Changeset 260 for trunk/thune/eval.c

Timestamp:

08/29/06 22:25:58 (2 years ago)

Author:

krobillard

Message:

Thune - Added experimental Rune evaluator.

Files:

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

trunk/thune/eval.c

@@ -2358 +2358 @@
 
 
+/*
+   Returns index of new signature block, number of arguments in pArgc, and
+   total number of arguments and local variables in pVarc.
+*/
+#ifndef LANG_RUNE
+static
+#endif
+UIndex _funcSignature( const UCell* scell, int* pArgc, int* pVarc )
+{
+    UIndex sigN;
+    UBlock* blk;
+    UCell* dst;
+    UCell* it;
+    UCell* end;
+    int argc;
+    int varc;
+    int inLocal;
+
+
+    argc = varc = 0;
+
+    sigN = scell->series.n;
+    blk = ur_block( scell );
+    it  = blk->ptr.cells;
+    end = it + blk->used;
+
+    inLocal = 0;
+    while( it != end )
+    {
+        if( ur_is(it, UT_WORD) )
+        {
+            if( ur_atom(it) == UR_ATOM_DDASH )
+                break;
+            if( ur_atom(it) == UR_ATOM_BAR )
+                inLocal = 1;
+            else if( ur_atom(it) >= UT_COUNT )
+            {
+                if( ! inLocal )
+                    ++argc;
+                ++varc;
+            }
+        }
+        ++it;
+    }
+
+    it  = blk->ptr.cells;
+    sigN = ur_makeBlock( argc + varc );
+    blk = ur_blockPtr(sigN);
+    dst = blk->ptr.cells;
+    inLocal = 0;
+    while( it != end )
+    {
+        if( ur_is(it, UT_WORD) )
+        {
+            if( ur_atom(it) == UR_ATOM_DDASH )
+                break;
+            if( ur_atom(it) == UR_ATOM_BAR )
+                inLocal = 1;
+            else if( ur_atom(it) < UT_COUNT )
+            {
+                UCell* cell = dst + varc - 1;
+                ur_initType( cell, UT_DATATYPE );
+                ur_datatype(cell) = ur_atom(it);
+                ur_setDatatypeMask( cell, ur_atom(it) );
+            }
+            else
+            {
+                if( ! inLocal )
+                    ur_initType( dst + varc, UT_NONE );
+                *dst++ = *it;
+            }
+        }
+        else if( ur_is(it, UT_DATATYPE) )
+        {
+            dst[varc - 1] = *it;
+        }
+        ++it;
+    }
+    blk->used = varc;
+
+    *pArgc = argc;
+    *pVarc = varc;
+
+    return sigN;
+}
+
+
 // (sig body ['loop] -- func)
 UR_CALL( uc_func )
@@ -2366 +2453 @@
     int varc;
     int loop;
-    UBlock* blk;
     UCell* res;
     UContext lctx;
@@ -2388 +2474 @@
 
         // Scan signature
-        sigN = res->series.n;
-        blk = ur_block( res );
-        argc = varc = 0;
-        {
-            int inLocal;
-            UCell* dst;
-            UCell* it  = blk->ptr.cells;
-            UCell* end = it + blk->used;
-
-            inLocal = 0;
-            while( it != end )
-            {
-                if( ur_is(it, UT_WORD) )
-                {
-                    if( ur_atom(it) == UR_ATOM_DDASH )
-                        break;
-                    if( ur_atom(it) == UR_ATOM_BAR )
-                        inLocal = 1;
-                    else if( ur_atom(it) >= UT_COUNT )
-                    {
-                        if( ! inLocal )
-                            ++argc;
-                        ++varc;
-                    }
-                }
-                ++it;
-            }
-
-            it  = blk->ptr.cells;
-            sigN = ur_makeBlock( argc + varc );
-            blk = ur_blockPtr(sigN);
-            dst = blk->ptr.cells;
-            inLocal = 0;
-            while( it != end )
-            {
-                if( ur_is(it, UT_WORD) )
-                {
-                    if( ur_atom(it) == UR_ATOM_DDASH )
-                        break;
-                    if( ur_atom(it) == UR_ATOM_BAR )
-                        inLocal = 1;
-                    else if( ur_atom(it) < UT_COUNT )
-                    {
-                        UCell* cell = dst + varc - 1;
-                        ur_initType( cell, UT_DATATYPE );
-                        ur_datatype(cell) = ur_atom(it);
-                        ur_setDatatypeMask( cell, ur_atom(it) );
-                    }
-                    else
-                    {
-                        if( ! inLocal )
-                            ur_initType( dst + varc, UT_NONE );
-                        *dst++ = *it;
-                    }
-                }
-                else if( ur_is(it, UT_DATATYPE) )
-                {
-                    dst[varc - 1] = *it;
-                }
-                ++it;
-            }
-            blk->used = varc;
-        }
+        sigN = _funcSignature( res, &argc, &varc );
 
         lctx.ctx.wordBlk =  sigN;