Changeset 105 for trunk/orca/ovalue.c

Timestamp:

03/30/06 14:50:55 (3 years ago)

Author:

krobillard

Message:

Can now make binary! from string!.

Files:

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

trunk/orca/ovalue.c

@@ -641 +641 @@
 
 
+/*
+   Returns non-zero of successful.
+*/
 static int orMake( int type, OValue* from, OValue* res )
 {
@@ -651 +654 @@
         case OT_GETWORD:
         case OT_LITWORD:
-            if( from->type == OT_STRING )
+            if( orIs(from, OT_STRING) )
             {
                 OContext ctx;
@@ -662 +665 @@
                 return 1;
             }
-            else if( from->type == OT_WORD )
+            else if( orIs(from, OT_WORD) )
             {
                 res->word = from->word;
@@ -683 +686 @@
 
         case OT_INTEGER:
-            if( from->type == OT_LOGIC )
+            if( orIs(from, OT_LOGIC) )
             {
                 orInt(res) = orInt(from);
                 return 1;
             }
-            else if( from->type == OT_DECIMAL )
+            else if( orIs(from, OT_DECIMAL) )
             {
                 orInt(res) = (int) orDecimal(from);
                 return 1;
             }
-            else if( from->type == OT_STRING )
+            else if( orIs(from, OT_STRING) )
             {
                 OString* str = orSTRING(from);
@@ -706 +709 @@
 
         case OT_DECIMAL:
-            if( (from->type == OT_INTEGER) ||
-                (from->type == OT_LOGIC) )
+            if( orIs(from, OT_INTEGER) ||
+                orIs(from, OT_LOGIC) )
             {
                 orDecimal(res) = (double) orInt(from);
@@ -725 +728 @@
 
         case OT_PAIR:
-            if( from->type == OT_BLOCK )
+            if( orIs(from, OT_BLOCK) )
             {
                 OBlock* blk = orBLOCK( from );
@@ -744 +747 @@
 
         case OT_TUPLE:
-            if( from->type == OT_BLOCK )
+            if( orIs(from, OT_BLOCK) )
             {
                 OBlock* blk = orBLOCK( from );
@@ -768 +771 @@
             }
             break;
+
+        case OT_BINARY:
+            if( orIs(from, OT_STRING) )
+            {
+                OString* str;
+                OBinary* bin;
+                int len;
+
+                str = orSTRING( from );
+                len = str->used - from->series.it;
+
+                bin = orMakeBinary( len );
+                bin->used = len;
+                memCpy(bin->byteArray, str->charArray + from->series.it, len); 
+
+                orSetTF( res, OT_BINARY );
+                orSetSeries( res, orBinaryN(bin), 0 );
+                return 1;
+            }
+            break;
     }
 
@@ -777 +800 @@
 static OBinary* _makeBitset( OBlock* blk, int index );
 
-void orMakeNative( OValue* a1 )
+OR_NATIVE( orMakeNative )
 {
     OValue* a2 = a1 + 1;