Changeset 78

Timestamp:

03/08/06 16:06:15 (3 years ago)

Author:

krobillard

Message:

Any type can now be inserted (or joined) to string!

Location:

trunk/orca

Files:

• print.c (modified) (2 diffs)
• series.c (modified) (4 diffs)

trunk/orca/print.c

@@ -1125 +1125 @@
     OString* str = orMakeString( 0 );
     orForm( str, a1 );
-    orResultSTRING( str - orSTRINGS );
+    orResultSTRING( orStringN(str) );
 }
 
@@ -1136 +1136 @@
     OString* str = orMakeString( 0 );
     orMold( str, a1 );
-    orResultSTRING( str - orSTRINGS );
+    orResultSTRING( orStringN(str) );
 }
 

trunk/orca/series.c

@@ -417 +417 @@
     OValue* a2 = a1 + 1;
 
-    switch( a1->type )
+    switch( orType(a1) )
     {
         case OT_BLOCK:
         case OT_PAREN:
         case OT_PATH:
-            if( (a2->type != OT_BLOCK) || orRefineSet(REF_INS_ONLY) )
+            if( (orType(a2) != OT_BLOCK) || orRefineSet(REF_INS_ONLY) )
             {
                 OValue* ipos;
@@ -473 +473 @@
         case OT_BINARY:
         {
-            if( orIsBlock(a2->type) )
+            if( orIsBlock( orType(a2) ) )
             {
                 OBlock* blk = orBLOCK(a2);
@@ -504 +504 @@
                 }
             }
-            else if( orIsString(a2->type) )
+            else if( orIsString( orType(a2) ) )
             {
                 OString* s2 = orSTRING(a2);
@@ -510 +510 @@
                                   s2->used - a2->series.it );
             }
-            else if( a2->type == OT_CHAR )
+            else if( orIs(a2, OT_CHAR) )
             {
                 char tmp = orInt(a2);
                 stringInsert( a1, &tmp, 1 );
+            }
+            else if( orIs(a1, OT_STRING) )
+            {
+                // Result is string so mold whatever we haven't handled.
+                orMold( orSTRING(a1), a2 );
             }
             else