expressir 0.2.10-x64-mingw32 → 0.2.15-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e3dbce96c7e7bb9c57a38c2f89b8ac1d03968b3e2fd9795908b5b5e8dd5c085
-  data.tar.gz: 8bac901364424d8ae620f7b953f2d5c3591daf16653857edbd6c27d2a05afae1
+  metadata.gz: 38f40d5af0bb6f8d9d71a15fe4bf060933440af50eabfde86b4f397aa8d516bc
+  data.tar.gz: f9133c2173e7f8d03c8f605f8f0841173c1e4e00e4f5b6203016543d569a5c1e
 SHA512:
-  metadata.gz: 4296510a0d587dfa1ba56ccb45e4b62c455b3fef858d179b5b4b0451391822b5a8c07e2b5de764cd9a8ef20a2b6f5d7c009edaaff6a1fc77071701118b22c404
-  data.tar.gz: e6352b83f7032e56fa7a8b3f5e54102226485279262c8d2834989f032ff69dfed4258eb209f4b9edbbfbcb393a70cd07bef9060a2a6a8be93900ff5e63cdab07
+  metadata.gz: 51da2d73670e7e68124c40b205ee0bdaee73d40ff2be2d13422cf7edb1365df5778e27a5db5adeb9f2290273493a0dbd26be4aba19b670374453c6bc06d0141b
+  data.tar.gz: c3e247487bcf77e138bd8ab9d53fac9582f6a15073af5c059f3a941c0bf3aabd85314b453c83308fc7ef930652bb71fde1ff1a70ad8ea2de47a99e1e481fbeca

data/exe/format

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require "expressir/express_exp/parser"
+require "expressir/express_exp/hyperlink_formatter"
+
+input_files = [
+  # basic test
+  # '../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 test
+  # '../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'
+  # renamed reference test
+  '../iso-10303-stepmod/ballots/ballots/ap210_wg12/express/resources/mathematical_functions_schema.exp',
+  '../iso-10303-stepmod/data/resources/iso13584_expressions_schema/iso13584_expressions_schema.exp',
+  # all valid iso-10303-stepmod files (takes 10 min)
+  # *`bundle exec ../stepmod-utils/exe/stepmod-find-express-files ../iso-10303-stepmod`.strip.split("\n").map{|file| File.exists?(file.sub(/\.exp$/, '_annotated.exp')) ? file.sub(/\.exp$/, '_annotated.exp') : file}
+]
+
+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'}
+schema = repo.schemas.find{|x| x.id == 'mathematical_functions_schema'}
+result = Expressir::ExpressExp::HyperlinkFormatter.format(schema)
+
+puts result

data/expressir.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   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 "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"

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::InterfaceItem
+          format_interface_item(node)
+        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
-          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
@@ -419,6 +419,20 @@ module Expressir
         ].join('')
       end
 
+      def format_interface_item(node)
+        [
+          format(node.ref),
+          *if node.id
+            [
+              ' ',
+              'AS',
+              ' ',
+              node.id
+            ]
+          end
+        ].join('')
+      end
+
       def format_parameter(node)
         [
           *if node.var
@@ -495,22 +509,11 @@ module Expressir
         ].join("\n")
       end
 
-      def format_renamed_ref(node)
-        [
-          format(node.ref),
-          ' ',
-          'AS',
-          ' ',
-          node.id
-        ].join('')
-      end
-
       def format_repository(node)
         [
           *if node.schemas and node.schemas.length > 0
             node.schemas.map{|node| format(node)}
-          end,
-          *format_scope_remarks(node)
+          end
         ].join("\n")
       end
 
@@ -627,7 +630,8 @@ module Expressir
           [
             'END_SCHEMA',
             ';'
-          ].join('')
+          ].join(''),
+          *format_scope_remarks(node)
         ].join("\n")
       end
 
@@ -773,11 +777,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,
           ' ',
@@ -806,11 +810,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('')
@@ -911,11 +915,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('')
@@ -1442,25 +1446,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,
@@ -1470,7 +1462,7 @@ module Expressir
           [
             '--',
             '"',
-            format_remark_ref(node),
+            node.path,
             '"',
             ' ',
             remark
@@ -1479,7 +1471,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
@@ -1491,9 +1483,7 @@ module Expressir
       def format_scope_remarks(node)
         [
           *format_remarks(node),
-          *if node.class.method_defined? :children
-            node.children.select{|x| x.parent == node}.flat_map{|x| format_scope_remarks(x)}
-          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

data/lib/expressir/express_exp/hyperlink_formatter.rb

@@ -0,0 +1,29 @@
+require "expressir/express_exp/formatter"
+
+module Expressir
+  module ExpressExp
+    class HyperlinkFormatter < Formatter
+      def format_expressions_simple_reference(node)
+        return node.id if node.parent.is_a? Model::Expressions::AttributeReference
+
+        # skip hyperlink if target node can't be found
+        target_node = if node.parent.is_a? Model::InterfaceItem
+          node.find("#{node.parent.parent.schema.id}.#{node.parent.ref.id}")
+        else
+          node.find(node.id)
+        end
+        return node.id unless target_node
+
+        # skip hyperlink for implicit scopes
+        return node.id if target_node.is_a? Model::Statements::Alias or target_node.is_a? Model::Statements::Repeat or target_node.is_a? Model::Expressions::QueryExpression
+
+        # skip hyperlink if this node and target node are in the same main item
+        node_path_parts = node.path.split(".")
+        target_node_path_parts = target_node.path.split(".")
+        return node.id if node_path_parts[0..1] == target_node_path_parts[0..1]
+
+        "{{{<<express:#{target_node.path},#{node.id}>>}}}"
+      end
+    end
+  end
+end

data/lib/expressir/express_exp/parser.rb

@@ -34,15 +34,21 @@ module Expressir
         visitor = Visitor.new(parser.tokens)
         repo = visitor.visit(parse_tree)
 
+        repo.schemas.each{|schema| schema.file = file}
+
         repo
       end
 
       def self.from_files(files)
         schemas = files.map{|file| self.from_file(file).schemas}.flatten
 
-        Model::Repository.new({
+        repo = Model::Repository.new({
           schemas: schemas
         })
+
+        repo.schemas.each{|schema| schema.parent = repo}
+
+        repo
       end
 
       # deprecated