lcase ucase clr

Author: omiq

README.md

@@ -67,6 +67,7 @@ Run this once after unpacking, and macOS will stop treating the binary as “fro
   - **`READ` / `DATA`**: load numeric and string literals from `DATA` statements into variables.
   - **`DEF FN`**: define simple user functions, e.g. `DEF FNY(X) = SIN(X)`.
   - **`POKE`**: accepted as a no‑op (for compatibility with old listings; it does not touch real memory).
+  - **`CLR`**: resets all variables to 0/empty, clears GOSUB/FOR stacks and DATA pointer; DEF FN definitions are kept.
 - **Variables**
   - **Numeric variables**: `A`, `B1`, `AB`, `ATAKFLAG`, etc. Names may be longer than two characters; CBM-style **first two characters** identify the variable (e.g. `ATAKFLAG` and `ATA` refer to the same variable).
   - **String variables**: names ending in `$`, e.g. `A$`, `NAME$`.
@@ -75,6 +76,7 @@ Run this once after unpacking, and macOS will stop treating the binary as “fro
   - **Math**: `SIN`, `COS`, `TAN`, `ABS`, `INT`, `SQR`, `SGN`, `EXP`, `LOG`, `RND`.
   - **Strings**:
     - `LEN`, `VAL`, `STR$`, `CHR$`, `ASC`.
+    - `UCASE$`, `LCASE$`: convert string to upper or lower case (ASCII).
     - `MID$`, `LEFT$`, `RIGHT$` with C64‑style semantics:
       - `MID$(S$, start)` or `MID$(S$, start, len)` (1‑based `start`).
       - `LEFT$(S$, n)` – first `n` characters.

basic

@@ -750,6 +750,7 @@ static void statement_get(char **p);
 static void do_sleep_ticks(double ticks);
 static void statement_locate(char **p);
 static void statement_on(char **p);
+static void statement_clr(char **p);
 static int function_lookup(const char *name, int len);
 
 enum func_code {
@@ -773,7 +774,9 @@ enum func_code {
     FN_SPC = 17,
     FN_MID = 18,
     FN_LEFT = 19,
-    FN_RIGHT = 20
+    FN_RIGHT = 20,
+    FN_UCASE = 21,
+    FN_LCASE = 22
 };
 
 /* Report an error and halt further execution.
@@ -1460,6 +1463,9 @@ static int function_lookup(const char *name, int len)
         if ((len == 4 && name[0] == 'L' && name[1] == 'E' && name[2] == 'F' && name[3] == 'T') ||
             (len == 5 && name[0] == 'L' && name[1] == 'E' && name[2] == 'F' && name[3] == 'T' && name[4] == '$'))
             return FN_LEFT;
+        if ((len == 5 && name[0] == 'L' && name[1] == 'C' && name[2] == 'A' && name[3] == 'S' && name[4] == 'E') ||
+            (len == 6 && name[0] == 'L' && name[1] == 'C' && name[2] == 'A' && name[3] == 'S' && name[4] == 'E' && name[5] == '$'))
+            return FN_LCASE;
         return FN_NONE;
     case 'M':
         if ((len == 3 && name[0] == 'M' && name[1] == 'I' && name[2] == 'D') ||
@@ -1475,6 +1481,11 @@ static int function_lookup(const char *name, int len)
     case 'V':
         if (len == 3 && name[0] == 'V' && name[1] == 'A' && name[2] == 'L') return FN_VAL;
         return FN_NONE;
+    case 'U':
+        if ((len == 5 && name[0] == 'U' && name[1] == 'C' && name[2] == 'A' && name[3] == 'S' && name[4] == 'E') ||
+            (len == 6 && name[0] == 'U' && name[1] == 'C' && name[2] == 'A' && name[3] == 'S' && name[4] == 'E' && name[5] == '$'))
+            return FN_UCASE;
+        return FN_NONE;
     default:
         return FN_NONE;
     }
@@ -2039,6 +2050,28 @@ static struct value eval_function(const char *name, char **p)
             return make_str(out);
         }
     }
+    case FN_UCASE: {
+        char out[MAX_STR_LEN];
+        size_t i, n;
+        ensure_str(&arg);
+        n = strlen(arg.str);
+        if (n >= MAX_STR_LEN) n = MAX_STR_LEN - 1;
+        for (i = 0; i < n; i++)
+            out[i] = (char)toupper((unsigned char)arg.str[i]);
+        out[n] = '\0';
+        return make_str(out);
+    }
+    case FN_LCASE: {
+        char out[MAX_STR_LEN];
+        size_t i, n;
+        ensure_str(&arg);
+        n = strlen(arg.str);
+        if (n >= MAX_STR_LEN) n = MAX_STR_LEN - 1;
+        for (i = 0; i < n; i++)
+            out[i] = (char)tolower((unsigned char)arg.str[i]);
+        out[n] = '\0';
+        return make_str(out);
+    }
     default:
         runtime_error("Unknown function");
         return make_num(0.0);
@@ -2303,7 +2336,8 @@ static struct value eval_factor(char **p)
             starts_with_kw(*p, "RND") || starts_with_kw(*p, "LEN") || starts_with_kw(*p, "VAL") ||
             starts_with_kw(*p, "STR") || starts_with_kw(*p, "CHR") || starts_with_kw(*p, "ASC") ||
             starts_with_kw(*p, "TAB") || starts_with_kw(*p, "SPC") || starts_with_kw(*p, "MID") ||
-            starts_with_kw(*p, "LEFT") || starts_with_kw(*p, "RIGHT")) {
+            starts_with_kw(*p, "LEFT") || starts_with_kw(*p, "RIGHT") ||
+            starts_with_kw(*p, "UCASE") || starts_with_kw(*p, "LCASE")) {
             char namebuf[8];
             char *q;
             q = *p;
@@ -2864,6 +2898,27 @@ static void statement_on(char **p)
     /* If index is out of range, ON expression simply falls through. */
 }
 
+/* CLR: reset all variables to 0/empty, clear GOSUB/FOR stacks, reset DATA pointer.
+ * DEF FN definitions are left intact (CBM-style). */
+static void statement_clr(char **p)
+{
+    int i, j;
+    (void)p;
+
+    for (i = 0; i < var_count; i++) {
+        struct var *v = &vars[i];
+        v->scalar = v->is_string ? make_str("") : make_num(0.0);
+        if (v->array && v->size > 0) {
+            for (j = 0; j < v->size; j++) {
+                v->array[j] = v->is_string ? make_str("") : make_num(0.0);
+            }
+        }
+    }
+    gosub_top = 0;
+    for_top = 0;
+    data_index = 0;
+}
+
 static void statement_let(char **p)
 {
     struct value *vp;
@@ -3341,6 +3396,11 @@ static void execute_statement(char **p)
         *p += strlen(*p);
         return;
     }
+    if (c == 'C' && starts_with_kw(*p, "CLR")) {
+        *p += 3;
+        statement_clr(p);
+        return;
+    }
     if (isalpha((unsigned char)c)) {
         /* Fallback: treat as implicit LET (assignment). Any syntax issues
          * inside the assignment will be reported by the expression parser.

basic.c

@@ -0,0 +1,6 @@
+10 A=1
+20 B$="before"
+30 PRINT "A=";A;" B$=";B$
+40 CLR
+50 PRINT "After CLR: A=";A;" B$='";B$;"'"
+60 END

examples/test_clr.bas

@@ -0,0 +1,2 @@
+10 PRINT UCASE$("hello "); LCASE$("WORLD")
+20 END

examples/test_ucase_lcase.bas

@@ -13,9 +13,6 @@ Colour without pokes
 * Subroutines and Functions
   * Syntax sugar before actual implementation?
 
-* CLR statement
-  * Implement CBM-style CLR (reset variables, stacks, execution state)
-
 * Program text preprocessor
   * Replace current ad-hoc whitespace tweaks with a small lexer-like pass for keywords and operators
   * Normalize compact CBM forms while preserving semantics, e.g.:
@@ -26,14 +23,15 @@ Colour without pokes
   * Ensure keywords are only recognized when not inside identifiers (e.g. avoid splitting `ORD(7)` or `FOR`), and never mangling string literals
   * Validate behavior against reference interpreter (`cbmbasic`) with a regression suite of tricky lines
 
-* String case utilities
-  * Add CBM-style upper/lower-case string manipulation functions (e.g. `UCASE$`, `LCASE$`)
-  * Ensure they round-trip correctly with PETSCII/ANSI mappings and existing `ASC`/`CHR$` behavior
-
 * Include files / libraries
   * Design a simple `INCLUDE "file.bas"` or similar directive processed at load time
   * Allow splitting larger programs into multiple source files / libraries while preserving line-numbered semantics
   * Consider search paths and guarding against recursive includes
 
-* Multi-dimensional arrays(x,y,x)
+---
+
+**Completed (removed from list):**
+- Multi-dimensional arrays — `DIM A(x,y)` (and up to 3 dimensions) in `basic.c`.
+- **CLR statement** — Resets all variables (scalar and array elements) to 0/empty, clears GOSUB and FOR stacks, resets DATA pointer; DEF FN definitions are kept.
+- **String case utilities** — `UCASE$(s)` and `LCASE$(s)` implemented (ASCII `toupper`/`tolower`); use in expressions and PRINT.