Merge branch 'master' of git://factorcode.org/git/factor into bags

diff --combined core/syntax/syntax.factor
index 77ef643fe2a28ae08a813c5ce6a114b7f09d917f,6c35a3c5c6a47c26d3a84903722123957dfbde8b..84a753fb1b58f4846a787d7c19b17547412fd040
--- 1/core/syntax/syntax.factor
--- 2/core/syntax/syntax.factor
+++ b/core/syntax/syntax.factor
@@@ -8,7 -8,7 +8,7 @@@ generic.standard generic.hook generic.m
  io.pathnames vocabs vocabs.parser classes.parser classes.union
  classes.intersection classes.mixin classes.predicate
  classes.singleton classes.tuple.parser compiler.units
 -combinators effects.parser slots ;
 +combinators effects.parser slots hash-sets ;
  IN: bootstrap.syntax
  
  ! These words are defined as a top-level form, instead of with
@@@ -51,7 -51,7 +51,7 @@@
  
      "UNUSE:" [ scan unuse-vocab ] define-core-syntax
  
-     "USING:" [ ";" parse-tokens [ use-vocab ] each ] define-core-syntax
+     "USING:" [ ";" [ use-vocab ] each-token ] define-core-syntax
  
      "QUALIFIED:" [ scan dup add-qualified ] define-core-syntax
  
@@@ -104,7 -104,6 +104,7 @@@
      "H{" [ \ } [ >hashtable ] parse-literal ] define-core-syntax
      "T{" [ parse-tuple-literal suffix! ] define-core-syntax
      "W{" [ \ } [ first <wrapper> ] parse-literal ] define-core-syntax
 +    "HS{" [ \ } [ <hash-set> ] parse-literal ] define-core-syntax
  
      "POSTPONE:" [ scan-word suffix! ] define-core-syntax
      "\\" [ scan-word <wrapper> suffix! ] define-core-syntax
@@@ -125,13 -124,11 +125,11 @@@
      ] define-core-syntax
  
      "SYMBOLS:" [
-         ";" parse-tokens
-         [ create-in dup reset-generic define-symbol ] each
+         ";" [ create-in dup reset-generic define-symbol ] each-token
      ] define-core-syntax
  
      "SINGLETONS:" [
-         ";" parse-tokens
-         [ create-class-in define-singleton-class ] each
+         ";" [ create-class-in define-singleton-class ] each-token
      ] define-core-syntax
  
      "DEFER:" [