From a335b29c0a85ea81ee1017f18dd6f2595d2a5227 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Thu, 21 Dec 2006 16:48:46 +0000
Subject: Meta variables are now treated as functions with name ? in SISR,
 VoiceXML and JavaScript linearization. VoiceXML now returns the partial
 result when update() is false.

---
 src/GF/JavaScript/JS.cf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/GF/JavaScript/JS.cf')

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
-- 
cgit v1.2.3