More HOF support

Author: mmoskal

mbit/hello.ts

@@ -26,11 +26,12 @@ export function main(): void {
  testReccoll();
  showDigit(5);
  inBg();
- /*
  testAction(1);
  showDigit(6);
  testAction(7);
- testActionSave();
+ testIter();
+ testActionSave(); 
+ /*
  msg("start mem test");
  testMemoryFree();
  msg("start 2nd mem test");
@@ -266,18 +267,26 @@ function inBg() {
  assert(rec.str == "foo", "inbg1")
 }
 
-/*
-
-
-function runTwice(fn:Action) : void
-{
+function runTwice(fn: Action): void {
  msg("r2 start");
  fn();
  fn();
 }
 
-function testAction(p: number) : void
-{
+function iter(max: number, fn: (v: number) => void) {
+ for (var i = 0; i < max; ++i)
+ fn(i);
+}
+
+function testIter() {
+ x = 0
+ iter(10, v => {
+ x = x + (v + 1)
+ })
+ assert(x == 55, "55")
+}
+
+function testAction(p: number): void {
  let s = "hello" + "1";
  let coll = (<number[]>[]);
  let p2 = p * 2;
@@ -291,22 +300,19 @@ function testAction(p: number) : void
  assert(coll.length == 2, "run2");
 }
 
-function saveAction(fn:Action) : void
-{
+function saveAction(fn: Action): void {
  action = fn;
 }
 
-function saveGlobalAction() : void
-{
+function saveGlobalAction(): void {
  let s = "foo" + "42";
  tot = "";
  saveAction(() => {
  tot = tot + s;
  });
 }
 
-function testActionSave() : void
-{
+function testActionSave(): void {
  saveGlobalAction();
  runTwice(action);
  msg(tot);
@@ -315,6 +321,7 @@ function testActionSave() : void
  action = (<Action>null);
 }
 
+/*
 
 function testRefLocals() : void
 {

src/mbit/README.md

@@ -0,0 +1,11 @@
+# ARM Thumb emitter for TypeScript
+
+## TODO
+
+* class methods
+* optional arguments
+* default arguments
+* code in top-level scope
+* image literals
+* +=, -= etc
+* return values in lambdas

src/mbit/emitter.ts

@@ -40,7 +40,9 @@ namespace ts {
  node = node.parent
  if (!node)
  userError(lf("cannot determine parent of {0}", stringKind(node0)))
- if (node.kind == SyntaxKind.FunctionDeclaration) return <FunctionDeclaration>node
+ if (node.kind == SyntaxKind.FunctionDeclaration ||
+ node.kind == SyntaxKind.ArrowFunction ||
+ node.kind == SyntaxKind.FunctionExpression) return <FunctionLikeDeclaration>node
  if (node.kind == SyntaxKind.SourceFile) return null
  }
  }
@@ -197,6 +199,7 @@ namespace ts {
  if (outer == null || outer == proc.action) {
  // not captured
  } else {
+ debugger;
  if (proc.info.capturedVars.indexOf(v) < 0)
  proc.info.capturedVars.push(v);
  info.captured = true;
@@ -479,10 +482,8 @@ namespace ts {
  proc.emit("add sp, #4*" + args.length)
  if (hasRet)
  proc.emit("push {r0}");
-
  }
 
-
  if (decl && decl.kind == SyntaxKind.FunctionDeclaration) {
  if (attrs.shim) {
  emitShim(decl, node, args);
@@ -517,6 +518,23 @@ namespace ts {
  unhandled(node, "non-shim method call");
  }
 
+ if (decl && (decl.kind == SyntaxKind.VariableDeclaration || decl.kind == SyntaxKind.Parameter)) {
+ if (args.length > 1)
+ userError("lambda functions with more than 1 argument not supported")
+
+ if (hasRet)
+ userError("lambda functions cannot yet return values")
+
+ let suff = args.length + ""
+ if (suff == "0") suff = ""
+
+ args.unshift(node.expression)
+ args.forEach(emit)
+
+ proc.emitCall("action::run" + suff, getMask(args));
+ return
+ }
+
  unhandled(node, stringKind(decl))
  }
 
@@ -572,7 +590,10 @@ namespace ts {
  proc.emitCall("action::mk", 0)
  caps.forEach((l, i) => {
  proc.emitInt(i)
- proc.localIndex(l).emitLoad(proc, true) // direct load
+ let loc = proc.localIndex(l)
+ if (!loc)
+ userError("cannot find captured value: " + checker.symbolToString(l.symbol))
+ loc.emitLoad(proc, true) // direct load
  proc.emitCall("bitvm::stclo", 0)
  // already done by emitCall
  // proc.emit("push {r0}");
@@ -597,6 +618,13 @@ namespace ts {
  proc.emit("@stackmark inlfunc");
  proc.emit("push {r5, lr}");
  proc.emit("mov r5, r1");
+
+ node.parameters.forEach((p, i) => {
+ if (i >= 2)
+ userError(lf("only up to two parameters supported in lambdas"))
+ proc.emit(`push {r${i + 2}}`)
+ })
+ proc.emit("@stackmark args");
  } else {
  proc.emit("@stackmark func");
  proc.emit("@stackmark args");
@@ -618,20 +646,24 @@ namespace ts {
 
  if (proc.hasReturn()) {
  proc.emit("push {r0}");
- proc.emitClrs(null, true);
+ proc.emitClrs();
  proc.emit("pop {r0}");
  } else {
- proc.emitClrs(null, true);
+ proc.emitClrs();
  }
 
  proc.popLocals();
 
  if (isLambda) {
+ proc.emit("@stackempty args")
+ if (node.parameters.length)
+ proc.emit("add sp, #4*" + node.parameters.length + " ; pop args")
  proc.emit("pop {r5, pc}");
  proc.emit("@stackempty inlfunc");
  } else {
  proc.emit("pop {pc}");
  proc.emit("@stackempty func");
+ proc.emit("@stackempty args")
  }
  })
  }
@@ -1559,13 +1591,10 @@ namespace ts {
  (noargs ? null : this.args.filter(n => n.def == l)[0])
  }
 
- emitClrs(omit: Declaration, inclArgs = false) {
- var lst = this.locals
- if (inclArgs)
- lst = lst.concat(this.args)
+ emitClrs() {
+ var lst = this.locals.concat(this.args)
  lst.forEach(p => {
- if (p.def != omit)
- p.emitClrIfRef(this)
+ p.emitClrIfRef(this)
  })
  }