Changeset 872

Timestamp:

11/27/11 10:20:29 (6 months ago)

Author:

msl

Message:

Aktualisierung auf Rev. 1434 offizieller Trunk

*  http://trac.assembla.com/chdk/changeset/1434/trunk
* Betrifft alle
+ Zusammenfassung der in Revision 867 neu eingeführten uBasic-Befehle zu einem Befehl
+ set_yield MAX_LINES MAX_TICKS

Location:

trunk/lib/ubasic

Files:

• tokenizer.c (modified) (1 diff)
• tokenizer.h (modified) (1 diff)
• ubasic.c (modified) (2 diffs)

trunk/lib/ubasic/tokenizer.c

@@ -191 +191 @@
   {"set_record",              TOKENIZER_SET_RECORD},
   {"set_config_value",        TOKENIZER_SET_CONFIG_VALUE},
-  {"set_yield_lines",         TOKENIZER_SET_YIELD_LINES},
-  {"set_yield_ms",            TOKENIZER_SET_YIELD_MS},
-  
+  {"set_yield",               TOKENIZER_SET_YIELD},
   
   {"wait_click",              TOKENIZER_WAIT_CLICK},

trunk/lib/ubasic/tokenizer.h

@@ -203 +203 @@
   TOKENIZER_GET_CONFIG_VALUE,
   TOKENIZER_SET_CONFIG_VALUE,
-  TOKENIZER_SET_YIELD_LINES,
-  TOKENIZER_SET_YIELD_MS,
+  TOKENIZER_SET_YIELD,
   TOKENIZER_GET_PARTITION_INFO,
   TOKENIZER_SWAP_PARTITIONS

trunk/lib/ubasic/ubasic.c

@@ -1527 +1527 @@
 }
 
-static void set_yield_lines_statement()
-{
-    accept(TOKENIZER_SET_YIELD_LINES);
-    yield_max_lines = expr();
+static void set_yield_statement()
+{
+    accept(TOKENIZER_SET_YIELD);
+    int val = expr();
+    yield_max_lines = val?val:YIELD_MAX_LINES_DEFAULT;
+    val = expr();
+    yield_max_ms = val?val:YIELD_MAX_MS_DEFAULT;
     accept_cr();
 }
 
-static void set_yield_ms_statement()
-{
-    accept(TOKENIZER_SET_YIELD_MS);
-    yield_max_ms = expr();
-    accept_cr();
-}
 /*---------------------------------------------------------------------------*/
 
@@ -2295 +2292 @@
     set_config_value_statement();
     break;
-  case TOKENIZER_SET_YIELD_LINES:
-    set_yield_lines_statement();
-    break;
-  case TOKENIZER_SET_YIELD_MS:
-    set_yield_ms_statement();
-    break;
-          
+  case TOKENIZER_SET_YIELD:
+    set_yield_statement();
+    break;
+
   default:
       DEBUG_PRINTF("ubasic.c: statement(): not implemented %d\n", token);