Skip to content

Add GlobalBeginFunctionInstruction for 'globals' #95

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
bearU369 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add GlobalBeginFunctionInstruction for 'globals' #95

Show file tree
Hide file tree
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
21 changes: 21 additions & 0 deletions ...rc/com/etheller/interpreter/ast/execution/instruction/GlobalBeginFunctionInstruction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.etheller.interpreter.ast.execution.instruction;

import com.etheller.interpreter.ast.execution.JassThread;

public class GlobalBeginFunctionInstruction extends BeginFunctionInstruction {
private boolean isDefined = false; // Prevent from multiple JassProgram::initialize calls to re-register the already defined global variables.

public GlobalBeginFunctionInstruction(final int lineNo, final String sourceFile, final String name) {
super(lineNo, sourceFile, name);
}

@Override
public void run(JassThread thread) {
super.run(thread);
if (isDefined) {
thread.instructionPtr = thread.stackFrame.returnAddressInstructionPtr;
return;
}
isDefined = true;
}
}
3 changes: 2 additions & 1 deletion jassparser/src/com/etheller/interpreter/ast/scope/GlobalScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.etheller.interpreter.ast.execution.JassThread;
import com.etheller.interpreter.ast.execution.instruction.BeginFunctionInstruction;
import com.etheller.interpreter.ast.execution.instruction.BranchInstruction;
import com.etheller.interpreter.ast.execution.instruction.GlobalBeginFunctionInstruction;
import com.etheller.interpreter.ast.execution.instruction.InstructionAppendingJassStatementVisitor;
import com.etheller.interpreter.ast.execution.instruction.JassInstruction;
import com.etheller.interpreter.ast.execution.instruction.PushLiteralInstruction;
Expand Down Expand Up @@ -384,7 +385,7 @@ public void innerBeginDefiningGlobals(final int lineNo, final String sourceFile)
else {
this.functionNameToInstructionPtr.put(INIT_GLOBALS_AUTOGEN_FXN_NAME, this.instructions.size());
}
this.instructions.add(new BeginFunctionInstruction(lineNo, sourceFile, INIT_GLOBALS_AUTOGEN_FXN_NAME));
this.instructions.add(new GlobalBeginFunctionInstruction(lineNo, sourceFile, INIT_GLOBALS_AUTOGEN_FXN_NAME));
}

public UserJassFunction getFunctionDefinitionByName(final String name) {
Expand Down