expressir 0.2.4-x64-mingw32 → 0.2.10-x64-mingw32

data/spec/expressir/express_exp/source_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::ExpressExp::Parser do
+  describe ".source" do
+    it "contains original source" do
+      input = File.read(sample_file)
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+
+      schema = repo.schemas.first
+      start_index = input.index("SCHEMA")
+      stop_index = input.index("END_SCHEMA;") + "END_SCHEMA;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(schema.source).to eq(expected_result)
+
+      entity = schema.entities.first
+      start_index = input.index("ENTITY")
+      stop_index = input.index("END_ENTITY;") + "END_ENTITY;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(entity.source).to eq(expected_result)
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "source.exp"
+    )
+  end
+end

data/spec/expressir/model/model_element_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::Model::ModelElement do
+  describe ".from_hash" do
+    it "parses an object from hash" do
+      input = {
+        "_class" => "Expressir::Model::Repository",
+        "schemas" => [{
+          "_class" => "Expressir::Model::Schema",
+          "id" => "simple_schema",
+          "entities" => [{
+            "_class" => "Expressir::Model::Entity",
+            "id" => "empty_entity"
+          }]
+        }]
+      }
+
+      repo = Expressir::Model::ModelElement.from_hash(input)
+
+      expect(repo).to be_instance_of(Expressir::Model::Repository)
+      expect(repo.schemas).to be_instance_of(Array)
+      expect(repo.schemas.count).to eq(1)
+      expect(repo.schemas[0]).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.schemas[0].id).to eq("simple_schema")
+      expect(repo.schemas[0].entities).to be_instance_of(Array)
+      expect(repo.schemas[0].entities.count).to eq(1)
+      expect(repo.schemas[0].entities[0]).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.schemas[0].entities[0].id).to eq("empty_entity")
+    end
+  end
+
+  describe ".to_hash" do
+    it "exports an object to hash" do
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+
+      result = repo.to_hash
+      
+      expect(result).to be_instance_of(Hash)
+      expect(result["_class"]).to eq("Expressir::Model::Repository")
+      expect(result["schemas"]).to be_instance_of(Array)
+      expect(result["schemas"].count).to eq(1)
+      expect(result["schemas"][0]).to be_instance_of(Hash)
+      expect(result["schemas"][0]["_class"]).to eq("Expressir::Model::Schema")
+      expect(result["schemas"][0]["id"]).to eq("simple_schema")
+      expect(result["schemas"][0]["entities"]).to be_instance_of(Array)
+      expect(result["schemas"][0]["entities"].count).to eq(1)
+      expect(result["schemas"][0]["entities"][0]).to be_instance_of(Hash)
+      expect(result["schemas"][0]["entities"][0]["_class"]).to eq("Expressir::Model::Entity")
+      expect(result["schemas"][0]["entities"][0]["id"]).to eq("empty_entity")
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "simple.exp"
+    )
+  end
+end

data/spec/expressir/model/{find_spec.rb → scope_spec.rb}

@@ -1,110 +1,123 @@
-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
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::Model::Scope 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_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.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)
+      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::Where)
+      expect(repo.find('remark_schema.remark_rule.wr:WR1')).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.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)
+      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::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
+      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('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
+      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('WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(rule.find('wr:WR1')).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

data/spec/expressr_spec.rb

@@ -1,5 +1,5 @@
-RSpec.describe Expressir do
-  it "has a version number" do
-    expect(Expressir::VERSION).not_to be nil
-  end
-end
+RSpec.describe Expressir do
+  it "has a version number" do
+    expect(Expressir::VERSION).not_to be nil
+  end
+end

data/spec/spec_helper.rb

@@ -1,17 +1,17 @@
-require "bundler/setup"
-require "expressir"
-
-Dir["./spec/support/**/*.rb"].sort.each { |file| require file }
-
-RSpec.configure do |config|
-  # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
-  config.include Expressir::ConsoleHelper
-
-  # Disable RSpec exposing methods globally on `Module` and `main`
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end
+require "bundler/setup"
+require "expressir"
+
+Dir["./spec/support/**/*.rb"].sort.each { |file| require file }
+
+RSpec.configure do |config|
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
+  config.include Expressir::ConsoleHelper
+
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

data/spec/support/console_helper.rb

@@ -1,29 +1,29 @@
-module Expressir
-  module ConsoleHelper
-    def capture_stdout(&_block)
-      original_stdout = $stdout
-      $stdout = fake = StringIO.new
-
-      begin
-        yield
-      ensure
-        $stdout = original_stdout
-      end
-
-      fake.string
-    end
-
-    def capture_stderr(&_block)
-      original_stderr = $stderr
-      $stderr = fake = StringIO.new
-
-      begin
-        yield
-      ensure
-        $stderr = original_stderr
-      end
-
-      fake.string
-    end
-  end
-end
+module Expressir
+  module ConsoleHelper
+    def capture_stdout(&_block)
+      original_stdout = $stdout
+      $stdout = fake = StringIO.new
+
+      begin
+        yield
+      ensure
+        $stdout = original_stdout
+      end
+
+      fake.string
+    end
+
+    def capture_stderr(&_block)
+      original_stderr = $stderr
+      $stderr = fake = StringIO.new
+
+      begin
+        yield
+      ensure
+        $stderr = original_stderr
+      end
+
+      fake.string
+    end
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.10
 platform: x64-mingw32
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rice
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: antlr4-native
   requirement: !ruby/object:Gem::Requirement
@@ -53,75 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".cross_rubies"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
@@ -161,350 +162,6 @@ files:
 - exe/expressir
 - exe/generate-parser
 - expressir.gemspec
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj.filters
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj.filters
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp-ios/Info.plist
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp-ios/antlrcpp_ios.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/project.pbxproj
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/xcshareddata/xcschemes/antlr4.xcscheme
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/xcshareddata/xcschemes/antlr4_ios.xcscheme
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/antlrcpp.xcodeproj/xcshareddata/xcschemes/antlr4_static.xcscheme
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRErrorListener.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRErrorListener.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRErrorStrategy.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRErrorStrategy.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRFileStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRFileStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRInputStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ANTLRInputStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/BailErrorStrategy.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/BailErrorStrategy.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/BaseErrorListener.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/BaseErrorListener.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/BufferedTokenStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/BufferedTokenStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CharStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CharStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonToken.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonToken.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonTokenFactory.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonTokenFactory.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonTokenStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/CommonTokenStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ConsoleErrorListener.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ConsoleErrorListener.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/DefaultErrorStrategy.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/DiagnosticErrorListener.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/DiagnosticErrorListener.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Exceptions.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Exceptions.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/FailedPredicateException.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/FailedPredicateException.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/InputMismatchException.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/InputMismatchException.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/IntStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/IntStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/InterpreterRuleContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/InterpreterRuleContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Lexer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Lexer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerInterpreter.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerInterpreter.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerNoViableAltException.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/LexerNoViableAltException.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ListTokenSource.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ListTokenSource.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/NoViableAltException.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/NoViableAltException.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Parser.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Parser.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserInterpreter.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserInterpreter.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserRuleContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ParserRuleContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ProxyErrorListener.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/ProxyErrorListener.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RecognitionException.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RecognitionException.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContextWithAltNum.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuleContextWithAltNum.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuntimeMetaData.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/RuntimeMetaData.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Token.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Token.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenFactory.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenSource.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenSource.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStreamRewriter.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/TokenStreamRewriter.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedCharStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedCharStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedTokenStream.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/UnbufferedTokenStream.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Vocabulary.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/Vocabulary.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/WritableToken.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/WritableToken.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-common.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-runtime.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfig.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfig.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfigSet.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNDeserializer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSerializer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSerializer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSimulator.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNSimulator.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNType.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AbstractPredicateTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AbstractPredicateTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ActionTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ActionTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AmbiguityInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AmbiguityInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AtomTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/AtomTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicBlockStartState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicBlockStartState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BasicState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockEndState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockEndState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockStartState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/BlockStartState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ContextSensitivityInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ContextSensitivityInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionEventInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionEventInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/DecisionState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EmptyPredictionContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EmptyPredictionContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EpsilonTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/EpsilonTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ErrorInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ErrorInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LL1Analyzer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNConfig.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNSimulator.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerATNSimulator.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionExecutor.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerActionType.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerChannelAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerChannelAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerCustomAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerCustomAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerModeAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerModeAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerMoreAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerMoreAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPopModeAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPopModeAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPushModeAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerPushModeAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerSkipAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerSkipAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerTypeAction.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LexerTypeAction.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LookaheadEventInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LookaheadEventInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LoopEndState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/LoopEndState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Makefile
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/NotSetTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/NotSetTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/OrderedATNConfigSet.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/OrderedATNConfigSet.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParseInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParseInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ParserATNSimulator.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusBlockStartState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusBlockStartState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusLoopbackState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PlusLoopbackState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateEvalInfo.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateEvalInfo.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredicateTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionMode.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/PredictionMode.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RangeTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RangeTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStartState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStartState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStopState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleStopState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/RuleTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SemanticContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SetTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SetTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SingletonPredictionContext.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/SingletonPredictionContext.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarBlockStartState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarBlockStartState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopEntryState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopEntryState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopbackState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/StarLoopbackState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TokensStartState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/TokensStartState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Transition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/Transition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/WildcardTransition.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/atn/WildcardTransition.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFA.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFA.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFASerializer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFASerializer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFAState.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/DFAState.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/LexerDFASerializer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/dfa/LexerDFASerializer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/InterpreterDataReader.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/InterpreterDataReader.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Interval.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Interval.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/IntervalSet.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/IntervalSet.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/MurmurHash.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/MurmurHash.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Predicate.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/misc/Predicate.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Any.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Any.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Arrays.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Arrays.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/BitSet.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/CPPUtils.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/CPPUtils.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/Declarations.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/StringUtils.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/StringUtils.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/guid.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/support/guid.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/AbstractParseTreeVisitor.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNode.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNode.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/IterativeParseTreeWalker.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/IterativeParseTreeWalker.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTree.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTree.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeListener.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeListener.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeProperty.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeVisitor.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeVisitor.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeWalker.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/ParseTreeWalker.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNode.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNode.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/Trees.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/Trees.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/Chunk.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/Chunk.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreeMatch.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreeMatch.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreePattern.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreePattern.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/RuleTagToken.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/RuleTagToken.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/TagChunk.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/TagChunk.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/TextChunk.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/TextChunk.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/TokenTagToken.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern/TokenTagToken.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPath.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPath.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathElement.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathElement.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.g4
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexer.tokens
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathRuleAnywhereElement.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathRuleAnywhereElement.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathRuleElement.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathRuleElement.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathTokenAnywhereElement.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathTokenAnywhereElement.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathTokenElement.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathTokenElement.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathWildcardAnywhereElement.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathWildcardAnywhereElement.h
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathWildcardElement.cpp
-- ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath/XPathWildcardElement.h
-- 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/express_parser.so
 - lib/expressir.rb
 - lib/expressir/cli.rb
 - lib/expressir/cli/ui.rb
@@ -538,6 +195,11 @@ files:
 - lib/expressir/express/type_select.rb
 - lib/expressir/express/unique_rule.rb
 - lib/expressir/express/where_rule.rb
+- lib/expressir/express_exp/2.4/express_parser.so
+- lib/expressir/express_exp/2.5/express_parser.so
+- lib/expressir/express_exp/2.6/express_parser.so
+- lib/expressir/express_exp/2.7/express_parser.so
+- lib/expressir/express_exp/3.0/express_parser.so
 - lib/expressir/express_exp/formatter.rb
 - lib/expressir/express_exp/parser.rb
 - lib/expressir/express_exp/visitor.rb
@@ -561,12 +223,14 @@ 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
 - lib/expressir/model/literals/logical.rb
 - lib/expressir/model/literals/real.rb
 - lib/expressir/model/literals/string.rb
+- lib/expressir/model/model_element.rb
 - lib/expressir/model/parameter.rb
 - lib/expressir/model/procedure.rb
 - lib/expressir/model/renamed_ref.rb
@@ -641,6 +305,8 @@ 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/simple.exp
+- original/examples/syntax/source.exp
 - original/examples/syntax/syntax.exp
 - original/examples/syntax/syntax_formatted.exp
 - original/exp2ruby.rb
@@ -650,15 +316,20 @@ files:
 - original/mapping_uml2.rb
 - original/mapping_uml2_eclipse.rb
 - original/reeper.rb
+- rakelib/cross-ruby.rake
 - spec/acceptance/express_to_owl_spec.rb
 - spec/acceptance/version_spec.rb
 - spec/expressir/express/repository_spec.rb
 - spec/expressir/express_exp/ap233_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/model/find_spec.rb
+- spec/expressir/express_exp/source_spec.rb
+- spec/expressir/model/model_element_spec.rb
+- spec/expressir/model/scope_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb
@@ -680,15 +351,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 2.5.dev
+      version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.