Commit Graph

4592 Commits

Author SHA1 Message Date
parrt 7e6af55245 Merge branch 'master' of github.com:antlr/antlr4 2016-01-28 10:49:23 -08:00
parrt 7b517f046a Merge branch 'cooperra-patch-1' 2016-01-28 10:48:09 -08:00
parrt 3a733af5f7 Merge branch 'patch-1' of git://github.com/cooperra/antlr4 into cooperra-patch-1
# Conflicts:
#	contributors.txt
2016-01-28 10:47:57 -08:00
parrt 5299d436aa Merge branch 'patch-1' of git://github.com/cooperra/antlr4 into cooperra-patch-1
# Conflicts:
#	contributors.txt
2016-01-28 10:47:03 -08:00
Terence Parr f870566b25 Merge pull request #1085 from gfx/remove_awt_deps
Remove unused Utils#waitForClose() in antlr4-runtime
2016-01-28 10:43:17 -08:00
Terence Parr 9c6e212bc9 Update creating-a-language-target.md 2016-01-16 12:53:00 -08:00
Josh Chase 7d478b18ae Only run the maven plugin when needed. 2016-01-13 16:32:59 -08:00
Peter Boyer 6bb241952a Update ace-javascript-target.md 2016-01-03 21:18:32 -05:00
Peter Boyer cceda58ed6 One more 2016-01-03 21:18:09 -05:00
Peter Boyer c432ce8889 Update ace-javascript-target.md 2016-01-03 21:15:44 -05:00
David Tymon a1c63234e1 JS: Added 'require' statements are missing the class names 2015-12-24 19:04:22 +11:00
FUJI Goro (gfx) 4a1ec7df38 Remove Utils#waitForClose()
It is used nowhere but imports java.awt.*; Android runtime
has no java.awt.* so Android SDK build tools say "it includes
invalid packages". It's better if antlr4-runtime has no dependency
on java.awt.*, esp. it is not used anymore.
2015-12-24 14:04:58 +09:00
David Tymon f77a8c9139 Sign contributors list 2015-12-24 14:45:07 +11:00
David Tymon 812794600d JS: LexerActionExecutor cached hash string name clashes with function
LexerActionExecutor caches its hash string in a member called
'hashString'. However, the class also has a method with the
same name which leads to unexpected results.

The member has been renamed to '_hashString' to avoid the name
clash.
2015-12-24 13:06:59 +11:00
David Tymon f40ce5a188 JS: LL1Analyzer passing PredictionContext incorrectly to ATNConfig constructor
The PredictionContext should be passed to the ATNConfig constructor
in the first argument, the params object. Instead, it is being passed
as the second argument which is intended to be the config.
2015-12-24 13:01:40 +11:00
David Tymon 0455e0a09f JS: Fix missing 'requires' statements 2015-12-24 12:23:09 +11:00
Peter Boyer 8eaea9105d Fix merge conflict in contributors 2015-12-23 14:36:21 -06:00
Peter Boyer 6a7cae8ea9 Update contributors.txt 2015-12-23 14:33:05 -06:00
Terence Parr ac3d78554c Merge pull request #1067 from sebadur/patch-1
Fixing typos in listeners.md
2015-12-16 16:52:19 -08:00
sebadur a631e3007a Signed to contributors.txt
- Also implemented sharwell's suggested changes of originally pull request
2015-12-17 01:15:49 +01:00
Sebastian Badur 3876cc600a Fixing typos in listeners.md
- ParserRuleContext does not have type parameters
- Confusing sentence cleaned up a little
2015-12-16 20:45:44 +01:00
Peter Boyer 797dd823be Fix mistake in tokenIndex bounds check
undefined < anyInteger 

returns false
2015-12-15 21:44:47 -05:00
Eric Vergnaud c651c83a8b fix #1058 2015-12-09 22:17:46 +08:00
Terence Parr 01e6923dbd Merge pull request #1059 from parrt/KvanTTT-master
Kvan ttt master
2015-12-08 11:39:09 -08:00
Terence Parr 1438ab817f why oh why does intellij skip changes when i push? 2015-12-08 11:38:35 -08:00
Terence Parr 99563b116e merging KvanTTT changes. 2015-12-08 11:38:08 -08:00
Terence Parr a072f59a87 Merge branch 'master' of github.com:antlr/antlr4 2015-12-08 11:34:45 -08:00
Terence Parr e7ba4967bc tweak doc 2015-11-26 11:04:58 -08:00
Terence Parr 6068a4a2c7 Merge pull request #1054 from abego/patch-4
Possible NullPointerException in ActionTranslater#translateActionChunk
2015-11-25 09:05:46 -08:00
Terence Parr 36d8d41def Merge pull request #1046 from abego/extraNullCheckInTestRig
Extra 'null' check in TestRig#process
2015-11-25 09:04:43 -08:00
Terence Parr 6da877e895 Merge pull request #1053 from abego/patch-3
Doc: more details on remotes `origin` and `upstream` in local Git repo
2015-11-25 09:04:09 -08:00
Terence Parr bd947c90a6 Merge pull request #1055 from abego/patch-5
sign "contributors.txt" file
2015-11-25 09:03:47 -08:00
Udo Borkowski b9b1afe902 sign "contributors.txt" file 2015-11-25 10:08:35 +01:00
Udo Borkowski 10edd9a243 Possible NullPointerException in ActionTranslater#translateActionChunk
The parameter `RuleFunction rf` in `ActionTranslater#translateActionChunk` may be `null`.

The method's implementation takes care of this by checking `rf` before making its `ruleCtx` the translator's nodeContext:

```
if ( rf!=null ) translator.nodeContext = rf.ruleCtx;
```

However in the statement following this code the check for `rf!=null` is missing. This will lead to a `NullPointerException` when  `altLabel` is defined and `rf` is `null`:

```
if ( altLabel!=null ) translator.nodeContext = rf.altLabelCtxs.get(altLabel);
```

To avoid the problem only access `rf.altLabelCtxs` when `rf` is not null:

```
if ( rf!=null ) {
    translator.nodeContext = rf.ruleCtx;
    if ( altLabel!=null ) translator.nodeContext = rf.altLabelCtxs.get(altLabel);
}
```
2015-11-25 00:37:48 +01:00
Udo Borkowski 0857dc40f3 Doc: more details on remotes `origin` and `upstream` in local Git repo 2015-11-25 00:32:56 +01:00
Terence Parr 8d6203450d Merge pull request #1052 from parrt/master
this->self.
2015-11-24 11:14:37 -08:00
Terence Parr 15f69d6697 this->self. 2015-11-24 10:58:19 -08:00
Terence Parr 8a4aa39de2 fix links 2015-11-23 16:19:45 -08:00
Terence Parr 3726992071 Merge pull request #1051 from parrt/move-doc-to-repo
Move doc to repo from wiki.
2015-11-23 16:10:30 -08:00
Terence Parr 292dce4f6d add more doc 2015-11-23 16:06:04 -08:00
Terence Parr 5aa8b29453 add more doc 2015-11-23 15:57:58 -08:00
Terence Parr e1073410f8 more doc 2015-11-22 09:25:41 -08:00
Terence Parr 1c3b4515ea add more doc 2015-11-19 15:59:04 -08:00
Terence Parr 73f042139c add more doc 2015-11-19 12:47:28 -08:00
Terence Parr 586bcd2368 Merge branch 'master' of github.com:parrt/antlr4 into move-doc-to-repo 2015-11-19 12:39:11 -08:00
Terence Parr 05b50325a8 Merge pull request #991 from michaelpj/sync-before-predict
Reinstitute `sync` calls before `adaptivePredict`
2015-11-19 12:37:09 -08:00
Terence Parr 3fa8cfe29e add more doc 2015-11-19 12:34:04 -08:00
Udo Borkowski a71ffbe8bc Extra 'null' check in TestRig#process
After loading and casting the parserClass in TestRig#process using
`cl.loadClass(parserName).asSubclass(Parser.class)` there is a check if
the class returned by `#asSubclass` is not null:

```
parserClass = cl.loadClass(parserName).asSubclass(Parser.class);
if ( parserClass==null ) {
	System.err.println("Can't load "+parserName);
}
```

The method `#asSubclass` will never return `null`, but throw an
`ClassCastException` when the cast is not valid, therefore the check
can be removed.

See also: [TestRig#process Documentation](http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html#asSubclass(java.lang.Class\))
2015-11-19 18:27:32 +01:00
Michael Peyton Jones 42cb08f46a Add proper qualifiers to the JS and Python errHandler calls 2015-11-19 16:40:17 +00:00
Michael Peyton Jones b48c86cc30 Use correct sync method in C# codegen 2015-11-18 11:22:53 +00:00