Changeset 538

Timestamp:

06/14/08 16:30:57 (4 months ago)

Author:

krobillard

Message:

Added get/words, isGlobalIndex(), and 10 reserved atoms.

Location:

trunk/thune

Files:

• doc/UserManual (modified) (2 diffs)
• eval.c (modified) (3 diffs)
• gl/gx_atoms.h (modified) (1 diff)
• gl/project.r (modified) (1 diff)
• internal.h (modified) (1 diff)
• urlan.c (modified) (4 diffs)
• urlan_atoms.h (modified) (1 diff)

trunk/thune/doc/UserManual

@@ -421 +421 @@
 get         (word -- val)             Retrieve value referenced by word.
 get         (word ctx -- val)         Retrieve value from context.
+get/words   (ctx -- block)            Make a block of the context's words.
 bind        (block ctx -- block)      Bind block to context.
 infuse      (block ctx -- block)      Replace words with context values.
@@ -585 +586 @@
 to-dec       (int -- int)            Flag integer to display in decimal.
 checksum     (bin type -- digest)    Compute 'crc16 or 'sha1 checksum.
+change-dir   (dir -- logic)          Change working directory.
+what-dir     ( -- path)              Get working directory.
+make-dir     (dir-name -- )          Make filesystem directory.
+file-info    (filename -- block)     Get file information.
+now          ( -- time)              Get current time.
 ===========  ======================  ======================
 

trunk/thune/eval.c

@@ -1089 +1089 @@
    (word -- val)
    (word ctx -- val)
+   /words (ctx -- blk)
 */
 UR_CALL( uc_get )
@@ -1107 +1108 @@
     else if( ur_is(tos, UT_CONTEXT) )
     {
-        val = ur_s_prev( tos );
-        if( ur_isAWord(val) )
-        {
-            UBlock* blk;
-            int wrdN;
-
-            wrdN = ur_lookup( tos, ur_atom(val) );
-            if( wrdN > -1 )
-            {
-                blk = ur_blockPtr( tos->ctx.valBlk );
-                ur_copyCell(val, blk->ptr.cells[ wrdN ]);
-                /*
-                if( ur_is(ctx, UT_UNSET) )
-                    _throwUnset( ut, ctx );
-                */
-            }
-            else
-            {
-                ur_setNone( val );
-            }
-
-            UR_S_DROP;
+        UBlock* blk;
+        UCell* inv = UR_CALL_CELL;
+
+        if( inv && ur_sel(inv) == UR_ATOM_WORDS )
+        {
+            int len;
+            UIndex blkN;
+
+            blk = ur_blockPtr( tos->ctx.valBlk );
+            len = blk->used;
+            blk = ur_blockPtr( tos->ctx.wordBlk );
+            val = blk->ptr.cells;
+
+            blkN = ur_makeBlockT( ut, len, &blk );     // gc!
+            ur_copyCells( val, val + len, blk->ptr.cells );
+            blk->used = len;
+            ur_bindT( ut, blkN, tos, isGlobalIndex(tos->ctx.valBlk) ?
+                                         UR_BIND_GLOBAL : UR_BIND_THREAD );
+
+            ur_initBlock( tos, blkN, 0 ); 
             return;
+        }
+        else
+        {
+            val = ur_s_prev( tos );
+            if( ur_isAWord(val) )
+            {
+                int wrdN;
+
+                wrdN = ur_lookup( tos, ur_atom(val) );
+                if( wrdN > -1 )
+                {
+                    blk = ur_blockPtr( tos->ctx.valBlk );
+                    ur_copyCell(val, blk->ptr.cells[ wrdN ]);
+                    /*
+                    if( ur_is(ctx, UT_UNSET) )
+                        _throwUnset( ut, ctx );
+                    */
+                }
+                else
+                {
+                    ur_setNone( val );
+                }
+
+                UR_S_DROP;
+                return;
+            }
         }
     }
@@ -1154 +1179 @@
 #endif
 
-    ur_throwErr( UR_ERR_DATATYPE, "get expected word!" );
+    ur_throwErr( UR_ERR_DATATYPE, "get expected word!/context!" );
 }
 

trunk/thune/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               329
-#define UR_ATOM_WIDTH           330
-#define UR_ATOM_HEIGHT          331
-#define UR_ATOM_AREA            332
-#define UR_ATOM_RECT            333
-#define UR_ATOM_SIZE            334
-#define UR_ATOM_RASTER          335
-#define UR_ATOM_TEXTURE         336
-#define UR_ATOM_ELEM            337
-#define UR_ATOM_CLOSE           188
-#define UR_ATOM_FOCUS           338
-#define UR_ATOM_RESIZE          339
-#define UR_ATOM_KEY_DOWN                340
-#define UR_ATOM_KEY_UP          341
-#define UR_ATOM_MOUSE_MOVE              342
-#define UR_ATOM_MOUSE_UP                343
-#define UR_ATOM_MOUSE_DOWN              344
-#define UR_ATOM_MOUSE_WHEEL             345
-#define UR_ATOM_AMBIENT         346
-#define UR_ATOM_DIFFUSE         347
-#define UR_ATOM_SPECULAR                348
-#define UR_ATOM_POS             349
-#define UR_ATOM_SHADER          350
-#define UR_ATOM_VERTEX          351
-#define UR_ATOM_FRAGMENT                352
-#define UR_ATOM_DEFAULT         353
-#define UR_ATOM_WAIT            138
-#define UR_ATOM_LEFT            354
-#define UR_ATOM_RIGHT           355
-#define UR_ATOM_CENTER          356
-#define UR_ATOM_RGB             357
-#define UR_ATOM_RGBA            358
-#define UR_ATOM_DEPTH           359
-#define UR_ATOM_CLAMP           360
-#define UR_ATOM_REPEAT          361
-#define UR_ATOM_NEAREST         362
-#define UR_ATOM_LINEAR          363
-#define UR_ATOM_MIN             364
-#define UR_ATOM_MAG             365
-#define UR_ATOM_MIPMAP          366
-#define UR_ATOM_GRAY            367
-#define UR_ATOM_RGB             357
-#define UR_ATOM_RGBA            358
-#define UR_ATOM_ON              272
-#define UR_ATOM_OFF             274
-#define UR_ATOM_ADD             207
-#define UR_ATOM_BURN            368
-#define UR_ATOM_COLOR           369
-#define UR_ATOM_TRANS           370
-#define UR_ATOM_SPRITE          371
-#define UR_ATOM_ONCE            372
-#define UR_ATOM_PING_PONG               373
-#define UR_ATOM_PONG            374
+#define UR_ATOM_DRAW_LIST_OPCODES               339
+#define UR_ATOM_WIDTH           340
+#define UR_ATOM_HEIGHT          341
+#define UR_ATOM_AREA            342
+#define UR_ATOM_RECT            343
+#define UR_ATOM_SIZE            344
+#define UR_ATOM_RASTER          345
+#define UR_ATOM_TEXTURE         346
+#define UR_ATOM_ELEM            347
+#define UR_ATOM_CLOSE           199
+#define UR_ATOM_FOCUS           348
+#define UR_ATOM_RESIZE          349
+#define UR_ATOM_KEY_DOWN                350
+#define UR_ATOM_KEY_UP          351
+#define UR_ATOM_MOUSE_MOVE              352
+#define UR_ATOM_MOUSE_UP                353
+#define UR_ATOM_MOUSE_DOWN              354
+#define UR_ATOM_MOUSE_WHEEL             355
+#define UR_ATOM_AMBIENT         356
+#define UR_ATOM_DIFFUSE         357
+#define UR_ATOM_SPECULAR                358
+#define UR_ATOM_POS             359
+#define UR_ATOM_SHADER          360
+#define UR_ATOM_VERTEX          361
+#define UR_ATOM_FRAGMENT                362
+#define UR_ATOM_DEFAULT         363
+#define UR_ATOM_WAIT            149
+#define UR_ATOM_LEFT            364
+#define UR_ATOM_RIGHT           365
+#define UR_ATOM_CENTER          366
+#define UR_ATOM_RGB             367
+#define UR_ATOM_RGBA            368
+#define UR_ATOM_DEPTH           369
+#define UR_ATOM_CLAMP           370
+#define UR_ATOM_REPEAT          371
+#define UR_ATOM_NEAREST         372
+#define UR_ATOM_LINEAR          373
+#define UR_ATOM_MIN             374
+#define UR_ATOM_MAG             375
+#define UR_ATOM_MIPMAP          376
+#define UR_ATOM_GRAY            377
+#define UR_ATOM_RGB             367
+#define UR_ATOM_RGBA            368
+#define UR_ATOM_ON              283
+#define UR_ATOM_OFF             285
+#define UR_ATOM_ADD             218
+#define UR_ATOM_BURN            378
+#define UR_ATOM_COLOR           379
+#define UR_ATOM_TRANS           380
+#define UR_ATOM_SPRITE          381
+#define UR_ATOM_ONCE            382
+#define UR_ATOM_PING_PONG               383
+#define UR_ATOM_PONG            384

trunk/thune/gl/project.r

@@ -83 +83 @@
     cflags {-DLANG_THUNE -DTHUNE_GL}
     include_from %.
+    include_from %..
     libs_from %. %thune-gl0
     libs_from %.. %thune0

trunk/thune/internal.h

@@ -16 +16 @@
 #define BLK_CTX_STACK       3
 //#define BLK_DSTACK          4
+
+
+#define isGlobalIndex(n)    (n < 0)
 
 

trunk/thune/urlan.c

@@ -308 +308 @@
     FIXED_ATOM( "case",   4, UR_ATOM_CASE )
     FIXED_ATOM( "reader-macros", 13, UR_ATOM_READER_MACROS )
+    FIXED_ATOM( "words",  5, UR_ATOM_WORDS )
+    //FIXED_ATOM( "key-values", 10, UR_ATOM_KEY_VALUES )
+
+    // ^^ Add new fixed atoms here ^^
+    // Reduce ATOMS_RESERVED for each new FIXED_ATOM to keep the number of
+    // atoms constant.  When it drops below zero then it should be reset to
+    // 10 and all library users who have their own fixed atoms must recompile.
+
+#define ATOMS_RESERVED  10
+    {
+        static char resFixed[13] = "_res-fixed-0";
+        int i;
+        for( i = 0; i < ATOMS_RESERVED; ++i )
+        {
+            resFixed[11] = i + '0';
+            ur_intern( resFixed, 12 );
+        }
+    }
 
 #if MAKE_ATOM_HEADER
@@ -826 +844 @@
 UBlock* ur_blockPtrT( UThread* ut, UIndex n)
 {
-   if( n < 0 )
+   if( isGlobalIndex(n) )
         return (((UBlock*) ut->env->blocks.arr.ptr.v) - n);
     return (((UBlock*) ut->blocks.arr.ptr.v) + n);
@@ -834 +852 @@
 UArray* ur_binPtrT( UThread* ut, UIndex n )
 {
-   if( n < 0 )
+   if( isGlobalIndex(n) )
         return (((UArray*) ut->env->bin.arr.ptr.v) - n);
     return (((UArray*) ut->bin.arr.ptr.v) + n);
@@ -842 +860 @@
 UResource* ur_resPtrT( UThread* ut, UIndex n )
 {
-   if( n < 0 )
+   if( isGlobalIndex(n) )
         return (((UResource*) ut->env->resources.arr.ptr.v) - n);
     return (((UResource*) ut->resources.arr.ptr.v) + n);

trunk/thune/urlan_atoms.h

@@ -49 +49 @@
 #define UR_ATOM_CASE            112
 #define UR_ATOM_READER_MACROS           113
+#define UR_ATOM_WORDS           114