factor: fixing merge errors, paths, etc.
Doug Coleman
parent
08763f7f09
commit
fd6f159aed
|
|
@ -53,7 +53,7 @@ load-help? off
|
||||||
|
|
||||||
init-resource-path
|
init-resource-path
|
||||||
|
|
||||||
"resource:basis/bootstrap/stage2.factor"
|
"resource:language/bootstrap/stage2.factor"
|
||||||
dup exists? [
|
dup exists? [
|
||||||
run-file
|
run-file
|
||||||
] [
|
] [
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,17 @@ SYMBOL: add-vocab-root-hook
|
||||||
[
|
[
|
||||||
V{
|
V{
|
||||||
"resource:core"
|
"resource:core"
|
||||||
"resource:basis"
|
"resource:language"
|
||||||
"resource:extra"
|
"resource:collections"
|
||||||
|
"resource:ffi"
|
||||||
|
"resource:libs"
|
||||||
|
"resource:frameworks"
|
||||||
|
"resource:apps"
|
||||||
|
"resource:tools"
|
||||||
|
"resource:webapps"
|
||||||
|
"resource:games"
|
||||||
|
"resource:demos"
|
||||||
|
"resource:benchmarks"
|
||||||
"resource:work"
|
"resource:work"
|
||||||
} clone vocab-roots set-global
|
} clone vocab-roots set-global
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,9 +17,9 @@ IN: colors.constants
|
||||||
[ parse-color ] H{ } map>assoc ;
|
[ parse-color ] H{ } map>assoc ;
|
||||||
|
|
||||||
MEMO: colors ( -- assoc )
|
MEMO: colors ( -- assoc )
|
||||||
"resource:basis/colors/constants/rgb.txt"
|
"vocab:colors/constants/rgb.txt"
|
||||||
"resource:basis/colors/constants/factor-colors.txt"
|
"vocab:colors/constants/factor-colors.txt"
|
||||||
"resource:basis/colors/constants/solarized-colors.txt"
|
"vocab:colors/constants/solarized-colors.txt"
|
||||||
[ utf8 file-lines parse-colors ] tri@ assoc-union assoc-union ;
|
[ utf8 file-lines parse-colors ] tri@ assoc-union assoc-union ;
|
||||||
|
|
||||||
PRIVATE>
|
PRIVATE>
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue