More JavaScript fixes for keyword handling

diff --git a/extra/peg/javascript/tokenizer/tokenizer.factor b/extra/peg/javascript/tokenizer/tokenizer.factor
index 70fabb10f6a37b27f54484017601a61a95c7713a..a1cff8a3dbae241e355a273063e2419dd8cdbea4 100644 (file)
--- a/extra/peg/javascript/tokenizer/tokenizer.factor
+++ b/extra/peg/javascript/tokenizer/tokenizer.factor
@@ -43,8 +43,8 @@ Keyword           =  ("break"
                     | "var"
                     | "void"
                     | "while"
-                    | "with") 
-Name              = iName !(Keyword) => [[ ast-name boa ]]
+                    | "with") !(NameRest) 
+Name              = !(Keyword) iName  => [[ ast-name boa ]]
 Number            =   Digits:ws '.' Digits:fs => [[ ws "." fs 3array concat >string string>number ast-number boa ]]
                     | Digits => [[ >string string>number ast-number boa ]]