macros: check macro effect is real-macro-effect.

diff --git a/basis/macros/macros-tests.factor b/basis/macros/macros-tests.factor
index 58c1de3dadc9f98938b322fd3d95df325be622c3..f02ea299f7aca2192985c59cfea7117e69ad9a6c 100644 (file)
--- a/basis/macros/macros-tests.factor
+++ b/basis/macros/macros-tests.factor
@@ -20,7 +20,7 @@ unit-test
 
 { f } [ \ see-test macro? ] unit-test
 
-{ } [ "USING: macros stack-checker kernel ; IN: hanging-macro MACRO: c ( quot -- ) infer drop [ ] ;" eval( -- ) ] unit-test
+{ } [ "USING: macros stack-checker kernel ; IN: hanging-macro MACRO: c ( quot -- quot ) infer drop [ ] ;" eval( -- ) ] unit-test
 { } [ "USING: macros kernel ; IN: hanging-macro : a ( -- ) [ a ] c ;" eval( -- ) ] unit-test
 
 { } [ [ "hanging-macro" forget-vocab ] with-compilation-unit ] unit-test

diff --git a/basis/macros/macros.factor b/basis/macros/macros.factor
index 31ef0e4037024369876345eed0dae83b20fed775..9b17ba04264f29260f24268d4938c9b343405c19 100644 (file)
--- a/basis/macros/macros.factor
+++ b/basis/macros/macros.factor
@@ -9,13 +9,18 @@ IN: macros
 : real-macro-effect ( effect -- effect' )
     in>> { "quot" } <effect> ;
 
+: check-macro-effect ( word effect -- )
+    [ real-macro-effect ] keep 2dup effect=
+    [ 3drop ] [ bad-stack-effect ] if ;
+
 PRIVATE>
 
 : define-macro ( word definition effect -- )
-    real-macro-effect {
+    {
+        [ nip check-macro-effect ]
         [
             [ '[ _ _ call-effect ] ] keep
-            [ memoize-quot '[ @ call ] ] keep
+            [ memoize-quot ] keep
             define-declared
         ]
         [ drop "macro" set-word-prop ]