expressir 1.2.4 → 1.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (310) hide show
  1. checksums.yaml +4 -4
  2. data/.cross_rubies +0 -6
  3. data/.github/workflows/rake.yml +200 -9
  4. data/.gitignore +7 -2
  5. data/.gitmodules +3 -0
  6. data/.rubocop.yml +13 -4
  7. data/Rakefile +4 -1
  8. data/bin/console +0 -1
  9. data/bin/rspec +3 -3
  10. data/exe/expressir +4 -2
  11. data/exe/format +1 -1
  12. data/exe/format-test +25 -25
  13. data/exe/generate-parser +16 -13
  14. data/expressir.gemspec +11 -9
  15. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt +44 -34
  16. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj +11 -5
  17. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters +0 -3
  18. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj +11 -4
  19. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj.filters +0 -3
  20. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj +11 -4
  21. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj.filters +0 -3
  22. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj +11 -4
  23. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters +0 -3
  24. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/project.pbxproj +20 -20
  25. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRFileStream.cpp +0 -6
  26. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRInputStream.cpp +30 -19
  27. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRInputStream.h +13 -10
  28. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonToken.cpp +2 -4
  29. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp +16 -13
  30. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Exceptions.cpp +2 -2
  31. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Exceptions.h +2 -2
  32. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/FailedPredicateException.cpp +5 -4
  33. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/FailedPredicateException.h +1 -1
  34. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/IntStream.h +0 -6
  35. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Lexer.cpp +0 -1
  36. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Lexer.h +0 -13
  37. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerInterpreter.cpp +0 -15
  38. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerInterpreter.h +1 -7
  39. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Parser.cpp +47 -27
  40. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Parser.h +0 -6
  41. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserInterpreter.cpp +27 -39
  42. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserInterpreter.h +1 -7
  43. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserRuleContext.cpp +19 -22
  44. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserRuleContext.h +20 -20
  45. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RecognitionException.cpp +0 -1
  46. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.cpp +16 -27
  47. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.h +10 -21
  48. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContext.cpp +4 -3
  49. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContext.h +5 -1
  50. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuntimeMetaData.cpp +2 -1
  51. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Token.h +0 -32
  52. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStreamRewriter.cpp +1 -1
  53. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStreamRewriter.h +2 -7
  54. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedCharStream.cpp +15 -18
  55. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedCharStream.h +12 -18
  56. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Version.h +42 -0
  57. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Vocabulary.cpp +13 -45
  58. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Vocabulary.h +11 -26
  59. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-common.h +19 -61
  60. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-runtime.h +7 -5
  61. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.cpp +4 -55
  62. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.h +34 -20
  63. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfig.cpp +30 -35
  64. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfig.h +35 -32
  65. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp +58 -54
  66. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfigSet.h +77 -31
  67. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.cpp +22 -32
  68. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.h +22 -24
  69. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp +335 -462
  70. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializer.h +9 -68
  71. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSimulator.cpp +9 -39
  72. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSimulator.h +6 -22
  73. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNState.cpp +10 -26
  74. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNState.h +41 -42
  75. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNStateType.cpp +33 -0
  76. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNStateType.h +36 -0
  77. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ActionTransition.cpp +2 -6
  78. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ActionTransition.h +4 -2
  79. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.cpp +49 -22
  80. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.h +20 -12
  81. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AtomTransition.cpp +1 -5
  82. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AtomTransition.h +5 -2
  83. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicBlockStartState.h +4 -2
  84. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicState.h +4 -2
  85. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockEndState.h +5 -3
  86. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockStartState.h +10 -1
  87. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionInfo.h +1 -1
  88. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionState.cpp +0 -5
  89. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionState.h +12 -8
  90. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EpsilonTransition.cpp +2 -6
  91. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EpsilonTransition.h +6 -3
  92. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp +139 -106
  93. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LL1Analyzer.h +9 -48
  94. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp +16 -33
  95. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNConfig.h +12 -12
  96. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNSimulator.cpp +69 -82
  97. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNSimulator.h +15 -33
  98. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerAction.cpp +12 -6
  99. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerAction.h +45 -11
  100. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp +48 -44
  101. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionExecutor.h +31 -18
  102. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionType.h +3 -1
  103. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerChannelAction.cpp +14 -26
  104. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerChannelAction.h +12 -16
  105. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerCustomAction.cpp +15 -32
  106. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerCustomAction.h +12 -24
  107. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.cpp +23 -29
  108. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.h +13 -19
  109. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerModeAction.cpp +13 -26
  110. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerModeAction.h +12 -16
  111. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerMoreAction.cpp +6 -17
  112. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerMoreAction.h +12 -16
  113. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPopModeAction.cpp +6 -17
  114. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPopModeAction.h +12 -16
  115. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPushModeAction.cpp +13 -26
  116. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPushModeAction.h +12 -16
  117. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerSkipAction.cpp +6 -17
  118. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerSkipAction.h +11 -15
  119. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerTypeAction.cpp +13 -26
  120. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerTypeAction.h +13 -17
  121. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LoopEndState.h +5 -1
  122. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/NotSetTransition.cpp +1 -6
  123. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/NotSetTransition.h +4 -2
  124. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/OrderedATNConfigSet.cpp +6 -2
  125. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/OrderedATNConfigSet.h +8 -3
  126. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp +164 -151
  127. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulator.h +26 -19
  128. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulatorOptions.h +50 -0
  129. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusBlockStartState.h +5 -1
  130. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusLoopbackState.h +5 -2
  131. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.cpp +2 -11
  132. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.h +15 -9
  133. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateEvalInfo.cpp +2 -2
  134. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateEvalInfo.h +2 -2
  135. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateTransition.cpp +4 -14
  136. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateTransition.h +22 -11
  137. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContext.cpp +255 -338
  138. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContext.h +86 -127
  139. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextCache.cpp +56 -0
  140. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextCache.h +64 -0
  141. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextMergeCache.cpp +167 -0
  142. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextMergeCache.h +101 -0
  143. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextMergeCacheOptions.h +71 -0
  144. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContextType.h +21 -0
  145. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionMode.cpp +18 -17
  146. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionMode.h +1 -1
  147. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.cpp +2 -2
  148. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.h +2 -2
  149. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RangeTransition.cpp +1 -5
  150. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RangeTransition.h +4 -2
  151. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStartState.h +4 -3
  152. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStopState.h +4 -2
  153. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleTransition.cpp +1 -5
  154. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleTransition.h +5 -3
  155. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContext.cpp +197 -156
  156. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContext.h +92 -81
  157. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContextType.h +23 -0
  158. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SerializedATNView.h +101 -0
  159. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SetTransition.cpp +2 -6
  160. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SetTransition.h +11 -3
  161. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SingletonPredictionContext.cpp +39 -34
  162. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SingletonPredictionContext.h +17 -10
  163. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarBlockStartState.h +5 -2
  164. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopEntryState.h +4 -2
  165. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopbackState.cpp +6 -6
  166. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopbackState.h +6 -2
  167. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TokensStartState.h +5 -2
  168. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Transition.cpp +1 -9
  169. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Transition.h +11 -22
  170. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TransitionType.cpp +27 -0
  171. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TransitionType.h +33 -0
  172. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/WildcardTransition.cpp +1 -5
  173. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/WildcardTransition.h +4 -2
  174. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFA.cpp +9 -21
  175. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFA.h +20 -15
  176. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFASerializer.cpp +1 -8
  177. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFASerializer.h +4 -4
  178. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFAState.cpp +9 -50
  179. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFAState.h +57 -48
  180. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/LexerDFASerializer.cpp +1 -4
  181. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/LexerDFASerializer.h +3 -4
  182. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/InterpreterDataReader.cpp +2 -2
  183. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/InterpreterDataReader.h +3 -1
  184. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Interval.cpp +1 -29
  185. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Interval.h +10 -10
  186. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/IntervalSet.cpp +7 -20
  187. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/IntervalSet.h +1 -9
  188. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/MurmurHash.cpp +54 -68
  189. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/MurmurHash.h +34 -14
  190. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Any.cpp +0 -5
  191. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Any.h +1 -155
  192. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Arrays.h +39 -0
  193. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/BitSet.h +1 -1
  194. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/CPPUtils.cpp +12 -53
  195. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/CPPUtils.h +16 -29
  196. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Casts.h +34 -0
  197. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Declarations.h +0 -2
  198. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/StringUtils.cpp +25 -33
  199. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/StringUtils.h +2 -62
  200. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Unicode.h +28 -0
  201. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Utf8.cpp +242 -0
  202. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Utf8.h +54 -0
  203. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/AbstractParseTreeVisitor.h +13 -12
  204. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNode.h +7 -2
  205. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.cpp +36 -5
  206. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.h +14 -4
  207. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/IterativeParseTreeWalker.cpp +14 -19
  208. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTree.cpp +0 -3
  209. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTree.h +13 -4
  210. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeType.h +22 -0
  211. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeVisitor.h +4 -4
  212. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeWalker.cpp +8 -9
  213. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeWalker.h +4 -4
  214. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNode.h +10 -2
  215. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp +2 -5
  216. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.h +4 -5
  217. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp +1 -2
  218. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.cpp +128 -119
  219. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.h +18 -27
  220. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/tests/Utf8Test.cpp +110 -0
  221. data/ext/express-parser/antlrgen/Express.interp +1 -1
  222. data/ext/express-parser/antlrgen/ExpressBaseListener.cpp +1 -1
  223. data/ext/express-parser/antlrgen/ExpressBaseListener.h +1 -1
  224. data/ext/express-parser/antlrgen/ExpressBaseVisitor.cpp +1 -1
  225. data/ext/express-parser/antlrgen/ExpressBaseVisitor.h +200 -200
  226. data/ext/express-parser/antlrgen/ExpressLexer.cpp +645 -1129
  227. data/ext/express-parser/antlrgen/ExpressLexer.h +20 -27
  228. data/ext/express-parser/antlrgen/ExpressLexer.interp +1 -1
  229. data/ext/express-parser/antlrgen/ExpressListener.cpp +1 -1
  230. data/ext/express-parser/antlrgen/ExpressListener.h +1 -1
  231. data/ext/express-parser/antlrgen/ExpressParser.cpp +1754 -1447
  232. data/ext/express-parser/antlrgen/ExpressParser.h +219 -223
  233. data/ext/express-parser/antlrgen/ExpressVisitor.cpp +1 -1
  234. data/ext/express-parser/antlrgen/ExpressVisitor.h +200 -200
  235. data/ext/express-parser/express_parser.cpp +207 -75
  236. data/ext/express-parser/extconf.rb +10 -9
  237. data/lib/expressir/config.rb +1 -1
  238. data/lib/expressir/express/parser.rb +2 -2
  239. data/lib/expressir/express/visitor.rb +7 -5
  240. data/lib/expressir/model.rb +78 -78
  241. data/lib/expressir/version.rb +1 -1
  242. data/rakelib/antlr4-native.rake +63 -0
  243. data/rakelib/cross-ruby.rake +213 -162
  244. data/spec/acceptance/version_spec.rb +7 -2
  245. data/spec/expressir/express/cache_spec.rb +8 -5
  246. data/spec/expressir/express/formatter_spec.rb +16 -8
  247. data/spec/expressir/express/parser_spec.rb +17 -11
  248. data/spec/expressir/model/model_element_spec.rb +154 -146
  249. metadata +79 -91
  250. data/demo.rb +0 -18
  251. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSerializer.cpp +0 -621
  252. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSerializer.h +0 -61
  253. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AbstractPredicateTransition.cpp +0 -14
  254. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AbstractPredicateTransition.h +0 -24
  255. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicBlockStartState.cpp +0 -12
  256. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicState.cpp +0 -12
  257. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockEndState.cpp +0 -15
  258. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockStartState.cpp +0 -9
  259. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EmptyPredictionContext.cpp +0 -35
  260. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EmptyPredictionContext.h +0 -27
  261. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LoopEndState.cpp +0 -12
  262. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Makefile +0 -67
  263. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusBlockStartState.cpp +0 -12
  264. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusLoopbackState.cpp +0 -12
  265. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStartState.cpp +0 -16
  266. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStopState.cpp +0 -12
  267. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarBlockStartState.cpp +0 -12
  268. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopEntryState.cpp +0 -15
  269. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TokensStartState.cpp +0 -12
  270. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/guid.cpp +0 -303
  271. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/guid.h +0 -112
  272. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNode.cpp +0 -9
  273. data/ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNode.cpp +0 -9
  274. data/original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.exp +0 -9589
  275. data/original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.owl +0 -36619
  276. data/original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.xml +0 -13294
  277. data/original/examples/employment/eclipse/.project +0 -17
  278. data/original/examples/employment/eclipse/Export/Employment.png +0 -0
  279. data/original/examples/employment/eclipse/Express/employment_schema.exp +0 -33
  280. data/original/examples/employment/eclipse/Express/employment_schema.xmi +0 -77
  281. data/original/examples/employment/eclipse/Express/employment_schema.xml +0 -93
  282. data/original/examples/employment/eclipse/Models/Employment.uml +0 -4
  283. data/original/examples/employment/eclipse/Models/Employment.umldi +0 -240
  284. data/original/examples/employment/eclipse/readme.txt +0 -7
  285. data/original/examples/employment/employment_schema.exp +0 -33
  286. data/original/examples/employment/employment_schema.rb +0 -232
  287. data/original/examples/employment/employment_schema.xml +0 -93
  288. data/original/examples/employment/employment_schema___module.rb +0 -46
  289. data/original/examples/employment/employment_schema___p28attr.rb +0 -126
  290. data/original/examples/employment/employment_schema___p28inst.rb +0 -26
  291. data/original/examples/employment/example_employment_data.xml +0 -1
  292. data/original/examples/employment/example_employment_data_copy.xml +0 -1
  293. data/original/examples/employment/example_employment_reader.rb +0 -30
  294. data/original/examples/employment/example_employment_writer.rb +0 -51
  295. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.exp +0 -3710
  296. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.owl +0 -35880
  297. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.xmi +0 -15357
  298. data/original/examples/plcs/ap239e1_arm_lf_dexlib_2010-01-06.xml +0 -9468
  299. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.exp +0 -8404
  300. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.owl +0 -43147
  301. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xmi +0 -18341
  302. data/original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xml +0 -11632
  303. data/original/exp2ruby.rb +0 -525
  304. data/original/expsm.rb +0 -34
  305. data/original/mapping_owl.rb +0 -1018
  306. data/original/mapping_sysml.rb +0 -2281
  307. data/original/mapping_uml2.rb +0 -599
  308. data/original/mapping_uml2_eclipse.rb +0 -433
  309. data/original/reeper.rb +0 -134
  310. data/spec/expressr_spec.rb +0 -5
@@ -1,599 +0,0 @@
1
- require 'erb'
2
- # EXPRESS to UML 2 Mapping
3
- # Version 0.1
4
- #
5
- # This function navigates the EXPRESS STEPMod Model Ruby Classes
6
- # and performs a structural EXPRESS-to-UML2 (2.1.2) mapping using Ruby ERB templates.
7
- # The output is in XMI 2.1 syntax in a file named <schema>.xmi if one schema input and 'Model.xmi' if more than one schema input.
8
- #
9
- # Integer, Boolean, String -> UML equivalent builtin type
10
- # Real, Number, Binary, Logical -> New PrimitiveType
11
- # Schema -> Package
12
- # Entity (subtype of) -> Class (Generalization)
13
- # Select Type -> Interface and InterfaceRealization
14
- # Enum Type -> Enumeration and EnumerationLiteral
15
- # Explicit Attribute (Optional) Primitive or Enum -> Property owned by Class (with lower)
16
- # Explicit Attribute (Optional) Entity -> Property owned by Class (with lower) plus Association owning other end property
17
- # Explicit Attribute 1-D SET, BAG, LIST of Select or Entity -> Property owned by Class (with lower)
18
- # plus Association owning other end property and multiplicity, unique and ordered set
19
- # Explicit Attribute 1-D SET, BAG, LIST of Primitive or Enum -> Property owned by Class and multiplicity, unique and ordered set
20
- # Explicit Attribute of Entity/Select/Builtin Redeclaration (Renamed) -> Property with (new) name that redefines inherited Property
21
- # Inverse Attribute -> Association end adjustment
22
- # Inverse Attribute Redeclaration (Renamed) -> Property with (new) name that redefines inherited Property
23
- # USE or REFERENCE (even with named items) -> UML PackageImport between Packages
24
- #
25
- #######################################################################################
26
-
27
- def map_from_express( mapinput )
28
-
29
- # Enter file name here to override defaults (<schema>.xmi if one schema, and Model.xmi if more than one)
30
- output_xmi_filename = nil
31
-
32
- # datatypes for builtin types that map directly to UML
33
- datatype_hash = Hash.new
34
- datatype_hash["INTEGER"] = 'http://schema.omg.org/spec/UML/2.1.2/uml.xml#Integer'
35
- datatype_hash["BOOLEAN"] = 'http://schema.omg.org/spec/UML/2.1.2/uml.xml#Boolean'
36
- datatype_hash["STRING"] = 'http://schema.omg.org/spec/UML/2.1.2/uml.xml#String'
37
-
38
- # XMI File Start Template (includes datatypes for builtin with no direct UML equivalent)
39
- overall_start_template = %{<?xml version="1.0" encoding="UTF-8"?>
40
- <uml:Model xmi:version = "2.1" xmlns:xmi = "http://schema.omg.org/spec/XMI/2.1" xmlns:uml = "http://schema.omg.org/spec/UML/2.1.2" name = "UMLfromEXPRESS" xmi:id = "_0">
41
- <packagedElement xmi:type="uml:PrimitiveType" xmi:id="REAL" name="Real" />
42
- <packagedElement xmi:type="uml:PrimitiveType" xmi:id="NUMBER" name="Number" />
43
- <packagedElement xmi:type="uml:PrimitiveType" xmi:id="BINARY" name="Binary" />
44
- <packagedElement xmi:type="uml:PrimitiveType" xmi:id="LOGICAL" name="Logical" />}
45
-
46
- # XMI File End Template
47
- overall_end_template = %{</uml:Model>}
48
-
49
- # SCHEMA Start Template
50
- schema_start_template = %{<packagedElement xmi:type = "uml:Package" xmi:id = "_1_<%= schema.name %>" name = "<%= schema.name %>" visibility = "public">}
51
-
52
- # SCHEMA INTERFACE Template
53
- schema_interface_template = %{<packageImport xmi:type='uml:PackageImport' xmi:id='_2_<%= schema.name %>-<%= interfaced_schema.foreign_schema_id %>' visibility='public' importedPackage='_1_<%= interfaced_schema.foreign_schema_id %>'/>}
54
-
55
- # SCHEMA End Template
56
- schema_end_template = %{</packagedElement>}
57
-
58
- # ENTITY Start Template
59
- entity_start_template = %{<packagedElement xmi:type = "uml:Class" xmi:id = "<%= xmiid %>" name = "<%= entity.name %>" isAbstract = "<% if entity.isAbs %>TRUE<% else %>FALSE<% end %>" visibility = "public">}
60
-
61
- # SUBTYPE OF Template
62
- supertype_template = %{<generalization xmi:type="uml:Generalization" xmi:id="<%= xmiid %>" general="<%= xmiid_general %>"/>}
63
-
64
- # ENTITY End Template
65
- entity_end_template = %{</packagedElement>}
66
-
67
- # ENUMERATION Start Template
68
- enum_start_template = %{<packagedElement xmi:type = "uml:Enumeration" xmi:id = "<%= type_xmiid %>" name = "<%= enum.name %>">}
69
-
70
- # ENUMERATION ITEM Template
71
- enum_item_template = %{<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="<%= enumitem_xmiid %>" name="<%= enumitem %>" classifier="<%= type_xmiid %>" enumeration="<%= type_xmiid %>">
72
- <specification xmi:type="uml:LiteralInteger" xmi:id="<%= enumitem_xmiid + '_specification' %> "/>
73
- </ownedLiteral>}
74
-
75
- # ENUMERATION End Template
76
- enum_end_template = %{</packagedElement>}
77
-
78
- # SELECT Start Template
79
- select_start_template = %{<packagedElement xmi:type = "uml:Interface" xmi:id = "<%= xmiid %>" name = "<%= select.name %>" isAbstract = "TRUE" visibility = "public">}
80
-
81
- # SELECT ITEM is ENTITY Template
82
- selectitem_entity_template = %{ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="<%= xmiid %>" supplier="<%= xmiid_general %>" client="<%= xmiid_entity %>" contract="<%= xmiid_general %>" implementingClassifier="<%= xmiid_entity %>"/>}
83
-
84
- # SELECT ITEM is TYPE Template
85
- selectitem_type_template = %{ <packagedElement xmi:type="uml:Realization" xmi:id="<%= xmiid %>" supplier="<%= xmiid_general %>" client="<%= xmiid_type %>"/>}
86
-
87
- # SELECT End Template
88
- select_end_template = %{</packagedElement>}
89
-
90
- # Template covering abstract entity types
91
- abstract_entity_template = %{}
92
-
93
- # Template covering the output file contents for each attribute that is an aggregate
94
- attribute_aggregate_template = %{}
95
-
96
- # Template covering the output file contents for each attribute that is an aggregate of select of entity
97
- attribute_aggregate_entity_select_template = %{}
98
-
99
- # Template covering the output file contents for each attribute that is a select of entity
100
- attribute_entity_select_template = %{}
101
-
102
- # Template covering the output file contents for each attribute that is an entity
103
- attribute_entity_template = %{<ownedAttribute xmi:type="uml:Property" xmi:id="<%= xmiid %>" name="<%= attr.name %>" visibility="public" isOrdered='<%= islist %>' isUnique='<%= isset %>' isLeaf='false' isStatic='false' isReadOnly='false' isDerived='false' isDerivedUnion='false' type="<%= domain_xmiid %>" aggregation="none" association="<%= assoc_xmiid %>"<% if attr.redeclare_entity %> redefinedProperty="<%= redefined_xmiid %>"<% end %>>}
104
-
105
- # INVERSE ATTRIBUTE Template
106
- inverse_attribute_template = %{<ownedAttribute xmi:type="uml:Property" xmi:id="<%= xmiid %>" name="<%= inverse.name %>" visibility="public" isOrdered='<%= islist %>' isUnique='<%= isset %>' isLeaf='false' isStatic='false' isReadOnly='true' isDerived='false' isDerivedUnion='false' type="<%= domain_xmiid %>" aggregation="none" association="<%= assoc_xmiid %>" <% if inverse.redeclare_entity %>redefinedProperty="<%= redefined_xmiid %>"<% end %>>}
107
-
108
- #Template covering attribute wrapup
109
- attribute_end = %{<% if lower == '0' %><lowerValue xmi:type="uml:LiteralInteger" xmi:id="<%= xmiid %>-lowerValue"/><% end %>
110
- <% if lower != '0' and lower != '1' %><lowerValue xmi:type="uml:LiteralInteger" xmi:id="<%= xmiid %>-lowerValue" value="<%= lower %>"/><% end %>
111
- <% if upper != '1' %><upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="<%= xmiid %>-upperValue" value="<%= upper %>"/><% end %>
112
- </ownedAttribute>}
113
-
114
-
115
- # EXPLICIT ATTRIBUTE ENTITY Create Association Template
116
- attribute_entity_association_template = %{<packagedElement xmi:type="uml:Association" xmi:id="<%= xmiid %>" name="" visibility='public' isLeaf='false' isAbstract='false' isDerived='false'>
117
- <memberEnd xmi:idref="<%= attr_xmiid %>"/>
118
- <% if !inverse_exists %><memberEnd xmi:idref="<%= xmiid + '-end' %>"/>
119
- <ownedEnd xmi:type="uml:Property" xmi:id="<%= xmiid + '-end' %>" type="<%= owner_xmiid %>" owningAssociation="<%= xmiid %>" association="<%= xmiid %>" visibility='public'>
120
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="<%= xmiid %>-lowerValue"/>
121
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="<%= xmiid %>-upperValue" value="*"/>
122
- </ownedEnd><% else %><memberEnd xmi:idref="<%= iattr_xmiid %>"/>
123
- <% end %>
124
- <% if general_exists %><generalization xmi:type="uml:Generalization" xmi:id="<%= general_xmiid %>" general="<%= redefined_xmiid %>"/><% end %>
125
- </packagedElement>}
126
-
127
-
128
- # INVERSE ATTRIBUTE ENTITY Create Association Template
129
- inverse_entity_association_template = %{<packagedElement xmi:type="uml:Association" xmi:id="<%= xmiid %>" name="" visibility='public' isLeaf='false' isAbstract='false' isDerived='false'>
130
- <memberEnd xmi:idref="<%= iattr_xmiid %>"/>
131
- <memberEnd xmi:idref="<%= xmiid + '-end' %>"/>
132
- <ownedEnd xmi:type="uml:Property" xmi:id="<%= xmiid + '-end' %>" type="<%= owner_xmiid %>" owningAssociation="<%= xmiid %>" association="<%= xmiid %>" visibility='public'/>
133
- <generalization xmi:type="uml:Generalization" xmi:id="<%= general_xmiid %>" general="<%= redefined_xmiid %>"/>
134
- </packagedElement>}
135
-
136
-
137
- # Template covering the output file contents for each attribute
138
- attribute_template = %{}
139
-
140
- # EXPLICIT ATTRIBUTE SIMPLE TYPE Template
141
- attribute_builtin_template = %{<ownedAttribute xmi:type="uml:Property" xmi:id="<%= xmiid %>" name="<%= attr.name %>" visibility="public" <% if datatype_hash[attr.domain] != nil %>isOrdered='<%= islist %>' isUnique='<%= isset %>'<% if attr.redeclare_entity %> redefinedProperty="<%= redefined_xmiid %>"<% end %>>
142
- <type xmi:type="uml:PrimitiveType" href="<%= datatype_hash[attr.domain] %>" /><% end %>
143
- <% if datatype_hash[attr.domain] == nil %>type="<%= attr.domain %>"<% if attr.redeclare_entity %> redefinedProperty="<%= redefined_xmiid %>"<% end %>><% end %>}
144
-
145
-
146
- # EXPLICIT ATTRIBUTE ENUM and TYPE Template
147
- attribute_enum_type_template = %{<ownedAttribute xmi:type="uml:Property" xmi:id="<%= xmiid %>" name="<%= attr.name %>" visibility="public" type="<%= type_xmiid %>" isOrdered='<%= islist %>' isUnique='<%= isset %>' >}
148
-
149
- # UNIQUE rule template
150
- unique_template = %{<ownedRule xmi:type="uml:Constraint" xmi:id="<%= xmiid %>" name="<%= unique.name %>" visibility="public">
151
- <constrainedElement xmi:idref="<%= xmiid_entity %>"/>
152
- <specification xmi:type="uml:OpaqueExpression" xmi:id="<%= xmiid + '-spec' %>" visibility="public">
153
- <body><%= entity.name %>::allInstance()-&gt;isUnique(<%= unique_text %>)</body>
154
- <language>OCL2.0</language>
155
- </specification>
156
- </ownedRule>}
157
-
158
- # TYPE Template
159
- type_template = %{<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_<%= schema.name %>-<%= type.name %>" name="<%= type.name %>" >
160
- <% if datatype_hash[type.domain] != nil %>
161
- <generalization xmi:type="uml:Generalization" xmi:id="_supertype_<%= schema.name %>-<%= type.name %>">
162
- <general xmi:type='uml:PrimitiveType' href="<%= datatype_hash[type.domain] %>" />
163
- </generalization>
164
- <% end %>
165
- <% if datatype_hash[type.domain] == nil %>
166
- <generalization xmi:type="uml:Generalization" xmi:id="_supertype_<%= schema.name %>-<%= type.name %>" general="<%= type.domain %>"/>
167
- <% end %>
168
- </packagedElement>}
169
-
170
-
171
- #############################################################################################
172
- # Set up list of schemas to process, input may be a repository containing schemas or a single schema
173
- #############################################################################################
174
-
175
- if mapinput.kind_of? EXPSM::Repository
176
- schema_list = mapinput.schemas
177
- elsif mapinput.kind_of? EXPSM::SchemaDefinition
178
- schema_list = [mapinput]
179
- else
180
- puts "ERROR : map_from_express input no Repository instance or Schema instance"
181
- exit
182
- end
183
-
184
- # Set up XMI output file
185
-
186
- if schema_list.size == 1 and output_xmi_filename == nil
187
- schema = schema_list[0]
188
- output_xmi_filename = schema.name.to_s + ".xmi"
189
- elsif output_xmi_filename == nil
190
- output_xmi_filename = 'Model.xmi'
191
- end
192
-
193
- file = File.new(output_xmi_filename, "w")
194
- puts 'reeper : Writing output to file ' + output_xmi_filename
195
-
196
- # Evaluate and write file start template
197
- res = ERB.new(overall_start_template)
198
- t = res.result(binding)
199
- file.puts t
200
-
201
- # Set up list of all EXPRESS Inverses in all schemas
202
- all_inverse_list = []
203
-
204
- for schema in schema_list
205
- entity_list = schema.contents.find_all{ |e| e.kind_of? EXPSM::Entity }
206
- for entity in entity_list
207
- entity_inverse_list = entity.attributes.find_all{ |e| e.kind_of? EXPSM::Inverse }
208
- for inverse in entity_inverse_list
209
- all_inverse_list.push inverse
210
- end
211
- end
212
-
213
-
214
- # Evaluate and write schema start template
215
- res = ERB.new(schema_start_template)
216
- t = res.result(binding)
217
- file.puts t
218
-
219
- interfaced_schema_list = schema.contents.find_all{ |e| e.instance_of? EXPSM::InterfaceSpecification}
220
-
221
- for interfaced_schema in interfaced_schema_list
222
- # Evaluate and write schema interface template
223
- res = ERB.new(schema_interface_template)
224
- t = res.result(binding)
225
- file.puts t
226
- end
227
-
228
- # set up select_list - used in a number of places
229
- select_list = schema.contents.find_all{ |e| e.instance_of? EXPSM::TypeSelect }
230
-
231
- # Map EXPRESS TYPE of Builtin
232
- type_list = schema.contents.find_all{ |e| e.instance_of? EXPSM::Type and e.isBuiltin}
233
- for type in type_list
234
- xmiid = '_' + schema.name + '-' + type.name
235
- res = ERB.new(type_template)
236
- t = res.result(binding)
237
- file.puts t
238
-
239
- # Map TYPE Select has Type as item
240
- for select in select_list
241
- if select.selectitems_array.include?(type)
242
- xmiid = '_2_selectitem_' + schema.name + '-' + type.name + '-' + select.name
243
- xmiid_general = '_' + schema.name + '-' + select.name
244
- res = ERB.new(selectitem_type_template)
245
- t = res.result(binding)
246
- file.puts t
247
- end
248
- end
249
- end
250
-
251
- # Map EXPRESS TYPE of TYPE Select
252
- type_list = schema.contents.find_all{ |e| e.instance_of? EXPSM::Type and !e.isBuiltin}
253
- for select in type_list
254
- superselect = NamedType.find_by_name( select.domain )
255
- if superselect.kind_of? EXPSM::TypeSelect
256
- # Evaluate and write TYPE Select start template
257
- xmiid = '_' + schema.name + '-' + select.name
258
- xmiid_type = xmiid
259
- res = ERB.new(select_start_template)
260
- t = res.result(binding)
261
- file.puts t
262
-
263
- # Write Select Item template for parent (maps to UML same as EXPRESS supertype)
264
- xmiid = '_2_superselect_' + schema.name + '-' + select.name + '-' + superselect.name
265
- xmiid_general = '_' + schema.name + '-' + superselect.name
266
- res = ERB.new(supertype_template)
267
- t = res.result(binding)
268
- file.puts t
269
-
270
- # Evaluate and write TYPE Select end template
271
- res = ERB.new(select_end_template)
272
- t = res.result(binding)
273
- file.puts t
274
- end
275
- end
276
-
277
- # Map EXPRESS Enumeration Types
278
- enum_list = schema.contents.find_all{ |e| e.instance_of? EXPSM::TypeEnum }
279
- for enum in enum_list
280
-
281
- # Evaluate and write TYPE Enum start template
282
- type_xmiid = '_' + schema.name + '-' + enum.name
283
- res = ERB.new(enum_start_template)
284
- t = res.result(binding)
285
- file.puts t
286
-
287
- superenum = enum.extends_item
288
- if superenum != nil
289
- if superselect.kind_of? EXPSM::TypeEnum
290
- # Write Enum Item template for parent (maps to UML same as EXPRESS supertype)
291
- xmiid = '_2_superenum_' + schema.name + '-' + enum.name + '-' + superenum.name
292
- xmiid_general = '_' + superenum.schema.name + '-' + superenum.name
293
- res = ERB.new(supertype_template)
294
- t = res.result(binding)
295
- file.puts t
296
- end
297
- end
298
-
299
- # Evaluate and write Enum Item template for each item
300
- enumitem_name_list = enum.items.scan(/\w+/)
301
- for enumitem in enumitem_name_list
302
- enumitem_xmiid = '_1_enumitem_' + schema.name + '-' + enum.name + '-' + enumitem
303
- res = ERB.new(enum_item_template)
304
- t = res.result(binding)
305
- file.puts t
306
- end
307
-
308
- # Evaluate and write TYPE Enum end template
309
- res = ERB.new(enum_end_template)
310
- t = res.result(binding)
311
- file.puts t
312
- end
313
-
314
- # Map EXPRESS TYPE Selects
315
- for select in select_list
316
-
317
- # Evaluate and write TYPE Select start template
318
- xmiid = '_' + schema.name + '-' + select.name
319
- res = ERB.new(select_start_template)
320
- t = res.result(binding)
321
- file.puts t
322
-
323
- superselect = select.extends_item
324
- if superselect != nil
325
- if superselect.kind_of? EXPSM::TypeSelect
326
- # Write Select Item template for parent (maps to UML same as EXPRESS supertype)
327
- xmiid = '_2_superselect_' + schema.name + '-' + select.name + '-' + superselect.name
328
- xmiid_general = '_' + superselect.schema.name + '-' + superselect.name
329
- res = ERB.new(supertype_template)
330
- t = res.result(binding)
331
- file.puts t
332
- end
333
- end
334
-
335
- # Evaluate and write Select Item template for each item (maps to UML same as EXPRESS supertype)
336
- for superselect in select_list
337
- if superselect.selectitems_array.include?(select)
338
- xmiid = '_2_superselect_' + schema.name + '-' + select.name + '-' + superselect.name
339
- xmiid_general = '_' + schema.name + '-' + superselect.name
340
- res = ERB.new(supertype_template)
341
- t = res.result(binding)
342
- file.puts t
343
- end
344
- end
345
-
346
- # Evaluate and write TYPE Select end template
347
- res = ERB.new(select_end_template)
348
- t = res.result(binding)
349
- file.puts t
350
- end
351
-
352
- entity_list = schema.contents.find_all{ |e| e.kind_of? EXPSM::Entity }
353
-
354
- # Map EXPRESS Explicit Attribute resulting UML Association (the Association is referenced from Class resulting from Entity)
355
- for entity in entity_list
356
- attr_list = entity.attributes.find_all{ |e| e.kind_of? EXPSM::Explicit }
357
- for attr in attr_list
358
-
359
- if NamedType.find_by_name( attr.domain ).kind_of? EXPSM::Entity or NamedType.find_by_name( attr.domain ).kind_of? EXPSM::TypeSelect
360
- xmiid = '_1_association_' + schema.name + '-' + entity.name + '-' + attr.name
361
- attr_xmiid = '_2_attr_' + schema.name + '-' + entity.name + '-' + attr.name
362
- owner_xmiid = '_' + schema.name + '-' + entity.name
363
- domain_xmiid = '_' + schema.name + '-' + NamedType.find_by_name( attr.domain ).name
364
-
365
- general_exists = false
366
- if attr.redeclare_entity
367
- general_exists = true
368
- redeclare_entity = NamedType.find_by_name( attr.redeclare_entity )
369
- general_xmiid = '_2_general_' + schema.name + '-' + entity.name + '-' + attr.name
370
- if attr.redeclare_oldname
371
- redefined_xmiid = '_1_association_' + redeclare_entity.schema.name + '-' + attr.redeclare_entity + '-' + attr.redeclare_oldname
372
- else
373
- redefined_xmiid = '_1_association_' + redeclare_entity.schema.name + '-' + attr.redeclare_entity + '-' + attr.name
374
- end
375
- end
376
-
377
- # check if inverse refers to this attribute, affects how association is written
378
- inverse_exists = false
379
- for inverse in all_inverse_list
380
- if inverse.reverseAttr == attr
381
- if attr.domain == inverse.entity.name
382
- iattr_xmiid = '_2_attr_' + inverse.entity.schema.name + '-' + inverse.entity.name + '-' + inverse.name
383
- all_inverse_list.delete inverse
384
- inverse_exists = true
385
- end
386
- end
387
- end
388
-
389
- res = ERB.new(attribute_entity_association_template)
390
- t = res.result(binding)
391
- file.puts t
392
- end
393
- end
394
- end
395
-
396
- # Map EXPRESS Inverse Attribute resulting UML Association (the Association is referenced from Class resulting from Entity)
397
- for inverse in all_inverse_list
398
- xmiid = '_1_association_' + inverse.reverseEntity.schema.name + '-' + inverse.entity.name + '-' + inverse.reverseAttr_id
399
- owner_xmiid = '_' + inverse.entity.schema.name + '-' + inverse.entity.name
400
- iattr_xmiid = '_2_attr_' + inverse.entity.schema.name + '-' + inverse.entity.name + '-' + inverse.name
401
-
402
- general_xmiid = '_2_general_' + inverse.reverseEntity.schema.name + '-' + inverse.entity.name + '-' + inverse.reverseAttr_id
403
- redefined_xmiid = '_1_association_' + inverse.entity.schema.name + '-' + inverse.reverseEntity.name + '-' + inverse.reverseAttr_id
404
-
405
- res = ERB.new(inverse_entity_association_template)
406
- t = res.result(binding)
407
- file.puts t
408
- end
409
-
410
- # Map EXPRESS Entity Types
411
- for entity in entity_list
412
-
413
- # Evaluate and write ENTITY start template
414
- xmiid = '_' + schema.name + '-' + entity.name
415
- xmiid_entity = xmiid
416
- res = ERB.new(entity_start_template)
417
- t = res.result(binding)
418
- file.puts t
419
-
420
- # Map Entity is SUBTYPE OF (i.e. list of supertypes)
421
- for supertype in entity.supertypes_array
422
- xmiid = '_2_supertype_' + schema.name + '-' + entity.name + '-' + supertype.name
423
- xmiid_general = '_' + supertype.schema.name + '-' + supertype.name
424
- res = ERB.new(supertype_template)
425
- t = res.result(binding)
426
- file.puts t
427
- end
428
-
429
- # Map TYPE Select has Entity as item
430
- for select in select_list
431
- if select.selectitems_array.include?(entity)
432
- xmiid = '_2_selectitem_' + schema.name + '-' + entity.name + '-' + select.name
433
- xmiid_general = '_' + schema.name + '-' + select.name
434
- res = ERB.new(selectitem_entity_template)
435
- t = res.result(binding)
436
- file.puts t
437
- end
438
- end
439
-
440
- # Map EXPRESS Explicit Attributes
441
- attr_list = entity.attributes.find_all{ |e| e.kind_of? EXPSM::Explicit }
442
- for attr in attr_list
443
- xmiid = '_2_attr_' + schema.name + '-' + entity.name + '-' + attr.name
444
-
445
- # set up references resulting from attribute being a redeclaration
446
- if attr.redeclare_entity
447
- redeclare_entity = NamedType.find_by_name( attr.redeclare_entity )
448
- if attr.redeclare_oldname
449
- redefined_xmiid = '_2_attr_' + redeclare_entity.schema.name + '-' + attr.redeclare_entity + '-' + attr.redeclare_oldname
450
- else
451
- redefined_xmiid = '_2_attr_' + redeclare_entity.schema.name + '-' + attr.redeclare_entity + '-' + attr.name
452
- end
453
- end
454
-
455
- # initialize default cardinailty constraints
456
- lower = '1'
457
- upper = '1'
458
- isset = 'true'
459
- islist = 'false'
460
-
461
- # set up cardinailty constraints from attribute being a 1-D aggregate
462
- if attr.instance_of? EXPSM::ExplicitAggregate and attr.rank == 1
463
- upper = attr.dimensions[0].upper
464
- if upper == '?'
465
- upper = '*'
466
- end
467
- lower = attr.dimensions[0].lower
468
- if attr.dimensions[0].aggrtype == 'LIST'
469
- islist = 'true'
470
- end
471
- if attr.dimensions[0].aggrtype == 'BAG'
472
- isset = 'false'
473
- end
474
- if attr.dimensions[0].aggrtype == 'LIST' and !attr.dimensions[0].isUnique
475
- isset = 'false'
476
- end
477
- end
478
- if attr.isOptional == TRUE
479
- lower = '0'
480
- end
481
-
482
- attrset = false
483
-
484
- # Map EXPRESS Explicit Attributes of Builtin
485
- if attr.isBuiltin
486
- attrset= true
487
- res = ERB.new(attribute_builtin_template,0,"<>")
488
- t = res.result(binding)
489
- file.puts t
490
- end
491
-
492
- attr_domain = NamedType.find_by_name( attr.domain )
493
-
494
- # Map EXPRESS Explicit Attributes of TYPE and TYPE Enum
495
- if attr_domain.kind_of? EXPSM::Type or attr_domain.kind_of? EXPSM::TypeEnum
496
- attrset= true
497
- type_xmiid = '_' + attr_domain.schema.name + '-' + attr_domain.name
498
- res = ERB.new(attribute_enum_type_template,0,"<>")
499
- t = res.result(binding)
500
- file.puts t
501
- end
502
-
503
- # Map EXPRESS Explicit Attributes of Entity and Select
504
- if attr_domain.kind_of? EXPSM::Entity or attr_domain.kind_of? EXPSM::TypeSelect
505
- attrset= true
506
- domain_xmiid = '_' + attr_domain.schema.name + '-' + attr_domain.name
507
- assoc_xmiid = '_1_association_' + schema.name + '-' + entity.name + '-' + attr.name
508
- res = ERB.new(attribute_entity_template,0,"<>")
509
- t = res.result(binding)
510
- file.puts t
511
- end
512
-
513
- if !attrset
514
- puts 'Oops ' + entity.name + '.' + attr.name
515
- puts attr.domain
516
- end
517
-
518
- res = ERB.new(attribute_end,0,"<>")
519
- t = res.result(binding)
520
- file.puts t
521
- end
522
-
523
- #Map EXPRESS Inverse Attributes
524
- inverse_attr_list = entity.attributes.find_all{ |e| e.kind_of? EXPSM::Inverse }
525
- for inverse in inverse_attr_list
526
- xmiid = '_2_attr_' + schema.name + '-' + entity.name + '-' + inverse.name
527
- # set up references resulting from attribute being a redeclaration
528
- if inverse.redeclare_entity
529
- puts 'FOUND REDECLARED INVERSE ' + inverse.name
530
- if inverse.redeclare_oldname
531
- redefined_xmiid = '_2_attr_' + schema.name + '-' + inverse.redeclare_entity + '-' + inverse.redeclare_oldname
532
- else
533
- redefined_xmiid = '_2_attr_' + schema.name + '-' + inverse.redeclare_entity + '-' + inverse.name
534
- end
535
- end
536
-
537
- lower = '1'
538
- upper = '1'
539
- isset = 'true'
540
- if inverse.instance_of? EXPSM::InverseAggregate
541
- lower = '0'
542
- upper = '*'
543
- if inverse.upper != '?'
544
- upper = inverse.upper
545
- end
546
- if inverse.lower != '0'
547
- lower = inverse.lower
548
- end
549
- if inverse.aggrtype == 'BAG'
550
- isset = 'false'
551
- end
552
- end
553
- domain_xmiid = '_' + schema.name + '-' + inverse.reverseEntity.name
554
- if inverse.reverseAttr.domain == entity.name
555
- assoc_xmiid = '_1_association_' + inverse.reverseEntity.schema.name + '-' + inverse.reverseEntity.name + '-' + inverse.reverseAttr_id
556
- else
557
- assoc_xmiid = '_1_association_' + inverse.reverseEntity.schema.name + '-' + entity.name + '-' + inverse.reverseAttr_id
558
- end
559
- res = ERB.new(inverse_attribute_template)
560
- t = res.result(binding)
561
- file.puts t
562
-
563
- res = ERB.new(attribute_end,0,"<>")
564
- t = res.result(binding)
565
- file.puts t
566
- end
567
-
568
- #Map EXPRESS Unique crules
569
- if entity.uniques.size > 0
570
- for unique in entity.uniques
571
- xmiid = '_3_uniq_' + schema.name + '-' + entity.name + '-' + unique.name
572
- if unique.attributes.size == 1
573
- unique_text = unique.attributes[0]
574
- else
575
- unique_text = 'Sequence{'+ unique.attributes.join(', ') +'}'
576
- end
577
- res = ERB.new(unique_template)
578
- t = res.result(binding)
579
- file.puts t
580
- end
581
- end
582
-
583
- # Evaluate and write ENTITY end template
584
- res = ERB.new(entity_end_template)
585
- t = res.result(binding)
586
- file.puts t
587
- end
588
-
589
- # Evaluate and write SCHEMA end template
590
- res = ERB.new(schema_end_template)
591
- t = res.result(binding)
592
- file.puts t
593
- end
594
-
595
- # Evaluate and write file end template
596
- res = ERB.new(overall_end_template)
597
- t = res.result(binding)
598
- file.puts t
599
- end