1
0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-08-14 22:27:37 +00:00

better javadoc and names.

This commit is contained in:
jespergravgaard
2019-08-25 14:19:37 +02:00
parent 41fddfd25c
commit 5229b24ae7
6 changed files with 12 additions and 14 deletions

View File

@@ -6,11 +6,10 @@ tokens { TYPEDEFNAME }
@header { @header {
} }
@lexer::members { @members {
/** The C-Parser. Used for importing C-files and communicating with the Parser about typedefs. */ /** The C-Parser. Used for importing C-files and communicating with the Parser about typedefs. */
CParser cParser; CParser cParser;
/** True of the next string is the name of a C-file to import*/ /** True of the next string is the name of a C-file to import*/
boolean importEnter = false; boolean importEnter = false;
/** True if the next CURLY starts ASM_MODE */ /** True if the next CURLY starts ASM_MODE */
@@ -35,7 +34,7 @@ SEMICOLON: ';' ;
COLON: ':'; COLON: ':';
COMMA: ',' ; COMMA: ',' ;
RANGE : '..' ; RANGE : '..' ;
QUESTION : '?' ; CONDITION : '?' ;
DOT : '.' ; DOT : '.' ;
ARROW : '->' ; ARROW : '->' ;
PLUS: '+'; PLUS: '+';
@@ -128,7 +127,7 @@ fragment BINDIGIT : [0-1];
fragment DECDIGIT : [0-9]; fragment DECDIGIT : [0-9];
fragment HEXDIGIT : [0-9a-fA-F]; fragment HEXDIGIT : [0-9a-fA-F];
//Names // Names
NAME : NAME_START NAME_CHAR* {if(cParser.isTypedef(getText())) setType(TYPEDEFNAME); }; NAME : NAME_START NAME_CHAR* {if(cParser.isTypedef(getText())) setType(TYPEDEFNAME); };
fragment NAME_START : [a-zA-Z_]; fragment NAME_START : [a-zA-Z_];
fragment NAME_CHAR : [a-zA-Z0-9_]; fragment NAME_CHAR : [a-zA-Z0-9_];

View File

@@ -20,7 +20,7 @@ public class KickCLexer extends Lexer {
new PredictionContextCache(); new PredictionContextCache();
public static final int public static final int
TYPEDEFNAME=1, CURLY_BEGIN=2, CURLY_END=3, BRACKET_BEGIN=4, BRACKET_END=5, TYPEDEFNAME=1, CURLY_BEGIN=2, CURLY_END=3, BRACKET_BEGIN=4, BRACKET_END=5,
PAR_BEGIN=6, PAR_END=7, SEMICOLON=8, COLON=9, COMMA=10, RANGE=11, QUESTION=12, PAR_BEGIN=6, PAR_END=7, SEMICOLON=8, COLON=9, COMMA=10, RANGE=11, CONDITION=12,
DOT=13, ARROW=14, PLUS=15, MINUS=16, ASTERISK=17, DIVIDE=18, MODULO=19, DOT=13, ARROW=14, PLUS=15, MINUS=16, ASTERISK=17, DIVIDE=18, MODULO=19,
INC=20, DEC=21, AND=22, BIT_NOT=23, BIT_XOR=24, BIT_OR=25, SHIFT_LEFT=26, INC=20, DEC=21, AND=22, BIT_NOT=23, BIT_XOR=24, BIT_OR=25, SHIFT_LEFT=26,
SHIFT_RIGHT=27, EQUAL=28, NOT_EQUAL=29, LESS_THAN=30, LESS_THAN_EQUAL=31, SHIFT_RIGHT=27, EQUAL=28, NOT_EQUAL=29, LESS_THAN=30, LESS_THAN_EQUAL=31,
@@ -55,7 +55,7 @@ public class KickCLexer extends Lexer {
public static final String[] ruleNames = { public static final String[] ruleNames = {
"CURLY_BEGIN", "CURLY_END", "BRACKET_BEGIN", "BRACKET_END", "PAR_BEGIN", "CURLY_BEGIN", "CURLY_END", "BRACKET_BEGIN", "BRACKET_END", "PAR_BEGIN",
"PAR_END", "SEMICOLON", "COLON", "COMMA", "RANGE", "QUESTION", "DOT", "PAR_END", "SEMICOLON", "COLON", "COMMA", "RANGE", "CONDITION", "DOT",
"ARROW", "PLUS", "MINUS", "ASTERISK", "DIVIDE", "MODULO", "INC", "DEC", "ARROW", "PLUS", "MINUS", "ASTERISK", "DIVIDE", "MODULO", "INC", "DEC",
"AND", "BIT_NOT", "BIT_XOR", "BIT_OR", "SHIFT_LEFT", "SHIFT_RIGHT", "EQUAL", "AND", "BIT_NOT", "BIT_XOR", "BIT_OR", "SHIFT_LEFT", "SHIFT_RIGHT", "EQUAL",
"NOT_EQUAL", "LESS_THAN", "LESS_THAN_EQUAL", "GREATER_THAN_EQUAL", "GREATER_THAN", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_EQUAL", "GREATER_THAN_EQUAL", "GREATER_THAN",
@@ -96,7 +96,7 @@ public class KickCLexer extends Lexer {
}; };
private static final String[] _SYMBOLIC_NAMES = { private static final String[] _SYMBOLIC_NAMES = {
null, "TYPEDEFNAME", "CURLY_BEGIN", "CURLY_END", "BRACKET_BEGIN", "BRACKET_END", null, "TYPEDEFNAME", "CURLY_BEGIN", "CURLY_END", "BRACKET_BEGIN", "BRACKET_END",
"PAR_BEGIN", "PAR_END", "SEMICOLON", "COLON", "COMMA", "RANGE", "QUESTION", "PAR_BEGIN", "PAR_END", "SEMICOLON", "COLON", "COMMA", "RANGE", "CONDITION",
"DOT", "ARROW", "PLUS", "MINUS", "ASTERISK", "DIVIDE", "MODULO", "INC", "DOT", "ARROW", "PLUS", "MINUS", "ASTERISK", "DIVIDE", "MODULO", "INC",
"DEC", "AND", "BIT_NOT", "BIT_XOR", "BIT_OR", "SHIFT_LEFT", "SHIFT_RIGHT", "DEC", "AND", "BIT_NOT", "BIT_XOR", "BIT_OR", "SHIFT_LEFT", "SHIFT_RIGHT",
"EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_EQUAL", "GREATER_THAN_EQUAL", "EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_EQUAL", "GREATER_THAN_EQUAL",
@@ -155,7 +155,6 @@ public class KickCLexer extends Lexer {
/** The C-Parser. Used for importing C-files and communicating with the Parser about typedefs. */ /** The C-Parser. Used for importing C-files and communicating with the Parser about typedefs. */
CParser cParser; CParser cParser;
/** True of the next string is the name of a C-file to import*/ /** True of the next string is the name of a C-file to import*/
boolean importEnter = false; boolean importEnter = false;
/** True if the next CURLY starts ASM_MODE */ /** True if the next CURLY starts ASM_MODE */

View File

@@ -9,7 +9,7 @@ SEMICOLON=8
COLON=9 COLON=9
COMMA=10 COMMA=10
RANGE=11 RANGE=11
QUESTION=12 CONDITION=12
DOT=13 DOT=13
ARROW=14 ARROW=14
PLUS=15 PLUS=15

View File

@@ -7,7 +7,7 @@ options { tokenVocab=KickCLexer; }
} }
@parser::members { @members {
CParser cParser; CParser cParser;
public KickCParser(TokenStream input, CParser cParser) { public KickCParser(TokenStream input, CParser cParser) {

View File

@@ -20,7 +20,7 @@ public class KickCParser extends Parser {
new PredictionContextCache(); new PredictionContextCache();
public static final int public static final int
TYPEDEFNAME=1, CURLY_BEGIN=2, CURLY_END=3, BRACKET_BEGIN=4, BRACKET_END=5, TYPEDEFNAME=1, CURLY_BEGIN=2, CURLY_END=3, BRACKET_BEGIN=4, BRACKET_END=5,
PAR_BEGIN=6, PAR_END=7, SEMICOLON=8, COLON=9, COMMA=10, RANGE=11, QUESTION=12, PAR_BEGIN=6, PAR_END=7, SEMICOLON=8, COLON=9, COMMA=10, RANGE=11, CONDITION=12,
DOT=13, ARROW=14, PLUS=15, MINUS=16, ASTERISK=17, DIVIDE=18, MODULO=19, DOT=13, ARROW=14, PLUS=15, MINUS=16, ASTERISK=17, DIVIDE=18, MODULO=19,
INC=20, DEC=21, AND=22, BIT_NOT=23, BIT_XOR=24, BIT_OR=25, SHIFT_LEFT=26, INC=20, DEC=21, AND=22, BIT_NOT=23, BIT_XOR=24, BIT_OR=25, SHIFT_LEFT=26,
SHIFT_RIGHT=27, EQUAL=28, NOT_EQUAL=29, LESS_THAN=30, LESS_THAN_EQUAL=31, SHIFT_RIGHT=27, EQUAL=28, NOT_EQUAL=29, LESS_THAN=30, LESS_THAN_EQUAL=31,
@@ -83,7 +83,7 @@ public class KickCParser extends Parser {
}; };
private static final String[] _SYMBOLIC_NAMES = { private static final String[] _SYMBOLIC_NAMES = {
null, "TYPEDEFNAME", "CURLY_BEGIN", "CURLY_END", "BRACKET_BEGIN", "BRACKET_END", null, "TYPEDEFNAME", "CURLY_BEGIN", "CURLY_END", "BRACKET_BEGIN", "BRACKET_END",
"PAR_BEGIN", "PAR_END", "SEMICOLON", "COLON", "COMMA", "RANGE", "QUESTION", "PAR_BEGIN", "PAR_END", "SEMICOLON", "COLON", "COMMA", "RANGE", "CONDITION",
"DOT", "ARROW", "PLUS", "MINUS", "ASTERISK", "DIVIDE", "MODULO", "INC", "DOT", "ARROW", "PLUS", "MINUS", "ASTERISK", "DIVIDE", "MODULO", "INC",
"DEC", "AND", "BIT_NOT", "BIT_XOR", "BIT_OR", "SHIFT_LEFT", "SHIFT_RIGHT", "DEC", "AND", "BIT_NOT", "BIT_XOR", "BIT_OR", "SHIFT_LEFT", "SHIFT_RIGHT",
"EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_EQUAL", "GREATER_THAN_EQUAL", "EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_EQUAL", "GREATER_THAN_EQUAL",
@@ -4741,7 +4741,7 @@ public class KickCParser extends Parser {
setState(581); setState(581);
if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)"); if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
setState(582); setState(582);
match(QUESTION); match(CONDITION);
setState(583); setState(583);
expr(0); expr(0);
setState(584); setState(584);

View File

@@ -9,7 +9,7 @@ SEMICOLON=8
COLON=9 COLON=9
COMMA=10 COMMA=10
RANGE=11 RANGE=11
QUESTION=12 CONDITION=12
DOT=13 DOT=13
ARROW=14 ARROW=14
PLUS=15 PLUS=15