steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parser: auto-use prefers non-private words to private words

db4
Slava Pestov 2010-02-22 19:15:53 +13:00
parent bb06e4671a
commit db3a23ffe0
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/parser/parser.factor
View File

@ -1,4 +1,4 @@
! Copyright (C) 2005, 2009 Slava Pestov. ! Copyright (C) 2005, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: arrays definitions generic assocs kernel math namespaces USING: arrays definitions generic assocs kernel math namespaces
sequences strings vectors words words.symbol quotations io sequences strings vectors words words.symbol quotations io
@ -33,11 +33,19 @@ SYMBOL: auto-use?
[ "Added \"" "\" vocabulary to search path" surround note. ] bi [ "Added \"" "\" vocabulary to search path" surround note. ] bi
] [ create-in ] if ; ] [ create-in ] if ;
: ignore-forwards ( seq -- seq' )
[ forward-reference? not ] filter ;
: private? ( word -- ? ) vocabulary>> ".private" tail? ;
: ignore-privates ( seq -- seq' )
dup [ private? ] all? [ [ private? not ] filter ] unless ;
: no-word ( name -- newword ) : no-word ( name -- newword )
dup words-named [ forward-reference? not ] filter dup words-named ignore-forwards
dup length 1 = auto-use? get and dup ignore-privates dup length 1 = auto-use? get and
[ nip first no-word-restarted ] [ 2nip first no-word-restarted ]
[ <no-word-error> throw-restarts no-word-restarted ] [ drop <no-word-error> throw-restarts no-word-restarted ]
if ; if ;
: parse-word ( string -- word/number ) : parse-word ( string -- word/number )