Allow omitting parenthesis on string functions.

This also makes the parser 2 bytes smaller.

Author: dmsc

manual.md

@@ -681,12 +681,13 @@ for example you can write `R.(10)`
 instead of `RAND(10)`.
 
 You can also omit parentheses on
-functions that take one numerical value
-as argument, for example, `RAND 10`.
+functions that take only one argument,
+for example, `RAND 10`.
+
 Note: This is not possible when the
-argument is a string (as with `ADR`),
-or the function accepts a variable number
-of arguments (as with `USR`).
+function accepts a variable number of
+arguments (as with `USR`), or with the
+`ADR` function.
 
 Some functions don't take parameters,
 and you must provide a set of

src/syntax/basic.syn

@@ -182,9 +182,9 @@ INT_FUNCTIONS: integer variable or function
         "USR("   EXPR emit TOK_USR_ADDR USR_EXPR_MORE ")" emit TOK_USR_CALL
         "ADR("   ADR_EXPR ")"
         "&"      ADR_EXPR
-        "Len"    STR_PAR_EXPR emit TOK_PEEK # First byte of string is the length
-        "Val"    STR_PAR_EXPR emit TOK_VAL
-        "ASc"    STR_PAR_EXPR emit { TOK_PUSH_1, TOK_ADD, TOK_PEEK } # TODO: does not check for empty strings.
+        "Len"    STR_EXPR emit TOK_PEEK # First byte of string is the length
+        "Val"    STR_EXPR emit TOK_VAL
+        "ASc"    STR_EXPR emit { TOK_PUSH_1, TOK_ADD, TOK_PEEK } # TODO: does not check for empty strings.
 
 # Used to handle PADDLE/STICK/PTRIG/STRIG
 RD_PORT:
@@ -193,9 +193,6 @@ RD_PORT:
 PAR_EXPR: left parenthesis
         "(" EXPR ")"
 
-STR_PAR_EXPR: left parenthesis
-        "(" STR_EXPR ")"
-
 # Parses a continuation of an INT to BOOLean expression
 OR_AND_BOOL:
         OR_EXPR_RIGHT
@@ -265,8 +262,10 @@ COMP_EXPR_MORE:
 
 # String expressions: base plus optional index
 STR_EXPR: string expression
+        "(" STR_EXPR ")"
         STRING_FUNCTIONS OPT_STR_INDEX
 
+
 OPT_STR_INDEX:
         "[" emit TOK_PUSH EXPR C_EXPR "]" emit TOK_STR_IDX OPT_STR_INDEX
         "[" emit TOK_PUSH EXPR "]" emit { TOK_PUSH_BYTE, 255, TOK_STR_IDX } OPT_STR_INDEX
@@ -530,7 +529,7 @@ STATEMENT: statement
         "INC" VAR_WORD_LVALUE_SADDR emit TOK_INC
         "DEc" VAR_WORD_LVALUE_SADDR emit TOK_DEC
         "PRoc" E_LABEL_CREATE emit { TOK_JUMP } E_LABEL_DEF emit LT_PROC_2 E_PUSH_LT OPT_PROC_VAR
-        "ENDProc" E_POP_PROC_2 emit TOK_RET E_POP_PROC_DATA
+        "ENdproc" E_POP_PROC_2 emit TOK_RET E_POP_PROC_DATA
         EXEC_CALL E_LABEL_CREATE OPT_EXEC_PARAM emit { TOK_CALL } E_DO_EXEC
         "DAta" DATA_VAR DATA_END
         "END" emit TOK_END

src/syntax/float.syn

@@ -80,7 +80,7 @@ FP_FUNCS:
         "SQr"   FP_T_EXPR emit TOK_FP_SQRT
         "SIn"   FP_T_EXPR emit TOK_FP_SIN
         "COs"   FP_T_EXPR emit TOK_FP_COS
-        "Val"   STR_PAR_EXPR emit TOK_FP_VAL
+        "Val"   STR_EXPR emit TOK_FP_VAL
         "RNd()" emit TOK_FP_RND
         "%"     PAR_EXPR emit TOK_FP_LOAD
 

testsuite/tests/abbrev.bas

@@ -129,7 +129,7 @@ RA.               ' RAD
 ? LO.10           ' LOG10
 ? SQ.4            ' SQR
 ? COS0            ' COS
-? 0.0 + V.("0.1") ' VAL FP
+? 0.0 + V."0.1"   ' VAL FP
 ? RN.>=0.0        ' RND
 
 
@@ -154,9 +154,9 @@ P.$284,3
 ' ? USR()         ' USR (can't abbreviate)
 ? ADR(R1)-ADR(R)  ' ADR (can't abbreviate)
 ? &R1-&R          ' ADR
-? L.("123")       ' LEN
-? V.("123")       ' VAL
-? AS.("123")      ' ASC
+? L."123"         ' LEN
+? V."123"         ' VAL
+? AS."123"        ' ASC
 
 ? "OPER"
 ? 1A.1;0A.1;0A.0  ' AND