Changeset 521

Timestamp:

04/28/08 18:30:18 (2 months ago)

Author:

krobillard

Message:

String parse to & thru now handle slices.

Files:

• trunk/thune/parse.c (modified) (2 diffs)
• trunk/thune/series.c (modified) (2 diffs)

trunk/thune/parse.c

@@ -36 +36 @@
-extern int ur_matchString( const UString* strA, int iA,
-                           const UString* strB, int iB, int matchCase );
-
-
+
+
+
-
-
@@ -228 +229 @@
-                        {
-                            UString* pat = ur_bin(tval);
-
+ pe->input.end,
-                                                 pat, tval->series.it,
+                                                     ur_sliceEnd( tval, pat ),
-                                                 pe->matchCase );
-                            if( pos < 0 )

trunk/thune/series.c

@@ -2750 +2750 @@
-  Returns index in strA where strB is found or -1 if strB is not found.
-*/
-
-
+
+
+
-{
-    const char* it   = strA->ptr.c + iA;
-strA->used
+endA
-    const char* pat  = strB->ptr.c + iB;
-strB->used
-
-assert( iA <= strA->used );
-assert( iB <= strB->used )
+endB
+
+if( (iA >= endA) || (iB >= endB) )
+    return -1
-
-    if( matchCase )
@@ -2919 +2920 @@
-                    inv = UR_CALL_CELL;
-                    found = ur_findString( s1, res->series.it,
+                                               ur_sliceEnd(res, s1),
-                                           s2, tos->series.it,
+                                               ur_sliceEnd(tos, s2),
-                                      (inv && (ur_sel(inv) == UR_ATOM_CASE)) );
-                    if( found > -1 )