Changeset 488

Timestamp:

10/18/07 04:20:02 (12 months ago)

Author:

krobillard

Message:

Added push & pop.

Location:

trunk/thune

Files:

• boot.c (modified) (1 diff)
• mkboot.t (modified) (1 diff)
• series.c (modified) (3 diffs)

trunk/thune/boot.c

@@ -169 +169 @@
   "[0 swap add] proc :to-dec\n"
   "[rot minimum maximum] proc :limit   ; (n min max -- n)\n"
-  "[append drop] proc :appen\n"
+  "push: :appen\n"
   "[blk | ctx num word]\n"
   "[\n"

trunk/thune/mkboot.t

@@ -197 +197 @@
 [rot minimum maximum] proc :limit   ; (n min max -- n)
 
-[append drop] proc :appen
+push: :appen
 
 [blk | ctx num word]

trunk/thune/series.c

@@ -1226 +1226 @@
             ur_throwErr( UR_ERR_DATATYPE,
                          "append expected series argument" );
+            return;
         }
     }
@@ -1382 +1383 @@
             ur_throwErr( UR_ERR_DATATYPE, "remove expected series argument" );
     }
+}
+
+
+/*
+  (series val -- )
+  Same as [append drop]
+*/
+UR_CALL( uc_push )
+{
+    UCell* ser = ur_s_prev(tos);
+    int len = ur_seriesEnd(ser);
+    if( len > -1 )
+    {
+        ser->series.it = len;
+        uc_insert( ut, tos );           // Assuming uc_insert cannot fail.
+        UR_S_DROP;
+        return;
+    }
+    ur_throwErr( UR_ERR_DATATYPE, "push expected series argument" );
+}
+
+
+/*
+  (series -- )
+  Same as [tail prev remove drop]
+*/
+UR_CALL( uc_pop )
+{
+    int len = ur_seriesEnd(tos);
+    if( len > -1 )
+    {
+        if( len > 0 )
+        {
+            tos->series.it = len - 1;
+            uc_remove( ut, tos );       // Assuming uc_remove cannot fail.
+        }
+        UR_S_DROP;
+        return;
+    }
+    ur_throwErr( UR_ERR_DATATYPE, "pop expected series argument" );
 }
 
@@ -3483 +3524 @@
     { uc_append_cat,   "append.cat" },
     { uc_remove,       "remove" },
+    { uc_push,         "push" },
+    { uc_pop,          "pop" },
     { uc_fill,         "fill" },
     { uc_pick,         "pick" },