Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed multiline ASCIZ MACRO-10 pseudo-op, and expressions with binary shift suffixes finally evaluate correctly in parseExpression()

Browse source
This commit is contained in:
Jeff 2017-03-16 16:50:47 -07:00 • committed by Jeff Parsons
commit 01e9bcf0fe
9 changed files with 1381 additions and 1363 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/pdp10/lib/macro10.js
View file

@ -348,7 +348,7 @@ class Macro10 {
sLine = this.addASCII(sLine);
}
var reLine = /\s*([A-Z$%._][0-9A-Z$%.]*[:=]|)\s*([A-Z$%.][0-9A-Z$%.]*|)\s*([^;]+|)\s*(;?.*)/i;
var reLine = /\s*([A-Z$%._][0-9A-Z$%.]*[:=]|)\s*([A-Z$%.][0-9A-Z$%.]*|)\s*([^;]+|)(;?[\s\S]*)/i;
var match = sLine.match(reLine);
if (!match || match[4] && match[4].slice(0, 1) != ';') {
this.error("failed to parse line: " + sLine);
@ -358,7 +358,9 @@ class Macro10 {
var sLabel = match[1];
var sOperator = match[2].toUpperCase();
var sOperands = match[3].trim();
var sComment = match[4].slice(1);
var sComment = match[4];
var sRemainder = match[3] + match[4];
if (sLabel) {
var chSep = sLabel.slice(-1);
sLabel = sLabel.slice(0, -1);
@ -370,8 +372,6 @@ class Macro10 {
}
}
sOperands = sOperands.trim();
if (!sOperator && !sOperands) return true;
/*
@ -413,7 +413,7 @@ class Macro10 {
case Macro10.PSEUDO_OP.ASCII:
case Macro10.PSEUDO_OP.ASCIZ:
case Macro10.PSEUDO_OP.SIXBIT:
this.addASCII(sOperands);
this.addASCII(sRemainder);
break;
case Macro10.PSEUDO_OP.XWD: