forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity
5,352 Commits 4 Branches 0 Tags 82 MiB
Commit Graph

95 Commits

Author SHA1 Message Date
parrt b4d8982e95 Merge branch 'master' of git://github.com/NoodleOfDeath/antlr4 2016-11-17 10:31:43 -08:00
sridharxp 13fbdbb840 Sign CLA 2016-11-16 13:24:16 +05:30
sridharxp 6e09f08348 InvokeRule without Fix without Temporary variable 2016-11-16 13:14:38 +05:30
hanjoes 35782f59ad Adding hanjoes to contributors.txt. 2016-11-15 14:59:21 -08:00
Mike Lischke 3b3fe3da57 Merge branch 'master_upstream' 
Had to resolve a number of conflicts + added code required for the C++ target to generate header files, after the recent changes in the main repo.
 2016-11-07 11:16:02 +01:00
Thom Morgan 6d12b85e10 Update contributors.txt 2016-11-06 09:37:13 -05:00
Peter Boyer b444d51648 Fix contributors merge conflict 2016-11-05 13:58:08 -04:00
Peter Boyer 8ebd12918f Fix merge conflict 2016-11-05 12:32:33 -04:00
parrt 6d022379bc Pull in parrt's branch 'model-updates-for-new-targets' which appears to have freshened some non Go stuff as well. Simplify Go filename construction. 2016-11-05 08:48:37 -07:00
Mike Lischke e71e95080a Merge branch 'master_upstream' 
Also updated the list of ignored tests in the Cpp.test.stg file (lke it is done for the other targets).
 2016-11-05 15:07:59 +01:00
runner 1b7fc4119d sign cla 
sign cla
 2016-11-05 19:58:22 +08:00
kai stammerjohann af624e1321 contributors.txt update 2016-11-01 09:48:57 +01:00
Floor 951d0f06d7 cpp runtime: updated the vs2013 project reflecting the last changes 2016-10-21 13:07:15 +02:00
parrt 285c7fca6c resolve contribs conflict 2016-10-13 16:21:00 -07:00
Niels Basjes 0bf739fa73 Added Niels Basjes to the contributers list 2016-10-13 22:53:12 +02:00
parrt 4312b37828 pull test changes in 2016-10-13 10:58:19 -07:00
Christian Gudrian 07f57564ec Update contributors.txt 
Added cgudrian
 2016-10-13 07:41:17 +02:00
Peter Boyer 42347c078b Fix merge failure 2016-10-12 09:53:43 -04:00
Mike Lischke 3b98c1136e Merge branch 'master_upstream' 2016-09-25 11:31:51 +02:00
Burt Harris 9a7e0b5e4e Merge branch 'master' into fixGitignore 
These are changes from the upstream master.
 2016-09-23 14:47:33 -07:00
Andreas Jonson 6e780c90bb update the runtime paths to work in windows 
the old paths contained a / at the beginning of the path e.g. "/C:/" but the expected path is "C:/" and due to this all test for the targets javascript, python and c# failed on windows.
 2016-08-19 23:27:08 +02:00
Burt Harris a51b709954 Fix .gitignore for target language directory 
Also added .gitignore entries for Node.js & typescript dependency cache directories.
 2016-08-11 12:56:34 -07:00
Wolfgang Johannes Kohnen 9371c7900e Sign CLA. 2016-08-08 19:36:00 +02:00
Dan McLaughlin 6230fbe5d9 Add myself to contributor list 2016-08-05 08:35:15 -07:00
Mike Lischke d089c8d864 Manually merged pull request #26. 2016-08-01 09:20:36 +02:00
Tim O'Callaghan 6d33a6f19b updated contributors list with my details 2016-07-27 21:46:35 +02:00
Chris Heller bba03383d2 Bring chrisheller-patch-1 branch up to date 2016-07-23 01:37:09 -07:00
Mike Lischke e8766953da Added kosl90 to contributors list. 2016-07-21 11:05:48 +02:00
Chris Heller 3a1c803548 Add Chris Heller to contributors.txt 
As requested for submitting contributions.
 2016-07-20 21:13:22 -07:00
Nathan Burles ffd65e3ef4 Added to contributors.txt 2016-07-20 16:20:01 +01:00
Will Faught 24a26d90df Sign CLA 2016-07-18 17:20:59 -07:00
Mike Lischke 014d9fd593 Merge branch 'master' into feature/templates 2016-04-23 16:05:10 +02:00
parrt 1356186f65 add get max token type to vocab. 2016-03-29 15:55:02 -07:00
Raphael R 7b9a7b5ec5 Update contributors.txt 2016-03-29 10:47:18 +02:00
Martin von Gagern 10756477ce Signing contributors.txt 2016-03-28 23:46:58 +02:00
Martin Steiger 420f4e0282 Update contributors.txt 
Added msteiger
 2016-03-28 22:10:36 +02:00
beardlybread ba64a1e001 documentation typos 2016-03-27 20:04:54 -04:00
Mike Lischke 7e09002ebc First working version of a demo app that uses the new C++ target. 
- Created a new command line target in the XCode project. Win + Linux yet outstanding.
- Reorganized the C++ runtime folder structure a bit
  * Put everything in a new folder "runtime"
  * Added a "demo" folder for the demo grammar + app
  * Renamed Apple folder to Mac in demo folder
  * Added a script with some descriptions to run parser regeneration (via jar or classes). This is also used in the XCode project to regenerate the files.
  * Moved all C++ runtime files up in the folder hierarchy. No need to mimic the deep nesting from Java.
- Some adjustments here and there in the C++ runtime for consistency.
- Overhaul of the Cpp.stg file to produce compilable code. Extracted file level templates into a new template Files.stg. Experimented with new named actions (@parser::listenerheader) but the result is not satisfying yet. Need to investigate more.
- Extended ANTLR to produce header files if a target class returns true in the new function needsHeader().
- Added generated folder from demo to .gitignore
- Added myself to contributors file + maven xml.
 2016-03-15 21:02:47 +01:00
David Tymon 121aba1bb8 pull in contrib 2016-01-28 11:09:52 -08:00
parrt ca5f65c731 Merge branch 'patch-1' of git://github.com/cooperra/antlr4 into cooperra-patch-1 Fixes #1081 2016-01-28 10:55:15 -08:00
parrt 34787c0fd8 Merge branch 'patch-1' of git://github.com/cooperra/antlr4 into cooperra-patch-1 Fixes #1081 2016-01-28 10:54:47 -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
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
sebadur a631e3007a Signed to contributors.txt 
- Also implemented sharwell's suggested changes of originally pull request
 2015-12-17 01:15:49 +01: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
Udo Borkowski b9b1afe902 sign "contributors.txt" file 2015-11-25 10:08:35 +01:00
Robbie Cooper 3abca793af Add cooperra to contributors.txt 2015-11-12 17:18:17 -05:00