Fixing stack effects of things that use TAGS:

diff --git a/basis/xml-rpc/xml-rpc.factor b/basis/xml-rpc/xml-rpc.factor
index 304f7400fadcd46b9c81902e66e1291e5e8ec6f1..24dfabc8ffcbd1ed26a70f0bbd5772d6e2d53085 100644 (file)
--- a/basis/xml-rpc/xml-rpc.factor
+++ b/basis/xml-rpc/xml-rpc.factor
@@ -178,5 +178,5 @@ TAG: array xml>item
     ! This needs to do something in the event of an error
     [ send-rpc ] dip http-post nip string>xml receive-rpc ;
 
-: invoke-method ( params method url -- )
+: invoke-method ( params method url -- response )
     [ swap <rpc-method> ] dip post-rpc ;

diff --git a/extra/4DNav/space-file-decoder/space-file-decoder.factor b/extra/4DNav/space-file-decoder/space-file-decoder.factor
index bd3915cb365fd8307668c3d07acfef02eaf439d8..ecc8f778fa8f83706d27d4c1735b0dedb050643f 100755 (executable)
--- a/extra/4DNav/space-file-decoder/space-file-decoder.factor
+++ b/extra/4DNav/space-file-decoder/space-file-decoder.factor
@@ -8,7 +8,7 @@ IN: 4DNav.space-file-decoder
 : decode-number-array ( x -- y )  \r
     "," split [ string>number ] map ;\r
 \r
-TAGS: adsoda-read-model ( tag -- )\r
+TAGS: adsoda-read-model ( tag -- model )\r
 \r
 TAG: dimension adsoda-read-model \r
     children>> first string>number ;\r
@@ -56,11 +56,9 @@ TAG: space adsoda-read-model
 ;\r
 \r
 : read-model-file ( path -- x )\r
-  dup\r
-  [\r
-    [ file>xml "space" tags-named first adsoda-read-model ] \r
-    [ drop <space> ] recover \r
-  ] [  drop <space> ] if \r
-\r
+    [\r
+        [ file>xml "space" tag-named adsoda-read-model ] \r
+        [ 2drop <space> ] recover \r
+    ] [ <space> ] if*\r
 ;\r
 \r