jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Zongyuan Zuo 2018-06-16 22:12:09 +08:00 committed by GitHub
parent 2d08b9f414 61acb35f0c
commit 8dfcf32cfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contributors.txt
View File

@ -181,4 +181,5 @@ YYYY/MM/DD, github id, Full name, email
2017/12/20, kbsletten, Kyle Sletten, kbsletten@gmail.com 2017/12/20, kbsletten, Kyle Sletten, kbsletten@gmail.com
2017/12/27, jkmar, Jakub Marciniszyn, marciniszyn.jk@gmail.com 2017/12/27, jkmar, Jakub Marciniszyn, marciniszyn.jk@gmail.com
2018/02/11, io7m, Mark Raynsford, code@io7m.com 2018/02/11, io7m, Mark Raynsford, code@io7m.com
2018/03/26, EternalPhane, Zongyuan Zuo, eternalphane@gmail.com 2018/15/05, johnvanderholt, jan dillingh johnvanderholte@gmail.com
2018/06/16, EternalPhane, Zongyuan Zuo, eternalphane@gmail.com

2
doc/javascript-target.md
View File

@ -62,7 +62,7 @@ The steps to create your parsing code are the following:
You are now ready to bundle your parsing code as follows: You are now ready to bundle your parsing code as follows:
- following webpack specs, create a webpack.config file - following webpack specs, create a webpack.config file
- in the webpack.config file, exclude node.js only modules using: node: { module: "empty", net: "empty", fs: "empty" } - in the webpack.config file, exclude node.js only modules using: node: { module: "empty", net: "empty", fs: "empty" }
- from the cmd line, nag-vigate to the directory containing webpack.config and type: webpack - from the cmd line, navigate to the directory containing webpack.config and type: webpack
This will produce a single js file containing all your parsing code. Easy to include in your web pages! This will produce a single js file containing all your parsing code. Easy to include in your web pages!

36
tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
View File

@ -236,9 +236,12 @@ public class <parser.name> extends <superClass; null="Parser"> {
<endif> <endif>
public static final int public static final int
<parser.rules:{r | RULE_<r.name> = <r.index>}; separator=", ", wrap, anchor>; <parser.rules:{r | RULE_<r.name> = <r.index>}; separator=", ", wrap, anchor>;
public static final String[] ruleNames = { private static String[] makeRuleNames() {
<parser.ruleNames:{r | "<r>"}; separator=", ", wrap, anchor> return new String[] {
}; <parser.ruleNames:{r | "<r>"}; separator=", ", wrap, anchor>
};
}
public static final String[] ruleNames = makeRuleNames();
<vocabulary(parser.literalNames, parser.symbolicNames)> <vocabulary(parser.literalNames, parser.symbolicNames)>
@ -275,12 +278,18 @@ case <f.ruleIndex>:
>> >>
vocabulary(literalNames, symbolicNames) ::= << vocabulary(literalNames, symbolicNames) ::= <<
private static final String[] _LITERAL_NAMES = { private static String[] makeLiteralNames() {
<literalNames:{t | <t>}; null="null", separator=", ", wrap, anchor> return new String[] {
}; <literalNames:{t | <t>}; null="null", separator=", ", wrap, anchor>
private static final String[] _SYMBOLIC_NAMES = { };
<symbolicNames:{t | <t>}; null="null", separator=", ", wrap, anchor> }
}; private static final String[] _LITERAL_NAMES = makeLiteralNames();
private static String[] makeSymbolicNames() {
return new String[] {
<symbolicNames:{t | <t>}; null="null", separator=", ", wrap, anchor>
};
}
private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
/** /**
@ -914,9 +923,12 @@ public class <lexer.name> extends <superClass; null="Lexer"> {
<lexer.modes:{m| "<m>"}; separator=", ", wrap, anchor> <lexer.modes:{m| "<m>"}; separator=", ", wrap, anchor>
}; };
public static final String[] ruleNames = { private static String[] makeRuleNames() {
<lexer.ruleNames:{r | "<r>"}; separator=", ", wrap, anchor> return new String[] {
}; <lexer.ruleNames:{r | "<r>"}; separator=", ", wrap, anchor>
};
}
public static final String[] ruleNames = makeRuleNames();
<vocabulary(lexer.literalNames, lexer.symbolicNames)> <vocabulary(lexer.literalNames, lexer.symbolicNames)>