Changeset 491 for trunk/thune/tokenize.c

Timestamp:

10/20/07 18:18:45 (13 months ago)

Author:

krobillard

Message:

Macros are now created with caret followed by paren: ^(...)

Files:

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

trunk/thune/tokenize.c

@@ -400 +400 @@
                     goto dollar;
 
+#ifdef UR_CONFIG_MACROS
+                case '^':
+                    ++it;
+                    if( it == end || *it != '(' )
+                        goto word;
+                    // Fall through...
+#endif
                 case '[':
                 case '(':
-                case '<':
                     ur_arrayReserve( &stack, sizeof(UIndex), stack.used+1 );
                     STACK[ stack.used ] = ur_makeBlock( 0 );
@@ -411 +417 @@
                         case '(': mode = UT_PAREN; break;
 #ifdef UR_CONFIG_MACROS
-                        case '<': mode = UT_MACRO;
+                        case '^': mode = UT_MACRO;
 #ifdef MACRO_CONTEXT
                             if( ! macroNest )
@@ -434 +440 @@
                 case ']':
                 case ')':
-#ifdef UR_CONFIG_MACROS
-                case '>':
-#endif
                     if( stack.used == 1 )
                     {
@@ -448 +451 @@
                         sol = 0;
 #ifdef UR_CONFIG_MACROS
-                    if( ch == '>' && macroNest )
+                    if( ch == ')' && macroNest )
                     {
                         UCell* otos;
                         UBlock* blk;
                         UIndex blkN;
+
+                        blk = BLOCK;
+                        if( (blk->used < 1) ||
+                            (ur_type(blk->ptr.cells + blk->used - 1) !=
+                                UT_MACRO) )
+                            break;
 
                         otos = UR_TOS;
@@ -467 +476 @@
                         }
 
-                        blk = ur_blockPtr( STACK[stack.used - 1] );
+                        blk = BLOCK;
                         --blk->used;    // Remove macro.