expressir 0.2.15 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b9d48b15ce85744e4c19cbe55752d22744388f738367cd486f2afa2ac10835
-  data.tar.gz: 44fbef691d15a6c0feee280e86aabda10401f6b5d344fc3596cbc7315e816c76
+  metadata.gz: 58e1bbf9a216e77cfda6594ad7040dba57086b8776c05b884bfcb25174967237
+  data.tar.gz: cf12bb3deef6b060f0d634e894a6bbcf10734cdcb8b3329d79ccb1d569d95a62
 SHA512:
-  metadata.gz: 8049d49a9c11790c0fb45a3d37e5d8574b18aaf7d3de92b9dd870668bf6131005ff2ce1630d391962dbd6c936ea80d9d6cf95cdca0f6926358640b1ca46e9312
-  data.tar.gz: d90065bbfda420df3dce91ad2b016e14a145d751f70914823f0d5db8b86ff212c0c4ebce20f77d2a6fa85a343d91e172c3094a66a851db6af64d95af9495aa84
+  metadata.gz: eb15652a0cca4901425feea15981e60ce302b55471fcd8b95b2f98df1174f87e9a2eba7c233f97d3678349b5187f2785a7f23cf3bc0845a373bda668c66791c8
+  data.tar.gz: 1a9b788abfc17361421943a7b10c83fa47b0d6653e57b6ffa645175d33354b387de2506b70f271a781d97000c037b122ecab4b383d310293643335e64868bafc

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/.github/workflows/release.yml

@@ -1,9 +1,15 @@
 name: release
 
 on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'patch'
   push:
     tags: [ v* ]
-  workflow_dispatch:
 
 jobs:
   pack:
@@ -20,9 +26,15 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
+          bundler-cache: true
 
-      - run: bundle install --jobs 4 --retry 3
+      - if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          gem bump --version ${{ github.event.inputs.next_version }} --tag --push
 
+      # build gem WITHOUT pre-built native extension
       - run: gem build expressir.gemspec
 
       - if: matrix.host == 'linux'
@@ -31,6 +43,7 @@ jobs:
           name: pkg-ruby
           path: expressir-*.gem
 
+      # build gem WITH pre-built native extension
       - run: bundle exec rake gem:${{ matrix.host }}
 
       - uses: actions/upload-artifact@v2
@@ -38,8 +51,7 @@ jobs:
           name: pkg-${{ matrix.host }}
           path: pkg/*.gem
 
-
-  release:
+  publish:
     runs-on: ubuntu-18.04
     needs: pack
     steps:

data/README.adoc

@@ -1,8 +1,8 @@
 = Expressir: EXPRESS in Ruby
 
-image:https://github.com/lutaml/expressir/workflows/ubuntu/badge.svg[ubuntu]
-image:https://github.com/lutaml/expressir/workflows/macos/badge.svg[macos]
-image:https://github.com/lutaml/expressir/workflows/windows/badge.svg[windows]
+image:https://img.shields.io/gem/v/expressir.svg["Gem Version", link="https://rubygems.org/gems/expressir"]
+// image:https://codeclimate.com/github/lutaml/expressir/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/lutaml/expressir"]
+image:https://github.com/lutaml/expressir/workflows/rake/badge.svg["Build Status", link="https://github.com/lutaml/expressir/actions?workflow=rake"]
 
 == Purpose
 

data/exe/format

@@ -1,27 +1,81 @@
 #!/usr/bin/env ruby
 
+require "yaml"
+require "tempfile"
 require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
+require "expressir/express_exp/schema_head_formatter"
 require "expressir/express_exp/hyperlink_formatter"
+require "expressir/express_exp/cache"
 
-input_files = [
+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'
-  # 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)
+  # '../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'}
-schema = repo.schemas.find{|x| x.id == 'mathematical_functions_schema'}
-result = Expressir::ExpressExp::HyperlinkFormatter.format(schema)
+start = Time.now
+repository = Expressir::ExpressExp::Parser.from_files(exp_files)
+puts "Parser.from_files time:  #{(Time.now - start).round(2)}s"
 
-puts result
+temp_file = Tempfile.new
+begin
+  start = Time.now
+  Expressir::ExpressExp::Cache.to_file(temp_file, repository)
+  puts "Cache.to_file time:      #{(Time.now - start).round(2)}s"
+
+  start = Time.now
+  repository = Expressir::ExpressExp::Cache.from_file(temp_file)
+  puts "Cache.from_file time:    #{(Time.now - start).round(2)}s"
+ensure
+  temp_file.close
+  temp_file.unlink
+end
+
+start = 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 "Repository.to_hash time: #{(Time.now - start).round(2)}s"
+
+# puts YAML.dump(result)

data/ext/express-parser/extconf.rb

@@ -37,6 +37,8 @@ if cross_build
   if RbConfig::CONFIG['target_os'] =~ /mingw32|mswin/
     # workaround for 'w64-mingw32-as: express_parser.o: too many sections'
     $CXXFLAGS << " -O3 -Wa,-mbig-obj"
+    # workaround for LoadError: 127: The specified procedure could not be found.
+    $DLDFLAGS << " -static -static-libgcc -static-libstdc++"
   end
 else
   require 'mkmf-rice'

data/lib/expressir/express_exp/cache.rb

@@ -0,0 +1,48 @@
+require 'yaml'
+require 'zlib'
+require 'expressir/model'
+
+module Expressir
+  module ExpressExp
+    class Cache
+      def self.to_file(file, content, options = {})
+        root_path = options[:root_path]
+        test_overwrite_version = options[:test_overwrite_version] # don't use, only for tests
+
+        version = test_overwrite_version || VERSION
+
+        cache = Model::Cache.new({
+          version: version,
+          content: content
+        })
+
+        hash = cache.to_hash(root_path: root_path, skip_empty: true)
+        yaml = YAML.dump(hash)
+        yaml_compressed = Zlib::Deflate.deflate(yaml)
+
+        File.binwrite(file, yaml_compressed)
+      end
+
+      def self.from_file(file, options = {})
+        root_path = options[:root_path]
+        test_overwrite_version = options[:test_overwrite_version] # don't use, only for tests
+
+        version = test_overwrite_version || VERSION
+
+        yaml_compressed = File.binread(file)
+        yaml = Zlib::Inflate.inflate(yaml_compressed)
+        hash = YAML.load(yaml)
+        cache = Model::ModelElement.from_hash(hash, root_path: root_path)
+
+        if cache.version != version
+          raise CacheLoadError.new("Cache version mismatch, cache version is #{cache.version}, Expressir version is #{VERSION}")
+        end
+
+        cache.content
+      end
+    end
+
+    class CacheLoadError < StandardError
+    end
+  end
+end

data/lib/expressir/express_exp/formatter.rb

@@ -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,13 +412,15 @@ 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,
           ';',
@@ -455,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")),
@@ -489,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")),
@@ -499,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,
           [
@@ -510,11 +519,7 @@ module Expressir
       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)
@@ -531,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")),
@@ -556,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")),
@@ -566,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',
@@ -582,7 +587,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_schema(node)
+      def format_schema_head(node)
         [
           [
             'SCHEMA',
@@ -596,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")),
@@ -609,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',
@@ -655,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',
               '(',
@@ -689,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',
@@ -707,7 +731,6 @@ module Expressir
           *if node.id
             [
               node.id,
-              ' ',
               ':',
               ' '
             ].join('')
@@ -741,7 +764,6 @@ module Expressir
           *if node.id
             [
               node.id,
-              ' ',
               ':',
               ' '
             ].join('')
@@ -976,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),
@@ -1001,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(', '),
@@ -1021,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
@@ -1055,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,
           [
@@ -1081,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")),
@@ -1145,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),
@@ -1267,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
@@ -1285,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)
@@ -1373,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
@@ -1389,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('')