expressir 1.0.0 → 1.2.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.3
+- !ruby/object:Gem::Dependency
+  name: asciidoctor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.13
 - !ruby/object:Gem::Dependency
   name: antlr4-native
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.26
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.26
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.
 email:
 - open.source@ribose.com'
@@ -164,8 +206,10 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".gitmodules"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".yardopts"
 - Gemfile
 - README.adoc
 - Rakefile
@@ -535,75 +579,84 @@ files:
 - lib/expressir/express/schema_head_formatter.rb
 - lib/expressir/express/visitor.rb
 - lib/expressir/model.rb
-- lib/expressir/model/attribute.rb
 - lib/expressir/model/cache.rb
-- lib/expressir/model/constant.rb
-- lib/expressir/model/entity.rb
-- lib/expressir/model/enumeration_item.rb
+- lib/expressir/model/data_type.rb
+- lib/expressir/model/data_types/aggregate.rb
+- lib/expressir/model/data_types/array.rb
+- lib/expressir/model/data_types/bag.rb
+- lib/expressir/model/data_types/binary.rb
+- lib/expressir/model/data_types/boolean.rb
+- lib/expressir/model/data_types/enumeration.rb
+- lib/expressir/model/data_types/enumeration_item.rb
+- lib/expressir/model/data_types/generic.rb
+- lib/expressir/model/data_types/generic_entity.rb
+- lib/expressir/model/data_types/integer.rb
+- lib/expressir/model/data_types/list.rb
+- lib/expressir/model/data_types/logical.rb
+- lib/expressir/model/data_types/number.rb
+- lib/expressir/model/data_types/real.rb
+- lib/expressir/model/data_types/select.rb
+- lib/expressir/model/data_types/set.rb
+- lib/expressir/model/data_types/string.rb
+- lib/expressir/model/declaration.rb
+- lib/expressir/model/declarations/attribute.rb
+- lib/expressir/model/declarations/constant.rb
+- lib/expressir/model/declarations/entity.rb
+- lib/expressir/model/declarations/function.rb
+- lib/expressir/model/declarations/interface.rb
+- lib/expressir/model/declarations/interface_item.rb
+- lib/expressir/model/declarations/interfaced_item.rb
+- lib/expressir/model/declarations/parameter.rb
+- lib/expressir/model/declarations/procedure.rb
+- lib/expressir/model/declarations/remark_item.rb
+- lib/expressir/model/declarations/rule.rb
+- lib/expressir/model/declarations/schema.rb
+- lib/expressir/model/declarations/schema_version.rb
+- lib/expressir/model/declarations/schema_version_item.rb
+- lib/expressir/model/declarations/subtype_constraint.rb
+- lib/expressir/model/declarations/type.rb
+- lib/expressir/model/declarations/unique_rule.rb
+- lib/expressir/model/declarations/variable.rb
+- lib/expressir/model/declarations/where_rule.rb
+- lib/expressir/model/expression.rb
 - lib/expressir/model/expressions/aggregate_initializer.rb
-- lib/expressir/model/expressions/aggregate_item.rb
-- lib/expressir/model/expressions/attribute_reference.rb
+- lib/expressir/model/expressions/aggregate_initializer_item.rb
 - lib/expressir/model/expressions/binary_expression.rb
-- lib/expressir/model/expressions/call.rb
 - lib/expressir/model/expressions/entity_constructor.rb
-- lib/expressir/model/expressions/group_reference.rb
-- lib/expressir/model/expressions/index_reference.rb
+- lib/expressir/model/expressions/function_call.rb
 - lib/expressir/model/expressions/interval.rb
 - lib/expressir/model/expressions/query_expression.rb
-- 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/interface_item.rb
-- lib/expressir/model/interfaced_item.rb
+- lib/expressir/model/literal.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/remark_item.rb
+- lib/expressir/model/reference.rb
+- lib/expressir/model/references/attribute_reference.rb
+- lib/expressir/model/references/group_reference.rb
+- lib/expressir/model/references/index_reference.rb
+- lib/expressir/model/references/simple_reference.rb
 - lib/expressir/model/repository.rb
-- lib/expressir/model/rule.rb
-- lib/expressir/model/schema.rb
-- lib/expressir/model/schema_version.rb
-- lib/expressir/model/schema_version_item.rb
+- lib/expressir/model/statement.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
-- lib/expressir/model/statements/call.rb
 - lib/expressir/model/statements/case.rb
 - lib/expressir/model/statements/case_action.rb
 - lib/expressir/model/statements/compound.rb
 - lib/expressir/model/statements/escape.rb
 - lib/expressir/model/statements/if.rb
 - lib/expressir/model/statements/null.rb
+- lib/expressir/model/statements/procedure_call.rb
 - lib/expressir/model/statements/repeat.rb
 - lib/expressir/model/statements/return.rb
 - lib/expressir/model/statements/skip.rb
-- lib/expressir/model/subtype_constraint.rb
-- lib/expressir/model/type.rb
-- lib/expressir/model/types/aggregate.rb
-- lib/expressir/model/types/array.rb
-- lib/expressir/model/types/bag.rb
-- lib/expressir/model/types/binary.rb
-- lib/expressir/model/types/boolean.rb
-- lib/expressir/model/types/enumeration.rb
-- lib/expressir/model/types/generic.rb
-- lib/expressir/model/types/generic_entity.rb
-- lib/expressir/model/types/integer.rb
-- lib/expressir/model/types/list.rb
-- lib/expressir/model/types/logical.rb
-- lib/expressir/model/types/number.rb
-- lib/expressir/model/types/real.rb
-- lib/expressir/model/types/select.rb
-- lib/expressir/model/types/set.rb
-- lib/expressir/model/types/string.rb
-- lib/expressir/model/unique_rule.rb
-- lib/expressir/model/variable.rb
-- lib/expressir/model/where_rule.rb
+- lib/expressir/model/supertype_expression.rb
+- lib/expressir/model/supertype_expressions/binary_supertype_expression.rb
+- lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb
 - lib/expressir/version.rb
 - original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.exp
 - original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.owl
@@ -689,7 +742,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.

data/lib/expressir/model/attribute.rb

@@ -1,38 +0,0 @@
-module Expressir
-  module Model
-    class Attribute < ModelElement
-      include Identifier
-
-      EXPLICIT = :EXPLICIT
-      DERIVED = :DERIVED
-      INVERSE = :INVERSE
-
-      model_attr_accessor :kind
-      model_attr_accessor :supertype_attribute
-      model_attr_accessor :optional
-      model_attr_accessor :type
-      model_attr_accessor :expression
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-        @source = options[:source]
-
-        @kind = options[:kind]
-        @supertype_attribute = options[:supertype_attribute]
-        @optional = options[:optional]
-        @type = options[:type]
-        @expression = options[:expression]
-
-        super
-      end
-
-      def children
-        [
-          *remark_items
-        ]
-      end
-    end
-  end
-end

data/lib/expressir/model/constant.rb

@@ -1,28 +0,0 @@
-module Expressir
-  module Model
-    class Constant < ModelElement
-      include Identifier
-
-      model_attr_accessor :type
-      model_attr_accessor :expression
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-        @source = options[:source]
-
-        @type = options[:type]
-        @expression = options[:expression]
-
-        super
-      end
-
-      def children
-        [
-          *remark_items
-        ]
-      end
-    end
-  end
-end

data/lib/expressir/model/entity.rb

@@ -1,42 +0,0 @@
-module Expressir
-  module Model
-    class Entity < ModelElement
-      include Identifier
-
-      model_attr_accessor :abstract
-      model_attr_accessor :supertype_expression
-      model_attr_accessor :subtype_of
-      model_attr_accessor :attributes
-      model_attr_accessor :unique_rules
-      model_attr_accessor :where_rules
-      model_attr_accessor :informal_propositions
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-        @source = options[:source]
-
-        @abstract = options[:abstract]
-        @supertype_expression = options[:supertype_expression]
-        @subtype_of = options[:subtype_of] || []
-        @attributes = options[:attributes] || []
-        @unique_rules = options[:unique_rules] || []
-        @where_rules = options[:where_rules] || []
-        @informal_propositions = options[:informal_propositions] || []
-
-        super
-      end
-
-      def children
-        [
-          *attributes,
-          *unique_rules,
-          *where_rules,
-          *informal_propositions,
-          *remark_items
-        ]
-      end
-    end
-  end
-end

data/lib/expressir/model/enumeration_item.rb

@@ -1,22 +0,0 @@
-module Expressir
-  module Model
-    class EnumerationItem < ModelElement
-      include Identifier
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-        @source = options[:source]
-
-        super
-      end
-
-      def children
-        [
-          *remark_items
-        ]
-      end
-    end
-  end
-end

data/lib/expressir/model/expressions/aggregate_item.rb

@@ -1,17 +0,0 @@
-module Expressir
-  module Model
-    module Expressions
-      class AggregateItem < ModelElement
-        model_attr_accessor :expression
-        model_attr_accessor :repetition
-
-        def initialize(options = {})
-          @expression = options[:expression]
-          @repetition = options[:repetition]
-
-          super
-        end
-      end
-    end
-  end
-end

data/lib/expressir/model/expressions/attribute_reference.rb

@@ -1,17 +0,0 @@
-module Expressir
-  module Model
-    module Expressions
-      class AttributeReference < ModelElement
-        model_attr_accessor :ref
-        model_attr_accessor :attribute
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @attribute = options[:attribute]
-
-          super
-        end
-      end
-    end
-  end
-end

data/lib/expressir/model/expressions/call.rb

@@ -1,17 +0,0 @@
-module Expressir
-  module Model
-    module Expressions
-      class Call < ModelElement
-        model_attr_accessor :ref
-        model_attr_accessor :parameters
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @parameters = options[:parameters] || []
-
-          super
-        end
-      end
-    end
-  end
-end

data/lib/expressir/model/expressions/group_reference.rb

@@ -1,17 +0,0 @@
-module Expressir
-  module Model
-    module Expressions
-      class GroupReference < ModelElement
-        model_attr_accessor :ref
-        model_attr_accessor :entity
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @entity = options[:entity]
-
-          super
-        end
-      end
-    end
-  end
-end

data/lib/expressir/model/expressions/index_reference.rb

@@ -1,19 +0,0 @@
-module Expressir
-  module Model
-    module Expressions
-      class IndexReference < ModelElement
-        model_attr_accessor :ref
-        model_attr_accessor :index1
-        model_attr_accessor :index2
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @index1 = options[:index1]
-          @index2 = options[:index2]
-
-          super
-        end
-      end
-    end
-  end
-end

data/lib/expressir/model/expressions/simple_reference.rb

@@ -1,19 +0,0 @@
-module Expressir
-  module Model
-    module Expressions
-      class SimpleReference < ModelElement
-        model_attr_accessor :id
-
-        model_attr_accessor :base_path
-
-        def initialize(options = {})
-          @id = options[:id]
-
-          @base_path = options[:base_path]
-
-          super
-        end
-      end
-    end
-  end
-end

data/lib/expressir/model/function.rb

@@ -1,57 +0,0 @@
-module Expressir
-  module Model
-    class Function < ModelElement
-      include Identifier
-
-      model_attr_accessor :parameters
-      model_attr_accessor :return_type
-      model_attr_accessor :types
-      model_attr_accessor :entities
-      model_attr_accessor :subtype_constraints
-      model_attr_accessor :functions
-      model_attr_accessor :procedures
-      model_attr_accessor :constants
-      model_attr_accessor :variables
-      model_attr_accessor :statements
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-        @source = options[:source]
-
-        @parameters = options[:parameters] || []
-        @return_type = options[:return_type]
-        @types = options[:types] || []
-        @entities = options[:entities] || []
-        @subtype_constraints = options[:subtype_constraints] || []
-        @functions = options[:functions] || []
-        @procedures = options[:procedures] || []
-        @constants = options[:constants] || []
-        @variables = options[:variables] || []
-        @statements = options[:statements] || []
-
-        super
-      end
-
-      def enumeration_items
-        types.flat_map{|x| x.enumeration_items}
-      end
-
-      def children
-        [
-          *parameters,
-          *types,
-          *enumeration_items,
-          *entities,
-          *subtype_constraints,
-          *functions,
-          *procedures,
-          *constants,
-          *variables,
-          *remark_items
-        ]
-      end
-    end
-  end
-end

data/lib/expressir/model/interface.rb

@@ -1,20 +0,0 @@
-module Expressir
-  module Model
-    class Interface < ModelElement
-      USE = :USE
-      REFERENCE = :REFERENCE
-
-      model_attr_accessor :kind
-      model_attr_accessor :schema
-      model_attr_accessor :items
-
-      def initialize(options = {})
-        @kind = options[:kind]
-        @schema = options[:schema]
-        @items = options[:items] || []
-
-        super
-      end
-    end
-  end
-end

data/lib/expressir/model/interface_item.rb

@@ -1,15 +0,0 @@
-module Expressir
-  module Model
-    class InterfaceItem < ModelElement
-      model_attr_accessor :ref
-      model_attr_accessor :id
-
-      def initialize(options = {})
-        @ref = options[:ref] 
-        @id = options[:id]
-
-        super
-      end
-    end
-  end
-end

data/lib/expressir/model/interfaced_item.rb

@@ -1,27 +0,0 @@
-module Expressir
-  module Model
-    class InterfacedItem < ModelElement
-      model_attr_accessor :id
-      model_attr_accessor :remarks
-      model_attr_accessor :remark_items
-
-      model_attr_accessor :base_item
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-
-        @base_item = options[:base_item]
-
-        super
-      end
-
-      def children
-        [
-          *remark_items
-        ]
-      end
-    end
-  end
-end

data/lib/expressir/model/parameter.rb

@@ -1,28 +0,0 @@
-module Expressir
-  module Model
-    class Parameter < ModelElement
-      include Identifier
-
-      model_attr_accessor :var
-      model_attr_accessor :type
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-        @source = options[:source]
-
-        @var = options[:var]
-        @type = options[:type]
-
-        super
-      end
-
-      def children
-        [
-          *remark_items
-        ]
-      end
-    end
-  end
-end

data/lib/expressir/model/procedure.rb

@@ -1,55 +0,0 @@
-module Expressir
-  module Model
-    class Procedure < ModelElement
-      include Identifier
-
-      model_attr_accessor :parameters
-      model_attr_accessor :types
-      model_attr_accessor :entities
-      model_attr_accessor :subtype_constraints
-      model_attr_accessor :functions
-      model_attr_accessor :procedures
-      model_attr_accessor :constants
-      model_attr_accessor :variables
-      model_attr_accessor :statements
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options[:remarks] || []
-        @remark_items = options[:remark_items] || []
-        @source = options[:source]
-
-        @parameters = options[:parameters] || []
-        @types = options[:types] || []
-        @entities = options[:entities] || []
-        @subtype_constraints = options[:subtype_constraints] || []
-        @functions = options[:functions] || []
-        @procedures = options[:procedures] || []
-        @constants = options[:constants] || []
-        @variables = options[:variables] || []
-        @statements = options[:statements] || []
-
-        super
-      end
-
-      def enumeration_items
-        types.flat_map{|x| x.enumeration_items}
-      end
-
-      def children
-        [
-          *parameters,
-          *types,
-          *enumeration_items,
-          *entities,
-          *subtype_constraints,
-          *functions,
-          *procedures,
-          *constants,
-          *variables,
-          *remark_items
-        ]
-      end
-    end
-  end
-end