From 2c4f6ffd79643ee56fc2a845f635181cacedac11 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 26 Jan 2009 04:48:50 -0600 Subject: [PATCH 1/3] Fix syndication unit test --- basis/syndication/syndication-tests.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c440b889eaa4e0bc02ab0aa1ed95ff1adb87e2db Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 26 Jan 2009 04:51:59 -0600 Subject: [PATCH 2/3] Fix make-image --- basis/bootstrap/image/image.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 508f9ca5fe3879c84e1d72ecec0ee57109a15ac9 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Mon, 26 Jan 2009 22:00:09 +0100 Subject: [PATCH 3/3] FUEL: string font lock fix. --- misc/fuel/fuel-syntax.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el index a095e70256..7f3e0c46f5 100644 --- a/misc/fuel/fuel-syntax.el +++ b/misc/fuel/fuel-syntax.el @@ -254,9 +254,9 @@ (" \\((\\)( \\([^\n]*\\) )\\()\\)\\( \\|\n\\)" (1 "b")) (" \\((\\) \\([^\n]*\\) \\()\\)\\( \\|\n\\)" (1 "b")) ;; Strings - ("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)[^\n\r\f]*\\(\"\\)\\( \\|\n\\)" + ("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)[^\n\r\f]*?\\(\"\\)\\( \\|\n\\)" (3 "\"") (4 "\"")) - ("\\( \\|^\\)\\(\"\\)[^\n\r\f]*\\(\"\\)\\( \\|\n\\)" (2 "\"") (3 "\"")) + ("\\(\"\\)[^\n\r\f]*?\\(\"\\)\\( \\|\n\\|$\\)" (1 "\"") (2 "\"")) ("\\_<<\\(\"\\)\\_>" (1 "\\_>" (1 ">b")) ;; Multiline constructs