Commit Graph

7944 Commits

Author SHA1 Message Date
jasder 2b797f1833 测试
测试合并后是否会刷新评论列表
2021-10-13 15:14:30 +08:00
forgetest1 58119ce017 Merge pull request '哈哈' (#1) from fix-3216 into align-js-runtime-with-java-runtime 2021-10-09 18:11:47 +08:00
Eric Vergnaud d82e8921a6 Fix issue where original ATN would be damaged by IntervalSet operations. Foxes #3216 2021-03-19 00:11:03 +08:00
Eric Vergnaud 20a4d9d138 always trigger enter/exit rules (same as Java/C#) 2021-03-19 00:06:02 +08:00
parrt c2f104cd08 tweak doc 2021-03-11 14:41:41 -08:00
parrt c0e22b99d6 js build modified some files 2021-03-11 14:36:29 -08:00
parrt 2b5bb2249e [maven-release-plugin] prepare for next development iteration 2021-03-11 14:18:19 -08:00
parrt 5e5b6d35b4 [maven-release-plugin] prepare release 4.9.2 2021-03-11 14:18:13 -08:00
parrt cb4e59d420 bump version to 4.9.2 2021-03-11 14:10:44 -08:00
parrt 8d621b73b6 support new anaconda mac location. 2021-03-11 13:55:37 -08:00
Terence Parr d889ba8668
Merge pull request #3113 from mike-lischke/master
Fixed ANTLRInputStream and ANTLRFileStream
2021-03-10 09:03:03 -08:00
Mike Lischke 4431f1ff69 Small improvement 2021-03-10 13:21:54 +01:00
Mike Lischke ff629d543a Another build fix
C++ is not <any other language where you don't need a useless constructor>
2021-03-10 12:07:09 +01:00
Mike Lischke 9d1737f33b Build fix 2021-03-10 11:58:49 +01:00
Mike Lischke 5731e64e22 Added a sanity check for input size. 2021-03-10 11:49:22 +01:00
Mike Lischke 84d4ce73de More changes to the ANTLRInputStream and ANTLRFileStream classes
- Added a default c-tor to the input stream to avoid an ambiquity.
- Changed the input stream API so that it can take a string pointer + length and use that for UTF conversion, avoiding so unnecessary copies. Convenience methods exist to use a std::string or a std::string_view.
- With that only a single load() method is necessary.
- In ANTLRFileStream the other c-tors are now also deleted, as they make no sense there.
2021-03-10 11:21:04 +01:00
Mike Lischke f881e3ec3f Wrong load call fixed. 2021-03-09 11:04:04 +01:00
Mike Lischke 93c06214a6 Fixed C++ tests and build warnings 2021-03-09 11:01:57 +01:00
Mike Lischke faa64fdfa7 Merge branch 'master-upstream' 2021-03-09 09:44:28 +01:00
Mike Lischke 62a829fb65 Fixed ANTLRInputStream and ANTLRFileStream
A previous change to add std::string_view support to ANTLRInputStream for C++17 caused some trouble because of ABI changes. This has been changed to define 2 constructors, one for std::string_view (for C++17) and the original one for std::string.
This is turn caused an error in ANTLRFileStream, which also takes a string in the constructor (but handling it as file name instead of input). To make this clearer the c-tor taking a std::string has been deleted in ANTLRFileStream and the class now requires to load input via the loadFile() function. This might cause some trouble for those users who had used the std::string constructor of ANTLRFileStream, but I think the better error reporting outweighs the little annoyance.
2021-03-09 09:42:55 +01:00
Terence Parr 0f8bddcbc1
Merge pull request #3009 from xTachyon/bettercpp
Serialized ATN const array generates horrible machine code fix
2021-03-03 18:05:14 -08:00
Damian Andrei 76975c15ae
Merge branch 'master' into bettercpp 2021-03-03 12:55:51 +02:00
ericvergnaud dc460a0514
Merge pull request #3100 from hackeris/patch-1
fix javascript import in example code
2021-03-02 11:18:19 +08:00
ericvergnaud 9af2480f48
Merge branch 'master' into patch-1 2021-03-02 10:11:35 +08:00
不是油条 ab2b71ce42
sign to contributors 2021-03-02 09:45:53 +08:00
Terence Parr 715acdb44a
Merge pull request #3094 from khmarbaise/issue-3093
Fix #3093 - The antlr4-maven-plugin is not marked as thread safe
2021-03-01 11:41:48 -08:00
不是油条 31dd28630e
fix javascript import in example code 2021-03-02 00:59:48 +08:00
Karl Heinz Marbaise 1b791a8694
Fixes #3093 - The antlr4-maven-plugin is not marked as thread safe 2021-02-27 21:16:44 +01:00
ericvergnaud 60fd27ff93
Merge pull request #3089 from namasikanam/master
fix a typo in the csharp-target doc
2021-02-21 11:13:08 +08:00
Xingyu Xie c3ad8fca0a
sign contributors certification 2021-02-21 03:08:12 +08:00
Xingyu Xie 3074c7f10f
fix a typo of case sensitivity 2021-02-21 03:05:09 +08:00
Terence Parr fde0b28dfb
Merge pull request #3071 from felixn/cxx-17
Cpp target: allow building runtime with newer C++ standards
2021-02-16 09:10:41 -08:00
Mike Lischke 83911369ad Merge branch 'master-upstream' 2021-02-16 09:14:05 +01:00
Felix Nieuwenhuizen a08edf89ce add hints about C++ standard to readmes 2021-02-15 19:57:36 +01:00
Felix Nieuwenhuizen 03ee69bc3f add example showing how to compile Cpp runtime with a different standard 2021-02-15 18:50:29 +01:00
Felix Nieuwenhuizen 98a3f7d640 allow override of CMAKE_CXX_STANDARD 2021-02-15 18:50:29 +01:00
Felix Nieuwenhuizen 66bf523beb whitespace cleanup 2021-02-15 18:50:29 +01:00
ericvergnaud 84722e9fcc
Fix javascript intervals (#3083)
* run jest tests in CI

* fix issue when merging sets of intervals

* fix CI config

* improve readability

* more tests
2021-02-14 16:51:41 +08:00
Eric Vergnaud 1281fb770e update readme 2021-02-14 00:41:43 +08:00
Oscar Bonilla c0935e190b
Add missing single quote in lexicon.md (#2254) 2021-02-14 00:27:10 +08:00
ericvergnaud 12be1d299d
split appveyor ci (#3082)
* split appveyor ci

* use appveyor matrix

* fix config

* analyze failure

* fix java test job

* troubleshooting

* install node

* troubleshooting

* troubleshooting

* troubleshooting

* troubleshooting

* troubleshooting

* troubleshoot

* troubleshoot

* troubleshoot

* troubleshoot

* troubleshoot

* troubleshoot

* troubleshoot

* almost there!

* full build
2021-02-14 00:11:27 +08:00
ericvergnaud 5719d3496c
Merge pull request #3081 from ericvergnaud/reinstate-php-ci
reinstate PHP ci on circle-ci
2021-02-13 20:19:11 +08:00
Eric Vergnaud bb7e8bae42 reenable all targets 2021-02-13 19:41:41 +08:00
Eric Vergnaud ce3700f3a0 change package 2021-02-13 19:37:17 +08:00
Eric Vergnaud e414c829cf try again 2021-02-13 19:33:14 +08:00
Eric Vergnaud e56f8abf3b getting there 2021-02-13 19:25:18 +08:00
Eric Vergnaud a95897c3fa progressing 2021-02-13 19:19:04 +08:00
Eric Vergnaud 2f12fa2688 add composer 2021-02-13 19:08:10 +08:00
Eric Vergnaud 88b582a73c try again 2021-02-13 19:04:45 +08:00
Eric Vergnaud f670a3944d grrr 2021-02-13 19:00:53 +08:00