]> gitweb.factorcode.org Git - factor.git/blobdiff - core/effects/parser/parser.factor
change ERROR: words from throw-foo back to foo.
[factor.git] / core / effects / parser / parser.factor
index aed4e2f3ea0e1ff445a29a61758a578034ad50af..2a9246c1b234ebad14962bfb7f2644b91604fa94 100644 (file)
@@ -21,8 +21,8 @@ SYMBOL: effect-var
 
 : parse-effect-var ( first? var name -- var )
     nip
-    [ ":" ?tail [ throw-row-variable-can't-have-type ] when ] curry
-    [ throw-invalid-row-variable ] if ;
+    [ ":" ?tail [ row-variable-can't-have-type ] when ] curry
+    [ invalid-row-variable ] if ;
 
 : parse-effect-value ( token -- value )
     ":" ?tail [ scan-object 2array ] when ;
@@ -31,8 +31,8 @@ PRIVATE>
 : parse-effect-token ( first? var end -- var more? )
     scan-token {
         { [ end-token? ] [ drop nip f ] }
-        { [ effect-opener? ] [ throw-bad-effect ] }
-        { [ effect-closer? ] [ throw-stack-effect-omits-dashes ] }
+        { [ effect-opener? ] [ bad-effect ] }
+        { [ effect-closer? ] [ stack-effect-omits-dashes ] }
         { [ row-variable? ] [ parse-effect-var t ] }
         [ [ drop ] 2dip parse-effect-value , t ]
     } cond ;