diff --git a/basis/locals/parser/parser.factor b/basis/locals/parser/parser.factor index 0d2e74545e..ea1a07478f 100644 --- 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 5501515199..b25dcbd27c 100644 --- 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 - : 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 42704ed1ca..f781a92e02 100644 --- 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 ;