summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Graham <joolean@undecidable.net>2016-09-13 08:39:43 -0400
committerLudovic Courtès <ludo@gnu.org>2016-10-25 23:39:30 +0200
commit9807d2dced107aecfb85502e9264e63f74214499 (patch)
treebb626e6005c929fda53a7c62c25dd85c33e26b5c
parentd74e0fed0d79f4ae30aa1acf309f47cfade5c589 (diff)
downloadguile-9807d2dced107aecfb85502e9264e63f74214499.tar.gz
Fix tree-il code generation for ECMAscript `new' expression.
The compiler was producing `((toplevel foo))' instead of `(toplevel foo)'. Changed to use `call' form with target type and spliced constructor arguments. * module/language/ecmascript/compile-tree-il.scm (comp): Replace `@impl' shorthand with `call' + `@implv' for better control over resulting tree-il. * test-suite/tests/ecmascript.test (compiler): Add test for "new Object();" Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--module/language/ecmascript/compile-tree-il.scm8
-rw-r--r--test-suite/tests/ecmascript.test8
2 files changed, 11 insertions, 5 deletions
diff --git a/module/language/ecmascript/compile-tree-il.scm b/module/language/ecmascript/compile-tree-il.scm
index a9ac3e0cd..d61f7120d 100644
--- a/module/language/ecmascript/compile-tree-il.scm
+++ b/module/language/ecmascript/compile-tree-il.scm
@@ -1,6 +1,6 @@
;;; ECMAScript for Guile
-;; Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2011, 2016 Free Software Foundation, Inc.
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -437,9 +437,9 @@
((^= ,what ,val)
(comp `(= ,what (^ ,what ,val)) e))
((new ,what ,args)
- (@impl new
- (map (lambda (x) (comp x e))
- (cons what args))))
+ `(call ,(@implv new)
+ ,(comp what e)
+ ,@(map (lambda (x) (comp x e)) args)))
((delete (pref ,obj ,prop))
(@impl pdel
(comp obj e)
diff --git a/test-suite/tests/ecmascript.test b/test-suite/tests/ecmascript.test
index 96b1d6666..9f2731e9f 100644
--- a/test-suite/tests/ecmascript.test
+++ b/test-suite/tests/ecmascript.test
@@ -1,6 +1,6 @@
;;;; ecmascript.test --- ECMAScript. -*- mode: scheme; coding: utf-8; -*-
;;;;
-;;;; Copyright (C) 2010, 2011, 2013 Free Software Foundation, Inc.
+;;;; Copyright (C) 2010, 2011, 2013, 2016 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -83,6 +83,12 @@
(ecompile "\"hello\";" "hello")
(ecompile "var test = { bar: 1 };")
+ (pass-if "new Object;"
+ (not (not
+ (compile (call-with-input-string "new Object;" read-ecmascript)
+ #:from 'ecmascript
+ #:to 'tree-il)))) ; Can't reference `Object' as value here
+
;; FIXME: Broken!
;; (ecompile "[1,2,3,4].map(function(x) { return x * x; });"
;; '(1 4 9 16))