Changeset 327 for trunk/thune/make.c

Timestamp:

12/27/06 20:33:47 (2 years ago)

Author:

krobillard

Message:

Thune - Can make select! from stack values.

Files:

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

trunk/thune/make.c

@@ -745 +745 @@
     return 0;
 }
+
+
+/*--------------------------------------------------------------------------*/
+
+
+#if 0
+typedef struct
+{
+    UAtom    name;
+    uint16_t index;
+    UAtom    ctype;
+}
+UStructField;
+
+
+/*
+   [field1 type1  field2 type2 ...]  
+*/
+UIndex ur_makeStructCell( const UCell* from, UCell* res ) 
+{
+    UArray* bin;
+    UIndex binN = 0;
+
+    if( ur_is(from, UT_BLOCK) )
+    {
+        UBlock* blk;
+        UCell* it;
+        UCell* end;
+        int count;
+        UAtom wrd;
+
+        blk = ur_block( from );
+        UR_ITER_BLOCK( it, end, blk, from )
+
+        wrd = 0;
+        count = 0;
+
+        while( it != end )
+        {
+            if( ur_is(it, UT_WORD) )
+            {
+                if( count & 1 )
+                {
+                    wrd = ur_atom(it);
+                }
+                else
+                {
+                    switch( ur_atom(it) )
+                    {
+                        case UT_CHAR:
+                            break;
+                        case UT_INT:
+                            break;
+                        case UT_INT64:
+                            break;
+                        case UT_DECIMAL:
+                            break;
+                        case UT_VECTOR:
+                            break;
+                    }
+                }
+                ++count;
+            }
+
+            ++it;
+        }
+
+        binN = ur_makeBinary( end - it, &bin );
+    }
+    //else if( ur_is(from, UT_STRUCT) ) { }
+
+    if( binN )
+    {
+        ur_initType(res, UT_STRUCT);
+        ur_setSeries(res, binN, 0);
+        return binN;
+    }
+
+    return 0;
+}
+#endif
 
 
@@ -1203 +1284 @@
   (opcode! code word -- value)
   (binary! int bytes -- value)
+  (select! word sel -- value)
   (context block -- value)
 */
@@ -1314 +1396 @@
                     goto error;
             }
+#ifdef LANG_THUNE
+            else if( argc == 2 )
+            {
+                UCell* wrd = ur_s_prev(tos);
+                if( ! ur_isAWord(wrd) )
+                    goto error;
+
+                ur_copyCell( res, *wrd );
+                ur_type(res) = UT_SELECT;
+
+                if( ur_is(tos, UT_INT) )
+                {
+                    res->id.flags &= ~UR_FLAG_SEL_ATOM;
+                    ur_sel(res) = ur_int(tos);
+                }
+                else if( ur_isAWord(tos) )
+                {
+                    res->id.flags |= UR_FLAG_SEL_ATOM;
+                    ur_sel(res) = ur_atom(tos);
+                }
+            }
+#endif
             break;
 
@@ -1570 +1674 @@
         {
             // Make array before setting res in case GC is called.
-            UIndex binN = ur_makeVectorCell( tos, res );
-            if( ! binN )
+            if( !  ur_makeVectorCell( tos, res ) )
                 goto error;
         }
@@ -1652 +1755 @@
 #endif
 
+#if 0
+        case UT_STRUCT:
+            if( ! ur_makeStructCell( tos, res ) )
+                goto error;
+            break;
+#endif
+
         default:
             if( ur_datatype(res) < UT_BI_COUNT )