6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-06-23 12:29:30 +00:00
Code Issues Projects Releases Wiki Activity

basic: new de-crunching algorithm, REM.. is token (18, 57, 84)

Browse Source
This commit is contained in:
Steven Hugg 2020-08-13 18:53:11 -05:00
parent ff780236d3
commit fab1768b75
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/common/basic/compiler.ts
View File

@ -59,7 +59,7 @@ export class CompileError extends Error {
// Lexer regular expression -- each (capture group) handles a different token type // Lexer regular expression -- each (capture group) handles a different token type
const re_toks = /([0-9.]+[E][+-]?\d+)|(\d*[.]\d*[E0-9]*)|[0]*(\d+)|&([OH][0-9A-F]+)|(['].*)|(\w+[$]?)|(".*?")|([<>]?[=<>#])|(\*\*)|([-+*/^,;:()\[\]?\\])|(\S+)/gi; const re_toks = /([0-9.]+[E][+-]?\d+)|(\d*[.]\d*[E0-9]*)|[0]*(\d+)|&([OH][0-9A-F]+)|(['].*|REM.*)|(\w+[$]?)|(".*?")|([<>]?[=<>#])|(\*\*)|([-+*/^,;:()\[\]?\\])|(\S+)/gi;
export enum TokenType { export enum TokenType {
EOL = 0, EOL = 0,
@ -408,7 +408,7 @@ export class BASICParser {
this.lineno++; this.lineno++;
this.tokens = []; this.tokens = [];
// split identifier regex (if token-crunching enabled) // split identifier regex (if token-crunching enabled)
let splitre = this.opts.optionalWhitespace && new RegExp(this.opts.validKeywords.map(s => `^${s}`).join('|')); let splitre = this.opts.optionalWhitespace && new RegExp('('+this.opts.validKeywords.map(s => `${s}`).join('|')+')');
// iterate over each token via re_toks regex // iterate over each token via re_toks regex
var m : RegExpMatchArray; var m : RegExpMatchArray;
while (m = re_toks.exec(line)) { while (m = re_toks.exec(line)) {
@ -428,20 +428,23 @@ export class BASICParser {
if (s == '[') s = '('; if (s == '[') s = '(';
if (s == ']') s = ')'; if (s == ']') s = ')';
} }
// un-crunch tokens? (TODO: still doesn't handle reserved words inside of variables) // un-crunch tokens?
if (splitre) { if (splitre && i == TokenType.Ident) {
while (i == TokenType.Ident) { var splittoks = s.split(splitre);
let m2 = splitre.exec(s); splittoks.forEach((ss) => {
if (m2 && s.length > m2[0].length) { if (ss != '') {
this.tokens.push({str:m2[0], type:TokenType.Ident, $loc:loc}); // leftover might be integer
s = s.substring(m2[0].length); i = /^[0-9]+$/.test(ss) ? TokenType.Int : TokenType.Ident;
} else // disable crunching after this token?
break; if (ss == 'DATA' || ss == 'OPTION')
} splitre = null;
if (/^[0-9]+$/.test(s)) i = TokenType.Int; // leftover might be integer this.tokens.push({str: ss, type: i, $loc:loc});
}
});
} else {
// add token to list
this.tokens.push({str: s, type: i, $loc:loc});
} }
// add token to list
this.tokens.push({str: s, type: i, $loc:loc});
break; break;
} }
} }
@ -479,16 +482,11 @@ export class BASICParser {
var stmt; var stmt;
switch (cmdtok.type) { switch (cmdtok.type) {
case TokenType.Remark: case TokenType.Remark:
if (!this.opts.tickComments) this.dialectError(`tick remarks`); if (cmdtok.str.startsWith("'") && !this.opts.tickComments) this.dialectError(`tick remarks`);
return null; return null;
case TokenType.Operator: case TokenType.Operator:
if (cmd == this.validKeyword('?')) cmd = 'PRINT'; if (cmd == this.validKeyword('?')) cmd = 'PRINT';
case TokenType.Ident: case TokenType.Ident:
// remark? ignore all tokens to eol
if (cmd.startsWith('REM')) {
while (this.consumeToken().type != TokenType.EOL) { }
return null;
}
// look for "GO TO" and "GO SUB" // look for "GO TO" and "GO SUB"
if (cmd == 'GO' && this.peekToken().str == 'TO') { if (cmd == 'GO' && this.peekToken().str == 'TO') {
this.consumeToken(); this.consumeToken();
@ -1110,7 +1108,8 @@ export const BASICODE : BASICOptions = {
validKeywords : [ validKeywords : [
'BASE','DATA','DEF','DIM','END', 'BASE','DATA','DEF','DIM','END',
'FOR','GO','GOSUB','GOTO','IF','INPUT','LET','NEXT','ON','OPTION','PRINT', 'FOR','GO','GOSUB','GOTO','IF','INPUT','LET','NEXT','ON','OPTION','PRINT',
'READ','REM','RESTORE','RETURN','STEP','STOP','SUB','THEN','TO' 'READ','REM','RESTORE','RETURN','STEP','STOP','SUB','THEN','TO',
'AND', 'NOT', 'OR'
], ],
validFunctions : [ validFunctions : [
'ABS','ASC','ATN','CHR$','COS','EXP','INT','LEFT$','LEN','LOG', 'ABS','ASC','ATN','CHR$','COS','EXP','INT','LEFT$','LEN','LOG',
@ -1161,6 +1160,7 @@ export const ALTAIR_BASIC41 : BASICOptions = {
'READ','REM','RESTORE','RESUME','RETURN','STOP','SWAP', 'READ','REM','RESTORE','RESUME','RETURN','STOP','SWAP',
'TROFF','TRON','WAIT', 'TROFF','TRON','WAIT',
'TO','STEP', 'TO','STEP',
'AND', 'NOT', 'OR', 'XOR', 'IMP', 'EQV', 'MOD'
], ],
validFunctions : [ validFunctions : [
'ABS','ASC','ATN','CDBL','CHR$','CINT','COS','ERL','ERR', 'ABS','ASC','ATN','CDBL','CHR$','CINT','COS','ERL','ERR',
@ -1170,8 +1170,8 @@ export const ALTAIR_BASIC41 : BASICOptions = {
'SQR','STR$','STRING$','TAB','TAN','USR','VAL','VARPTR' 'SQR','STR$','STRING$','TAB','TAN','USR','VAL','VARPTR'
], ],
validOperators : [ validOperators : [
'=', '<>', '<', '>', '<=', '>=', '+', '-', '*', '/', '^', 'AND', 'NOT', 'OR', '=', '<>', '<', '>', '<=', '>=', '+', '-', '*', '/', '^', '\\',
'XOR', 'IMP', 'EQV', '\\', 'MOD' 'AND', 'NOT', 'OR', 'XOR', 'IMP', 'EQV', 'MOD'
], ],
printZoneLength : 15, printZoneLength : 15,
numericPadding : true, numericPadding : true,
@ -1218,6 +1218,7 @@ export const APPLESOFT_BASIC : BASICOptions = {
'DATA','READ','RESTORE', 'DATA','READ','RESTORE',
'REM','TRACE','NOTRACE', 'REM','TRACE','NOTRACE',
'TO','STEP', 'TO','STEP',
'AND', 'NOT', 'OR'
], ],
validFunctions : [ validFunctions : [
'ABS','ATN','COS','EXP','INT','LOG','RND','SGN','SIN','SQR','TAN', 'ABS','ATN','COS','EXP','INT','LOG','RND','SGN','SIN','SQR','TAN',
@ -1225,7 +1226,8 @@ export const APPLESOFT_BASIC : BASICOptions = {
'FRE','SCRN','PDL','PEEK','POS' 'FRE','SCRN','PDL','PEEK','POS'
], ],
validOperators : [ validOperators : [
'=', '<>', '<', '>', '<=', '>=', '+', '-', '*', '/', '^', 'AND', 'NOT', 'OR' '=', '<>', '<', '>', '<=', '>=', '+', '-', '*', '/', '^',
'AND', 'NOT', 'OR'
], ],
printZoneLength : 16, printZoneLength : 16,
numericPadding : false, numericPadding : false,
@ -1271,6 +1273,7 @@ export const BASIC80 : BASICOptions = {
'TROFF','TRON','WAIT', 'TROFF','TRON','WAIT',
'CALL','CHAIN','COMMON','WHILE','WEND','WRITE','RANDOMIZE', 'CALL','CHAIN','COMMON','WHILE','WEND','WRITE','RANDOMIZE',
'TO','STEP', 'TO','STEP',
'AND', 'NOT', 'OR', 'XOR', 'IMP', 'EQV', 'MOD'
], ],
validFunctions : [ validFunctions : [
'ABS','ASC','ATN','CDBL','CHR$','CINT','COS','CSNG','CVI','CVS','CVD', 'ABS','ASC','ATN','CDBL','CHR$','CINT','COS','CSNG','CVI','CVS','CVD',
@ -1279,7 +1282,10 @@ export const BASIC80 : BASICOptions = {
'OCT$','PEEK','POS','RIGHT$','RND','SGN','SIN','SPACE$','SPC', 'OCT$','PEEK','POS','RIGHT$','RND','SGN','SIN','SPACE$','SPC',
'SQR','STR$','STRING$','TAB','TAN','USR','VAL','VARPTR' 'SQR','STR$','STRING$','TAB','TAN','USR','VAL','VARPTR'
], ],
validOperators : null, // all validOperators : [
'=', '<>', '<', '>', '<=', '>=', '+', '-', '*', '/', '^', '\\',
'AND', 'NOT', 'OR', 'XOR', 'IMP', 'EQV', 'MOD'
],
printZoneLength : 14, printZoneLength : 14,
numericPadding : true, numericPadding : true,
checkOverflow : false, // TODO: message displayed when overflow, division by zero = ok checkOverflow : false, // TODO: message displayed when overflow, division by zero = ok
@ -1324,8 +1330,8 @@ export const MODERN_BASIC : BASICOptions = {
optionalNextVar : true, optionalNextVar : true,
multipleNextVars : true, multipleNextVars : true,
bitwiseLogic : true, bitwiseLogic : true,
checkOnGotoIndex : false, checkOnGotoIndex : true,
computedGoto : false, computedGoto : true,
restoreWithLabel : true, restoreWithLabel : true,
squareBrackets : true, squareBrackets : true,
arraysContainChars : false, arraysContainChars : false,