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

fuel.eval: fixing the manifest gunk more 

Some FUEL features doesn't ship a correct usings list so you need to use
the current manifests vocabs.
modern-harvey2
Björn Lindqvist 2017-06-26 03:46:07 +02:00
parent be31d22797
commit 08354f638f
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extra/fuel/eval/eval.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2009 Jose Antonio Ortega Ruiz. ! Copyright (C) 2009 Jose Antonio Ortega Ruiz.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: arrays continuations debugger fuel.pprint io io.streams.string USING: accessors arrays continuations debugger fuel.pprint io
kernel listener namespaces parser.notes prettyprint.config sequences io.streams.string kernel listener namespaces parser.notes
vocabs.parser ; prettyprint.config sequences sets vocabs.parser ;
IN: fuel.eval IN: fuel.eval
SYMBOL: restarts-stack SYMBOL: restarts-stack
@ -46,14 +46,22 @@ t eval-res-flag set-global
: eval-in ( in -- ) : eval-in ( in -- )
[ set-current-vocab ] when* ; [ set-current-vocab ] when* ;
: eval-in-context ( lines in usings -- ) : eval-in-context ( lines in usings/f -- )
begin-eval begin-eval
[ [
parser-quiet? on parser-quiet? on
[
! The idea is that a correct usings list should always be
! specified. But a lot of code in FUEL sends empty usings
! lists so then we have to use the current manifests
! vocabs instead.
manifest get search-vocab-names>> members
] [
! These vocabs are always needed in the manifest. syntax for ! These vocabs are always needed in the manifest. syntax for
! obvious reasons, fuel for FUEL stuff and debugger for the :N ! obvious reasons, fuel for FUEL stuff and debugger for the :N
! words. ! words.
{ "fuel" "syntax" "debugger" } prepend { "fuel" "syntax" "debugger" } prepend
<manifest> manifest set ] if-empty
<manifest> manifest namespaces:set
[ eval-usings eval-in eval ] with-string-writer [ eval-usings eval-in eval ] with-string-writer
] with-scope end-eval ; ] with-scope end-eval ;