]> gitweb.factorcode.org Git - factor.git/commitdiff
Fixing libraries for language changes
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 29 Aug 2008 03:28:01 +0000 (22:28 -0500)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 29 Aug 2008 03:28:01 +0000 (22:28 -0500)
basis/io/servers/connection/connection.factor
basis/xml/generator/generator.factor
basis/xml/xml.factor
extra/math/matrices/elimination/elimination.factor
extra/syndication/syndication.factor

index fa0e2f515d9a451a71ee76d45a9948167a4d810a..041cff72ba8fdee0094d13e3ab3cab59bb1b8790 100755 (executable)
@@ -87,7 +87,7 @@ M: threaded-server handle-client* handler>> call ;
         [ [ accept-connection ] with-semaphore ]
         [ accept-connection ]
         if*
-    ] [ accept-loop ] bi ; inline
+    ] [ accept-loop ] bi ; inline recursive
 
 : started-accept-loop ( server -- )
     threaded-server get
index bf4bd618b76d83f72b63d89ced4387ba87d9bfa4..d5cf4dac4010e01adabfb627294d2cc55c2ea04c 100644 (file)
@@ -27,7 +27,7 @@ IN: xml.generator
 
 ! Word-based XML literal syntax
 : parsed-name ( accum -- accum )
-    scan ":" split1 [ f <name> ] [ <name-tag> ] if* parsed ;
+    scan ":" split1 [ f <name> ] [ <simple-name> ] if* parsed ;
 
 : run-combinator ( accum quot1 quot2 -- accum )
     >r [ ] like parsed r> [ parsed ] each ;
index 6b64aff2572ac3ca3ffacc1626628a2380b0a26b..67168bfb4955e4453f88b8e730ccfde8aba58ed0 100644 (file)
@@ -127,17 +127,17 @@ TUPLE: pull-xml scope ;
 : call-under ( quot object -- quot )
     swap dup slip ; inline
 
-: sax-loop ( quot -- ) ! quot: xml-elem --
+: sax-loop ( quot: ( xml-elem -- ) -- )
     parse-text call-under
     get-char [ make-tag call-under sax-loop ]
-    [ drop ] if ; inline
+    [ drop ] if ; inline recursive
 
-: sax ( stream quot -- ) ! quot: xml-elem --
+: sax ( stream quot: ( xml-elem -- ) -- )
     swap [
         reset-prolog init-ns-stack
         prolog-data get call-under
         sax-loop
-    ] state-parse ; inline
+    ] state-parse ; inline recursive
 
 : (read-xml) ( -- )
     [ process ] sax-loop ; inline
index d4cab29f6af6b79da6d5080e59dd81d7e94e9db6..6e83a61eb325d996ec82be6bce3fee551d832c0e 100755 (executable)
@@ -31,10 +31,10 @@ SYMBOL: matrix
     >r over r> nth dup zero? [
         3drop 0
     ] [
-        >r nth dup zero? [
-            r> 2drop 0
+        >r nth dup zero? r> swap [
+            2drop 0
         ] [
-            r> swap / neg
+            swap / neg
         ] if
     ] if ;
 
index 8d4c91177accf230a7a750251ae826314f8cfd45..2fa8abcd59e1599410ff15ff8ed151de6374f34f 100644 (file)
@@ -76,8 +76,8 @@ TUPLE: entry title url description date ;
         [ "link" tag-named "href" swap at >url >>url ]
         [
             { "content" "summary" } any-tag-named
-            dup tag-children [ string? not ] contains?
-            [ tag-children [ write-chunk ] with-string-writer ]
+            dup children>> [ string? not ] contains?
+            [ children>> [ write-chunk ] with-string-writer ]
             [ children>string ] if >>description
         ]
         [
@@ -96,7 +96,7 @@ TUPLE: entry title url description date ;
     tri ;
 
 : xml>feed ( xml -- feed )
-    dup name-tag {
+    dup main>> {
         { "RDF" [ rss1.0 ] }
         { "rss" [ rss2.0 ] }
         { "feed" [ atom1.0 ] }