New utility word: complete-effect

basis/constructors/constructors.factor

@@ -18,6 +18,6 @@ MACRO: set-slots ( slots -- quot )
 
 SYNTAX: CONSTRUCTOR:
     scan-word [ name>> "<" ">" surround create-in ] keep
-    "(" expect ")" parse-effect
+    complete-effect
     parse-definition
     define-constructor ;

basis/functors/functors.factor

@@ -42,7 +42,7 @@ M: object fake-quotations> ;
     parse-definition >fake-quotations parsed \ fake-quotations> parsed ;
 
 : parse-declared* ( accum -- accum )
-    "(" expect ")" parse-effect
+    complete-effect
     [ parse-definition* ] dip
     parsed ;
 
@@ -71,7 +71,7 @@ SYNTAX: `M:
 SYNTAX: `C:
     scan-param parsed
     scan-param parsed
-    "(" expect ")" parse-effect
+    complete-effect
     [ [ [ boa ] curry ] over push-all ] dip parsed
     \ define-declared* parsed ;
 

basis/locals/parser/parser.factor

@@ -104,7 +104,7 @@ M: lambda-parser parse-quotation ( -- quotation )
     (parse-lambda) <wlet> ?rewrite-closures ;
 
 : parse-locals ( -- effect vars assoc )
-    "(" expect ")" parse-effect
+    complete-effect
     dup
     in>> [ dup pair? [ first ] when ] map make-locals ;
 

core/effects/parser/parser.factor

@@ -27,5 +27,8 @@ ERROR: bad-effect ;
     parse-effect-tokens { "--" } split1 dup
     [ <effect> ] [ "Stack effect declaration must contain --" throw ] if ;
 
+: complete-effect ( -- effect )
+    "(" expect ")" parse-effect ;
+
 : parse-call( ( accum word -- accum )
     [ ")" parse-effect ] dip 2array over push-all ;

core/parser/parser.factor

@@ -134,7 +134,7 @@ M: f parse-quotation \ ] parse-until >quotation ;
 
 : (:) ( -- word def effect )
     CREATE-WORD
-    "(" expect ")" parse-effect
+    complete-effect
     parse-definition swap ;
 
 ERROR: bad-number ;