diff options
| author | Björn Gustavsson <[email protected]> | 2014-03-05 12:53:39 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-03-05 12:53:39 +0100 |
| commit | ab044b52bbe0217bc06c9b67cba7099c28176ee9 (patch) | |
| tree | 82ce4d9b96b6751ae857cd6c8099c9a707093ad5 | |
| parent | 70cb25dd47ca15a79f84d3f7a92c0316cf94bd03 (diff) | |
| parent | 66057b0e0c6e4a69b878090543604a7c2a59b34c (diff) | |
| download | otp-ab044b52bbe0217bc06c9b67cba7099c28176ee9.tar.gz otp-ab044b52bbe0217bc06c9b67cba7099c28176ee9.tar.bz2 otp-ab044b52bbe0217bc06c9b67cba7099c28176ee9.zip | |
Merge branch 'nox/compiler/lint-shortcircuit-ops'
* nox/compiler/lint-shortcircuit-ops:
Properly lint shortcircuiting operators
| -rw-r--r-- | lib/stdlib/src/erl_lint.erl | 10 | ||||
| -rw-r--r-- | lib/stdlib/test/erl_lint_SUITE.erl | 10 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl index 1fe0bd5896..5ba68318d7 100644 --- a/lib/stdlib/src/erl_lint.erl +++ b/lib/stdlib/src/erl_lint.erl @@ -1864,6 +1864,10 @@ gexpr({op,Line,Op,A}, Vt, St0) -> true -> {Avt,St1}; false -> {Avt,add_error(Line, illegal_guard_expr, St1)} end; +gexpr({op,_,'andalso',L,R}, Vt, St) -> + gexpr_list([L,R], Vt, St); +gexpr({op,_,'orelse',L,R}, Vt, St) -> + gexpr_list([L,R], Vt, St); gexpr({op,Line,Op,L,R}, Vt, St0) -> {Avt,St1} = gexpr_list([L,R], Vt, St0), case is_gexpr_op(Op, 2) of @@ -1950,12 +1954,14 @@ is_gexpr({call,L,{tuple,Lt,[{atom,Lm,erlang},{atom,Lf,F}]},As}, RDs) -> is_gexpr({call,L,{remote,Lt,{atom,Lm,erlang},{atom,Lf,F}},As}, RDs); is_gexpr({op,_L,Op,A}, RDs) -> is_gexpr_op(Op, 1) andalso is_gexpr(A, RDs); +is_gexpr({op,_L,'andalso',A1,A2}, RDs) -> + is_gexpr_list([A1,A2], RDs); +is_gexpr({op,_L,'orelse',A1,A2}, RDs) -> + is_gexpr_list([A1,A2], RDs); is_gexpr({op,_L,Op,A1,A2}, RDs) -> is_gexpr_op(Op, 2) andalso is_gexpr_list([A1,A2], RDs); is_gexpr(_Other, _RDs) -> false. -is_gexpr_op('andalso', 2) -> true; -is_gexpr_op('orelse', 2) -> true; is_gexpr_op(Op, A) -> try erl_internal:op_type(Op, A) of arith -> true; diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl index 8754677466..5e117409de 100644 --- a/lib/stdlib/test/erl_lint_SUITE.erl +++ b/lib/stdlib/test/erl_lint_SUITE.erl @@ -1494,7 +1494,15 @@ guard(Config) when is_list(Config) -> [], {errors,[{1,erl_lint,illegal_guard_expr}, {2,erl_lint,illegal_guard_expr}, - {3,erl_lint,illegal_guard_expr}],[]}} + {3,erl_lint,illegal_guard_expr}],[]}}, + {guard9, + <<"t(X, Y) when erlang:'andalso'(X, Y) -> ok; + t(X, Y) when erlang:'orelse'(X, Y) -> ok. + ">>, + [], + {errors,[{1,erl_lint,illegal_guard_expr}, + {2,erl_lint,illegal_guard_expr}], + []}} ], ?line [] = run(Config, Ts1), ok. |