QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Merge pull request #169 from aeternity/fix-illformed-lex-errors

Browse Source 
Fix mangled lex errors
This commit is contained in:
Ulf Norell 2019-10-21 09:00:43 +02:00 committed by GitHub
commit 83c3015899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aeso_parser.erl
View File

@ -50,7 +50,8 @@ parse_and_scan(P, S, Opts) ->
set_current_file(proplists:get_value(src_file, Opts, no_file)), set_current_file(proplists:get_value(src_file, Opts, no_file)),
case aeso_scan:scan(S) of case aeso_scan:scan(S) of
{ok, Tokens} -> aeso_parse_lib:parse(P, Tokens); {ok, Tokens} -> aeso_parse_lib:parse(P, Tokens);
Error -> Error {error, {{Input, Pos}, _}} ->
{error, {Pos, scan_error, Input}}
end. end.
-dialyzer({nowarn_function, parse_error/1}). -dialyzer({nowarn_function, parse_error/1}).
@ -60,8 +61,8 @@ parse_error(Err) ->
mk_p_err(Pos, Msg) -> mk_p_err(Pos, Msg) ->
aeso_errors:new(parse_error, mk_pos(Pos), lists:flatten(Msg)). aeso_errors:new(parse_error, mk_pos(Pos), lists:flatten(Msg)).
mk_error({Pos, ScanE}) when ScanE == scan_error; ScanE == scan_error_no_state -> mk_error({Pos, scan_error, Input}) ->
mk_p_err(Pos, "Scan error\n"); mk_p_err(Pos, io_lib:format("Lexical error on input: ~s\n", [Input]));
mk_error({Pos, parse_error, Err}) -> mk_error({Pos, parse_error, Err}) ->
Msg = io_lib:format("~s\n", [Err]), Msg = io_lib:format("~s\n", [Err]),
mk_p_err(Pos, Msg); mk_p_err(Pos, Msg);