over push -> suffix!, over push-all -> append!

[factor.git] / basis / classes / struct / struct.factor

diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor
index 417f188c3ce9eda249ba44898043382ce3b2b54f..d5e5fdc6c3d6badfb673aea3c2ec1cfd63ca84c9 100755 (executable)
--- a/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor
@@ -350,7 +350,7 @@ PRIVATE>
 : parse-struct-slots ( slots -- slots' more? )
     scan {
         { ";" [ f ] }
-        { "{" [ parse-struct-slot over push t ] }
+        { "{" [ parse-struct-slot suffix! t ] }
         { f [ unexpected-eof ] }
         [ invalid-struct-slot ]
     } case ;
@@ -378,7 +378,7 @@ SYNTAX: S@
 
 : parse-struct-slot` ( accum -- accum )
     scan-string-param scan-c-type` \ } parse-until
-    [ <struct-slot-spec> over push ] 3curry over push-all ;
+    [ <struct-slot-spec> suffix! ] 3curry append! ;
 
 : parse-struct-slots` ( accum -- accum more? )
     scan {
@@ -390,9 +390,9 @@ PRIVATE>
 
 FUNCTOR-SYNTAX: STRUCT:
     scan-param suffix!
-    [ 8 <vector> ] over push-all
+    [ 8 <vector> ] append!
     [ parse-struct-slots` ] [ ] while
-    [ >array define-struct-class ] over push-all ;
+    [ >array define-struct-class ] append! ;
 
 USING: vocabs vocabs.loader ;