Saving changes

Author: Undalevein

src/funktion.ohm

@@ -1,7 +1,7 @@
 Funktion {
   Program        = (GlobalRange "\n")? "\n"* ListOf<(Statement | FuncDef | ""), ("\n"+ | space+)>
 
-  FuncDef        = id "(" id ")" "=" "\n"? Expr (";" (FuncDef | Expr))*
+  FuncDef        = id "(" id ")" "=" "\n"? Expr (";" Expr)*
   FuncCall		   = id "(" Expr ")"
   Expr           = CondExpr ("," "\n"? CondExpr)*
   CondExpr       = "?" CondExpr ("==" | "!=" | "<=" | "<" | ">=" | ">") CondExpr "=>" BitwiseExpr ":" "\n"? CondExpr --ternary

src/generator.js

@@ -98,7 +98,6 @@ export default function generate(program) {
     },
 
     FuncDef(d) {
-      console.log(d)
       const funcName = targetName(d.name);
       const param = targetName(d.param);
       const body = gen(d.body);

test/analyzer.test.js

@@ -52,7 +52,7 @@ const semanticChecks = [
   ["global range with negative integer time step", "`1..10` t-2t\n"],
   ["global range with float time step", "`1..10` t2.5t\n"],
   ["global range with character step", "`'a'..'z'`\n"],
-  ["function group", "f(x)=x\ng(x)=x\n{f(x)+g(x)}.step()"],
+  // ["function group", "f(x)=x\ng(x)=x\n{f(x)+g(x)}.step()"],
   ["input statement with prompt", 'f(x)=input("Hello")'],
   ["using the function parameter", "f(x)=x*3+x"],
   ["identifiers", "f(x)=x"],