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

Merge branch 'master' of github.com:antlr/antlr4

This commit is contained in:
parrt 2016-03-29 14:40:17 -07:00
parent cd9ed40ab0 9655a92d50
commit 41a196082d
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.txt
View File

@ -88,5 +88,6 @@ YYYY/MM/DD, github id, Full name, email
2015/12/17, sebadur, Sebastian Badur, sebadur@users.noreply.github.com 2015/12/17, sebadur, Sebastian Badur, sebadur@users.noreply.github.com
2015/12/23, pboyer, Peter Boyer, peter.b.boyer@gmail.com 2015/12/23, pboyer, Peter Boyer, peter.b.boyer@gmail.com
2015/12/24, dtymon, David Tymon, david.tymon@gmail.com 2015/12/24, dtymon, David Tymon, david.tymon@gmail.com
2016/02/18, reitzig, Raphael Reitzig, reitzig[at]cs.uni-kl.de
2016/03/27, beardlybread, Bradley Steinbacher, bradley.j.steinbacher@gmail.com 2016/03/27, beardlybread, Bradley Steinbacher, bradley.j.steinbacher@gmail.com
2016/03/28, gagern, Martin von Gagern, gagern@ma.tum.de 2016/03/28, gagern, Martin von Gagern, gagern@ma.tum.de

2
doc/targets.md
View File

@ -18,7 +18,7 @@ The [ANTLR v4 book](http://pragprog.com/book/tpantlr2/the-definitive-antlr-4-ref
New features generally appear in the Java target and then migrate to the other targets, but these other targets don't always get updated in the same overall tool release. This section tries to identify features added to Java that have not been added to the other targets. New features generally appear in the Java target and then migrate to the other targets, but these other targets don't always get updated in the same overall tool release. This section tries to identify features added to Java that have not been added to the other targets.
|Feature|Java|C♯|JavaScript|Python2|Python3|Swift|C++| |Feature|Java|C♯|JavaScript|Python2|Python3|Swift|C++|
|-|-|-|-|-|-|-|-| |---|---|---|---|---|---|---|---|
|Ambiguous tree construction|4.5.1|-|-|-|-|-|-| |Ambiguous tree construction|4.5.1|-|-|-|-|-|-|

2
runtime/JavaScript/src/antlr4/atn/ATNConfig.js
View File

@ -50,7 +50,7 @@ function checkParams(params, isCfg) {
} else { } else {
var props = {}; var props = {};
props.state = params.state || null; props.state = params.state || null;
props.alt = params.alt || null; props.alt = (params.alt === undefined) ? null : params.alt;
props.context = params.context || null; props.context = params.context || null;
props.semanticContext = params.semanticContext || null; props.semanticContext = params.semanticContext || null;
if(isCfg) { if(isCfg) {

2
tool/src/org/antlr/v4/codegen/target/Python2Target.java
View File

@ -61,7 +61,7 @@ public class Python2Target extends Target {
"memoryview", "memoryview",
"object", "oct", "open", "ord", "object", "oct", "open", "ord",
"pow", "print", "property", "pow", "print", "property",
"range", "raw_input", "reduce", "reload", "repr", "reversed", "round", "range", "raw_input", "reduce", "reload", "repr", "return", "reversed", "round",
"set", "setattr", "slice", "sorted", "staticmethod", "str", "sum", "super", "set", "setattr", "slice", "sorted", "staticmethod", "str", "sum", "super",
"tuple", "type", "tuple", "type",
"unichr", "unicode", "unichr", "unicode",