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
@@ -1,17 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <projectDescription>
3
- <name>Employment</name>
4
- <comment></comment>
5
- <projects>
6
- </projects>
7
- <buildSpec>
8
- <buildCommand>
9
- <name>org.topcased.modeler.org.topcased.modeler.builders.todoNoteBuilder</name>
10
- <arguments>
11
- </arguments>
12
- </buildCommand>
13
- </buildSpec>
14
- <natures>
15
- <nature>org.topcased.core.topcasednature</nature>
16
- </natures>
17
- </projectDescription>
@@ -1,33 +0,0 @@
1
- SCHEMA employment_schema;
2
-
3
- TYPE date = STRING;
4
- END_TYPE;
5
-
6
- TYPE po = SELECT ( Person, Organization );
7
- END_TYPE;
8
-
9
- TYPE contract_type = ENUMERATION OF ( contract, atwill, contractor );
10
- END_TYPE;
11
-
12
- ENTITY Person;
13
- names : LIST OF STRING;
14
- END_ENTITY;
15
-
16
- ENTITY Organization;
17
- name : STRING;
18
- END_ENTITY;
19
-
20
- ENTITY PersonOrganizationRelationship;
21
- the_person : Person;
22
- the_organization : Organization;
23
- start_date : date;
24
- end_date : date;
25
- END_ENTITY;
26
-
27
- ENTITY Employment SUBTYPE OF ( PersonOrganizationRelationship );
28
- job_title : STRING;
29
- ended_by : po;
30
- employment_type : contract_type;
31
- END_ENTITY;
32
-
33
- END_SCHEMA;
@@ -1,77 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_0" name="UMLfromEXPRESS">
3
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="REAL" name="Real"/>
4
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="NUMBER" name="Number"/>
5
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="BINARY" name="Binary"/>
6
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="LOGICAL" name="Logical"/>
7
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="STRING" name="String"/>
8
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="INTEGER" name="Integer"/>
9
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="BOOLEAN" name="Boolean"/>
10
- <packagedElement xsi:type="uml:Package" xmi:id="_1_employment_schema" name="employment_schema">
11
- <packagedElement xsi:type="uml:PrimitiveType" xmi:id="_employment_schema-date" name="date">
12
- <generalization xmi:id="_supertype_employment_schema-date" general="STRING"/>
13
- </packagedElement>
14
- <packagedElement xsi:type="uml:Enumeration" xmi:id="_employment_schema-contract_type" name="contract_type">
15
- <ownedLiteral xmi:id="_1_enumitem_employment_schema-contract_type-contract" name="contract" classifier="_employment_schema-contract_type">
16
- <specification xsi:type="uml:LiteralInteger" xmi:id="_1_enumitem_employment_schema-contract_type-contract_specification "/>
17
- </ownedLiteral>
18
- <ownedLiteral xmi:id="_1_enumitem_employment_schema-contract_type-atwill" name="atwill" classifier="_employment_schema-contract_type">
19
- <specification xsi:type="uml:LiteralInteger" xmi:id="_1_enumitem_employment_schema-contract_type-atwill_specification "/>
20
- </ownedLiteral>
21
- <ownedLiteral xmi:id="_1_enumitem_employment_schema-contract_type-contractor" name="contractor" classifier="_employment_schema-contract_type">
22
- <specification xsi:type="uml:LiteralInteger" xmi:id="_1_enumitem_employment_schema-contract_type-contractor_specification "/>
23
- </ownedLiteral>
24
- </packagedElement>
25
- <packagedElement xsi:type="uml:Interface" xmi:id="_employment_schema-po" name="po" isAbstract="true"/>
26
- <packagedElement xsi:type="uml:Association" xmi:id="_1_association_employment_schema-PersonOrganizationRelationship-the_person" name="" memberEnd="_employment_schema-Person-the_person-end _2_attr_employment_schema-PersonOrganizationRelationship-the_person-end" navigableOwnedEnd="_employment_schema-Person-the_person-end">
27
- <ownedEnd xmi:id="_employment_schema-Person-the_person-end" name="the_person" visibility="public" type="_employment_schema-Person" association="_1_association_employment_schema-PersonOrganizationRelationship-the_person">
28
- <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_employment_schema-Person-the_person-end-upperValue" value="1"/>
29
- <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_employment_schema-Person-the_person-end-lowerValue" value="1"/>
30
- </ownedEnd>
31
- <ownedEnd xmi:id="_2_attr_employment_schema-PersonOrganizationRelationship-the_person-end" name="" visibility="public" type="_employment_schema-PersonOrganizationRelationship" association="_1_association_employment_schema-PersonOrganizationRelationship-the_person">
32
- <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_attr_employment_schema-PersonOrganizationRelationship-the_person-end-upperValue" value="1"/>
33
- <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_2_attr_employment_schema-PersonOrganizationRelationship-the_person-end-lowerValue" value="1"/>
34
- </ownedEnd>
35
- </packagedElement>
36
- <packagedElement xsi:type="uml:Association" xmi:id="_1_association_employment_schema-PersonOrganizationRelationship-the_organization" name="" memberEnd="_employment_schema-Organization-the_organization-end _2_attr_employment_schema-PersonOrganizationRelationship-the_organization-end" navigableOwnedEnd="_employment_schema-Organization-the_organization-end">
37
- <ownedEnd xmi:id="_employment_schema-Organization-the_organization-end" name="the_organization" visibility="public" type="_employment_schema-Organization" association="_1_association_employment_schema-PersonOrganizationRelationship-the_organization">
38
- <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_employment_schema-Organization-the_organization-end-upperValue" value="1"/>
39
- <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_employment_schema-Organization-the_organization-end-lowerValue" value="1"/>
40
- </ownedEnd>
41
- <ownedEnd xmi:id="_2_attr_employment_schema-PersonOrganizationRelationship-the_organization-end" name="" visibility="public" type="_employment_schema-PersonOrganizationRelationship" association="_1_association_employment_schema-PersonOrganizationRelationship-the_organization">
42
- <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_attr_employment_schema-PersonOrganizationRelationship-the_organization-end-upperValue" value="1"/>
43
- <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_2_attr_employment_schema-PersonOrganizationRelationship-the_organization-end-lowerValue" value="1"/>
44
- </ownedEnd>
45
- </packagedElement>
46
- <packagedElement xsi:type="uml:Association" xmi:id="_1_association_employment_schema-Employment-ended_by" name="" memberEnd="_employment_schema-po-ended_by-end _2_attr_employment_schema-Employment-ended_by-end" navigableOwnedEnd="_employment_schema-po-ended_by-end">
47
- <ownedEnd xmi:id="_employment_schema-po-ended_by-end" name="ended_by" visibility="public" type="_employment_schema-po" association="_1_association_employment_schema-Employment-ended_by">
48
- <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_employment_schema-po-ended_by-end-upperValue" value="1"/>
49
- <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_employment_schema-po-ended_by-end-lowerValue" value="1"/>
50
- </ownedEnd>
51
- <ownedEnd xmi:id="_2_attr_employment_schema-Employment-ended_by-end" name="" visibility="public" type="_employment_schema-Employment" association="_1_association_employment_schema-Employment-ended_by">
52
- <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_attr_employment_schema-Employment-ended_by-end-upperValue" value="1"/>
53
- <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_2_attr_employment_schema-Employment-ended_by-end-lowerValue" value="1"/>
54
- </ownedEnd>
55
- </packagedElement>
56
- <packagedElement xsi:type="uml:Class" xmi:id="_employment_schema-Person" name="Person" clientDependency="_2_selectitem_employment_schema-Person-po">
57
- <ownedAttribute xmi:id="_2_attr_employment_schema-Person-names" name="names" visibility="public" type="STRING">
58
- <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_attr_employment_schema-Person-names-upperValue" value="*"/>
59
- <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_2_attr_employment_schema-Person-names-lowerValue"/>
60
- </ownedAttribute>
61
- <interfaceRealization xmi:id="_2_selectitem_employment_schema-Person-po" supplier="_employment_schema-po" client="_employment_schema-Person" contract="_employment_schema-po"/>
62
- </packagedElement>
63
- <packagedElement xsi:type="uml:Class" xmi:id="_employment_schema-Organization" name="Organization" clientDependency="_2_selectitem_employment_schema-Organization-po">
64
- <ownedAttribute xmi:id="_2_attr_employment_schema-Organization-name" name="name" visibility="public" type="STRING"/>
65
- <interfaceRealization xmi:id="_2_selectitem_employment_schema-Organization-po" supplier="_employment_schema-po" client="_employment_schema-Organization" contract="_employment_schema-po"/>
66
- </packagedElement>
67
- <packagedElement xsi:type="uml:Class" xmi:id="_employment_schema-PersonOrganizationRelationship" name="PersonOrganizationRelationship">
68
- <ownedAttribute xmi:id="__2_attr_employment_schema-PersonOrganizationRelationship-start_date" name="start_date" visibility="public" type="_employment_schema-date"/>
69
- <ownedAttribute xmi:id="__2_attr_employment_schema-PersonOrganizationRelationship-end_date" name="end_date" visibility="public" type="_employment_schema-date"/>
70
- </packagedElement>
71
- <packagedElement xsi:type="uml:Class" xmi:id="_employment_schema-Employment" name="Employment">
72
- <generalization xmi:id="_2_supertype_employment_schema-Employment-PersonOrganizationRelationship" general="_employment_schema-PersonOrganizationRelationship"/>
73
- <ownedAttribute xmi:id="_2_attr_employment_schema-Employment-job_title" name="job_title" visibility="public" type="STRING"/>
74
- <ownedAttribute xmi:id="__2_attr_employment_schema-Employment-employment_type" name="employment_type" visibility="public" type="_employment_schema-contract_type"/>
75
- </packagedElement>
76
- </packagedElement>
77
- </uml:Model>
@@ -1,93 +0,0 @@
1
- <?xml version="1.0"?>
2
-
3
- <express
4
- language_version="2"
5
- rcs.date="$Date: $"
6
- rcs.revision="$Revision: $">
7
-
8
- <application
9
- name=" Eurostep EXPRESS Parser (Eep!)"
10
- owner="Eurostep Limited"
11
- url="www.eurostep.com"
12
- version="1, 3, 34, 40"
13
- source="employment_schema.exp"/>
14
-
15
- <schema name="employment_schema">
16
- <type name="date">
17
- <builtintype type="STRING"
18
- />
19
- </type>
20
-
21
- <type name="po">
22
- <select
23
- selectitems="Person Organization"
24
- />
25
- </type>
26
-
27
- <type name="contract_type">
28
- <enumeration
29
- items="contract atwill contractor"
30
- />
31
- </type>
32
-
33
- <entity name="Person"
34
- >
35
- <explicit
36
- name="names">
37
- <aggregate type="LIST"
38
- />
39
- <builtintype type="STRING"
40
- />
41
- </explicit>
42
- </entity>
43
-
44
- <entity name="Organization"
45
- >
46
- <explicit
47
- name="name">
48
- <builtintype type="STRING"
49
- />
50
- </explicit>
51
- </entity>
52
-
53
- <entity name="PersonOrganizationRelationship"
54
- >
55
- <explicit
56
- name="the_person">
57
- <typename name="Person"/>
58
- </explicit>
59
- <explicit
60
- name="the_organization">
61
- <typename name="Organization"/>
62
- </explicit>
63
- <explicit
64
- name="start_date">
65
- <typename name="date"/>
66
- </explicit>
67
- <explicit
68
- name="end_date">
69
- <typename name="date"/>
70
- </explicit>
71
- </entity>
72
-
73
- <entity name="Employment"
74
- supertypes="PersonOrganizationRelationship"
75
- >
76
- <explicit
77
- name="job_title">
78
- <builtintype type="STRING"
79
- />
80
- </explicit>
81
- <explicit
82
- name="ended_by">
83
- <typename name="po"/>
84
- </explicit>
85
- <explicit
86
- name="employment_type">
87
- <typename name="contract_type"/>
88
- </explicit>
89
- </entity>
90
-
91
- </schema>
92
-
93
- </express>
@@ -1,4 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_qb8akM37EdqwVrslYOdUDA">
3
- <packagedElement xmi:type="uml:Package" xmi:id="_w8IxIM37EdqwVrslYOdUDA" name="Employment"/>
4
- </uml:Model>
@@ -1,240 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <diagrams:Diagrams xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.topcased.org/DI/1.0" xmlns:diagrams="http://www.topcased.org/Diagrams/1.0" xmi:id="_A578oFbnEeCXeKoxJ0Vc8g" activeDiagram="_A578oVbnEeCXeKoxJ0Vc8g">
3
- <model href="Employment.uml#_w8IxIM37EdqwVrslYOdUDA"/>
4
- <diagrams xmi:id="_A578oVbnEeCXeKoxJ0Vc8g" position="0,0" size="100,100" name="Employment" viewport="0,0">
5
- <property xmi:id="_A6JYAFbnEeCXeKoxJ0Vc8g" key="pageFormatName" value="A3"/>
6
- <property xmi:id="_A6JYAVbnEeCXeKoxJ0Vc8g" key="diagramWidth" value="1188"/>
7
- <property xmi:id="_A6JYAlbnEeCXeKoxJ0Vc8g" key="diagramHeight" value="1680"/>
8
- <property xmi:id="_A6JYA1bnEeCXeKoxJ0Vc8g" key="pageMarginName" value="Small Margin"/>
9
- <property xmi:id="_A6JYBFbnEeCXeKoxJ0Vc8g" key="diagramTopMargin" value="20"/>
10
- <property xmi:id="_A6JYBVbnEeCXeKoxJ0Vc8g" key="diagramBottomMargin" value="20"/>
11
- <property xmi:id="_A6JYBlbnEeCXeKoxJ0Vc8g" key="diagramLeftMargin" value="20"/>
12
- <property xmi:id="_A6JYB1bnEeCXeKoxJ0Vc8g" key="diagramRightMargin" value="20"/>
13
- <property xmi:id="_A6JYCFbnEeCXeKoxJ0Vc8g" key="orientation" value="landscape"/>
14
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_A578olbnEeCXeKoxJ0Vc8g" presentation="org.topcased.modeler.uml.classdiagram">
15
- <element href="Employment.uml#_w8IxIM37EdqwVrslYOdUDA"/>
16
- </semanticModel>
17
- <contained xsi:type="di:GraphNode" xmi:id="_kQIOIFbnEeCXeKoxJ0Vc8g" position="130,42" size="180,-1">
18
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQIOIVbnEeCXeKoxJ0Vc8g" presentation="default">
19
- <element href="../Express/employment_schema.xmi#_employment_schema-date"/>
20
- </semanticModel>
21
- <contained xsi:type="di:GraphNode" xmi:id="_kQIOIlbnEeCXeKoxJ0Vc8g">
22
- <property xmi:id="_kQIOI1bnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="37"/>
23
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQIOJFbnEeCXeKoxJ0Vc8g" presentation="default">
24
- <element href="../Express/employment_schema.xmi#_employment_schema-date"/>
25
- </semanticModel>
26
- </contained>
27
- <contained xsi:type="di:GraphNode" xmi:id="_kQIOJVbnEeCXeKoxJ0Vc8g">
28
- <property xmi:id="_kQIOJlbnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="38"/>
29
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQIOJ1bnEeCXeKoxJ0Vc8g" presentation="default">
30
- <element href="../Express/employment_schema.xmi#_employment_schema-date"/>
31
- </semanticModel>
32
- </contained>
33
- </contained>
34
- <contained xsi:type="di:GraphNode" xmi:id="_kQUbYFbnEeCXeKoxJ0Vc8g" position="453,27" size="180,-1">
35
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQUbYVbnEeCXeKoxJ0Vc8g" presentation="default">
36
- <element href="../Express/employment_schema.xmi#_employment_schema-contract_type"/>
37
- </semanticModel>
38
- <contained xsi:type="di:GraphNode" xmi:id="_kQUbYlbnEeCXeKoxJ0Vc8g">
39
- <property xmi:id="_kQUbY1bnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="39"/>
40
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQUbZFbnEeCXeKoxJ0Vc8g" presentation="default">
41
- <element href="../Express/employment_schema.xmi#_employment_schema-contract_type"/>
42
- </semanticModel>
43
- <contained xsi:type="di:GraphNode" xmi:id="_kQxuYFbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
44
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQxuYVbnEeCXeKoxJ0Vc8g" presentation="default">
45
- <element href="../Express/employment_schema.xmi#_1_enumitem_employment_schema-contract_type-contract"/>
46
- </semanticModel>
47
- </contained>
48
- <contained xsi:type="di:GraphNode" xmi:id="_kQ3N8FbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
49
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ3N8VbnEeCXeKoxJ0Vc8g" presentation="default">
50
- <element href="../Express/employment_schema.xmi#_1_enumitem_employment_schema-contract_type-atwill"/>
51
- </semanticModel>
52
- </contained>
53
- <contained xsi:type="di:GraphNode" xmi:id="_kQ31AFbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
54
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ31AVbnEeCXeKoxJ0Vc8g" presentation="default">
55
- <element href="../Express/employment_schema.xmi#_1_enumitem_employment_schema-contract_type-contractor"/>
56
- </semanticModel>
57
- </contained>
58
- </contained>
59
- </contained>
60
- <contained xsi:type="di:GraphNode" xmi:id="_kQbJEFbnEeCXeKoxJ0Vc8g" position="469,407" size="147,-1">
61
- <anchorage xmi:id="_kRNMMFbnEeCXeKoxJ0Vc8g" graphEdge="_kROaUFbnEeCXeKoxJ0Vc8g _kRTS0FbnEeCXeKoxJ0Vc8g _kRW9MFbnEeCXeKoxJ0Vc8g"/>
62
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQbJEVbnEeCXeKoxJ0Vc8g" presentation="default">
63
- <element href="../Express/employment_schema.xmi#_employment_schema-po"/>
64
- </semanticModel>
65
- <contained xsi:type="di:GraphNode" xmi:id="_kQbJElbnEeCXeKoxJ0Vc8g">
66
- <property xmi:id="_kQbJE1bnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="37"/>
67
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQbJFFbnEeCXeKoxJ0Vc8g" presentation="default">
68
- <element href="../Express/employment_schema.xmi#_employment_schema-po"/>
69
- </semanticModel>
70
- </contained>
71
- <contained xsi:type="di:GraphNode" xmi:id="_kQbJFVbnEeCXeKoxJ0Vc8g">
72
- <property xmi:id="_kQbJFlbnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="38 41 "/>
73
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQbJF1bnEeCXeKoxJ0Vc8g" presentation="default">
74
- <element href="../Express/employment_schema.xmi#_employment_schema-po"/>
75
- </semanticModel>
76
- </contained>
77
- </contained>
78
- <contained xsi:type="di:GraphNode" xmi:id="_kQid0FbnEeCXeKoxJ0Vc8g" position="127,365" size="190,-1">
79
- <anchorage xmi:id="_kRRdoFbnEeCXeKoxJ0Vc8g" graphEdge="_kRTS0FbnEeCXeKoxJ0Vc8g _kRb1sFbnEeCXeKoxJ0Vc8g"/>
80
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQid0VbnEeCXeKoxJ0Vc8g" presentation="default">
81
- <element href="../Express/employment_schema.xmi#_employment_schema-Person"/>
82
- </semanticModel>
83
- <contained xsi:type="di:GraphNode" xmi:id="_kQid0lbnEeCXeKoxJ0Vc8g">
84
- <property xmi:id="_kQid01bnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="37"/>
85
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQid1FbnEeCXeKoxJ0Vc8g" presentation="default">
86
- <element href="../Express/employment_schema.xmi#_employment_schema-Person"/>
87
- </semanticModel>
88
- <contained xsi:type="di:GraphNode" xmi:id="_kQ31AlbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
89
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ31A1bnEeCXeKoxJ0Vc8g" presentation="default">
90
- <element href="../Express/employment_schema.xmi#_2_attr_employment_schema-Person-names"/>
91
- </semanticModel>
92
- </contained>
93
- </contained>
94
- <contained xsi:type="di:GraphNode" xmi:id="_kQid1VbnEeCXeKoxJ0Vc8g">
95
- <property xmi:id="_kQid1lbnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="47 50 "/>
96
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQid11bnEeCXeKoxJ0Vc8g" presentation="default">
97
- <element href="../Express/employment_schema.xmi#_employment_schema-Person"/>
98
- </semanticModel>
99
- </contained>
100
- </contained>
101
- <contained xsi:type="di:GraphNode" xmi:id="_kQmIMFbnEeCXeKoxJ0Vc8g" position="129,464" size="190,-1">
102
- <anchorage xmi:id="_kRWWIFbnEeCXeKoxJ0Vc8g" graphEdge="_kRW9MFbnEeCXeKoxJ0Vc8g _kRguMFbnEeCXeKoxJ0Vc8g"/>
103
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQmIMVbnEeCXeKoxJ0Vc8g" presentation="default">
104
- <element href="../Express/employment_schema.xmi#_employment_schema-Organization"/>
105
- </semanticModel>
106
- <contained xsi:type="di:GraphNode" xmi:id="_kQmIMlbnEeCXeKoxJ0Vc8g">
107
- <property xmi:id="_kQmIM1bnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="37"/>
108
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQmINFbnEeCXeKoxJ0Vc8g" presentation="default">
109
- <element href="../Express/employment_schema.xmi#_employment_schema-Organization"/>
110
- </semanticModel>
111
- <contained xsi:type="di:GraphNode" xmi:id="_kQ4cEFbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
112
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ4cEVbnEeCXeKoxJ0Vc8g" presentation="default">
113
- <element href="../Express/employment_schema.xmi#_2_attr_employment_schema-Organization-name"/>
114
- </semanticModel>
115
- </contained>
116
- </contained>
117
- <contained xsi:type="di:GraphNode" xmi:id="_kQmINVbnEeCXeKoxJ0Vc8g">
118
- <property xmi:id="_kQmINlbnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="47 50 "/>
119
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQmIN1bnEeCXeKoxJ0Vc8g" presentation="default">
120
- <element href="../Express/employment_schema.xmi#_employment_schema-Organization"/>
121
- </semanticModel>
122
- </contained>
123
- </contained>
124
- <contained xsi:type="di:GraphNode" xmi:id="_kQpykFbnEeCXeKoxJ0Vc8g" position="111,166" size="219,-1">
125
- <anchorage xmi:id="_kRankFbnEeCXeKoxJ0Vc8g" graphEdge="_kRb1sFbnEeCXeKoxJ0Vc8g _kRguMFbnEeCXeKoxJ0Vc8g _kRkYkFbnEeCXeKoxJ0Vc8g"/>
126
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQpykVbnEeCXeKoxJ0Vc8g" presentation="default">
127
- <element href="../Express/employment_schema.xmi#_employment_schema-PersonOrganizationRelationship"/>
128
- </semanticModel>
129
- <contained xsi:type="di:GraphNode" xmi:id="_kQpyklbnEeCXeKoxJ0Vc8g">
130
- <property xmi:id="_kQqZoFbnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="37"/>
131
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQqZoVbnEeCXeKoxJ0Vc8g" presentation="default">
132
- <element href="../Express/employment_schema.xmi#_employment_schema-PersonOrganizationRelationship"/>
133
- </semanticModel>
134
- <contained xsi:type="di:GraphNode" xmi:id="_kQ5DIFbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
135
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ5DIVbnEeCXeKoxJ0Vc8g" presentation="default">
136
- <element href="../Express/employment_schema.xmi#__2_attr_employment_schema-PersonOrganizationRelationship-start_date"/>
137
- </semanticModel>
138
- </contained>
139
- <contained xsi:type="di:GraphNode" xmi:id="_kQ5DIlbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
140
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ5DI1bnEeCXeKoxJ0Vc8g" presentation="default">
141
- <element href="../Express/employment_schema.xmi#__2_attr_employment_schema-PersonOrganizationRelationship-end_date"/>
142
- </semanticModel>
143
- </contained>
144
- </contained>
145
- <contained xsi:type="di:GraphNode" xmi:id="_kQqZolbnEeCXeKoxJ0Vc8g">
146
- <property xmi:id="_kQqZo1bnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="47 50 "/>
147
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQqZpFbnEeCXeKoxJ0Vc8g" presentation="default">
148
- <element href="../Express/employment_schema.xmi#_employment_schema-PersonOrganizationRelationship"/>
149
- </semanticModel>
150
- </contained>
151
- </contained>
152
- <contained xsi:type="di:GraphNode" xmi:id="_kQuEAFbnEeCXeKoxJ0Vc8g" position="433,162" size="224,-1">
153
- <anchorage xmi:id="_kRNMMVbnEeCXeKoxJ0Vc8g" graphEdge="_kROaUFbnEeCXeKoxJ0Vc8g _kRkYkFbnEeCXeKoxJ0Vc8g"/>
154
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQuEAVbnEeCXeKoxJ0Vc8g" presentation="default">
155
- <element href="../Express/employment_schema.xmi#_employment_schema-Employment"/>
156
- </semanticModel>
157
- <contained xsi:type="di:GraphNode" xmi:id="_kQuEAlbnEeCXeKoxJ0Vc8g">
158
- <property xmi:id="_kQuEA1bnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="37"/>
159
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQuEBFbnEeCXeKoxJ0Vc8g" presentation="default">
160
- <element href="../Express/employment_schema.xmi#_employment_schema-Employment"/>
161
- </semanticModel>
162
- <contained xsi:type="di:GraphNode" xmi:id="_kQ5qMFbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
163
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ5qMVbnEeCXeKoxJ0Vc8g" presentation="default">
164
- <element href="../Express/employment_schema.xmi#_2_attr_employment_schema-Employment-job_title"/>
165
- </semanticModel>
166
- </contained>
167
- <contained xsi:type="di:GraphNode" xmi:id="_kQ5qMlbnEeCXeKoxJ0Vc8g" position="0,0" size="-1,-1">
168
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQ5qM1bnEeCXeKoxJ0Vc8g" presentation="default">
169
- <element href="../Express/employment_schema.xmi#__2_attr_employment_schema-Employment-employment_type"/>
170
- </semanticModel>
171
- </contained>
172
- </contained>
173
- <contained xsi:type="di:GraphNode" xmi:id="_kQuEBVbnEeCXeKoxJ0Vc8g">
174
- <property xmi:id="_kQuEBlbnEeCXeKoxJ0Vc8g" key="eStructuralFeatureID" value="47 50 "/>
175
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kQuEB1bnEeCXeKoxJ0Vc8g" presentation="default">
176
- <element href="../Express/employment_schema.xmi#_employment_schema-Employment"/>
177
- </semanticModel>
178
- </contained>
179
- </contained>
180
- <contained xsi:type="di:GraphEdge" xmi:id="_kROaUFbnEeCXeKoxJ0Vc8g" anchor="_kRNMMFbnEeCXeKoxJ0Vc8g _kRNMMVbnEeCXeKoxJ0Vc8g">
181
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kROaUVbnEeCXeKoxJ0Vc8g" presentation="default">
182
- <element href="../Express/employment_schema.xmi#_1_association_employment_schema-Employment-ended_by"/>
183
- </semanticModel>
184
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kROaUlbnEeCXeKoxJ0Vc8g" id="srcNameEdgeObject" uDistance="10" vDistance="10"/>
185
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kROaU1bnEeCXeKoxJ0Vc8g" id="srcPropertiesEdgeObject" uDistance="25" vDistance="10"/>
186
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kROaVFbnEeCXeKoxJ0Vc8g" id="srcCountEdgeObject" uDistance="10" vDistance="-10"/>
187
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kROaVVbnEeCXeKoxJ0Vc8g" id="targetNameEdgeObject" uDistance="10" vDistance="10"/>
188
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kROaVlbnEeCXeKoxJ0Vc8g" id="targetPropertiesEdgeObject" uDistance="25" vDistance="10"/>
189
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kROaV1bnEeCXeKoxJ0Vc8g" id="targetCountEdgeObject" uDistance="10" vDistance="-10"/>
190
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kROaWFbnEeCXeKoxJ0Vc8g" visible="false" id="middleNameEdgeObject" offset="0,10"/>
191
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kROaWVbnEeCXeKoxJ0Vc8g" id="stereotypeEdgeObject" offset="0,-10"/>
192
- </contained>
193
- <contained xsi:type="di:GraphEdge" xmi:id="_kRTS0FbnEeCXeKoxJ0Vc8g" anchor="_kRRdoFbnEeCXeKoxJ0Vc8g _kRNMMFbnEeCXeKoxJ0Vc8g">
194
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kRTS0VbnEeCXeKoxJ0Vc8g" presentation="default">
195
- <element href="../Express/employment_schema.xmi#_2_selectitem_employment_schema-Person-po"/>
196
- </semanticModel>
197
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kRTS0lbnEeCXeKoxJ0Vc8g" id="stereotypeEdgeObject"/>
198
- </contained>
199
- <contained xsi:type="di:GraphEdge" xmi:id="_kRW9MFbnEeCXeKoxJ0Vc8g" anchor="_kRWWIFbnEeCXeKoxJ0Vc8g _kRNMMFbnEeCXeKoxJ0Vc8g">
200
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kRW9MVbnEeCXeKoxJ0Vc8g" presentation="default">
201
- <element href="../Express/employment_schema.xmi#_2_selectitem_employment_schema-Organization-po"/>
202
- </semanticModel>
203
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kRW9MlbnEeCXeKoxJ0Vc8g" id="stereotypeEdgeObject"/>
204
- </contained>
205
- <contained xsi:type="di:GraphEdge" xmi:id="_kRb1sFbnEeCXeKoxJ0Vc8g" anchor="_kRRdoFbnEeCXeKoxJ0Vc8g _kRankFbnEeCXeKoxJ0Vc8g">
206
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kRb1sVbnEeCXeKoxJ0Vc8g" presentation="default">
207
- <element href="../Express/employment_schema.xmi#_1_association_employment_schema-PersonOrganizationRelationship-the_person"/>
208
- </semanticModel>
209
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRb1slbnEeCXeKoxJ0Vc8g" id="srcNameEdgeObject" uDistance="10" vDistance="10"/>
210
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRb1s1bnEeCXeKoxJ0Vc8g" id="srcPropertiesEdgeObject" uDistance="25" vDistance="10"/>
211
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRb1tFbnEeCXeKoxJ0Vc8g" id="srcCountEdgeObject" uDistance="10" vDistance="-10"/>
212
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRb1tVbnEeCXeKoxJ0Vc8g" id="targetNameEdgeObject" uDistance="10" vDistance="10"/>
213
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRb1tlbnEeCXeKoxJ0Vc8g" id="targetPropertiesEdgeObject" uDistance="25" vDistance="10"/>
214
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRb1t1bnEeCXeKoxJ0Vc8g" id="targetCountEdgeObject" uDistance="10" vDistance="-10"/>
215
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kRb1uFbnEeCXeKoxJ0Vc8g" visible="false" id="middleNameEdgeObject" offset="0,10"/>
216
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kRb1uVbnEeCXeKoxJ0Vc8g" id="stereotypeEdgeObject" offset="0,-10"/>
217
- </contained>
218
- <contained xsi:type="di:GraphEdge" xmi:id="_kRguMFbnEeCXeKoxJ0Vc8g" anchor="_kRWWIFbnEeCXeKoxJ0Vc8g _kRankFbnEeCXeKoxJ0Vc8g">
219
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kRguMVbnEeCXeKoxJ0Vc8g" presentation="default">
220
- <element href="../Express/employment_schema.xmi#_1_association_employment_schema-PersonOrganizationRelationship-the_organization"/>
221
- </semanticModel>
222
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRguMlbnEeCXeKoxJ0Vc8g" id="srcNameEdgeObject" uDistance="10" vDistance="10"/>
223
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRguM1bnEeCXeKoxJ0Vc8g" id="srcPropertiesEdgeObject" uDistance="25" vDistance="10"/>
224
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRguNFbnEeCXeKoxJ0Vc8g" id="srcCountEdgeObject" uDistance="10" vDistance="-10"/>
225
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRguNVbnEeCXeKoxJ0Vc8g" id="targetNameEdgeObject" uDistance="10" vDistance="10"/>
226
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRguNlbnEeCXeKoxJ0Vc8g" id="targetPropertiesEdgeObject" uDistance="25" vDistance="10"/>
227
- <contained xsi:type="di:EdgeObjectUV" xmi:id="_kRguN1bnEeCXeKoxJ0Vc8g" id="targetCountEdgeObject" uDistance="10" vDistance="-10"/>
228
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kRguOFbnEeCXeKoxJ0Vc8g" visible="false" id="middleNameEdgeObject" offset="0,10"/>
229
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kRguOVbnEeCXeKoxJ0Vc8g" id="stereotypeEdgeObject" offset="0,-10"/>
230
- <waypoints>[-203, 0, -197, 273]</waypoints>
231
- <waypoints>[-203, -280, -197, -7]</waypoints>
232
- </contained>
233
- <contained xsi:type="di:GraphEdge" xmi:id="_kRkYkFbnEeCXeKoxJ0Vc8g" anchor="_kRNMMVbnEeCXeKoxJ0Vc8g _kRankFbnEeCXeKoxJ0Vc8g">
234
- <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_kRkYkVbnEeCXeKoxJ0Vc8g" presentation="default">
235
- <element href="../Express/employment_schema.xmi#_2_supertype_employment_schema-Employment-PersonOrganizationRelationship"/>
236
- </semanticModel>
237
- <contained xsi:type="di:EdgeObjectOffset" xmi:id="_kRkYklbnEeCXeKoxJ0Vc8g" id="stereotypeEdgeObject"/>
238
- </contained>
239
- </diagrams>
240
- </diagrams:Diagrams>
@@ -1,7 +0,0 @@
1
- Topcased 4 Employment example - Roch Bertucat
2
-
3
- This Eclipse project can be imported directly into Topcased:
4
- - /Models/ contains the Topcased files,
5
- - /Express/ contains the EXPRESS file, the generated XML, and the Eclipse UML2
6
- compatible XMI file that can be read directly within Eclipse
7
- - /Export/ contains the UML2 diagram exported from Topcased, based on the XMI file.
@@ -1,33 +0,0 @@
1
- SCHEMA employment_schema;
2
-
3
- TYPE date = STRING;
4
- END_TYPE;
5
-
6
- TYPE po = SELECT ( Person, Organization );
7
- END_TYPE;
8
-
9
- TYPE contract_type = ENUMERATION OF ( contract, atwill, contractor );
10
- END_TYPE;
11
-
12
- ENTITY Person;
13
- names : LIST OF STRING;
14
- END_ENTITY;
15
-
16
- ENTITY Organization;
17
- name : STRING;
18
- END_ENTITY;
19
-
20
- ENTITY PersonOrganizationRelationship;
21
- the_person : Person;
22
- the_organization : Organization;
23
- start_date : date;
24
- end_date : date;
25
- END_ENTITY;
26
-
27
- ENTITY Employment SUBTYPE OF ( PersonOrganizationRelationship );
28
- job_title : STRING;
29
- ended_by : po;
30
- employment_type : contract_type;
31
- END_ENTITY;
32
-
33
- END_SCHEMA;