Apple-2-SW/bastools
1
0
Fork 0
mirror of https://github.com/AppleCommander/bastools.git synced 2024-06-01 13:41:29 +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

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

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