expressir 0.2.2 → 0.2.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -166,6 +166,7 @@ files:
 - lib/expressir/express/type_select.rb
 - lib/expressir/express/unique_rule.rb
 - lib/expressir/express/where_rule.rb
+- lib/expressir/express_exp/formatter.rb
 - lib/expressir/express_exp/generated/ExpressBaseVisitor.rb
 - lib/expressir/express_exp/generated/ExpressLexer.rb
 - lib/expressir/express_exp/generated/ExpressParser.rb
@@ -174,73 +175,44 @@ files:
 - lib/expressir/express_exp/visitor.rb
 - lib/expressir/express_parser.rb
 - lib/expressir/model.rb
+- lib/expressir/model/attribute.rb
 - lib/expressir/model/constant.rb
-- lib/expressir/model/derived.rb
 - lib/expressir/model/entity.rb
 - lib/expressir/model/enumeration_item.rb
-- lib/expressir/model/explicit.rb
-- lib/expressir/model/expressions/aggregate_element.rb
 - lib/expressir/model/expressions/aggregate_initializer.rb
-- lib/expressir/model/expressions/attribute_qualifier.rb
+- lib/expressir/model/expressions/aggregate_item.rb
+- lib/expressir/model/expressions/attribute_reference.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/expression.rb
-- lib/expressir/model/expressions/function_call.rb
-- lib/expressir/model/expressions/group_qualifier.rb
-- lib/expressir/model/expressions/index_qualifier.rb
+- lib/expressir/model/expressions/group_reference.rb
+- lib/expressir/model/expressions/index_reference.rb
 - lib/expressir/model/expressions/interval.rb
-- lib/expressir/model/expressions/qualified_ref.rb
-- lib/expressir/model/expressions/query.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/inverse.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/local.rb
-- lib/expressir/model/operators/addition.rb
-- lib/expressir/model/operators/and.rb
-- lib/expressir/model/operators/andor.rb
-- lib/expressir/model/operators/combine.rb
-- lib/expressir/model/operators/equal.rb
-- lib/expressir/model/operators/exponentiation.rb
-- lib/expressir/model/operators/greater_than.rb
-- lib/expressir/model/operators/greater_than_or_equal.rb
-- lib/expressir/model/operators/in.rb
-- lib/expressir/model/operators/instance_equal.rb
-- lib/expressir/model/operators/instance_not_equal.rb
-- lib/expressir/model/operators/integer_division.rb
-- lib/expressir/model/operators/less_than.rb
-- lib/expressir/model/operators/less_than_or_equal.rb
-- lib/expressir/model/operators/like.rb
-- lib/expressir/model/operators/modulo.rb
-- lib/expressir/model/operators/multiplication.rb
-- lib/expressir/model/operators/not.rb
-- lib/expressir/model/operators/not_equal.rb
-- lib/expressir/model/operators/oneof.rb
-- lib/expressir/model/operators/or.rb
-- lib/expressir/model/operators/real_division.rb
-- lib/expressir/model/operators/subtraction.rb
-- lib/expressir/model/operators/unary_minus.rb
-- lib/expressir/model/operators/unary_plus.rb
-- lib/expressir/model/operators/xor.rb
 - lib/expressir/model/parameter.rb
 - lib/expressir/model/procedure.rb
-- lib/expressir/model/ref.rb
-- lib/expressir/model/reference.rb
 - lib/expressir/model/renamed_ref.rb
 - lib/expressir/model/repository.rb
 - lib/expressir/model/rule.rb
 - lib/expressir/model/schema.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
@@ -263,7 +235,7 @@ files:
 - lib/expressir/model/types/set.rb
 - lib/expressir/model/types/string.rb
 - lib/expressir/model/unique.rb
-- lib/expressir/model/use.rb
+- lib/expressir/model/variable.rb
 - lib/expressir/model/where.rb
 - lib/expressir/parser.rb
 - lib/expressir/parser/owl_parser.rb
@@ -298,7 +270,9 @@ files:
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xmi
 - 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/syntax.exp
+- original/examples/syntax/syntax_formatted.exp
 - original/exp2ruby.rb
 - original/expsm.rb
 - original/mapping_owl.rb
@@ -310,8 +284,10 @@ files:
 - spec/acceptance/version_spec.rb
 - spec/expressir/express/repository_spec.rb
 - spec/expressir/express_exp/ap233_spec.rb
-- spec/expressir/express_exp/remark_spec.rb
-- spec/expressir/express_exp/syntax_spec.rb
+- spec/expressir/express_exp/format_remark_spec.rb
+- spec/expressir/express_exp/format_syntax_spec.rb
+- spec/expressir/express_exp/parse_remark_spec.rb
+- spec/expressir/express_exp/parse_syntax_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb

data/lib/expressir/model/explicit.rb

@@ -1,19 +0,0 @@
-module Expressir
-  module Model
-    class Explicit
-      attr_accessor :id
-      attr_accessor :supertype_attribute
-      attr_accessor :optional
-      attr_accessor :type
-      attr_accessor :remarks
-
-      def initialize(options = {})
-        @id = options[:id]
-        @supertype_attribute = options[:supertype_attribute]
-        @optional = options[:optional]
-        @type = options[:type]
-        @remarks = options[:remarks]
-      end
-    end
-  end
-end

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

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

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

@@ -1,15 +0,0 @@
-module Expressir
-  module Model
-    module Expressions
-      class QualifiedRef
-        attr_accessor :ref
-        attr_accessor :qualifiers
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @qualifiers = options[:qualifiers]
-        end
-      end
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-module Expressir
-    module Model
-      module Expressions
-        class Query
-          attr_accessor :id
-          attr_accessor :source
-          attr_accessor :expression
-          attr_accessor :remarks
-  
-          def initialize(options = {})
-            @id = options[:id]
-            @source = options[:source]
-            @expression = options[:expression]
-            @remarks = options[:remarks]
-          end
-
-          def scope_items
-            items = []
-            items.push(self)
-            items
-          end
-        end
-      end
-    end
-  end

data/lib/expressir/model/inverse.rb

@@ -1,19 +0,0 @@
-module Expressir
-  module Model
-    class Inverse
-      attr_accessor :id
-      attr_accessor :supertype_attribute
-      attr_accessor :type
-      attr_accessor :attribute
-      attr_accessor :remarks
-
-      def initialize(options = {})
-        @id = options[:id]
-        @supertype_attribute = options[:supertype_attribute]
-        @type = options[:type]
-        @attribute = options[:attribute]
-        @remarks = options[:remarks]
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/addition.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Addition
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/and.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class And
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/andor.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Andor
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/combine.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Combine
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/equal.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Equal
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/exponentiation.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Exponentiation
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/greater_than.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class GreaterThan
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/greater_than_or_equal.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class GreaterThanOrEqual
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/in.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class In
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/instance_equal.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class InstanceEqual
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/instance_not_equal.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class InstanceNotEqual
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/integer_division.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class IntegerDivision
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/less_than.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class LessThan
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/less_than_or_equal.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class LessThanOrEqual
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/like.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Like
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/modulo.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Modulo
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/multiplication.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Multiplication
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/not.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Not
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/not_equal.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class NotEqual
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/oneof.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Oneof
-      end
-    end
-  end
-end

data/lib/expressir/model/operators/or.rb

@@ -1,8 +0,0 @@
-module Expressir
-  module Model
-    module Operators
-      class Or
-      end
-    end
-  end
-end