Changeset 408 for branches/thune/thread_safe/tokenize.c

Timestamp:

06/11/07 04:07:02 (18 months ago)

Author:

krobillard

Message:

Thune - Simplified macros with macro! datatype.

Files:

• branches/thune/thread_safe/tokenize.c (modified) (11 diffs)

branches/thune/thread_safe/tokenize.c

@@ -204 +204 @@
 
 
-/*
-#if UR_CONFIG_MATH3D
-static int isVec3( const char* cp, int len ) 
+#ifdef UR_CONFIG_MACROS
+extern void ur_infuseOpcodes( UThread*, UIndex );
+
+//#define MACRO_CONTEXT   1
+#ifdef MACRO_CONTEXT
+extern UContext ur_global;
+
+static void _pushMacroContext( UThread* ut )
 {
-    if( len < 3 )
-        return 0;
-    if( *cp == '-' )
-        ++cp;
-    if( *cp < '0' || *cp > '9' )
-        return 0;
-    return 1;
-}
-
-
-static void assignVec3( float* vec, const char* start, int len )
-{
-    int ch;
-    const char* pos;
-    const char* end = start + len;
-
-    *vec++ = (float) ur_stringToDec( start, end, &pos );
-    while( pos != end )
-    {
-        ch = *pos;
-        if( ! ur_bitIsSet(charset_white, ch) )
-            break;
-        ++pos;
-    }
-    *vec++ = (float) ur_stringToDec( pos, end, &pos );
-    while( pos != end )
-    {
-        ch = *pos;
-        if( ! ur_bitIsSet(charset_white, ch) )
-            break;
-        ++pos;
-    }
-    *vec   = (float) ur_stringToDec( pos, end, &pos );
+    UBlock* blk;
+    UCell* mc;
+    int wrdN;
+   
+    wrdN = ur_internWord( &ur_global, UR_ATOM_READER_MACROS );
+    blk = ur_blockPtr( ur_global.ctx.valBlk );
+    mc = blk->ptr.cells + wrdN;
+    if( ! ur_is(mc, UT_CONTEXT) )
+        ur_makeContext( mc, 0 );
+    ur_pushContext( ut, mc );
 }
 #endif
-*/
-
-
-#ifdef UR_CONFIG_MACROS
-struct TokenizeCallInfo
-{
-    int valueLimit;
-    const char* finalInputPos;
-};
-
-
-static int _evalMacro( UThread* ut, UBlock* blk, UCell* mval,
-                       const char** pin, const char* end )
-{
-    UCell* cell;
-
-    if( ur_is(mval, UT_FUNCTION) )
-    {
-        if( mval->func.localArgs )
-        {
-            UIndex tblkN;
-            UBlock* callBlk;
-            UCell* otos;
-            int ok;
-            struct TokenizeCallInfo tci;
-
-            tci.valueLimit    = mval->func.localArgs;
-            tci.finalInputPos = 0;
-
-            tblkN = ur_tokenize( ut, *pin, end, &tci );
-            *pin = tci.finalInputPos;
-
-            callBlk = ur_blockPtr( tblkN );
-            UR_EXPAND_1( UCell, callBlk, cell );
-            ur_copyCell(cell, *mval);
-            otos = UR_TOS;
-            ok = ur_eval( ut, tblkN, 0 );
-            if( ok != UR_EVAL_OK )
-                return 0;
-            if( UR_TOS == otos )
-                return 1;
-            mval = ur_result( ut, 1 );
-        }
-    }
-
-    if( ur_is(mval, UT_BLOCK) )
-    {
-        // Join blocks (share code with uc_join?).
-        UBlock* s2 = ur_block(mval);
-        int srcLen = s2->used - mval->series.it;
-
-        ur_arrayReserve( blk, sizeof(UCell), blk->used + srcLen );
-
-        ur_copyCells( s2->ptr.cells + mval->series.it,
-                      s2->ptr.cells + s2->used,
-                      blk->ptr.cells + blk->used );
-        blk->used += srcLen;
-    }
-    else
-    {
-        UR_EXPAND_1( UCell, blk, cell );
-        ur_copyCell( cell, *mval );
-    }
-    return 1;
-}
-
-
-static UCell* _macro( UBlock* macroStack, const char* a, const char* b )
-{
-    int wrdN;
-    UCell* top = macroStack->ptr.cells + macroStack->used;
-    UAtom atom = ur_intern( a, b - a );
-
-    while( top != macroStack->ptr.cells )
-    {
-        wrdN = ur_lookup( --top, atom );
-        if( wrdN > -1 )
-        {
-            return ur_blockPtr( top->ctx.valBlk )->ptr.cells + wrdN;
-        }
-    }
-
-    return 0;
-}
 #endif
 
@@ -341 +239 @@
     ur_throwErr( UR_ERR_SYNTAX, "%s (line %d)", msg, lines + 1 ); \
     goto error
+
+
+/*
+   Returns zero if end reached.
+*/
+static const char* blockComment( const char* it, const char* end, int* lines )
+{
+    int ch, tn, mode;
+    int lineCount = 0;
+
+    mode = 0;
+    tn = 0;
+
+    SCAN_LOOP
+        if( ch == '\n' )
+        {
+            ++lineCount;
+            mode = 0;
+        }
+        else
+        {
+            switch( mode )
+            {
+                case 0:
+                    if( ch == '*' )
+                        mode = 1;
+                    else if( ch == '/' )
+                        mode = 2;
+                    break;
+
+                case 1:
+                    if( ch == '/' )
+                    {
+                        if( tn == 0 )
+                        {
+                            *lines += lineCount;
+                            return ++it;
+                        }
+                        --tn;
+                    }
+                    mode = 0;
+                    break;
+
+                case 2:
+                    if( ch == '*' )
+                        ++tn;
+                    mode = 0;
+                    break;
+            }
+        }
+    SCAN_END
+
+    *lines += lineCount;
+    return 0;
+}
 
 
@@ -359 +312 @@
     int lines = 0;
 #ifdef UR_CONFIG_MACROS
-#define TCI     ((struct TokenizeCallInfo*) tci)
-    UBlock* macroStack;
-    int valueLimit;
-
-    cell = ur_resolvePath( UR_ATOM_SCRIPT_ENV,
-                           UT_WORD, UR_ATOM_READER_MACROS,
-                           UT_NONE );
-    macroStack = cell ? ur_block(cell) : 0;
-    valueLimit = tci ? TCI->valueLimit : 0;
-#else
+    int macroNest = 0;
+#endif
+
     (void) tci;
-#endif
 
 
@@ -448 +393 @@
                 case '[':
                 case '(':
+                case '<':
                     ur_arrayReserve( &stack, sizeof(UIndex), stack.used+1 );
                     STACK[ stack.used ] = ur_makeBlock( 0 );
 
-                    cell = ur_appendCell( BLOCK, 
-                                          (ch == '[') ? UT_BLOCK : UT_PAREN );
+                    switch( ch )
+                    {
+                        case '[': mode = UT_BLOCK; break;
+                        case '(': mode = UT_PAREN; break;
+                        case '<': mode = UT_MACRO;
+#ifdef UR_CONFIG_MACROS
+#ifdef MACRO_CONTEXT
+                            if( ! macroNest )
+                                _pushMacroContext( ut );
+#endif
+                            ++macroNest;
+#endif
+                            break;
+                    }
+
+                    cell = ur_appendCell( BLOCK, mode );
                     ur_setSeries( cell, STACK[ stack.used ], 0 );
 
@@ -465 +425 @@
                 case ']':
                 case ')':
+                case '>':
                     if( stack.used == 1 )
                     {
-                        syntaxError( "End of block found without '['" );
+                        ur_throwErr( UR_ERR_SYNTAX,
+                            "End of block '%c' has no opening match (line %d)",
+                                     ch, lines + 1 );
+                        goto error;
                     }
                     --stack.used;
                     if( eol )
+                        eol = 0;
+#ifdef UR_CONFIG_MACROS
+                    if( ch == '>' && macroNest )
                     {
-                        /*
-                        UBlock* blk = ur_blockPtr( STACK[ stack.used - 1 ] );
-                        cell = blk->ptr.cells + blk->used - 1;
-                        cell->id.flags |= UR_FLAG_BLOCK_EOL;
-                        */
-                        eol = 0;
+                        UCell* otos;
+                        UBlock* blk;
+
+                        otos = UR_TOS;
+                        ur_infuseOpcodes( ut, STACK[ stack.used ] );
+                        tn = ur_eval( ut, STACK[ stack.used ], 0 );
+                        if( tn == UR_EVAL_ERROR )
+                        {
+                            UR_CALL_OP = OP_THROW;
+                            goto error;
+                        }
+
+                        blk = ur_blockPtr( STACK[stack.used - 1] );
+                        --blk->used;    // Remove macro.
+
+                        if( UR_TOS != otos )
+                        {
+                            // Append reduced macro to current block.
+                            tn = UR_TOS - otos;
+                            UR_TOS = otos;
+                            ++otos;
+
+                            ur_arrayReserve( blk, sizeof(UCell),
+                                             blk->used + tn );
+                            ur_copyCells( otos, otos + tn,
+                                          blk->ptr.cells + blk->used );
+                            blk->used += tn;
+                        }
+
+#ifdef MACRO_CONTEXT
+                        if( macroNest == 1 )
+                            ur_popContext( ut );
+#endif
+                        --macroNest;
                     }
-#ifdef UR_CONFIG_MACROS
-                    ++it;
-                    goto check_final;
-#else
+#endif
                     break;
-#endif
                 }
             }
@@ -498 +489 @@
         eol = 0;
     }
-#ifdef UR_CONFIG_MACROS
-check_final:
-    if( valueLimit && (stack.used == 1) )
-    {
-        if( --valueLimit == 0 )
-        {
-            TCI->finalInputPos = it;
-            goto finish;
-        }
-    }
-#endif
     goto start;
 
@@ -544 +524 @@
 //block_comment
 
-    mode = 0;
-    tn = 0;
-
-    SCAN_LOOP
-        if( ch == '\n' )
-        {
-            ++lines;
-            mode = 0;
-        }
-        else
-        {
-            switch( mode )
-            {
-                case 0:
-                    if( ch == '*' )
-                        mode = 1;
-                    else if( ch == '/' )
-                        mode = 2;
-                    break;
-
-                case 1:
-                    if( ch == '/' )
-                    {
-                        if( tn == 0 )
-                        {
-                            ++it;
-                            goto start;
-                        }
-                        --tn;
-                    }
-                    mode = 0;
-                    break;
-
-                case 2:
-                    if( ch == '*' )
-                        ++tn;
-                    mode = 0;
-                    break;
-            }
-        }
-    SCAN_END
+    it = blockComment( it, end, &lines );
+    if( it )
+        goto start;
     goto finish;
 
@@ -707 +649 @@
             }
 word_append:
-#ifdef UR_CONFIG_MACROS
-            if( macroStack && mode == UT_WORD )
-            {
-                cell = _macro( macroStack, token, it );
-                if( cell )
-                {
-                    if( _evalMacro( ut, BLOCK, cell, &it, end ) )
-                        goto start;
-                    syntaxError( "Macro evaluation failed" );
-                }
-            }
-#endif
             if( it == token )
                 goto word_err;
@@ -909 +839 @@
         else if( *it == '[' )
         {
+            // TODO: Handle macros in vector!.
             int inNum = 0;
             UArray* arr;
@@ -994 +925 @@
                     goto array_white;
                 }
+                else if( ch == '/' )
+                {
+                    ++it;
+                    if( it == end )
+                        goto bad_array;
+                    if( *it != '*' )
+                        goto bad_array;
+                    it = blockComment( ++it, end, &lines );
+                    if( it )
+                        goto array_white;
+                    goto finish;
+                }
                 else
                 {
@@ -999 +942 @@
                 }
             SCAN_END
-
+bad_array:
             syntaxError( "Invalid array" );
         }