Changeset 186

Timestamp:

06/17/06 21:06:45 (3 years ago)

Author:

krobillard

Message:

Thune - Can now tokenize int! as hexadecimal.

Location:

trunk/thune

Files:

• charset.c (modified) (1 diff)
• charset.h (modified) (1 diff)
• eval.c (modified) (2 diffs)
• make.c (modified) (3 diffs)
• print.c (modified) (4 diffs)
• tests/working/parse.good (modified) (2 diffs)
• tests/working/parse.t (modified) (3 diffs)
• tokenize.c (modified) (6 diffs)

trunk/thune/charset.c

@@ -51 +51 @@
 
 
+/* Hex: 0-9 a-z A-Z */
+uint8_t charset_hex[32] = {
+    0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x03,
+    0x7E,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+};
+
+
 /*EOF*/

trunk/thune/charset.h

@@ -8 +8 @@
 extern uint8_t charset_word[32];
 extern uint8_t charset_binary[32];
+extern uint8_t charset_hex[32];
 
 

trunk/thune/eval.c

@@ -49 +49 @@
 #define PUSHC_CELL(val) \
     *((UCell*) UR_TOC) = val; \
-    UR_C_GROW
-
-#define PUSHC_NONE \
-    ur_initType(UR_TOC, UT_NONE); \
     UR_C_GROW
 
@@ -855 +851 @@
                         while( argc < totc )
                         {
-                            PUSHC_NONE;
+                            ur_initType(UR_TOC, UT_NONE);
+                            UR_C_GROW;
                             ++argc;
                         }

trunk/thune/make.c

@@ -28 +28 @@
 
 extern int ur_stringToInt( const char*, const char*, const char** );
+extern int ur_hexToInt( const char*, const char*, const char** );
 extern double ur_stringToDec( const char*, const char*, const char** );
 
@@ -916 +917 @@
         {
             int n = 0;
+            int hex = 0;
             if( ur_is(tos, UT_DECIMAL) )
             {
@@ -923 +925 @@
             {
                 if( spA )
-                    n = ur_stringToInt( spA, spB, 0 );
+                {
+                    if( *spA == '$' )
+                    {
+                        n = ur_hexToInt( ++spA, spB, 0 );
+                        hex = 1;
+                    }
+                    else
+                    {
+                        n = ur_stringToInt( spA, spB, 0 );
+                    }
+                }
             }
             else
                 goto error;
+
             ur_initType( res, UT_INT );
             ur_int(res) = n;
+            if( hex )
+                res->id.flags |= UR_FLAG_INT_HEX;
         }
             break;

trunk/thune/print.c

@@ -167 +167 @@
     EXPAND( out, 16 );
     cp = out->ptr.c + out->used;
-/*
-    strPrint( cp, "$%x", n );
-    while( *cp != '\0' )
-        ++cp;
-*/
     *cp++ = '$';
     cp = ur_intToStr( n, cp, 16 );
-
     out->used = cp - out->ptr.c;
 }
@@ -706 +700 @@
                             EXPAND( out, 32 );
                             cp = out->ptr.c + out->used;
-                            strPrint( cp, "%dx%d", val->pair[0], val->pair[1]);
-                            while( *cp != '\0' )
+                            strPrint( cp, "%dx%d", val->pair[0], val->pair[1]); while( *cp != '\0' )
                                 ++cp;
                             out->used = cp - out->ptr.c;
@@ -804 +797 @@
     */
 
-    switch( val->id.type )
+    switch( ur_type(val) )
     {
         case UT_NONE:       append(out, "none", 4); break;
@@ -1199 +1192 @@
 
         default:
-            {
-            char* cp;
-            append( out, "<bad dt #", 9 );
-            EXPAND( out, 12 );
-            cp = out->ptr.c + out->used;
-            strPrint( cp, "%x", val->num.i);
-            while( *cp != '\0' )
-                ++cp;
-            out->used = cp - out->ptr.c;
+            append( out, "<bad dt ", 8 );
+            appendInteger( out, ur_type(val) );
             append1('>', out);
-            }
             break;
     }

trunk/thune/tests/working/parse.good

@@ -1 +1 @@
 -- T1 Types --
 [:a-b 1 c2 1.23 2 3
+    $FF $20
     'go 'd' 0
     arr/1 pos/x
@@ -10 +11 @@
 int! 2
 int! 3
+int! $FF
+int! $20
 lit-word! 'go
 char! 'd'

trunk/thune/tests/working/parse.t

@@ -38 +38 @@
     ['0' - '9'] charset :digit
     ['a' - 'z' 'A' - 'Z'] charset :alpha
-    ['a' - 'z' 'A' - 'Z' '0' - '9' "+-*_.,!?|&"] charset :wordc
-    ['a' - 'z' 'A' - 'Z' "+-*/_.,!?|&"] charset :word-start
+    ['a' - 'z' 'A' - 'Z' '0' - '9' "+-*_.,!?|&<>="] charset :wordc
+    ['a' - 'z' 'A' - 'Z' "+-*/_.,!?|&<>="] charset :word-start
     ['0' - '9'] charset :digit
     ['0' - '9' 'a' - 'f' 'A' - 'F'] charset :hex
@@ -61 +61 @@
         | opt sign some digit [
               '.' any digit tok:  (decimal! tok app)
+            ;| 1 5 [',' opt sign some digit] tok: (tuple! tok app)
             | tok:  (int! tok app)
           ]
+        | '$' some hex tok: (int! tok app)
+        ;| '<' any ' ' 1 3 decimal any ' ' '>' tok: (vec3! tok app)
         | word [
               ':' tok:  (get-word! tok slice.prev app)
@@ -104 +107 @@
 {-- T1 Types --} print
 {:a-b 1 c2 1.23 2 3
+ $ff $0020
  'go 'd' 0.0
  arr/1  pos/x

trunk/thune/tokenize.c

@@ -59 +59 @@
 
 
-#ifdef OR_CONFIG_HEX_TOKEN
-int hexStringToInt( const char* start, const char* end )
-{
+int ur_hexToInt( const char* start, const char* end, const char** pos )
+{
+    int cn;
     int n = 0;
     const char* cp = start;
@@ -69 +69 @@
     while( cp != end )
     {
+        cn = *cp;
+        if( cn >= 'a' )
+            cn = cn - 'a' + 10;
+        else if( cn >= 'A' )
+            cn = cn - 'A' + 10;
+        else
+            cn -= '0';
+        if( cn < 0 || cn > 15 )
+            goto finish;
+
         n *= 16;
-        if( *cp >= 'a' )
-            n += *cp - 'a' + 10;
-        else if( *cp >= 'A' )
-            n += *cp - 'A' + 10;
-        else
-            n += *cp - '0';
-        ++cp;
-    }
+        n += cn;
+        ++cp;
+    }
+
+finish:
+
     if( *start == '-' )
         n = -n;
-
+    if( pos )
+        *pos = cp;
     return n;
 }
-#endif
 
 
@@ -212 +220 @@
 #define BLOCK           ur_blockPtr( STACK[ stack.used - 1 ] )
 #define IS_DIGIT(v)     (('0' <= v) && (v <= '9'))
+#define IS_HEX(v)       ur_bitIsSet(charset_hex,v)
 
 #define syntaxError(msg) \
@@ -296 +305 @@
                     ++it;
                     goto sign;
+
+                case '$':
+                    ++it;
+                    goto dollar;
 
                 case '[':
@@ -421 +434 @@
     if( IS_DIGIT(ch) )
         goto integer;
+    goto word;
+
+dollar:
+
+    if( it == end )
+    {
+        mode = UT_WORD;
+        goto word_append;
+    }
+    ch = *it;
+    if( IS_HEX(ch) )
+        goto hex_num;
+    //goto word;
 
 word:
@@ -507 +533 @@
     cell = ur_appendCell( BLOCK, mode );
     if( mode == UT_DECIMAL )
+    {
         ur_decimal(cell) = ur_stringToDec( token, it, 0 );
+    }
     else
+    {
         ur_int(cell) = ur_stringToInt( token, it, 0 );
+    }
+    goto set_eol;
+
+hex_num:
+
+    SCAN_LOOP
+        if( ! IS_HEX(ch) )
+            break;
+    SCAN_END
+
+    cell = ur_appendCell( BLOCK, UT_INT );
+    cell->id.flags |= UR_FLAG_INT_HEX;
+    ur_int(cell) = ur_hexToInt( ++token, it, 0 );
     goto set_eol;