ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

cache: add script id to grammar

Browse Source
This commit is contained in:
Adam
2018-01-26 22:32:54 -05:00
parent 6353bb0138
commit 049ab21819
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache/src/main/antlr4/net/runelite/cache/script/assembler/rs2asm.g4 vendored
View File

@@ -26,13 +26,15 @@ grammar rs2asm;
prog: (header NEWLINE)* (line NEWLINE)+ ; prog: (header NEWLINE)* (line NEWLINE)+ ;
header: int_stack_count | string_stack_count | int_var_count | string_var_count ; header: id | int_stack_count | string_stack_count | int_var_count | string_var_count ;
id: '.id ' id_value ;
int_stack_count: '.int_stack_count ' int_stack_value ; int_stack_count: '.int_stack_count ' int_stack_value ;
string_stack_count: '.string_stack_count ' string_stack_value ; string_stack_count: '.string_stack_count ' string_stack_value ;
int_var_count: '.int_var_count ' int_var_value ; int_var_count: '.int_var_count ' int_var_value ;
string_var_count: '.string_var_count ' string_var_value ; string_var_count: '.string_var_count ' string_var_value ;
id_value: INT ;
int_stack_value: INT ; int_stack_value: INT ;
string_stack_value: INT ; string_stack_value: INT ;
int_var_value: INT ; int_var_value: INT ;

9
cache/src/main/java/net/runelite/cache/script/assembler/ScriptWriter.java vendored
View File

@@ -42,6 +42,7 @@ public class ScriptWriter extends rs2asmBaseListener
private final Instructions instructions; private final Instructions instructions;
private final LabelVisitor labelVisitor; private final LabelVisitor labelVisitor;
private int id;
private int pos; private int pos;
private int intStackCount; private int intStackCount;
private int stringStackCount; private int stringStackCount;
@@ -58,6 +59,13 @@ public class ScriptWriter extends rs2asmBaseListener
this.labelVisitor = labelVisitor; this.labelVisitor = labelVisitor;
} }
@Override
public void enterId_value(rs2asmParser.Id_valueContext ctx)
{
int value = Integer.parseInt(ctx.getText());
id = value;
}
@Override @Override
public void enterInt_stack_value(rs2asmParser.Int_stack_valueContext ctx) public void enterInt_stack_value(rs2asmParser.Int_stack_valueContext ctx)
{ {
@@ -209,6 +217,7 @@ public class ScriptWriter extends rs2asmBaseListener
public ScriptDefinition buildScript() public ScriptDefinition buildScript()
{ {
ScriptDefinition script = new ScriptDefinition(); ScriptDefinition script = new ScriptDefinition();
script.setId(id);
script.setIntStackCount(intStackCount); script.setIntStackCount(intStackCount);
script.setStringStackCount(stringStackCount); script.setStringStackCount(stringStackCount);
script.setLocalIntCount(localIntCount); script.setLocalIntCount(localIntCount);