Changeset 538 for trunk/thune/urlan.c

Timestamp:

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

Author:

krobillard

Message:

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

Files:

• trunk/thune/urlan.c (modified) (4 diffs)

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);