expressir 1.0.0 → 1.1.0

data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb

@@ -0,0 +1,19 @@
+module Expressir
+  module Model
+    module SupertypeExpressions
+      # Specified in ISO 10303-11:2004
+      # - section 9.2.5.2 ONEOF
+      class OneofSupertypeExpression < SupertypeExpression
+        model_attr_accessor :operands, 'Array<SupertypeExpression>'
+
+        # @param [Hash] options
+        # @option options [Array<SupertypeExpression>] :operands
+        def initialize(options = {})
+          @operands = options[:operands]
+
+          super
+        end
+      end
+    end
+  end
+end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/spec/expressir/model/model_element_spec.rb

@@ -77,12 +77,12 @@ RSpec.describe Expressir::Model::ModelElement do
       repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
-      expect(repo.find('single_schema')).to be_instance_of(Expressir::Model::Schema)
-      expect(repo.find('single_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('single_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
+      expect(repo.find('single_schema.empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
 
       # schema scope
       schema = repo.schemas.first
-      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
     end
 
     it "finds an object (multiple.exp)" do
@@ -91,20 +91,20 @@ RSpec.describe Expressir::Model::ModelElement do
       repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
-      expect(repo.find('multiple_schema')).to be_instance_of(Expressir::Model::Schema)
-      expect(repo.find('multiple_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
-      expect(repo.find('multiple_schema.attribute_entity')).to be_instance_of(Expressir::Model::Entity)
-      expect(repo.find('multiple_schema.attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
-      expect(repo.find('multiple_schema.attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
-      expect(repo.find('multiple_schema.attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
+      expect(repo.find('multiple_schema.empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(repo.find('multiple_schema.attribute_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(repo.find('multiple_schema.attribute_entity2')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(repo.find('multiple_schema.attribute_entity3')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(repo.find('multiple_schema.attribute_entity4')).to be_instance_of(Expressir::Model::Declarations::Entity)
 
       # schema scope
       schema = repo.schemas.first
-      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
-      expect(schema.find('attribute_entity')).to be_instance_of(Expressir::Model::Entity)
-      expect(schema.find('attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
-      expect(schema.find('attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
-      expect(schema.find('attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(schema.find('attribute_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(schema.find('attribute_entity2')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(schema.find('attribute_entity3')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(schema.find('attribute_entity4')).to be_instance_of(Expressir::Model::Declarations::Entity)
     end
 
     it "finds an object (syntax.exp)" do
@@ -113,12 +113,12 @@ RSpec.describe Expressir::Model::ModelElement do
       repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
-      expect(repo.find('syntax_schema')).to be_instance_of(Expressir::Model::Schema)
-      expect(repo.find('syntax_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('syntax_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
+      expect(repo.find('syntax_schema.empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
 
       # schema scope
       schema = repo.schemas.first
-      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
     end
 
     it "finds an object (remark.exp)" do
@@ -127,140 +127,140 @@ RSpec.describe Expressir::Model::ModelElement do
       repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
-      expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Schema)
-      expect(repo.find('remark_schema.remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(repo.find('remark_schema.remark_entity')).to be_instance_of(Expressir::Model::Entity)
-      expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(repo.find('remark_schema.remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(repo.find('remark_schema.remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::UniqueRule)
-      expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
-      expect(repo.find('remark_schema.remark_function')).to be_instance_of(Expressir::Model::Function)
-      expect(repo.find('remark_schema.remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
-      expect(repo.find('remark_schema.remark_function.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(repo.find('remark_schema.remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(repo.find('remark_schema.remark_function.remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(repo.find('remark_schema.remark_function.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(repo.find('remark_schema.remark_procedure')).to be_instance_of(Expressir::Model::Procedure)
-      expect(repo.find('remark_schema.remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
-      expect(repo.find('remark_schema.remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(repo.find('remark_schema.remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(repo.find('remark_schema.remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(repo.find('remark_schema.remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(repo.find('remark_schema.remark_rule')).to be_instance_of(Expressir::Model::Rule)
-      expect(repo.find('remark_schema.remark_rule.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(repo.find('remark_schema.remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(repo.find('remark_schema.remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(repo.find('remark_schema.remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Declarations::Schema)
+      expect(repo.find('remark_schema.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(repo.find('remark_schema.remark_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(repo.find('remark_schema.remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(repo.find('remark_schema.remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::Declarations::UniqueRule)
+      expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::Declarations::SubtypeConstraint)
+      expect(repo.find('remark_schema.remark_function')).to be_instance_of(Expressir::Model::Declarations::Function)
+      expect(repo.find('remark_schema.remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
+      expect(repo.find('remark_schema.remark_function.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(repo.find('remark_schema.remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(repo.find('remark_schema.remark_function.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(repo.find('remark_schema.remark_function.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
+      expect(repo.find('remark_schema.remark_procedure')).to be_instance_of(Expressir::Model::Declarations::Procedure)
+      expect(repo.find('remark_schema.remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
+      expect(repo.find('remark_schema.remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(repo.find('remark_schema.remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(repo.find('remark_schema.remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(repo.find('remark_schema.remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
+      expect(repo.find('remark_schema.remark_rule')).to be_instance_of(Expressir::Model::Declarations::Rule)
+      expect(repo.find('remark_schema.remark_rule.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(repo.find('remark_schema.remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(repo.find('remark_schema.remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
+      expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(repo.find('remark_schema.remark_item')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
 
       # schema scope
       schema = repo.schemas.first
-      expect(schema.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(schema.find('remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(schema.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(schema.find('remark_entity')).to be_instance_of(Expressir::Model::Entity)
-      expect(schema.find('remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(schema.find('remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(schema.find('remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::UniqueRule)
-      expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
-      expect(schema.find('remark_function')).to be_instance_of(Expressir::Model::Function)
-      expect(schema.find('remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
-      expect(schema.find('remark_function.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(schema.find('remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(schema.find('remark_function.remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(schema.find('remark_function.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(schema.find('remark_procedure')).to be_instance_of(Expressir::Model::Procedure)
-      expect(schema.find('remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
-      expect(schema.find('remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(schema.find('remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(schema.find('remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(schema.find('remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(schema.find('remark_rule')).to be_instance_of(Expressir::Model::Rule)
-      expect(schema.find('remark_rule.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(schema.find('remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(schema.find('remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(schema.find('remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(schema.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(schema.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(schema.find('remark_entity')).to be_instance_of(Expressir::Model::Declarations::Entity)
+      expect(schema.find('remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(schema.find('remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(schema.find('remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::Declarations::UniqueRule)
+      expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::Declarations::SubtypeConstraint)
+      expect(schema.find('remark_function')).to be_instance_of(Expressir::Model::Declarations::Function)
+      expect(schema.find('remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
+      expect(schema.find('remark_function.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(schema.find('remark_function.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(schema.find('remark_function.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(schema.find('remark_function.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
+      expect(schema.find('remark_procedure')).to be_instance_of(Expressir::Model::Declarations::Procedure)
+      expect(schema.find('remark_procedure.remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
+      expect(schema.find('remark_procedure.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(schema.find('remark_procedure.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(schema.find('remark_procedure.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(schema.find('remark_procedure.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
+      expect(schema.find('remark_rule')).to be_instance_of(Expressir::Model::Declarations::Rule)
+      expect(schema.find('remark_rule.remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(schema.find('remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(schema.find('remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
+      expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(schema.find('remark_item')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
 
       # type scope
       type = schema.types.first
-      expect(type.find('WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(type.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(type.find('WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(type.find('IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
 
       # entity scope
       entity = schema.entities.first
-      expect(entity.find('remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(entity.find('remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(entity.find('remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(entity.find('UR1')).to be_instance_of(Expressir::Model::UniqueRule)
-      expect(entity.find('WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(entity.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(entity.find('remark_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(entity.find('remark_derived_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(entity.find('remark_inverse_attribute')).to be_instance_of(Expressir::Model::Declarations::Attribute)
+      expect(entity.find('UR1')).to be_instance_of(Expressir::Model::Declarations::UniqueRule)
+      expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(entity.find('IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
 
       # function scope
       function = schema.functions.first
-      expect(function.find('remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
-      expect(function.find('remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(function.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(function.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(function.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
+      expect(function.find('remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
+      expect(function.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(function.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(function.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(function.find('remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
 
       # procedure scope
       procedure = schema.procedures.first
-      expect(procedure.find('remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
-      expect(procedure.find('remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(procedure.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(procedure.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(procedure.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
+      expect(procedure.find('remark_parameter')).to be_instance_of(Expressir::Model::Declarations::Parameter)
+      expect(procedure.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(procedure.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(procedure.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(procedure.find('remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
 
       # rule scope
       rule = schema.rules.first
-      expect(rule.find('remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(rule.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
-      expect(rule.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
-      expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(rule.find('WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(rule.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(rule.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(rule.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::DataTypes::EnumerationItem)
+      expect(rule.find('remark_constant')).to be_instance_of(Expressir::Model::Declarations::Constant)
+      expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Declarations::Variable)
+      expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(rule.find('IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
 
       # retry search in parent scope
-      expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
-      expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
-      expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Declarations::Type)
+      expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Declarations::WhereRule)
+      expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+      expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
     end
   end
 end

data/spec/syntax/multiple.yaml

@@ -1,198 +1,198 @@
 ---
 _class: Expressir::Model::Repository
 schemas:
-- _class: Expressir::Model::Schema
+- _class: Expressir::Model::Declarations::Schema
   file: spec/syntax/multiple.exp
   id: multiple_schema
   interfaces:
-  - _class: Expressir::Model::Interface
+  - _class: Expressir::Model::Declarations::Interface
     kind: :REFERENCE
     schema:
-      _class: Expressir::Model::Expressions::SimpleReference
+      _class: Expressir::Model::References::SimpleReference
       id: multiple_schema2
       base_path: multiple_schema2
-  - _class: Expressir::Model::Interface
+  - _class: Expressir::Model::Declarations::Interface
     kind: :REFERENCE
     schema:
-      _class: Expressir::Model::Expressions::SimpleReference
+      _class: Expressir::Model::References::SimpleReference
       id: multiple_schema3
       base_path: multiple_schema3
     items:
-    - _class: Expressir::Model::InterfaceItem
+    - _class: Expressir::Model::Declarations::InterfaceItem
       ref:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: attribute_entity3
         base_path: multiple_schema3.attribute_entity3
-  - _class: Expressir::Model::Interface
+  - _class: Expressir::Model::Declarations::Interface
     kind: :REFERENCE
     schema:
-      _class: Expressir::Model::Expressions::SimpleReference
+      _class: Expressir::Model::References::SimpleReference
       id: multiple_schema4
       base_path: multiple_schema4
     items:
-    - _class: Expressir::Model::InterfaceItem
+    - _class: Expressir::Model::Declarations::InterfaceItem
       ref:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: attribute_entity
         base_path: multiple_schema4.attribute_entity
       id: attribute_entity4
   entities:
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: test
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: empty_entity
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: attribute_entity
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       id: test
       kind: :EXPLICIT
       type:
-        _class: Expressir::Model::Types::Boolean
-  - _class: Expressir::Model::Entity
+        _class: Expressir::Model::DataTypes::Boolean
+  - _class: Expressir::Model::Declarations::Entity
     id: subtype_empty_entity
     subtype_of:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: empty_entity
       base_path: multiple_schema.empty_entity
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: subtype_attribute_entity
     subtype_of:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: attribute_entity
       base_path: multiple_schema.attribute_entity
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       kind: :EXPLICIT
       supertype_attribute:
-        _class: Expressir::Model::Expressions::AttributeReference
+        _class: Expressir::Model::References::AttributeReference
         ref:
-          _class: Expressir::Model::Expressions::GroupReference
+          _class: Expressir::Model::References::GroupReference
           ref:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: SELF
           entity:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: attribute_entity
             base_path: multiple_schema.attribute_entity
         attribute:
-          _class: Expressir::Model::Expressions::SimpleReference
+          _class: Expressir::Model::References::SimpleReference
           id: test
       type:
-        _class: Expressir::Model::Types::Boolean
-  - _class: Expressir::Model::Entity
+        _class: Expressir::Model::DataTypes::Boolean
+  - _class: Expressir::Model::Declarations::Entity
     id: subtype_attribute_entity2
     subtype_of:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: attribute_entity2
       base_path: multiple_schema2.attribute_entity2
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       kind: :EXPLICIT
       supertype_attribute:
-        _class: Expressir::Model::Expressions::AttributeReference
+        _class: Expressir::Model::References::AttributeReference
         ref:
-          _class: Expressir::Model::Expressions::GroupReference
+          _class: Expressir::Model::References::GroupReference
           ref:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: SELF
           entity:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: attribute_entity2
             base_path: multiple_schema2.attribute_entity2
         attribute:
-          _class: Expressir::Model::Expressions::SimpleReference
+          _class: Expressir::Model::References::SimpleReference
           id: test
       type:
-        _class: Expressir::Model::Types::Boolean
-  - _class: Expressir::Model::Entity
+        _class: Expressir::Model::DataTypes::Boolean
+  - _class: Expressir::Model::Declarations::Entity
     id: subtype_attribute_entity3
     subtype_of:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: attribute_entity3
       base_path: multiple_schema3.attribute_entity3
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       kind: :EXPLICIT
       supertype_attribute:
-        _class: Expressir::Model::Expressions::AttributeReference
+        _class: Expressir::Model::References::AttributeReference
         ref:
-          _class: Expressir::Model::Expressions::GroupReference
+          _class: Expressir::Model::References::GroupReference
           ref:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: SELF
           entity:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: attribute_entity3
             base_path: multiple_schema3.attribute_entity3
         attribute:
-          _class: Expressir::Model::Expressions::SimpleReference
+          _class: Expressir::Model::References::SimpleReference
           id: test
       type:
-        _class: Expressir::Model::Types::Boolean
-  - _class: Expressir::Model::Entity
+        _class: Expressir::Model::DataTypes::Boolean
+  - _class: Expressir::Model::Declarations::Entity
     id: subtype_attribute_entity4
     subtype_of:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: attribute_entity4
       base_path: multiple_schema4.attribute_entity
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       kind: :EXPLICIT
       supertype_attribute:
-        _class: Expressir::Model::Expressions::AttributeReference
+        _class: Expressir::Model::References::AttributeReference
         ref:
-          _class: Expressir::Model::Expressions::GroupReference
+          _class: Expressir::Model::References::GroupReference
           ref:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: SELF
           entity:
-            _class: Expressir::Model::Expressions::SimpleReference
+            _class: Expressir::Model::References::SimpleReference
             id: attribute_entity4
             base_path: multiple_schema4.attribute_entity
         attribute:
-          _class: Expressir::Model::Expressions::SimpleReference
+          _class: Expressir::Model::References::SimpleReference
           id: test
       type:
-        _class: Expressir::Model::Types::Boolean
-  - _class: Expressir::Model::Entity
+        _class: Expressir::Model::DataTypes::Boolean
+  - _class: Expressir::Model::Declarations::Entity
     id: subtype_missing_entity
     subtype_of:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: missing_entity
-- _class: Expressir::Model::Schema
+- _class: Expressir::Model::Declarations::Schema
   file: spec/syntax/multiple.exp
   id: multiple_schema2
   entities:
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: attribute_entity2
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       id: test
       kind: :EXPLICIT
       type:
-        _class: Expressir::Model::Types::Boolean
-- _class: Expressir::Model::Schema
+        _class: Expressir::Model::DataTypes::Boolean
+- _class: Expressir::Model::Declarations::Schema
   file: spec/syntax/multiple.exp
   id: multiple_schema3
   entities:
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: attribute_entity3
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       id: test
       kind: :EXPLICIT
       type:
-        _class: Expressir::Model::Types::Boolean
-- _class: Expressir::Model::Schema
+        _class: Expressir::Model::DataTypes::Boolean
+- _class: Expressir::Model::Declarations::Schema
   file: spec/syntax/multiple.exp
   id: multiple_schema4
   entities:
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: attribute_entity
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       id: test
       kind: :EXPLICIT
       type:
-        _class: Expressir::Model::Types::Boolean
+        _class: Expressir::Model::DataTypes::Boolean