expressir 0.2.3 → 0.2.4

data/spec/expressir/express_exp/ap233_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require_relative "../../../lib/expressir/express_exp/parser"
+require "expressir/express_exp/parser"
 
 RSpec.describe Expressir::ExpressExp::Parser do
   describe ".from_file" do

data/spec/expressir/express_exp/parse_syntax_spec.rb

@@ -171,8 +171,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -181,8 +181,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].optional).to eq(true)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
@@ -192,12 +192,12 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(2)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.attributes[1]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[1].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[1].id).to eq("test2")
+        expect(x.attributes[1].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[1].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -206,12 +206,12 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(2)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.attributes[1]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[1].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[1].id).to eq("test2")
+        expect(x.attributes[1].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[1].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -237,6 +237,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
+        expect(x.attributes[0].id).to eq("test2")
         expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].supertype_attribute).to be_instance_of(Expressir::Model::Expressions::AttributeReference)
         expect(x.attributes[0].supertype_attribute.ref).to be_instance_of(Expressir::Model::Expressions::GroupReference)
@@ -246,7 +247,6 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes[0].supertype_attribute.ref.entity.id).to eq("attribute_entity")
         expect(x.attributes[0].supertype_attribute.attribute).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].supertype_attribute.attribute.id).to eq("test")
-        expect(x.attributes[0].id).to eq("test2")
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -255,8 +255,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::DERIVED)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::DERIVED)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.attributes[0].expression).to be_instance_of(Expressir::Model::Literals::Logical)
         expect(x.attributes[0].expression.value).to eq(Expressir::Model::Literals::Logical::TRUE)
@@ -286,6 +286,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
+        expect(x.attributes[0].id).to eq("test2")
         expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::DERIVED)
         expect(x.attributes[0].supertype_attribute).to be_instance_of(Expressir::Model::Expressions::AttributeReference)
         expect(x.attributes[0].supertype_attribute.ref).to be_instance_of(Expressir::Model::Expressions::GroupReference)
@@ -295,7 +296,6 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes[0].supertype_attribute.ref.entity.id).to eq("attribute_entity")
         expect(x.attributes[0].supertype_attribute.attribute).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].supertype_attribute.attribute.id).to eq("test")
-        expect(x.attributes[0].id).to eq("test2")
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.attributes[0].expression).to be_instance_of(Expressir::Model::Literals::Logical)
         expect(x.attributes[0].expression.value).to eq(Expressir::Model::Literals::Logical::TRUE)
@@ -306,8 +306,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].type.id).to eq("attribute_entity")
         expect(x.attributes[0].expression).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
@@ -319,8 +319,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].type.id).to eq("attribute_entity")
         expect(x.attributes[0].expression).to be_instance_of(Expressir::Model::Expressions::AttributeReference)
@@ -335,8 +335,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Set)
         expect(x.attributes[0].type.base_type).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].type.base_type.id).to eq("attribute_entity")
@@ -349,8 +349,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Set)
         expect(x.attributes[0].type.bound1).to be_instance_of(Expressir::Model::Literals::Integer)
         expect(x.attributes[0].type.bound1.value).to eq("1")
@@ -367,8 +367,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Bag)
         expect(x.attributes[0].type.base_type).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].type.base_type.id).to eq("attribute_entity")
@@ -381,8 +381,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Bag)
         expect(x.attributes[0].type.bound1).to be_instance_of(Expressir::Model::Literals::Integer)
         expect(x.attributes[0].type.bound1.value).to eq("1")
@@ -419,6 +419,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
+        expect(x.attributes[0].id).to eq("test2")
         expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::INVERSE)
         expect(x.attributes[0].supertype_attribute).to be_instance_of(Expressir::Model::Expressions::AttributeReference)
         expect(x.attributes[0].supertype_attribute.ref).to be_instance_of(Expressir::Model::Expressions::GroupReference)
@@ -428,7 +429,6 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes[0].supertype_attribute.ref.entity.id).to eq("attribute_entity")
         expect(x.attributes[0].supertype_attribute.attribute).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].supertype_attribute.attribute.id).to eq("test")
-        expect(x.attributes[0].id).to eq("test2")
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
         expect(x.attributes[0].type.id).to eq("attribute_entity")
         expect(x.attributes[0].expression).to be_instance_of(Expressir::Model::Expressions::SimpleReference)
@@ -440,8 +440,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.unique).to be_instance_of(Array)
         expect(x.unique.count).to eq(1)
@@ -457,8 +457,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.attributes).to be_instance_of(Array)
         expect(x.attributes.count).to eq(1)
         expect(x.attributes[0]).to be_instance_of(Expressir::Model::Attribute)
-        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].id).to eq("test")
+        expect(x.attributes[0].kind).to eq(Expressir::Model::Attribute::EXPLICIT)
         expect(x.attributes[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.unique).to be_instance_of(Array)
         expect(x.unique.count).to eq(1)
@@ -1011,8 +1011,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.parameters).to be_instance_of(Array)
         expect(x.parameters.count).to eq(1)
         expect(x.parameters[0]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].id).to eq("test")
+        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -1021,12 +1021,12 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.parameters).to be_instance_of(Array)
         expect(x.parameters.count).to eq(2)
         expect(x.parameters[0]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].id).to eq("test")
+        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.parameters[1]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[1].var).not_to eq(true)
         expect(x.parameters[1].id).to eq("test2")
+        expect(x.parameters[1].var).not_to eq(true)
         expect(x.parameters[1].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -1035,12 +1035,12 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.parameters).to be_instance_of(Array)
         expect(x.parameters.count).to eq(2)
         expect(x.parameters[0]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].id).to eq("test")
+        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.parameters[1]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[1].var).not_to eq(true)
         expect(x.parameters[1].id).to eq("test2")
+        expect(x.parameters[1].var).not_to eq(true)
         expect(x.parameters[1].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -1049,8 +1049,8 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.parameters).to be_instance_of(Array)
         expect(x.parameters.count).to eq(1)
         expect(x.parameters[0]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[0].var).to eq(true)
         expect(x.parameters[0].id).to eq("test")
+        expect(x.parameters[0].var).to eq(true)
         expect(x.parameters[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -1059,12 +1059,12 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.parameters).to be_instance_of(Array)
         expect(x.parameters.count).to eq(2)
         expect(x.parameters[0]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[0].var).to eq(true)
         expect(x.parameters[0].id).to eq("test")
+        expect(x.parameters[0].var).to eq(true)
         expect(x.parameters[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.parameters[1]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[1].var).not_to eq(true)
         expect(x.parameters[1].id).to eq("test2")
+        expect(x.parameters[1].var).not_to eq(true)
         expect(x.parameters[1].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -1073,12 +1073,12 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.parameters).to be_instance_of(Array)
         expect(x.parameters.count).to eq(2)
         expect(x.parameters[0]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].id).to eq("test")
+        expect(x.parameters[0].var).not_to eq(true)
         expect(x.parameters[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.parameters[1]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[1].var).to eq(true)
         expect(x.parameters[1].id).to eq("test2")
+        expect(x.parameters[1].var).to eq(true)
         expect(x.parameters[1].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 
@@ -1087,12 +1087,12 @@ RSpec.describe Expressir::ExpressExp::Parser do
         expect(x.parameters).to be_instance_of(Array)
         expect(x.parameters.count).to eq(2)
         expect(x.parameters[0]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[0].var).to eq(true)
         expect(x.parameters[0].id).to eq("test")
+        expect(x.parameters[0].var).to eq(true)
         expect(x.parameters[0].type).to be_instance_of(Expressir::Model::Types::Boolean)
         expect(x.parameters[1]).to be_instance_of(Expressir::Model::Parameter)
-        expect(x.parameters[1].var).to eq(true)
         expect(x.parameters[1].id).to eq("test2")
+        expect(x.parameters[1].var).to eq(true)
         expect(x.parameters[1].type).to be_instance_of(Expressir::Model::Types::Boolean)
       end
 

data/spec/expressir/model/find_spec.rb

@@ -0,0 +1,110 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::Model do
+  describe ".find" do
+    it "finds an object" do
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_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_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.remark_unique')).to be_instance_of(Expressir::Model::Unique)
+      expect(repo.find('remark_schema.remark_entity.remark_where')).to be_instance_of(Expressir::Model::Where)
+      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.remark_where')).to be_instance_of(Expressir::Model::Where)
+
+      # 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_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.remark_unique')).to be_instance_of(Expressir::Model::Unique)
+      expect(schema.find('remark_entity.remark_where')).to be_instance_of(Expressir::Model::Where)
+      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.remark_where')).to be_instance_of(Expressir::Model::Where)
+
+      # 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('remark_unique')).to be_instance_of(Expressir::Model::Unique)
+      expect(entity.find('remark_where')).to be_instance_of(Expressir::Model::Where)
+
+      # 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)
+
+      # 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)
+
+      # 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('remark_where')).to be_instance_of(Expressir::Model::Where)
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "remark.exp"
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,19 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: antlr4-runtime
+  name: rice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: antlr4-native
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -113,13 +141,14 @@ email:
 - open.source@ribose.com'
 executables:
 - expressir
-extensions: []
+extensions:
+- ext/express-parser/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
@@ -131,8 +160,26 @@ files:
 - demo.rb
 - docs/development.md
 - exe/expressir
+- exe/generate-parser
 - expressir.gemspec
-- generate-parser.sh
+- ext/express-parser/antlrgen/Express.interp
+- ext/express-parser/antlrgen/Express.tokens
+- ext/express-parser/antlrgen/ExpressBaseListener.cpp
+- ext/express-parser/antlrgen/ExpressBaseListener.h
+- ext/express-parser/antlrgen/ExpressBaseVisitor.cpp
+- ext/express-parser/antlrgen/ExpressBaseVisitor.h
+- ext/express-parser/antlrgen/ExpressLexer.cpp
+- ext/express-parser/antlrgen/ExpressLexer.h
+- ext/express-parser/antlrgen/ExpressLexer.interp
+- ext/express-parser/antlrgen/ExpressLexer.tokens
+- ext/express-parser/antlrgen/ExpressListener.cpp
+- ext/express-parser/antlrgen/ExpressListener.h
+- ext/express-parser/antlrgen/ExpressParser.cpp
+- ext/express-parser/antlrgen/ExpressParser.h
+- ext/express-parser/antlrgen/ExpressVisitor.cpp
+- ext/express-parser/antlrgen/ExpressVisitor.h
+- ext/express-parser/express_parser.cpp
+- ext/express-parser/extconf.rb
 - lib/expressir.rb
 - lib/expressir/cli.rb
 - lib/expressir/cli/ui.rb
@@ -167,10 +214,6 @@ files:
 - lib/expressir/express/unique_rule.rb
 - lib/expressir/express/where_rule.rb
 - lib/expressir/express_exp/formatter.rb
-- lib/expressir/express_exp/generated/ExpressBaseVisitor.rb
-- lib/expressir/express_exp/generated/ExpressLexer.rb
-- lib/expressir/express_exp/generated/ExpressParser.rb
-- lib/expressir/express_exp/generated/ExpressVisitor.rb
 - lib/expressir/express_exp/parser.rb
 - lib/expressir/express_exp/visitor.rb
 - lib/expressir/express_parser.rb
@@ -192,6 +235,7 @@ files:
 - lib/expressir/model/expressions/simple_reference.rb
 - lib/expressir/model/expressions/unary_expression.rb
 - lib/expressir/model/function.rb
+- lib/expressir/model/identifier.rb
 - lib/expressir/model/interface.rb
 - lib/expressir/model/literals/binary.rb
 - lib/expressir/model/literals/integer.rb
@@ -204,6 +248,7 @@ files:
 - lib/expressir/model/repository.rb
 - lib/expressir/model/rule.rb
 - lib/expressir/model/schema.rb
+- lib/expressir/model/scope.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
 - lib/expressir/model/statements/call.rb
@@ -288,6 +333,7 @@ files:
 - spec/expressir/express_exp/format_syntax_spec.rb
 - spec/expressir/express_exp/parse_remark_spec.rb
 - spec/expressir/express_exp/parse_syntax_spec.rb
+- spec/expressir/model/find_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb
@@ -313,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.