expressir 0.2.27-x64-mingw32 → 1.0.0-x64-mingw32

data/lib/expressir/{express_exp → express}/hyperlink_formatter.rb

@@ -1,5 +1,5 @@
 module Expressir
-  module ExpressExp
+  module Express
     module HyperlinkFormatter
       def format_expressions_simple_reference(node)
         return node.id unless node.base_path

data/lib/expressir/{express_exp → express}/model_visitor.rb

@@ -1,7 +1,7 @@
 require "expressir/model"
 
 module Expressir
-  module ExpressExp
+  module Express
     class ModelVisitor
       def visit(node)
         node.class.model_attrs.each do |variable|

data/lib/expressir/{express_exp → express}/parser.rb

@@ -4,8 +4,8 @@ begin
 rescue LoadError
   require_relative "express_parser"
 end
-require 'expressir/express_exp/visitor'
-require 'expressir/express_exp/resolve_references_model_visitor'
+require 'expressir/express/visitor'
+require 'expressir/express/resolve_references_model_visitor'
 
 =begin
 char_stream = Antlr4::Runtime::CharStreams.from_string(input, 'String')
@@ -23,7 +23,7 @@ repo = visitor.visit(parse_tree)
 =end
 
 module Expressir
-  module ExpressExp
+  module Express
     class Parser
       def self.from_file(file, options = {})
         skip_references = options[:skip_references]

data/lib/expressir/{express_exp → express}/resolve_references_model_visitor.rb

@@ -1,8 +1,8 @@
-require "expressir/express_exp/model_visitor"
+require "expressir/express/model_visitor"
 require "expressir/model"
 
 module Expressir
-  module ExpressExp
+  module Express
     class ResolveReferencesModelVisitor < ModelVisitor
       def visit(node)
         if node.is_a? Model::Expressions::SimpleReference

data/lib/expressir/{express_exp → express}/schema_head_formatter.rb

@@ -1,5 +1,5 @@
 module Expressir
-  module ExpressExp
+  module Express
     module SchemaHeadFormatter
       def format_schema(node)
         format_schema_head(node)

data/lib/expressir/{express_exp → express}/visitor.rb

@@ -32,7 +32,7 @@ require "set"
 # - e.g. see visit_schema_decl
 
 module Expressir
-  module ExpressExp
+  module Express
     class Visitor < ::ExpressParser::Visitor
       REMARK_CHANNEL = 2
 
@@ -694,7 +694,7 @@ module Expressir
         id = visit_if(ctx__rule_label_id)
         expression = visit_if(ctx__expression)
 
-        Model::Where.new({
+        Model::WhereRule.new({
           id: id,
           expression: expression
         })
@@ -759,8 +759,8 @@ module Expressir
           *visit_if(ctx__entity_body__derive_clause),
           *visit_if(ctx__entity_body__inverse_clause)
         ]
-        unique = visit_if(ctx__entity_body__unique_clause, [])
-        where = visit_if(ctx__entity_body__where_clause, [])
+        unique_rules = visit_if(ctx__entity_body__unique_clause, [])
+        where_rules = visit_if(ctx__entity_body__where_clause, [])
 
         Model::Entity.new({
           id: id,
@@ -768,8 +768,8 @@ module Expressir
           supertype_expression: supertype_expression,
           subtype_of: subtype_of,
           attributes: attributes,
-          unique: unique,
-          where: where
+          unique_rules: unique_rules,
+          where_rules: where_rules
         })
       end
 
@@ -834,15 +834,13 @@ module Expressir
         ctx__enumeration_extension__enumeration_items = ctx__enumeration_extension&.enumeration_items
 
         extensible = ctx__EXTENSIBLE && true
-        items = visit_if(ctx__enumeration_items, [])
-        extension_type = visit_if(ctx__enumeration_extension__type_ref)
-        extension_items = visit_if(ctx__enumeration_extension__enumeration_items, [])
+        based_on = visit_if(ctx__enumeration_extension__type_ref)
+        items = visit_if(ctx__enumeration_items || ctx__enumeration_extension__enumeration_items, [])
 
         Model::Types::Enumeration.new({
           extensible: extensible,
-          items: items,
-          extension_type: extension_type,
-          extension_items: extension_items
+          based_on: based_on,
+          items: items
         })
       end
 
@@ -1870,7 +1868,7 @@ module Expressir
         constants = visit_if(ctx__algorithm_head__constant_decl, [])
         variables = visit_if(ctx__algorithm_head__local_decl, [])
         statements = visit_if_map(ctx__stmt)
-        where = visit_if(ctx__where_clause, [])
+        where_rules = visit_if(ctx__where_clause, [])
 
         Model::Rule.new({
           id: id,
@@ -1883,7 +1881,7 @@ module Expressir
           constants: constants,
           variables: variables,
           statements: statements,
-          where: where
+          where_rules: where_rules
         })
       end
 
@@ -2012,16 +2010,14 @@ module Expressir
 
         extensible = ctx__EXTENSIBLE && true
         generic_entity = ctx__GENERIC_ENTITY && true
-        items = visit_if(ctx__select_list, [])
-        extension_type = visit_if(ctx__select_extension__type_ref)
-        extension_items = visit_if(ctx__select_extension__select_list, [])
+        based_on = visit_if(ctx__select_extension__type_ref)
+        items = visit_if(ctx__select_list || ctx__select_extension__select_list, [])
 
         Model::Types::Select.new({
           extensible: extensible,
           generic_entity: generic_entity,
-          items: items,
-          extension_type: extension_type,
-          extension_items: extension_items
+          based_on: based_on,
+          items: items
         })
       end
 
@@ -2315,13 +2311,13 @@ module Expressir
         ctx__where_clause = ctx.where_clause
 
         id = visit_if(ctx__type_id)
-        type = visit_if(ctx__underlying_type)
-        where = visit_if(ctx__where_clause, [])
+        underlying_type = visit_if(ctx__underlying_type)
+        where_rules = visit_if(ctx__where_clause, [])
 
         Model::Type.new({
           id: id,
-          type: type,
-          where: where
+          underlying_type: underlying_type,
+          where_rules: where_rules
         })
       end
 
@@ -2381,7 +2377,7 @@ module Expressir
         id = visit_if(ctx__rule_label_id)
         attributes = visit_if_map(ctx__referenced_attribute)
 
-        Model::Unique.new({
+        Model::UniqueRule.new({
           id: id,
           attributes: attributes
         })

data/lib/expressir/model.rb

@@ -22,9 +22,9 @@ require 'expressir/model/schema_version'
 require 'expressir/model/schema_version_item'
 require 'expressir/model/subtype_constraint'
 require 'expressir/model/type'
-require 'expressir/model/unique'
+require 'expressir/model/unique_rule'
 require 'expressir/model/variable'
-require 'expressir/model/where'
+require 'expressir/model/where_rule'
 require 'expressir/model/expressions/aggregate_initializer'
 require 'expressir/model/expressions/aggregate_item'
 require 'expressir/model/expressions/binary_expression'

data/lib/expressir/model/entity.rb

@@ -7,8 +7,8 @@ module Expressir
       model_attr_accessor :supertype_expression
       model_attr_accessor :subtype_of
       model_attr_accessor :attributes
-      model_attr_accessor :unique
-      model_attr_accessor :where
+      model_attr_accessor :unique_rules
+      model_attr_accessor :where_rules
       model_attr_accessor :informal_propositions
 
       def initialize(options = {})
@@ -21,8 +21,8 @@ module Expressir
         @supertype_expression = options[:supertype_expression]
         @subtype_of = options[:subtype_of] || []
         @attributes = options[:attributes] || []
-        @unique = options[:unique] || []
-        @where = options[:where] || []
+        @unique_rules = options[:unique_rules] || []
+        @where_rules = options[:where_rules] || []
         @informal_propositions = options[:informal_propositions] || []
 
         super
@@ -31,8 +31,8 @@ module Expressir
       def children
         [
           *attributes,
-          *unique,
-          *where,
+          *unique_rules,
+          *where_rules,
           *informal_propositions,
           *remark_items
         ]

data/lib/expressir/model/model_element.rb

@@ -96,7 +96,7 @@ module Expressir
       def to_hash(options = {})
         root_path = options[:root_path]
         formatter = options[:formatter]
-        include_empty = options[:include_empty] || !options[:skip_empty] # TODO: remove skip_empty
+        include_empty = options[:include_empty]
 
         hash = {}
         hash[CLASS_KEY] = self.class.name

data/lib/expressir/model/rule.rb

@@ -12,7 +12,7 @@ module Expressir
       model_attr_accessor :constants
       model_attr_accessor :variables
       model_attr_accessor :statements
-      model_attr_accessor :where
+      model_attr_accessor :where_rules
       model_attr_accessor :informal_propositions
 
       def initialize(options = {})
@@ -30,7 +30,7 @@ module Expressir
         @constants = options[:constants] || []
         @variables = options[:variables] || []
         @statements = options[:statements] || []
-        @where = options[:where] || []
+        @where_rules = options[:where_rules] || []
         @informal_propositions = options[:informal_propositions] || []
 
         super
@@ -50,7 +50,7 @@ module Expressir
           *procedures,
           *constants,
           *variables,
-          *where,
+          *where_rules,
           *informal_propositions,
           *remark_items
         ]

data/lib/expressir/model/type.rb

@@ -3,8 +3,8 @@ module Expressir
     class Type < ModelElement
       include Identifier
 
-      model_attr_accessor :type
-      model_attr_accessor :where
+      model_attr_accessor :underlying_type
+      model_attr_accessor :where_rules
       model_attr_accessor :informal_propositions
 
       def initialize(options = {})
@@ -13,21 +13,21 @@ module Expressir
         @remark_items = options[:remark_items] || []
         @source = options[:source]
 
-        @type = options[:type]
-        @where = options[:where] || []
+        @underlying_type = options[:underlying_type]
+        @where_rules = options[:where_rules] || []
         @informal_propositions = options[:informal_propositions] || []
 
         super
       end
 
       def enumeration_items
-        type.is_a?(Types::Enumeration) ? type.items : []
+        underlying_type.is_a?(Types::Enumeration) ? underlying_type.items : []
       end
 
       def children
         [
           *enumeration_items,
-          *where,
+          *where_rules,
           *informal_propositions,
           *remark_items
         ]

data/lib/expressir/model/types/enumeration.rb

@@ -3,15 +3,13 @@ module Expressir
     module Types
       class Enumeration < ModelElement
         model_attr_accessor :extensible
+        model_attr_accessor :based_on
         model_attr_accessor :items
-        model_attr_accessor :extension_type
-        model_attr_accessor :extension_items
 
         def initialize(options = {})
           @extensible = options[:extensible]
+          @based_on = options[:based_on]
           @items = options[:items] || []
-          @extension_type = options[:extension_type]
-          @extension_items = options[:extension_items] || []
 
           super
         end

data/lib/expressir/model/types/select.rb

@@ -4,16 +4,14 @@ module Expressir
       class Select < ModelElement
         model_attr_accessor :extensible
         model_attr_accessor :generic_entity
+        model_attr_accessor :based_on
         model_attr_accessor :items
-        model_attr_accessor :extension_type
-        model_attr_accessor :extension_items
 
         def initialize(options = {})
           @extensible = options[:extensible]
           @generic_entity = options[:generic_entity]
+          @based_on = options[:based_on]
           @items = options[:items] || []
-          @extension_type = options[:extension_type]
-          @extension_items = options[:extension_items] || []
 
           super
         end

data/lib/expressir/model/{unique.rb → unique_rule.rb}

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Unique < ModelElement
+    class UniqueRule < ModelElement
       include Identifier
 
       model_attr_accessor :attributes

data/lib/expressir/model/{where.rb → where_rule.rb}

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Where < ModelElement
+    class WhereRule < ModelElement
       include Identifier
 
       model_attr_accessor :expression

data/lib/expressir/version.rb

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

data/rakelib/cross-ruby.rake

@@ -296,7 +296,7 @@ require "rake/extensiontask"
 
 Rake::ExtensionTask.new("express_parser", GEMSPEC) do |ext|
   ext.ext_dir = "ext/express-parser"
-  ext.lib_dir = File.join(*['lib', 'expressir', 'express_exp', ENV['FAT_DIR']].compact)
+  ext.lib_dir = File.join(*['lib', 'expressir', 'express', ENV['FAT_DIR']].compact)
   ext.config_options << ENV['EXTOPTS']
   ext.cross_compile  = true
   ext.cross_platform = CROSS_RUBIES.map(&:platform).uniq

data/spec/expressir/{express_exp → express}/cache_spec.rb

@@ -1,10 +1,10 @@
 require "yaml"
 require "tempfile"
 require "spec_helper"
-require "expressir/express_exp/parser"
-require "expressir/express_exp/cache"
+require "expressir/express/parser"
+require "expressir/express/cache"
 
-RSpec.describe Expressir::ExpressExp::Cache do
+RSpec.describe Expressir::Express::Cache do
   TEST_VERSION = "0.0.0"
 
   describe ".to_file" do
@@ -14,7 +14,7 @@ RSpec.describe Expressir::ExpressExp::Cache do
       repository = Expressir::Model::Repository.new
 
       begin
-        Expressir::ExpressExp::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
+        Expressir::Express::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
 
         size = File.size(temp_file)
 
@@ -33,9 +33,9 @@ RSpec.describe Expressir::ExpressExp::Cache do
       repository = Expressir::Model::Repository.new
 
       begin
-        Expressir::ExpressExp::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
+        Expressir::Express::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
 
-        result = Expressir::ExpressExp::Cache.from_file(temp_file, test_overwrite_version: TEST_VERSION)
+        result = Expressir::Express::Cache.from_file(temp_file, test_overwrite_version: TEST_VERSION)
 
         expect(result).to be_instance_of(Expressir::Model::Repository)
       ensure
@@ -50,11 +50,11 @@ RSpec.describe Expressir::ExpressExp::Cache do
       repository = Expressir::Model::Repository.new
 
       begin
-        Expressir::ExpressExp::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
+        Expressir::Express::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
 
         expect do
-          Expressir::ExpressExp::Cache.from_file(temp_file)
-        end.to raise_error(Expressir::ExpressExp::CacheLoadError)
+          Expressir::Express::Cache.from_file(temp_file)
+        end.to raise_error(Expressir::Error)
       ensure
         temp_file.close
         temp_file.unlink

data/spec/expressir/express/formatter_spec.rb

@@ -0,0 +1,127 @@
+require "yaml"
+require "spec_helper"
+require "expressir/express/parser"
+require "expressir/express/formatter"
+require "expressir/express/schema_head_formatter"
+require "expressir/express/hyperlink_formatter"
+
+RSpec.describe Expressir::Express::Formatter do
+  describe ".format" do
+    it "exports an object (single.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "single.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "single_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      result = Expressir::Express::Formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "exports an object (multiple.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "multiple_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      result = Expressir::Express::Formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "exports an object (remark.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "remark.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "remark_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      result = Expressir::Express::Formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "exports an object (syntax.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "syntax.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "syntax_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      result = Expressir::Express::Formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "exports an object with schema head formatter (syntax.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "syntax.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "syntax_schema_head_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      formatter = Class.new(Expressir::Express::Formatter) do
+        include Expressir::Express::SchemaHeadFormatter
+      end
+      result = formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "exports an object with hyperlink formatter (syntax.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "syntax.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "syntax_hyperlink_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      formatter = Class.new(Expressir::Express::Formatter) do
+        include Expressir::Express::HyperlinkFormatter
+      end
+      result = formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "exports an object with hyperlink formatter (multiple.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "multiple_hyperlink_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      formatter = Class.new(Expressir::Express::Formatter) do
+        include Expressir::Express::HyperlinkFormatter
+      end
+      result = formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "exports an object with schema head and hyperlink formatter (multiple.exp)" do
+      exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
+      formatted_exp_file = Expressir.root_path.join("spec", "syntax", "multiple_schema_head_hyperlink_formatted.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      formatter = Class.new(Expressir::Express::Formatter) do
+        include Expressir::Express::SchemaHeadFormatter
+        include Expressir::Express::HyperlinkFormatter
+      end
+      result = formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+  end
+end