Changeset 498

Timestamp:

11/14/07 17:18:50 (11 months ago)

Author:

krobillard

Message:

Fixed bug in reverse 'iter when series had one element.

Location:

trunk/thune

Files:

• doc/UserManual (modified) (2 diffs)
• tests/working/iter.good (modified) (2 diffs)
• tests/working/iter.t (modified) (2 diffs)
• thune.c (modified) (2 diffs)

trunk/thune/doc/UserManual

@@ -82 +82 @@
 block!       []  [a b c]
 paren!       ()  (a b c)
-macro!       <size 2 mul>
+macro!       ^(size 2 mul)
 vector!      #[1 2 3]  #[-85.33 2 44.8]
 function!    [2 add] proc :inc2
@@ -114 +114 @@
 Example::
 
-    <34 2 mul :border>
-
-    box-width <border> add
+    ^(34 2 mul :border)
+
+    box-width ^(border) add
 
 Conditional Example::
 
-    <script-env/os [
+    ^(script-env/os [
         linux   ["Linux"]
         solaris ["Solaris"]
         ["Unsupported OS" error]
-     ] case>
+     ] case)
     print
 

trunk/thune/tests/working/iter.good

@@ -6 +6 @@
 [1 2 3]
 [3]
+--- Forward one ---
+[a]
 --- Forward empty ---
 --- Reverse ---
@@ -14 +16 @@
 [3]
 [1 2 3]
+--- Reverse one ---
+[x]
 --- Reverse empty ---

trunk/thune/tests/working/iter.t

@@ -6 +6 @@
 "--- Forward skip ---" print
 data [.] iter/2
+
+"--- Forward one ---" print
+[a] [.] iter
 
 "--- Forward empty ---" print
@@ -16 +19 @@
 data tail prev [.] iter/-2
 
+"--- Reverse one ---" print
+[x] tail prev [.] iter/-1
+
 "--- Reverse empty ---" print
 [] [.] iter/-1

trunk/thune/thune.c

@@ -609 +609 @@
 
                 case OP_ITER:           // (series blk -- )
-                    if( ur_is(UR_TOS, UT_BLOCK) )
+                    if( ur_is(UR_TOS, UT_BLOCK) &&
+                        (ur_itLen( ut, ur_s_prev(UR_TOS) ) > 0) )
                     {
                         int skip = ur_sel(val);
                         if( skip == 0 )
                             skip = 1;
-                        if( skip > 0 )
-                        {
-                            if( ur_itLen( ut, ur_s_prev(UR_TOS) ) < 1 )
-                                goto no_iter;
-                        }
-                        else
-                        {
-                            if( ur_s_prev(UR_TOS)->series.it < 1 )
-                                goto no_iter;
-                        }
                         PUSHC_EVAL( blkN, start, pc );
                         SET_BLK_PC( UR_TOS->series.n,
@@ -634 +625 @@
                     else
                     {
-no_iter:
                         UR_S_DROPN(2);
                     }