Changeset 141 for trunk/thune/make.c

Timestamp:

05/06/06 04:54:25 (3 years ago)

Author:

krobillard

Message:

Thune - Implemented selector!

Files:

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

trunk/thune/make.c

@@ -25 +25 @@
 #include "os.h"
 #include "internal.h"
+
+
+extern int ur_stringToInt( const char*, const char*, const char** );
+extern double ur_stringToDec( const char*, const char*, const char** );
 
 
@@ -472 +476 @@
 
 
+int ur_makeSelector( UCell* res, const char* spA, const char* end )
+{
+    const char* cp;
+    const char* sep = spA;
+    while( sep != end )
+    {
+        if( *sep == '/' )
+            break;
+        ++sep;
+    }
+    if( sep == end )
+        return 0;
+
+    ur_setType( res, UT_SELECTOR );
+
+    cp = sep + 1;
+    if( *cp >= '0' && *cp <= '9' )
+    {
+        ur_selector(res) = ur_stringToInt( cp, end, 0 );
+    }
+    else
+    {
+        res->id.flags |= UR_FLAG_SEL_ATOM;
+        ur_selector(res) = ur_intern( cp, end - cp );
+    }
+
+    res->word.valBlk = GLOBAL_VAL_BLKN;
+    res->word.atom   = ur_intern( spA, sep - spA );
+    res->word.index  = ur_internWord( &ur_global, res->word.atom );
+
+    return 1;
+}
+
+
+/*--------------------------------------------------------------------------*/
+
+
 static void _makeContextProto( UContext* ctx, const UCell* proto )
 {
@@ -580 +621 @@
 
 /*--------------------------------------------------------------------------*/
-
-
-extern int ur_stringToInt( const char*, const char*, const char** );
-extern double ur_stringToDec( const char*, const char*, const char** );
 
 
@@ -649 +686 @@
                 res->word.atom   = ur_intern( spA, spB - spA );
                 res->word.index  = ur_internWord( &ur_global, res->word.atom );
+            }
+            break;
+
+        case UT_SELECTOR:
+            if( ur_stringSlice(tos, &spA, &spB) && spA )
+            {
+                if( ! ur_makeSelector( res, spA, spB ) )
+                    goto error;
             }
             break;