Changeset 162 for trunk/thune/make.c

Timestamp:

05/27/06 21:22:22 (3 years ago)

Author:

krobillard

Message:

Thune -

Opcode selector is now preserved by infuse & ur_toStr().
Added ur_makeBinaryFrom() & ur_encodingCharSize[].
Command line arguments now passed to script in 'args.
Switched order of 'iter arguments.

Files:

• trunk/thune/make.c (modified) (6 diffs)

trunk/thune/make.c

@@ -128 +128 @@
     ur_arrayInit( ptr, sizeof(char), size );
     return ur_binN( ptr );
+}
+
+
+/*
+   Returns zero if cell can not be converted.
+*/
+UIndex ur_makeBinaryFrom( const UCell* cell )
+{
+    char* cpA;
+    char* cpB;
+    UIndex binN = 0;
+
+    if( ur_stringSlice( cell, &cpA, &cpB ) )
+    {
+        int count;
+        int size;
+        UBinary* bin;
+
+        count = cpB - cpA;
+        size =  count * ur_encCharSize( cell );
+        binN = ur_makeBinary( size );
+        if( size )
+        {
+            bin = ur_binPtr( binN );
+            memCpy( bin->ptr.b, cpA, size );
+            bin->used = count;
+        }
+    }
+
+    return binN;
 }
 
@@ -200 +230 @@
   Returns non-zero if identical up to end of either string.
 */
-static int strEqual( const char* a, const char* b, int len )
+int memEqual( const char* a, const char* b, int len )
 {
     const char* end = a + len;
@@ -231 +261 @@
     else if( len == 3 )
     {
-        if( strEqual( cp, "tab", 3 ) )
+        if( memEqual( cp, "tab", 3 ) )
             return '\t';
-        if( strEqual( cp, "esc", 3 ) )
+        if( memEqual( cp, "esc", 3 ) )
             return 27;
     }
     else if( len == 4 )
     {
-        if( strEqual( cp, "line", 4 ) )
+        if( memEqual( cp, "line", 4 ) )
             return '\n';
-        if( strEqual( cp, "page", 4 ) )
+        if( memEqual( cp, "page", 4 ) )
             return '\f';
-        if( strEqual( cp, "back", 4 ) )
+        if( memEqual( cp, "back", 4 ) )
             return '\b';
-        if( strEqual( cp, "bell", 4 ) )
+        if( memEqual( cp, "bell", 4 ) )
             return '\a';
-        if( strEqual( cp, "null", 4 ) )
+        if( memEqual( cp, "null", 4 ) )
             return '\0';
     }
@@ -376 +406 @@
 static void _setBitsetStr( uint8_t* bits, const UCell* from )
 {
-    UChar* it;
-    UChar* end;
+    char* it;
+    char* end;
     UBinary* src = ur_bin(from);
 
@@ -630 +660 @@
 UR_CALL_PUB( uc_make )
 {
-    UChar* spA;
-    UChar* spB;
+    char* spA;
+    char* spB;
     UCell* res;
     int argc = 1;
@@ -663 +693 @@
             {
                 ur_setType( res, UT_OPCODE );
-                ur_opcode(res)     = ur_int(ur_s_next(res));
-                ur_opcodeAtom(res) = ur_atom(tos);
+                ur_opcode(res) = ur_int(ur_s_next(res));
+                ur_atom(res)   = ur_atom(tos);
             }
             break;