aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-02-25 11:44:42 +0100
committerBjörn Gustavsson <[email protected]>2015-02-25 11:44:42 +0100
commit54d2eee83c75fc257b9934eb2e4f2069983b4eb2 (patch)
tree05f90c9af43c6126d170ffa0bfb831eadaf316f7 /lib
parent4dae7cd0c0fc15f051ac90d6e1c4b19d94a27128 (diff)
parent814f9b367c33a9f28b78b18ef97c674b2918d258 (diff)
downloadotp-54d2eee83c75fc257b9934eb2e4f2069983b4eb2.tar.gz
otp-54d2eee83c75fc257b9934eb2e4f2069983b4eb2.tar.bz2
otp-54d2eee83c75fc257b9934eb2e4f2069983b4eb2.zip
Merge branch 'nox/stdlib/erl_lint-expr_list'
* nox/stdlib/erl_lint-expr_list: Remove a few superfluous vt operations in erl_lint
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/erl_lint.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index b870ccf1f9..dabedff0d4 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2270,11 +2270,10 @@ expr({remote,Line,_M,_F}, _Vt, St) ->
%% {UsedVarTable,State}
expr_list(Es, Vt, St) ->
- {Vt1,St1} = foldl(fun (E, {Esvt,St0}) ->
- {Evt,St1} = expr(E, Vt, St0),
- {vtmerge_pat(Evt, Esvt),St1}
- end, {[],St}, Es),
- {vtmerge(vtnew(Vt1, Vt), vtold(Vt1, Vt)),St1}.
+ foldl(fun (E, {Esvt,St0}) ->
+ {Evt,St1} = expr(E, Vt, St0),
+ {vtmerge_pat(Evt, Esvt),St1}
+ end, {[],St}, Es).
record_expr(Line, Rec, Vt, St0) ->
St1 = warn_invalid_record(Line, Rec, St0),