expressir 0.2.26-x86_64-linux → 1.2.0-x86_64-linux

Sign up to get free protection for your applications and to get access to all the features.
Files changed (214) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +50 -5
  3. data/.github/workflows/release.yml +8 -0
  4. data/.gitignore +2 -2
  5. data/.hound.yml +3 -0
  6. data/.rubocop.yml +6 -506
  7. data/.yardopts +11 -0
  8. data/Rakefile +3 -0
  9. data/demo.rb +5 -5
  10. data/exe/format +8 -8
  11. data/exe/format-test +11 -11
  12. data/expressir.gemspec +4 -2
  13. data/lib/expressir/cli.rb +0 -6
  14. data/lib/expressir/express/2.4/express_parser.so +0 -0
  15. data/lib/expressir/express/2.5/express_parser.so +0 -0
  16. data/lib/expressir/express/2.6/express_parser.so +0 -0
  17. data/lib/expressir/express/2.7/express_parser.so +0 -0
  18. data/lib/expressir/{express_exp → express}/3.0/express_parser.so +0 -0
  19. data/lib/expressir/express/cache.rb +51 -0
  20. data/lib/expressir/{express_exp → express}/formatter.rb +304 -237
  21. data/lib/expressir/{express_exp → express}/hyperlink_formatter.rb +16 -2
  22. data/lib/expressir/{express_exp → express}/model_visitor.rb +2 -1
  23. data/lib/expressir/{express_exp → express}/parser.rb +19 -13
  24. data/lib/expressir/{express_exp → express}/resolve_references_model_visitor.rb +9 -7
  25. data/lib/expressir/express/schema_head_formatter.rb +23 -0
  26. data/lib/expressir/{express_exp → express}/visitor.rb +318 -270
  27. data/lib/expressir/model/cache.rb +6 -2
  28. data/lib/expressir/model/data_type.rb +9 -0
  29. data/lib/expressir/model/data_types/aggregate.rb +31 -0
  30. data/lib/expressir/model/data_types/array.rb +31 -0
  31. data/lib/expressir/model/data_types/bag.rb +25 -0
  32. data/lib/expressir/model/data_types/binary.rb +22 -0
  33. data/lib/expressir/model/data_types/boolean.rb +10 -0
  34. data/lib/expressir/model/data_types/enumeration.rb +25 -0
  35. data/lib/expressir/model/data_types/enumeration_item.rb +26 -0
  36. data/lib/expressir/model/data_types/generic.rb +26 -0
  37. data/lib/expressir/model/data_types/generic_entity.rb +26 -0
  38. data/lib/expressir/model/data_types/integer.rb +10 -0
  39. data/lib/expressir/model/data_types/list.rb +28 -0
  40. data/lib/expressir/model/data_types/logical.rb +10 -0
  41. data/lib/expressir/model/data_types/number.rb +10 -0
  42. data/lib/expressir/model/data_types/real.rb +19 -0
  43. data/lib/expressir/model/data_types/select.rb +28 -0
  44. data/lib/expressir/model/data_types/set.rb +25 -0
  45. data/lib/expressir/model/data_types/string.rb +22 -0
  46. data/lib/expressir/model/declaration.rb +9 -0
  47. data/lib/expressir/model/declarations/attribute.rb +47 -0
  48. data/lib/expressir/model/declarations/constant.rb +34 -0
  49. data/lib/expressir/model/declarations/entity.rb +53 -0
  50. data/lib/expressir/model/declarations/function.rb +67 -0
  51. data/lib/expressir/model/declarations/interface.rb +28 -0
  52. data/lib/expressir/model/declarations/interface_item.rb +23 -0
  53. data/lib/expressir/model/declarations/interfaced_item.rb +37 -0
  54. data/lib/expressir/model/declarations/parameter.rb +34 -0
  55. data/lib/expressir/model/declarations/procedure.rb +64 -0
  56. data/lib/expressir/model/declarations/remark_item.rb +21 -0
  57. data/lib/expressir/model/declarations/rule.rb +71 -0
  58. data/lib/expressir/model/declarations/schema.rb +117 -0
  59. data/lib/expressir/model/declarations/schema_version.rb +22 -0
  60. data/lib/expressir/model/declarations/schema_version_item.rb +22 -0
  61. data/lib/expressir/model/declarations/subtype_constraint.rb +40 -0
  62. data/lib/expressir/model/declarations/type.rb +45 -0
  63. data/lib/expressir/model/declarations/unique_rule.rb +31 -0
  64. data/lib/expressir/model/declarations/variable.rb +34 -0
  65. data/lib/expressir/model/declarations/where_rule.rb +31 -0
  66. data/lib/expressir/model/expression.rb +9 -0
  67. data/lib/expressir/model/expressions/aggregate_initializer.rb +7 -3
  68. data/lib/expressir/model/expressions/aggregate_initializer_item.rb +22 -0
  69. data/lib/expressir/model/expressions/binary_expression.rb +16 -5
  70. data/lib/expressir/model/expressions/entity_constructor.rb +9 -4
  71. data/lib/expressir/model/expressions/function_call.rb +22 -0
  72. data/lib/expressir/model/expressions/interval.rb +17 -6
  73. data/lib/expressir/model/expressions/query_expression.rb +11 -7
  74. data/lib/expressir/model/expressions/unary_expression.rb +9 -3
  75. data/lib/expressir/model/identifier.rb +26 -4
  76. data/lib/expressir/model/literal.rb +9 -0
  77. data/lib/expressir/model/literals/binary.rb +6 -2
  78. data/lib/expressir/model/literals/integer.rb +6 -2
  79. data/lib/expressir/model/literals/logical.rb +6 -2
  80. data/lib/expressir/model/literals/real.rb +6 -2
  81. data/lib/expressir/model/literals/string.rb +8 -3
  82. data/lib/expressir/model/model_element.rb +63 -37
  83. data/lib/expressir/model/reference.rb +9 -0
  84. data/lib/expressir/model/references/attribute_reference.rb +22 -0
  85. data/lib/expressir/model/references/group_reference.rb +22 -0
  86. data/lib/expressir/model/references/index_reference.rb +27 -0
  87. data/lib/expressir/model/references/simple_reference.rb +24 -0
  88. data/lib/expressir/model/repository.rb +6 -2
  89. data/lib/expressir/model/statement.rb +9 -0
  90. data/lib/expressir/model/statements/alias.rb +12 -8
  91. data/lib/expressir/model/statements/assignment.rb +8 -3
  92. data/lib/expressir/model/statements/case.rb +11 -5
  93. data/lib/expressir/model/statements/case_action.rb +8 -3
  94. data/lib/expressir/model/statements/compound.rb +7 -3
  95. data/lib/expressir/model/statements/escape.rb +3 -1
  96. data/lib/expressir/model/statements/if.rb +12 -6
  97. data/lib/expressir/model/statements/null.rb +3 -1
  98. data/lib/expressir/model/statements/procedure_call.rb +22 -0
  99. data/lib/expressir/model/statements/repeat.rb +20 -12
  100. data/lib/expressir/model/statements/return.rb +6 -2
  101. data/lib/expressir/model/statements/skip.rb +3 -1
  102. data/lib/expressir/model/supertype_expression.rb +9 -0
  103. data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb +29 -0
  104. data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb +19 -0
  105. data/lib/expressir/model.rb +52 -43
  106. data/lib/expressir/version.rb +1 -1
  107. data/lib/expressir.rb +0 -1
  108. data/rakelib/cross-ruby.rake +1 -1
  109. data/spec/expressir/{express_exp → express}/cache_spec.rb +9 -9
  110. data/spec/expressir/express/formatter_spec.rb +127 -0
  111. data/spec/expressir/{express_exp → express}/parser_spec.rb +23 -23
  112. data/spec/expressir/model/model_element_spec.rb +153 -153
  113. data/{original/examples → spec}/syntax/multiple.exp +0 -0
  114. data/spec/syntax/multiple.yaml +198 -0
  115. data/{original/examples → spec}/syntax/multiple_formatted.exp +0 -0
  116. data/{original/examples → spec}/syntax/multiple_hyperlink_formatted.exp +0 -0
  117. data/{original/examples → spec}/syntax/multiple_schema_head_hyperlink_formatted.exp +0 -0
  118. data/{original/examples → spec}/syntax/remark.exp +0 -0
  119. data/{original/examples → spec}/syntax/remark.yaml +73 -73
  120. data/{original/examples → spec}/syntax/remark_formatted.exp +0 -0
  121. data/{original/examples → spec}/syntax/single.exp +1 -1
  122. data/spec/syntax/single.yaml +18 -0
  123. data/{original/examples → spec}/syntax/single_formatted.exp +1 -1
  124. data/{original/examples → spec}/syntax/single_formatted.yaml +9 -6
  125. data/{original/examples → spec}/syntax/syntax.exp +11 -11
  126. data/{original/examples → spec}/syntax/syntax.yaml +1100 -1111
  127. data/{original/examples → spec}/syntax/syntax_formatted.exp +11 -11
  128. data/{original/examples → spec}/syntax/syntax_hyperlink_formatted.exp +11 -11
  129. data/{original/examples → spec}/syntax/syntax_schema_head_formatted.exp +1 -1
  130. metadata +128 -121
  131. data/lib/expressir/express/aggregate_dimension.rb +0 -38
  132. data/lib/expressir/express/attribute.rb +0 -15
  133. data/lib/expressir/express/comment.rb +0 -7
  134. data/lib/expressir/express/defined_type.rb +0 -36
  135. data/lib/expressir/express/derived.rb +0 -65
  136. data/lib/expressir/express/derived_aggregate.rb +0 -43
  137. data/lib/expressir/express/entity.rb +0 -137
  138. data/lib/expressir/express/explicit.rb +0 -70
  139. data/lib/expressir/express/explicit_aggregate.rb +0 -46
  140. data/lib/expressir/express/explicit_or_derived.rb +0 -16
  141. data/lib/expressir/express/global_rule.rb +0 -44
  142. data/lib/expressir/express/interface_specification.rb +0 -51
  143. data/lib/expressir/express/interfaced_item.rb +0 -38
  144. data/lib/expressir/express/inverse.rb +0 -46
  145. data/lib/expressir/express/inverse_aggregate.rb +0 -37
  146. data/lib/expressir/express/model_element.rb +0 -7
  147. data/lib/expressir/express/named_type.rb +0 -19
  148. data/lib/expressir/express/remark.rb +0 -8
  149. data/lib/expressir/express/repository.rb +0 -306
  150. data/lib/expressir/express/schema_definition.rb +0 -96
  151. data/lib/expressir/express/subtype_constraint.rb +0 -14
  152. data/lib/expressir/express/type.rb +0 -26
  153. data/lib/expressir/express/type_aggregate.rb +0 -42
  154. data/lib/expressir/express/type_enum.rb +0 -29
  155. data/lib/expressir/express/type_parser.rb +0 -45
  156. data/lib/expressir/express/type_select.rb +0 -82
  157. data/lib/expressir/express/unique_rule.rb +0 -35
  158. data/lib/expressir/express/where_rule.rb +0 -32
  159. data/lib/expressir/express.rb +0 -11
  160. data/lib/expressir/express_exp/2.4/express_parser.so +0 -0
  161. data/lib/expressir/express_exp/2.5/express_parser.so +0 -0
  162. data/lib/expressir/express_exp/2.6/express_parser.so +0 -0
  163. data/lib/expressir/express_exp/2.7/express_parser.so +0 -0
  164. data/lib/expressir/express_exp/cache.rb +0 -48
  165. data/lib/expressir/express_exp/schema_head_formatter.rb +0 -9
  166. data/lib/expressir/express_parser.rb +0 -30
  167. data/lib/expressir/model/attribute.rb +0 -38
  168. data/lib/expressir/model/constant.rb +0 -28
  169. data/lib/expressir/model/entity.rb +0 -42
  170. data/lib/expressir/model/enumeration_item.rb +0 -22
  171. data/lib/expressir/model/expressions/aggregate_item.rb +0 -17
  172. data/lib/expressir/model/expressions/attribute_reference.rb +0 -17
  173. data/lib/expressir/model/expressions/call.rb +0 -17
  174. data/lib/expressir/model/expressions/group_reference.rb +0 -17
  175. data/lib/expressir/model/expressions/index_reference.rb +0 -19
  176. data/lib/expressir/model/expressions/simple_reference.rb +0 -19
  177. data/lib/expressir/model/function.rb +0 -57
  178. data/lib/expressir/model/interface.rb +0 -20
  179. data/lib/expressir/model/interface_item.rb +0 -15
  180. data/lib/expressir/model/interfaced_item.rb +0 -27
  181. data/lib/expressir/model/parameter.rb +0 -28
  182. data/lib/expressir/model/procedure.rb +0 -55
  183. data/lib/expressir/model/remark_item.rb +0 -15
  184. data/lib/expressir/model/rule.rb +0 -60
  185. data/lib/expressir/model/schema.rb +0 -100
  186. data/lib/expressir/model/statements/call.rb +0 -17
  187. data/lib/expressir/model/subtype_constraint.rb +0 -32
  188. data/lib/expressir/model/type.rb +0 -37
  189. data/lib/expressir/model/types/aggregate.rb +0 -28
  190. data/lib/expressir/model/types/array.rb +0 -23
  191. data/lib/expressir/model/types/bag.rb +0 -19
  192. data/lib/expressir/model/types/binary.rb +0 -17
  193. data/lib/expressir/model/types/boolean.rb +0 -8
  194. data/lib/expressir/model/types/enumeration.rb +0 -21
  195. data/lib/expressir/model/types/generic.rb +0 -24
  196. data/lib/expressir/model/types/generic_entity.rb +0 -24
  197. data/lib/expressir/model/types/integer.rb +0 -8
  198. data/lib/expressir/model/types/list.rb +0 -21
  199. data/lib/expressir/model/types/logical.rb +0 -8
  200. data/lib/expressir/model/types/number.rb +0 -8
  201. data/lib/expressir/model/types/real.rb +0 -15
  202. data/lib/expressir/model/types/select.rb +0 -23
  203. data/lib/expressir/model/types/set.rb +0 -19
  204. data/lib/expressir/model/types/string.rb +0 -17
  205. data/lib/expressir/model/unique.rb +0 -26
  206. data/lib/expressir/model/variable.rb +0 -28
  207. data/lib/expressir/model/where.rb +0 -26
  208. data/lib/expressir/parser/owl_parser.rb +0 -8
  209. data/lib/expressir/parser.rb +0 -6
  210. data/original/examples/syntax/multiple.yaml +0 -198
  211. data/original/examples/syntax/single.yaml +0 -15
  212. data/spec/acceptance/express_to_owl_spec.rb +0 -18
  213. data/spec/expressir/express/repository_spec.rb +0 -25
  214. data/spec/expressir/express_exp/formatter_spec.rb +0 -127
@@ -1,18 +1,18 @@
1
1
 
2
2
  require "yaml"
3
3
  require "spec_helper"
4
- require "expressir/express_exp/parser"
5
- require "expressir/express_exp/formatter"
4
+ require "expressir/express/parser"
5
+ require "expressir/express/formatter"
6
6
 
7
7
  RSpec.describe Expressir::Model::ModelElement do
8
8
  describe ".to_hash" do
9
9
  it "exports an object with a formatter (single.exp)" do
10
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
11
- yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single_formatted.yaml")
10
+ exp_file = Expressir.root_path.join("spec", "syntax", "single.exp")
11
+ yaml_file = Expressir.root_path.join("spec", "syntax", "single_formatted.yaml")
12
12
 
13
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
13
+ repo = Expressir::Express::Parser.from_file(exp_file)
14
14
 
15
- result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, formatter: Expressir::ExpressExp::Formatter, skip_empty: true))
15
+ result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, formatter: Expressir::Express::Formatter))
16
16
  # File.write(yaml_file, result)
17
17
  expected_result = File.read(yaml_file)
18
18
 
@@ -22,48 +22,48 @@ RSpec.describe Expressir::Model::ModelElement do
22
22
 
23
23
  describe ".from_hash" do
24
24
  it "parses an object (single.yaml)" do
25
- yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single.yaml")
25
+ yaml_file = Expressir.root_path.join("spec", "syntax", "single.yaml")
26
26
 
27
27
  input = YAML.load(File.read(yaml_file))
28
28
  repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
29
29
 
30
- result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
30
+ result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
31
31
  expected_result = File.read(yaml_file)
32
32
 
33
33
  expect(result).to eq(expected_result)
34
34
  end
35
35
 
36
36
  it "parses an object (multiple.yaml)" do
37
- yaml_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.yaml")
37
+ yaml_file = Expressir.root_path.join("spec", "syntax", "multiple.yaml")
38
38
 
39
39
  input = YAML.load(File.read(yaml_file))
40
40
  repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
41
41
 
42
- result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
42
+ result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
43
43
  expected_result = File.read(yaml_file)
44
44
 
45
45
  expect(result).to eq(expected_result)
46
46
  end
47
47
 
48
48
  it "parses an object (syntax.yaml)" do
49
- yaml_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.yaml")
49
+ yaml_file = Expressir.root_path.join("spec", "syntax", "syntax.yaml")
50
50
 
51
51
  input = YAML.load(File.read(yaml_file))
52
52
  repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
53
53
 
54
- result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
54
+ result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
55
55
  expected_result = File.read(yaml_file)
56
56
 
57
57
  expect(result).to eq(expected_result)
58
58
  end
59
59
 
60
60
  it "parses an object (remark.yaml)" do
61
- yaml_file = Expressir.root_path.join("original", "examples", "syntax", "remark.yaml")
61
+ yaml_file = Expressir.root_path.join("spec", "syntax", "remark.yaml")
62
62
 
63
63
  input = YAML.load(File.read(yaml_file))
64
64
  repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
65
65
 
66
- result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
66
+ result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
67
67
  expected_result = File.read(yaml_file)
68
68
 
69
69
  expect(result).to eq(expected_result)
@@ -72,195 +72,195 @@ RSpec.describe Expressir::Model::ModelElement do
72
72
 
73
73
  describe ".find" do
74
74
  it "finds an object (single.exp)" do
75
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
75
+ exp_file = Expressir.root_path.join("spec", "syntax", "single.exp")
76
76
 
77
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
77
+ repo = Expressir::Express::Parser.from_file(exp_file)
78
78
 
79
79
  # universal scope
80
- expect(repo.find('single_schema')).to be_instance_of(Expressir::Model::Schema)
81
- expect(repo.find('single_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
80
+ expect(repo.find('single_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
81
+ expect(repo.find('single_schema.empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
82
82
 
83
83
  # schema scope
84
84
  schema = repo.schemas.first
85
- expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
85
+ expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
86
86
  end
87
87
 
88
88
  it "finds an object (multiple.exp)" do
89
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
89
+ exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
90
90
 
91
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
91
+ repo = Expressir::Express::Parser.from_file(exp_file)
92
92
 
93
93
  # universal scope
94
- expect(repo.find('multiple_schema')).to be_instance_of(Expressir::Model::Schema)
95
- expect(repo.find('multiple_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
96
- expect(repo.find('multiple_schema.attribute_entity')).to be_instance_of(Expressir::Model::Entity)
97
- expect(repo.find('multiple_schema.attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
98
- expect(repo.find('multiple_schema.attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
99
- expect(repo.find('multiple_schema.attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
94
+ expect(repo.find('multiple_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
95
+ expect(repo.find('multiple_schema.empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
96
+ expect(repo.find('multiple_schema.attribute_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
97
+ expect(repo.find('multiple_schema.attribute_entity2')).to be_instance_of(Expressir::Model::Declarations::Entity)
98
+ expect(repo.find('multiple_schema.attribute_entity3')).to be_instance_of(Expressir::Model::Declarations::Entity)
99
+ expect(repo.find('multiple_schema.attribute_entity4')).to be_instance_of(Expressir::Model::Declarations::Entity)
100
100
 
101
101
  # schema scope
102
102
  schema = repo.schemas.first
103
- expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
104
- expect(schema.find('attribute_entity')).to be_instance_of(Expressir::Model::Entity)
105
- expect(schema.find('attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
106
- expect(schema.find('attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
107
- expect(schema.find('attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
103
+ expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
104
+ expect(schema.find('attribute_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
105
+ expect(schema.find('attribute_entity2')).to be_instance_of(Expressir::Model::Declarations::Entity)
106
+ expect(schema.find('attribute_entity3')).to be_instance_of(Expressir::Model::Declarations::Entity)
107
+ expect(schema.find('attribute_entity4')).to be_instance_of(Expressir::Model::Declarations::Entity)
108
108
  end
109
109
 
110
110
  it "finds an object (syntax.exp)" do
111
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
111
+ exp_file = Expressir.root_path.join("spec", "syntax", "syntax.exp")
112
112
 
113
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
113
+ repo = Expressir::Express::Parser.from_file(exp_file)
114
114
 
115
115
  # universal scope
116
- expect(repo.find('syntax_schema')).to be_instance_of(Expressir::Model::Schema)
117
- expect(repo.find('syntax_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
116
+ expect(repo.find('syntax_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
117
+ expect(repo.find('syntax_schema.empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
118
118
 
119
119
  # schema scope
120
120
  schema = repo.schemas.first
121
- expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
121
+ expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
122
122
  end
123
123
 
124
124
  it "finds an object (remark.exp)" do
125
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
125
+ exp_file = Expressir.root_path.join("spec", "syntax", "remark.exp")
126
126
 
127
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
127
+ repo = Expressir::Express::Parser.from_file(exp_file)
128
128
 
129
129
  # universal scope
130
- expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Schema)
131
- expect(repo.find('remark_schema.remark_constant')).to be_instance_of(Expressir::Model::Constant)
132
- expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Type)
133
- expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
134
- expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
135
- expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
136
- expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
137
- expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
138
- expect(repo.find('remark_schema.remark_entity')).to be_instance_of(Expressir::Model::Entity)
139
- expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
140
- expect(repo.find('remark_schema.remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
141
- expect(repo.find('remark_schema.remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
142
- expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
143
- expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
144
- expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
145
- expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
146
- expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
147
- expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
148
- expect(repo.find('remark_schema.remark_function')).to be_instance_of(Expressir::Model::Function)
149
- expect(repo.find('remark_schema.remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
150
- expect(repo.find('remark_schema.remark_function.remark_type')).to be_instance_of(Expressir::Model::Type)
151
- expect(repo.find('remark_schema.remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
152
- expect(repo.find('remark_schema.remark_function.remark_constant')).to be_instance_of(Expressir::Model::Constant)
153
- expect(repo.find('remark_schema.remark_function.remark_variable')).to be_instance_of(Expressir::Model::Variable)
154
- expect(repo.find('remark_schema.remark_procedure')).to be_instance_of(Expressir::Model::Procedure)
155
- expect(repo.find('remark_schema.remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
156
- expect(repo.find('remark_schema.remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Type)
157
- expect(repo.find('remark_schema.remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
158
- expect(repo.find('remark_schema.remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Constant)
159
- expect(repo.find('remark_schema.remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Variable)
160
- expect(repo.find('remark_schema.remark_rule')).to be_instance_of(Expressir::Model::Rule)
161
- expect(repo.find('remark_schema.remark_rule.remark_type')).to be_instance_of(Expressir::Model::Type)
162
- expect(repo.find('remark_schema.remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
163
- expect(repo.find('remark_schema.remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
164
- expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
165
- expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
166
- expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
167
- expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
168
- expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
169
- expect(repo.find('remark_schema.remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
130
+ expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
131
+ expect(repo.find('remark_schema.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
132
+ expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
133
+ expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
134
+ expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
135
+ expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
136
+ expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
137
+ expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
138
+ expect(repo.find('remark_schema.remark_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
139
+ expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
140
+ expect(repo.find('remark_schema.remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
141
+ expect(repo.find('remark_schema.remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
142
+ expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::Declarations::UniqueRule)
143
+ expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
144
+ expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
145
+ expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
146
+ expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
147
+ expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::Declarations::SubtypeConstraint)
148
+ expect(repo.find('remark_schema.remark_function')).to be_instance_of(Expressir::Model::Declarations::Function)
149
+ expect(repo.find('remark_schema.remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
150
+ expect(repo.find('remark_schema.remark_function.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
151
+ expect(repo.find('remark_schema.remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
152
+ expect(repo.find('remark_schema.remark_function.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
153
+ expect(repo.find('remark_schema.remark_function.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
154
+ expect(repo.find('remark_schema.remark_procedure')).to be_instance_of(Expressir::Model::Declarations::Procedure)
155
+ expect(repo.find('remark_schema.remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
156
+ expect(repo.find('remark_schema.remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
157
+ expect(repo.find('remark_schema.remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
158
+ expect(repo.find('remark_schema.remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
159
+ expect(repo.find('remark_schema.remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
160
+ expect(repo.find('remark_schema.remark_rule')).to be_instance_of(Expressir::Model::Declarations::Rule)
161
+ expect(repo.find('remark_schema.remark_rule.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
162
+ expect(repo.find('remark_schema.remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
163
+ expect(repo.find('remark_schema.remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
164
+ expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
165
+ expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
166
+ expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
167
+ expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
168
+ expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
169
+ expect(repo.find('remark_schema.remark_item')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
170
170
 
171
171
  # schema scope
172
172
  schema = repo.schemas.first
173
- expect(schema.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
174
- expect(schema.find('remark_type')).to be_instance_of(Expressir::Model::Type)
175
- expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
176
- expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
177
- expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
178
- expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
179
- expect(schema.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
180
- expect(schema.find('remark_entity')).to be_instance_of(Expressir::Model::Entity)
181
- expect(schema.find('remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
182
- expect(schema.find('remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
183
- expect(schema.find('remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
184
- expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
185
- expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
186
- expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
187
- expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
188
- expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
189
- expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
190
- expect(schema.find('remark_function')).to be_instance_of(Expressir::Model::Function)
191
- expect(schema.find('remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
192
- expect(schema.find('remark_function.remark_type')).to be_instance_of(Expressir::Model::Type)
193
- expect(schema.find('remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
194
- expect(schema.find('remark_function.remark_constant')).to be_instance_of(Expressir::Model::Constant)
195
- expect(schema.find('remark_function.remark_variable')).to be_instance_of(Expressir::Model::Variable)
196
- expect(schema.find('remark_procedure')).to be_instance_of(Expressir::Model::Procedure)
197
- expect(schema.find('remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
198
- expect(schema.find('remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Type)
199
- expect(schema.find('remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
200
- expect(schema.find('remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Constant)
201
- expect(schema.find('remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Variable)
202
- expect(schema.find('remark_rule')).to be_instance_of(Expressir::Model::Rule)
203
- expect(schema.find('remark_rule.remark_type')).to be_instance_of(Expressir::Model::Type)
204
- expect(schema.find('remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
205
- expect(schema.find('remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
206
- expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
207
- expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
208
- expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
209
- expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
210
- expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
211
- expect(schema.find('remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
173
+ expect(schema.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
174
+ expect(schema.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
175
+ expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
176
+ expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
177
+ expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
178
+ expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
179
+ expect(schema.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
180
+ expect(schema.find('remark_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
181
+ expect(schema.find('remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
182
+ expect(schema.find('remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
183
+ expect(schema.find('remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
184
+ expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::Declarations::UniqueRule)
185
+ expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
186
+ expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
187
+ expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
188
+ expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
189
+ expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::Declarations::SubtypeConstraint)
190
+ expect(schema.find('remark_function')).to be_instance_of(Expressir::Model::Declarations::Function)
191
+ expect(schema.find('remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
192
+ expect(schema.find('remark_function.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
193
+ expect(schema.find('remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
194
+ expect(schema.find('remark_function.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
195
+ expect(schema.find('remark_function.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
196
+ expect(schema.find('remark_procedure')).to be_instance_of(Expressir::Model::Declarations::Procedure)
197
+ expect(schema.find('remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
198
+ expect(schema.find('remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
199
+ expect(schema.find('remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
200
+ expect(schema.find('remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
201
+ expect(schema.find('remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
202
+ expect(schema.find('remark_rule')).to be_instance_of(Expressir::Model::Declarations::Rule)
203
+ expect(schema.find('remark_rule.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
204
+ expect(schema.find('remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
205
+ expect(schema.find('remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
206
+ expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
207
+ expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
208
+ expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
209
+ expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
210
+ expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
211
+ expect(schema.find('remark_item')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
212
212
 
213
213
  # type scope
214
214
  type = schema.types.first
215
- expect(type.find('WR1')).to be_instance_of(Expressir::Model::Where)
216
- expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
217
- expect(type.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
218
- expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
215
+ expect(type.find('WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
216
+ expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
217
+ expect(type.find('IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
218
+ expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
219
219
 
220
220
  # entity scope
221
221
  entity = schema.entities.first
222
- expect(entity.find('remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
223
- expect(entity.find('remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
224
- expect(entity.find('remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
225
- expect(entity.find('UR1')).to be_instance_of(Expressir::Model::Unique)
226
- expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Where)
227
- expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
228
- expect(entity.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
229
- expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
222
+ expect(entity.find('remark_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
223
+ expect(entity.find('remark_derived_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
224
+ expect(entity.find('remark_inverse_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
225
+ expect(entity.find('UR1')).to be_instance_of(Expressir::Model::Declarations::UniqueRule)
226
+ expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
227
+ expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
228
+ expect(entity.find('IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
229
+ expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
230
230
 
231
231
  # function scope
232
232
  function = schema.functions.first
233
- expect(function.find('remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
234
- expect(function.find('remark_type')).to be_instance_of(Expressir::Model::Type)
235
- expect(function.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
236
- expect(function.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
237
- expect(function.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
233
+ expect(function.find('remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
234
+ expect(function.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
235
+ expect(function.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
236
+ expect(function.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
237
+ expect(function.find('remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
238
238
 
239
239
  # procedure scope
240
240
  procedure = schema.procedures.first
241
- expect(procedure.find('remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
242
- expect(procedure.find('remark_type')).to be_instance_of(Expressir::Model::Type)
243
- expect(procedure.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
244
- expect(procedure.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
245
- expect(procedure.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
241
+ expect(procedure.find('remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
242
+ expect(procedure.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
243
+ expect(procedure.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
244
+ expect(procedure.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
245
+ expect(procedure.find('remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
246
246
 
247
247
  # rule scope
248
248
  rule = schema.rules.first
249
- expect(rule.find('remark_type')).to be_instance_of(Expressir::Model::Type)
250
- expect(rule.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
251
- expect(rule.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
252
- expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
253
- expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Where)
254
- expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
255
- expect(rule.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
256
- expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
249
+ expect(rule.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
250
+ expect(rule.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
251
+ expect(rule.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
252
+ expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
253
+ expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
254
+ expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
255
+ expect(rule.find('IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
256
+ expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
257
257
 
258
258
  # retry search in parent scope
259
- expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Type)
260
- expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
261
- expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
262
- expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
263
- expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
259
+ expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
260
+ expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
261
+ expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
262
+ expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
263
+ expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
264
264
  end
265
265
  end
266
266
  end
File without changes
@@ -0,0 +1,198 @@
1
+ ---
2
+ _class: Expressir::Model::Repository
3
+ schemas:
4
+ - _class: Expressir::Model::Declarations::Schema
5
+ file: spec/syntax/multiple.exp
6
+ id: multiple_schema
7
+ interfaces:
8
+ - _class: Expressir::Model::Declarations::Interface
9
+ kind: :REFERENCE
10
+ schema:
11
+ _class: Expressir::Model::References::SimpleReference
12
+ id: multiple_schema2
13
+ base_path: multiple_schema2
14
+ - _class: Expressir::Model::Declarations::Interface
15
+ kind: :REFERENCE
16
+ schema:
17
+ _class: Expressir::Model::References::SimpleReference
18
+ id: multiple_schema3
19
+ base_path: multiple_schema3
20
+ items:
21
+ - _class: Expressir::Model::Declarations::InterfaceItem
22
+ ref:
23
+ _class: Expressir::Model::References::SimpleReference
24
+ id: attribute_entity3
25
+ base_path: multiple_schema3.attribute_entity3
26
+ - _class: Expressir::Model::Declarations::Interface
27
+ kind: :REFERENCE
28
+ schema:
29
+ _class: Expressir::Model::References::SimpleReference
30
+ id: multiple_schema4
31
+ base_path: multiple_schema4
32
+ items:
33
+ - _class: Expressir::Model::Declarations::InterfaceItem
34
+ ref:
35
+ _class: Expressir::Model::References::SimpleReference
36
+ id: attribute_entity
37
+ base_path: multiple_schema4.attribute_entity
38
+ id: attribute_entity4
39
+ entities:
40
+ - _class: Expressir::Model::Declarations::Entity
41
+ id: test
42
+ - _class: Expressir::Model::Declarations::Entity
43
+ id: empty_entity
44
+ - _class: Expressir::Model::Declarations::Entity
45
+ id: attribute_entity
46
+ attributes:
47
+ - _class: Expressir::Model::Declarations::Attribute
48
+ id: test
49
+ kind: :EXPLICIT
50
+ type:
51
+ _class: Expressir::Model::DataTypes::Boolean
52
+ - _class: Expressir::Model::Declarations::Entity
53
+ id: subtype_empty_entity
54
+ subtype_of:
55
+ - _class: Expressir::Model::References::SimpleReference
56
+ id: empty_entity
57
+ base_path: multiple_schema.empty_entity
58
+ - _class: Expressir::Model::Declarations::Entity
59
+ id: subtype_attribute_entity
60
+ subtype_of:
61
+ - _class: Expressir::Model::References::SimpleReference
62
+ id: attribute_entity
63
+ base_path: multiple_schema.attribute_entity
64
+ attributes:
65
+ - _class: Expressir::Model::Declarations::Attribute
66
+ kind: :EXPLICIT
67
+ supertype_attribute:
68
+ _class: Expressir::Model::References::AttributeReference
69
+ ref:
70
+ _class: Expressir::Model::References::GroupReference
71
+ ref:
72
+ _class: Expressir::Model::References::SimpleReference
73
+ id: SELF
74
+ entity:
75
+ _class: Expressir::Model::References::SimpleReference
76
+ id: attribute_entity
77
+ base_path: multiple_schema.attribute_entity
78
+ attribute:
79
+ _class: Expressir::Model::References::SimpleReference
80
+ id: test
81
+ type:
82
+ _class: Expressir::Model::DataTypes::Boolean
83
+ - _class: Expressir::Model::Declarations::Entity
84
+ id: subtype_attribute_entity2
85
+ subtype_of:
86
+ - _class: Expressir::Model::References::SimpleReference
87
+ id: attribute_entity2
88
+ base_path: multiple_schema2.attribute_entity2
89
+ attributes:
90
+ - _class: Expressir::Model::Declarations::Attribute
91
+ kind: :EXPLICIT
92
+ supertype_attribute:
93
+ _class: Expressir::Model::References::AttributeReference
94
+ ref:
95
+ _class: Expressir::Model::References::GroupReference
96
+ ref:
97
+ _class: Expressir::Model::References::SimpleReference
98
+ id: SELF
99
+ entity:
100
+ _class: Expressir::Model::References::SimpleReference
101
+ id: attribute_entity2
102
+ base_path: multiple_schema2.attribute_entity2
103
+ attribute:
104
+ _class: Expressir::Model::References::SimpleReference
105
+ id: test
106
+ type:
107
+ _class: Expressir::Model::DataTypes::Boolean
108
+ - _class: Expressir::Model::Declarations::Entity
109
+ id: subtype_attribute_entity3
110
+ subtype_of:
111
+ - _class: Expressir::Model::References::SimpleReference
112
+ id: attribute_entity3
113
+ base_path: multiple_schema3.attribute_entity3
114
+ attributes:
115
+ - _class: Expressir::Model::Declarations::Attribute
116
+ kind: :EXPLICIT
117
+ supertype_attribute:
118
+ _class: Expressir::Model::References::AttributeReference
119
+ ref:
120
+ _class: Expressir::Model::References::GroupReference
121
+ ref:
122
+ _class: Expressir::Model::References::SimpleReference
123
+ id: SELF
124
+ entity:
125
+ _class: Expressir::Model::References::SimpleReference
126
+ id: attribute_entity3
127
+ base_path: multiple_schema3.attribute_entity3
128
+ attribute:
129
+ _class: Expressir::Model::References::SimpleReference
130
+ id: test
131
+ type:
132
+ _class: Expressir::Model::DataTypes::Boolean
133
+ - _class: Expressir::Model::Declarations::Entity
134
+ id: subtype_attribute_entity4
135
+ subtype_of:
136
+ - _class: Expressir::Model::References::SimpleReference
137
+ id: attribute_entity4
138
+ base_path: multiple_schema4.attribute_entity
139
+ attributes:
140
+ - _class: Expressir::Model::Declarations::Attribute
141
+ kind: :EXPLICIT
142
+ supertype_attribute:
143
+ _class: Expressir::Model::References::AttributeReference
144
+ ref:
145
+ _class: Expressir::Model::References::GroupReference
146
+ ref:
147
+ _class: Expressir::Model::References::SimpleReference
148
+ id: SELF
149
+ entity:
150
+ _class: Expressir::Model::References::SimpleReference
151
+ id: attribute_entity4
152
+ base_path: multiple_schema4.attribute_entity
153
+ attribute:
154
+ _class: Expressir::Model::References::SimpleReference
155
+ id: test
156
+ type:
157
+ _class: Expressir::Model::DataTypes::Boolean
158
+ - _class: Expressir::Model::Declarations::Entity
159
+ id: subtype_missing_entity
160
+ subtype_of:
161
+ - _class: Expressir::Model::References::SimpleReference
162
+ id: missing_entity
163
+ - _class: Expressir::Model::Declarations::Schema
164
+ file: spec/syntax/multiple.exp
165
+ id: multiple_schema2
166
+ entities:
167
+ - _class: Expressir::Model::Declarations::Entity
168
+ id: attribute_entity2
169
+ attributes:
170
+ - _class: Expressir::Model::Declarations::Attribute
171
+ id: test
172
+ kind: :EXPLICIT
173
+ type:
174
+ _class: Expressir::Model::DataTypes::Boolean
175
+ - _class: Expressir::Model::Declarations::Schema
176
+ file: spec/syntax/multiple.exp
177
+ id: multiple_schema3
178
+ entities:
179
+ - _class: Expressir::Model::Declarations::Entity
180
+ id: attribute_entity3
181
+ attributes:
182
+ - _class: Expressir::Model::Declarations::Attribute
183
+ id: test
184
+ kind: :EXPLICIT
185
+ type:
186
+ _class: Expressir::Model::DataTypes::Boolean
187
+ - _class: Expressir::Model::Declarations::Schema
188
+ file: spec/syntax/multiple.exp
189
+ id: multiple_schema4
190
+ entities:
191
+ - _class: Expressir::Model::Declarations::Entity
192
+ id: attribute_entity
193
+ attributes:
194
+ - _class: Expressir::Model::Declarations::Attribute
195
+ id: test
196
+ kind: :EXPLICIT
197
+ type:
198
+ _class: Expressir::Model::DataTypes::Boolean