summaryrefslogtreecommitdiff
path: root/src/GF/JavaScript/JS.cf
diff options
context:
space:
mode:
Diffstat (limited to 'src/GF/JavaScript/JS.cf')
-rw-r--r--src/GF/JavaScript/JS.cf5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/GF/JavaScript/JS.cf b/src/GF/JavaScript/JS.cf
index 1402d9511..58233ed74 100644
--- a/src/GF/JavaScript/JS.cf
+++ b/src/GF/JavaScript/JS.cf
@@ -15,7 +15,7 @@ SDeclOrExpr. Stmt ::= DeclOrExpr ";" ;
separator Stmt "" ;
Decl. DeclOrExpr ::= "var" [DeclVar];
-DExpr. DeclOrExpr ::= Expr ;
+DExpr. DeclOrExpr ::= Expr1 ;
DVar. DeclVar ::= Ident ;
DInit. DeclVar ::= Ident "=" Expr ;
@@ -39,6 +39,7 @@ ENull. Expr16 ::= "null" ;
EThis. Expr16 ::= "this" ;
EFun. Expr16 ::= "function" "(" [Ident] ")" "{" [Stmt] "}" ;
EArray. Expr16 ::= "[" [Expr] "]" ;
+EObj. Expr16 ::= "{" [Property] "}" ;
eseq1. Expr16 ::= "(" Expr "," [Expr] ")";
internal ESeq. Expr16 ::= "(" [Expr] ")" ;
@@ -47,3 +48,5 @@ define eseq1 x xs = ESeq (x:xs);
separator Expr "," ;
coercions Expr 16 ;
+Prop. Property ::= Ident ":" Expr ;
+separator Property "," ; \ No newline at end of file