Drastic changes again

Author: Undalevein

examples/factorial.funk

@@ -1,5 +1,6 @@
 `5..1` t1t
 
-factorial(x) = ? x > 1 => x * factorial(x).step() : 1    
+factorial(x) = ? x > 1 => x * factorial(x - 1) : 1    
 
-print(factorial(x):1)
+factorial(x).step(5)
+print(x:5)

examples/fizzbuzz copy.funk

@@ -6,4 +6,4 @@ G(x) = input("Give me a value and I will multiply that sequence with that value.
 
 h(x) = f(x) * G(x)
 h(x).step(2)
-print(f(x):5)
+print(x:5)                                                                            

examples/give_me_input.funk

@@ -2,4 +2,4 @@
 
 f(x) = x ; x + 1 ; x + 2
 f(x).step(2)
-print(f(x):7)
+print(x:7)

examples/slices.funk

@@ -25,7 +25,8 @@ class Context {
   }
 
   newChildContext(props) {
-    return new Context({ ...this, ...props, parent: this, locals: new Map() });
+    
+    return new Context({ ...this, ...props, parent: this, locals: this.locals });
   }
 }
 
@@ -86,9 +87,9 @@ export default function analyze(match) {
 
     FuncDef(
       id,
-      open,
+      _open,
       param,
-      close,
+      _close,
       _eq,
       _newLine,
       body,
@@ -99,16 +100,17 @@ export default function analyze(match) {
       // Temporary check inside the function.
       const originalContext = context;
       context = context.newChildContext();
+      context.add(id.sourceString, {
+        kind: "Function",
+        type: core.functionType,
+        name: id.sourceString,
+      });
       context.add(param.sourceString, {
         kind: "MutableRange",
         type: core.numberType,
         name: param.sourceString,
       });
-      const functionId =
-        id.sourceString +
-        open.sourceString +
-        param.sourceString +
-        close.sourceString;
+      const functionId = `${id.sourceString}(${param.sourceString})`;
       context.add(functionId, {
         kind: "Function",
         type: core.functionType,
@@ -117,7 +119,7 @@ export default function analyze(match) {
       const analyzedBody = body?.rep();
       // Checks outside of the function definition.
       context = originalContext;
-      context.add(functionId, {
+      context.add(id.sourceString, {
         kind: "Function",
         type: core.functionType,
         name: functionId,
@@ -136,20 +138,15 @@ export default function analyze(match) {
       return func;
     },
 
-    FuncCall(id, open, arg, close) {
-      const functionId =
-        id.sourceString +
-        open.sourceString +
-        arg.sourceString +
-        close.sourceString;
-      const func = context.lookup(functionId);
+    FuncCall(id, _open, arg, _close) {
+      const func = context.lookup(id.sourceString);
       mustHaveBeenFound(func, id.sourceString, { at: id });
-      return core.funcCall(id.sourceString, arg.sourceString);
+      return core.funcCall(id.sourceString, arg.rep());
     },
 
-    FunctionGroup(_open, expr, _close) {
-      return core.functionGroup(expr.rep());
-    },
+    // FunctionGroup(_open, expr, _close) {
+    //   return core.functionGroup(expr.rep());
+    // },
 
     Expr(condExpr, _sep, _newLine, rest) {
       return core.expr(
@@ -239,7 +236,7 @@ export default function analyze(match) {
 
     MulExpr_mul(left, right) {
       const l = left.rep();
-      const r = right.sourceString;
+      const r = right.rep();
       return core.mulExpr(l, "*", r);
     },
 
@@ -283,10 +280,10 @@ export default function analyze(match) {
       return core.printStmt(expr.rep());
     },
 
-    StepCall(expr, _dot, _step, _open, stepValue, _close) {
+    StepCall(id, _open, arg, _close, _dot, _step, _open1, stepValue, _close1) {
       // Syntax Sugar: Default step count is 1.
       return core.stepCall(
-        expr.rep(),
+        {name: id.sourceString, arg: arg.sourceString},
         stepValue.rep().length ? stepValue.rep()[0].value : 1
       );
     },
@@ -325,8 +322,8 @@ export default function analyze(match) {
     num(sign, value, _period, decimal) {
       const number = Number(
         sign.sourceString +
-          value.sourceString +
-          decimal.sourceString
+        value.sourceString +
+        decimal.sourceString
       );
       return core.num(number);
     },
@@ -343,7 +340,7 @@ export default function analyze(match) {
       const idName = firstChar.sourceString + name?.sourceString;
       const entity = context.lookup(idName);
       mustHaveBeenFound(entity, idName, { at: name });
-      return core.id(firstChar.sourceString + name?.sourceString);
+      return core.id(idName);
     },
 
     _terminal(...children) {

src/analyzer.js

@@ -17,9 +17,9 @@ export function funcCall(name, arg) {
   return { type: anyType, kind: "FuncCall", name, arg };
 }
 
-export function functionGroup(expr) {
-  return { type: expr.type, kind: "FunctionGroup", expr };
-}
+// export function functionGroup(expr) {
+//   return { type: expr.type, kind: "FunctionGroup", expr };
+// }
 
 export function expr(condExpr, rest = []) {
   return { type: condExpr.type, kind: "Expr", condExpr, rest };

src/core.js

@@ -2,7 +2,7 @@ Funktion {
   Program        = (GlobalRange "\n")? "\n"* ListOf<(Statement | FuncDef | ""), ("\n"+ | space+)>
 
   FuncDef        = id "(" id ")" "=" "\n"? Expr (";" (FuncDef | Expr))*
-  FuncCall		   = id "(" id ")"
+  FuncCall		   = id "(" Expr ")"
   Expr           = CondExpr ("," "\n"? CondExpr)*
   CondExpr       = "?" CondExpr ("==" | "!=" | "<=" | "<" | ">=" | ">") CondExpr "=>" BitwiseExpr ":" "\n"? CondExpr --ternary
                  | BitwiseExpr
@@ -33,7 +33,8 @@ Funktion {
                  | InputStmt
   PrintStmt      = "print" "(" (TimeCall | CondExpr) ")"
   TimeCall       = id ":" num
-  StepCall       =  (FuncCall | FunctionGroup) "." "step" "(" num? ")"
+  StepCall       =  id "(" id ")" "." "step" "(" num? ")"
+  StepCallMulti  = FunctionGroup "." "step" "(" num? ")"
   InputStmt      = "input" "(" stringliteral? ")"
 
   GlobalRange    = range timestep?

src/funktion.ohm

@@ -1,6 +1,8 @@
 import { voidType, numberType, stringType, functionType, standardLibrary } from "./core.js";
 
 export default function generate(program) {
+  const inputCode = [];
+  let inputIndex = 0;
   const output = [];
   const targetName = ((mapping) => {
     return (name) => {
@@ -13,9 +15,8 @@ export default function generate(program) {
 
   const gen = node => generators?.[node?.kind]?.(node) ?? node
 
-  const instantiatedMutableRanges = []
+  const instantiatedMutableRanges = new Set([]);
 
-  // let currentFunction = { name: null, param: null };
 
   const generators = {
     Program(p) {
@@ -28,6 +29,11 @@ export default function generate(program) {
       const end = range ? gen(range.end[0]) : 5;
       const step = timestep ? gen(timestep.value) :
                    start <= end ? 1 : -1;
+      inputCode.push(`
+        import { createInterface } from "node:readline/promises";
+        import { stdin as input, stdout as output } from "node:process";
+        const rl = createInterface({ input, output });
+      `);
       output.push(`
         function generateRange(start = ${start}, end = ${end}, step = ${step}) {
           if (end < start) step *= -1;
@@ -87,16 +93,20 @@ export default function generate(program) {
         }
       `);
       p.statements.forEach(gen);
+      output.push(`rl.close()`);
+      output.unshift(...inputCode);
     },
 
     FuncDef(d) {
+      console.log(d)
       const funcName = targetName(d.name);
       const param = targetName(d.param);
       const body = gen(d.body);
       const lastStmt = body.pop();
       output.push(`function ${funcName}(${param}) {\n${body}\nreturn ${lastStmt};\n} `);
-      if (instantiatedMutableRanges.indexOf(param) === -1) {
+      if (!instantiatedMutableRanges.has(param)) {
         output.push(`let ${param} = initializeMutableRange();`);
+        instantiatedMutableRanges.add(param)
       }
     },
 
@@ -105,7 +115,7 @@ export default function generate(program) {
     },
 
     StepCall(s) {
-      const expr = gen(s.expr);
+      const expr = targetName(s.expr.name);
       const stepValue = gen(s.stepValue);
       const arg = targetName(s.expr.arg);
       output.push(`applyFunction(${arg}, ${stepValue}, ${expr});`);
@@ -188,6 +198,14 @@ export default function generate(program) {
       return `${gen(e.id)}.values.slice(0, ${gen(e.timeValue)})`;
     },
 
+    InputStmt(e) {
+      inputCode.push(`
+        console.log(${gen(e.prompt[0])});
+        const inputVar__${inputIndex} = await rl.question("Input: ");
+      `);
+      return `inputVar__${inputIndex++}`
+    },
+
     num(n) {
       return n.value;
     },
@@ -205,7 +223,7 @@ export default function generate(program) {
     },
 
     FuncCall(c) {
-      return `${targetName(c.name)}`;
+      return `${targetName(c.name)}(${gen(c.arg)})`;
     }
   };