expressir 0.2.8 → 0.2.9

data/spec/expressir/express_exp/source_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Expressir::Model::Scope do
 
   def sample_file
     @sample_file ||= Expressir.root_path.join(
-      "original", "examples", "syntax", "syntax.exp"
+      "original", "examples", "syntax", "source.exp"
     )
   end
 end

data/spec/expressir/model/find_spec.rb

@@ -10,13 +10,16 @@ RSpec.describe Expressir::Model do
       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::Where)
+      expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
       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_entity.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_entity.wr:WR1')).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)
@@ -35,7 +38,8 @@ RSpec.describe Expressir::Model do
       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)
+      expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
 
       # schema scope
       schema = repo.schemas.first
@@ -47,7 +51,8 @@ RSpec.describe Expressir::Model do
       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_entity.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_entity.wr:WR1')).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)
@@ -66,7 +71,13 @@ RSpec.describe Expressir::Model do
       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)
+      expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+
+      # type scope
+      type = schema.types.first
+      expect(type.find('WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
 
       # entity scope
       entity = schema.entities.first
@@ -74,7 +85,8 @@ RSpec.describe Expressir::Model do
       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)
+      expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
 
       # function scope
       function = schema.functions.first
@@ -98,7 +110,8 @@ RSpec.describe Expressir::Model do
       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)
+      expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: antlr4-native
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -576,6 +576,7 @@ files:
 - lib/expressir/model/expressions/unary_expression.rb
 - lib/expressir/model/function.rb
 - lib/expressir/model/identifier.rb
+- lib/expressir/model/informal_proposition.rb
 - lib/expressir/model/interface.rb
 - lib/expressir/model/literals/binary.rb
 - lib/expressir/model/literals/integer.rb
@@ -656,6 +657,7 @@ files:
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xml
 - original/examples/syntax/remark.exp
 - original/examples/syntax/remark_formatted.exp
+- original/examples/syntax/source.exp
 - original/examples/syntax/syntax.exp
 - original/examples/syntax/syntax_formatted.exp
 - original/exp2ruby.rb
@@ -670,9 +672,10 @@ files:
 - spec/acceptance/version_spec.rb
 - spec/expressir/express/repository_spec.rb
 - spec/expressir/express_exp/ap233_spec.rb
-- spec/expressir/express_exp/find_spec.rb
 - spec/expressir/express_exp/format_remark_spec.rb
 - spec/expressir/express_exp/format_syntax_spec.rb
+- spec/expressir/express_exp/head_source_spec.rb
+- spec/expressir/express_exp/parse_multiple_spec.rb
 - spec/expressir/express_exp/parse_remark_spec.rb
 - spec/expressir/express_exp/parse_syntax_spec.rb
 - spec/expressir/express_exp/source_spec.rb

data/spec/expressir/express_exp/find_spec.rb

@@ -1,28 +0,0 @@
-require "spec_helper"
-require "expressir/express_exp/parser"
-
-RSpec.describe Expressir::Model::Scope do
-  describe ".find" do
-    it "finds an item" do
-      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
-
-      schema = repo.find("syntax_schema")
-      expect(schema).to be_instance_of(Expressir::Model::Schema)
-
-      entity = repo.find("syntax_schema.empty_entity")
-      expect(entity).to be_instance_of(Expressir::Model::Entity)
-
-      attribute = repo.find("syntax_schema.attribute_entity.test")
-      expect(attribute).to be_instance_of(Expressir::Model::Attribute)
-
-      where = repo.find("syntax_schema.where_label_entity.wr:WR1")
-      expect(where).to be_instance_of(Expressir::Model::Where)
-    end
-  end
-
-  def sample_file
-    @sample_file ||= Expressir.root_path.join(
-      "original", "examples", "syntax", "syntax.exp"
-    )
-  end
-end