Skip to content

Support multiple ops in a single line (#19) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shesek wants to merge 3 commits into
base: master
Choose a base branch
from
+25 −38
Open

Support multiple ops in a single line (#19) #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2165de7
Support multiple ops in a single line (#19)
shesek Feb 9, 2022
ded3814
Use new assignLabel() method
shesek Feb 9, 2022
af4f1ca
Support negative number literals
shesek Feb 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 25 additions & 37 deletions src/components/ScriptEditor/ScriptEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,45 +51,33 @@ const ScriptEditor: React.FC<Props> = ({ scriptWiz }) => {

const parseInput = useCallback(
(inputText: string) => {
// 1: hex, 2: bin, 3/4: quoted text, 5: number, 6: opcode, 7: label
const reWord = /^\s*(?:<(?:0x([a-fA-F0-9]+)|0b([01]+)|"([^"]+)"|'([^']+)'|(-?\d+))>|(OP_\w+)|(\$\w+))(?:\s+|$)/;

let lineRemain = inputText.trim();
while (lineRemain.length) {
const matches = lineRemain.match(reWord);
if (!matches) {
console.error('UI: Invalid input value:', lineRemain);
// TODO user-visible error message
return;
}

// Look for $label assignments, keep them for later processing and strip them from the line string.
const labelMatches = inputText.match(/\$\w+$/)
if (labelMatches) {
inputText = inputText.replace(/\s*\$\w+$/, '')
}

if (inputText.startsWith('<') && inputText.endsWith('>')) {
const inputTextValue = inputText.substring(1, inputText.length - 1);

if (inputTextValue.startsWith('0x')) {
scriptWiz.parseHex(inputTextValue.substring(2));
} else if (inputTextValue.startsWith('0b')) {
scriptWiz.parseBin(inputTextValue.substring(2));
} else if (
(inputTextValue.startsWith('"') && inputTextValue.endsWith('"')) ||
(inputTextValue.startsWith("'") && inputTextValue.endsWith("'"))
) {
const inputTextValueString = inputTextValue.substring(1, inputTextValue.length - 1);
scriptWiz.parseText(inputTextValueString);
} else if (!isNaN(Number(inputTextValue))) {
scriptWiz.parseNumber(Number(inputTextValue));
} else if (inputTextValue.startsWith('OP_')) {
const opwordToOphex = scriptWiz.opCodes.wordHex(inputTextValue);
scriptWiz.parseHex(opwordToOphex.substring(2));
} else {
console.error('UI: Invalid input value!!!');
if (matches[1]) {
scriptWiz.parseHex(matches[1]);
} else if (matches[2]) {
scriptWiz.parseBin(matches[2]);
} else if (matches[3] || matches[4]) {
scriptWiz.parseText(matches[3] || matches[4]);
} else if (matches[5]) {
scriptWiz.parseNumber(+matches[5]);
} else if (matches[6]) {
scriptWiz.parseOpcode(matches[6]);
} else if (matches[7]) {
scriptWiz.assignLabel(matches[7]);
}
} else if (inputText.startsWith('OP_')) {
scriptWiz.parseOpcode(inputText);
} else if (inputText !== '') {
console.error('UI: Invalid input value!!!');
}

// Assign the label to the last element on the stack
if (labelMatches) {
if (!scriptWiz.stackDataList.main.length) throw new Error('nothing to label');
const lastStack = scriptWiz.stackDataList.main[scriptWiz.stackDataList.main.length-1];
lastStack.label = labelMatches[0];
lineRemain = lineRemain.slice(matches[0].length);
}
},
[scriptWiz],
Expand All @@ -111,7 +99,7 @@ const ScriptEditor: React.FC<Props> = ({ scriptWiz }) => {

if (lines) {
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
const line = lines[i].trim();

if (line !== '') {
parseInput(line);
Expand Down
1 change: 0 additions & 1 deletion src/helper/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const convertEditorLines = (formattedLines: string): string[] => {
let lines = formattedLines.split('\n');
lines = lines.map((line) => line.replace(/ /g, ''));

lines = lines.map((line) => line.replaceAll('\r', ''));

Expand Down