expressir 1.2.3 → 1.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (328) hide show
  1. checksums.yaml +4 -4
  2. data/.cross_rubies +0 -6
  3. data/.github/workflows/rake.yml +223 -31
  4. data/.gitignore +7 -1
  5. data/.gitmodules +3 -0
  6. data/.rubocop.yml +13 -4
  7. data/README.adoc +8 -0
  8. data/Rakefile +4 -1
  9. data/bin/console +0 -1
  10. data/bin/rspec +3 -3
  11. data/exe/expressir +4 -2
  12. data/exe/format +1 -1
  13. data/exe/format-test +25 -25
  14. data/exe/generate-parser +16 -13
  15. data/expressir.gemspec +11 -9
  16. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt +44 -9
  17. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj +11 -5
  18. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters +0 -3
  19. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj +11 -4
  20. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj.filters +0 -3
  21. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj +11 -4
  22. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj.filters +0 -3
  23. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj +19 -4
  24. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters +0 -3
  25. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/project.pbxproj +51 -35
  26. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/xcshareddata/xcschemes/antlr4.xcscheme +1 -1
  27. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/xcshareddata/xcschemes/antlr4_ios.xcscheme +1 -5
  28. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/xcshareddata/xcschemes/antlr4_static.xcscheme +1 -5
  29. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRFileStream.cpp +1 -12
  30. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRFileStream.h +9 -6
  31. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRInputStream.cpp +43 -18
  32. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRInputStream.h +16 -6
  33. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonToken.cpp +2 -4
  34. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonTokenFactory.cpp +1 -1
  35. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonTokenFactory.h +1 -1
  36. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp +16 -13
  37. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Exceptions.cpp +2 -2
  38. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Exceptions.h +2 -2
  39. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/FailedPredicateException.cpp +5 -4
  40. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/FailedPredicateException.h +1 -1
  41. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/IntStream.h +1 -1
  42. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Lexer.cpp +2 -3
  43. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Lexer.h +9 -9
  44. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerInterpreter.cpp +0 -15
  45. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerInterpreter.h +1 -7
  46. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ListTokenSource.cpp +2 -2
  47. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ListTokenSource.h +2 -2
  48. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Parser.cpp +51 -31
  49. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Parser.h +1 -7
  50. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserInterpreter.cpp +27 -39
  51. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserInterpreter.h +1 -7
  52. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserRuleContext.cpp +20 -23
  53. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserRuleContext.h +21 -21
  54. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ProxyErrorListener.cpp +4 -4
  55. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RecognitionException.cpp +0 -1
  56. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.cpp +16 -27
  57. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.h +12 -17
  58. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContext.cpp +4 -3
  59. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContext.h +5 -1
  60. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuntimeMetaData.cpp +2 -1
  61. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Token.h +7 -7
  62. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenSource.h +1 -1
  63. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStreamRewriter.cpp +6 -6
  64. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStreamRewriter.h +4 -2
  65. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedCharStream.cpp +15 -18
  66. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedCharStream.h +12 -18
  67. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Version.h +42 -0
  68. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Vocabulary.cpp +13 -53
  69. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Vocabulary.h +11 -27
  70. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-common.h +19 -58
  71. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-runtime.h +7 -5
  72. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.cpp +6 -57
  73. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.h +35 -15
  74. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfig.cpp +29 -36
  75. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfig.h +36 -27
  76. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp +58 -54
  77. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfigSet.h +77 -31
  78. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.cpp +22 -32
  79. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.h +22 -24
  80. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp +335 -464
  81. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializer.h +9 -62
  82. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSimulator.cpp +9 -39
  83. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSimulator.h +6 -22
  84. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNState.cpp +10 -26
  85. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNState.h +42 -36
  86. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNStateType.cpp +33 -0
  87. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNStateType.h +36 -0
  88. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ActionTransition.cpp +2 -6
  89. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ActionTransition.h +4 -2
  90. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.cpp +49 -22
  91. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.h +20 -12
  92. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AtomTransition.cpp +1 -5
  93. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AtomTransition.h +5 -2
  94. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicBlockStartState.h +4 -2
  95. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicState.h +4 -2
  96. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockEndState.h +5 -3
  97. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockStartState.h +10 -1
  98. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionInfo.h +1 -1
  99. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionState.cpp +0 -5
  100. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionState.h +12 -8
  101. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EpsilonTransition.cpp +2 -6
  102. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EpsilonTransition.h +6 -3
  103. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp +139 -108
  104. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LL1Analyzer.h +10 -43
  105. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp +16 -33
  106. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNConfig.h +12 -12
  107. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNSimulator.cpp +69 -82
  108. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNSimulator.h +17 -28
  109. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerAction.cpp +12 -6
  110. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerAction.h +45 -11
  111. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp +48 -44
  112. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionExecutor.h +31 -18
  113. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionType.h +3 -1
  114. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerChannelAction.cpp +14 -26
  115. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerChannelAction.h +12 -16
  116. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerCustomAction.cpp +15 -32
  117. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerCustomAction.h +12 -24
  118. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.cpp +23 -29
  119. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.h +13 -19
  120. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerModeAction.cpp +13 -26
  121. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerModeAction.h +12 -16
  122. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerMoreAction.cpp +6 -17
  123. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerMoreAction.h +12 -16
  124. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPopModeAction.cpp +6 -17
  125. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPopModeAction.h +12 -16
  126. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPushModeAction.cpp +13 -26
  127. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPushModeAction.h +12 -16
  128. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerSkipAction.cpp +6 -17
  129. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerSkipAction.h +11 -15
  130. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerTypeAction.cpp +13 -26
  131. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerTypeAction.h +13 -17
  132. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LoopEndState.h +5 -1
  133. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/NotSetTransition.cpp +1 -6
  134. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/NotSetTransition.h +4 -2
  135. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/OrderedATNConfigSet.cpp +6 -2
  136. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/OrderedATNConfigSet.h +8 -3
  137. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp +169 -152
  138. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulator.h +26 -19
  139. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulatorOptions.h +50 -0
  140. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusBlockStartState.h +5 -1
  141. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusLoopbackState.h +5 -2
  142. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.cpp +2 -11
  143. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.h +15 -9
  144. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateEvalInfo.cpp +2 -2
  145. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateEvalInfo.h +2 -2
  146. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateTransition.cpp +4 -14
  147. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateTransition.h +22 -11
  148. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContext.cpp +255 -338
  149. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContext.h +87 -116
  150. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextCache.cpp +56 -0
  151. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextCache.h +64 -0
  152. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextMergeCache.cpp +167 -0
  153. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextMergeCache.h +101 -0
  154. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextMergeCacheOptions.h +71 -0
  155. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextType.h +21 -0
  156. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionMode.cpp +18 -17
  157. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionMode.h +1 -1
  158. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.cpp +2 -2
  159. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.h +2 -2
  160. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RangeTransition.cpp +1 -5
  161. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RangeTransition.h +4 -2
  162. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStartState.h +4 -3
  163. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStopState.h +4 -2
  164. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleTransition.cpp +1 -5
  165. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleTransition.h +5 -3
  166. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContext.cpp +197 -156
  167. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContext.h +92 -81
  168. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContextType.h +23 -0
  169. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SerializedATNView.h +101 -0
  170. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SetTransition.cpp +2 -6
  171. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SetTransition.h +11 -3
  172. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SingletonPredictionContext.cpp +39 -34
  173. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SingletonPredictionContext.h +17 -10
  174. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarBlockStartState.h +5 -2
  175. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopEntryState.h +4 -2
  176. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopbackState.cpp +6 -6
  177. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopbackState.h +6 -2
  178. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TokensStartState.h +5 -2
  179. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Transition.cpp +1 -9
  180. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Transition.h +11 -22
  181. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TransitionType.cpp +27 -0
  182. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TransitionType.h +33 -0
  183. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/WildcardTransition.cpp +1 -5
  184. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/WildcardTransition.h +4 -2
  185. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFA.cpp +11 -23
  186. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFA.h +20 -15
  187. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFASerializer.cpp +2 -9
  188. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFASerializer.h +4 -4
  189. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFAState.cpp +9 -50
  190. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFAState.h +57 -48
  191. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/LexerDFASerializer.cpp +1 -4
  192. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/LexerDFASerializer.h +3 -4
  193. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/InterpreterDataReader.cpp +2 -2
  194. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/InterpreterDataReader.h +3 -1
  195. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Interval.cpp +1 -29
  196. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Interval.h +10 -10
  197. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/IntervalSet.cpp +15 -28
  198. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/IntervalSet.h +1 -9
  199. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/MurmurHash.cpp +54 -68
  200. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/MurmurHash.h +35 -9
  201. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Any.cpp +0 -5
  202. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Any.h +1 -155
  203. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Arrays.cpp +2 -2
  204. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Arrays.h +39 -0
  205. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/BitSet.h +1 -1
  206. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/CPPUtils.cpp +13 -54
  207. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/CPPUtils.h +16 -29
  208. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Casts.h +34 -0
  209. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Declarations.h +0 -2
  210. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/StringUtils.cpp +25 -23
  211. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/StringUtils.h +2 -40
  212. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Unicode.h +28 -0
  213. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Utf8.cpp +242 -0
  214. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Utf8.h +54 -0
  215. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/AbstractParseTreeVisitor.h +13 -12
  216. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNode.h +7 -2
  217. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.cpp +36 -5
  218. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.h +14 -4
  219. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/IterativeParseTreeWalker.cpp +14 -19
  220. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTree.cpp +0 -3
  221. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTree.h +14 -5
  222. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeType.h +22 -0
  223. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeVisitor.h +4 -4
  224. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeWalker.cpp +8 -9
  225. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeWalker.h +30 -6
  226. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNode.h +10 -2
  227. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp +2 -5
  228. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.h +4 -5
  229. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/Trees.cpp +1 -1
  230. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreePattern.cpp +1 -1
  231. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp +1 -2
  232. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPath.cpp +1 -1
  233. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.cpp +128 -119
  234. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.h +18 -27
  235. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathRuleElement.cpp +1 -1
  236. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathTokenElement.cpp +1 -1
  237. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/tests/Utf8Test.cpp +110 -0
  238. data/ext/express-parser/antlrgen/Express.interp +1 -1
  239. data/ext/express-parser/antlrgen/ExpressBaseListener.cpp +1 -1
  240. data/ext/express-parser/antlrgen/ExpressBaseListener.h +1 -1
  241. data/ext/express-parser/antlrgen/ExpressBaseVisitor.cpp +1 -1
  242. data/ext/express-parser/antlrgen/ExpressBaseVisitor.h +200 -200
  243. data/ext/express-parser/antlrgen/ExpressLexer.cpp +645 -1129
  244. data/ext/express-parser/antlrgen/ExpressLexer.h +20 -27
  245. data/ext/express-parser/antlrgen/ExpressLexer.interp +1 -1
  246. data/ext/express-parser/antlrgen/ExpressListener.cpp +1 -1
  247. data/ext/express-parser/antlrgen/ExpressListener.h +1 -1
  248. data/ext/express-parser/antlrgen/ExpressParser.cpp +1754 -1447
  249. data/ext/express-parser/antlrgen/ExpressParser.h +219 -223
  250. data/ext/express-parser/antlrgen/ExpressVisitor.cpp +1 -1
  251. data/ext/express-parser/antlrgen/ExpressVisitor.h +200 -200
  252. data/ext/express-parser/express_parser.cpp +165 -101
  253. data/ext/express-parser/extconf.rb +14 -14
  254. data/lib/expressir/config.rb +1 -1
  255. data/lib/expressir/express/parser.rb +17 -15
  256. data/lib/expressir/express/visitor.rb +7 -3
  257. data/lib/expressir/model.rb +78 -78
  258. data/lib/expressir/version.rb +1 -1
  259. data/rakelib/antlr4-native.rake +161 -0
  260. data/rakelib/cross-ruby.rake +213 -162
  261. data/spec/acceptance/version_spec.rb +17 -2
  262. data/spec/expressir/express/cache_spec.rb +23 -5
  263. data/spec/expressir/express/formatter_spec.rb +54 -8
  264. data/spec/expressir/express/parser_spec.rb +47 -11
  265. data/spec/expressir/model/model_element_spec.rb +198 -146
  266. data/spec/spec_helper.rb +7 -0
  267. metadata +79 -91
  268. data/demo.rb +0 -18
  269. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSerializer.cpp +0 -621
  270. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSerializer.h +0 -61
  271. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AbstractPredicateTransition.cpp +0 -14
  272. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AbstractPredicateTransition.h +0 -24
  273. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicBlockStartState.cpp +0 -12
  274. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicState.cpp +0 -12
  275. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockEndState.cpp +0 -15
  276. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockStartState.cpp +0 -9
  277. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EmptyPredictionContext.cpp +0 -35
  278. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EmptyPredictionContext.h +0 -27
  279. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LoopEndState.cpp +0 -12
  280. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Makefile +0 -67
  281. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusBlockStartState.cpp +0 -12
  282. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusLoopbackState.cpp +0 -12
  283. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStartState.cpp +0 -16
  284. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStopState.cpp +0 -12
  285. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarBlockStartState.cpp +0 -12
  286. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopEntryState.cpp +0 -15
  287. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TokensStartState.cpp +0 -12
  288. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/guid.cpp +0 -303
  289. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/guid.h +0 -112
  290. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNode.cpp +0 -9
  291. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNode.cpp +0 -9
  292. data/original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.exp +0 -9589
  293. data/original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.owl +0 -36619
  294. data/original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.xml +0 -13294
  295. data/original/examples/employment/eclipse/.project +0 -17
  296. data/original/examples/employment/eclipse/Export/Employment.png +0 -0
  297. data/original/examples/employment/eclipse/Express/employment_schema.exp +0 -33
  298. data/original/examples/employment/eclipse/Express/employment_schema.xmi +0 -77
  299. data/original/examples/employment/eclipse/Express/employment_schema.xml +0 -93
  300. data/original/examples/employment/eclipse/Models/Employment.uml +0 -4
  301. data/original/examples/employment/eclipse/Models/Employment.umldi +0 -240
  302. data/original/examples/employment/eclipse/readme.txt +0 -7
  303. data/original/examples/employment/employment_schema.exp +0 -33
  304. data/original/examples/employment/employment_schema.rb +0 -232
  305. data/original/examples/employment/employment_schema.xml +0 -93
  306. data/original/examples/employment/employment_schema___module.rb +0 -46
  307. data/original/examples/employment/employment_schema___p28attr.rb +0 -126
  308. data/original/examples/employment/employment_schema___p28inst.rb +0 -26
  309. data/original/examples/employment/example_employment_data.xml +0 -1
  310. data/original/examples/employment/example_employment_data_copy.xml +0 -1
  311. data/original/examples/employment/example_employment_reader.rb +0 -30
  312. data/original/examples/employment/example_employment_writer.rb +0 -51
  313. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.exp +0 -3710
  314. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.owl +0 -35880
  315. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.xmi +0 -15357
  316. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.xml +0 -9468
  317. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.exp +0 -8404
  318. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.owl +0 -43147
  319. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xmi +0 -18341
  320. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xml +0 -11632
  321. data/original/exp2ruby.rb +0 -525
  322. data/original/expsm.rb +0 -34
  323. data/original/mapping_owl.rb +0 -1018
  324. data/original/mapping_sysml.rb +0 -2281
  325. data/original/mapping_uml2.rb +0 -599
  326. data/original/mapping_uml2_eclipse.rb +0 -433
  327. data/original/reeper.rb +0 -134
  328. data/spec/expressr_spec.rb +0 -5
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt CHANGED
@@ -1,3 +1,4 @@
1
+ option(ANTLR_BUILD_CPP_TESTS "Build C++ tests." ON)
1
2
 
2
3
  include_directories(
3
4
  ${PROJECT_SOURCE_DIR}/runtime/src
@@ -36,6 +37,38 @@ add_custom_target(make_lib_output_dir ALL
36
37
  add_dependencies(antlr4_shared make_lib_output_dir)
37
38
  add_dependencies(antlr4_static make_lib_output_dir)
38
39
 
40
+ if (ANTLR_BUILD_CPP_TESTS)
41
+ include(FetchContent)
42
+
43
+ FetchContent_Declare(
44
+ googletest
45
+ URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.zip
46
+ )
47
+
48
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
49
+
50
+ FetchContent_MakeAvailable(googletest)
51
+
52
+ file(GLOB libantlrcpp_TESTS
53
+ "${PROJECT_SOURCE_DIR}/runtime/tests/*.cpp"
54
+ )
55
+
56
+ add_executable(
57
+ antlr4_tests
58
+ ${libantlrcpp_TESTS}
59
+ )
60
+
61
+ target_link_libraries(
62
+ antlr4_tests
63
+ antlr4_static
64
+ gtest_main
65
+ )
66
+
67
+ include(GoogleTest)
68
+
69
+ gtest_discover_tests(antlr4_tests)
70
+ endif()
71
+
39
72
  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
40
73
  target_link_libraries(antlr4_shared ${UUID_LIBRARIES})
41
74
  target_link_libraries(antlr4_static ${UUID_LIBRARIES})
@@ -102,17 +135,19 @@ set_target_properties(antlr4_static
102
135
  COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
103
136
 
104
137
  install(TARGETS antlr4_shared
105
- DESTINATION lib
106
- EXPORT antlr4-targets)
138
+ EXPORT antlr4-targets
139
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
140
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
141
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
142
+
107
143
  install(TARGETS antlr4_static
108
- DESTINATION lib
109
- EXPORT antlr4-targets)
144
+ EXPORT antlr4-targets
145
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
146
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
147
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
110
148
 
111
- install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
149
+ install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
112
150
  DESTINATION "include/antlr4-runtime"
113
- COMPONENT dev
151
+ COMPONENT dev
114
152
  FILES_MATCHING PATTERN "*.h"
115
153
  )
116
-
117
-
118
-
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj CHANGED
@@ -179,6 +179,7 @@
179
179
  <ForcedIncludeFiles>
180
180
  </ForcedIncludeFiles>
181
181
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
182
+ <LanguageStandard>stdcpp17</LanguageStandard>
182
183
  </ClCompile>
183
184
  <Link>
184
185
  <SubSystem>Windows</SubSystem>
@@ -196,6 +197,7 @@
196
197
  <ForcedIncludeFiles>
197
198
  </ForcedIncludeFiles>
198
199
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
200
+ <LanguageStandard>stdcpp17</LanguageStandard>
199
201
  </ClCompile>
200
202
  <Link>
201
203
  <SubSystem>Windows</SubSystem>
@@ -213,6 +215,7 @@
213
215
  <ForcedIncludeFiles>
214
216
  </ForcedIncludeFiles>
215
217
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
218
+ <LanguageStandard>stdcpp17</LanguageStandard>
216
219
  </ClCompile>
217
220
  <Link>
218
221
  <SubSystem>Windows</SubSystem>
@@ -230,6 +233,7 @@
230
233
  <ForcedIncludeFiles>
231
234
  </ForcedIncludeFiles>
232
235
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
236
+ <LanguageStandard>stdcpp17</LanguageStandard>
233
237
  </ClCompile>
234
238
  <Link>
235
239
  <SubSystem>Windows</SubSystem>
@@ -249,6 +253,7 @@
249
253
  <ForcedIncludeFiles>
250
254
  </ForcedIncludeFiles>
251
255
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
256
+ <LanguageStandard>stdcpp17</LanguageStandard>
252
257
  </ClCompile>
253
258
  <Link>
254
259
  <SubSystem>Windows</SubSystem>
@@ -270,6 +275,7 @@
270
275
  <ForcedIncludeFiles>
271
276
  </ForcedIncludeFiles>
272
277
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
278
+ <LanguageStandard>stdcpp17</LanguageStandard>
273
279
  </ClCompile>
274
280
  <Link>
275
281
  <SubSystem>Windows</SubSystem>
@@ -291,6 +297,7 @@
291
297
  <ForcedIncludeFiles>
292
298
  </ForcedIncludeFiles>
293
299
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
300
+ <LanguageStandard>stdcpp17</LanguageStandard>
294
301
  </ClCompile>
295
302
  <Link>
296
303
  <SubSystem>Windows</SubSystem>
@@ -312,6 +319,7 @@
312
319
  <ForcedIncludeFiles>
313
320
  </ForcedIncludeFiles>
314
321
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
322
+ <LanguageStandard>stdcpp17</LanguageStandard>
315
323
  </ClCompile>
316
324
  <Link>
317
325
  <SubSystem>Windows</SubSystem>
@@ -430,7 +438,7 @@
430
438
  <ClCompile Include="src\support\Any.cpp" />
431
439
  <ClCompile Include="src\support\Arrays.cpp" />
432
440
  <ClCompile Include="src\support\CPPUtils.cpp" />
433
- <ClCompile Include="src\support\guid.cpp" />
441
+ <ClCompile Include="src\support\Guid.cpp" />
434
442
  <ClCompile Include="src\support\StringUtils.cpp" />
435
443
  <ClCompile Include="src\Token.cpp" />
436
444
  <ClCompile Include="src\TokenSource.cpp" />
@@ -485,8 +493,6 @@
485
493
  <ClInclude Include="src\atn\ATNConfigSet.h" />
486
494
  <ClInclude Include="src\atn\ATNDeserializationOptions.h" />
487
495
  <ClInclude Include="src\atn\ATNDeserializer.h" />
488
- <ClInclude Include="src\atn\ATNSerializer.h" />
489
- <ClInclude Include="src\atn\ATNSimulator.h" />
490
496
  <ClInclude Include="src\atn\ATNState.h" />
491
497
  <ClInclude Include="src\atn\ATNType.h" />
492
498
  <ClInclude Include="src\atn\AtomTransition.h" />
@@ -586,7 +592,7 @@
586
592
  <ClInclude Include="src\support\BitSet.h" />
587
593
  <ClInclude Include="src\support\CPPUtils.h" />
588
594
  <ClInclude Include="src\support\Declarations.h" />
589
- <ClInclude Include="src\support\guid.h" />
595
+ <ClInclude Include="src\support\Guid.h" />
590
596
  <ClInclude Include="src\support\StringUtils.h" />
591
597
  <ClInclude Include="src\Token.h" />
592
598
  <ClInclude Include="src\TokenFactory.h" />
@@ -634,4 +640,4 @@
634
640
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
635
641
  <ImportGroup Label="ExtensionTargets">
636
642
  </ImportGroup>
637
- </Project>
643
+ </Project>
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters CHANGED
@@ -285,9 +285,6 @@
285
285
  <ClInclude Include="src\atn\ATNDeserializer.h">
286
286
  <Filter>Header Files\atn</Filter>
287
287
  </ClInclude>
288
- <ClInclude Include="src\atn\ATNSerializer.h">
289
- <Filter>Header Files\atn</Filter>
290
- </ClInclude>
291
288
  <ClInclude Include="src\atn\ATNSimulator.h">
292
289
  <Filter>Header Files\atn</Filter>
293
290
  </ClInclude>
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj CHANGED
@@ -182,6 +182,7 @@
182
182
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
183
183
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
184
184
  <MinimalRebuild>false</MinimalRebuild>
185
+ <LanguageStandard>stdcpp17</LanguageStandard>
185
186
  </ClCompile>
186
187
  <Link>
187
188
  <SubSystem>Windows</SubSystem>
@@ -201,6 +202,7 @@
201
202
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
202
203
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
203
204
  <MinimalRebuild>false</MinimalRebuild>
205
+ <LanguageStandard>stdcpp17</LanguageStandard>
204
206
  </ClCompile>
205
207
  <Link>
206
208
  <SubSystem>Windows</SubSystem>
@@ -220,6 +222,7 @@
220
222
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
221
223
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
222
224
  <MinimalRebuild>false</MinimalRebuild>
225
+ <LanguageStandard>stdcpp17</LanguageStandard>
223
226
  </ClCompile>
224
227
  <Link>
225
228
  <SubSystem>Windows</SubSystem>
@@ -239,6 +242,7 @@
239
242
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
240
243
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
241
244
  <MinimalRebuild>false</MinimalRebuild>
245
+ <LanguageStandard>stdcpp17</LanguageStandard>
242
246
  </ClCompile>
243
247
  <Link>
244
248
  <SubSystem>Windows</SubSystem>
@@ -259,6 +263,7 @@
259
263
  </ForcedIncludeFiles>
260
264
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
261
265
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
266
+ <LanguageStandard>stdcpp17</LanguageStandard>
262
267
  </ClCompile>
263
268
  <Link>
264
269
  <SubSystem>Windows</SubSystem>
@@ -281,6 +286,7 @@
281
286
  </ForcedIncludeFiles>
282
287
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
283
288
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
289
+ <LanguageStandard>stdcpp17</LanguageStandard>
284
290
  </ClCompile>
285
291
  <Link>
286
292
  <SubSystem>Windows</SubSystem>
@@ -303,6 +309,7 @@
303
309
  </ForcedIncludeFiles>
304
310
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
305
311
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
312
+ <LanguageStandard>stdcpp17</LanguageStandard>
306
313
  </ClCompile>
307
314
  <Link>
308
315
  <SubSystem>Windows</SubSystem>
@@ -325,6 +332,7 @@
325
332
  </ForcedIncludeFiles>
326
333
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
327
334
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
335
+ <LanguageStandard>stdcpp17</LanguageStandard>
328
336
  </ClCompile>
329
337
  <Link>
330
338
  <SubSystem>Windows</SubSystem>
@@ -444,7 +452,7 @@
444
452
  <ClCompile Include="src\support\Any.cpp" />
445
453
  <ClCompile Include="src\support\Arrays.cpp" />
446
454
  <ClCompile Include="src\support\CPPUtils.cpp" />
447
- <ClCompile Include="src\support\guid.cpp" />
455
+ <ClCompile Include="src\support\Guid.cpp" />
448
456
  <ClCompile Include="src\support\StringUtils.cpp" />
449
457
  <ClCompile Include="src\Token.cpp" />
450
458
  <ClCompile Include="src\TokenSource.cpp" />
@@ -499,7 +507,6 @@
499
507
  <ClInclude Include="src\atn\ATNConfigSet.h" />
500
508
  <ClInclude Include="src\atn\ATNDeserializationOptions.h" />
501
509
  <ClInclude Include="src\atn\ATNDeserializer.h" />
502
- <ClInclude Include="src\atn\ATNSerializer.h" />
503
510
  <ClInclude Include="src\atn\ATNSimulator.h" />
504
511
  <ClInclude Include="src\atn\ATNState.h" />
505
512
  <ClInclude Include="src\atn\ATNType.h" />
@@ -602,7 +609,7 @@
602
609
  <ClInclude Include="src\support\BitSet.h" />
603
610
  <ClInclude Include="src\support\CPPUtils.h" />
604
611
  <ClInclude Include="src\support\Declarations.h" />
605
- <ClInclude Include="src\support\guid.h" />
612
+ <ClInclude Include="src\support\Guid.h" />
606
613
  <ClInclude Include="src\support\StringUtils.h" />
607
614
  <ClInclude Include="src\Token.h" />
608
615
  <ClInclude Include="src\TokenFactory.h" />
@@ -649,4 +656,4 @@
649
656
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
650
657
  <ImportGroup Label="ExtensionTargets">
651
658
  </ImportGroup>
652
- </Project>
659
+ </Project>
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj.filters CHANGED
@@ -285,9 +285,6 @@
285
285
  <ClInclude Include="src\atn\ATNDeserializer.h">
286
286
  <Filter>Header Files\atn</Filter>
287
287
  </ClInclude>
288
- <ClInclude Include="src\atn\ATNSerializer.h">
289
- <Filter>Header Files\atn</Filter>
290
- </ClInclude>
291
288
  <ClInclude Include="src\atn\ATNSimulator.h">
292
289
  <Filter>Header Files\atn</Filter>
293
290
  </ClInclude>
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj CHANGED
@@ -182,6 +182,7 @@
182
182
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
183
183
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
184
184
  <MinimalRebuild>false</MinimalRebuild>
185
+ <LanguageStandard>stdcpp17</LanguageStandard>
185
186
  </ClCompile>
186
187
  <Link>
187
188
  <SubSystem>Windows</SubSystem>
@@ -201,6 +202,7 @@
201
202
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
202
203
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
203
204
  <MinimalRebuild>false</MinimalRebuild>
205
+ <LanguageStandard>stdcpp17</LanguageStandard>
204
206
  </ClCompile>
205
207
  <Link>
206
208
  <SubSystem>Windows</SubSystem>
@@ -220,6 +222,7 @@
220
222
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
221
223
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
222
224
  <MinimalRebuild>false</MinimalRebuild>
225
+ <LanguageStandard>stdcpp17</LanguageStandard>
223
226
  </ClCompile>
224
227
  <Link>
225
228
  <SubSystem>Windows</SubSystem>
@@ -239,6 +242,7 @@
239
242
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
240
243
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
241
244
  <MinimalRebuild>false</MinimalRebuild>
245
+ <LanguageStandard>stdcpp17</LanguageStandard>
242
246
  </ClCompile>
243
247
  <Link>
244
248
  <SubSystem>Windows</SubSystem>
@@ -259,6 +263,7 @@
259
263
  </ForcedIncludeFiles>
260
264
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
261
265
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
266
+ <LanguageStandard>stdcpp17</LanguageStandard>
262
267
  </ClCompile>
263
268
  <Link>
264
269
  <SubSystem>Windows</SubSystem>
@@ -281,6 +286,7 @@
281
286
  </ForcedIncludeFiles>
282
287
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
283
288
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
289
+ <LanguageStandard>stdcpp17</LanguageStandard>
284
290
  </ClCompile>
285
291
  <Link>
286
292
  <SubSystem>Windows</SubSystem>
@@ -303,6 +309,7 @@
303
309
  </ForcedIncludeFiles>
304
310
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
305
311
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
312
+ <LanguageStandard>stdcpp17</LanguageStandard>
306
313
  </ClCompile>
307
314
  <Link>
308
315
  <SubSystem>Windows</SubSystem>
@@ -325,6 +332,7 @@
325
332
  </ForcedIncludeFiles>
326
333
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
327
334
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
335
+ <LanguageStandard>stdcpp17</LanguageStandard>
328
336
  </ClCompile>
329
337
  <Link>
330
338
  <SubSystem>Windows</SubSystem>
@@ -444,7 +452,7 @@
444
452
  <ClCompile Include="src\support\Any.cpp" />
445
453
  <ClCompile Include="src\support\Arrays.cpp" />
446
454
  <ClCompile Include="src\support\CPPUtils.cpp" />
447
- <ClCompile Include="src\support\guid.cpp" />
455
+ <ClCompile Include="src\support\Guid.cpp" />
448
456
  <ClCompile Include="src\support\StringUtils.cpp" />
449
457
  <ClCompile Include="src\Token.cpp" />
450
458
  <ClCompile Include="src\TokenSource.cpp" />
@@ -499,7 +507,6 @@
499
507
  <ClInclude Include="src\atn\ATNConfigSet.h" />
500
508
  <ClInclude Include="src\atn\ATNDeserializationOptions.h" />
501
509
  <ClInclude Include="src\atn\ATNDeserializer.h" />
502
- <ClInclude Include="src\atn\ATNSerializer.h" />
503
510
  <ClInclude Include="src\atn\ATNSimulator.h" />
504
511
  <ClInclude Include="src\atn\ATNState.h" />
505
512
  <ClInclude Include="src\atn\ATNType.h" />
@@ -602,7 +609,7 @@
602
609
  <ClInclude Include="src\support\BitSet.h" />
603
610
  <ClInclude Include="src\support\CPPUtils.h" />
604
611
  <ClInclude Include="src\support\Declarations.h" />
605
- <ClInclude Include="src\support\guid.h" />
612
+ <ClInclude Include="src\support\Guid.h" />
606
613
  <ClInclude Include="src\support\StringUtils.h" />
607
614
  <ClInclude Include="src\Token.h" />
608
615
  <ClInclude Include="src\TokenFactory.h" />
@@ -649,4 +656,4 @@
649
656
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
650
657
  <ImportGroup Label="ExtensionTargets">
651
658
  </ImportGroup>
652
- </Project>
659
+ </Project>
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj.filters CHANGED
@@ -285,9 +285,6 @@
285
285
  <ClInclude Include="src\atn\ATNDeserializer.h">
286
286
  <Filter>Header Files\atn</Filter>
287
287
  </ClInclude>
288
- <ClInclude Include="src\atn\ATNSerializer.h">
289
- <Filter>Header Files\atn</Filter>
290
- </ClInclude>
291
288
  <ClInclude Include="src\atn\ATNSimulator.h">
292
289
  <Filter>Header Files\atn</Filter>
293
290
  </ClInclude>
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj CHANGED
@@ -182,6 +182,8 @@
182
182
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
183
183
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
184
184
  <MinimalRebuild>false</MinimalRebuild>
185
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
186
+ <LanguageStandard>stdcpp17</LanguageStandard>
185
187
  </ClCompile>
186
188
  <Link>
187
189
  <SubSystem>Windows</SubSystem>
@@ -201,6 +203,8 @@
201
203
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
202
204
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
203
205
  <MinimalRebuild>false</MinimalRebuild>
206
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
207
+ <LanguageStandard>stdcpp17</LanguageStandard>
204
208
  </ClCompile>
205
209
  <Link>
206
210
  <SubSystem>Windows</SubSystem>
@@ -220,6 +224,8 @@
220
224
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
221
225
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
222
226
  <MinimalRebuild>false</MinimalRebuild>
227
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
228
+ <LanguageStandard>stdcpp17</LanguageStandard>
223
229
  </ClCompile>
224
230
  <Link>
225
231
  <SubSystem>Windows</SubSystem>
@@ -239,6 +245,8 @@
239
245
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
240
246
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
241
247
  <MinimalRebuild>false</MinimalRebuild>
248
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
249
+ <LanguageStandard>stdcpp17</LanguageStandard>
242
250
  </ClCompile>
243
251
  <Link>
244
252
  <SubSystem>Windows</SubSystem>
@@ -259,6 +267,8 @@
259
267
  </ForcedIncludeFiles>
260
268
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
261
269
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
270
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
271
+ <LanguageStandard>stdcpp17</LanguageStandard>
262
272
  </ClCompile>
263
273
  <Link>
264
274
  <SubSystem>Windows</SubSystem>
@@ -281,6 +291,8 @@
281
291
  </ForcedIncludeFiles>
282
292
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
283
293
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
294
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
295
+ <LanguageStandard>stdcpp17</LanguageStandard>
284
296
  </ClCompile>
285
297
  <Link>
286
298
  <SubSystem>Windows</SubSystem>
@@ -303,6 +315,8 @@
303
315
  </ForcedIncludeFiles>
304
316
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
305
317
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
318
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
319
+ <LanguageStandard>stdcpp17</LanguageStandard>
306
320
  </ClCompile>
307
321
  <Link>
308
322
  <SubSystem>Windows</SubSystem>
@@ -325,6 +339,8 @@
325
339
  </ForcedIncludeFiles>
326
340
  <DisableSpecificWarnings>4251</DisableSpecificWarnings>
327
341
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
342
+ <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
343
+ <LanguageStandard>stdcpp17</LanguageStandard>
328
344
  </ClCompile>
329
345
  <Link>
330
346
  <SubSystem>Windows</SubSystem>
@@ -444,7 +460,7 @@
444
460
  <ClCompile Include="src\support\Any.cpp" />
445
461
  <ClCompile Include="src\support\Arrays.cpp" />
446
462
  <ClCompile Include="src\support\CPPUtils.cpp" />
447
- <ClCompile Include="src\support\guid.cpp" />
463
+ <ClCompile Include="src\support\Guid.cpp" />
448
464
  <ClCompile Include="src\support\StringUtils.cpp" />
449
465
  <ClCompile Include="src\Token.cpp" />
450
466
  <ClCompile Include="src\TokenSource.cpp" />
@@ -499,7 +515,6 @@
499
515
  <ClInclude Include="src\atn\ATNConfigSet.h" />
500
516
  <ClInclude Include="src\atn\ATNDeserializationOptions.h" />
501
517
  <ClInclude Include="src\atn\ATNDeserializer.h" />
502
- <ClInclude Include="src\atn\ATNSerializer.h" />
503
518
  <ClInclude Include="src\atn\ATNSimulator.h" />
504
519
  <ClInclude Include="src\atn\ATNState.h" />
505
520
  <ClInclude Include="src\atn\ATNType.h" />
@@ -602,7 +617,7 @@
602
617
  <ClInclude Include="src\support\BitSet.h" />
603
618
  <ClInclude Include="src\support\CPPUtils.h" />
604
619
  <ClInclude Include="src\support\Declarations.h" />
605
- <ClInclude Include="src\support\guid.h" />
620
+ <ClInclude Include="src\support\Guid.h" />
606
621
  <ClInclude Include="src\support\StringUtils.h" />
607
622
  <ClInclude Include="src\Token.h" />
608
623
  <ClInclude Include="src\TokenFactory.h" />
@@ -649,4 +664,4 @@
649
664
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
650
665
  <ImportGroup Label="ExtensionTargets">
651
666
  </ImportGroup>
652
- </Project>
667
+ </Project>
data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters CHANGED
@@ -285,9 +285,6 @@
285
285
  <ClInclude Include="src\atn\ATNDeserializer.h">
286
286
  <Filter>Header Files\atn</Filter>
287
287
  </ClInclude>
288
- <ClInclude Include="src\atn\ATNSerializer.h">
289
- <Filter>Header Files\atn</Filter>
290
- </ClInclude>
291
288
  <ClInclude Include="src\atn\ATNSimulator.h">
292
289
  <Filter>Header Files\atn</Filter>
293
290
  </ClInclude>