Changeset 480

Timestamp:

09/24/07 23:27:09 (13 months ago)

Author:

krobillard

Message:

Line comments now set SOL for next value.
Select! now supports a negative index.

Location:

trunk/thune

Files:

• doc/UserManual (modified) (1 diff)
• eval.c (modified) (1 diff)
• make.c (modified) (1 diff)
• tokenize.c (modified) (1 diff)

trunk/thune/doc/UserManual

@@ -646 +646 @@
     "Hello world" :s
     s 2,4 slice .          ; "ello"
-    s -2 slice .           ; ""Hello wor"
+    s -2 slice .           ; "Hello wor"
 
 

trunk/thune/eval.c

@@ -170 +170 @@
                 goto set_none;
         }
+        ur_throwErr( UR_ERR_SCRIPT, "Invalid select!" );
+        return 0;
     }
     else
     {
-        if( ur_pick( ut, val, ur_sel(sel) - 1, res ) )
-            return 1;
-    }
-
-    ur_throwErr( UR_ERR_SCRIPT, "Invalid select!" );
-    return 0;
+        int n = ur_sel(sel);
+        if( n )
+        {
+            if( n > 0 )
+                --n;
+            if( ur_pick( ut, val, n, res ) )
+                return 1;
+        }
+    }
 
 set_none:

trunk/thune/make.c

@@ -1054 +1054 @@
     if( count == (UR_MAX_PATH_LEN - 1) ) \
         return 0; \
-    if( *cp >= '0' && *cp <= '9' ) \
-    { \
+    if( (*cp >= '0' && *cp <= '9') || (*cp == '-') ) { \
         node[ count ] = ur_stringToInt( cp, it, 0 ); \
     } else { \

trunk/thune/tokenize.c

@@ -517 +517 @@
             ++lines;
             ++it;
+            sol = 1;
             goto start;
         }