Changeset 125 for trunk/thune/make.c

Timestamp:

04/26/06 18:39:31 (3 years ago)

Author:

krobillard

Message:

Thune -

Parse test now handles linefeeds and can parse itself.
ur_clone() renamed as ur_copy() and now handles slice!.
Can now make error! and string! from slice!.
Added copy.part & error.
Error trace no longer prints paren! contents.

Files:

• trunk/thune/make.c (modified) (5 diffs)

trunk/thune/make.c

@@ -604 +604 @@
         if( ur_type(tos) == ur_datatype(res) )
         {
-            ur_copy(res, *tos);     // UR_S_NIP;
+            ur_copyCell(res, *tos);     // UR_S_NIP;
             UR_S_DROP;
             return;
@@ -798 +798 @@
             else if( ur_is(tos, UT_BLOCK) )
             {
-                UIndex binN = 0;
+                UIndex binN;
                 UString* str;
                
@@ -809 +809 @@
                 ur_setSeries(res, binN, 0);
             }
+            else if( ur_stringSlice(tos, &spA, &spB) )
+            {
+                UIndex binN;
+
+                if( spA )
+                    binN = ur_makeString( spA, spB - spA );
+                else
+                    binN = ur_makeBinary( 0 );
+
+                ur_setType(res, UT_STRING);
+                ur_setSeries(res, binN, 0);
+            }
             break;
 
@@ -834 +846 @@
             ur_setSeries(res, binN, 0);
         }
+            break;
+
+        case UT_ERROR:
+            if( ! ur_is(tos, UT_STRING) )
+                goto error;
+
+            ur_setType(res, UT_ERROR);
+            res->err.exType     = UR_EX_SCRIPT;
+            res->err.messageStr = tos->series.n;
+            res->err.traceBlk   = ur_makeBlock( 8 );
             break;
 
@@ -879 +901 @@
                         UR_S_DROPN( 2 );
                         tos = ur_s_prev(tos);
-                        ur_copy( res, *tos );
+                        ur_copyCell( res, *tos );
                         (*lit)->compile( ur_thread, res );
                         return;