expressir 0.2.27-x86-mingw32 → 1.0.0-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (90) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +3 -3
  3. data/.gitignore +2 -2
  4. data/demo.rb +5 -5
  5. data/exe/format +8 -8
  6. data/exe/format-test +11 -11
  7. data/expressir.gemspec +0 -1
  8. data/lib/expressir.rb +0 -1
  9. data/lib/expressir/cli.rb +0 -6
  10. data/lib/expressir/{express_exp → express}/2.4/express_parser.so +0 -0
  11. data/lib/expressir/{express_exp → express}/2.5/express_parser.so +0 -0
  12. data/lib/expressir/{express_exp → express}/2.6/express_parser.so +0 -0
  13. data/lib/expressir/{express_exp → express}/2.7/express_parser.so +0 -0
  14. data/lib/expressir/{express_exp → express}/3.0/express_parser.so +0 -0
  15. data/lib/expressir/{express_exp → express}/cache.rb +3 -6
  16. data/lib/expressir/{express_exp → express}/formatter.rb +72 -66
  17. data/lib/expressir/{express_exp → express}/hyperlink_formatter.rb +1 -1
  18. data/lib/expressir/{express_exp → express}/model_visitor.rb +1 -1
  19. data/lib/expressir/{express_exp → express}/parser.rb +3 -3
  20. data/lib/expressir/{express_exp → express}/resolve_references_model_visitor.rb +2 -2
  21. data/lib/expressir/{express_exp → express}/schema_head_formatter.rb +1 -1
  22. data/lib/expressir/{express_exp → express}/visitor.rb +21 -25
  23. data/lib/expressir/model.rb +2 -2
  24. data/lib/expressir/model/entity.rb +6 -6
  25. data/lib/expressir/model/model_element.rb +1 -1
  26. data/lib/expressir/model/rule.rb +3 -3
  27. data/lib/expressir/model/type.rb +6 -6
  28. data/lib/expressir/model/types/enumeration.rb +2 -4
  29. data/lib/expressir/model/types/select.rb +2 -4
  30. data/lib/expressir/model/{unique.rb → unique_rule.rb} +1 -1
  31. data/lib/expressir/model/{where.rb → where_rule.rb} +1 -1
  32. data/lib/expressir/version.rb +1 -1
  33. data/rakelib/cross-ruby.rake +1 -1
  34. data/spec/expressir/{express_exp → express}/cache_spec.rb +9 -9
  35. data/spec/expressir/express/formatter_spec.rb +127 -0
  36. data/spec/expressir/{express_exp → express}/parser_spec.rb +23 -23
  37. data/spec/expressir/model/model_element_spec.rb +45 -45
  38. data/{original/examples → spec}/syntax/multiple.exp +0 -0
  39. data/{original/examples → spec}/syntax/multiple.yaml +4 -4
  40. data/{original/examples → spec}/syntax/multiple_formatted.exp +0 -0
  41. data/{original/examples → spec}/syntax/multiple_hyperlink_formatted.exp +0 -0
  42. data/{original/examples → spec}/syntax/multiple_schema_head_hyperlink_formatted.exp +0 -0
  43. data/{original/examples → spec}/syntax/remark.exp +0 -0
  44. data/{original/examples → spec}/syntax/remark.yaml +13 -13
  45. data/{original/examples → spec}/syntax/remark_formatted.exp +0 -0
  46. data/{original/examples → spec}/syntax/single.exp +0 -0
  47. data/{original/examples → spec}/syntax/single.yaml +1 -1
  48. data/{original/examples → spec}/syntax/single_formatted.exp +0 -0
  49. data/{original/examples → spec}/syntax/single_formatted.yaml +1 -1
  50. data/{original/examples → spec}/syntax/syntax.exp +10 -10
  51. data/{original/examples → spec}/syntax/syntax.yaml +106 -106
  52. data/{original/examples → spec}/syntax/syntax_formatted.exp +10 -10
  53. data/{original/examples → spec}/syntax/syntax_hyperlink_formatted.exp +10 -10
  54. data/{original/examples → spec}/syntax/syntax_schema_head_formatted.exp +0 -0
  55. metadata +37 -85
  56. data/lib/expressir/express.rb +0 -11
  57. data/lib/expressir/express/aggregate_dimension.rb +0 -38
  58. data/lib/expressir/express/attribute.rb +0 -15
  59. data/lib/expressir/express/comment.rb +0 -7
  60. data/lib/expressir/express/defined_type.rb +0 -36
  61. data/lib/expressir/express/derived.rb +0 -65
  62. data/lib/expressir/express/derived_aggregate.rb +0 -43
  63. data/lib/expressir/express/entity.rb +0 -137
  64. data/lib/expressir/express/explicit.rb +0 -70
  65. data/lib/expressir/express/explicit_aggregate.rb +0 -46
  66. data/lib/expressir/express/explicit_or_derived.rb +0 -16
  67. data/lib/expressir/express/global_rule.rb +0 -44
  68. data/lib/expressir/express/interface_specification.rb +0 -51
  69. data/lib/expressir/express/interfaced_item.rb +0 -38
  70. data/lib/expressir/express/inverse.rb +0 -46
  71. data/lib/expressir/express/inverse_aggregate.rb +0 -37
  72. data/lib/expressir/express/model_element.rb +0 -7
  73. data/lib/expressir/express/named_type.rb +0 -19
  74. data/lib/expressir/express/remark.rb +0 -8
  75. data/lib/expressir/express/repository.rb +0 -306
  76. data/lib/expressir/express/schema_definition.rb +0 -96
  77. data/lib/expressir/express/subtype_constraint.rb +0 -14
  78. data/lib/expressir/express/type.rb +0 -26
  79. data/lib/expressir/express/type_aggregate.rb +0 -42
  80. data/lib/expressir/express/type_enum.rb +0 -29
  81. data/lib/expressir/express/type_parser.rb +0 -45
  82. data/lib/expressir/express/type_select.rb +0 -82
  83. data/lib/expressir/express/unique_rule.rb +0 -35
  84. data/lib/expressir/express/where_rule.rb +0 -32
  85. data/lib/expressir/express_parser.rb +0 -30
  86. data/lib/expressir/parser.rb +0 -6
  87. data/lib/expressir/parser/owl_parser.rb +0 -8
  88. data/spec/acceptance/express_to_owl_spec.rb +0 -18
  89. data/spec/expressir/express/repository_spec.rb +0 -25
  90. data/spec/expressir/express_exp/formatter_spec.rb +0 -127
data/{original/examples → spec}/syntax/single.exp RENAMED
File without changes
data/{original/examples → spec}/syntax/single.yaml RENAMED
@@ -2,7 +2,7 @@
2
2
  _class: Expressir::Model::Repository
3
3
  schemas:
4
4
  - _class: Expressir::Model::Schema
5
- file: original/examples/syntax/single.exp
5
+ file: spec/syntax/single.exp
6
6
  id: single_schema
7
7
  version:
8
8
  _class: Expressir::Model::SchemaVersion
data/{original/examples → spec}/syntax/single_formatted.yaml RENAMED
@@ -2,7 +2,7 @@
2
2
  _class: Expressir::Model::Repository
3
3
  schemas:
4
4
  - _class: Expressir::Model::Schema
5
- file: original/examples/syntax/single.exp
5
+ file: spec/syntax/single.exp
6
6
  id: single_schema
7
7
  version:
8
8
  _class: Expressir::Model::SchemaVersion
data/{original/examples → spec}/syntax/syntax.exp RENAMED
@@ -192,18 +192,18 @@ PROCEDURE types;
192
192
  TYPE select_type = SELECT; END_TYPE;
193
193
  TYPE select_extensible_type = EXTENSIBLE SELECT; END_TYPE;
194
194
  TYPE select_extensible_generic_entity_type = EXTENSIBLE GENERIC_ENTITY SELECT; END_TYPE;
195
- TYPE select_list_type = SELECT (empty_type); END_TYPE;
196
- TYPE select_list_multiple_type = SELECT (empty_type, empty_type); END_TYPE;
197
- TYPE select_extension_type_ref_type = SELECT BASED_ON select_type; END_TYPE;
198
- TYPE select_extension_type_ref_list_type = SELECT BASED_ON select_type WITH (empty_type); END_TYPE;
199
- TYPE select_extension_type_ref_list_multiple_type = SELECT BASED_ON select_type WITH (empty_type, empty_type); END_TYPE;
195
+ TYPE select_item_type = SELECT (empty_type); END_TYPE;
196
+ TYPE select_multiple_item_type = SELECT (empty_type, empty_type); END_TYPE;
197
+ TYPE select_based_on_type = SELECT BASED_ON select_type; END_TYPE;
198
+ TYPE select_based_on_item_type = SELECT BASED_ON select_type WITH (empty_type); END_TYPE;
199
+ TYPE select_based_on_multiple_item_type = SELECT BASED_ON select_type WITH (empty_type, empty_type); END_TYPE;
200
200
  TYPE enumeration_type = ENUMERATION; END_TYPE;
201
201
  TYPE enumeration_extensible_type = EXTENSIBLE ENUMERATION; END_TYPE;
202
- TYPE enumeration_list_type = ENUMERATION OF (test); END_TYPE;
203
- TYPE enumeration_list_multiple_type = ENUMERATION OF (test, test2); END_TYPE;
204
- TYPE enumeration_extension_type_ref_type = ENUMERATION BASED_ON enumeration_type; END_TYPE;
205
- TYPE enumeration_extension_type_ref_list_type = ENUMERATION BASED_ON enumeration_type WITH (test); END_TYPE;
206
- TYPE enumeration_extension_type_ref_list_multiple_type = ENUMERATION BASED_ON enumeration_type WITH (test, test2); END_TYPE;
202
+ TYPE enumeration_item_type = ENUMERATION OF (test); END_TYPE;
203
+ TYPE enumeration_multiple_item_type = ENUMERATION OF (test, test2); END_TYPE;
204
+ TYPE enumeration_based_on_type = ENUMERATION BASED_ON enumeration_type; END_TYPE;
205
+ TYPE enumeration_based_on_item_type = ENUMERATION BASED_ON enumeration_type WITH (test); END_TYPE;
206
+ TYPE enumeration_based_on_multiple_item_type = ENUMERATION BASED_ON enumeration_type WITH (test, test2); END_TYPE;
207
207
 
208
208
  -- generic types
209
209
  FUNCTION generic_type : GENERIC; ; END_FUNCTION;
data/{original/examples → spec}/syntax/syntax.yaml RENAMED
@@ -2,7 +2,7 @@
2
2
  _class: Expressir::Model::Repository
3
3
  schemas:
4
4
  - _class: Expressir::Model::Schema
5
- file: original/examples/syntax/syntax.exp
5
+ file: spec/syntax/syntax.exp
6
6
  id: syntax_schema
7
7
  version:
8
8
  _class: Expressir::Model::SchemaVersion
@@ -115,23 +115,23 @@ schemas:
115
115
  types:
116
116
  - _class: Expressir::Model::Type
117
117
  id: empty_type
118
- type:
118
+ underlying_type:
119
119
  _class: Expressir::Model::Types::Boolean
120
120
  - _class: Expressir::Model::Type
121
121
  id: where_type
122
- type:
122
+ underlying_type:
123
123
  _class: Expressir::Model::Types::Boolean
124
- where:
125
- - _class: Expressir::Model::Where
124
+ where_rules:
125
+ - _class: Expressir::Model::WhereRule
126
126
  expression:
127
127
  _class: Expressir::Model::Literals::Logical
128
128
  value: :TRUE
129
129
  - _class: Expressir::Model::Type
130
130
  id: where_label_type
131
- type:
131
+ underlying_type:
132
132
  _class: Expressir::Model::Types::Boolean
133
- where:
134
- - _class: Expressir::Model::Where
133
+ where_rules:
134
+ - _class: Expressir::Model::WhereRule
135
135
  id: WR1
136
136
  expression:
137
137
  _class: Expressir::Model::Literals::Logical
@@ -513,8 +513,8 @@ schemas:
513
513
  kind: :EXPLICIT
514
514
  type:
515
515
  _class: Expressir::Model::Types::Boolean
516
- unique:
517
- - _class: Expressir::Model::Unique
516
+ unique_rules:
517
+ - _class: Expressir::Model::UniqueRule
518
518
  attributes:
519
519
  - _class: Expressir::Model::Expressions::SimpleReference
520
520
  id: test
@@ -527,8 +527,8 @@ schemas:
527
527
  kind: :EXPLICIT
528
528
  type:
529
529
  _class: Expressir::Model::Types::Boolean
530
- unique:
531
- - _class: Expressir::Model::Unique
530
+ unique_rules:
531
+ - _class: Expressir::Model::UniqueRule
532
532
  id: UR1
533
533
  attributes:
534
534
  - _class: Expressir::Model::Expressions::SimpleReference
@@ -540,8 +540,8 @@ schemas:
540
540
  - _class: Expressir::Model::Expressions::SimpleReference
541
541
  id: attribute_entity
542
542
  base_path: syntax_schema.attribute_entity
543
- unique:
544
- - _class: Expressir::Model::Unique
543
+ unique_rules:
544
+ - _class: Expressir::Model::UniqueRule
545
545
  attributes:
546
546
  - _class: Expressir::Model::Expressions::AttributeReference
547
547
  ref:
@@ -562,8 +562,8 @@ schemas:
562
562
  - _class: Expressir::Model::Expressions::SimpleReference
563
563
  id: attribute_entity
564
564
  base_path: syntax_schema.attribute_entity
565
- unique:
566
- - _class: Expressir::Model::Unique
565
+ unique_rules:
566
+ - _class: Expressir::Model::UniqueRule
567
567
  id: UR1
568
568
  attributes:
569
569
  - _class: Expressir::Model::Expressions::AttributeReference
@@ -581,15 +581,15 @@ schemas:
581
581
  id: test
582
582
  - _class: Expressir::Model::Entity
583
583
  id: where_entity
584
- where:
585
- - _class: Expressir::Model::Where
584
+ where_rules:
585
+ - _class: Expressir::Model::WhereRule
586
586
  expression:
587
587
  _class: Expressir::Model::Literals::Logical
588
588
  value: :TRUE
589
589
  - _class: Expressir::Model::Entity
590
590
  id: where_label_entity
591
- where:
592
- - _class: Expressir::Model::Where
591
+ where_rules:
592
+ - _class: Expressir::Model::WhereRule
593
593
  id: WR1
594
594
  expression:
595
595
  _class: Expressir::Model::Literals::Logical
@@ -957,7 +957,7 @@ schemas:
957
957
  types:
958
958
  - _class: Expressir::Model::Type
959
959
  id: test
960
- type:
960
+ underlying_type:
961
961
  _class: Expressir::Model::Types::Boolean
962
962
  statements:
963
963
  - _class: Expressir::Model::Statements::Null
@@ -1100,8 +1100,8 @@ schemas:
1100
1100
  - _class: Expressir::Model::Expressions::SimpleReference
1101
1101
  id: empty_entity
1102
1102
  base_path: syntax_schema.empty_entity
1103
- where:
1104
- - _class: Expressir::Model::Where
1103
+ where_rules:
1104
+ - _class: Expressir::Model::WhereRule
1105
1105
  expression:
1106
1106
  _class: Expressir::Model::Literals::Logical
1107
1107
  value: :TRUE
@@ -1114,10 +1114,10 @@ schemas:
1114
1114
  types:
1115
1115
  - _class: Expressir::Model::Type
1116
1116
  id: test
1117
- type:
1117
+ underlying_type:
1118
1118
  _class: Expressir::Model::Types::Boolean
1119
- where:
1120
- - _class: Expressir::Model::Where
1119
+ where_rules:
1120
+ - _class: Expressir::Model::WhereRule
1121
1121
  expression:
1122
1122
  _class: Expressir::Model::Literals::Logical
1123
1123
  value: :TRUE
@@ -1135,8 +1135,8 @@ schemas:
1135
1135
  expression:
1136
1136
  _class: Expressir::Model::Literals::Logical
1137
1137
  value: :TRUE
1138
- where:
1139
- - _class: Expressir::Model::Where
1138
+ where_rules:
1139
+ - _class: Expressir::Model::WhereRule
1140
1140
  expression:
1141
1141
  _class: Expressir::Model::Literals::Logical
1142
1142
  value: :TRUE
@@ -1161,8 +1161,8 @@ schemas:
1161
1161
  expression:
1162
1162
  _class: Expressir::Model::Literals::Logical
1163
1163
  value: :TRUE
1164
- where:
1165
- - _class: Expressir::Model::Where
1164
+ where_rules:
1165
+ - _class: Expressir::Model::WhereRule
1166
1166
  expression:
1167
1167
  _class: Expressir::Model::Literals::Logical
1168
1168
  value: :TRUE
@@ -1177,8 +1177,8 @@ schemas:
1177
1177
  id: test
1178
1178
  type:
1179
1179
  _class: Expressir::Model::Types::Boolean
1180
- where:
1181
- - _class: Expressir::Model::Where
1180
+ where_rules:
1181
+ - _class: Expressir::Model::WhereRule
1182
1182
  expression:
1183
1183
  _class: Expressir::Model::Literals::Logical
1184
1184
  value: :TRUE
@@ -1197,8 +1197,8 @@ schemas:
1197
1197
  id: test2
1198
1198
  type:
1199
1199
  _class: Expressir::Model::Types::Boolean
1200
- where:
1201
- - _class: Expressir::Model::Where
1200
+ where_rules:
1201
+ - _class: Expressir::Model::WhereRule
1202
1202
  expression:
1203
1203
  _class: Expressir::Model::Literals::Logical
1204
1204
  value: :TRUE
@@ -1217,8 +1217,8 @@ schemas:
1217
1217
  id: test2
1218
1218
  type:
1219
1219
  _class: Expressir::Model::Types::Boolean
1220
- where:
1221
- - _class: Expressir::Model::Where
1220
+ where_rules:
1221
+ - _class: Expressir::Model::WhereRule
1222
1222
  expression:
1223
1223
  _class: Expressir::Model::Literals::Logical
1224
1224
  value: :TRUE
@@ -1236,8 +1236,8 @@ schemas:
1236
1236
  expression:
1237
1237
  _class: Expressir::Model::Literals::Logical
1238
1238
  value: :TRUE
1239
- where:
1240
- - _class: Expressir::Model::Where
1239
+ where_rules:
1240
+ - _class: Expressir::Model::WhereRule
1241
1241
  expression:
1242
1242
  _class: Expressir::Model::Literals::Logical
1243
1243
  value: :TRUE
@@ -1262,8 +1262,8 @@ schemas:
1262
1262
  expression:
1263
1263
  _class: Expressir::Model::Literals::Logical
1264
1264
  value: :TRUE
1265
- where:
1266
- - _class: Expressir::Model::Where
1265
+ where_rules:
1266
+ - _class: Expressir::Model::WhereRule
1267
1267
  expression:
1268
1268
  _class: Expressir::Model::Literals::Logical
1269
1269
  value: :TRUE
@@ -1288,8 +1288,8 @@ schemas:
1288
1288
  expression:
1289
1289
  _class: Expressir::Model::Literals::Logical
1290
1290
  value: :TRUE
1291
- where:
1292
- - _class: Expressir::Model::Where
1291
+ where_rules:
1292
+ - _class: Expressir::Model::WhereRule
1293
1293
  expression:
1294
1294
  _class: Expressir::Model::Literals::Logical
1295
1295
  value: :TRUE
@@ -1301,8 +1301,8 @@ schemas:
1301
1301
  base_path: syntax_schema.empty_entity
1302
1302
  statements:
1303
1303
  - _class: Expressir::Model::Statements::Null
1304
- where:
1305
- - _class: Expressir::Model::Where
1304
+ where_rules:
1305
+ - _class: Expressir::Model::WhereRule
1306
1306
  expression:
1307
1307
  _class: Expressir::Model::Literals::Logical
1308
1308
  value: :TRUE
@@ -1312,8 +1312,8 @@ schemas:
1312
1312
  - _class: Expressir::Model::Expressions::SimpleReference
1313
1313
  id: empty_entity
1314
1314
  base_path: syntax_schema.empty_entity
1315
- where:
1316
- - _class: Expressir::Model::Where
1315
+ where_rules:
1316
+ - _class: Expressir::Model::WhereRule
1317
1317
  id: WR1
1318
1318
  expression:
1319
1319
  _class: Expressir::Model::Literals::Logical
@@ -1400,7 +1400,7 @@ schemas:
1400
1400
  types:
1401
1401
  - _class: Expressir::Model::Type
1402
1402
  id: test
1403
- type:
1403
+ underlying_type:
1404
1404
  _class: Expressir::Model::Types::Boolean
1405
1405
  - _class: Expressir::Model::Procedure
1406
1406
  id: constant_procedure
@@ -1927,18 +1927,18 @@ schemas:
1927
1927
  types:
1928
1928
  - _class: Expressir::Model::Type
1929
1929
  id: binary_type
1930
- type:
1930
+ underlying_type:
1931
1931
  _class: Expressir::Model::Types::Binary
1932
1932
  - _class: Expressir::Model::Type
1933
1933
  id: binary_width_type
1934
- type:
1934
+ underlying_type:
1935
1935
  _class: Expressir::Model::Types::Binary
1936
1936
  width:
1937
1937
  _class: Expressir::Model::Literals::Integer
1938
1938
  value: '3'
1939
1939
  - _class: Expressir::Model::Type
1940
1940
  id: binary_width_fixed_type
1941
- type:
1941
+ underlying_type:
1942
1942
  _class: Expressir::Model::Types::Binary
1943
1943
  width:
1944
1944
  _class: Expressir::Model::Literals::Integer
@@ -1946,45 +1946,45 @@ schemas:
1946
1946
  fixed: true
1947
1947
  - _class: Expressir::Model::Type
1948
1948
  id: boolean_type
1949
- type:
1949
+ underlying_type:
1950
1950
  _class: Expressir::Model::Types::Boolean
1951
1951
  - _class: Expressir::Model::Type
1952
1952
  id: integer_type
1953
- type:
1953
+ underlying_type:
1954
1954
  _class: Expressir::Model::Types::Integer
1955
1955
  - _class: Expressir::Model::Type
1956
1956
  id: logical_type
1957
- type:
1957
+ underlying_type:
1958
1958
  _class: Expressir::Model::Types::Logical
1959
1959
  - _class: Expressir::Model::Type
1960
1960
  id: number_type
1961
- type:
1961
+ underlying_type:
1962
1962
  _class: Expressir::Model::Types::Number
1963
1963
  - _class: Expressir::Model::Type
1964
1964
  id: real_type
1965
- type:
1965
+ underlying_type:
1966
1966
  _class: Expressir::Model::Types::Real
1967
1967
  - _class: Expressir::Model::Type
1968
1968
  id: real_precision_type
1969
- type:
1969
+ underlying_type:
1970
1970
  _class: Expressir::Model::Types::Real
1971
1971
  precision:
1972
1972
  _class: Expressir::Model::Literals::Integer
1973
1973
  value: '3'
1974
1974
  - _class: Expressir::Model::Type
1975
1975
  id: string_type
1976
- type:
1976
+ underlying_type:
1977
1977
  _class: Expressir::Model::Types::String
1978
1978
  - _class: Expressir::Model::Type
1979
1979
  id: string_width_type
1980
- type:
1980
+ underlying_type:
1981
1981
  _class: Expressir::Model::Types::String
1982
1982
  width:
1983
1983
  _class: Expressir::Model::Literals::Integer
1984
1984
  value: '3'
1985
1985
  - _class: Expressir::Model::Type
1986
1986
  id: string_width_fixed_type
1987
- type:
1987
+ underlying_type:
1988
1988
  _class: Expressir::Model::Types::String
1989
1989
  width:
1990
1990
  _class: Expressir::Model::Literals::Integer
@@ -1992,7 +1992,7 @@ schemas:
1992
1992
  fixed: true
1993
1993
  - _class: Expressir::Model::Type
1994
1994
  id: array_type
1995
- type:
1995
+ underlying_type:
1996
1996
  _class: Expressir::Model::Types::Array
1997
1997
  bound1:
1998
1998
  _class: Expressir::Model::Literals::Integer
@@ -2004,7 +2004,7 @@ schemas:
2004
2004
  _class: Expressir::Model::Types::String
2005
2005
  - _class: Expressir::Model::Type
2006
2006
  id: array_optional_type
2007
- type:
2007
+ underlying_type:
2008
2008
  _class: Expressir::Model::Types::Array
2009
2009
  bound1:
2010
2010
  _class: Expressir::Model::Literals::Integer
@@ -2017,7 +2017,7 @@ schemas:
2017
2017
  _class: Expressir::Model::Types::String
2018
2018
  - _class: Expressir::Model::Type
2019
2019
  id: array_unique_type
2020
- type:
2020
+ underlying_type:
2021
2021
  _class: Expressir::Model::Types::Array
2022
2022
  bound1:
2023
2023
  _class: Expressir::Model::Literals::Integer
@@ -2030,7 +2030,7 @@ schemas:
2030
2030
  _class: Expressir::Model::Types::String
2031
2031
  - _class: Expressir::Model::Type
2032
2032
  id: array_optional_unique_type
2033
- type:
2033
+ underlying_type:
2034
2034
  _class: Expressir::Model::Types::Array
2035
2035
  bound1:
2036
2036
  _class: Expressir::Model::Literals::Integer
@@ -2044,13 +2044,13 @@ schemas:
2044
2044
  _class: Expressir::Model::Types::String
2045
2045
  - _class: Expressir::Model::Type
2046
2046
  id: bag_type
2047
- type:
2047
+ underlying_type:
2048
2048
  _class: Expressir::Model::Types::Bag
2049
2049
  base_type:
2050
2050
  _class: Expressir::Model::Types::String
2051
2051
  - _class: Expressir::Model::Type
2052
2052
  id: bag_bound_type
2053
- type:
2053
+ underlying_type:
2054
2054
  _class: Expressir::Model::Types::Bag
2055
2055
  bound1:
2056
2056
  _class: Expressir::Model::Literals::Integer
@@ -2062,13 +2062,13 @@ schemas:
2062
2062
  _class: Expressir::Model::Types::String
2063
2063
  - _class: Expressir::Model::Type
2064
2064
  id: list_type
2065
- type:
2065
+ underlying_type:
2066
2066
  _class: Expressir::Model::Types::List
2067
2067
  base_type:
2068
2068
  _class: Expressir::Model::Types::String
2069
2069
  - _class: Expressir::Model::Type
2070
2070
  id: list_bound_type
2071
- type:
2071
+ underlying_type:
2072
2072
  _class: Expressir::Model::Types::List
2073
2073
  bound1:
2074
2074
  _class: Expressir::Model::Literals::Integer
@@ -2080,14 +2080,14 @@ schemas:
2080
2080
  _class: Expressir::Model::Types::String
2081
2081
  - _class: Expressir::Model::Type
2082
2082
  id: list_unique_type
2083
- type:
2083
+ underlying_type:
2084
2084
  _class: Expressir::Model::Types::List
2085
2085
  unique: true
2086
2086
  base_type:
2087
2087
  _class: Expressir::Model::Types::String
2088
2088
  - _class: Expressir::Model::Type
2089
2089
  id: list_bound_unique_type
2090
- type:
2090
+ underlying_type:
2091
2091
  _class: Expressir::Model::Types::List
2092
2092
  bound1:
2093
2093
  _class: Expressir::Model::Literals::Integer
@@ -2100,13 +2100,13 @@ schemas:
2100
2100
  _class: Expressir::Model::Types::String
2101
2101
  - _class: Expressir::Model::Type
2102
2102
  id: set_type
2103
- type:
2103
+ underlying_type:
2104
2104
  _class: Expressir::Model::Types::Set
2105
2105
  base_type:
2106
2106
  _class: Expressir::Model::Types::String
2107
2107
  - _class: Expressir::Model::Type
2108
2108
  id: set_bound_type
2109
- type:
2109
+ underlying_type:
2110
2110
  _class: Expressir::Model::Types::Set
2111
2111
  bound1:
2112
2112
  _class: Expressir::Model::Literals::Integer
@@ -2118,30 +2118,30 @@ schemas:
2118
2118
  _class: Expressir::Model::Types::String
2119
2119
  - _class: Expressir::Model::Type
2120
2120
  id: select_type
2121
- type:
2121
+ underlying_type:
2122
2122
  _class: Expressir::Model::Types::Select
2123
2123
  - _class: Expressir::Model::Type
2124
2124
  id: select_extensible_type
2125
- type:
2125
+ underlying_type:
2126
2126
  _class: Expressir::Model::Types::Select
2127
2127
  extensible: true
2128
2128
  - _class: Expressir::Model::Type
2129
2129
  id: select_extensible_generic_entity_type
2130
- type:
2130
+ underlying_type:
2131
2131
  _class: Expressir::Model::Types::Select
2132
2132
  extensible: true
2133
2133
  generic_entity: true
2134
2134
  - _class: Expressir::Model::Type
2135
- id: select_list_type
2136
- type:
2135
+ id: select_item_type
2136
+ underlying_type:
2137
2137
  _class: Expressir::Model::Types::Select
2138
2138
  items:
2139
2139
  - _class: Expressir::Model::Expressions::SimpleReference
2140
2140
  id: empty_type
2141
2141
  base_path: syntax_schema.empty_type
2142
2142
  - _class: Expressir::Model::Type
2143
- id: select_list_multiple_type
2144
- type:
2143
+ id: select_multiple_item_type
2144
+ underlying_type:
2145
2145
  _class: Expressir::Model::Types::Select
2146
2146
  items:
2147
2147
  - _class: Expressir::Model::Expressions::SimpleReference
@@ -2151,34 +2151,34 @@ schemas:
2151
2151
  id: empty_type
2152
2152
  base_path: syntax_schema.empty_type
2153
2153
  - _class: Expressir::Model::Type
2154
- id: select_extension_type_ref_type
2155
- type:
2154
+ id: select_based_on_type
2155
+ underlying_type:
2156
2156
  _class: Expressir::Model::Types::Select
2157
- extension_type:
2157
+ based_on:
2158
2158
  _class: Expressir::Model::Expressions::SimpleReference
2159
2159
  id: select_type
2160
2160
  base_path: syntax_schema.types.select_type
2161
2161
  - _class: Expressir::Model::Type
2162
- id: select_extension_type_ref_list_type
2163
- type:
2162
+ id: select_based_on_item_type
2163
+ underlying_type:
2164
2164
  _class: Expressir::Model::Types::Select
2165
- extension_type:
2165
+ based_on:
2166
2166
  _class: Expressir::Model::Expressions::SimpleReference
2167
2167
  id: select_type
2168
2168
  base_path: syntax_schema.types.select_type
2169
- extension_items:
2169
+ items:
2170
2170
  - _class: Expressir::Model::Expressions::SimpleReference
2171
2171
  id: empty_type
2172
2172
  base_path: syntax_schema.empty_type
2173
2173
  - _class: Expressir::Model::Type
2174
- id: select_extension_type_ref_list_multiple_type
2175
- type:
2174
+ id: select_based_on_multiple_item_type
2175
+ underlying_type:
2176
2176
  _class: Expressir::Model::Types::Select
2177
- extension_type:
2177
+ based_on:
2178
2178
  _class: Expressir::Model::Expressions::SimpleReference
2179
2179
  id: select_type
2180
2180
  base_path: syntax_schema.types.select_type
2181
- extension_items:
2181
+ items:
2182
2182
  - _class: Expressir::Model::Expressions::SimpleReference
2183
2183
  id: empty_type
2184
2184
  base_path: syntax_schema.empty_type
@@ -2187,23 +2187,23 @@ schemas:
2187
2187
  base_path: syntax_schema.empty_type
2188
2188
  - _class: Expressir::Model::Type
2189
2189
  id: enumeration_type
2190
- type:
2190
+ underlying_type:
2191
2191
  _class: Expressir::Model::Types::Enumeration
2192
2192
  - _class: Expressir::Model::Type
2193
2193
  id: enumeration_extensible_type
2194
- type:
2194
+ underlying_type:
2195
2195
  _class: Expressir::Model::Types::Enumeration
2196
2196
  extensible: true
2197
2197
  - _class: Expressir::Model::Type
2198
- id: enumeration_list_type
2199
- type:
2198
+ id: enumeration_item_type
2199
+ underlying_type:
2200
2200
  _class: Expressir::Model::Types::Enumeration
2201
2201
  items:
2202
2202
  - _class: Expressir::Model::EnumerationItem
2203
2203
  id: test
2204
2204
  - _class: Expressir::Model::Type
2205
- id: enumeration_list_multiple_type
2206
- type:
2205
+ id: enumeration_multiple_item_type
2206
+ underlying_type:
2207
2207
  _class: Expressir::Model::Types::Enumeration
2208
2208
  items:
2209
2209
  - _class: Expressir::Model::EnumerationItem
@@ -2211,33 +2211,33 @@ schemas:
2211
2211
  - _class: Expressir::Model::EnumerationItem
2212
2212
  id: test2
2213
2213
  - _class: Expressir::Model::Type
2214
- id: enumeration_extension_type_ref_type
2215
- type:
2214
+ id: enumeration_based_on_type
2215
+ underlying_type:
2216
2216
  _class: Expressir::Model::Types::Enumeration
2217
- extension_type:
2217
+ based_on:
2218
2218
  _class: Expressir::Model::Expressions::SimpleReference
2219
2219
  id: enumeration_type
2220
2220
  base_path: syntax_schema.types.enumeration_type
2221
2221
  - _class: Expressir::Model::Type
2222
- id: enumeration_extension_type_ref_list_type
2223
- type:
2222
+ id: enumeration_based_on_item_type
2223
+ underlying_type:
2224
2224
  _class: Expressir::Model::Types::Enumeration
2225
- extension_type:
2225
+ based_on:
2226
2226
  _class: Expressir::Model::Expressions::SimpleReference
2227
2227
  id: enumeration_type
2228
2228
  base_path: syntax_schema.types.enumeration_type
2229
- extension_items:
2229
+ items:
2230
2230
  - _class: Expressir::Model::EnumerationItem
2231
2231
  id: test
2232
2232
  - _class: Expressir::Model::Type
2233
- id: enumeration_extension_type_ref_list_multiple_type
2234
- type:
2233
+ id: enumeration_based_on_multiple_item_type
2234
+ underlying_type:
2235
2235
  _class: Expressir::Model::Types::Enumeration
2236
- extension_type:
2236
+ based_on:
2237
2237
  _class: Expressir::Model::Expressions::SimpleReference
2238
2238
  id: enumeration_type
2239
2239
  base_path: syntax_schema.types.enumeration_type
2240
- extension_items:
2240
+ items:
2241
2241
  - _class: Expressir::Model::EnumerationItem
2242
2242
  id: test
2243
2243
  - _class: Expressir::Model::EnumerationItem