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

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

db4
John Benediktsson 2008-09-17 23:11:08 -07:00
parent e966330bbb 562118e158
commit 076d30b78f
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
basis/bootstrap/image/image.factor
View File

@ -26,7 +26,6 @@ IN: bootstrap.image
"x86.32" "x86.32"
"x86.64" "x86.64"
"linux-ppc" "macosx-ppc" "linux-ppc" "macosx-ppc"
! "arm"
} ; } ;
<PRIVATE <PRIVATE
@ -412,14 +411,14 @@ M: quotation '
all-words [ emit-word ] each ; all-words [ emit-word ] each ;
: emit-global ( -- ) : emit-global ( -- )
[ {
{ dictionary source-files builtins
dictionary source-files builtins update-map implementors-map
update-map implementors-map class<=-cache } [ [ bootstrap-word ] [ get ] bi ] H{ } map>assoc
class-not-cache classes-intersect-cache class-and-cache {
class-or-cache class<=-cache class-not-cache classes-intersect-cache
} [ dup get swap bootstrap-word set ] each class-and-cache class-or-cache
] H{ } make-assoc } [ H{ } clone ] H{ } map>assoc assoc-union
bootstrap-global set bootstrap-global set
bootstrap-global emit-userenv ; bootstrap-global emit-userenv ;

8
core/io/files/files.factor
View File

@ -192,11 +192,13 @@ PRIVATE>
SYMBOL: current-directory SYMBOL: current-directory
[ cwd current-directory set-global ] "io.files" add-init-hook [
cwd current-directory set-global
image parent-directory cwd prepend-path "resource-path" set
] "io.files" add-init-hook
: resource-path ( path -- newpath ) : resource-path ( path -- newpath )
"resource-path" get [ image parent-directory ] unless* "resource-path" get prepend-path ;
prepend-path ;
: (normalize-path) ( path -- path' ) : (normalize-path) ( path -- path' )
"resource:" ?head [ "resource:" ?head [