]> gitweb.factorcode.org Git - factor.git/commitdiff
compiler.tree.propagation: Fix build error
authorDoug Coleman <doug.coleman@gmail.com>
Thu, 13 Aug 2015 09:53:03 +0000 (02:53 -0700)
committerDoug Coleman <doug.coleman@gmail.com>
Thu, 13 Aug 2015 09:53:03 +0000 (02:53 -0700)
basis/compiler/tree/propagation/call-effect/call-effect-tests.factor
basis/compiler/tree/propagation/call-effect/call-effect.factor
basis/compiler/tree/propagation/simple/simple.factor
basis/compiler/tree/propagation/transforms/transforms.factor

index 05e24ca7fc4aa665bd3ab456cc9f6523be55bfd3..56d7d721400e18c19c5bb08c5c5234ca27c50883 100644 (file)
@@ -43,7 +43,7 @@ IN: compiler.tree.propagation.call-effect.tests
             2dip
             rot
             [ 2drop ]
-            [ wrong-values ]
+            [ throw-wrong-values ]
             if
         ]
         ( obj -- a b c )
index 361bb012867334eefd5c0b32b0258ee6d9999699..dab787c6880c593b98026b351ea87ef51a3f8546 100644 (file)
@@ -146,14 +146,14 @@ ERROR: uninferable ;
 : (infer-value) ( value-info -- effect )
     dup literal?>> [
         literal>>
-        [ callable? [ uninferable ] unless ]
-        [ already-inlined-quot? [ uninferable ] when ]
-        [ safe-infer dup +unknown+ = [ uninferable ] when ] tri
+        [ callable? [ throw-uninferable ] unless ]
+        [ already-inlined-quot? [ throw-uninferable ] when ]
+        [ safe-infer dup +unknown+ = [ throw-uninferable ] when ] tri
     ] [
         dup class>> {
             { \ curry [ slots>> third (infer-value) remove-effect-input ] }
             { \ compose [ slots>> last2 [ (infer-value) ] bi@ compose-effects ] }
-            [ uninferable ]
+            [ throw-uninferable ]
         } case
     ] if ;
 
index 05ad2aeed34afdad7cdedfa55a2e735ac909d6f7..971f79be053f11c69436efb987360711500dcb09 100644 (file)
@@ -73,7 +73,7 @@ ERROR: invalid-outputs #call infos ;
 
 : check-outputs ( #call infos -- infos )
     over out-d>> over [ length ] bi@ =
-    [ nip ] [ invalid-outputs ] if ;
+    [ nip ] [ throw-invalid-outputs ] if ;
 
 : call-outputs-quot ( #call word -- infos )
     dupd
index e95939b378f170679b34fee74c21e50accc86fae..749daf9dcd6a3bc1a55966e36f0501ebb6222f6b 100644 (file)
@@ -164,7 +164,7 @@ ERROR: bad-partial-eval quot word ;
 
 : check-effect ( quot word -- )
     2dup [ infer ] [ stack-effect ] bi* effect<=
-    [ 2drop ] [ bad-partial-eval ] if ;
+    [ 2drop ] [ throw-bad-partial-eval ] if ;
 
 :: define-partial-eval ( word quot n -- )
     word [