Commit Graph

6627 Commits

Author SHA1 Message Date
Mike Lischke 16242e43c0 Merge branch 'master' into interpreter2 2017-10-22 13:48:10 +02:00
Terence Parr b8fd54780a Merge pull request #1974 from matthauck/cmake-windows
Add MSVC support to c++ cmake build
2017-10-21 13:16:23 -07:00
Terence Parr db5a0aeaf2 Merge pull request #1955 from sharwell/fix-closurebusy
Avoid adding to closureBusy before all ATNConfig properties are set
2017-10-21 13:13:48 -07:00
Terence Parr 593b49fa3d Merge pull request #1983 from shirou/master
[Go] Add CommonTokenStream test.
2017-10-21 13:00:02 -07:00
Terence Parr 5fe98b17fd Merge pull request #1996 from ereyes01/export-lexer-methods
Export Go lexer methods
2017-10-21 12:58:31 -07:00
Terence Parr 8a551095dc Merge branch 'master' into export-lexer-methods 2017-10-21 12:58:22 -07:00
Terence Parr eacbe23ea1 Merge pull request #2064 from antlr/revert-2011-master
Revert "CMake build fixes for Visual Studio"
2017-10-21 12:55:31 -07:00
Terence Parr 0839970e00 Revert "CMake build fixes for Visual Studio" 2017-10-21 12:55:16 -07:00
Terence Parr fa72e72de0 Merge pull request #2011 from gendalph/master
CMake build fixes for Visual Studio
2017-10-21 12:53:53 -07:00
Terence Parr f8ae3e8cad Merge pull request #2063 from hanjoes/hanjoes-updates
Update boot.py and swift-target.md to reflect Swift 4 migration changes.
2017-10-21 12:47:24 -07:00
Hanzhou Shi 0dce38109c Update boot.py and swift-target.md to reflect Swift 4 migration changes. 2017-10-21 12:44:44 -07:00
Terence Parr c9c7561701 Merge pull request #2032 from ewanmellor/swift-4
Migrate the Swift runtime to Swift 4.
2017-10-21 12:26:29 -07:00
Terence Parr ae0f139dc4 Merge pull request #2062 from antlr/revert-1978-go-target
Revert "[Go] Interval"
2017-10-21 12:00:48 -07:00
Terence Parr 38aaf88097 Revert "[Go] Interval" 2017-10-21 12:00:25 -07:00
Terence Parr 24c149603d Merge pull request #1978 from neatnerd/go-target
[Go] Interval
2017-10-21 09:38:00 -07:00
Terence Parr daecc851d6 Merge pull request #2055 from ewanmellor/appveyor-version-4.7.1
Update AppVeyor version number to 4.7.1-SNAPSHOT.
2017-10-21 09:20:56 -07:00
Terence Parr 33066e2ab1 Merge pull request #2058 from simkimsia/patch-1
Change all mentions of 4.5.3 in getting-started to 4.7
2017-10-21 09:20:27 -07:00
Terence Parr 1985fede5d Merge pull request #2052 from ewanmellor/swift-remove-nullPointer
Remove ANTLRError.nullPointer from the Swift runtime.
2017-10-21 09:19:54 -07:00
Ewan Mellor 897b4339a3
Switch the Linux Swift tests to Trusty and Swift 4.0.
This uses Travis's new(ish) Ubuntu Trusty image, and changes the
version number of the Swift binaries that we download.

We now install clang-3.6.  This is not the default on Trusty, but
it's required by the Swift 4.0 toolchain.

This also removes the lines to upgrade libicu-dev and sqlite3.  These
are sufficiently up-to-date in the Trusty image.
2017-10-20 10:12:47 -07:00
Ewan Mellor cfb0041328
Switch all the macOS Travis jobs to use the Xcode 9 image.
We require Xcode 9 for the Swift target, and the C++ and .NET tests
shouldn't care either way.

We no longer need to install cmake: this is already in the Travis
Xcode 9.0 image (and it barfs if we try to install it again).

We no longer need the rvm bug workarounds; a newer version of rvm is
in the Xcode 9.0 image so this is no longer a problem.

The openssl package is already installed and up-to-date now, so there is
no need to install that.

These changes mean that we don't need before-install-osx-cpp.sh
or before-install-os-swift.sh at all, and before-install-osx-dotnet.sh
gets a bit shorter.  .travis.yml gets a small change to handle the
fact that some platform / target combos don't need before-install any more.
2017-10-20 10:12:47 -07:00
Ewan Mellor 39c01f6da7
Update the Swift tests for Swift Package Manager 4.0.
SwiftPM has changed its default layout for new packages (i.e. when we
use "swift package init --type executable" during the test).  It now is
<projectName>/Sources/<projectName>/main.swift, so we need to adjust the
paths appropriately.

This includes a small change to print stdout as well as stderr if a
unit test fails to build.  swift-build-tool takes the compiler subprocess's
stderr and puts it on stdout.  *sheesh*  This meant that we were losing
critical error messages.
2017-10-20 10:12:47 -07:00
Ewan Mellor 7aa6b544d9
Redo Package.swift for Swift Package Manager 4.0. 2017-10-20 10:12:47 -07:00
Ewan Mellor 8a292c0f4f
Migrate the Swift runtime to Swift 4.
Remove a number of generic type constraints, since these can now
be inferred by the compiler.

Match the syntax change when passing a tuple into a function (adding
an extra set of parens).

Change filterPrecedencePredicates to avoid a now-illegal cast.

Match the renames truncatingBitPattern -> truncatingIfNeeded,
multiplyWithOverflow -> multipliedReportingOverflow, etc.  In
some cases the multiplyWithOverflow calls are replaced by
overflowing operators (e.g. &*) instead.
2017-10-20 10:12:46 -07:00
Ewan Mellor 365d4f40bb
Refactor to avoid forced casts. 2017-10-20 10:12:46 -07:00
Ewan Mellor 4bafc74e6c
Remove unused functions from StringExtension.
Some of these are subject to change for Swift 4, but since they are unused
we should remove them anyway.
2017-10-20 10:12:46 -07:00
Ewan Mellor 8ba2c0ba4f
Add entries to .gitignore for the files that are generated by
Swift Package Manager.
2017-10-20 10:12:46 -07:00
Ewan Mellor 4d628174df
Update Swift runtime documentation.
We now use boot.py and Swift Package Manager to generate the .xcodeproj
rather than having those committed in the source repo.
2017-10-20 10:12:44 -07:00
Ewan Mellor 7df0c2f478
Split the C++ tests into three groups.
Running these as a single test still intermittently times out after 40
minutes, even with the other recent csets.
2017-10-20 00:30:53 -07:00
simkimsia 3def33fdd5 Update contributors.txt 2017-10-15 16:17:23 +08:00
simkimsia 51fc50dbcb Update getting-started.md
change all mentions of 4.5.3 to 4.7 since that's what the quickstart on http://www.antlr.org/ homepage is already showing
2017-10-15 16:14:50 +08:00
Arshinskiy Mike 5297bf2697 Modified open interval logic
Added tests
2017-10-14 20:31:38 +02:00
Arshinskiy Mike d297c9ddda added initial tests for interval set 2017-10-14 15:15:41 +02:00
Ewan Mellor 5f28a5b313
Split Travis tests into three phases.
This gives a "smoke-test" phase which just runs the Java tests, to get a
quick check that compilation is working.  It is followed by the
"main-test" phase that tests each target on their preferred platform
(e.g. Swift on macOS, Python on Linux) followed by "test-extended"
which runs all the remaining tests (all the other Java variants, and
any other platforms supported by each target).

This means that those tests in the later phases won't run unless the
earlier phases have passed.  This should vastly improve our Travis
turnaround.

This changeset also changes the matrix so that we get some coverage across
all of openjdk7,8 and oraclejdk7,8 and moves the Go and Javascript tests
to Trusty just so that they are more up-to-date.  This adds one additional
Java test run, so now we compare oraclejdk8 and openjdk8 in case of
problems in that regard.

Note that the test matrix has not been extended to cover oraclejdk9.  This
currently fails for us with a build issue, so it is not included in this
changeset.

This changeset also removes the meaningless custom apt configuration in the
section for macOS .NET tests.
2017-10-13 20:14:10 -07:00
Ewan Mellor 7bd52e5518
Wrap the run-tests-$TARGET.sh with a travis_wait call.
This means that it will write a line to the log each minute while the
tests are running, up to the specified timeout.  This works around the
fact that one of Maven / Surefire / JUnit are buffering our test output
until a whole test class has run.

This is a problem in particular with the TestLeftRecursion tests because
they are taking over 9 minutes on their own.  After 10 minutes of silence
Travis assumes that a job is broken and kills it.  We've been hitting
that timeout regularly.
2017-10-13 20:14:08 -07:00
Ewan Mellor 242dbe095d
Add cache entries to .travis.yml.
This is recommended by the Travis docs to speed up the parts of the
tests where unpack / install has a significant cost, as opposed to the
download.

This changeset adds entries for ~/.m2 (for Maven) and
~/Library/Caches/Homebrew for (brew on macOS).
2017-10-13 20:13:24 -07:00
Ewan Mellor 0097838b8a
Update AppVeyor version number to 4.7.1-SNAPSHOT. 2017-10-12 16:49:03 -07:00
Terence Parr 8778ad65c4 Merge pull request #2047 from bramp/commonsetstuff
[Go] Placed the CommonSetStuff code inside a scope
2017-10-12 09:42:32 -07:00
Terence Parr 28a81b8568 Merge pull request #2038 from ericvergnaud/fix-unicode-2031
fix #2031
2017-10-12 09:40:34 -07:00
Terence Parr e35988ddc8 Merge branch 'master' into fix-unicode-2031 2017-10-12 09:39:56 -07:00
Terence Parr 7d2a0978b5 Merge branch 'master' into fix-unicode-2031 2017-10-12 09:38:16 -07:00
Ewan Mellor 5df3b2bbdf
Remove ANTLRError.nullPointer from the Swift runtime.
This was copied from the API of the equivalent code in Java when
the runtime was ported to Swift.  It is meaningless in Swift, and
was unused.
2017-10-12 00:52:44 -07:00
Terence Parr afeb2e9b88 Merge pull request #2034 from ewanmellor/jdk7
Replace oraclejdk7 with openjdk7 in .travis.yml.
2017-10-10 12:57:56 -07:00
Terence Parr c4cbcb5b58 Merge pull request #2007 from brauliobz/fragment_only_grammar
Fix codegen error (Java) when a lexer has only fragment tokens
2017-10-10 12:55:07 -07:00
Terence Parr 2b529d8529 Merge branch 'master' into fragment_only_grammar 2017-10-10 12:55:01 -07:00
Terence Parr c861e09d39 Merge pull request #1977 from nielsbasjes/EmptyGetText
Fixed empty CodePointCharStream throwing exception on getText.
2017-10-10 12:47:00 -07:00
Terence Parr 2905b8cdda Merge pull request #2045 from bramp/patch-1
bramp signed the contributors.txt
2017-10-10 12:43:49 -07:00
Terence Parr 6911cb45b5 Merge branch 'master' into patch-1 2017-10-10 12:43:40 -07:00
Terence Parr 2fabbdb589 Merge pull request #2010 from sachinjain024/patch-2
Adding mention to contributor.txt
2017-10-10 12:43:09 -07:00
Terence Parr ed5f07575d Merge branch 'master' into patch-2 2017-10-10 12:43:04 -07:00
Terence Parr 7688518116 Merge pull request #1989 from tiagomazzutti/patch-1
Update contributors.txt
2017-10-10 12:42:36 -07:00