peg.javascript: fix tests.

diff --git a/extra/peg/javascript/javascript-tests.factor b/extra/peg/javascript/javascript-tests.factor
index b8a13187ee885dc5c9426d5e30b465764b245d99..3fe0ed359cc1238107cce97c34cfeeaed5650558 100644 (file)
--- a/extra/peg/javascript/javascript-tests.factor
+++ b/extra/peg/javascript/javascript-tests.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: kernel tools.test peg.javascript peg.javascript.ast ;
+USING: accessors kernel math peg peg.ebnf peg.ebnf.private
+peg.javascript peg.javascript.private sequences tools.test ;
 
 {
   V{

diff --git a/extra/peg/javascript/javascript.factor b/extra/peg/javascript/javascript.factor
index 65710a30f9c771c7a1fe23f2e92d0efc41cd99c0..46652aace5cefb54472bc54ad056163ac480db9b 100644 (file)
--- a/extra/peg/javascript/javascript.factor
+++ b/extra/peg/javascript/javascript.factor
@@ -174,7 +174,6 @@ tokenizer         = <foreign tokenize-javascript Tok>
 End               = !(.)
 Space             = [ \t\r\n]
 Spaces            = Space* => [[ ignore ]]
-Comment           = "/*" [^*/]* "*/" => [[ ignore ]]
 Name               = . ?[ ast-name?   ]?   => [[ value>> ]]
 Number             = . ?[ ast-number? ]?
 String             = . ?[ ast-string? ]?
@@ -309,7 +308,7 @@ Sc                 = SpacesNoNl (nl | &("}") | End)| ";"
 Binding            =   Name:n "=" Expr:v                      => [[ n v ast-var boa ]]
                      | Name:n                                 => [[ n "undefined" ast-get boa ast-var boa ]]
 Block              = "{" SrcElems:ss "}"                      => [[ ss ]]
-Bindings           = (Binding ("," Binding => [[ second ]])* => [[ first2 swap prefix ]])?
+Bindings           = (Binding (","~ Binding)* => [[ first2 swap prefix ]])?
 For1               =   "var" Bindings => [[ second ]] 
                      | ExprNoIn 
                      | Spaces => [[ "undefined" ast-get boa ]] 
@@ -345,5 +344,5 @@ Stmt               =   Block
 SrcElem            =   "function" Name:n FuncRest:f                  => [[ n f ast-var boa ]]
                      | Stmt
 SrcElems           = SrcElem*                                      => [[ ast-begin boa ]]
-TopLevel           = SrcElems Spaces Comment
+TopLevel           = SrcElems Spaces
 ]=]