Changeset 497

Timestamp:

11/14/07 04:27:55 (10 months ago)

Author:

krobillard

Message:

Iter accepts negative skip.
Updated GL atoms, manual, and encode test.

Location:

trunk/thune

Files:

• doc/UserManual (modified) (1 diff)
• gl/gx_atoms.h (modified) (1 diff)
• project.r (modified) (1 diff)
• tests/working/encode.good (modified) (1 diff)
• tests/working/iter.good (added)
• tests/working/iter.t (added)
• thune.c (modified) (4 diffs)

trunk/thune/doc/UserManual

@@ -464 +464 @@
 pick        (ser index -- val)      Fetch an element from a series.
 poke        (ser val index -- ser)  Set an element of a series.
+push        (ser val -- )           Append value to series and drop.
+pop         (ser -- )               Remove last element from series and drop.
 first       (ser -- val)            Fetch first value in series.
 second      (ser -- val)            Fetch second value in series.

trunk/thune/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               324
-#define UR_ATOM_WIDTH           325
-#define UR_ATOM_HEIGHT          326
-#define UR_ATOM_AREA            327
-#define UR_ATOM_RECT            328
-#define UR_ATOM_RASTER          329
-#define UR_ATOM_TEXTURE         330
-#define UR_ATOM_ELEM            331
-#define UR_ATOM_CLOSE           183
-#define UR_ATOM_FOCUS           332
-#define UR_ATOM_RESIZE          333
-#define UR_ATOM_KEY_DOWN                334
-#define UR_ATOM_KEY_UP          335
-#define UR_ATOM_MOUSE_MOVE              336
-#define UR_ATOM_MOUSE_UP                337
-#define UR_ATOM_MOUSE_DOWN              338
-#define UR_ATOM_MOUSE_WHEEL             339
-#define UR_ATOM_AMBIENT         340
-#define UR_ATOM_DIFFUSE         341
-#define UR_ATOM_SPECULAR                342
-#define UR_ATOM_POS             343
-#define UR_ATOM_SHADER          344
-#define UR_ATOM_VERTEX          345
-#define UR_ATOM_FRAGMENT                346
-#define UR_ATOM_DEFAULT         347
+#define UR_ATOM_DRAW_LIST_OPCODES               325
+#define UR_ATOM_WIDTH           326
+#define UR_ATOM_HEIGHT          327
+#define UR_ATOM_AREA            328
+#define UR_ATOM_RECT            329
+#define UR_ATOM_RASTER          330
+#define UR_ATOM_TEXTURE         331
+#define UR_ATOM_ELEM            332
+#define UR_ATOM_CLOSE           184
+#define UR_ATOM_FOCUS           333
+#define UR_ATOM_RESIZE          334
+#define UR_ATOM_KEY_DOWN                335
+#define UR_ATOM_KEY_UP          336
+#define UR_ATOM_MOUSE_MOVE              337
+#define UR_ATOM_MOUSE_UP                338
+#define UR_ATOM_MOUSE_DOWN              339
+#define UR_ATOM_MOUSE_WHEEL             340
+#define UR_ATOM_AMBIENT         341
+#define UR_ATOM_DIFFUSE         342
+#define UR_ATOM_SPECULAR                343
+#define UR_ATOM_POS             344
+#define UR_ATOM_SHADER          345
+#define UR_ATOM_VERTEX          346
+#define UR_ATOM_FRAGMENT                347
+#define UR_ATOM_DEFAULT         348
 #define UR_ATOM_WAIT            135
-#define UR_ATOM_RGB             348
-#define UR_ATOM_RGBA            349
-#define UR_ATOM_DEPTH           350
-#define UR_ATOM_CLAMP           351
-#define UR_ATOM_REPEAT          352
-#define UR_ATOM_NEAREST         353
-#define UR_ATOM_LINEAR          354
-#define UR_ATOM_MIN             355
-#define UR_ATOM_MAG             356
-#define UR_ATOM_MIPMAP          357
-#define UR_ATOM_GRAY            358
-#define UR_ATOM_RGB             348
-#define UR_ATOM_RGBA            349
-#define UR_ATOM_ON              263
-#define UR_ATOM_OFF             265
-#define UR_ATOM_ADD             202
-#define UR_ATOM_BURN            359
-#define UR_ATOM_COLOR           360
-#define UR_ATOM_TRANS           361
-#define UR_ATOM_SPRITE          362
-#define UR_ATOM_ONCE            363
-#define UR_ATOM_PING_PONG               364
-#define UR_ATOM_PONG            365
+#define UR_ATOM_RGB             349
+#define UR_ATOM_RGBA            350
+#define UR_ATOM_DEPTH           351
+#define UR_ATOM_CLAMP           352
+#define UR_ATOM_REPEAT          353
+#define UR_ATOM_NEAREST         354
+#define UR_ATOM_LINEAR          355
+#define UR_ATOM_MIN             356
+#define UR_ATOM_MAG             357
+#define UR_ATOM_MIPMAP          358
+#define UR_ATOM_GRAY            359
+#define UR_ATOM_RGB             349
+#define UR_ATOM_RGBA            350
+#define UR_ATOM_ON              264
+#define UR_ATOM_OFF             266
+#define UR_ATOM_ADD             203
+#define UR_ATOM_BURN            360
+#define UR_ATOM_COLOR           361
+#define UR_ATOM_TRANS           362
+#define UR_ATOM_SPRITE          363
+#define UR_ATOM_ONCE            364
+#define UR_ATOM_PING_PONG               365
+#define UR_ATOM_PONG            366

trunk/thune/project.r

@@ -25 +25 @@
         cflags {-pedantic}
         include_from %unix
+        universal
     ]
     unix [

trunk/thune/tests/working/encode.good

@@ -13 +13 @@
 hello
 "hello"
-#{680065006C006C006F00}
+#{00680065006C006C006F}
 5
 'e'

trunk/thune/thune.c

@@ -609 +609 @@
 
                 case OP_ITER:           // (series blk -- )
-                    if( ur_is(UR_TOS, UT_BLOCK) &&
-                        (ur_itLen( ut, ur_s_prev(UR_TOS) ) > 0) )
+                    if( ur_is(UR_TOS, UT_BLOCK) )
                     {
+                        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,
                                     UR_TOS->series.it );
-                        PUSHC_ITER( blkN, pc, end,
-                                    (ur_sel(val) > 1) ? ur_sel(val) : 1 );
+                        PUSHC_ITER( blkN, pc, end, skip );
 
                         // Loop code must drop TOS.
@@ -623 +634 @@
                     else
                     {
+no_iter:
                         UR_S_DROPN(2);
                     }
@@ -1063 +1075 @@
 
         case CC_ITER:
-            UR_TOS->series.it += UR_TOC->iter.skip;
-            if( ur_itLen(ut, UR_TOS) > 0 )
+        {
+            int skip = UR_TOC->iter.skip;
+            UR_TOS->series.it += skip;
+            if( ((skip > 0) ? ur_itLen(ut, UR_TOS) : UR_TOS->series.it + 1)
+                    > 0 )
             {
                 RESET_ITER( pc, end );
@@ -1072 +1087 @@
             UR_C_DEC;
             UR_S_DROP;           // Pop iterator value.
+        }
             goto control;