expressir 0.2.9-x86-mingw32 → 0.2.10-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb9f59220d257fb94378b5af338bd85183d38a38f0b410c4970e0a3e03cbf55
-  data.tar.gz: 236ee875325b9df509932b6640df2ae4bd247f729b9032e445dac92b8530bcbe
+  metadata.gz: 6e94f87997672212725a0ad9c198f2eeccefb16ff107b908bed94636dfd52780
+  data.tar.gz: 813c913be662de5154486b3f137d9cf97c3036c4e530da1daf89be3482ece51e
 SHA512:
-  metadata.gz: 0ac9baa4afb7313977a6a5b64d764a561bbee38f09e754f340446cca8f562bc9daa117d4b90b55abdbec621305743c0148698d84b318bacadf9df6e0d0217da3
-  data.tar.gz: 3d167c0cf9ed34bd2ba9f93ad33f24e5d54660a3092de890d30a39a2180aa4fdc158a3efe35cff881840029be5e9c7d5285b504abaff75368fcacc4fcb53c7e5
+  metadata.gz: 140390c63d94fde61fbdb12f16b7d1c447cf178c6902094d5174185e69db58755623e9d2d8d5965fcf79d313e0666c744f1a1d6db6c8077049d392640887fe20
+  data.tar.gz: 138b2066b6c9723a5d577304476824bdf514fe1abd8ead084632b79f66d73201078379e37c708ab14c2ba78a3fa1e212f06bf46f4f79783b2a42c78cce18a663

data/lib/expressir/express_exp/formatter.rb

@@ -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([
@@ -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([
@@ -500,8 +528,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,8 +606,23 @@ 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',
@@ -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',

data/lib/expressir/express_exp/visitor.rb

@@ -26,6 +26,10 @@ require "set"
 #
 # static shorthands are unwrapped
 # - entity attributes, function/procedure parameters, local variables
+#
+# all access to ctx members must happen before calling other visitor code
+# - prevents segfault in ANTLR4 C++ runtime, not sure why they are caused
+# - e.g. see visit_schema_decl
 
 module Expressir
   module ExpressExp
@@ -47,16 +51,28 @@ module Expressir
         result
       end
 
-      def visit_if(ctx)
-        visit(ctx) if ctx
+      def visit_if(ctx, default = nil)
+        if ctx
+          visit(ctx)
+        else
+          default
+        end
       end
     
       def visit_if_map(ctx)
-        ctx.map{|ctx2| visit(ctx2)} if ctx
+        if ctx
+          ctx.map{|ctx2| visit(ctx2)}
+        else
+          []
+        end
       end
     
       def visit_if_map_flatten(ctx)
-        ctx.map{|ctx2| visit(ctx2)}.flatten if ctx
+        if ctx
+          ctx.map{|ctx2| visit(ctx2)}.flatten
+        else
+          []
+        end
       end
 
       def get_tokens_source(tokens)
@@ -416,8 +432,8 @@ module Expressir
 
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
-        optional = !!ctx__OPTIONAL
-        unique = !!ctx__UNIQUE
+        optional = ctx__OPTIONAL && true
+        unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__instantiable_type)
         
         Model::Types::Array.new({
@@ -501,7 +517,7 @@ module Expressir
         ctx__width_spec__FIXED = ctx__width_spec&.FIXED
 
         width = visit_if(ctx__width_spec__width)
-        fixed = !!ctx__width_spec__FIXED
+        fixed = ctx__width_spec__FIXED && true
 
         Model::Types::Binary.new({
           width: width,
@@ -753,7 +769,7 @@ module Expressir
         ctx__entity_body__where_clause = ctx__entity_body&.where_clause
 
         id = visit_if(ctx__entity_head__entity_id)
-        abstract = !!(ctx__entity_head__subsuper__supertype_constraint__abstract_entity_declaration || ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration)
+        abstract = (ctx__entity_head__subsuper__supertype_constraint__abstract_entity_declaration || ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration) && true
         supertype_expression = visit_if(ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration || ctx__entity_head__subsuper__supertype_constraint__supertype_rule)
         subtype_of = visit_if(ctx__entity_head__subsuper__subtype_declaration)
         attributes = [
@@ -761,8 +777,8 @@ module Expressir
           *visit_if(ctx__entity_body__derive_clause),
           *visit_if(ctx__entity_body__inverse_clause)
         ]
-        unique = visit_if(ctx__entity_body__unique_clause)
-        where = visit_if(ctx__entity_body__where_clause)
+        unique = visit_if(ctx__entity_body__unique_clause, [])
+        where = visit_if(ctx__entity_body__where_clause, [])
 
         Model::Entity.new({
           id: id,
@@ -835,10 +851,10 @@ module Expressir
         ctx__enumeration_extension__type_ref = ctx__enumeration_extension&.type_ref
         ctx__enumeration_extension__enumeration_items = ctx__enumeration_extension&.enumeration_items
 
-        extensible = !!ctx__EXTENSIBLE
-        items = visit_if(ctx__enumeration_items)
+        extensible = ctx__EXTENSIBLE && true
+        items = visit_if(ctx__enumeration_items, [])
         extension_type = visit_if(ctx__enumeration_extension__type_ref)
-        extension_items = visit_if(ctx__enumeration_extension__enumeration_items)
+        extension_items = visit_if(ctx__enumeration_extension__enumeration_items, [])
 
         Model::Types::Enumeration.new({
           extensible: extensible,
@@ -858,7 +874,7 @@ module Expressir
         ctx__parameter_type = ctx.parameter_type
 
         attributes = visit_if_map(ctx__attribute_decl)
-        optional = !!ctx__OPTIONAL
+        optional = ctx__OPTIONAL && true
         type = visit_if(ctx__parameter_type)
 
         attributes.map do |attribute|
@@ -932,7 +948,7 @@ module Expressir
         ctx__actual_parameter_list = ctx.actual_parameter_list
 
         ref = visit_if(ctx__built_in_function || ctx__function_ref)
-        parameters = visit_if(ctx__actual_parameter_list)
+        parameters = visit_if(ctx__actual_parameter_list, [])
 
         Model::Expressions::Call.new({
           ref: ref,
@@ -955,15 +971,24 @@ module Expressir
         parameters = visit_if_map_flatten(ctx__function_head__formal_parameter)
         return_type = visit_if(ctx__function_head__parameter_type)
         declarations = visit_if_map(ctx__algorithm_head__declaration)
-        constants = visit_if(ctx__algorithm_head__constant_decl)
-        variables = visit_if(ctx__algorithm_head__local_decl)
+        types = declarations.select{|x| x.instance_of? Model::Type}
+        entities = declarations.select{|x| x.instance_of? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.instance_of? Model::Function}
+        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
+        constants = visit_if(ctx__algorithm_head__constant_decl, [])
+        variables = visit_if(ctx__algorithm_head__local_decl, [])
         statements = visit_if_map(ctx__stmt)
 
         Model::Function.new({
           id: id,
           parameters: parameters,
           return_type: return_type,
-          declarations: declarations,
+          types: types,
+          entities: entities,
+          subtype_constraints: subtype_constraints,
+          functions: functions,
+          procedures: procedures,
           constants: constants,
           variables: variables,
           statements: statements
@@ -1008,8 +1033,8 @@ module Expressir
 
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
-        optional = !!ctx__OPTIONAL
-        unique = !!ctx__UNIQUE
+        optional = ctx__OPTIONAL && true
+        unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__parameter_type)
         
         Model::Types::Array.new({
@@ -1047,7 +1072,7 @@ module Expressir
 
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
-        unique = !!ctx__UNIQUE
+        unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__parameter_type)
         
         Model::Types::List.new({
@@ -1122,8 +1147,8 @@ module Expressir
         ctx__if_stmt_else_statements = ctx.if_stmt_else_statements
 
         expression = visit_if(ctx__logical_expression)
-        statements = visit_if(ctx__if_stmt_statements)
-        else_statements = visit_if(ctx__if_stmt_else_statements)
+        statements = visit_if(ctx__if_stmt_statements, [])
+        else_statements = visit_if(ctx__if_stmt_else_statements, [])
 
         Model::Statements::If.new({
           expression: expression,
@@ -1337,7 +1362,7 @@ module Expressir
 
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
-        unique = !!ctx__UNIQUE
+        unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__instantiable_type)
         
         Model::Types::List.new({
@@ -1553,7 +1578,7 @@ module Expressir
         ctx__actual_parameter_list = ctx.actual_parameter_list
 
         ref = visit_if(ctx__built_in_procedure || ctx__procedure_ref)
-        parameters = visit_if(ctx__actual_parameter_list)
+        parameters = visit_if(ctx__actual_parameter_list, [])
 
         Model::Statements::Call.new({
           ref: ref,
@@ -1574,14 +1599,23 @@ module Expressir
         id = visit_if(ctx__procedure_head__procedure_id)
         parameters = visit_if_map_flatten(ctx__procedure_head__procedure_head_parameter)
         declarations = visit_if_map(ctx__algorithm_head__declaration)
-        constants = visit_if(ctx__algorithm_head__constant_decl)
-        variables = visit_if(ctx__algorithm_head__local_decl)
+        types = declarations.select{|x| x.instance_of? Model::Type}
+        entities = declarations.select{|x| x.instance_of? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.instance_of? Model::Function}
+        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
+        constants = visit_if(ctx__algorithm_head__constant_decl, [])
+        variables = visit_if(ctx__algorithm_head__local_decl, [])
         statements = visit_if_map(ctx__stmt)
 
         Model::Procedure.new({
           id: id,
           parameters: parameters,
-          declarations: declarations,
+          types: types,
+          entities: entities,
+          subtype_constraints: subtype_constraints,
+          functions: functions,
+          procedures: procedures,
           constants: constants,
           variables: variables,
           statements: statements
@@ -1858,15 +1892,24 @@ module Expressir
         id = visit_if(ctx__rule_head__rule_id)
         applies_to = visit_if_map(ctx__rule_head__entity_ref)
         declarations = visit_if_map(ctx__algorithm_head__declaration)
-        constants = visit_if(ctx__algorithm_head__constant_decl)
-        variables = visit_if(ctx__algorithm_head__local_decl)
+        types = declarations.select{|x| x.instance_of? Model::Type}
+        entities = declarations.select{|x| x.instance_of? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.instance_of? Model::Function}
+        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
+        constants = visit_if(ctx__algorithm_head__constant_decl, [])
+        variables = visit_if(ctx__algorithm_head__local_decl, [])
         statements = visit_if_map(ctx__stmt)
-        where = visit_if(ctx__where_clause)
+        where = visit_if(ctx__where_clause, [])
 
         Model::Rule.new({
           id: id,
           applies_to: applies_to,
-          declarations: declarations,
+          types: types,
+          entities: entities,
+          subtype_constraints: subtype_constraints,
+          functions: functions,
+          procedures: procedures,
           constants: constants,
           variables: variables,
           statements: statements,
@@ -1912,15 +1955,26 @@ module Expressir
         id = visit_if(ctx__schema_id)
         version = visit_if(ctx__schema_version_id)
         interfaces = visit_if_map(ctx__schema_body__interface_specification)
-        constants = visit_if(ctx__schema_body__constant_decl)
+        constants = visit_if(ctx__schema_body__constant_decl, [])
         declarations = visit_if_map(ctx__schema_body__schema_body_declaration)
+        types = declarations.select{|x| x.instance_of? Model::Type}
+        entities = declarations.select{|x| x.instance_of? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.instance_of? Model::Function}
+        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
+        rules = declarations.select{|x| x.instance_of? Model::Rule}
 
         Model::Schema.new({
           id: id,
           version: version,
           interfaces: interfaces,
           constants: constants,
-          declarations: declarations
+          types: types,
+          entities: entities,
+          subtype_constraints: subtype_constraints,
+          functions: functions,
+          procedures: procedures,
+          rules: rules
         })
       end
 
@@ -1960,11 +2014,11 @@ module Expressir
         ctx__select_extension__type_ref = ctx.select_extension&.type_ref
         ctx__select_extension__select_list = ctx__select_extension&.select_list
 
-        extensible = !!ctx__EXTENSIBLE
-        generic_entity = !!ctx__GENERIC_ENTITY
-        items = visit_if(ctx__select_list)
+        extensible = ctx__EXTENSIBLE && true
+        generic_entity = ctx__GENERIC_ENTITY && true
+        items = visit_if(ctx__select_list, [])
         extension_type = visit_if(ctx__select_extension__type_ref)
-        extension_items = visit_if(ctx__select_extension__select_list)
+        extension_items = visit_if(ctx__select_extension__select_list, [])
 
         Model::Types::Select.new({
           extensible: extensible,
@@ -2097,7 +2151,7 @@ module Expressir
         ctx__width_spec__FIXED = ctx__width_spec&.FIXED
 
         width = visit_if(ctx__width_spec__width)
-        fixed = !!ctx__width_spec__FIXED
+        fixed = ctx__width_spec__FIXED && true
 
         Model::Types::String.new({
           width: width,
@@ -2130,7 +2184,7 @@ module Expressir
 
         id = visit_if(ctx__subtype_constraint_head__subtype_constraint_id)
         applies_to = visit_if(ctx__subtype_constraint_head__entity_ref)
-        abstract = !!ctx__subtype_constraint_body__abstract_supertype
+        abstract = ctx__subtype_constraint_body__abstract_supertype && true
         total_over = visit_if(ctx__subtype_constraint_body__total_over)
         supertype_expression = visit_if(ctx__subtype_constraint_body__supertype_expression)
 
@@ -2266,7 +2320,7 @@ module Expressir
 
         id = visit_if(ctx__type_id)
         type = visit_if(ctx__underlying_type)
-        where = visit_if(ctx__where_clause)
+        where = visit_if(ctx__where_clause, [])
 
         Model::Type.new({
           id: id,