Skip to content
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

Jump to bottom

Fix self statement semicolon rewrite #1347

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix self statement semicolon rewrite #1347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 29 additions & 14 deletions src/main/java/com/laytonsmith/core/MethodScriptCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1912,7 +1912,8 @@ public static ParseTree compile(TokenStream stream, Environment environment,
Stack<List<Procedure>> procs = new Stack<>();
procs.add(new ArrayList<>());
processKeywords(tree, environment, compilerErrors);
addSelfStatements(tree, environment, envs, compilerErrors);
addSelfStatements(rootNode, environment, envs, compilerErrors); // Pass rootNode since this might rewrite 'tree'.
tree = rootNode.getChildAt(0);
rewriteAutoconcats(tree, environment, envs, compilerErrors, true);
processLateKeywords(tree, environment, compilerErrors);
checkLinearComponents(tree, environment, compilerErrors);
Expand Down Expand Up @@ -2075,10 +2076,19 @@ private static void moveNodeModifiersOffSyntheticNodes(ParseTree node) {
}
}

private static void addSelfStatements(ParseTree root, Environment env,
/**
* Adds semicolon AST nodes after self statements within children of the given AST node (following
* {@link Function#isSelfStatement(Target, Environment, List, Set)}).
* When the self statement is not yet within an {@link __autoconcat__}, it is wrapped into one.
* @param ast - The abstract syntax tree.
* @param env - The environment.
* @param envs - The set of expected environment classes at runtime.
* @param compilerErrors - A set to put compile errors in.
*/
private static void addSelfStatements(ParseTree ast, Environment env,
Set<Class<? extends Environment.EnvironmentImpl>> envs, Set<ConfigCompileException> compilerErrors) {
for(int i = 0; i < root.numberOfChildren(); i++) {
ParseTree node = root.getChildAt(i);
for(int i = 0; i < ast.numberOfChildren(); i++) {
ParseTree node = ast.getChildAt(i);
boolean isSelfStatement;
try {
isSelfStatement = node.getData() instanceof CFunction cf
Expand All @@ -2090,16 +2100,21 @@ private static void addSelfStatements(ParseTree root, Environment env,
return;
}
if(isSelfStatement) {
int offset = i + 1;
if(!(root.getData() instanceof CFunction cf && cf.val().equals(Compiler.__autoconcat__.NAME))) {
// We need to create an autoconcat node first, and put this and the semicolon in that
ParseTree newNode = new ParseTree(new CFunction(Compiler.__autoconcat__.NAME, Target.UNKNOWN), root.getFileOptions(), true);
newNode.addChild(root);
root = newNode;
offset = 1;
}
root.getChildren().add(offset, new ParseTree(new CSemicolon(Target.UNKNOWN),
node.getFileOptions(), true));
if(ast.getData() instanceof CFunction cf && cf.val().equals(Compiler.__autoconcat__.NAME)) {

// Add semicolon to existing autoconcat.
ast.getChildren().add(i + 1, new ParseTree(
new CSemicolon(Target.UNKNOWN), node.getFileOptions(), true));
i++; // Skip added semicolon.
} else {

// Replace node with an autoconcat that contains the node and a semicolon.
ParseTree newNode = new ParseTree(new CFunction(
Compiler.__autoconcat__.NAME, Target.UNKNOWN), ast.getFileOptions(), true);
newNode.addChild(node);
newNode.addChild(new ParseTree(new CSemicolon(Target.UNKNOWN), node.getFileOptions(), true));
ast.getChildren().set(i, newNode);
}
}
addSelfStatements(node, env, envs, compilerErrors);
}
Expand Down