@@ -26,7 +26,7 @@ var Identifier = function(state) { return Identifier(state); } var ReservedWord = choice("end", "fn", "if", "infixl", "infixr", "infix", "in", - "let", "module") + "let", "module", "do") var ReservedOperator = choice("|", "@", "->", "=") var IdentifierBeginning = choice(range("a", "z"), "_") @@ -333,23 +333,29 @@ updateOpParser() /* dynamic hook to allow updating the table. */ var Infix0 = function(state) { return opParser(state) } -var Infix = chainl(whitespace(Infix0), action(whitespace(';'), - function(ast) { return function(lhs, rhs) { - if (lhs.type == "seq") - return { type: "seq", exprs: lhs.exprs.concat(rhs) } - else - return { type: "seq", exprs: [lhs, rhs] }}})) +var Infix = action(sequence( + chainl(whitespace(Infix0), action(whitespace(';'), + function(ast) { return function(lhs, rhs) { + if (lhs.type == "seq") + return { type: "seq", exprs: lhs.exprs.concat(rhs) } + else + return { type: "seq", exprs: [lhs, rhs] }}})), + optional(whitespace(";"))), + function(ast) { return ast[0] }) var Module = action(wsequence("module", repeat0(TopLevelExpr), "end"), function(ast) { return { type: "module", exprs: ast[1] } }) +var Block = action(wsequence("do", repeat0(Expr), "end"), + function(ast) { return { type: "seq", exprs: ast[1] } }) + var NamedModule = action(wsequence("module", Identifier, repeat0(TopLevelExpr), "end"), function(ast) { return { type: "def", bindings: [[ast[1], { type: "module", exprs: ast[2] }]] }}) -var Expr = choice(App, Infix, ExprNoOp, Module) +var Expr = choice(App, Infix, ExprNoOp, Module, Block) var OpDecl = action(choice(action(wsequence("infixl", Operator, DecimalLiteral), function(ast) { yam.js 7d8c28c4083089cefbf9aa76c04d0d5be52f80c3 Christian Neukirchen chneukirchen@gmail.com http://github.com/chneukirchen/yam/commit/a3b53d059ab3d8cc30c1c0f1d90d05337ea6fb51 a3b53d059ab3d8cc30c1c0f1d90d05337ea6fb51 2009-02-01T07:21:24-08:00 2009-02-01T07:21:24-08:00 Add do/end blocks, allow trailing semicolon 378751eac2d6a5b824c5ca14bc3630b2cc1a5a7a Christian Neukirchen chneukirchen@gmail.com