core: in-definition -> with-definition.

diff --git a/basis/locals/parser/parser.factor b/basis/locals/parser/parser.factor
index 0d2e74545e677d3841380a58e6b73356bfe3f247..ea1a07478fb5c751b52e659b045ec63c56d88cde 100644 (file)
--- a/basis/locals/parser/parser.factor
+++ b/basis/locals/parser/parser.factor
@@ -90,7 +90,7 @@ M: lambda-parser parse-quotation ( -- quotation )
         scan-new-word
         [ parse-definition ]
         parse-locals-definition
-    ] in-definition ;
+    ] with-definition ;
 
 : (M::) ( -- word def )
     [
@@ -99,4 +99,4 @@ M: lambda-parser parse-quotation ( -- quotation )
             [ parse-definition ]
             parse-locals-method-definition drop
         ] with-method-definition
-    ] in-definition ;
+    ] with-definition ;

diff --git a/core/effects/parser/parser.factor b/core/effects/parser/parser.factor
index 5501515199e60ae927d790f38b4d0b236ebbb27c..b25dcbd27c737506e0f675a25be76e73479cef89 100644 (file)
--- a/core/effects/parser/parser.factor
+++ b/core/effects/parser/parser.factor
@@ -13,8 +13,6 @@ ERROR: stack-effect-omits-dashes ;
 
 SYMBOL: effect-var
 
-SYMBOL: in-definition
-
 <PRIVATE
 : end-token? ( end token -- token ? ) [ nip ] [ = ] 2bi ; inline
 : effect-opener? ( token -- token ? ) dup { f "(" "((" "--" } member? ; inline
@@ -54,12 +52,14 @@ PRIVATE>
 : parse-call( ( accum word -- accum )
     [ ")" parse-effect ] dip 2array append! ;
 
+SYMBOL: in-definition
+
 ERROR: can't-nest-definitions word ;
 
 : check-in-definition ( -- )
     in-definition get [ word can't-nest-definitions ] when ;
 
-: in-definition ( quot -- )
+: with-definition ( quot -- )
     [ check-in-definition t in-definition ] dip with-variable ; inline
 
 : (:) ( -- word def effect )
@@ -67,4 +67,4 @@ ERROR: can't-nest-definitions word ;
         scan-new-word
         scan-effect
         parse-definition swap
-    ] in-definition ;
+    ] with-definition ;

diff --git a/core/generic/parser/parser.factor b/core/generic/parser/parser.factor
index 42704ed1caf5cba96c6e858d609b1bea26ab1fc7..f781a92e02b0359ea356a75e34897bfeb75a1fd3 100644 (file)
--- a/core/generic/parser/parser.factor
+++ b/core/generic/parser/parser.factor
@@ -56,4 +56,4 @@ PRIVATE>
 : (M:) ( -- method def )
     [
         scan-new-method [ parse-method-definition ] with-method-definition
-    ] in-definition ;
+    ] with-definition ;