Changeset 276 for trunk/thune/eval.c

Timestamp:

09/18/06 03:43:03 (2 years ago)

Author:

krobillard

Message:

Thune - Custom datatypes can now be created. Added raster! to GL.

Files:

• trunk/thune/eval.c (modified) (6 diffs)

trunk/thune/eval.c

@@ -186 +186 @@
 
 
+typedef int (*UDatatypeSelFunc)( UThread*, UCell*, const UCell*, UCell* );
+
 /**
   Returns non-zero if successful.
@@ -241 +243 @@
             }
                 goto set_none;
+
+            default:
+                if( ur_type(val) >= UT_BI_COUNT )
+                {
+                    UDatatypeSelFunc func = ur_thread->env->customDT
+                                [ ur_type(val) - UT_BI_COUNT ].selectAtom;
+                    if( func )
+                        return func( ur_thread, val, sel, res );
+                }
+                goto set_none;
         }
     }
@@ -391 +403 @@
                 UString* str;
                 ur_throwErr( ur_thread, UR_EX_DATATYPE,
-                             "found %s! at TOS-%d; expected ",
+                             "found %s at TOS-%d; expected ",
                              ur_typeName( ur_type(it) ),
                              count - (int) (end - it) );
@@ -1342 +1354 @@
 
     --pc;
-    ur_throwErr( ur_thread, UR_EX_DATATYPE, "invalid type %s! for '%s opcode",
+    ur_throwErr( ur_thread, UR_EX_DATATYPE, "invalid type %s for '%s opcode",
                  ur_typeName( ur_type(UR_TOS) ),
                  ur_atomCStr( ur_atom(pc), 0 ) );
@@ -2346 +2358 @@
             if( ur_atom(it) == UR_ATOM_BAR )
                 inLocal = 1;
-            else if( ur_atom(it) >= UT_COUNT )
+            else if( ur_atom(it) >= UT_BI_COUNT )
             {
                 if( ! inLocal )
@@ -2369 +2381 @@
             if( ur_atom(it) == UR_ATOM_BAR )
                 inLocal = 1;
-            else if( ur_atom(it) < UT_COUNT )
+            else if( ur_atom(it) < UT_BI_COUNT )
             {
                 UCell* cell = dst + varc - 1;