expressir 0.2.24-x86-linux → 1.1.0-x86-linux

Sign up to get free protection for your applications and to get access to all the features.
Files changed (212) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +7 -6
  3. data/.gitignore +2 -2
  4. data/.yardopts +11 -0
  5. data/Rakefile +3 -0
  6. data/demo.rb +5 -5
  7. data/exe/format +10 -73
  8. data/exe/format-test +81 -0
  9. data/expressir.gemspec +3 -1
  10. data/lib/expressir.rb +0 -1
  11. data/lib/expressir/cli.rb +0 -6
  12. data/lib/expressir/{express_exp → express}/2.4/express_parser.so +0 -0
  13. data/lib/expressir/{express_exp → express}/2.5/express_parser.so +0 -0
  14. data/lib/expressir/{express_exp → express}/2.6/express_parser.so +0 -0
  15. data/lib/expressir/{express_exp → express}/2.7/express_parser.so +0 -0
  16. data/lib/expressir/{express_exp → express}/3.0/express_parser.so +0 -0
  17. data/lib/expressir/express/cache.rb +51 -0
  18. data/lib/expressir/{express_exp → express}/formatter.rb +306 -239
  19. data/lib/expressir/express/hyperlink_formatter.rb +36 -0
  20. data/lib/expressir/express/model_visitor.rb +24 -0
  21. data/lib/expressir/express/parser.rb +81 -0
  22. data/lib/expressir/express/resolve_references_model_visitor.rb +31 -0
  23. data/lib/expressir/express/schema_head_formatter.rb +23 -0
  24. data/lib/expressir/{express_exp → express}/visitor.rb +318 -270
  25. data/lib/expressir/model.rb +52 -43
  26. data/lib/expressir/model/cache.rb +6 -2
  27. data/lib/expressir/model/data_type.rb +9 -0
  28. data/lib/expressir/model/data_types/aggregate.rb +31 -0
  29. data/lib/expressir/model/data_types/array.rb +31 -0
  30. data/lib/expressir/model/data_types/bag.rb +25 -0
  31. data/lib/expressir/model/data_types/binary.rb +22 -0
  32. data/lib/expressir/model/data_types/boolean.rb +10 -0
  33. data/lib/expressir/model/data_types/enumeration.rb +25 -0
  34. data/lib/expressir/model/data_types/enumeration_item.rb +26 -0
  35. data/lib/expressir/model/data_types/generic.rb +26 -0
  36. data/lib/expressir/model/data_types/generic_entity.rb +26 -0
  37. data/lib/expressir/model/data_types/integer.rb +10 -0
  38. data/lib/expressir/model/data_types/list.rb +28 -0
  39. data/lib/expressir/model/data_types/logical.rb +10 -0
  40. data/lib/expressir/model/data_types/number.rb +10 -0
  41. data/lib/expressir/model/data_types/real.rb +19 -0
  42. data/lib/expressir/model/data_types/select.rb +28 -0
  43. data/lib/expressir/model/data_types/set.rb +25 -0
  44. data/lib/expressir/model/data_types/string.rb +22 -0
  45. data/lib/expressir/model/declaration.rb +9 -0
  46. data/lib/expressir/model/declarations/attribute.rb +47 -0
  47. data/lib/expressir/model/declarations/constant.rb +34 -0
  48. data/lib/expressir/model/declarations/entity.rb +53 -0
  49. data/lib/expressir/model/declarations/function.rb +67 -0
  50. data/lib/expressir/model/declarations/interface.rb +28 -0
  51. data/lib/expressir/model/declarations/interface_item.rb +23 -0
  52. data/lib/expressir/model/declarations/interfaced_item.rb +37 -0
  53. data/lib/expressir/model/declarations/parameter.rb +34 -0
  54. data/lib/expressir/model/declarations/procedure.rb +64 -0
  55. data/lib/expressir/model/declarations/remark_item.rb +21 -0
  56. data/lib/expressir/model/declarations/rule.rb +71 -0
  57. data/lib/expressir/model/declarations/schema.rb +117 -0
  58. data/lib/expressir/model/declarations/schema_version.rb +22 -0
  59. data/lib/expressir/model/declarations/schema_version_item.rb +22 -0
  60. data/lib/expressir/model/declarations/subtype_constraint.rb +40 -0
  61. data/lib/expressir/model/declarations/type.rb +45 -0
  62. data/lib/expressir/model/declarations/unique_rule.rb +31 -0
  63. data/lib/expressir/model/declarations/variable.rb +34 -0
  64. data/lib/expressir/model/declarations/where_rule.rb +31 -0
  65. data/lib/expressir/model/expression.rb +9 -0
  66. data/lib/expressir/model/expressions/aggregate_initializer.rb +7 -3
  67. data/lib/expressir/model/expressions/aggregate_initializer_item.rb +22 -0
  68. data/lib/expressir/model/expressions/binary_expression.rb +16 -5
  69. data/lib/expressir/model/expressions/entity_constructor.rb +9 -4
  70. data/lib/expressir/model/expressions/function_call.rb +22 -0
  71. data/lib/expressir/model/expressions/interval.rb +17 -6
  72. data/lib/expressir/model/expressions/query_expression.rb +11 -7
  73. data/lib/expressir/model/expressions/unary_expression.rb +9 -3
  74. data/lib/expressir/model/identifier.rb +26 -4
  75. data/lib/expressir/model/literal.rb +9 -0
  76. data/lib/expressir/model/literals/binary.rb +6 -2
  77. data/lib/expressir/model/literals/integer.rb +6 -2
  78. data/lib/expressir/model/literals/logical.rb +6 -2
  79. data/lib/expressir/model/literals/real.rb +6 -2
  80. data/lib/expressir/model/literals/string.rb +8 -3
  81. data/lib/expressir/model/model_element.rb +70 -37
  82. data/lib/expressir/model/reference.rb +9 -0
  83. data/lib/expressir/model/references/attribute_reference.rb +22 -0
  84. data/lib/expressir/model/references/group_reference.rb +22 -0
  85. data/lib/expressir/model/references/index_reference.rb +27 -0
  86. data/lib/expressir/model/references/simple_reference.rb +24 -0
  87. data/lib/expressir/model/repository.rb +8 -2
  88. data/lib/expressir/model/statement.rb +9 -0
  89. data/lib/expressir/model/statements/alias.rb +12 -8
  90. data/lib/expressir/model/statements/assignment.rb +8 -3
  91. data/lib/expressir/model/statements/case.rb +11 -5
  92. data/lib/expressir/model/statements/case_action.rb +8 -3
  93. data/lib/expressir/model/statements/compound.rb +7 -3
  94. data/lib/expressir/model/statements/escape.rb +3 -1
  95. data/lib/expressir/model/statements/if.rb +12 -6
  96. data/lib/expressir/model/statements/null.rb +3 -1
  97. data/lib/expressir/model/statements/procedure_call.rb +22 -0
  98. data/lib/expressir/model/statements/repeat.rb +20 -12
  99. data/lib/expressir/model/statements/return.rb +6 -2
  100. data/lib/expressir/model/statements/skip.rb +3 -1
  101. data/lib/expressir/model/supertype_expression.rb +9 -0
  102. data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb +29 -0
  103. data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb +19 -0
  104. data/lib/expressir/version.rb +1 -1
  105. data/rakelib/cross-ruby.rake +1 -1
  106. data/spec/expressir/{express_exp → express}/cache_spec.rb +9 -9
  107. data/spec/expressir/express/formatter_spec.rb +127 -0
  108. data/spec/expressir/{express_exp → express}/parser_spec.rb +24 -24
  109. data/spec/expressir/model/model_element_spec.rb +181 -129
  110. data/{original/examples → spec}/syntax/multiple.exp +1 -1
  111. data/spec/syntax/multiple.yaml +198 -0
  112. data/{original/examples → spec}/syntax/multiple_formatted.exp +1 -1
  113. data/{original/examples → spec}/syntax/multiple_hyperlink_formatted.exp +4 -4
  114. data/{original/examples → spec}/syntax/multiple_schema_head_hyperlink_formatted.exp +1 -1
  115. data/{original/examples → spec}/syntax/remark.exp +0 -0
  116. data/{original/examples → spec}/syntax/remark.yaml +87 -73
  117. data/{original/examples → spec}/syntax/remark_formatted.exp +0 -0
  118. data/spec/syntax/single.exp +4 -0
  119. data/spec/syntax/single.yaml +18 -0
  120. data/spec/syntax/single_formatted.exp +10 -0
  121. data/spec/syntax/single_formatted.yaml +36 -0
  122. data/{original/examples → spec}/syntax/syntax.exp +11 -11
  123. data/{original/examples → spec}/syntax/syntax.yaml +1181 -1111
  124. data/{original/examples → spec}/syntax/syntax_formatted.exp +11 -11
  125. data/spec/syntax/syntax_hyperlink_formatted.exp +902 -0
  126. data/{original/examples → spec}/syntax/syntax_schema_head_formatted.exp +1 -1
  127. metadata +124 -114
  128. data/lib/expressir/express.rb +0 -11
  129. data/lib/expressir/express/aggregate_dimension.rb +0 -38
  130. data/lib/expressir/express/attribute.rb +0 -15
  131. data/lib/expressir/express/comment.rb +0 -7
  132. data/lib/expressir/express/defined_type.rb +0 -36
  133. data/lib/expressir/express/derived.rb +0 -65
  134. data/lib/expressir/express/derived_aggregate.rb +0 -43
  135. data/lib/expressir/express/entity.rb +0 -137
  136. data/lib/expressir/express/explicit.rb +0 -70
  137. data/lib/expressir/express/explicit_aggregate.rb +0 -46
  138. data/lib/expressir/express/explicit_or_derived.rb +0 -16
  139. data/lib/expressir/express/global_rule.rb +0 -44
  140. data/lib/expressir/express/interface_specification.rb +0 -51
  141. data/lib/expressir/express/interfaced_item.rb +0 -38
  142. data/lib/expressir/express/inverse.rb +0 -46
  143. data/lib/expressir/express/inverse_aggregate.rb +0 -37
  144. data/lib/expressir/express/model_element.rb +0 -7
  145. data/lib/expressir/express/named_type.rb +0 -19
  146. data/lib/expressir/express/remark.rb +0 -8
  147. data/lib/expressir/express/repository.rb +0 -306
  148. data/lib/expressir/express/schema_definition.rb +0 -96
  149. data/lib/expressir/express/subtype_constraint.rb +0 -14
  150. data/lib/expressir/express/type.rb +0 -26
  151. data/lib/expressir/express/type_aggregate.rb +0 -42
  152. data/lib/expressir/express/type_enum.rb +0 -29
  153. data/lib/expressir/express/type_parser.rb +0 -45
  154. data/lib/expressir/express/type_select.rb +0 -82
  155. data/lib/expressir/express/unique_rule.rb +0 -35
  156. data/lib/expressir/express/where_rule.rb +0 -32
  157. data/lib/expressir/express_exp/cache.rb +0 -48
  158. data/lib/expressir/express_exp/hyperlink_formatter.rb +0 -27
  159. data/lib/expressir/express_exp/parser.rb +0 -64
  160. data/lib/expressir/express_exp/schema_head_formatter.rb +0 -9
  161. data/lib/expressir/express_parser.rb +0 -30
  162. data/lib/expressir/model/attribute.rb +0 -38
  163. data/lib/expressir/model/constant.rb +0 -28
  164. data/lib/expressir/model/entity.rb +0 -42
  165. data/lib/expressir/model/enumeration_item.rb +0 -22
  166. data/lib/expressir/model/expressions/aggregate_item.rb +0 -17
  167. data/lib/expressir/model/expressions/attribute_reference.rb +0 -17
  168. data/lib/expressir/model/expressions/call.rb +0 -17
  169. data/lib/expressir/model/expressions/group_reference.rb +0 -17
  170. data/lib/expressir/model/expressions/index_reference.rb +0 -19
  171. data/lib/expressir/model/expressions/simple_reference.rb +0 -15
  172. data/lib/expressir/model/function.rb +0 -57
  173. data/lib/expressir/model/interface.rb +0 -20
  174. data/lib/expressir/model/interface_item.rb +0 -15
  175. data/lib/expressir/model/interfaced_item.rb +0 -31
  176. data/lib/expressir/model/parameter.rb +0 -28
  177. data/lib/expressir/model/procedure.rb +0 -55
  178. data/lib/expressir/model/remark_item.rb +0 -15
  179. data/lib/expressir/model/rule.rb +0 -60
  180. data/lib/expressir/model/schema.rb +0 -98
  181. data/lib/expressir/model/statements/call.rb +0 -17
  182. data/lib/expressir/model/subtype_constraint.rb +0 -32
  183. data/lib/expressir/model/type.rb +0 -37
  184. data/lib/expressir/model/types/aggregate.rb +0 -28
  185. data/lib/expressir/model/types/array.rb +0 -23
  186. data/lib/expressir/model/types/bag.rb +0 -19
  187. data/lib/expressir/model/types/binary.rb +0 -17
  188. data/lib/expressir/model/types/boolean.rb +0 -8
  189. data/lib/expressir/model/types/enumeration.rb +0 -21
  190. data/lib/expressir/model/types/generic.rb +0 -24
  191. data/lib/expressir/model/types/generic_entity.rb +0 -24
  192. data/lib/expressir/model/types/integer.rb +0 -8
  193. data/lib/expressir/model/types/list.rb +0 -21
  194. data/lib/expressir/model/types/logical.rb +0 -8
  195. data/lib/expressir/model/types/number.rb +0 -8
  196. data/lib/expressir/model/types/real.rb +0 -15
  197. data/lib/expressir/model/types/select.rb +0 -23
  198. data/lib/expressir/model/types/set.rb +0 -19
  199. data/lib/expressir/model/types/string.rb +0 -17
  200. data/lib/expressir/model/unique.rb +0 -26
  201. data/lib/expressir/model/variable.rb +0 -28
  202. data/lib/expressir/model/where.rb +0 -26
  203. data/lib/expressir/parser.rb +0 -6
  204. data/lib/expressir/parser/owl_parser.rb +0 -8
  205. data/original/examples/syntax/multiple.yaml +0 -184
  206. data/original/examples/syntax/single.exp +0 -3
  207. data/original/examples/syntax/single.yaml +0 -9
  208. data/original/examples/syntax/single_formatted.exp +0 -6
  209. data/original/examples/syntax/single_formatted.yaml +0 -19
  210. data/spec/acceptance/express_to_owl_spec.rb +0 -18
  211. data/spec/expressir/express/repository_spec.rb +0 -25
  212. data/spec/expressir/express_exp/formatter_spec.rb +0 -111
@@ -1,20 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Interface < ModelElement
4
- USE = :USE
5
- REFERENCE = :REFERENCE
6
-
7
- model_attr_accessor :kind
8
- model_attr_accessor :schema
9
- model_attr_accessor :items
10
-
11
- def initialize(options = {})
12
- @kind = options[:kind]
13
- @schema = options[:schema]
14
- @items = options.fetch(:items, [])
15
-
16
- super
17
- end
18
- end
19
- end
20
- end
@@ -1,15 +0,0 @@
1
- module Expressir
2
- module Model
3
- class InterfaceItem < ModelElement
4
- model_attr_accessor :ref
5
- model_attr_accessor :id
6
-
7
- def initialize(options = {})
8
- @ref = options[:ref]
9
- @id = options[:id]
10
-
11
- super
12
- end
13
- end
14
- end
15
- end
@@ -1,31 +0,0 @@
1
- module Expressir
2
- module Model
3
- class InterfacedItem < ModelElement
4
- model_attr_accessor :id
5
- model_attr_accessor :remarks
6
- model_attr_accessor :remark_items
7
-
8
- model_attr_accessor :base_item
9
-
10
- def initialize(options = {})
11
- @id = options[:id]
12
- @remarks = options.fetch(:remarks, [])
13
- @remark_items = options.fetch(:remark_items, [])
14
-
15
- @base_item = options[:base_item]
16
-
17
- super
18
- end
19
-
20
- def path
21
- base_item.path
22
- end
23
-
24
- def children
25
- [
26
- *remark_items
27
- ]
28
- end
29
- end
30
- end
31
- end
@@ -1,28 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Parameter < ModelElement
4
- include Identifier
5
-
6
- model_attr_accessor :var
7
- model_attr_accessor :type
8
-
9
- def initialize(options = {})
10
- @id = options[:id]
11
- @remarks = options.fetch(:remarks, [])
12
- @remark_items = options.fetch(:remark_items, [])
13
- @source = options[:source]
14
-
15
- @var = options[:var]
16
- @type = options[:type]
17
-
18
- super
19
- end
20
-
21
- def children
22
- [
23
- *remark_items
24
- ]
25
- end
26
- end
27
- end
28
- end
@@ -1,55 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Procedure < ModelElement
4
- include Identifier
5
-
6
- model_attr_accessor :parameters
7
- model_attr_accessor :types
8
- model_attr_accessor :entities
9
- model_attr_accessor :subtype_constraints
10
- model_attr_accessor :functions
11
- model_attr_accessor :procedures
12
- model_attr_accessor :constants
13
- model_attr_accessor :variables
14
- model_attr_accessor :statements
15
-
16
- def initialize(options = {})
17
- @id = options[:id]
18
- @remarks = options.fetch(:remarks, [])
19
- @remark_items = options.fetch(:remark_items, [])
20
- @source = options[:source]
21
-
22
- @parameters = options.fetch(:parameters, [])
23
- @types = options.fetch(:types, [])
24
- @entities = options.fetch(:entities, [])
25
- @subtype_constraints = options.fetch(:subtype_constraints, [])
26
- @functions = options.fetch(:functions, [])
27
- @procedures = options.fetch(:procedures, [])
28
- @constants = options.fetch(:constants, [])
29
- @variables = options.fetch(:variables, [])
30
- @statements = options.fetch(:statements, [])
31
-
32
- super
33
- end
34
-
35
- def enumeration_items
36
- types.flat_map{|x| x.enumeration_items}
37
- end
38
-
39
- def children
40
- [
41
- *parameters,
42
- *types,
43
- *enumeration_items,
44
- *entities,
45
- *subtype_constraints,
46
- *functions,
47
- *procedures,
48
- *constants,
49
- *variables,
50
- *remark_items
51
- ]
52
- end
53
- end
54
- end
55
- end
@@ -1,15 +0,0 @@
1
- module Expressir
2
- module Model
3
- class RemarkItem < ModelElement
4
- model_attr_accessor :id
5
- model_attr_accessor :remarks
6
-
7
- def initialize(options = {})
8
- @id = options[:id]
9
- @remarks = options.fetch(:remarks, [])
10
-
11
- super
12
- end
13
- end
14
- end
15
- end
@@ -1,60 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Rule < ModelElement
4
- include Identifier
5
-
6
- model_attr_accessor :applies_to
7
- model_attr_accessor :types
8
- model_attr_accessor :entities
9
- model_attr_accessor :subtype_constraints
10
- model_attr_accessor :functions
11
- model_attr_accessor :procedures
12
- model_attr_accessor :constants
13
- model_attr_accessor :variables
14
- model_attr_accessor :statements
15
- model_attr_accessor :where
16
- model_attr_accessor :informal_propositions
17
-
18
- def initialize(options = {})
19
- @id = options[:id]
20
- @remarks = options.fetch(:remarks, [])
21
- @remark_items = options.fetch(:remark_items, [])
22
- @source = options[:source]
23
-
24
- @applies_to = options.fetch(:applies_to, [])
25
- @types = options.fetch(:types, [])
26
- @entities = options.fetch(:entities, [])
27
- @subtype_constraints = options.fetch(:subtype_constraints, [])
28
- @functions = options.fetch(:functions, [])
29
- @procedures = options.fetch(:procedures, [])
30
- @constants = options.fetch(:constants, [])
31
- @variables = options.fetch(:variables, [])
32
- @statements = options.fetch(:statements, [])
33
- @where = options.fetch(:where, [])
34
- @informal_propositions = options.fetch(:informal_propositions, [])
35
-
36
- super
37
- end
38
-
39
- def enumeration_items
40
- types.flat_map{|x| x.enumeration_items}
41
- end
42
-
43
- def children
44
- [
45
- *types,
46
- *enumeration_items,
47
- *entities,
48
- *subtype_constraints,
49
- *functions,
50
- *procedures,
51
- *constants,
52
- *variables,
53
- *where,
54
- *informal_propositions,
55
- *remark_items
56
- ]
57
- end
58
- end
59
- end
60
- end
@@ -1,98 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Schema < ModelElement
4
- model_attr_accessor :file
5
-
6
- include Identifier
7
-
8
- model_attr_accessor :version
9
- model_attr_accessor :interfaces
10
- model_attr_accessor :constants
11
- model_attr_accessor :types
12
- model_attr_accessor :entities
13
- model_attr_accessor :subtype_constraints
14
- model_attr_accessor :functions
15
- model_attr_accessor :rules
16
- model_attr_accessor :procedures
17
-
18
- def initialize(options = {})
19
- @file = options[:file]
20
-
21
- @id = options[:id]
22
- @remarks = options.fetch(:remarks, [])
23
- @remark_items = options.fetch(:remark_items, [])
24
- @source = options[:source]
25
-
26
- @version = options[:version]
27
- @interfaces = options.fetch(:interfaces, [])
28
- @constants = options.fetch(:constants, [])
29
- @types = options.fetch(:types, [])
30
- @entities = options.fetch(:entities, [])
31
- @subtype_constraints = options.fetch(:subtype_constraints, [])
32
- @functions = options.fetch(:functions, [])
33
- @rules = options.fetch(:rules, [])
34
- @procedures = options.fetch(:procedures, [])
35
-
36
- super
37
- end
38
-
39
- def create_interfaced_item(id, base_item)
40
- interfaced_item = InterfacedItem.new({
41
- id: id
42
- })
43
- interfaced_item.base_item = base_item # skip overriding parent
44
- interfaced_item.parent = self
45
- interfaced_item
46
- end
47
-
48
- def interfaced_items
49
- interfaces.flat_map do |interface|
50
- schema = parent.children_by_id[interface.schema.id.downcase]
51
- if schema
52
- schema_safe_children = schema.safe_children
53
- schema_safe_children_by_id = schema_safe_children.select{|x| x.id}.map{|x| [x.id.downcase, x]}.to_h
54
- if interface.items.length > 0
55
- interface.items.map do |interface_item|
56
- base_item = schema_safe_children_by_id[interface_item.ref.id.downcase]
57
- if base_item
58
- id = interface_item.id || base_item.id
59
- create_interfaced_item(id, base_item)
60
- end
61
- end
62
- else
63
- schema_safe_children.map do |base_item|
64
- id = base_item.id
65
- create_interfaced_item(id, base_item)
66
- end
67
- end
68
- end
69
- end.select{|x| x}
70
- end
71
-
72
- def enumeration_items
73
- types.flat_map{|x| x.enumeration_items}
74
- end
75
-
76
- def safe_children
77
- [
78
- *constants,
79
- *types,
80
- *enumeration_items,
81
- *entities,
82
- *subtype_constraints,
83
- *functions,
84
- *rules,
85
- *procedures,
86
- *remark_items
87
- ]
88
- end
89
-
90
- def children
91
- [
92
- *interfaced_items,
93
- *safe_children
94
- ]
95
- end
96
- end
97
- end
98
- end
@@ -1,17 +0,0 @@
1
- module Expressir
2
- module Model
3
- module Statements
4
- class Call < ModelElement
5
- model_attr_accessor :ref
6
- model_attr_accessor :parameters
7
-
8
- def initialize(options = {})
9
- @ref = options[:ref]
10
- @parameters = options.fetch(:parameters, [])
11
-
12
- super
13
- end
14
- end
15
- end
16
- end
17
- end
@@ -1,32 +0,0 @@
1
- module Expressir
2
- module Model
3
- class SubtypeConstraint < ModelElement
4
- include Identifier
5
-
6
- model_attr_accessor :applies_to
7
- model_attr_accessor :abstract
8
- model_attr_accessor :total_over
9
- model_attr_accessor :supertype_expression
10
-
11
- def initialize(options = {})
12
- @id = options[:id]
13
- @remarks = options.fetch(:remarks, [])
14
- @remark_items = options.fetch(:remark_items, [])
15
- @source = options[:source]
16
-
17
- @applies_to = options[:applies_to]
18
- @abstract = options[:abstract]
19
- @total_over = options.fetch(:total_over, [])
20
- @supertype_expression = options[:supertype_expression]
21
-
22
- super
23
- end
24
-
25
- def children
26
- [
27
- *remark_items
28
- ]
29
- end
30
- end
31
- end
32
- end
@@ -1,37 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Type < ModelElement
4
- include Identifier
5
-
6
- model_attr_accessor :type
7
- model_attr_accessor :where
8
- model_attr_accessor :informal_propositions
9
-
10
- def initialize(options = {})
11
- @id = options[:id]
12
- @remarks = options.fetch(:remarks, [])
13
- @remark_items = options.fetch(:remark_items, [])
14
- @source = options[:source]
15
-
16
- @type = options[:type]
17
- @where = options.fetch(:where, [])
18
- @informal_propositions = options.fetch(:informal_propositions, [])
19
-
20
- super
21
- end
22
-
23
- def enumeration_items
24
- type.is_a?(Types::Enumeration) ? type.items : []
25
- end
26
-
27
- def children
28
- [
29
- *enumeration_items,
30
- *where,
31
- *informal_propositions,
32
- *remark_items
33
- ]
34
- end
35
- end
36
- end
37
- end
@@ -1,28 +0,0 @@
1
- module Expressir
2
- module Model
3
- module Types
4
- class Aggregate < ModelElement
5
- include Identifier
6
-
7
- model_attr_accessor :base_type
8
-
9
- def initialize(options = {})
10
- @id = options[:id]
11
- @remarks = options.fetch(:remarks, [])
12
- @remark_items = options.fetch(:remark_items, [])
13
- @source = options[:source]
14
-
15
- @base_type = options[:base_type]
16
-
17
- super
18
- end
19
-
20
- def children
21
- [
22
- *remark_items
23
- ]
24
- end
25
- end
26
- end
27
- end
28
- end