Apply some of the changes from the previous commit to the .g files
authorTony Garnock-Jones <tonygarnockjones@gmail.com>
Wed, 26 May 2010 21:52:29 +1200
changeset 31 dd9850e5e4fc
parent 30 af04a16148de
child 32 5deee5dae03d
Apply some of the changes from the previous commit to the .g files
ometa-boot-pretty.g
ometa-boot.g
--- a/ometa-boot-pretty.g	Sun Jan 18 00:24:08 2009 +0000
+++ b/ometa-boot-pretty.g	Wed May 26 21:52:29 2010 +1200
@@ -29,7 +29,7 @@
 expr1 = token("<{") host-language-expression:s token("}>") -> `(sequence ,s);
 expr1 = name:prod-exp apply-arguments:arg-exps -> `(apply ,prod-exp ,@arg-exps);
 expr1 = token("->") host-language-expression:r -> `(action ,r);
-expr1 = token("?") host-language-expression:r -> `(action (or ,r (error 'expected ',r)));
+expr1 = token("?") host-language-expression:r -> `(action (or ,r (error)));
 expr1 = literal:x -> `(exactly ,x);
 expr1 = token("_") -> `(anything);
 expr1 = token("(") expr:x token(")") -> x;
--- a/ometa-boot.g	Sun Jan 18 00:24:08 2009 +0000
+++ b/ometa-boot.g	Wed May 26 21:52:29 2010 +1200
@@ -25,7 +25,7 @@
 ;
 
 expr1 =
-(token("<{") host-language-expression:s token("}>") ->(quasiquote (sequence (unquote s))) | name:prod-exp apply-arguments:arg-exps ->(quasiquote (apply (unquote prod-exp) (unquote-splicing arg-exps))) | token("->") host-language-expression:r ->(quasiquote (action (unquote r))) | token("?") host-language-expression:r ->(quasiquote (action (or (unquote r) (error (quote expected) (quote (unquote r)))))) | literal:x ->(quasiquote (exactly (unquote x))) | token("_") ->(quasiquote (anything)) | token("(") expr:x token(")") ->x | token("{") expr-seq:xs token("}") ->(quasiquote (nest (unquote xs))))
+(token("<{") host-language-expression:s token("}>") ->(quasiquote (sequence (unquote s))) | name:prod-exp apply-arguments:arg-exps ->(quasiquote (apply (unquote prod-exp) (unquote-splicing arg-exps))) | token("->") host-language-expression:r ->(quasiquote (action (unquote r))) | token("?") host-language-expression:r ->(quasiquote (action (or (unquote r) (error)))) | literal:x ->(quasiquote (exactly (unquote x))) | token("_") ->(quasiquote (anything)) | token("(") expr:x token(")") ->x | token("{") expr-seq:xs token("}") ->(quasiquote (nest (unquote xs))))
 ;
 
 apply-arguments =