Apple-2-SW/bastools
1
0
Fork 0
mirror of https://github.com/AppleCommander/bastools.git synced 2024-12-22 14:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Fixing some directive parsing snafus.

Browse Source
This commit is contained in:
Rob Greene 2018-07-13 00:00:12 -05:00
parent 446d06af1d
commit 9dbbfdd663
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/main/java/io/github/applecommander/bastools/api/Directive.java
View File

@ -91,7 +91,8 @@ public abstract class Directive {
* (probably EOL) to prevent loss of information. * (probably EOL) to prevent loss of information.
*/ */
public void append(Token token) { public void append(Token token) {
if (token.type == Type.EOL || (token.type == Type.SYNTAX && ",".equals(token.text))) { if (token.type == Type.EOL) {
while (!paramTokens.isEmpty()) {
String name = requireIdentToken(); String name = requireIdentToken();
if (!parameterNames.contains(name)) { if (!parameterNames.contains(name)) {
String message = String.format("Parameter '%s' is invalid for %s directive", name, directiveName); String message = String.format("Parameter '%s' is invalid for %s directive", name, directiveName);
@ -100,6 +101,10 @@ public abstract class Directive {
requireSyntaxToken("="); requireSyntaxToken("=");
Expression expr = buildExpression(); Expression expr = buildExpression();
parameters.put(name, expr); parameters.put(name, expr);
if (!paramTokens.isEmpty()) {
requireSyntaxToken(",");
}
}
} else { } else {
paramTokens.add(token); paramTokens.add(token);
} }
@ -166,6 +171,7 @@ public abstract class Directive {
} }
} }
private boolean checkSyntaxToken(String syntax) { private boolean checkSyntaxToken(String syntax) {
if (paramTokens.isEmpty()) return false;
Type tokenType = ApplesoftKeyword.find(syntax).map(t -> Type.KEYWORD).orElse(Type.SYNTAX); Type tokenType = ApplesoftKeyword.find(syntax).map(t -> Type.KEYWORD).orElse(Type.SYNTAX);
Token token = paramTokens.get(0); Token token = paramTokens.get(0);
return tokenType == token.type && syntax.equals(token.text); return tokenType == token.type && syntax.equals(token.text);