added support for INSTR, as well as the most common alternatives, POS and INDEX. this supports both common formats, with the optional starting position in the first or last parameter

updating version to 1.8.7

Author: maurymarkowitz

bas/test.bas

@@ -131,6 +131,13 @@
 1910 PRINT "using SPACE$, should print three spaces and HELLO: ";SPACE$(3);"HELLO"
 1920 PRINT "using STRING$, should print HELLO three times: ";STRING$("HELLO",3)
 1930 PRINT "using STRING$ with ASCII value, should print three X's: ";STRING$(88,3)
+1940 PRINT "using INSTR to find ELL in HELLO, should print 2: ";INSTR("HELLO","ELL")
+1950 PRINT "using INSTR to find JEL in HELLO, should print 0: ";INSTR("HELLO","JEL")
+1960 PRINT "using INSTR to find ELL in HELLO starting at 2, should print 0: ";INSTR("HELLO","JEL",2)
+1970 PRINT "using POS to find ELL in HELLO, should print 2: ";POS("HELLO","ELL")
+1980 PRINT "using INDEX to find ELL in HELLO, should print 2: ";INDEX("HELLO","ELL")
+1985 PRINT "using POS with single parameter, should print cursor position: ";POS(0)
+1985 PRINT "using POS with no parameter, should print cursor position: ";POS(0)
 2000 REM
 2001 REM bin/oct/hex conversions
 2002 REM

doc/TODO

@@ -9,7 +9,9 @@ WB = Wang BASIC
 PA = Palo Alto Tiny BASIC
 BP - DEC BASIC-PLUS
 
-- add INSTR and variations thereof
+- trunc values for single and integer during calculations depending on the variable type
+
+- add INKEY$
 
 - need to allow multiple INPUTs on a single line, currently it requires a CR between values
 
@@ -27,7 +29,7 @@ BP - DEC BASIC-PLUS
 
 - support Dartmouth/ANSI style FOR loops which skip the body if the test fails on the first loop
 
-- ELSE would be realtively easy to add, at least the single-line variety
+- ELSE would be relatively easy to add, at least the single-line variety
 
 - flesh out GET and PUT, which are just placeholders for now
 

doc/VERSIONS

@@ -98,3 +98,7 @@ Version 1.8.5 - 16 November 2023
 Version 1.8.6 - 23 November 2023
 
 - fix problem in array initialization that was causing amazing.bas to fail
+
+Version 1.8.7 - 10 December 2023
+
+- add INSTR string function, and the INDEX alias

src/main.c

@@ -27,7 +27,7 @@
 /* simple version info for --version command line option */
 static void print_version(void)
 {
-  puts("RetroBASIC 1.8.6");
+  puts("RetroBASIC 1.8.7");
 }
 
 /* usage short form, just a list of the switches */

src/parse.h

@@ -130,40 +130,41 @@
      CHR = 346,
      SEG = 347,
      SUBSTR = 348,
-     AND = 349,
-     OR = 350,
-     NOT = 351,
-     XOR = 352,
-     CMP_LE = 353,
-     CMP_GE = 354,
-     CMP_NE = 355,
-     CMP_HASH = 356,
-     FRE = 357,
-     SPC = 358,
-     TAB = 359,
-     POS = 360,
-     USR = 361,
-     LIN = 362,
-     DEFSTR = 363,
-     DEFINT = 364,
-     DEFSNG = 365,
-     DEFDBL = 366,
-     CHANGE = 367,
-     CONVERT = 368,
-     UCASE = 369,
-     LCASE = 370,
-     STRNG = 371,
-     TIME = 372,
-     TIME_STR = 373,
-     HEX = 374,
-     OCT = 375,
-     BIN = 376,
-     HEXSTR = 377,
-     OCTSTR = 378,
-     BINSTR = 379,
-     UBOUND = 380,
-     LBOUND = 381,
-     LABEL = 382
+     INSTR = 349,
+     AND = 350,
+     OR = 351,
+     NOT = 352,
+     XOR = 353,
+     CMP_LE = 354,
+     CMP_GE = 355,
+     CMP_NE = 356,
+     CMP_HASH = 357,
+     FRE = 358,
+     SPC = 359,
+     TAB = 360,
+     POS = 361,
+     USR = 362,
+     LIN = 363,
+     DEFSTR = 364,
+     DEFINT = 365,
+     DEFSNG = 366,
+     DEFDBL = 367,
+     CHANGE = 368,
+     CONVERT = 369,
+     UCASE = 370,
+     LCASE = 371,
+     STRNG = 372,
+     TIME = 373,
+     TIME_STR = 374,
+     HEX = 375,
+     OCT = 376,
+     BIN = 377,
+     HEXSTR = 378,
+     OCTSTR = 379,
+     BINSTR = 380,
+     UBOUND = 381,
+     LBOUND = 382,
+     LABEL = 383
    };
 #endif
 /* Tokens.  */
@@ -258,40 +259,41 @@
 #define CHR 346
 #define SEG 347
 #define SUBSTR 348
-#define AND 349
-#define OR 350
-#define NOT 351
-#define XOR 352
-#define CMP_LE 353
-#define CMP_GE 354
-#define CMP_NE 355
-#define CMP_HASH 356
-#define FRE 357
-#define SPC 358
-#define TAB 359
-#define POS 360
-#define USR 361
-#define LIN 362
-#define DEFSTR 363
-#define DEFINT 364
-#define DEFSNG 365
-#define DEFDBL 366
-#define CHANGE 367
-#define CONVERT 368
-#define UCASE 369
-#define LCASE 370
-#define STRNG 371
-#define TIME 372
-#define TIME_STR 373
-#define HEX 374
-#define OCT 375
-#define BIN 376
-#define HEXSTR 377
-#define OCTSTR 378
-#define BINSTR 379
-#define UBOUND 380
-#define LBOUND 381
-#define LABEL 382
+#define INSTR 349
+#define AND 350
+#define OR 351
+#define NOT 352
+#define XOR 353
+#define CMP_LE 354
+#define CMP_GE 355
+#define CMP_NE 356
+#define CMP_HASH 357
+#define FRE 358
+#define SPC 359
+#define TAB 360
+#define POS 361
+#define USR 362
+#define LIN 363
+#define DEFSTR 364
+#define DEFINT 365
+#define DEFSNG 366
+#define DEFDBL 367
+#define CHANGE 368
+#define CONVERT 369
+#define UCASE 370
+#define LCASE 371
+#define STRNG 372
+#define TIME 373
+#define TIME_STR 374
+#define HEX 375
+#define OCT 376
+#define BIN 377
+#define HEXSTR 378
+#define OCTSTR 379
+#define BINSTR 380
+#define UBOUND 381
+#define LBOUND 382
+#define LABEL 383
 
 
 
@@ -309,7 +311,7 @@ typedef union YYSTYPE
   variable_reference_t *variable;
 }
 /* Line 1529 of yacc.c.  */
-#line 313 "/Volumes/Bigger/Users/maury/Desktop/RetroBASIC/obj/Intermediates.noindex/RetroBASIC.build/Debug/retrobasic.build/DerivedSources/y.tab.h"
+#line 315 "/Volumes/Bigger/Users/maury/Desktop/RetroBASIC/obj/Intermediates.noindex/RetroBASIC.build/Debug/retrobasic.build/DerivedSources/y.tab.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

src/parse.y

@@ -162,6 +162,7 @@ static expression_t *make_operator(int arity, int o)
 %token LEFT MID RIGHT
 %token LEN STR VAL CHR
 %token SEG SUBSTR
+%token INSTR
 
  /* boolean operations and comparisons */
 %token AND OR NOT XOR
@@ -176,22 +177,18 @@ static expression_t *make_operator(int arity, int o)
 %token LIN // from HP, a vertical version of TAB
 
  /* type definitions added circa 1979 */
-%token DEFSTR
-%token DEFINT
-%token DEFSNG
-%token DEFDBL
+%token DEFSTR DEFINT DEFSNG DEFDBL
 
  /* Dartmouth-style string manipulation */
 %token CHANGE
  /* otherwise identical command from HP */
 %token CONVERT
  /* and some later string-related additions */
-%token UCASE
-%token LCASE
+%token UCASE LCASE
  /* string builders */
 %token STRNG
 
- /* time and date patterened on MS style */
+ /* time and date patterned on MS style */
 %token TIME
 %token TIME_STR
 
@@ -200,10 +197,9 @@ static expression_t *make_operator(int arity, int o)
 %token HEXSTR OCTSTR BINSTR
 
 /* array utilities */
-%token UBOUND
-%token LBOUND
+%token UBOUND LBOUND
 
- /* line lables, procedures, etc. */
+ /* line labels, procedures, etc. */
 %token LABEL
 
 %%
@@ -1069,6 +1065,8 @@ fn_2:
 
  /* arity-1, 2 or 3 functions */
 fn_x:
+ INSTR { $$ = INSTR; } |
+ POS { $$ = POS; } |
  MID { $$ = MID; } |
  SEG { $$ = SEG; } |
  SUBSTR { $$ = SUBSTR; } |