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

Add oneline error pretty-printing

Browse Source
This commit is contained in:
Hans Svensson 2022-01-05 13:04:11 +01:00
parent c04f66a00a
commit 1a89d58952
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- Compiler warnings for the follwing: shadowing, negative spends, division by zero, unused functions, unused includes, unused stateful annotations, unused variables, unused parameters, unused user-defined type, dead return value. - Compiler warnings for the follwing: shadowing, negative spends, division by zero, unused functions, unused includes, unused stateful annotations, unused variables, unused parameters, unused user-defined type, dead return value.
### Changed ### Changed
- Error messages have been restructured (less newlines) to provide more unified errors. Also `pp_oneline/1` has been added.
### Removed ### Removed
## [6.1.0] - 2021-10-20 ## [6.1.0] - 2021-10-20

10
src/aeso_errors.erl
View File

@ -30,12 +30,14 @@
-export([ err_msg/1 -export([ err_msg/1
, msg/1 , msg/1
, msg_oneline/1
, new/2 , new/2
, new/3 , new/3
, new/4 , new/4
, pos/2 , pos/2
, pos/3 , pos/3
, pp/1 , pp/1
, pp_oneline/1
, pp_pos/1 , pp_pos/1
, to_json/1 , to_json/1
, throw/1 , throw/1
@ -68,6 +70,9 @@ throw(#err{} = Err) ->
msg(#err{ message = Msg, context = none }) -> Msg; msg(#err{ message = Msg, context = none }) -> Msg;
msg(#err{ message = Msg, context = Ctxt }) -> Msg ++ "\n" ++ Ctxt. msg(#err{ message = Msg, context = Ctxt }) -> Msg ++ "\n" ++ Ctxt.
msg_oneline(#err{ message = Msg, context = none }) -> Msg;
msg_oneline(#err{ message = Msg, context = Ctxt }) -> Msg ++ " - " ++ Ctxt.
err_msg(#err{ pos = Pos } = Err) -> err_msg(#err{ pos = Pos } = Err) ->
lists:flatten(io_lib:format("~s~s\n", [str_pos(Pos), msg(Err)])). lists:flatten(io_lib:format("~s~s\n", [str_pos(Pos), msg(Err)])).
@ -81,6 +86,11 @@ type(#err{ type = Type }) -> Type.
pp(#err{ type = Kind, pos = Pos } = Err) -> pp(#err{ type = Kind, pos = Pos } = Err) ->
lists:flatten(io_lib:format("~s~s:\n~s\n", [pp_kind(Kind), pp_pos(Pos), msg(Err)])). lists:flatten(io_lib:format("~s~s:\n~s\n", [pp_kind(Kind), pp_pos(Pos), msg(Err)])).
pp_oneline(#err{ type = Kind, pos = Pos } = Err) ->
Msg = msg_oneline(Err),
OneLineMsg = re:replace(Msg, "[\s\\n]+", " ", [global]),
lists:flatten(io_lib:format("~s~s: ~s", [pp_kind(Kind), pp_pos(Pos), OneLineMsg])).
pp_kind(type_error) -> "Type error"; pp_kind(type_error) -> "Type error";
pp_kind(parse_error) -> "Parse error"; pp_kind(parse_error) -> "Parse error";
pp_kind(code_error) -> "Code generation error"; pp_kind(code_error) -> "Code generation error";