using the new H{ } make.

[factor.git] / basis / locals / parser / parser.factor

diff --git a/basis/locals/parser/parser.factor b/basis/locals/parser/parser.factor
index 861ffa54453b5fb196e809d6d70b6349408f246b..0bb47586c29d791228e70dee7f100fb16bc8f7a2 100644 (file)
--- a/basis/locals/parser/parser.factor
+++ b/basis/locals/parser/parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2009 Slava Pestov, Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators effects.parser
+USING: accessors arrays assocs combinators effects.parser
 generic.parser kernel lexer locals.errors fry
 locals.rewrite.closures locals.types make namespaces parser
 quotations sequences splitting words vocabs.parser ;
@@ -14,15 +14,15 @@ SYMBOL: in-lambda?
 : make-local ( name -- word )
     "!" ?tail [
         <local-reader>
-        dup <local-writer> dup name>> set
+        dup <local-writer> dup name>> ,,
     ] [ <local> ] if
-    dup dup name>> set ;
+    dup dup name>> ,, ;
 
 : make-locals ( seq -- words assoc )
-    [ [ make-local ] map ] H{ } make-assoc ;
+    [ [ make-local ] map ] H{ } make ;
 
 : parse-local-defs ( -- words assoc )
-    [ "|" [ make-local ] map-tokens ] H{ } make-assoc ;
+    [ "|" [ make-local ] map-tokens ] H{ } make ;
 
 SINGLETON: lambda-parser
 
@@ -36,7 +36,7 @@ SYMBOL: locals
         [ use-words @ ]
         [ unuse-words ] tri
     ] with-scope ; inline
-    
+
 : (parse-lambda) ( assoc -- quot )
     [ \ ] parse-until >quotation ] ((parse-lambda)) ;
 
@@ -46,10 +46,14 @@ SYMBOL: locals
     ?rewrite-closures ;
 
 : parse-multi-def ( locals -- multi-def )
-    [ ")" [ make-local ] map-tokens ] with-variables <multi-def> ;
+    [ [ ")" [ make-local ] map-tokens ] H{ } make ] dip
+    swap assoc-union! drop <multi-def> ;
 
 : parse-def ( name/paren locals -- def )
-    over "(" = [ nip parse-multi-def ] [ [ make-local ] with-variables <def> ] if ;
+    over "(" =
+    [ nip parse-multi-def ]
+    [ [ [ make-local ] H{ } make ] dip swap assoc-union! drop <def> ]
+    if ;
 
 M: lambda-parser parse-quotation ( -- quotation )
     H{ } clone (parse-lambda) ;