Changeset 26 for trunk/orca/ovalue.c

Timestamp:

02/07/06 00:52:42 (3 years ago)

Author:

krobillard

Message:

Atom names are now stored in a single string.
Maximum word length is now 32.

Files:

• trunk/orca/ovalue.c (modified) (10 diffs)

trunk/orca/ovalue.c

@@ -101 +101 @@
 
 extern OBlock* orTokenize( const char*, const char* );
+extern const char* orAtomCString( OAtom );
 
 extern void orBindNative( OValue* );
@@ -336 +337 @@
     orInitAGC( &env->freeIntArr );
 #endif
+
+    orMakeString( 2048 );     // BIN_ATOM_NAMES
 
     makeGlobalContext();
@@ -1366 +1369 @@
         if( val->type == OT_UNSET )
         {
-            OString* str = orAtomString( a1->word.atom );
-            orError( "%s has no value", str->charArray );
+            orError( "%s has no value", orAtomCString( a1->word.atom ) );
         }
         else
@@ -1996 +1998 @@
 
 unset:
-    {
-    OString* str;
-    str = orAtomString( pit->word.atom );
-    orError( "Path word %s has no value", str->charArray );
-    }
+    orError( "Path word %s has no value", orAtomCString( pit->word.atom ) );
     return -1;
 
@@ -2220 +2218 @@
             {
                 case OT_UNSET:
-                    {
-                    OString* str = orAtomString( pc->word.atom );
-                    orError( "%s has no value", str->charArray );
-                    }
+                    orError( "%s has no value", orAtomCString(pc->word.atom) );
                     return -1;
 
@@ -2317 +2312 @@
                 if( wblk->values[ pc->word.index ].flags & OR_WORD_PROT )
                 {
-                    OString* str = orAtomString( pc->word.atom );
-                    orError( "Word %s is protected", str->charArray );
+                    orError( "Word %s is protected", 
+                             orAtomCString( pc->word.atom ) );
                     goto sThrown;
                 }
             }
 #ifdef TRACE
-            cprint( "TR> %s:\n", orAtomString(pc->word.atom)->charArray );
+            cprint( "TR> %s:\n", orAtomCString( pc->word.atom ) );
 #endif
             PUSH_CALL( wval, OC_SETWORD, 0 );
@@ -2768 +2763 @@
     if( si == send )
     {
-        OString* str = orAtomString( pp->word.atom );
-        orError( "Function has no refinement %s", str->charArray ); 
+        orError( "Function has no refinement %s", 
+                 orAtomCString( pp->word.atom ) );
         goto sThrown;
     }
@@ -3093 +3088 @@
                 (it->type == OT_LITWORD) )
             {
-                OString* str = orAtomString( it->word.atom );
                 dprint( " %d %d %s\n", it->word.context, it->word.index,
-                        str->charArray );
+                        orAtomCString( it->word.atom ) );
             }
             else if( it->type == OT_DATATYPE )
@@ -3938 +3932 @@
             orDatatypeName(type),
             (orSTRINGS + wrd->str)->charArray,
-            orAtomString(wrd->atom)->charArray,
+            orAtomCString( wrd->atom ),
             val->word.atom );
 #endif
@@ -4286 +4280 @@
         {
 #if 0
-            OString* str = orAtomString( it->word.atom );
-            dprint( "orFuncNative - intern %s\n", str->charArray );
+            dprint( "orFuncNative - intern %s\n",
+                    orAtomCString( it->word.atom ) );
 #endif
             prevWord = 1;