fix stack effect of n*quot, use iota in core/slots

diff --git a/basis/generalizations/generalizations-docs.factor b/basis/generalizations/generalizations-docs.factor
index 2088e468c64593800b8d869e335f6b618ceb6bfa..36715111940242937ab1e43d6976993a4151f139 100644 (file)
--- a/basis/generalizations/generalizations-docs.factor
+++ b/basis/generalizations/generalizations-docs.factor
@@ -272,8 +272,8 @@ HELP: nweave
 \r
 HELP: n*quot\r
 { $values\r
-     { "n" integer } { "seq" sequence }\r
-     { "seq'" sequence }\r
+     { "n" integer } { "quot" quotation }\r
+     { "quot'" quotation }\r
 }\r
 { $examples\r
     { $example "USING: generalizations prettyprint math ;"\r

diff --git a/basis/generalizations/generalizations.factor b/basis/generalizations/generalizations.factor
index 0aa042d4f2e7056159d3d1775c8fd31853fc5808..637f958eb5a436d57972f6afecdad21eba45efdc 100644 (file)
--- a/basis/generalizations/generalizations.factor
+++ b/basis/generalizations/generalizations.factor
@@ -7,7 +7,7 @@ IN: generalizations
 
 <<
 
-: n*quot ( n seq -- seq' ) <repetition> concat >quotation ;
+: n*quot ( n quot -- seq' ) <repetition> concat >quotation ;
 
 : repeat ( n obj quot -- ) swapd times ; inline
 
@@ -94,4 +94,4 @@ MACRO: nweave ( n -- )
 : nappend-as ( n exemplar -- seq )
     [ narray concat ] dip like ; inline
 
-: nappend ( n -- seq ) narray concat ; inline
\ No newline at end of file
+: nappend ( n -- seq ) narray concat ; inline

diff --git a/core/slots/slots.factor b/core/slots/slots.factor
index a353f5094736da78b96f07ec3cdd928870bbb0c8..63c0319c1ce429251258b010169ccd47d83f941c 100755 (executable)
--- a/core/slots/slots.factor
+++ b/core/slots/slots.factor
@@ -222,7 +222,7 @@ M: slot-spec make-slot
     [ make-slot ] map ;
 
 : finalize-slots ( specs base -- specs )
-    over length [ + ] with map [ >>offset ] 2map ;
+    over length iota [ + ] with map [ >>offset ] 2map ;
 
 : slot-named ( name specs -- spec/f )
     [ name>> = ] with find nip ;