Skip to content

Commit d5a1243

Browse files
committed
Adds abbreviations for operators: AND/OR/EXOR/NOT/MOD/TO.
1 parent ff38a32 commit d5a1243

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

manual.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,9 @@ If there is a need to alter the
405405
precedence, you can put the expression
406406
between parenthesis.
407407

408+
Note that `MOD` and `EXOR` can be
409+
abbreviated `M.` and `E.` respectively.
410+
408411
When using floating point expressions,
409412
the operators are:
410413

@@ -477,6 +480,9 @@ order of precedence, are:
477480
converted to floating point before
478481
comparison.
479482

483+
The words `OR`, `AND` and `NOT` can be
484+
abbreviated `O.`, `A.` and `N.`
485+
480486

481487
Arrays
482488
------
@@ -1042,7 +1048,7 @@ Control Statements
10421048

10431049

10441050
**Loop Over Values Of A Variable**
1045-
**FOR _var_=_value_ TO _end_ [STEP _step_] / F. TO S.**
1051+
**FOR _var_=_value_ TO _end_ [STEP _step_] / F. T. S.**
10461052
**NEXT _var_ / N.**
10471053

10481054
FOR loop allows performing a loop a

src/basic.syn

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ INT_EXPR_MORE: '+', '-'
165165
M_EXPR_MORE: '*', '/', 'MOD'
166166
"*" PUSH_T_EXPR BIT_EXPR_MORE emit TOK_MUL M_EXPR_MORE
167167
"/" PUSH_T_EXPR BIT_EXPR_MORE emit TOK_DIV M_EXPR_MORE
168-
"MOD" PUSH_T_EXPR BIT_EXPR_MORE emit TOK_MOD M_EXPR_MORE
168+
"Mod" PUSH_T_EXPR BIT_EXPR_MORE emit TOK_MOD M_EXPR_MORE
169169
pass
170170

171171
BIT_EXPR_MORE: '&', '!', 'EXOR'
172172
"&" PUSH_T_EXPR emit TOK_BIT_AND BIT_EXPR_MORE
173173
"!" PUSH_T_EXPR emit TOK_BIT_OR BIT_EXPR_MORE
174-
"EXOR" PUSH_T_EXPR emit TOK_BIT_EXOR BIT_EXPR_MORE
174+
"Exor" PUSH_T_EXPR emit TOK_BIT_EXOR BIT_EXPR_MORE
175175
pass
176176

177177
ADR_EXPR: string or variable
@@ -194,7 +194,7 @@ T_EXPR: integer constant, variable or function
194194
emit TOK_NUM E_NUMBER_WORD
195195
"-" T_EXPR emit TOK_NEG
196196
"+" T_EXPR
197-
"NOT" NOT_EXPR emit TOK_L_NOT
197+
"Not" NOT_EXPR emit TOK_L_NOT
198198
# Special (predefined) variables
199199
"Time" emit TOK_TIME
200200
# Variables as R-Values, push value into stack
@@ -267,21 +267,21 @@ FORCE_BOOL_EXPR:
267267
NOT_EXPR AND_EXPR_MORE OR_EXPR_MORE
268268

269269
OR_EXPR_RIGHT: 'OR'
270-
"OR" emit TOK_PUSH NOT_EXPR AND_EXPR_MORE emit TOK_L_OR OR_EXPR_MORE
270+
"Or" emit TOK_PUSH NOT_EXPR AND_EXPR_MORE emit TOK_L_OR OR_EXPR_MORE
271271

272272
OR_EXPR_MORE:
273273
OR_EXPR_RIGHT
274274
pass
275275

276276
AND_EXPR_RIGHT: 'AND'
277-
"AND" emit TOK_PUSH NOT_EXPR emit TOK_L_AND AND_EXPR_MORE
277+
"And" emit TOK_PUSH NOT_EXPR emit TOK_L_AND AND_EXPR_MORE
278278

279279
AND_EXPR_MORE:
280280
AND_EXPR_RIGHT
281281
pass
282282

283283
NOT_EXPR:
284-
"NOT" NOT_EXPR emit TOK_L_NOT
284+
"Not" NOT_EXPR emit TOK_L_NOT
285285
INT_EXPR COMP_OR_BOOL
286286
#@if FASTBASIC_FP
287287
FP_EXPR COMP_FP_RIGHT
@@ -638,7 +638,7 @@ PARSE_LINE_COMMAND:
638638
"WEnd" emit TOK_JUMP E_POP_WHILE
639639
"If" FORCE_BOOL_EXPR emit { TOK_CJUMP, LT_IF } E_PUSH_LT THEN_OR_MULTILINE
640640
"For" VAR_WORD_LVALUE_SADDR EQUAL emit TOK_PUSH EXPR emit TOK_DPOKE \
641-
"TO" EXPR STEP_OPTIONAL \
641+
"To" EXPR STEP_OPTIONAL \
642642
emit { TOK_FOR, TOK_CNJUMP, LT_FOR_2 } E_PUSH_LT emit LT_FOR_1 E_PUSH_LT
643643
"Next" emit TOK_FOR_NEXT emit TOK_CJUMP NEXT_VARNAME E_POP_FOR emit TOK_FOR_EXIT
644644
"Else" emit TOK_JUMP emit LT_ELSE E_ELSEIF

0 commit comments

Comments
 (0)