Merge remote-tracking branch 'origin/master' into stack-size-hack

Conflicts:
	src/expr.cc
master
Marius Kintel 2014-11-25 17:02:58 -05:00
commit 74475395f4
2 changed files with 2 additions and 2 deletions

View File

@ -29,4 +29,4 @@ z = (j);
aa = k ? l : m;
bb = n[o];
cc = let(a=1) a;
dd = [for (a=[0,1]) a];
dd = [for (a=[0,1]) let(b=a) if (true) b];

View File

@ -29,5 +29,5 @@ z = j;
aa = (k ? l : m);
bb = n[o];
cc = let(a = 1) a;
dd = [for(a = [0, 1]) a];
dd = [for(a = [0, 1]) let(b = a) if(true) b];