Changeset 426 for branches/thune/thread_safe/tokenize.c

Timestamp:

07/05/07 04:03:51 (17 months ago)

Author:

krobillard

Message:

Added component! & lit-select! datatypes.
ur_makeBlockT() now has a ptr return argument.

Files:

• branches/thune/thread_safe/tokenize.c (modified) (4 diffs)

branches/thune/thread_safe/tokenize.c

@@ -539 +539 @@
     }
 
+    mode = UT_LITWORD;
+
     SCAN_LOOP
-        if( ur_bitIsSet( charset_delimiters, ch ) )   // '[' 'word[]
+        if( ch == '/' )
+        {
+            mode = UT_LITSELECT;
+        }
+        else if( ur_bitIsSet( charset_delimiters, ch ) )   // '[' 'word[]
+        {
             break;
+        }
     SCAN_END
 
@@ -549 +557 @@
         if( it == token )
             goto quote_err;
-        cell = ur_appendWord( BLOCK, UT_LITWORD, token, it - token );
+        if( mode == UT_LITWORD )
+        {
+            cell = ur_appendWord( BLOCK, UT_LITWORD, token, it - token );
+        }
+        else
+        {
+            cell = ur_appendCell( BLOCK, UT_UNSET );
+            if( ! ur_makeSelector( ut, cell, token, it ) )
+            {
+                syntaxError( "Invalid lit-select" );
+            }
+            ur_type(cell) = UT_LITSELECT;
+        }
         goto set_eol;
     }
@@ -591 +611 @@
 #endif
 
-    mode = (ch == '\'') ? UT_LITWORD : UT_WORD;
+    mode = UT_WORD;
 
     SCAN_LOOP
-        if( ch == ':' /*&& (mode != UT_LITWORD)*/ )
+        if( ch == ':' )
         {
             mode = WORD_COLON;
@@ -638 +658 @@
             if( ! ur_makeSelector( ut, cell, token, it ) )
             {
-                syntaxError( "Invalid selector" );
+                syntaxError( "Invalid select" );
             }
         }