]> gitweb.factorcode.org Git - factor.git/commitdiff
parser: Cleaner fix, comments. Fixes #1174.
authorDoug Coleman <doug.coleman@gmail.com>
Mon, 27 Oct 2014 19:12:23 +0000 (12:12 -0700)
committerDoug Coleman <doug.coleman@gmail.com>
Mon, 27 Oct 2014 19:12:55 +0000 (12:12 -0700)
core/parser/parser.factor

index 4833e079d1bbf8de7b83ed4dad7888349f7ec011..7f9cfc60acae66a9ac1bd0b61f823aaa7eff2ab4 100644 (file)
@@ -36,14 +36,14 @@ SYMBOL: auto-use?
 
 : private? ( word -- ? ) vocabulary>> ".private" tail? ;
 
+! True branch is a singleton public word with no name conflicts
+! False branch, singleton private words need confirmation regardless
+! of name conflicts
 : no-word ( name -- newword )
     dup words-named ignore-forwards
-    dup length 1 = auto-use? get and
-    [
-        dup first private?
-        [ <no-word-error> throw-restarts no-word-restarted ]
-        [ nip first no-word-restarted ] if
-    ]
+    dup [ length 1 = ] [ first private? not ] bi and
+    auto-use? get and
+    [ nip first no-word-restarted ]
     [ <no-word-error> throw-restarts no-word-restarted ]
     if ;