Changeset 26 for trunk/orca/print.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/print.c (modified) (6 diffs)

trunk/orca/print.c

@@ -374 +374 @@
     OValue* it;
     OValue* end;
-    OString* str;
 
     wblk = orBlockPtr( ctx->wblkN );
@@ -392 +391 @@
     while( it != end )
     {
-        str = orAtomString( wval->word.atom );
-
         indent( out, depth );
-        append( out, str->charArray, str->used );
+
+        orAtomStr( wval->word.atom, out );
         append( out, ": ", 2 );
 
@@ -519 +517 @@
                             break;
 
-        case OT_REFINEMENT: {
-                            OString* str = orAtomString( val->index );
-                            append(out, str->charArray, str->used);
-                            }
+        case OT_REFINEMENT: orAtomStr( val->index, out );
                             break;
 
         case OT_WORD:
         case OT_LITWORD:
-        case OT_SETWORD:
-        case OT_GETWORD:    {
-                            OString* str = orAtomString( val->word.atom );
-                            append(out, str->charArray, str->used);
-                            }
+        case OT_SETWORD:    orAtomStr( val->word.atom, out );
                             break;
 
@@ -703 +694 @@
                             break;
 
-        case OT_REFINEMENT: {
-                            OString* str = orAtomString( val->index );
-                            append1('/', out);
-                            append(out, str->charArray, str->used);
-                            }
-                            break;
-
-        case OT_WORD:       {
-                            OString* str = orAtomString( val->word.atom );
-                            append(out, str->charArray, str->used);
-                            }
-                            break;
-
-        case OT_LITWORD:    {
-                            OString* str = orAtomString( val->word.atom );
-                            append1(39, out);
-                            append(out, str->charArray, str->used);
-                            }
-                            break;
-
-        case OT_SETWORD:    {
-                            OString* str = orAtomString( val->word.atom );
-                            append(out, str->charArray, str->used);
+        case OT_REFINEMENT: append1('/', out);
+                            orAtomStr( val->index, out );
+                            break;
+
+        case OT_LITWORD:    append1('\'', out);
+                            // fall through to OT_WORD
+
+        case OT_WORD:       orAtomStr( val->word.atom, out );
+                            break;
+
+        case OT_SETWORD:    orAtomStr( val->word.atom, out );
                             append1(':', out);
-                            }
-                            break;
-
-        case OT_GETWORD:    {
-                            OString* str = orAtomString( val->word.atom );
-                            append1(':', out);
-                            append(out, str->charArray, str->used);
-                            }
+                            break;
+
+        case OT_GETWORD:    append1(':', out);
+                            orAtomStr( val->word.atom, out );
                             break;
 
@@ -1048 +1023 @@
             OValue* end = it + wblk->used;
             OValue* vit = vblk->values;
-            OString* str;
 
             ((OValue*) val)->flags |= OR_FLAG_RECURSION;
@@ -1067 +1041 @@
                     indent(out, depth + 1);
 
-                    str = orAtomString( it->word.atom );
-                    append( out, str->charArray, str->used );
+                    orAtomStr( it->word.atom, out );
                     append( out, ": ", 2 );
                     mold( out, vit, depth + 1 );