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

data/lib/expressir/express_parser.rb

@@ -1,30 +1,30 @@
-require "expressir/parser"
-
-module Expressir
-  class ExpressParser
-    def initialize(file, options)
-      @file = file
-      @options = options
-    end
-
-    def to_owl
-      owl_parser.parse(express_xml, options)
-    end
-
-    def self.to_owl(file, **options)
-      new(file, options).to_owl
-    end
-
-    private
-
-    attr_reader :file, :options
-
-    def owl_parser
-      Expressir::Parser::OwlParser
-    end
-
-    def express_xml
-      Expressir::Express.from_xml(file)
-    end
-  end
-end
+require "expressir/parser"
+
+module Expressir
+  class ExpressParser
+    def initialize(file, options)
+      @file = file
+      @options = options
+    end
+
+    def to_owl
+      owl_parser.parse(express_xml, options)
+    end
+
+    def self.to_owl(file, **options)
+      new(file, options).to_owl
+    end
+
+    private
+
+    attr_reader :file, :options
+
+    def owl_parser
+      Expressir::Parser::OwlParser
+    end
+
+    def express_xml
+      Expressir::Express.from_xml(file)
+    end
+  end
+end

data/lib/expressir/model.rb

@@ -1,65 +1,68 @@
-require 'expressir/model/scope'
-require 'expressir/model/identifier'
-
-require 'expressir/model/attribute'
-require 'expressir/model/constant'
-require 'expressir/model/entity'
-require 'expressir/model/enumeration_item'
-require 'expressir/model/function'
-require 'expressir/model/interface'
-require 'expressir/model/parameter'
-require 'expressir/model/procedure'
-require 'expressir/model/renamed_ref'
-require 'expressir/model/repository'
-require 'expressir/model/rule'
-require 'expressir/model/schema'
-require 'expressir/model/subtype_constraint'
-require 'expressir/model/type'
-require 'expressir/model/unique'
-require 'expressir/model/variable'
-require 'expressir/model/where'
-require 'expressir/model/expressions/aggregate_initializer'
-require 'expressir/model/expressions/aggregate_item'
-require 'expressir/model/expressions/binary_expression'
-require 'expressir/model/expressions/call'
-require 'expressir/model/expressions/attribute_reference'
-require 'expressir/model/expressions/entity_constructor'
-require 'expressir/model/expressions/group_reference'
-require 'expressir/model/expressions/index_reference'
-require 'expressir/model/expressions/interval'
-require 'expressir/model/expressions/query_expression'
-require 'expressir/model/expressions/simple_reference'
-require 'expressir/model/expressions/unary_expression'
-require 'expressir/model/literals/binary'
-require 'expressir/model/literals/integer'
-require 'expressir/model/literals/logical'
-require 'expressir/model/literals/real'
-require 'expressir/model/literals/string'
-require 'expressir/model/statements/alias'
-require 'expressir/model/statements/assignment'
-require 'expressir/model/statements/call'
-require 'expressir/model/statements/case'
-require 'expressir/model/statements/case_action'
-require 'expressir/model/statements/compound'
-require 'expressir/model/statements/escape'
-require 'expressir/model/statements/if'
-require 'expressir/model/statements/null'
-require 'expressir/model/statements/repeat'
-require 'expressir/model/statements/return'
-require 'expressir/model/statements/skip'
-require 'expressir/model/types/aggregate'
-require 'expressir/model/types/array'
-require 'expressir/model/types/bag'
-require 'expressir/model/types/binary'
-require 'expressir/model/types/boolean'
-require 'expressir/model/types/enumeration'
-require 'expressir/model/types/generic_entity'
-require 'expressir/model/types/generic'
-require 'expressir/model/types/integer'
-require 'expressir/model/types/list'
-require 'expressir/model/types/logical'
-require 'expressir/model/types/number'
-require 'expressir/model/types/real'
-require 'expressir/model/types/set'
-require 'expressir/model/types/select'
+require 'expressir/model/model_element'
+
+require 'expressir/model/scope'
+require 'expressir/model/identifier'
+
+require 'expressir/model/attribute'
+require 'expressir/model/constant'
+require 'expressir/model/entity'
+require 'expressir/model/enumeration_item'
+require 'expressir/model/function'
+require 'expressir/model/informal_proposition'
+require 'expressir/model/interface'
+require 'expressir/model/parameter'
+require 'expressir/model/procedure'
+require 'expressir/model/renamed_ref'
+require 'expressir/model/repository'
+require 'expressir/model/rule'
+require 'expressir/model/schema'
+require 'expressir/model/subtype_constraint'
+require 'expressir/model/type'
+require 'expressir/model/unique'
+require 'expressir/model/variable'
+require 'expressir/model/where'
+require 'expressir/model/expressions/aggregate_initializer'
+require 'expressir/model/expressions/aggregate_item'
+require 'expressir/model/expressions/binary_expression'
+require 'expressir/model/expressions/call'
+require 'expressir/model/expressions/attribute_reference'
+require 'expressir/model/expressions/entity_constructor'
+require 'expressir/model/expressions/group_reference'
+require 'expressir/model/expressions/index_reference'
+require 'expressir/model/expressions/interval'
+require 'expressir/model/expressions/query_expression'
+require 'expressir/model/expressions/simple_reference'
+require 'expressir/model/expressions/unary_expression'
+require 'expressir/model/literals/binary'
+require 'expressir/model/literals/integer'
+require 'expressir/model/literals/logical'
+require 'expressir/model/literals/real'
+require 'expressir/model/literals/string'
+require 'expressir/model/statements/alias'
+require 'expressir/model/statements/assignment'
+require 'expressir/model/statements/call'
+require 'expressir/model/statements/case'
+require 'expressir/model/statements/case_action'
+require 'expressir/model/statements/compound'
+require 'expressir/model/statements/escape'
+require 'expressir/model/statements/if'
+require 'expressir/model/statements/null'
+require 'expressir/model/statements/repeat'
+require 'expressir/model/statements/return'
+require 'expressir/model/statements/skip'
+require 'expressir/model/types/aggregate'
+require 'expressir/model/types/array'
+require 'expressir/model/types/bag'
+require 'expressir/model/types/binary'
+require 'expressir/model/types/boolean'
+require 'expressir/model/types/enumeration'
+require 'expressir/model/types/generic_entity'
+require 'expressir/model/types/generic'
+require 'expressir/model/types/integer'
+require 'expressir/model/types/list'
+require 'expressir/model/types/logical'
+require 'expressir/model/types/number'
+require 'expressir/model/types/real'
+require 'expressir/model/types/set'
+require 'expressir/model/types/select'
 require 'expressir/model/types/string'

data/lib/expressir/model/attribute.rb

@@ -1,27 +1,29 @@
-module Expressir
-  module Model
-    class Attribute
-      include Identifier
-
-      EXPLICIT = :EXPLICIT
-      DERIVED = :DERIVED
-      INVERSE = :INVERSE
-
-      attr_accessor :kind
-      attr_accessor :supertype_attribute
-      attr_accessor :optional
-      attr_accessor :type
-      attr_accessor :expression
-
-      def initialize(options = {})
-        @id = options[:id]
-
-        @kind = options[:kind]
-        @supertype_attribute = options[:supertype_attribute]
-        @optional = options[:optional]
-        @type = options[:type]
-        @expression = options[:expression]
-      end
-    end
-  end
+module Expressir
+  module Model
+    class Attribute < ModelElement
+      include Identifier
+
+      EXPLICIT = :EXPLICIT
+      DERIVED = :DERIVED
+      INVERSE = :INVERSE
+
+      attr_accessor :kind
+      attr_accessor :supertype_attribute
+      attr_accessor :optional
+      attr_accessor :type
+      attr_accessor :expression
+
+      def initialize(options = {})
+        @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+
+        @kind = options[:kind]
+        @supertype_attribute = options[:supertype_attribute]
+        @optional = options[:optional]
+        @type = options[:type]
+        @expression = options[:expression]
+      end
+    end
+  end
 end

data/lib/expressir/model/constant.rb

@@ -1,17 +1,19 @@
-module Expressir
-  module Model
-    class Constant
-      include Identifier
-
-      attr_accessor :type
-      attr_accessor :expression
-
-      def initialize(options = {})
-        @id = options[:id]
-
-        @type = options[:type]
-        @expression = options[:expression]
-      end
-    end
-  end
+module Expressir
+  module Model
+    class Constant < ModelElement
+      include Identifier
+
+      attr_accessor :type
+      attr_accessor :expression
+
+      def initialize(options = {})
+        @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+
+        @type = options[:type]
+        @expression = options[:expression]
+      end
+    end
+  end
 end

data/lib/expressir/model/entity.rb

@@ -1,46 +1,39 @@
-module Expressir
-  module Model
-    class Entity
-      include Scope
-      include Identifier
-
-      attr_accessor :abstract
-      attr_accessor :supertype_expression
-      attr_accessor :subtype_of
-      attr_accessor :attributes
-      attr_accessor :unique
-      attr_accessor :where
-
-      def initialize(options = {})
-        @id = options[:id]
-
-        @abstract = options[:abstract]
-        @supertype_expression = options[:supertype_expression]
-        @subtype_of = options[:subtype_of]
-        @attributes = options[:attributes]
-        @unique = options[:unique]
-        @where = options[:where]
-      end
-
-      def explicit_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::EXPLICIT}
-      end
-
-      def derived_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::DERIVED}
-      end
-
-      def inverse_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::INVERSE}
-      end
-
-      def children
-        items = []
-        items.push(*@attributes) if @attributes
-        items.push(*@unique) if @unique
-        items.push(*@where) if @where
-        items
-      end
-    end
-  end
+module Expressir
+  module Model
+    class Entity < ModelElement
+      include Scope
+      include Identifier
+
+      attr_accessor :abstract
+      attr_accessor :supertype_expression
+      attr_accessor :subtype_of
+      attr_accessor :attributes
+      attr_accessor :unique
+      attr_accessor :where
+      attr_accessor :informal_propositions
+
+      def initialize(options = {})
+        @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+
+        @abstract = options[:abstract]
+        @supertype_expression = options[:supertype_expression]
+        @subtype_of = options[:subtype_of]
+        @attributes = options.fetch(:attributes, [])
+        @unique = options.fetch(:unique, [])
+        @where = options.fetch(:where, [])
+        @informal_propositions = options.fetch(:informal_propositions, [])
+      end
+
+      def children
+        items = []
+        items.push(*@attributes)
+        items.push(*@unique)
+        items.push(*@where)
+        items.push(*@informal_propositions)
+        items
+      end
+    end
+  end
 end

data/lib/expressir/model/enumeration_item.rb

@@ -1,11 +1,13 @@
-module Expressir
-  module Model
-    class EnumerationItem
-      include Identifier
-
-      def initialize(options = {})
-        @id = options[:id]
-      end
-    end
-  end
+module Expressir
+  module Model
+    class EnumerationItem < ModelElement
+      include Identifier
+
+      def initialize(options = {})
+        @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+      end
+    end
+  end
 end

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

@@ -1,13 +1,13 @@
-module Expressir
-  module Model
-    module Expressions
-      class AggregateInitializer
-        attr_accessor :items
-
-        def initialize(options = {})
-          @items = options[:items]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class AggregateInitializer < ModelElement
+        attr_accessor :items
+
+        def initialize(options = {})
+          @items = options.fetch(:items, [])
+        end
+      end
+    end
+  end
 end

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

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