expressir 0.2.8-x86-mingw32 → 0.2.13-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f1c04da8b8c78468a69c1e7af8aec0933832e91f2c9a5c26eb37e77300ae52
-  data.tar.gz: 0623ad362c34b32997d089c5f207a336871107d11dd20a364575c035aa50bdc0
+  metadata.gz: 8ed3288bba0296e8a2e5a14cfa0131adc2ff64bd0534b6be2f63606996bc3882
+  data.tar.gz: 857a8ae992b9d2f0693b70a7ef1b69c0b7d067d0479b56bf6db45d4fcb00c6f4
 SHA512:
-  metadata.gz: f7807b3f35d9f6fe7cb77576ac3fa8569c10c18dfb7e9cefb1696a2a060dc38bc7301d16091d87ceb3dc1364ae3007285da08b822d86daa383e1eed2cc227635
-  data.tar.gz: 105af5f9f9e2f2aaca1f9036a1f576f4c57e3a7c6debfe86a13b502a0527fb2ab9260dd39886942b4979ed39ac945272a9cbc066b1368d53d38e0c593a5ee82c
+  metadata.gz: 64f6581db4d0b0463c2d61198040227050f31461a6dc5f946e0a76f4ede7e74d12d5c41b6883a3e233af79df9142de3ea7a35e5d56cb5ce0804ed018bb20f5c4
+  data.tar.gz: 980b58d6f69ee4edbda7227d329ba50f8926b11eea4ec2b80f2bf28a2d606e508e5a43580edfaa490c7c29043b3e0f1ef5ad260f582f8d6c836ea7058bf435b6

data/.github/workflows/release.yml

@@ -74,16 +74,10 @@ jobs:
           RUBYGEMS_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
         run: |
           mkdir -p ~/.gem
-          echo "---"
           cat > ~/.gem/credentials << EOF
           ---
           :rubygems_api_key: ${RUBYGEMS_API_KEY}
           EOF
-          echo "---"
           chmod 0600 ~/.gem/credentials
-          echo "---"
-          ls -la ~/.gem
-          echo "---"
-          gem signin --debug
-          echo "---"
+          gem signin
           for gem in pkg/*.gem; do gem push $gem -V; done

data/exe/format

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "expressir/express_exp/parser"
+require "expressir/express_exp/hyperlink_formatter"
+
+input_files = [
+  '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
+  # cyclic reference
+  # '../iso-10303-stepmod/data/resources/product_property_definition_schema/product_property_definition_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/product_property_representation_schema/product_property_representation_schema_annotated.exp'
+]
+
+repo = Expressir::ExpressExp::Parser.from_files(input_files)
+schema = repo.schemas.find{|x| x.id == 'action_schema'}
+# schema = repo.schemas.find{|x| x.id == 'product_property_definition_schema'}
+result = Expressir::ExpressExp::HyperlinkFormatter.format(schema)
+
+puts result

data/expressir.gemspec

@@ -32,11 +32,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "nokogiri", "~> 1.10"
   spec.add_runtime_dependency "thor", "~> 1.0"
-  spec.add_runtime_dependency "rice", "~> 2.2.0"
+  spec.add_runtime_dependency "rice", "~> 3"
   spec.add_development_dependency "antlr4-native", "~> 1.1.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "byebug", "~> 11.1"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rake-compiler", "~> 1.1"
   spec.add_development_dependency "rake-compiler-dock", "~> 1.1"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/expressir/express_exp/formatter.rb

@@ -38,129 +38,129 @@ module Expressir
       end
 
       def format(node)
-        if node.instance_of? Model::Attribute
+        if node.is_a? Model::Attribute
           format_attribute(node)
-        elsif node.instance_of? Model::Constant
+        elsif node.is_a? Model::Constant
           format_constant(node)
-        elsif node.instance_of? Model::Entity
+        elsif node.is_a? Model::Entity
           format_entity(node)
-        elsif node.instance_of? Model::EnumerationItem
+        elsif node.is_a? Model::EnumerationItem
           format_enumeration_item(node)
-        elsif node.instance_of? Model::Function
+        elsif node.is_a? Model::Function
           format_function(node)
-        elsif node.instance_of? Model::Interface
+        elsif node.is_a? Model::Interface
           format_interface(node)
-        elsif node.instance_of? Model::Parameter
+        elsif node.is_a? Model::Parameter
           format_parameter(node)
-        elsif node.instance_of? Model::Procedure
+        elsif node.is_a? Model::Procedure
           format_procedure(node)
-        elsif node.instance_of? Model::RenamedRef
+        elsif node.is_a? Model::RenamedRef
           format_renamed_ref(node)
-        elsif node.instance_of? Model::Repository
+        elsif node.is_a? Model::Repository
           format_repository(node)
-        elsif node.instance_of? Model::Rule
+        elsif node.is_a? Model::Rule
           format_rule(node)
-        elsif node.instance_of? Model::Schema
+        elsif node.is_a? Model::Schema
           format_schema(node)
-        elsif node.instance_of? Model::SubtypeConstraint
+        elsif node.is_a? Model::SubtypeConstraint
           format_subtype_constraint(node)
-        elsif node.instance_of? Model::Type
+        elsif node.is_a? Model::Type
           format_type(node)
-        elsif node.instance_of? Model::Unique
+        elsif node.is_a? Model::Unique
           format_unique(node)
-        elsif node.instance_of? Model::Variable
+        elsif node.is_a? Model::Variable
           format_variable(node)
-        elsif node.instance_of? Model::Where
+        elsif node.is_a? Model::Where
           format_where(node)
-        elsif node.instance_of? Model::Expressions::AggregateInitializer
+        elsif node.is_a? Model::Expressions::AggregateInitializer
           format_expressions_aggregate_initializer(node)
-        elsif node.instance_of? Model::Expressions::AggregateItem
+        elsif node.is_a? Model::Expressions::AggregateItem
           format_expressions_aggregate_item(node)
-        elsif node.instance_of? Model::Expressions::AttributeReference
+        elsif node.is_a? Model::Expressions::AttributeReference
           format_expressions_attribute_reference(node)
-        elsif node.instance_of? Model::Expressions::BinaryExpression
+        elsif node.is_a? Model::Expressions::BinaryExpression
           format_expressions_binary_expression(node)
-        elsif node.instance_of? Model::Expressions::Call
+        elsif node.is_a? Model::Expressions::Call
           format_expressions_call(node)
-        elsif node.instance_of? Model::Expressions::EntityConstructor
+        elsif node.is_a? Model::Expressions::EntityConstructor
           format_expressions_entity_constructor(node)
-        elsif node.instance_of? Model::Expressions::GroupReference
+        elsif node.is_a? Model::Expressions::GroupReference
           format_expressions_group_reference(node)
-        elsif node.instance_of? Model::Expressions::IndexReference
+        elsif node.is_a? Model::Expressions::IndexReference
           format_expressions_index_reference(node)
-        elsif node.instance_of? Model::Expressions::Interval
+        elsif node.is_a? Model::Expressions::Interval
           format_expressions_interval(node)
-        elsif node.instance_of? Model::Expressions::QueryExpression
+        elsif node.is_a? Model::Expressions::QueryExpression
           format_expressions_query_expression(node)
-        elsif node.instance_of? Model::Expressions::SimpleReference
+        elsif node.is_a? Model::Expressions::SimpleReference
           format_expressions_simple_reference(node)
-        elsif node.instance_of? Model::Expressions::UnaryExpression
+        elsif node.is_a? Model::Expressions::UnaryExpression
           format_expressions_unary_expression(node)
-        elsif node.instance_of? Model::Literals::Binary
+        elsif node.is_a? Model::Literals::Binary
           format_literals_binary(node)
-        elsif node.instance_of? Model::Literals::Integer
+        elsif node.is_a? Model::Literals::Integer
           format_literals_integer(node)
-        elsif node.instance_of? Model::Literals::Logical
+        elsif node.is_a? Model::Literals::Logical
           format_literals_logical(node)
-        elsif node.instance_of? Model::Literals::Real
+        elsif node.is_a? Model::Literals::Real
           format_literals_real(node)
-        elsif node.instance_of? Model::Literals::String
+        elsif node.is_a? Model::Literals::String
           format_literals_string(node)
-        elsif node.instance_of? Model::Statements::Alias
+        elsif node.is_a? Model::Statements::Alias
           format_statements_alias(node)
-        elsif node.instance_of? Model::Statements::Assignment
+        elsif node.is_a? Model::Statements::Assignment
           format_statements_assignment(node)
-        elsif node.instance_of? Model::Statements::Call
+        elsif node.is_a? Model::Statements::Call
           format_statements_call(node)
-        elsif node.instance_of? Model::Statements::Case
+        elsif node.is_a? Model::Statements::Case
           format_statements_case(node)
-        elsif node.instance_of? Model::Statements::CaseAction
+        elsif node.is_a? Model::Statements::CaseAction
           format_statements_case_action(node)
-        elsif node.instance_of? Model::Statements::Compound
+        elsif node.is_a? Model::Statements::Compound
           format_statements_compound(node)
-        elsif node.instance_of? Model::Statements::Escape
+        elsif node.is_a? Model::Statements::Escape
           format_statements_escape(node)
-        elsif node.instance_of? Model::Statements::If
+        elsif node.is_a? Model::Statements::If
           format_statements_if(node)
-        elsif node.instance_of? Model::Statements::Null
+        elsif node.is_a? Model::Statements::Null
           format_statements_null(node)
-        elsif node.instance_of? Model::Statements::Repeat
+        elsif node.is_a? Model::Statements::Repeat
           format_statements_repeat(node)
-        elsif node.instance_of? Model::Statements::Return
+        elsif node.is_a? Model::Statements::Return
           format_statements_return(node)
-        elsif node.instance_of? Model::Statements::Skip
+        elsif node.is_a? Model::Statements::Skip
           format_statements_skip(node)
-        elsif node.instance_of? Model::Types::Aggregate
+        elsif node.is_a? Model::Types::Aggregate
           format_types_aggregate(node)
-        elsif node.instance_of? Model::Types::Array
+        elsif node.is_a? Model::Types::Array
           format_types_array(node)
-        elsif node.instance_of? Model::Types::Bag
+        elsif node.is_a? Model::Types::Bag
           format_types_bag(node)
-        elsif node.instance_of? Model::Types::Binary
+        elsif node.is_a? Model::Types::Binary
           format_types_binary(node)
-        elsif node.instance_of? Model::Types::Boolean
+        elsif node.is_a? Model::Types::Boolean
           format_types_boolean(node)
-        elsif node.instance_of? Model::Types::Enumeration
+        elsif node.is_a? Model::Types::Enumeration
           format_types_enumeration(node)
-        elsif node.instance_of? Model::Types::GenericEntity
+        elsif node.is_a? Model::Types::GenericEntity
           format_types_generic_entity(node)
-        elsif node.instance_of? Model::Types::Generic
+        elsif node.is_a? Model::Types::Generic
           format_types_generic(node)
-        elsif node.instance_of? Model::Types::Integer
+        elsif node.is_a? Model::Types::Integer
           format_types_integer(node)
-        elsif node.instance_of? Model::Types::List
+        elsif node.is_a? Model::Types::List
           format_types_list(node)
-        elsif node.instance_of? Model::Types::Logical
+        elsif node.is_a? Model::Types::Logical
           format_types_logical(node)
-        elsif node.instance_of? Model::Types::Number
+        elsif node.is_a? Model::Types::Number
           format_types_number(node)
-        elsif node.instance_of? Model::Types::Real
+        elsif node.is_a? Model::Types::Real
           format_types_real(node)
-        elsif node.instance_of? Model::Types::Select
+        elsif node.is_a? Model::Types::Select
           format_types_select(node)
-        elsif node.instance_of? Model::Types::Set
+        elsif node.is_a? Model::Types::Set
           format_types_set(node)
-        elsif node.instance_of? Model::Types::String
+        elsif node.is_a? Model::Types::String
           format_types_string(node)
         else
           puts node.class
@@ -233,6 +233,10 @@ module Expressir
       end
 
       def format_entity(node)
+        explicit_attributes = node.attributes.select{|x| x.kind == Model::Attribute::EXPLICIT}
+        derived_attributes = node.attributes.select{|x| x.kind == Model::Attribute::DERIVED}
+        inverse_attributes = node.attributes.select{|x| x.kind == Model::Attribute::INVERSE}
+
         [
           [
             'ENTITY',
@@ -290,19 +294,19 @@ module Expressir
             end,
             ';'
           ].join(''),
-          *if node.explicit_attributes and node.explicit_attributes.length > 0
-            indent(node.explicit_attributes.map{|x| format(x)}.join("\n"))
+          *if explicit_attributes and explicit_attributes.length > 0
+            indent(explicit_attributes.map{|x| format(x)}.join("\n"))
           end,
-          *if node.derived_attributes and node.derived_attributes.length > 0
+          *if derived_attributes and derived_attributes.length > 0
             indent([
               'DERIVE',
-              indent(node.derived_attributes.map{|x| format(x)}.join("\n")),
+              indent(derived_attributes.map{|x| format(x)}.join("\n")),
             ].join("\n"))
           end,
-          *if node.inverse_attributes and node.inverse_attributes.length > 0
+          *if inverse_attributes and inverse_attributes.length > 0
             indent([
               'INVERSE',
-              indent(node.inverse_attributes.map{|x| format(x)}.join("\n")),
+              indent(inverse_attributes.map{|x| format(x)}.join("\n")),
             ].join("\n"))
           end,
           *if node.unique and node.unique.length > 0
@@ -347,8 +351,20 @@ module Expressir
             format(node.return_type),
             ';'
           ].join(''),
-          *if node.declarations and node.declarations.length > 0
-            indent(node.declarations.map{|x| format(x)}.join("\n"))
+          *if node.types and node.types.length > 0
+            indent(node.types.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.entities and node.entities.length > 0
+            indent(node.entities.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.functions and node.functions.length > 0
+            indent(node.functions.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.procedures and node.procedures.length > 0
+            indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
           *if node.constants and node.constants.length > 0
             indent([
@@ -395,7 +411,7 @@ module Expressir
               "\n",
               INDENT,
               '(',
-              node.items.map{|x| format(x)},
+              node.items.map{|x| format(x)}.join(', '),
               ')'
             ].join('')
           end,
@@ -434,8 +450,20 @@ module Expressir
             end,
             ';'
           ].join(''),
-          *if node.declarations and node.declarations.length > 0
-            indent(node.declarations.map{|x| format(x)}.join("\n"))
+          *if node.types and node.types.length > 0
+            indent(node.types.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.entities and node.entities.length > 0
+            indent(node.entities.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.functions and node.functions.length > 0
+            indent(node.functions.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.procedures and node.procedures.length > 0
+            indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
           *if node.constants and node.constants.length > 0
             indent([
@@ -481,8 +509,7 @@ module Expressir
         [
           *if node.schemas and node.schemas.length > 0
             node.schemas.map{|node| format(node)}
-          end,
-          *format_scope_remarks(node)
+          end
         ].join("\n")
       end
 
@@ -500,8 +527,20 @@ module Expressir
             ')',
             ';'
           ].join(''),
-          *if node.declarations and node.declarations.length > 0
-            indent(node.declarations.map{|x| format(x)}.join("\n"))
+          *if node.types and node.types.length > 0
+            indent(node.types.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.entities and node.entities.length > 0
+            indent(node.entities.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.functions and node.functions.length > 0
+            indent(node.functions.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.procedures and node.procedures.length > 0
+            indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
           *if node.constants and node.constants.length > 0
             indent([
@@ -566,13 +605,29 @@ module Expressir
               ].join('')
             ].join("\n")
           end,
-          *if node.declarations and node.declarations.length > 0
-            node.declarations.map{|x| format(x)}.join("\n\n")
+          *if node.types and node.types.length > 0
+            node.types.map{|x| format(x)}.join("\n")
+          end,
+          *if node.entities and node.entities.length > 0
+            node.entities.map{|x| format(x)}.join("\n")
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            node.subtype_constraints.map{|x| format(x)}.join("\n")
+          end,
+          *if node.functions and node.functions.length > 0
+            node.functions.map{|x| format(x)}.join("\n")
+          end,
+          *if node.procedures and node.procedures.length > 0
+            node.procedures.map{|x| format(x)}.join("\n")
+          end,
+          *if node.rules and node.rules.length > 0
+            node.rules.map{|x| format(x)}.join("\n")
           end,
           [
             'END_SCHEMA',
             ';'
-          ].join('')
+          ].join(''),
+          *format_scope_remarks(node)
         ].join("\n")
       end
 
@@ -718,11 +773,11 @@ module Expressir
 
       def format_expressions_binary_expression(node)
         [
-          *if node.operand1.instance_of? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand1.operator] > OPERATOR_PRECEDENCE[node.operator]
+          *if node.operand1.is_a? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand1.operator] > OPERATOR_PRECEDENCE[node.operator]
             '('
           end,
           format(node.operand1),
-          *if node.operand1.instance_of? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand1.operator] > OPERATOR_PRECEDENCE[node.operator]
+          *if node.operand1.is_a? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand1.operator] > OPERATOR_PRECEDENCE[node.operator]
             ')'
           end,
           ' ',
@@ -751,11 +806,11 @@ module Expressir
             when Model::Expressions::BinaryExpression::XOR then 'XOR'
           end,
           ' ',
-          *if node.operand2.instance_of? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand2.operator] > OPERATOR_PRECEDENCE[node.operator]
+          *if node.operand2.is_a? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand2.operator] > OPERATOR_PRECEDENCE[node.operator]
             '('
           end,
           format(node.operand2),
-          *if node.operand2.instance_of? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand2.operator] > OPERATOR_PRECEDENCE[node.operator]
+          *if node.operand2.is_a? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand2.operator] > OPERATOR_PRECEDENCE[node.operator]
             ')'
           end,
         ].join('')
@@ -856,11 +911,11 @@ module Expressir
           if node.operator == Model::Expressions::UnaryExpression::NOT
             ' '
           end,
-          *if node.operand.instance_of? Model::Expressions::BinaryExpression
+          *if node.operand.is_a? Model::Expressions::BinaryExpression
             '('
           end,
           format(node.operand),
-          *if node.operand.instance_of? Model::Expressions::BinaryExpression
+          *if node.operand.is_a? Model::Expressions::BinaryExpression
             ')'
           end
         ].join('')
@@ -1226,7 +1281,7 @@ module Expressir
               format(node.extension_type)
             ].join('')
           end,
-          *if node.extension_items
+          *if node.extension_items and node.extension_items.length > 0
             [
               ' ',
               'WITH',
@@ -1330,7 +1385,7 @@ module Expressir
               format(node.extension_type)
             ].join('')
           end,
-          *if node.extension_items
+          *if node.extension_items and node.extension_items.length > 0
             [
               ' ',
               'WITH',
@@ -1387,25 +1442,13 @@ module Expressir
         str.split("\n").map{|x| "#{INDENT}#{x}"}.join("\n")
       end
 
-      def format_remark_ref(node)
-        [
-          *if node.class.method_defined? :parent and node.parent.class.method_defined? :id and node.parent != node
-            [
-              format_remark_ref(node.parent),
-              '.'
-            ].join('')
-          end,
-          node.id,
-        ].join('')
-      end
-
       def format_remark(node, remark)
         if remark.include?("\n")
           [
             [
               '(*',
               '"',
-              format_remark_ref(node),
+              node.path,
               '"',
             ].join(''),
             remark,
@@ -1415,7 +1458,7 @@ module Expressir
           [
             '--',
             '"',
-            format_remark_ref(node),
+            node.path,
             '"',
             ' ',
             remark
@@ -1424,7 +1467,7 @@ module Expressir
       end
 
       def format_remarks(node)
-        if node.class.method_defined? :remarks and node.remarks and node.remarks.length > 0
+        if node.class.method_defined? :remarks
           node.remarks.map do |remark|
             format_remark(node, remark)
           end
@@ -1436,13 +1479,7 @@ module Expressir
       def format_scope_remarks(node)
         [
           *format_remarks(node),
-          *if node.class.method_defined? :children
-            node.children.flat_map do |x|
-              if x != node
-                format_scope_remarks(x)
-              end
-            end
-          end
+          *node.children.select{|x| !x.is_a? Model::EnumerationItem or node.is_a? Model::Type}.flat_map{|x| format_scope_remarks(x)}
         ]
       end
     end