diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor index 08c75fec34..cb8c0ef538 100644 --- a/basis/bootstrap/image/image.factor +++ b/basis/bootstrap/image/image.factor @@ -8,7 +8,7 @@ vectors words quotations assocs system layouts splitting grouping growable classes classes.builtin classes.tuple classes.tuple.private words.private vocabs vocabs.loader source-files definitions debugger -quotations.private sequences.private combinators combinators.smart +quotations.private sequences.private combinators math.order math.private accessors slots.private compiler.units fry ; IN: bootstrap.image @@ -95,7 +95,7 @@ SYMBOL: objects SYMBOL: sub-primitives : make-jit ( quot rc rt offset -- quad ) - [ [ { } make ] 3dip ] output>array ; inline + [ { } make ] 3dip 4array ; inline : jit-define ( quot rc rt offset name -- ) [ make-jit ] dip set ; inline diff --git a/basis/interpolate/interpolate.factor b/basis/interpolate/interpolate.factor index 778f94ab6f..5c859f8947 100644 --- a/basis/interpolate/interpolate.factor +++ b/basis/interpolate/interpolate.factor @@ -30,14 +30,14 @@ TUPLE: interpolate-var name ; if ] map [ ] join ; inline -: interpolate-locals ( string -- quot ) - [ search [ ] ] (interpolate) ; - PRIVATE> MACRO: interpolate ( string -- ) [ [ get ] ] (interpolate) ; +: interpolate-locals ( string -- quot ) + [ search [ ] ] (interpolate) ; + : I[ "]I" parse-multiline-string interpolate-locals over push-all ; parsing diff --git a/basis/syndication/syndication-tests.factor b/basis/syndication/syndication-tests.factor index 4fbfee03d9..8cfdc9e1d5 100644 --- a/basis/syndication/syndication-tests.factor +++ b/basis/syndication/syndication-tests.factor @@ -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 xml>string drop ] unit-test +[ ] [ "resource:basis/syndication/test/atom.xml" load-news-file feed>xml xml>string drop ] unit-test