summaryrefslogtreecommitdiff
path: root/module/language/ecmascript/parse.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-02-19 13:55:55 +0100
committerAndy Wingo <wingo@pobox.com>2009-02-19 13:55:55 +0100
commit131f7d6c71d0a0fe4f60b49a39efcd4f8ace6b0c (patch)
tree4ffdd807ccdcd05ad49d2da7190751fc30006bb3 /module/language/ecmascript/parse.scm
parent8fa6886d7af7c012c4cd17f793e5038931ffb4a0 (diff)
downloadguile-131f7d6c71d0a0fe4f60b49a39efcd4f8ace6b0c.tar.gz
further ecmascript work
* libguile/vm-i-system.c (drop, return): Declare drop and return as popping one arg from the stack. * module/language/ghil/compile-glil.scm: * module/language/glil/compile-assembly.scm (make-meta): Adjust so that we declare 'drop and 'return calls as popping one arg from the stack. * module/language/ecmascript/compile-ghil.scm (comp, comp-body): Flesh out a bit more. Most significantly, scoping within functions obeys javascript semantics better, modulo bits about with() forms. * module/language/ecmascript/impl.scm: Define some runtime helper routines. * module/language/Makefile.am (SOURCES): Add impl.scm. * module/language/ecmascript/parse.scm (parse-ecmascript): Minor tweaks. * module/language/ecmascript/tokenize.scm (read-identifier): Identifiers now read as symbols, not strings.
Diffstat (limited to 'module/language/ecmascript/parse.scm')
-rw-r--r--module/language/ecmascript/parse.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/module/language/ecmascript/parse.scm b/module/language/ecmascript/parse.scm
index 0632b6d87..b11de0e1d 100644
--- a/module/language/ecmascript/parse.scm
+++ b/module/language/ecmascript/parse.scm
@@ -30,6 +30,9 @@
(define (read-ecmascript/1 port)
(parse-ecmascript (make-tokenizer/1 port) pk))
+(define *eof-object*
+ (call-with-input-string "" read-char))
+
(define parse-ecmascript
(lalr-parser
;; terminal (i.e. input) token types
@@ -45,7 +48,7 @@
(Program (SourceElements) -> $1
- (*eoi*) -> (call-with-input-string "" read-char))
+ (*eoi*) -> *eof-object*)
;;
;; Verily, here we define statements. Expressions are defined
@@ -55,8 +58,8 @@
(SourceElement (Statement) -> $1
(FunctionDeclaration) -> $1)
- (FunctionDeclaration (function Identifier lparen rparen lbrace FunctionBody rbrace) -> `(define ,$2 (lambda () ,$6))
- (function Identifier lparen FormalParameterList rparen lbrace FunctionBody rbrace) -> `(define ,$2 (lambda ,$4 ,$7)))
+ (FunctionDeclaration (function Identifier lparen rparen lbrace FunctionBody rbrace) -> `(var ,$2 (lambda () ,$6))
+ (function Identifier lparen FormalParameterList rparen lbrace FunctionBody rbrace) -> `(var ,$2 (lambda ,$4 ,$7)))
(FunctionExpression (function lparen rparen lbrace FunctionBody rbrace) -> `(lambda () ,$5)
(function Identifier lparen rparen lbrace FunctionBody rbrace) -> `(lambda () ,$6)
(function lparen FormalParameterList rparen lbrace FunctionBody rbrace) -> `(lambda ,$3 ,$6)