@@ -67,9 +67,9 @@ kwd ~= eatId("after @"); immutable LexPosition varpos = (lex.empty ? null : lex.front.pos); string var = eatId("after "~kwd); eat("=", "after "~kwd); - kwd = (kwd[0]=='@' ? kwd : "@val"); + kwd = (kwd[0]=='@' ? kwd : ""); // "let, var, def ==> neutral layer" auto e = E(0); if( tryEat(";") && !lex.empty && (lex.front.quoted || (lex.front.str!="}" && lex.front.str!=")")) ) return new LetExpression(pos, var, kwd, e, Body()); else @@ -262,11 +262,11 @@ assert_eq(parseString("\u03BB(){1}"), fun([],intl(1))); assert_eq(parseString("\u03BB(x){1}"), fun(["x"],intl(1))); assert_eq(parseString(`1;2`), let("_","@val",intl(1),intl(2))); assert_eq(parseString(`1;2;`), let("_","@val",intl(1),intl(2))); - assert_eq(parseString(`let x=1;2`), let("x","@val",intl(1),intl(2))); - assert_eq(parseString(`var x=1;2;`), let("x","@val",intl(1),intl(2))); - assert_eq(parseString(`def x=1`), let("x","@val",intl(1),var("x"))); + assert_eq(parseString(`let x=1;2`), let("x","",intl(1),intl(2))); + assert_eq(parseString(`var x=1;2;`), let("x","",intl(1),intl(2))); + assert_eq(parseString(`def x=1`), let("x","",intl(1),var("x"))); assert_eq(parseString(`@val x=1;`), let("x","@val",intl(1),var("x"))); assert_eq(parseString(`@typ x="#int";`), let("x","@typ",strl("#int"),var("x"))); assert_eq(parseString(`f(1,2)`), call(var("f"),intl(1),intl(2))); assert_eq(parseString(`if(1){2}`), call(var("if"),intl(1),fun([],intl(2)),fun([],intl(178)))); @@ -282,16 +282,16 @@ let x = 100; #comment let y = 200; #comment!!!!! x+y `), - let("x", "@val", intl(100), let("y", "@val", intl(200), call(var("+"), var("x"), var("y")))) + let("x", "", intl(100), let("y", "", intl(200), call(var("+"), var("x"), var("y")))) ); assert_eq(parseString(` var fac = fun(x){ if(x <= 1) {1} else {x*fac(x-1)} }; fac(10) `), - let("fac", "@val", fun(["x"], + let("fac", "", fun(["x"], call(var("if"), call(var("<="), var("x"), intl(1)), fun([], intl(1)), fun([], call(var("*"), var("x"), call(var("fac"),call(var("-"),var("x"),intl(1)))))