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

cache: Relax label name constraints

Browse Source 
Allows labels to be any reasonable identifier, not just `LABEL-?[0-9+]`

INSTRUCTION was changed to IDENTIFIER because if the LABEL rule is relaxed the lexer cannot tell the difference between a LABEL and a INSTRUCTION.
This commit is contained in:
Max Weber
2018-07-10 20:24:17 -06:00
committed by Adam
parent c6ea6900f2
commit bf79c3237c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,25 +42,25 @@ string_var_value: INT ;
line: instruction | label | switch_lookup ; line: instruction | label | switch_lookup ;
instruction: instruction_name instruction_operand ; instruction: instruction_name instruction_operand ;
label: 'LABEL' INT ':' ; label: IDENTIFIER ':' ;
instruction_name: name_string | name_opcode ; instruction_name: name_string | name_opcode ;
name_string: INSTRUCTION ; name_string: IDENTIFIER ;
name_opcode: INT ; name_opcode: INT ;
instruction_operand: operand_int | operand_qstring | operand_label | ; instruction_operand: operand_int | operand_qstring | operand_label | ;
operand_int: INT ; operand_int: INT ;
operand_qstring: QSTRING ; operand_qstring: QSTRING ;
operand_label: 'LABEL' INT ; operand_label: IDENTIFIER ;
switch_lookup: switch_key ':' switch_value ; switch_lookup: switch_key ':' switch_value ;
switch_key: INT ; switch_key: INT ;
switch_value: 'LABEL' INT ; switch_value: IDENTIFIER ;
NEWLINE: ( '\r' | '\n' )+ ; NEWLINE: ( '\r' | '\n' )+ ;
INT: '-'? [0-9]+ ; INT: '-'? [0-9]+ ;
QSTRING: '"' (~('"' | '\\' | '\r' | '\n') | '\\' ('"' | '\\'))* '"' ; QSTRING: '"' (~('"' | '\\' | '\r' | '\n') | '\\' ('"' | '\\'))* '"' ;
INSTRUCTION: [a-z0-9_]+ ; IDENTIFIER: [a-zA-Z0-9_]+ ;
COMMENT: ';' ~( '\r' | '\n' )* -> channel(HIDDEN) ; COMMENT: ';' ~( '\r' | '\n' )* -> channel(HIDDEN) ;
WS: (' ' | '\t')+ -> channel(HIDDEN) ; WS: (' ' | '\t')+ -> channel(HIDDEN) ;