From 225c28f23ac1bf1b449d76da64df42ad6b451223 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 13 Aug 2015 02:53:03 -0700 Subject: [PATCH] compiler.tree.propagation: Fix build error --- .../tree/propagation/call-effect/call-effect-tests.factor | 2 +- .../tree/propagation/call-effect/call-effect.factor | 8 ++++---- basis/compiler/tree/propagation/simple/simple.factor | 2 +- .../tree/propagation/transforms/transforms.factor | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor b/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor index 05e24ca7fc..56d7d72140 100644 --- a/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor +++ b/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor @@ -43,7 +43,7 @@ IN: compiler.tree.propagation.call-effect.tests 2dip rot [ 2drop ] - [ wrong-values ] + [ throw-wrong-values ] if ] ( obj -- a b c ) diff --git a/basis/compiler/tree/propagation/call-effect/call-effect.factor b/basis/compiler/tree/propagation/call-effect/call-effect.factor index 361bb01286..dab787c688 100644 --- a/basis/compiler/tree/propagation/call-effect/call-effect.factor +++ b/basis/compiler/tree/propagation/call-effect/call-effect.factor @@ -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 ; diff --git a/basis/compiler/tree/propagation/simple/simple.factor b/basis/compiler/tree/propagation/simple/simple.factor index 05ad2aeed3..971f79be05 100644 --- a/basis/compiler/tree/propagation/simple/simple.factor +++ b/basis/compiler/tree/propagation/simple/simple.factor @@ -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 diff --git a/basis/compiler/tree/propagation/transforms/transforms.factor b/basis/compiler/tree/propagation/transforms/transforms.factor index e95939b378..749daf9dcd 100644 --- a/basis/compiler/tree/propagation/transforms/transforms.factor +++ b/basis/compiler/tree/propagation/transforms/transforms.factor @@ -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 [