effect-variable -> row-variable

diff --git a/core/effects/effects-tests.factor b/core/effects/effects-tests.factor
index af4675d6f20405647e893515412e23f820ef5cd1..4dd5502046db6764bf839a973399a5a2437fb98d 100644 (file)
--- a/core/effects/effects-tests.factor
+++ b/core/effects/effects-tests.factor
@@ -38,7 +38,7 @@ IN: effects.tests
 [ { "e" } ] [ (( ..a b c -- ..d e )) out>> ] unit-test
 
 [ "(( a ..b c -- d ))" eval( -- effect ) ]
-[ error>> invalid-effect-variable? ] must-fail-with
+[ error>> invalid-row-variable? ] must-fail-with
 
 [ "(( ..a: integer b c -- d ))" eval( -- effect ) ]
-[ error>> effect-variable-can't-have-type? ] must-fail-with
+[ error>> row-variable-can't-have-type? ] must-fail-with

diff --git a/core/effects/parser/parser.factor b/core/effects/parser/parser.factor
index 2748df4bc8c7d67a0e7e53db12964533f0b677e5..cd484ddd2e6113dd8636889d6fe0775eb3129ba2 100644 (file)
--- a/core/effects/parser/parser.factor
+++ b/core/effects/parser/parser.factor
@@ -7,8 +7,8 @@ IN: effects.parser
 DEFER: parse-effect
 
 ERROR: bad-effect ;
-ERROR: invalid-effect-variable ;
-ERROR: effect-variable-can't-have-type ;
+ERROR: invalid-row-variable ;
+ERROR: row-variable-can't-have-type ;
 ERROR: stack-effect-omits-dashes ;
 
 SYMBOL: effect-var
@@ -17,12 +17,12 @@ SYMBOL: effect-var
 : end-token? ( end token -- token ? ) [ nip ] [ = ] 2bi ; inline
 : effect-opener? ( token -- token ? ) dup { f "(" "((" "--" } member? ; inline
 : effect-closer? ( token -- token ? ) dup { ")" "))" } member? ; inline
-: effect-variable? ( token -- token' ? ) ".." ?head ; inline
+: row-variable? ( token -- token' ? ) ".." ?head ; inline
 
 : parse-effect-var ( first? var name -- var )
     nip
-    [ ":" ?tail [ effect-variable-can't-have-type ] when ] curry
-    [ invalid-effect-variable ] if ;
+    [ ":" ?tail [ row-variable-can't-have-type ] when ] curry
+    [ invalid-row-variable ] if ;
 
 : parse-effect-value ( token -- value )
     ":" ?tail [
@@ -39,7 +39,7 @@ PRIVATE>
         { [ end-token? ] [ drop nip f ] }
         { [ effect-opener? ] [ bad-effect ] }
         { [ effect-closer? ] [ stack-effect-omits-dashes ] }
-        { [ effect-variable? ] [ parse-effect-var t ] }
+        { [ row-variable? ] [ parse-effect-var t ] }
         [ [ drop ] 2dip parse-effect-value , t ]
     } cond ;