Changeset 451 for branches/thune

Timestamp:

08/19/07 14:21:25 (15 months ago)

Author:

krobillard

Message:

A decimal/vec3 can now start with '.'. Vim syntax handles hex numbers.

Location:

branches/thune/thread_safe

Files:

• charset.c (modified) (1 diff)
• doc/thune.vim (modified) (2 diffs)
• tokenize.c (modified) (11 diffs)

branches/thune/thread_safe/charset.c

@@ -24 +24 @@
 
 
-/* Strict Word: a-z A-Z ?!.*&|=_~ and all ascii >= 127  */
+/* Start of Word: a-z A-Z ?!.*&|=_~ and all ascii >= 127  */
 uint8_t charset_sword[32] = {
 #ifdef UR_CONFIG_MACROS

branches/thune/thread_safe/doc/thune.vim

@@ -49 +49 @@
 " Integers
 syn match       thuneInteger    "\<[+-]\=\d\+\('\d*\)*\>"
+" Hex number
+syn match       thuneInteger    "\$\x\+"
 " Decimals
 syn match       thuneDecimal    "[+-]\=\(\d\+\('\d*\)*\)\=[,.]\d*\(e[+-]\=\d\+\)\="
@@ -66 +68 @@
 " DD.MM.YYYY format
 syn match       thuneDate       "\d\{1,2}\.\d\{1,2}\.\d\{4}\>"
-" Money
-syn match       thuneMoney      "\a*\$\d\+\('\d*\)*\([,.]\d\+\)\="
 " Strings
 syn region      thuneString     oneline start=+"+ skip=+^"+ end=+"+ contains=thuneSpecialChar

branches/thune/thread_safe/tokenize.c

@@ -310 +310 @@
     int tn;         // Each state can use tn & mode as it wishes.
     int mode = 0;
-    int eol = 0;
+    int sol = 0;
     int lines = 0;
 #ifdef UR_CONFIG_MACROS
@@ -332 +332 @@
             {
                 ++lines;
-                eol = 1;
+                sol = 1;
             }
         }
@@ -342 +342 @@
             {
                 ++it;
+                if( ch == '.' && (it != end) )
+                {
+                    ch = *it;
+                    if( IS_DIGIT(ch) )
+                    {
+                        --it;
+                        goto number;
+                    }
+                }
                 goto word;
             }
@@ -347 +356 @@
             {
                 ++it;
-                goto integer;
+                goto number;
             }
             else
@@ -400 +409 @@
                         case '[': mode = UT_BLOCK; break;
                         case '(': mode = UT_PAREN; break;
+#ifdef UR_CONFIG_MACROS
                         case '<': mode = UT_MACRO;
-#ifdef UR_CONFIG_MACROS
 #ifdef MACRO_CONTEXT
                             if( ! macroNest )
@@ -415 +424 @@
 
                     ++stack.used;
-                    if( eol )
+                    if( sol )
                     {
                         cell->id.flags |= UR_FLAG_SOL;
-                        eol = 0;
+                        sol = 0;
                     }
                     break;
@@ -424 +433 @@
                 case ']':
                 case ')':
+#ifdef UR_CONFIG_MACROS
                 case '>':
+#endif
                     if( stack.used == 1 )
                     {
@@ -433 +444 @@
                     }
                     --stack.used;
-                    if( eol )
-                        eol = 0;
+                    if( sol )
+                        sol = 0;
 #ifdef UR_CONFIG_MACROS
                     if( ch == '>' && macroNest )
@@ -488 +499 @@
 set_eol:
 
-    if( eol )
+    if( sol )
     {
         cell->id.flags |= UR_FLAG_SOL;
-        eol = 0;
+        sol = 0;
     }
     goto start;
@@ -590 +601 @@
     ch = *it;
     if( IS_DIGIT(ch) )
-        goto integer;
+        goto number;
     goto word;
 
@@ -685 +696 @@
     syntaxError( "Invalid word" );
 
-integer:
+number:
 
     mode = UT_INT;