repos-javascript-compilers
diff --git a/‎TODO.md
Lines changed: 5 additions & 4 deletions b/‎TODO.md
Lines changed: 5 additions & 4 deletions
diff --git a/‎macros/index.js
Lines changed: 5 additions & 1 deletion b/‎macros/index.js
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/ki.sjs
Lines changed: 5 additions & 1 deletion b/‎src/ki.sjs
Lines changed: 5 additions & 1 deletion
diff --git a/‎test/core.js
Lines changed: 37 additions & 2 deletions b/‎test/core.js
Lines changed: 37 additions & 2 deletions
@@ -41,17 +41,18 @@
 * **DONE** atoms
 * **DONE** exceptions
 * **DONE** allow generated scripts to run in browser (avoid require)
-* **DONE** fnth (fn bound to this) **TODO** test
-* **DONE** be consistent in binding to this **TODO** test
+* **DONE** fnth (fn bound to this)
+* **DONE** be consistent in binding to this
 
 * **DONE** testing
 
 * example with node
-* example with React
+* **DONE** example with React
 
 ## 0.3.0 Add the nice to have
 
 * destructuring
+* multiline strings
 * CPS modeled after tame.js
   In tame we would have something like
     (await (setTimeout (defer) 100))
@@ -74,7 +75,7 @@
 * named parameters and defaults
 * optional arguments to functions (catpured in a vector)
 * regular expressions
-* expression problem
+* implement a REPL
 * additional functions/forms
   * condp case
   * for (comprehension)
 
@@ -385,7 +385,7 @@ macro _sexpr {
     _sexpr $fn.apply(this,_sexpr (clj_to_js $args))
   }
 
-  rule { (bind $fn $obj) } => {
+  rule { (bind $obj $fn) } => {
     _sexpr $fn.bind($obj)
   }
 
@@ -678,6 +678,10 @@ macro ki {
     }());}
   }
 
+  //case {_ macro ($x ...) ($y ...)} => {
+  //  return #{};
+  //}
+
   case { $ki ($x ...) } => {
 
     var Token = {
 
@@ -385,7 +385,7 @@ macro _sexpr {
     _sexpr $fn.apply(this,_sexpr (clj_to_js $args))
   }
 
-  rule { (bind $fn $obj) } => {
+  rule { (bind $obj $fn) } => {
     _sexpr $fn.bind($obj)
   }
 
@@ -678,6 +678,10 @@ macro ki {
     }());}
   }
 
+  //case {_ macro ($x ...) ($y ...)} => {
+  //  return #{};
+  //}
+
   case { $ki ($x ...) } => {
 
     var Token = {
 
@@ -548,8 +548,8 @@ describe("bind", function() {
     ki (do 
         (def a {:a 1 :b 2})
         (defn f [] (get this :a)))
-    expect(ki ((bind f a))).to.eql(1);
-    expect(ki ((bind (fn [] (get this :a)) a))).to.eql(1);
+    expect(ki ((bind a f))).to.eql(1);
+    expect(ki ((bind a (fn [] (get this :a))))).to.eql(1);
   });
 
 });
@@ -613,6 +613,41 @@ describe("exceptions", function() {
 
 });
 
+describe("this and fnth", function() {
+
+  it("should handle binding this fn-wise correctly from within IIFN", function() {
+
+    ki require core
+
+    ki (defn somefn [] (letv [a 1] this.someprop));
+    var bar = {someprop: 1};
+    var baz = {};
+
+    expect(ki ((bind bar somefn))).to.eql(1);
+    expect(ki ((bind baz somefn))).to.eql(undefined);
+    expect(ki (somefn)).to.eql(undefined);
+
+  });
+
+  it("should allow a shorthand notation for defining a fn bound to the enclosing this", function() {
+
+    ki require core
+
+    var fn1, fn2;
+    ki (do
+         (js this.jee = 1)
+         (letv [a (fn [] this.jee)
+                b (fnth [] this.jee)]
+           (js fn1 = a)
+           (js fn2 = b)));
+
+    expect(fn1.bind({jee: 2})()).to.eql(2);
+    expect(fn2.bind({jee: 2})()).to.eql(1);
+
+  });
+
+});
+
 describe("str", function() {
 
   it("should allow to concatenate strings and literals", function() {
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ macro _sexpr {`
`385`	`385`	`_sexpr $fn.apply(this,_sexpr (clj_to_js $args))`
`386`	`386`	`}`
`387`	`387`
`388`		`- rule { (bind $fn $obj) } => {`
	`388`	`+ rule { (bind $obj $fn) } => {`
`389`	`389`	`_sexpr $fn.bind($obj)`
`390`	`390`	`}`
`391`	`391`
`@@ -678,6 +678,10 @@ macro ki {`
`678`	`678`	`}());}`
`679`	`679`	`}`
`680`	`680`
	`681`	`+ //case {_ macro ($x ...) ($y ...)} => {`
	`682`	`+ // return #{};`
	`683`	`+ //}`
	`684`	`+`
`681`	`685`	`case { $ki ($x ...) } => {`
`682`	`686`
`683`	`687`	`var Token = {`