Changeset 450 for branches/thune/thread_safe/parse.c

Timestamp:

08/11/07 04:53:46 (16 months ago)

Author:

krobillard

Message:

Removed slice! datatype - series now have an end.
Added slice test.
ur_makeBinary() now takes pointer argument.
Fixed bug in _makeComponent().
Fixed compiler warnings. Minor optimization to if/.

Files:

• branches/thune/thread_safe/parse.c (modified) (6 diffs)

branches/thune/thread_safe/parse.c

@@ -308 +308 @@
                 ++rit;
 
-                ur_initType( cell, UT_SLICE );
-                ur_sliceDT(cell) = UT_STRING;
-                ur_setSeries( cell, pe->input.n, pos );
-                cell->slice.end = pe->input.end;
+                ur_initType( cell, UT_STRING );
+                ur_setSlice( cell, pe->input.n, pos, pe->input.end );
             }
                 break;
@@ -321 +319 @@
                 ++rit;
 
-                if( ur_is(cell, UT_SLICE) && (cell->series.n == pe->input.n) )
-                    cell->slice.end = pos;
+                if( ur_is(cell, UT_STRING) && (cell->series.n == pe->input.n) )
+                    cell->series.end = pos;
             }
                 break;
@@ -812 +810 @@
                 ++rit;
 
-                ur_initType( cell, UT_SLICE );
-                ur_sliceDT(cell) = UT_BLOCK;
-                ur_setSeries( cell, pe->input.n, pos );
-                cell->slice.end = pe->input.end;
+                ur_initType( cell, UT_BLOCK );
+                ur_setSlice( cell, pe->input.n, pos, pe->input.end );
             }
                 break;
@@ -826 +822 @@
                 ++rit;
 
-                if( ur_is(cell, UT_SLICE) && (cell->series.n == pe->input.n) )
-                    cell->slice.end = pos;
+                if( ur_is(cell, UT_BLOCK) && (cell->series.n == pe->input.n) )
+                    cell->series.end = pos;
             }
                 break;
@@ -1065 +1061 @@
     if( ur_is(rules, UT_BLOCK) )
     {
-        if( ur_is(ser, UT_STRING) ||
-            (ur_is(ser, UT_SLICE) && (ur_sliceDT(ser) == UT_STRING)) )
+        if( ur_is(ser, UT_STRING) )
         {
             StringParser pe;
@@ -1112 +1107 @@
             return;
         }
-        else if( ur_is(ser, UT_BLOCK) ||
-                (ur_is(ser, UT_SLICE) && (ur_sliceDT(ser) == UT_BLOCK)) )
+        else if( ur_is(ser, UT_BLOCK) )
         {
             BlockParser pe;