Merge branch 'master' of git://factorcode.org/git/littledan

core/parser/parser.factor

@@ -366,6 +366,10 @@ ERROR: bad-number ;
 
 : (M:) CREATE-METHOD parse-definition ;
 
+: scan-object ( -- object )
+    scan-word dup parsing?
+    [ V{ } clone swap execute first ] when ;
+
 GENERIC: expected>string ( obj -- str )
 
 M: f expected>string drop "end of input" ;

core/syntax/syntax.factor

@@ -171,9 +171,7 @@ IN: bootstrap.syntax
     ] define-syntax
 
     "FORGET:" [
-        scan-word
+        scan-object forget
-        dup parsing? [ V{ } clone swap execute first ] when
-        forget
     ] define-syntax
 
     "(" [

extra/help/syntax/syntax.factor

@@ -16,6 +16,4 @@ IN: help.syntax
     over add-article >link r> remember-definition ; parsing
 
 : ABOUT:
-    scan-word dup parsing? [
+    scan-object in get vocab set-vocab-help ; parsing
-        V{ } clone swap execute first
-    ] when in get vocab set-vocab-help ; parsing

extra/tuple-syntax/tuple-syntax.factor

@@ -5,9 +5,6 @@ IN: tuple-syntax
 ! TUPLE: foo bar baz ;
 ! TUPLE{ foo bar: 1 baz: 2 }
 
-: parse-object ( -- object )
-    scan-word dup parsing? [ V{ } clone swap execute first ] when ;
-
 : parse-slot-writer ( tuple -- slot# )
     scan dup "}" = [ 2drop f ] [
         1 head* swap object-slots slot-named slot-spec-offset
@@ -15,7 +12,7 @@ IN: tuple-syntax
 
 : parse-slots ( accum tuple -- accum tuple )
     dup parse-slot-writer
-    [ parse-object pick rot set-slot parse-slots ] when* ;
+    [ scan-object pick rot set-slot parse-slots ] when* ;
 
 : TUPLE{
     scan-word construct-empty parse-slots parsed ; parsing