Changeset 491

Timestamp:

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

Author:

krobillard

Message:

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

Location:

trunk/thune

Files:

• charset.c (modified) (2 diffs)
• gl/scripts/view.t (modified) (5 diffs)
• gl/test.t (modified) (1 diff)
• tokenize.c (modified) (5 diffs)

trunk/thune/charset.c

@@ -26 +26 @@
 /* Start of Word: a-z A-Z ?!.*&|=_~ and all ascii >= 127  */
 uint8_t charset_sword[32] = {
-#ifdef UR_CONFIG_MACROS
-        0x00,0x00,0x00,0x00,0x42,0x44,0x00,0xA0,    // Don't allow < >
-#else
         0x00,0x00,0x00,0x00,0x42,0x44,0x00,0xF0,
-#endif
         0xFE,0xFF,0xFF,0x97,0xFF,0xFF,0xFF,0x57,
         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
@@ -39 +35 @@
 /* Word: 0-9 a-z A-Z ?!.+-*&|=_~ and all ascii >= 127 */
 uint8_t charset_word[32] = {
-#ifdef UR_CONFIG_MACROS
-        0x00,0x00,0x00,0x00,0x42,0x6C,0xFF,0xA3,    // Don't allow < >
-#else
         0x00,0x00,0x00,0x00,0x42,0x6C,0xFF,0xF3,
-#endif
         0xFE,0xFF,0xFF,0x97,0xFF,0xFF,0xFF,0x57,
         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,

trunk/thune/gl/scripts/view.t

@@ -1 +1 @@
 ; Thune GL View
 
-<"scripts/stars.t" load do>
+^("scripts/stars.t" load do)
 
 ;"scripts/timer_bar.t" load do
@@ -33 +33 @@
         particle
         shader star-sh
-        call <400 make-stars>
+        call ^(400 make-stars)
 
         particle/sprite
         shader bstar-sh
-        call <10 make-stars>
+        call ^(10 make-stars)
     pop
     ;particle/off
@@ -128 +128 @@
     [
         model
-        shader ent-shader   ; FIXME: Causes text not to render.
+        shader ent-shader
         call ent-dl
 
@@ -256 +256 @@
         dup :mouse-pos
         mouse-pos/5 [
-            <mouse-lb> [mouse-pos/3 mouse-pos/4 view-cam/turntable]
-            <mouse-mb> [light-amb mouse-pos/4 0.02 mul add :light-amb]
-            <mouse-rb> [mouse-pos/3 mouse-pos/4 move-light]
+            ^(mouse-lb) [mouse-pos/3 mouse-pos/4 view-cam/turntable]
+            ^(mouse-mb) [light-amb mouse-pos/4 0.02 mul add :light-amb]
+            ^(mouse-rb) [mouse-pos/3 mouse-pos/4 move-light]
         ] case
+        ; KR "------------" print .s
     ]
 
@@ -301 +302 @@
         text text-pos "Model Demo 1"
         ;enable/?
-        image/trans logo-pos <"image/warpfleetc.png" load.tex.clamp>
+        image/trans logo-pos ^("image/warpfleetc.png" load.tex.clamp)
 
         ;shader matte

trunk/thune/gl/test.t

@@ -2 +2 @@
 
 
-"data_loc" change-dir
+"local_data" change-dir
 
 ;1024,768 'fullscreen display

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.