Changeset 172 for trunk/thune/make.c

Timestamp:

06/08/06 01:12:46 (3 years ago)

Author:

krobillard

Message:

Thune - Implemented datatype typemask.

Files:

• trunk/thune/make.c (modified) (1 diff)

trunk/thune/make.c

@@ -624 +624 @@
 
 
+#define UR_MAX_PATH_LEN     16      // LIMIT: Maximum path/typemask nodes.
+
+
+#define SET_PATH_NODE \
+    if( count == (UR_MAX_PATH_LEN - 1) ) \
+        return 0; \
+    if( *cp >= '0' && *cp <= '9' ) \
+    { \
+        node[ count ] = ur_stringToInt( cp, it, 0 ); \
+    } else { \
+        nodeType |= 1 << count; \
+        node[ count ] = ur_intern( cp, it - cp ); \
+    } \
+    ++count;
+
+
+/*
+   Returns zero if spA is not a valid selector, datatype, or path.
+*/
 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 )
+    const char* it;
+    int16_t node[ UR_MAX_PATH_LEN ];
+    int i;
+    int nodeType = 0;
+    int count = 0;
+
+    cp = it = spA;
+
+    while( it != end )
+    {
+        if( *it == '/' )
+        {
+            SET_PATH_NODE
+            cp = it + 1;
+        }
+        ++it;
+    }
+
+    if( cp == it )              // Empty or ends with '/'.
         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;
+    if( (nodeType & 1) == 0 )   // First node must be a word.
+        return 0;
+
+    SET_PATH_NODE
+
+    // Check if path is a typemask.
+    for( i = 0; i < count; ++i )
+    {
+        if( (nodeType & (1 << i)) == 0 )
+            break;
+        if( node[ i ] >= UT_COUNT )
+            break;
+    }
+
+    if( i == count )
+    {
+        ur_setType( res, UT_DATATYPE );
+        ur_datatype(res) = UT_TYPEMASK;
+        res->dt.bitCount = count;
+        ur_setDatatypeMask( res, node[0] );
+        for( i = 1; i < count; ++i )
+            ur_setDatatypeBit( res, node[ i ] );
+
+        return 1;
+    }
+
+    if( count == 2 )
+    {
+        ur_setType( res, UT_SELECTOR );
+        if( nodeType & 2 )
+            res->id.flags |= UR_FLAG_SEL_ATOM;
+        res->word.valBlk = GLOBAL_VAL_BLKN;
+        res->word.atom   = node[0];
+        ur_selector(res) = node[1];
+        res->word.index  = ur_internWord( &ur_global, res->word.atom );
+
+        return 1;
+    }
+
+    // TODO: make path!
+    return 0;
 }