expressir 0.2.14-arm64-darwin → 0.2.19-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf9e8c647bf98788931baaa0d62d2063e0a78597ee88afdc897446458c2f270f
-  data.tar.gz: 57a94bf8ab13a65a22614ff8483dbd20f0cd989dbe083b299dbbd41dd31ef71f
+  metadata.gz: 168ac92ae73844ba8179770b660d02b847613e15d73851236685030b53be3aa9
+  data.tar.gz: d68d1a0424984cebd9bf6712028c770489610724b8b50e9b4170cab6c1e1ca87
 SHA512:
-  metadata.gz: 5de6d4eb4b0f9145ad329c2141af52b0fa9060ec7c80ad5c4f0e262958e7d01bb48a1ef430d7715f4d5e7546aa49974d0bab4742a3d7ae3d999d08a89a74827d
-  data.tar.gz: 6720bfc45da7dfa3811983b2477e8ed10f500a02a620d483e917f6bd72fd3851085403b7de36192cc6a09e65af5643a1e96ee481846352488370dc361aadb67a
+  metadata.gz: 20be2048054c8dc1de713393b784976c2b8ff28731730e923c39fa5f6c228198b1342107b82842be24347b15b5c465d1c1225dfbefab08d64a7f24be1b09f58e
+  data.tar.gz: aec312699ee89bc3a661509e2f665b6a469a30ea36f53d20688be04913b1f1120c7b718635aba2a1465bc3b9631fa61aabc175f9cd11f688081102e71cb8239b

data/.github/workflows/rake.yml

@@ -43,3 +43,8 @@ jobs:
       - run: bundle exec rake compile
 
       - run: bundle exec rake
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: express_parser-${{ matrix.os }}-${{ matrix.ruby }}
+          path: lib/expressir/express_exp/express_parser.so

data/exe/format

@@ -1,20 +1,65 @@
 #!/usr/bin/env ruby
 
+require "yaml"
 require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
+require "expressir/express_exp/schema_head_formatter"
 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
+exp_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/modules/analysis/mim_annotated.exp',
+  # '../iso-10303-stepmod/data/modules/analysis_product_relationships/mim_annotated.exp',
+  # cyclic reference test 2
   # '../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'
+  # '../iso-10303-stepmod/data/resources/product_property_representation_schema/product_property_representation_schema_annotated.exp',
+  # renamed reference test (36s)
+  # '../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',
+  # annotated-express test (12s)
+  # see https://github.com/metanorma/annotated-express/blob/master/data/documents/resources/fundamentals_of_product_description_and_support/sections/04-schemas.adoc
+  # '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/application_context_schema/application_context_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/approval_schema/approval_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/certification_schema/certification_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/contract_schema/contract_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/date_time_schema/date_time_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/document_schema/document_schema.exp',
+  # '../iso-10303-stepmod/data/resources/effectivity_schema/effectivity_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/experience_schema/experience_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/external_reference_schema/external_reference_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/group_schema/group_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/language_schema/language_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/location_schema/location_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/management_resources_schema/management_resources_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/measure_schema/measure_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/person_organization_schema/person_organization_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/process_property_schema/process_property_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/product_definition_schema/product_definition_schema_annotated.exp',
+  # '../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',
+  # '../iso-10303-stepmod/data/resources/qualifications_schema/qualifications_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/security_classification_schema/security_classification_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
+  # full test (6m18s + 8s = 6m26s)
+  *`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'}
-result = Expressir::ExpressExp::HyperlinkFormatter.format(schema)
+start = Time.now
+repository = Expressir::ExpressExp::Parser.from_files(exp_files)
+puts "Parsing time: #{Time.now - start}"
+start2 = Time.now
+formatter = Class.new(Expressir::ExpressExp::Formatter) do
+  include Expressir::ExpressExp::SchemaHeadFormatter
+  include Expressir::ExpressExp::HyperlinkFormatter
+end
+result = repository.to_hash(formatter: formatter, skip_empty: true)
+puts "Formatting & serializing time: #{Time.now - start2}"
+puts "Total time: #{Time.now - start}"
 
-puts result
+# puts YAML.dump(result)

data/lib/expressir/express_exp/formatter.rb

@@ -50,12 +50,12 @@ module Expressir
           format_function(node)
         elsif node.is_a? Model::Interface
           format_interface(node)
+        elsif node.is_a? Model::InterfaceItem
+          format_interface_item(node)
         elsif node.is_a? Model::Parameter
           format_parameter(node)
         elsif node.is_a? Model::Procedure
           format_procedure(node)
-        elsif node.is_a? Model::RenamedRef
-          format_renamed_ref(node)
         elsif node.is_a? Model::Repository
           format_repository(node)
         elsif node.is_a? Model::Rule
@@ -163,7 +163,8 @@ module Expressir
         elsif node.is_a? Model::Types::String
           format_types_string(node)
         else
-          puts node.class
+          STDERR.puts "#{node.class.name} format not implemented"
+          ''
         end
       end
 
@@ -245,51 +246,55 @@ module Expressir
             *if node.abstract and !node.supertype_expression
               [
                 "\n",
-                INDENT,
-                'ABSTRACT',
-                ' ',
-                'SUPERTYPE'
+                indent([
+                  'ABSTRACT',
+                  ' ',
+                  'SUPERTYPE'
+                ].join(''))
               ].join('')
             end,
             *if node.abstract and node.supertype_expression
               [
                 "\n",
-                INDENT,
-                'ABSTRACT',
-                ' ',
-                'SUPERTYPE',
-                ' ',
-                'OF',
-                ' ',
-                '(',
-                format(node.supertype_expression),
-                ')'
+                indent([
+                  'ABSTRACT',
+                  ' ',
+                  'SUPERTYPE',
+                  ' ',
+                  'OF',
+                  ' ',
+                  '(',
+                  format(node.supertype_expression),
+                  ')'
+                ].join(''))
               ].join('')
             end,
             *if !node.abstract and node.supertype_expression
               [
                 "\n",
-                INDENT,
-                'SUPERTYPE',
-                ' ',
-                'OF',
-                ' ',
-                '(',
-                format(node.supertype_expression),
-                ')'
+                indent([
+                  'SUPERTYPE',
+                  ' ',
+                  'OF',
+                  ' ',
+                  '(',
+                  format(node.supertype_expression),
+                  ')'
+                ].join(''))
               ].join('')
             end,
-            *if node.subtype_of and node.subtype_of.length > 0
+            *if node.subtype_of.length > 0
               [
                 "\n",
-                INDENT,
-                'SUBTYPE',
-                ' ',
-                'OF',
-                ' ',
-                '(',
-                node.subtype_of.map{|x| format(x)}.join(', '),
-                ')'
+                indent([
+                  'SUBTYPE',
+                  ' ',
+                  'OF',
+                  ' ',
+                  '(',
+                  node.subtype_of.map{|x| format(x)}.join(', '),
+                  ')'
+                ].join(''))
               ].join('')
             end,
             ';'
@@ -298,28 +303,28 @@ module Expressir
             indent(explicit_attributes.map{|x| format(x)}.join("\n"))
           end,
           *if derived_attributes and derived_attributes.length > 0
-            indent([
+            [
               'DERIVE',
               indent(derived_attributes.map{|x| format(x)}.join("\n")),
-            ].join("\n"))
+            ]
           end,
           *if inverse_attributes and inverse_attributes.length > 0
-            indent([
+            [
               'INVERSE',
               indent(inverse_attributes.map{|x| format(x)}.join("\n")),
-            ].join("\n"))
+            ]
           end,
-          *if node.unique and node.unique.length > 0
-            indent([
+          *if node.unique.length > 0
+            [
               'UNIQUE',
               indent(node.unique.map{|x| format(x)}.join("\n"))
-            ].join("\n"))
+            ]
           end,
-          *if node.where and node.where.length > 0
-            indent([
+          *if node.where.length > 0
+            [
               'WHERE',
               indent(node.where.map{|x| format(x)}.join("\n")),
-            ].join("\n"))
+            ]
           end,
           [
             'END_ENTITY',
@@ -338,10 +343,11 @@ module Expressir
             'FUNCTION',
             ' ',
             node.id,
-            *if node.parameters and node.parameters.length > 0
+            *if node.parameters.length > 0
+              parameter_indent = INDENT_CHAR * "FUNCTION #{node.id}(".length
               [
                 '(',
-                node.parameters.map{|x| format(x)}.join('; '),
+                node.parameters.map{|x| format(x)}.join(";\n#{parameter_indent}"),
                 ')'
               ].join('')
             end,
@@ -351,22 +357,22 @@ module Expressir
             format(node.return_type),
             ';'
           ].join(''),
-          *if node.types and node.types.length > 0
+          *if node.types.length > 0
             indent(node.types.map{|x| format(x)}.join("\n"))
           end,
-          *if node.entities and node.entities.length > 0
+          *if node.entities.length > 0
             indent(node.entities.map{|x| format(x)}.join("\n"))
           end,
-          *if node.subtype_constraints and node.subtype_constraints.length > 0
+          *if node.subtype_constraints.length > 0
             indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
           end,
-          *if node.functions and node.functions.length > 0
+          *if node.functions.length > 0
             indent(node.functions.map{|x| format(x)}.join("\n"))
           end,
-          *if node.procedures and node.procedures.length > 0
+          *if node.procedures.length > 0
             indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
-          *if node.constants and node.constants.length > 0
+          *if node.constants.length > 0
             indent([
               'CONSTANT',
               indent(node.constants.map{|x| format(x)}.join("\n")),
@@ -376,7 +382,7 @@ module Expressir
               ].join('')
             ].join("\n"))
           end,
-          *if node.variables and node.variables.length > 0
+          *if node.variables.length > 0
             indent([
               'LOCAL',
               indent(node.variables.map{|x| format(x)}.join("\n")),
@@ -386,7 +392,7 @@ module Expressir
               ].join('')
             ].join("\n"))
           end,
-          *if node.statements and node.statements.length > 0
+          *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
           [
@@ -406,19 +412,35 @@ module Expressir
           'FROM',
           ' ',
           format(node.schema),
-          *if node.items and node.items.length > 0
+          *if node.items.length > 0
+            item_indent = INDENT_CHAR * '('.length
             [
               "\n",
-              INDENT,
-              '(',
-              node.items.map{|x| format(x)}.join(', '),
-              ')'
+              indent([
+                '(',
+                node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                ')'
+              ].join(''))
             ].join('')
           end,
           ';',
         ].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
@@ -441,31 +463,32 @@ module Expressir
             'PROCEDURE',
             ' ',
             node.id,
-            *if node.parameters and node.parameters.length > 0
+            *if node.parameters.length > 0
+              parameter_indent = INDENT_CHAR * "PROCEDURE #{node.id}(".length
               [
                 '(',
-                node.parameters.map{|x| format(x)}.join('; '),
+                node.parameters.map{|x| format(x)}.join(";\n#{parameter_indent}"),
                 ')'
               ].join('')
             end,
             ';'
           ].join(''),
-          *if node.types and node.types.length > 0
+          *if node.types.length > 0
             indent(node.types.map{|x| format(x)}.join("\n"))
           end,
-          *if node.entities and node.entities.length > 0
+          *if node.entities.length > 0
             indent(node.entities.map{|x| format(x)}.join("\n"))
           end,
-          *if node.subtype_constraints and node.subtype_constraints.length > 0
+          *if node.subtype_constraints.length > 0
             indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
           end,
-          *if node.functions and node.functions.length > 0
+          *if node.functions.length > 0
             indent(node.functions.map{|x| format(x)}.join("\n"))
           end,
-          *if node.procedures and node.procedures.length > 0
+          *if node.procedures.length > 0
             indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
-          *if node.constants and node.constants.length > 0
+          *if node.constants.length > 0
             indent([
               'CONSTANT',
               indent(node.constants.map{|x| format(x)}.join("\n")),
@@ -475,7 +498,7 @@ module Expressir
               ].join('')
             ].join("\n"))
           end,
-          *if node.variables and node.variables.length > 0
+          *if node.variables.length > 0
             indent([
               'LOCAL',
               indent(node.variables.map{|x| format(x)}.join("\n")),
@@ -485,7 +508,7 @@ module Expressir
               ].join('')
             ].join("\n"))
           end,
-          *if node.statements and node.statements.length > 0
+          *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
           [
@@ -495,22 +518,8 @@ 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
-        ].join("\n")
+        node.schemas.map{|node| format(node)}.join("\n\n")
       end
 
       def format_rule(node)
@@ -527,22 +536,22 @@ module Expressir
             ')',
             ';'
           ].join(''),
-          *if node.types and node.types.length > 0
+          *if node.types.length > 0
             indent(node.types.map{|x| format(x)}.join("\n"))
           end,
-          *if node.entities and node.entities.length > 0
+          *if node.entities.length > 0
             indent(node.entities.map{|x| format(x)}.join("\n"))
           end,
-          *if node.subtype_constraints and node.subtype_constraints.length > 0
+          *if node.subtype_constraints.length > 0
             indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
           end,
-          *if node.functions and node.functions.length > 0
+          *if node.functions.length > 0
             indent(node.functions.map{|x| format(x)}.join("\n"))
           end,
-          *if node.procedures and node.procedures.length > 0
+          *if node.procedures.length > 0
             indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
-          *if node.constants and node.constants.length > 0
+          *if node.constants.length > 0
             indent([
               'CONSTANT',
               indent(node.constants.map{|x| format(x)}.join("\n")),
@@ -552,7 +561,7 @@ module Expressir
               ].join('')
             ].join("\n"))
           end,
-          *if node.variables and node.variables.length > 0
+          *if node.variables.length > 0
             indent([
               'LOCAL',
               indent(node.variables.map{|x| format(x)}.join("\n")),
@@ -562,14 +571,14 @@ module Expressir
               ].join('')
             ].join("\n"))
           end,
-          *if node.statements and node.statements.length > 0
+          *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
-          *if node.where and node.where.length > 0
-            indent([
+          *if node.where.length > 0
+            [
               'WHERE',
               indent(node.where.map{|x| format(x)}.join("\n"))
-            ].join("\n"))
+            ]
           end,
           [
             'END_RULE',
@@ -578,7 +587,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_schema(node)
+      def format_schema_head(node)
         [
           [
             'SCHEMA',
@@ -592,10 +601,18 @@ module Expressir
             end,
             ';'
           ].join(''),
-          *if node.interfaces and node.interfaces.length > 0
-            node.interfaces.map{|x| format(x)}.join("\n")
-          end,
-          *if node.constants and node.constants.length > 0
+          *if node.interfaces.length > 0
+            [
+              '',
+              node.interfaces.map{|x| format(x)}.join("\n")
+            ]
+          end
+        ].join("\n")
+      end
+
+      def format_schema(node)
+        schema_declarations = [
+          *if node.constants.length > 0
             [
               'CONSTANT',
               indent(node.constants.map{|x| format(x)}.join("\n")),
@@ -605,23 +622,34 @@ module Expressir
               ].join('')
             ].join("\n")
           end,
-          *if node.types and node.types.length > 0
-            node.types.map{|x| format(x)}.join("\n")
+          *if node.types.length > 0
+            node.types.map{|x| format(x)}
           end,
-          *if node.entities and node.entities.length > 0
-            node.entities.map{|x| format(x)}.join("\n")
+          *if node.entities.length > 0
+            node.entities.map{|x| format(x)}
           end,
-          *if node.subtype_constraints and node.subtype_constraints.length > 0
-            node.subtype_constraints.map{|x| format(x)}.join("\n")
+          *if node.subtype_constraints.length > 0
+            node.subtype_constraints.map{|x| format(x)}
           end,
-          *if node.functions and node.functions.length > 0
-            node.functions.map{|x| format(x)}.join("\n")
+          *if node.functions.length > 0
+            node.functions.map{|x| format(x)}
           end,
-          *if node.procedures and node.procedures.length > 0
-            node.procedures.map{|x| format(x)}.join("\n")
+          *if node.rules.length > 0
+            node.rules.map{|x| format(x)}
           end,
-          *if node.rules and node.rules.length > 0
-            node.rules.map{|x| format(x)}.join("\n")
+          *if node.procedures and node.procedures.length > 0
+            node.procedures.map{|x| format(x)}
+          end
+        ]
+
+        [
+          format_schema_head(node),
+          *if schema_declarations.length > 0
+            [
+              '',
+              schema_declarations.join("\n\n"),
+              ''
+            ]
           end,
           [
             'END_SCHEMA',
@@ -651,7 +679,7 @@ module Expressir
               ';'
             ].join(''))
           end,
-          *if node.total_over and node.total_over.length > 0
+          *if node.total_over.length > 0
             indent([
               'TOTAL_OVER',
               '(',
@@ -685,11 +713,11 @@ module Expressir
             format(node.type),
             ';',
           ].join(''),
-          *if node.where and node.where.length > 0
-            indent([
+          *if node.where.length > 0
+            [
               'WHERE',
               indent(node.where.map{|x| format(x)}.join("\n"))
-            ].join("\n"))
+            ]
           end,
           [
             'END_TYPE',
@@ -703,7 +731,6 @@ module Expressir
           *if node.id
             [
               node.id,
-              ' ',
               ':',
               ' '
             ].join('')
@@ -737,7 +764,6 @@ module Expressir
           *if node.id
             [
               node.id,
-              ' ',
               ':',
               ' '
             ].join('')
@@ -972,7 +998,7 @@ module Expressir
             format(node.expression),
             ';'
           ].join(''),
-          *if node.statements and node.statements.length > 0
+          *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
           *format_remarks(node),
@@ -997,7 +1023,7 @@ module Expressir
       def format_statements_call(node)
         [
           format(node.ref),
-          *if node.parameters and node.parameters.length > 0
+          *if node.parameters.length > 0
             [
               '(',
               node.parameters.map{|x| format(x)}.join(', '),
@@ -1017,7 +1043,7 @@ module Expressir
             ' ',
             'OF'
           ].join(''),
-          *if node.actions and node.actions.length > 0
+          *if node.actions.length > 0
             node.actions.map{|x| format(x)}
           end,
           *if node.otherwise_statement
@@ -1051,7 +1077,7 @@ module Expressir
       def format_statements_compound(node)
         [
           'BEGIN',
-          *if node.statements and node.statements.length > 0
+          *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
           [
@@ -1077,10 +1103,10 @@ module Expressir
             ' ',
             'THEN'
           ].join(''),
-          *if node.statements and node.statements.length > 0
+          *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
-          *if node.else_statements and node.else_statements.length > 0
+          *if node.else_statements.length > 0
             [
               'ELSE',
               indent(node.else_statements.map{|x| format(x)}.join("\n")),
@@ -1141,7 +1167,7 @@ module Expressir
             end,
             ';'
           ].join(''),
-          *if node.statements and node.statements.length > 0
+          *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
           *format_remarks(node),
@@ -1263,14 +1289,17 @@ module Expressir
             ].join('')
           end,
           'ENUMERATION',
-          *if node.items and node.items.length > 0
+          *if node.items.length > 0
+            item_indent = INDENT_CHAR * '('.length
             [
               ' ',
               'OF',
-              ' ',
-              '(',
-              node.items.map{|x| format(x)}.join(', '),
-              ')'
+              "\n",
+              indent([
+                '(',
+                node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                ')'
+              ].join(''))
             ].join('')
           end,
           *if node.extension_type
@@ -1281,25 +1310,44 @@ module Expressir
               format(node.extension_type)
             ].join('')
           end,
-          *if node.extension_items and node.extension_items.length > 0
+          *if node.extension_items.length > 0
+            item_indent = INDENT_CHAR * '('.length
             [
               ' ',
               'WITH',
-              ' ',
-              '(',
-              node.extension_items.map{|x| format(x)}.join(', '),
-              ')'
+              "\n",
+              indent([
+                '(',
+                node.extension_items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                ')'
+              ].join(''))
             ].join('')
           end
         ].join('')
       end
 
       def format_types_generic_entity(node)
-        'GENERIC_ENTITY'
+        [
+          'GENERIC_ENTITY',
+          *if node.id
+            [
+              ':',
+              node.id
+            ]
+          end
+        ].join('')
       end
 
       def format_types_generic(node)
-        'GENERIC'
+        [
+          'GENERIC',
+          *if node.id
+            [
+              ':',
+              node.id
+            ]
+          end
+        ].join('')
       end
 
       def format_types_integer(node)
@@ -1369,12 +1417,15 @@ module Expressir
             ].join('')
           end,
           'SELECT',
-          *if node.items and node.items.length > 0
+          *if node.items.length > 0
+            item_indent = INDENT_CHAR * '('.length
             [
-              ' ',
-              '(',
-              node.items.map{|x| format(x)}.join(', '),
-              ')'
+              "\n",
+              indent([
+                '(',
+                node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                ')'
+              ].join(''))
             ].join('')
           end,
           *if node.extension_type
@@ -1385,14 +1436,17 @@ module Expressir
               format(node.extension_type)
             ].join('')
           end,
-          *if node.extension_items and node.extension_items.length > 0
+          *if node.extension_items.length > 0
+            item_indent = INDENT_CHAR * '('.length
             [
               ' ',
               'WITH',
-              ' ',
-              '(',
-              node.extension_items.map{|x| format(x)}.join(', '),
-              ')'
+              "\n",
+              indent([
+                '(',
+                node.extension_items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                ')'
+              ].join(''))
             ].join('')
           end
         ].join('')