Changeset 82 for trunk/orca

Timestamp:

03/08/06 18:01:08 (3 years ago)

Author:

krobillard

Message:

find/skip now works on blocks.

Location:

trunk/orca

Files:

• boot.c (modified) (1 diff)
• boot.r (modified) (1 diff)
• series.c (modified) (3 diffs)
• tests/run_test (modified) (1 diff)
• tests/working/find.r (modified) (1 diff)

trunk/orca/boot.c

@@ -57 +57 @@
   "    /match\n"
   "    /last\n"
+  "    /skip size [integer!]\n"
   "]\n"
   "reduce: native [\n"

trunk/orca/boot.r

@@ -77 +77 @@
         /match
         /last
+        /skip size [integer!]
         ;/part
         ;range   ; [number! series! port!]

trunk/orca/series.c

@@ -1785 +1785 @@
 #define REF_FIND_MATCH  a1+2
 #define REF_FIND_LAST   a1+3
-//#define REF_FIND_PART   a1+4
-//#define REF_FIND_RANGE  a1+5
-//#define REF_FIND_CASE   a1+6
+#define REF_FIND_SKIP   a1+4
+#define REF_FIND_SIZE   a1+5
+//#define REF_FIND_PART   a1+6
+//#define REF_FIND_RANGE  a1+7
+//#define REF_FIND_CASE   a1+8
 
 /*
@@ -1819 +1821 @@
             else
             {
-                while( it != end )
+                int skip = 1;
+
+                if( orRefineSet(REF_FIND_SKIP) )
+                    skip = orInt(REF_FIND_SIZE);
+
+                while( it < end )
                 {
                     if( orEqual(it, a2) )
@@ -1827 +1834 @@
                         return;
                     }
-                    ++it;
+                    it += skip;
                 }
             }

trunk/orca/tests/run_test

@@ -2 +2 @@
 
 INTERPRETER=../orca
-REBOL=rebol
+#REBOL=rebol
 #REBOL=./rebol
-#REBOL=./rebol_view_1.2.47
+REBOL=./rebol_view_1.2.47
 
 #DIFF='diff -w --ignore-blank-lines'

trunk/orca/tests/working/find.r

@@ -5 +5 @@
 x: find [%t11.ext  %t1.ext] %t1.EXT
 print ["test1 - block/string case" type? x x]
+
+
+
+s: [1 2 3 4]
+print ["skip1" find/skip s 1 2]
+print ["skip2" find/skip s 2 2]
+print ["skip3" find/skip s 3 2]
+print ["skip4" find/skip s 4 2]