Changeset 391

Timestamp:

05/19/07 05:57:36 (18 months ago)

Author:

krobillard

Message:

Thune - Implemented block parse 'set.

Location:

trunk/thune

Files:

• parse.c (modified) (8 diffs)
• tests/working/parse_block.t (modified) (1 diff)

trunk/thune/parse.c

@@ -608 +608 @@
 
 
+#define CHECK_WORD(cell) \
+    if( ! cell ) { \
+        pe->error = PARSE_EX_ERROR; \
+        return 0; }
+
 /*
    Returns zero if matching rule not found or exception occured.
@@ -718 +723 @@
                             {
                                 tval = ur_wordCell( pe->thread, rit );
+                                CHECK_WORD( tval )
                             }
                         }
@@ -760 +766 @@
                         break;
 
+                    case UR_ATOM_SET:
+                        ++rit;
+                        if( rit == rend )
+                            goto unexpected_end;
+                        if( ! ur_is(rit, UT_WORD) )
+                        {
+                            ur_throwErr( PARSE_EX, "parse set expected word" );
+                            pe->error = PARSE_EX_ERROR;
+                            return 0;
+                        }
+                        {
+                        UCell* cell = ur_wordCell( pe->thread, rit );
+                        CHECK_WORD( cell )
+                        ur_copyCell( cell, iblk->ptr.cells[ pos ] );
+                        }
+                        ++rit;
+                        break;
+
                     //case UR_ATOM_COPY:
 
@@ -765 +789 @@
                     {
                         tval = ur_wordCell( pe->thread, rit );
+                        CHECK_WORD( tval )
 
                         if( ur_is(tval, UT_BLOCK) )
@@ -785 +810 @@
                 UCell* cell;
                 cell = ur_wordCell( pe->thread, rit );
+                CHECK_WORD( cell )
                 ++rit;
 
@@ -798 +824 @@
                 UCell* cell;
                 cell = ur_wordCell( pe->thread, rit );
+                CHECK_WORD( cell )
                 ++rit;
 
@@ -902 +929 @@
     if( rit == rend )
     {
+unexpected_end:
         ur_throwErr( PARSE_EX, "Enexpected end of parse rule" );
         pe->error = PARSE_EX_ERROR;
@@ -913 +941 @@
         {
             tval = ur_wordCell( pe->thread, rit );
+            CHECK_WORD( tval )
         }
         else

trunk/thune/tests/working/parse_block.t

@@ -10 +10 @@
 prog [some[
       'min :a int!               (["Minimum:" a/1] print)
-    | 'max :a [int! | decimal!]  (["Maximum:" a/1] print)
+    | 'max set a [int! | decimal!]  (["Maximum:" a] print)
     | 'fire :a word!             (["Fired:"   a/1] print)
     | 'range :a int! int!        (["Range:" a/1 "-" a/2] print)