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 2009-01-26 07:34:49 -08:00
parent 28dd81c685 c440b889ea
commit 0deb4af4a5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ vectors words quotations assocs system layouts splitting
grouping growable classes classes.builtin classes.tuple grouping growable classes classes.builtin classes.tuple
classes.tuple.private words.private vocabs classes.tuple.private words.private vocabs
vocabs.loader source-files definitions debugger vocabs.loader source-files definitions debugger
quotations.private sequences.private combinators combinators.smart quotations.private sequences.private combinators
math.order math.private accessors math.order math.private accessors
slots.private compiler.units fry ; slots.private compiler.units fry ;
IN: bootstrap.image IN: bootstrap.image
@ -95,7 +95,7 @@ SYMBOL: objects
SYMBOL: sub-primitives SYMBOL: sub-primitives
: make-jit ( quot rc rt offset -- quad ) : make-jit ( quot rc rt offset -- quad )
[ [ { } make ] 3dip ] output>array ; inline [ { } make ] 3dip 4array ; inline
: jit-define ( quot rc rt offset name -- ) : jit-define ( quot rc rt offset name -- )
[ make-jit ] dip set ; inline [ make-jit ] dip set ; inline

6
basis/interpolate/interpolate.factor
View File

@ -30,14 +30,14 @@ TUPLE: interpolate-var name ;
if if
] map [ ] join ; inline ] map [ ] join ; inline
: interpolate-locals ( string -- quot )
[ search [ ] ] (interpolate) ;
PRIVATE> PRIVATE>
MACRO: interpolate ( string -- ) MACRO: interpolate ( string -- )
[ [ get ] ] (interpolate) ; [ [ get ] ] (interpolate) ;
: interpolate-locals ( string -- quot )
[ search [ ] ] (interpolate) ;
: I[ : I[
"]I" parse-multiline-string "]I" parse-multiline-string
interpolate-locals over push-all ; parsing interpolate-locals over push-all ; parsing

2
basis/syndication/syndication-tests.factor
View File

@ -43,4 +43,4 @@ IN: syndication.tests
} }
} }
} ] [ "resource:basis/syndication/test/atom.xml" load-news-file ] unit-test } ] [ "resource:basis/syndication/test/atom.xml" load-news-file ] unit-test
[ ] [ "resource:basis/syndication/test/atom.xml" load-news-file xml>string drop ] unit-test [ ] [ "resource:basis/syndication/test/atom.xml" load-news-file feed>xml xml>string drop ] unit-test