From f57e253826584c6d3d5f8dadfe02869047905299 Mon Sep 17 00:00:00 2001 From: Noah Lavine Date: Mon, 3 Jan 2011 02:22:35 -0500 Subject: [PATCH] Ecmascript Compiler Fix * module/language/ecmascript/compile-tree-il.scm (compile-tree-il): generate correct tree-il for construction of new objects. * test-suite/tests/ecmascript.test: test whether we generate new objects correctly. --- module/language/ecmascript/compile-tree-il.scm | 20 ++++++++++---------- test-suite/tests/ecmascript.test | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/module/language/ecmascript/compile-tree-il.scm b/module/language/ecmascript/compile-tree-il.scm index a97e555..a5276ab 100644 --- a/module/language/ecmascript/compile-tree-il.scm +++ b/module/language/ecmascript/compile-tree-il.scm @@ -366,16 +366,16 @@ `(apply ,(@implv new-array) ,@(map (lambda (x) (comp x e)) args))) ((object . ,args) - (@impl new-object - (map (lambda (x) - (pmatch x - ((,prop ,val) - (-> (apply (-> (primitive 'cons)) - (-> (const prop)) - (comp val e)))) - (else - (error "bad prop-val pair" x)))) - args))) + `(apply (@ (language ecmascript impl) new-object) + ,@(map (lambda (x) + (pmatch x + ((,prop ,val) + (-> (apply (-> (primitive 'cons)) + (-> (const prop)) + (comp val e)))) + (else + (error "bad prop-val pair" x)))) + args))) ((pref ,obj ,prop) (@impl pget (comp obj e) diff --git a/test-suite/tests/ecmascript.test b/test-suite/tests/ecmascript.test index 955296d..2d497e8 100644 --- a/test-suite/tests/ecmascript.test +++ b/test-suite/tests/ecmascript.test @@ -65,6 +65,7 @@ (ecompile "true;" #t) (ecompile "2 + 2;" 4) (ecompile "\"hello\";" "hello") + (ecompile "var test = { bar: 1 };") ;; FIXME: Broken! ;; (ecompile "[1,2,3,4].map(function(x) { return x * x; });" -- 1.7.3.2