Changeset 446

Timestamp:

08/08/07 03:54:30 (14 months ago)

Author:

krobillard

Message:

last & match support slice!.

Files:

• branches/thune/thread_safe/series.c (modified) (8 diffs)

branches/thune/thread_safe/series.c

@@ -1628 +1628 @@
         {
             UBinary* bin = ur_bin(tos);
-            if( (bin->used - tos->series.it) < 1 )
+            int n = bin->used;
+            if( (n - tos->series.it) < 1 )
                 break;
+            --n;
+            if( ur_encoding(tos) == UR_ENC_UTF16 )
+                ur_int(tos) = bin->ptr.u16[ n ];
+            else
+                ur_int(tos) = bin->ptr.c[ n ];
             ur_initType( tos, UT_CHAR );
-            ur_int(tos) = bin->ptr.c[ bin->used - 1 ];
         }
             return;
@@ -1648 +1653 @@
         /*
         case UT_COORD:
-            orResult( UT_INTEGER, tos->coord[ tos->argc ] );
+            ur_int(tos) = tos->coord.elem[ tos->coord.len - 1 ];
+            ur_initType( tos, UT_INT );
             return;
 
@@ -1654 +1660 @@
             break;
         */
+
+        case UT_SLICE:
+            switch( ur_sliceDT(tos) )
+            {
+                case UT_STRING:
+                {
+                    UBinary* bin = ur_bin(tos);
+                    UIndex n = ur_sliceEnd( tos, bin );
+                    if( (n - tos->series.it) < 1 )
+                        break;
+                    --n;
+                    if( ur_encoding(tos) == UR_ENC_UTF16 )
+                        ur_int(tos) = bin->ptr.u16[ n ];
+                    else
+                        ur_int(tos) = bin->ptr.c[ n ];
+                    ur_initType( tos, UT_CHAR );
+                }
+                    return;
+
+                case UT_BINARY:
+                {
+                    UBinary* bin = ur_bin(tos);
+                    UIndex n = ur_sliceEnd( tos, bin );
+                    if( (n - tos->series.it) < 1 )
+                        break;
+                    ur_initType( tos, UT_INT );
+                    ur_int(tos) = bin->ptr.b[ n - 1 ];
+                }
+                    return;
+
+                default:
+                    ur_throwErr( UR_ERR_DATATYPE,
+                                 "FIXME: last not implemented for %s slice",
+                                 ur_typeName( ur_sliceDT(tos) ) );
+                    return;
+            }
+            break;
 
         case UT_VECTOR:
@@ -2941 +2984 @@
 
 
+/**
+  Returns sit where match is complete or zero if string starting with sit
+  does not match all of pattern pit to pend.
+*/
+static const char* ur_match1( const char* sit, const char* send,
+                              const char* pit, const char* pend )
+{
+    while( pit != pend )
+    {
+        if( sit == send )
+            return 0;
+        if( *sit != *pit )
+            return 0;
+        ++sit;
+        ++pit;
+    }
+    return sit;
+}
+
+
 /*
   (series value -- series)
@@ -2956 +3019 @@
         case UT_STRING:
         {
-            int found;
-            UString* s1 = ur_bin(res);
-
             if( ur_is(tos, UT_CHAR) )
             {
@@ -2973 +3033 @@
             else if( ur_is(tos, UT_STRING) || ur_is(tos, UT_BINARY) )
             {
-                UString* s2 = ur_bin(tos);
-                if( s2->used )
-                {
-                    found = ur_matchString( s1, res->series.it,
-                                            s2, tos->series.it );
-                    if( found )
-                    {
-                        res->series.it = found;
-                        return;
-                    }
-                }
+                goto match_bytes;
+            }
+            else if( ur_is(tos, UT_SLICE) &&
+                    ((ur_sliceDT(res) == UT_STRING) ||
+                     (ur_sliceDT(res) == UT_BINARY)) )
+            {
+                goto match_bytes;
             }
         }
@@ -3004 +3060 @@
         }
             goto ret_none;
+
+        case UT_SLICE:
+            if( ((ur_sliceDT(res) == UT_STRING) ||
+                 (ur_sliceDT(res) == UT_BINARY)) &&
+                (ur_is(tos, UT_STRING) || ur_is(tos, UT_BINARY)) )
+                goto match_bytes;
+            goto ret_none;
     }
 
@@ -3013 +3076 @@
     ur_initType(res, UT_NONE);
     return;
+
+match_bytes:
+    {
+        const char* eom;
+        char* pA;
+        char* pB;
+        char* sA;
+        char* sB;
+
+        ur_seriesMem( ut, res, &sA, &sB );
+        ur_seriesMem( ut, tos, &pA, &pB );
+
+        eom = ur_match1( sA, sB, pA, pB );
+        if( eom )
+        {
+            res->series.it += eom - sA;
+            return;
+        }
+    }
+    goto ret_none;
 }