Commit Graph

7198 Commits

Author SHA1 Message Date
Terence Parr 66e5b3bfbb
Merge pull request #2402 from ewanmellor/swift-1922
[Swift] Report InputMismatchException with original context information
2018-11-15 09:27:10 -08:00
Steve Vinoski 562eab817c Do not throw std::bad_cast from antlrcpp::Any::is
The antlrcpp::Any::is function should not throw a std::bad_cast
exception if the contained type can't be cast to the requested type,
but should instead just return a boolean result. Add a boolean
parameter to the private getDerived helper function to allow callers
to specify whether or not they want the cast results checked. In the
is() function, pass false for this parameter; in the as() functions,
pass true.
2018-11-15 11:08:09 -05:00
Ewan Mellor c88fe83578
[Swift] Remove repeated epsilon transitions in ATN.
Port the cset 125a509e from the Java runtime.  This adds checks to ATNState
to remove any repeated edges.  This was PR #1369 for the Java runtime.
2018-11-14 21:11:27 -08:00
Ewan Mellor e6feaeb489
Enable some performance tests on Swift.
These were skipped for the Javascript backends because they're still
too slow, but Swift is fine.  (Go is also excluded from these, maybe
that's a mistake, but I don't know.)
2018-11-14 20:29:56 -08:00
Ewan Mellor 842d3d7597
[Swift] Report InputMismatchException with original context information
Port 0803c74 from the Java runtime to Swift.  This was issue #1922.
Enable the corresponding tests for Swift.
2018-11-14 20:28:24 -08:00
nxtstep 36621bda6d
Fix ST4 Snapshot dependency 2018-11-15 00:13:02 +01:00
Terence Parr 11d601348e
Merge pull request #2280 from solussd/master
File path handling fixes
2018-11-13 13:27:52 -08:00
Joseph Smith 6f057dbc59 Use STGroupFile filename constructor
- URL constructor unnecessary
2018-11-13 14:59:12 -06:00
Joe R. Smith 7fcadaa9f7
Use release version of st4 2018-11-13 11:23:39 -06:00
Terence Parr 7983e25ff6
Merge pull request #2399 from vinoski/cpp-any-const-accessors
Add const accessors to antlrcpp::Any C++ class
2018-11-13 09:02:26 -08:00
Joe R. Smith 61d8aea398
Merge branch 'master' into master 2018-11-13 10:57:42 -06:00
Joseph Smith 6899cc5c76 update st4 dep 2018-11-13 10:56:25 -06:00
Steve Vinoski 875aa034d2 Add const accessors to antlrcpp::Any C++ class
To make it easier to work with the const antlrcpp::Any arguments to
the AbstractParseTreeVisitor class aggregateResult and
shouldVisitNextChild functions, add a public const overload for the
antlrcpp::Any::as member function to return a const StorageType&, and
add a public const overloaded conversion operator returning a const
instance of the type contained within the Any.

Add the private antlrcpp::Any::getDerived function to avoid
duplicating the dynamic_cast of the internal pointer, and call it from
the overloaded Any::as functions and also the Any::is function.
2018-11-12 15:25:30 -05:00
Sergey Chupov 9321b6bb97
Update contributors.txt 2018-11-12 11:01:18 +02:00
Sergey Chupov a3e7099dac
Merge branch 'master' into patch-1 2018-11-12 11:00:48 +02:00
Terence Parr dc3b43376c
Merge pull request #2244 from dannoc/antlr_clang_patches
Changes to cpp runtime to make antlr work with Chromium build
2018-11-11 09:27:04 -08:00
Terence Parr b06169c785
Merge branch 'master' into antlr_clang_patches 2018-11-11 09:26:42 -08:00
Terence Parr 2159d15da7
Merge pull request #2248 from uvguy/master
Add support c++ target on android
2018-11-11 09:26:09 -08:00
Terence Parr 7ef7770db1
Merge branch 'master' into master 2018-11-11 09:25:33 -08:00
Terence Parr e230ae7d69
Merge pull request #2203 from xgcssch/master
Support for CMake Packages in the Cpp Runtime
2018-11-11 09:24:32 -08:00
Terence Parr 42275a6de2
Merge pull request #2398 from mike-lischke/issue-2164
Fix for antlr#2164.
2018-11-11 09:22:52 -08:00
Sönke Schau 444fe24bb0
Merge branch 'master' into master 2018-11-11 13:21:57 +01:00
Mike Lischke 95fecce8ed Fix for memory leak in function `ParserATNSimulator::execATNWithFullContext` 2018-11-11 12:06:35 +01:00
parrt a02c2fa5a6 Merge branch 'master' of github.com:antlr/antlr4 2018-11-10 14:54:56 -08:00
parrt 8047283de7 use latest ST4 2018-11-10 14:54:42 -08:00
Terence Parr 40e883a0aa
Merge pull request #2162 from janlinde/make-exit-rule-non-virtual
C++ runtime: Make Parser::exitRule() non-virtual
2018-11-10 08:54:09 -08:00
Terence Parr 07cb53b0ff
Merge branch 'master' into make-exit-rule-non-virtual 2018-11-10 08:54:00 -08:00
Terence Parr 2471d7ec71
Merge pull request #2232 from ChaseOxide/master
Fixed warning from MingGW and error from Clang Windows
2018-11-09 11:40:51 -08:00
parrt f6c6217804 Force usage of previousContext in Cpp 2018-11-09 11:31:59 -08:00
parrt 5aa0df9c45 Fixes #2350 2018-11-09 11:28:30 -08:00
Terence Parr 27d5cc7163
Merge pull request #2396 from mike-lischke/master
Applied C++ changes for PR #1955.
2018-11-09 11:25:52 -08:00
Mike Lischke 3d764a39fd Applied C++ changes for PR #1955.
Also applied recommended XCode settings.
2018-11-09 09:32:24 +01:00
parrt 488375df5a Merge branch 'master' of github.com:antlr/antlr4 2018-11-08 16:52:41 -08:00
parrt 3039dc2411 update jetty server to avoid security risk 2018-11-08 16:51:15 -08:00
Terence Parr 4fed934948
Merge pull request #2159 from enessoylu/master
[Javascript] Update license string for the NPM package.
2018-11-08 13:46:22 -08:00
Terence Parr 25b30623c0
Merge branch 'master' into master 2018-11-08 13:46:09 -08:00
Terence Parr 39a1aa5c0f
Merge pull request #2156 from ewanmellor/swift-stream-tidyups
[Swift] Minor tidyups in the stream code.
2018-11-08 13:45:30 -08:00
Terence Parr 54131a074e
Merge pull request #2155 from ewanmellor/swift-ATNDeserializationOptions-struct
[Swift] Make ATNDeserializationOptions a simple struct.
2018-11-08 13:45:16 -08:00
Terence Parr 0c63b68e18
Merge pull request #2154 from ewanmellor/swift-remove-hashmap
[Swift] Remove HashMap and fix Parser caches.
2018-11-08 13:44:59 -08:00
Terence Parr f1b195765a
Merge pull request #2165 from niccroad/vs2017projects
Add Visual Studio 2017 project to Cpp runtime. Also change define for static library setting to be ANTLR4CPP_STATIC, in all projects.
2018-11-08 13:42:22 -08:00
Terence Parr 441c4076a4
Merge pull request #2168 from ajaypanyala/cppruntime-non-appleclang-macosx
Add missing -std=c++11 flag when using non-appleclang compiler on macosx
2018-11-08 13:41:51 -08:00
Terence Parr f45e36509c
Merge branch 'master' into cppruntime-non-appleclang-macosx 2018-11-08 13:41:32 -08:00
parrt a57732ce74 Merge branch 'master' of github.com:antlr/antlr4 2018-11-08 13:36:02 -08:00
parrt 756e4da008 tweak 2018-11-08 13:35:56 -08:00
Terence Parr 609e1a70b1
Merge pull request #2208 from amilajack/patch-1
Changed travis repo badge to svg
2018-11-08 13:31:20 -08:00
Terence Parr e25ff7105c
Merge pull request #2338 from m-novikov/stdin-stream
Allow importing StdinStream from antlr4 package
2018-11-08 13:26:51 -08:00
Terence Parr d9a061d6d7
Merge pull request #2316 from wu-sheng/patch-1
Make grun alias as same as antlr4.
2018-11-08 13:22:26 -08:00
Terence Parr 47d1ca04bb
Merge pull request #2315 from wu-sheng/patch-2
Sign contributors.txt
2018-11-08 13:22:11 -08:00
Terence Parr 941ae184ad
Merge branch 'master' into patch-2 2018-11-08 13:22:04 -08:00
Terence Parr e159b5dd41
Merge pull request #2339 from LucasHMS/master
Fixing the link to the Eclipse plugin on the Java documentation
2018-11-08 13:18:49 -08:00