expressir 0.2.24 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce50a374ee7552fa79d80e286765681ed1cb808bea2a6833c53e0ddf626ab5bc
-  data.tar.gz: 6856209fcb72eb146ac4408e8f58d4aa45f74ccf54adbe4d7c6fd5653bcacc7b
+  metadata.gz: 057ba0878ed09b56d5e74b4efe11f2b411d7ece2e6742f25a79d3f72c7004ef4
+  data.tar.gz: 73e4f84455ebaaba9886271fccbb4feb461700d93f19d7d3bcac05acc8667007
 SHA512:
-  metadata.gz: 3a4a7554be0d0348f65ca086a3238104bdd36f13c33e719f0cfb01d28724b3487f764ebd0ebf49b2f59b49112180cce512a05e36442ec90c62828f82cf805a0a
-  data.tar.gz: e871ff00c28957c32823c7b4ff0f3222270d1a7471426dfb335d6077a1c4fbcbb078b3924a2029502c671a54d9fb97740187be85f1cdc64993f3ed2bcacf8d4d
+  metadata.gz: 50ed04a48373ade0e9ba6668350e6b9f16c54b176fd56984e0c18243a5364980bb1aa962e3b73bfc4865db4c5db1052cba08c296da9e99e4ac4ef2a4d276ea3e
+  data.tar.gz: 76c734d4013fc6b5e79623a1c274c44195da2e35816cb507b6dc2a6b0c6d07a8f2c906ebcc82bef4d39f6c6aa4bc61b8b44bae9a80fb06f61495b7f0d2c4494b

data/.github/workflows/rake.yml

@@ -40,11 +40,12 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - run: bundle exec rake compile
+      - uses: actions/cache@v2
+        with:
+          path: lib/expressir/express/express_parser.*
+          key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
-      - run: bundle exec rake
+      - if: hashFiles('lib/expressir/express/express_parser.*') == ''
+        run: bundle exec rake compile
 
-      - uses: actions/upload-artifact@v2
-        with:
-          name: express_parser-${{ matrix.os }}-${{ matrix.ruby }}
-          path: lib/expressir/express_exp/express_parser.so
+      - run: bundle exec rake

data/.gitignore

@@ -8,8 +8,8 @@
 /tmp/
 /Gemfile.lock
 /.idea
-/lib/expressir/express_exp/express_parser.bundle
-/original/examples/syntax/*-pretty.exp
+/lib/expressir/express/express_parser.bundle
+/spec/syntax/*-pretty.exp
 
 # rspec failure tracking
 .rspec_status

data/.yardopts

@@ -0,0 +1,11 @@
+# macro must be defined first, see https://stackoverflow.com/a/10344776/1823988
+lib/expressir/model/model_element.rb
+lib/expressir/model/data_type.rb
+lib/expressir/model/declaration.rb
+lib/expressir/model/expression.rb
+lib/expressir/model/literal.rb
+lib/expressir/model/reference.rb
+lib/expressir/model/statement.rb
+lib/expressir/model/supertype_expression.rb
+
+lib/**/*.rb

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rake/extensiontask"
+require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -9,3 +10,5 @@ task :default => :spec
 GEMSPEC = Gem::Specification.load("expressir.gemspec")
 
 Gem::PackageTask.new(GEMSPEC).define
+
+YARD::Rake::YardocTask.new

data/demo.rb

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
 require 'expressir'
-require 'expressir/express_exp/parser'
+require 'expressir/express/parser'
 
 # This file is from:
 # https://github.com/metanorma/annotated-express/blob/master/data/resources/action_schema/action_schema.exp
 file = 'action_schema.exp'
 
-# repo = Expressir::ExpressExp::Parser.from_exp(file)
+# repo = Expressir::Express::Parser.from_exp(file)
 # schema = repo.schemas.find{|schema| schema.id == "support_resource_schema"}
 
-repo = Expressir::ExpressExp::Parser.from_exp(file)
+repo = Expressir::Express::Parser.from_exp(file)
 schema = repo.schemas.find{|schema| schema.id == "action_schema"}
 entity = schema.entities.find{|entity| entity.id == "action_directive_relationship"}
-where = entity.where.find{|where| where.id == "WR1"}
+where_rule = entity.where_rules.find{|where_rule| where_rule.id == "WR1"}
 
-puts where.inspect
+puts where_rule.inspect

data/exe/format

@@ -1,81 +1,18 @@
 #!/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"
+require "expressir/express/parser"
+require "expressir/express/formatter"
+require "expressir/express/schema_head_formatter"
+require "expressir/express/hyperlink_formatter"
 
-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 (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}
-]
+exp_files = ARGV
 
-start = Time.now
-repository = Expressir::ExpressExp::Parser.from_files(exp_files)
-puts "Parser.from_files time:  #{(Time.now - start).round(2)}s"
-
-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
+repository = Expressir::Express::Parser.from_files(exp_files)
+formatter = Class.new(Expressir::Express::Formatter) do
+  include Expressir::Express::SchemaHeadFormatter
+  include Expressir::Express::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)
+puts YAML.dump(result)

data/exe/format-test

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require "yaml"
+require "tempfile"
+require "expressir/express/parser"
+require "expressir/express/formatter"
+require "expressir/express/schema_head_formatter"
+require "expressir/express/hyperlink_formatter"
+require "expressir/express/cache"
+
+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 (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}
+]
+
+start = Time.now
+repository = Expressir::Express::Parser.from_files(exp_files)
+puts "Parser.from_files time:  #{(Time.now - start).round(2)}s"
+
+temp_file = Tempfile.new
+begin
+  start = Time.now
+  Expressir::Express::Cache.to_file(temp_file, repository)
+  puts "Cache.to_file time:      #{(Time.now - start).round(2)}s"
+
+  start = Time.now
+  repository = Expressir::Express::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::Express::Formatter) do
+  include Expressir::Express::SchemaHeadFormatter
+  include Expressir::Express::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/expressir.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
 
   spec.extensions = File.join(*%w(ext express-parser extconf.rb))
 
-  spec.add_runtime_dependency "nokogiri", "~> 1.10"
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_runtime_dependency "rice", "~> 3"
+  spec.add_development_dependency "asciidoctor", "~> 2.0.13"
   spec.add_development_dependency "antlr4-native", "~> 1.1.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "pry", "~> 0.12.2"
@@ -41,4 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake-compiler", "~> 1.1"
   spec.add_development_dependency "rake-compiler-dock", "~> 1.1"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "yard", "~> 0.9.26"
+  spec.add_development_dependency "webrick", "~> 1.7.0"
 end

data/ext/express-parser/extconf.rb

@@ -56,4 +56,4 @@ src_paths.each do |src_path|
   $srcs.push(*Dir["#{abs_src_path}/*.cpp"])
 end
 
-create_makefile "expressir/express_exp/#{extension_name}"
+create_makefile "expressir/express/#{extension_name}"

data/lib/expressir.rb

@@ -2,7 +2,6 @@ require "expressir/version"
 
 require "expressir/cli"
 require "expressir/config"
-require "expressir/express"
 
 module Expressir
   class Error < StandardError; end

data/lib/expressir/cli.rb

@@ -1,6 +1,5 @@
 require "thor"
 require "expressir/cli/ui"
-require "expressir/express_parser"
 
 module Expressir
   module Cli
@@ -17,11 +16,6 @@ module Expressir
       def version
         Cli.ui.say("Version #{Expressir::VERSION}")
       end
-
-      desc "express-to-owl FILE", "Express to OWL conversion"
-      def express_to_owl(file)
-        Cli.ui.say(ExpressParser.to_owl(file))
-      end
     end
   end
 end

data/lib/expressir/express/cache.rb

@@ -0,0 +1,51 @@
+require 'yaml'
+require 'zlib'
+require 'expressir/model'
+
+module Expressir
+  module Express
+    class Cache
+      # Save Express model into a cache file
+      # @param file [String] cache file path
+      # @param content [Model::ModelElement] Express model
+      # @param root_path [String] Express repository root path, to be stripped from Express file paths to create a portable cache file
+      # @param test_overwrite_version [String] don't use, only for tests
+      # @return [nil]
+      def self.to_file(file, content, root_path: nil, test_overwrite_version: nil)
+        version = test_overwrite_version || VERSION
+
+        cache = Model::Cache.new(
+          version: version,
+          content: content
+        )
+
+        hash = cache.to_hash(root_path: root_path)
+        yaml = YAML.dump(hash)
+        yaml_compressed = Zlib::Deflate.deflate(yaml)
+
+        File.binwrite(file, yaml_compressed)
+        nil
+      end
+
+      # Load Express model from a cache file
+      # @param file [String] cache file path
+      # @param root_path [String] Express repository root path, to be prepended to Express file paths if loading a portable cache file
+      # @param test_overwrite_version [String] don't use, only for tests
+      # @return [Model::ModelElement] Express model
+      def self.from_file(file, root_path: nil, test_overwrite_version: nil)
+        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 Error.new("Cache version mismatch, cache version is #{cache.version}, Expressir version is #{version}")
+        end
+
+        cache.content
+      end
+    end
+  end
+end

data/lib/expressir/{express_exp → express}/formatter.rb

@@ -1,12 +1,11 @@
 require 'expressir/model'
 
 module Expressir
-  module ExpressExp
+  module Express
     class Formatter
       INDENT_CHAR = ' '
       INDENT_WIDTH = 2
       INDENT = INDENT_CHAR * INDENT_WIDTH
-
       OPERATOR_PRECEDENCE = {
         Model::Expressions::BinaryExpression::EXPONENTIATION => 1,
         Model::Expressions::BinaryExpression::MULTIPLICATION => 2,
@@ -29,71 +28,112 @@ module Expressir
         Model::Expressions::BinaryExpression::INSTANCE_NOT_EQUAL => 4,
         Model::Expressions::BinaryExpression::IN => 4,
         Model::Expressions::BinaryExpression::LIKE => 4,
-        Model::Expressions::BinaryExpression::ANDOR => 4,
       }
+      SUPERTYPE_OPERATOR_PRECEDENCE = {
+        Model::SupertypeExpressions::BinarySupertypeExpression::AND => 1,
+        Model::SupertypeExpressions::BinarySupertypeExpression::ANDOR => 2,
+      }
+
+      private_constant :INDENT_CHAR
+      private_constant :INDENT_WIDTH
+      private_constant :INDENT
+      private_constant :OPERATOR_PRECEDENCE
+      private_constant :SUPERTYPE_OPERATOR_PRECEDENCE
 
+      # Formats Express model into an Express code
+      # @param [Model::ModelElement] node
+      # @return [String]
       def self.format(node)
         formatter = self.new
         formatter.format(node)
       end
 
+      # Formats Express model into an Express code
+      # @param [Model::ModelElement] node
+      # @return [String]
       def format(node)
-        if node.is_a? Model::Attribute
-          format_attribute(node)
-        elsif node.is_a? Model::Constant
-          format_constant(node)
-        elsif node.is_a? Model::Entity
-          format_entity(node)
-        elsif node.is_a? Model::EnumerationItem
-          format_enumeration_item(node)
-        elsif node.is_a? Model::Function
-          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::Repository
+        if node.is_a? Model::Repository
           format_repository(node)
-        elsif node.is_a? Model::Rule
-          format_rule(node)
-        elsif node.is_a? Model::Schema
-          format_schema(node)
-        elsif node.is_a? Model::SubtypeConstraint
-          format_subtype_constraint(node)
-        elsif node.is_a? Model::Type
-          format_type(node)
-        elsif node.is_a? Model::Unique
-          format_unique(node)
-        elsif node.is_a? Model::Variable
-          format_variable(node)
-        elsif node.is_a? Model::Where
-          format_where(node)
+        elsif node.is_a? Model::Declarations::Attribute
+          format_declarations_attribute(node)
+        elsif node.is_a? Model::Declarations::Constant
+          format_declarations_constant(node)
+        elsif node.is_a? Model::Declarations::Entity
+          format_declarations_entity(node)
+        elsif node.is_a? Model::Declarations::Function
+          format_declarations_function(node)
+        elsif node.is_a? Model::Declarations::Interface
+          format_declarations_interface(node)
+        elsif node.is_a? Model::Declarations::InterfaceItem
+          format_declarations_interface_item(node)
+        elsif node.is_a? Model::Declarations::Parameter
+          format_declarations_parameter(node)
+        elsif node.is_a? Model::Declarations::Procedure
+          format_declarations_procedure(node)
+        elsif node.is_a? Model::Declarations::Rule
+          format_declarations_rule(node)
+        elsif node.is_a? Model::Declarations::Schema
+          format_declarations_schema(node)
+        elsif node.is_a? Model::Declarations::SchemaVersion
+          format_declarations_schema_version(node)
+        elsif node.is_a? Model::Declarations::SubtypeConstraint
+          format_declarations_subtype_constraint(node)
+        elsif node.is_a? Model::Declarations::Type
+          format_declarations_type(node)
+        elsif node.is_a? Model::Declarations::UniqueRule
+          format_declarations_unique_rule(node)
+        elsif node.is_a? Model::Declarations::Variable
+          format_declarations_variable(node)
+        elsif node.is_a? Model::Declarations::WhereRule
+          format_declarations_where_rule(node)
+        elsif node.is_a? Model::DataTypes::Aggregate
+          format_data_types_aggregate(node)
+        elsif node.is_a? Model::DataTypes::Array
+          format_data_types_array(node)
+        elsif node.is_a? Model::DataTypes::Bag
+          format_data_types_bag(node)
+        elsif node.is_a? Model::DataTypes::Binary
+          format_data_types_binary(node)
+        elsif node.is_a? Model::DataTypes::Boolean
+          format_data_types_boolean(node)
+        elsif node.is_a? Model::DataTypes::Enumeration
+          format_data_types_enumeration(node)
+        elsif node.is_a? Model::DataTypes::EnumerationItem
+          format_data_types_enumeration_item(node)
+        elsif node.is_a? Model::DataTypes::GenericEntity
+          format_data_types_generic_entity(node)
+        elsif node.is_a? Model::DataTypes::Generic
+          format_data_types_generic(node)
+        elsif node.is_a? Model::DataTypes::Integer
+          format_data_types_integer(node)
+        elsif node.is_a? Model::DataTypes::List
+          format_data_types_list(node)
+        elsif node.is_a? Model::DataTypes::Logical
+          format_data_types_logical(node)
+        elsif node.is_a? Model::DataTypes::Number
+          format_data_types_number(node)
+        elsif node.is_a? Model::DataTypes::Real
+          format_data_types_real(node)
+        elsif node.is_a? Model::DataTypes::Select
+          format_data_types_select(node)
+        elsif node.is_a? Model::DataTypes::Set
+          format_data_types_set(node)
+        elsif node.is_a? Model::DataTypes::String
+          format_data_types_string(node)
         elsif node.is_a? Model::Expressions::AggregateInitializer
           format_expressions_aggregate_initializer(node)
-        elsif node.is_a? Model::Expressions::AggregateItem
-          format_expressions_aggregate_item(node)
-        elsif node.is_a? Model::Expressions::AttributeReference
-          format_expressions_attribute_reference(node)
+        elsif node.is_a? Model::Expressions::AggregateInitializerItem
+          format_expressions_aggregate_initializer_item(node)
         elsif node.is_a? Model::Expressions::BinaryExpression
           format_expressions_binary_expression(node)
-        elsif node.is_a? Model::Expressions::Call
-          format_expressions_call(node)
         elsif node.is_a? Model::Expressions::EntityConstructor
           format_expressions_entity_constructor(node)
-        elsif node.is_a? Model::Expressions::GroupReference
-          format_expressions_group_reference(node)
-        elsif node.is_a? Model::Expressions::IndexReference
-          format_expressions_index_reference(node)
+        elsif node.is_a? Model::Expressions::FunctionCall
+          format_expressions_function_call(node)
         elsif node.is_a? Model::Expressions::Interval
           format_expressions_interval(node)
         elsif node.is_a? Model::Expressions::QueryExpression
           format_expressions_query_expression(node)
-        elsif node.is_a? Model::Expressions::SimpleReference
-          format_expressions_simple_reference(node)
         elsif node.is_a? Model::Expressions::UnaryExpression
           format_expressions_unary_expression(node)
         elsif node.is_a? Model::Literals::Binary
@@ -106,12 +146,18 @@ module Expressir
           format_literals_real(node)
         elsif node.is_a? Model::Literals::String
           format_literals_string(node)
+        elsif node.is_a? Model::References::AttributeReference
+          format_references_attribute_reference(node)
+        elsif node.is_a? Model::References::GroupReference
+          format_references_group_reference(node)
+        elsif node.is_a? Model::References::IndexReference
+          format_references_index_reference(node)
+        elsif node.is_a? Model::References::SimpleReference
+          format_references_simple_reference(node)
         elsif node.is_a? Model::Statements::Alias
           format_statements_alias(node)
         elsif node.is_a? Model::Statements::Assignment
           format_statements_assignment(node)
-        elsif node.is_a? Model::Statements::Call
-          format_statements_call(node)
         elsif node.is_a? Model::Statements::Case
           format_statements_case(node)
         elsif node.is_a? Model::Statements::CaseAction
@@ -124,44 +170,18 @@ module Expressir
           format_statements_if(node)
         elsif node.is_a? Model::Statements::Null
           format_statements_null(node)
+        elsif node.is_a? Model::Statements::ProcedureCall
+          format_statements_procedure_call(node)
         elsif node.is_a? Model::Statements::Repeat
           format_statements_repeat(node)
         elsif node.is_a? Model::Statements::Return
           format_statements_return(node)
         elsif node.is_a? Model::Statements::Skip
           format_statements_skip(node)
-        elsif node.is_a? Model::Types::Aggregate
-          format_types_aggregate(node)
-        elsif node.is_a? Model::Types::Array
-          format_types_array(node)
-        elsif node.is_a? Model::Types::Bag
-          format_types_bag(node)
-        elsif node.is_a? Model::Types::Binary
-          format_types_binary(node)
-        elsif node.is_a? Model::Types::Boolean
-          format_types_boolean(node)
-        elsif node.is_a? Model::Types::Enumeration
-          format_types_enumeration(node)
-        elsif node.is_a? Model::Types::GenericEntity
-          format_types_generic_entity(node)
-        elsif node.is_a? Model::Types::Generic
-          format_types_generic(node)
-        elsif node.is_a? Model::Types::Integer
-          format_types_integer(node)
-        elsif node.is_a? Model::Types::List
-          format_types_list(node)
-        elsif node.is_a? Model::Types::Logical
-          format_types_logical(node)
-        elsif node.is_a? Model::Types::Number
-          format_types_number(node)
-        elsif node.is_a? Model::Types::Real
-          format_types_real(node)
-        elsif node.is_a? Model::Types::Select
-          format_types_select(node)
-        elsif node.is_a? Model::Types::Set
-          format_types_set(node)
-        elsif node.is_a? Model::Types::String
-          format_types_string(node)
+        elsif node.is_a? Model::SupertypeExpressions::BinarySupertypeExpression
+          format_supertype_expressions_binary_supertype_expression(node)
+        elsif node.is_a? Model::SupertypeExpressions::OneofSupertypeExpression
+          format_supertype_expressions_oneof_supertype_expression(node)
         else
           STDERR.puts "#{node.class.name} format not implemented"
           ''
@@ -170,7 +190,11 @@ module Expressir
 
       private
 
-      def format_attribute(node)
+      def format_repository(node)
+        node.schemas.map{|x| format(x)}.join("\n\n")
+      end
+
+      def format_declarations_attribute(node)
         [
           *if node.supertype_attribute
             [
@@ -199,14 +223,14 @@ module Expressir
           end,
           ' ',
           format(node.type),
-          *if node.kind == Model::Attribute::DERIVED
+          *if node.kind == Model::Declarations::Attribute::DERIVED
             [
               ' ',
               ':=',
               ' ',
               format(node.expression)
             ].join('')
-          elsif node.kind == Model::Attribute::INVERSE
+          elsif node.kind == Model::Declarations::Attribute::INVERSE
             [
               ' ',
               'FOR',
@@ -218,7 +242,7 @@ module Expressir
         ].join('')
       end
 
-      def format_constant(node)
+      def format_declarations_constant(node)
         [
           node.id,
           ' ',
@@ -233,10 +257,10 @@ module Expressir
         ].join('')
       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}
+      def format_declarations_entity(node)
+        explicit_attributes = node.attributes.select{|x| x.kind == Model::Declarations::Attribute::EXPLICIT}
+        derived_attributes = node.attributes.select{|x| x.kind == Model::Declarations::Attribute::DERIVED}
+        inverse_attributes = node.attributes.select{|x| x.kind == Model::Declarations::Attribute::INVERSE}
 
         [
           [
@@ -314,16 +338,16 @@ module Expressir
               indent(inverse_attributes.map{|x| format(x)}.join("\n")),
             ]
           end,
-          *if node.unique.length > 0
+          *if node.unique_rules.length > 0
             [
               'UNIQUE',
-              indent(node.unique.map{|x| format(x)}.join("\n"))
+              indent(node.unique_rules.map{|x| format(x)}.join("\n"))
             ]
           end,
-          *if node.where.length > 0
+          *if node.where_rules.length > 0
             [
               'WHERE',
-              indent(node.where.map{|x| format(x)}.join("\n")),
+              indent(node.where_rules.map{|x| format(x)}.join("\n")),
             ]
           end,
           [
@@ -333,11 +357,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_enumeration_item(node)
-        node.id
-      end
-
-      def format_function(node)
+      def format_declarations_function(node)
         [
           [
             'FUNCTION',
@@ -402,11 +422,11 @@ module Expressir
         ].join("\n")
       end
 
-      def format_interface(node)
+      def format_declarations_interface(node)
         [
           case node.kind
-            when Model::Interface::USE then 'USE'
-            when Model::Interface::REFERENCE then 'REFERENCE'
+            when Model::Declarations::Interface::USE then 'USE'
+            when Model::Declarations::Interface::REFERENCE then 'REFERENCE'
           end,
           ' ',
           'FROM',
@@ -427,7 +447,7 @@ module Expressir
         ].join('')
       end
 
-      def format_interface_item(node)
+      def format_declarations_interface_item(node)
         [
           format(node.ref),
           *if node.id
@@ -441,7 +461,7 @@ module Expressir
         ].join('')
       end
 
-      def format_parameter(node)
+      def format_declarations_parameter(node)
         [
           *if node.var
             [
@@ -457,7 +477,7 @@ module Expressir
         ].join('')
       end
 
-      def format_procedure(node)
+      def format_declarations_procedure(node)
         [
           [
             'PROCEDURE',
@@ -518,11 +538,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_repository(node)
-        node.schemas.map{|node| format(node)}.join("\n\n")
-      end
-
-      def format_rule(node)
+      def format_declarations_rule(node)
         [
           [
             'RULE',
@@ -574,10 +590,10 @@ module Expressir
           *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
-          *if node.where.length > 0
+          *if node.where_rules.length > 0
             [
               'WHERE',
-              indent(node.where.map{|x| format(x)}.join("\n"))
+              indent(node.where_rules.map{|x| format(x)}.join("\n"))
             ]
           end,
           [
@@ -587,7 +603,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_schema_head(node)
+      def format_declarations_schema_head(node)
         [
           [
             'SCHEMA',
@@ -610,7 +626,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_schema(node)
+      def format_declarations_schema(node)
         schema_declarations = [
           *if node.constants.length > 0
             [
@@ -643,7 +659,7 @@ module Expressir
         ]
 
         [
-          format_schema_head(node),
+          format_declarations_schema_head(node),
           *if schema_declarations.length > 0
             [
               '',
@@ -659,7 +675,15 @@ module Expressir
         ].join("\n")
       end
 
-      def format_subtype_constraint(node)
+      def format_declarations_schema_version(node)
+        [
+          "'",
+          node.value,
+          "'"
+        ].join('')
+      end
+
+      def format_declarations_subtype_constraint(node)
         [
           [
             'SUBTYPE_CONSTRAINT',
@@ -701,7 +725,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_type(node)
+      def format_declarations_type(node)
         [
           [
             'TYPE',
@@ -710,13 +734,13 @@ module Expressir
             ' ',
             '=',
             ' ',
-            format(node.type),
+            format(node.underlying_type),
             ';',
           ].join(''),
-          *if node.where.length > 0
+          *if node.where_rules.length > 0
             [
               'WHERE',
-              indent(node.where.map{|x| format(x)}.join("\n"))
+              indent(node.where_rules.map{|x| format(x)}.join("\n"))
             ]
           end,
           [
@@ -726,7 +750,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_unique(node)
+      def format_declarations_unique_rule(node)
         [
           *if node.id
             [
@@ -740,7 +764,7 @@ module Expressir
         ].join('')
       end
 
-      def format_variable(node)
+      def format_declarations_variable(node)
         [
           node.id,
           ' ',
@@ -759,7 +783,7 @@ module Expressir
         ].join('')
       end
 
-      def format_where(node)
+      def format_declarations_where_rule(node)
         [
           *if node.id
             [
@@ -781,7 +805,7 @@ module Expressir
         ].join('')
       end
 
-      def format_expressions_aggregate_item(node)
+      def format_expressions_aggregate_initializer_item(node)
         [
           format(node.expression),
           ':',
@@ -789,14 +813,6 @@ module Expressir
         ].join('')
       end
 
-      def format_expressions_attribute_reference(node)
-        [
-          format(node.ref),
-          '.',
-          format(node.attribute)
-        ].join('')
-      end
-
       def format_expressions_binary_expression(node)
         [
           *if node.operand1.is_a? Model::Expressions::BinaryExpression and OPERATOR_PRECEDENCE[node.operand1.operator] > OPERATOR_PRECEDENCE[node.operator]
@@ -810,7 +826,6 @@ module Expressir
           case node.operator
             when Model::Expressions::BinaryExpression::ADDITION then '+'
             when Model::Expressions::BinaryExpression::AND then 'AND'
-            when Model::Expressions::BinaryExpression::ANDOR then 'ANDOR'
             when Model::Expressions::BinaryExpression::COMBINE then '||'
             when Model::Expressions::BinaryExpression::EQUAL then '='
             when Model::Expressions::BinaryExpression::EXPONENTIATION then '**'
@@ -842,62 +857,39 @@ module Expressir
         ].join('')
       end
 
-      def format_expressions_call(node)
+      def format_expressions_entity_constructor(node)
         [
-          format(node.ref),
+          format(node.entity),
           '(',
           node.parameters.map{|x| format(x)}.join(', '),
           ')'
         ].join('')
       end
 
-      def format_expressions_entity_constructor(node)
+      def format_expressions_function_call(node)
         [
-          format(node.entity),
+          format(node.function),
           '(',
           node.parameters.map{|x| format(x)}.join(', '),
           ')'
         ].join('')
       end
 
-      def format_expressions_group_reference(node)
-        [
-          format(node.ref),
-          '\\',
-          format(node.entity)
-        ].join('')
-      end
-
-      def format_expressions_index_reference(node)
-        [
-          format(node.ref),
-          '[',
-          format(node.index1),
-          *if node.index2
-            [
-              ':',
-              format(node.index2)
-            ].join('')
-          end,
-          ']'
-        ].join('')
-      end
-
       def format_expressions_interval(node)
         [
           '{',
           format(node.low),
           ' ',
           case node.operator1
-            when Model::Expressions::BinaryExpression::LESS_THAN then '<'
-            when Model::Expressions::BinaryExpression::LESS_THAN_OR_EQUAL then '<='
+            when Model::Expressions::Interval::LESS_THAN then '<'
+            when Model::Expressions::Interval::LESS_THAN_OR_EQUAL then '<='
           end,
           ' ',
           format(node.item),
           ' ',
           case node.operator2
-            when Model::Expressions::BinaryExpression::LESS_THAN then '<'
-            when Model::Expressions::BinaryExpression::LESS_THAN_OR_EQUAL then '<='
+            when Model::Expressions::Interval::LESS_THAN then '<'
+            when Model::Expressions::Interval::LESS_THAN_OR_EQUAL then '<='
           end,
           ' ',
           format(node.high),
@@ -923,10 +915,6 @@ module Expressir
         ].join('')
       end
 
-      def format_expressions_simple_reference(node)
-        node.id
-      end
-
       def format_expressions_unary_expression(node)
         [
           case node.operator
@@ -986,6 +974,41 @@ module Expressir
         end
       end
 
+      def format_references_attribute_reference(node)
+        [
+          format(node.ref),
+          '.',
+          format(node.attribute)
+        ].join('')
+      end
+
+      def format_references_group_reference(node)
+        [
+          format(node.ref),
+          '\\',
+          format(node.entity)
+        ].join('')
+      end
+
+      def format_references_index_reference(node)
+        [
+          format(node.ref),
+          '[',
+          format(node.index1),
+          *if node.index2
+            [
+              ':',
+              format(node.index2)
+            ].join('')
+          end,
+          ']'
+        ].join('')
+      end
+
+      def format_references_simple_reference(node)
+        node.id
+      end
+
       def format_statements_alias(node)
         [
           [
@@ -1020,9 +1043,9 @@ module Expressir
         ].join('')
       end
 
-      def format_statements_call(node)
+      def format_statements_procedure_call(node)
         [
-          format(node.ref),
+          format(node.procedure),
           *if node.parameters.length > 0
             [
               '(',
@@ -1200,11 +1223,45 @@ module Expressir
         ].join('')
       end
 
-      def format_types_aggregate(node)
+      def format_supertype_expressions_binary_supertype_expression(node)
+        [
+          *if node.operand1.is_a? Model::SupertypeExpressions::BinarySupertypeExpression and SUPERTYPE_OPERATOR_PRECEDENCE[node.operand1.operator] > SUPERTYPE_OPERATOR_PRECEDENCE[node.operator]
+            '('
+          end,
+          format(node.operand1),
+          *if node.operand1.is_a? Model::SupertypeExpressions::BinarySupertypeExpression and SUPERTYPE_OPERATOR_PRECEDENCE[node.operand1.operator] > SUPERTYPE_OPERATOR_PRECEDENCE[node.operator]
+            ')'
+          end,
+          ' ',
+          case node.operator
+            when Model::SupertypeExpressions::BinarySupertypeExpression::AND then 'AND'
+            when Model::SupertypeExpressions::BinarySupertypeExpression::ANDOR then 'ANDOR'
+          end,
+          ' ',
+          *if node.operand2.is_a? Model::SupertypeExpressions::BinarySupertypeExpression and SUPERTYPE_OPERATOR_PRECEDENCE[node.operand2.operator] > SUPERTYPE_OPERATOR_PRECEDENCE[node.operator]
+            '('
+          end,
+          format(node.operand2),
+          *if node.operand2.is_a? Model::SupertypeExpressions::BinarySupertypeExpression and SUPERTYPE_OPERATOR_PRECEDENCE[node.operand2.operator] > SUPERTYPE_OPERATOR_PRECEDENCE[node.operator]
+            ')'
+          end,
+        ].join('')
+      end
+
+      def format_supertype_expressions_oneof_supertype_expression(node)
+        [
+          'ONEOF',
+          '(',
+          node.operands.map{|x| format(x)}.join(', '),
+          ')'
+        ].join('')
+      end
+
+      def format_data_types_aggregate(node)
         'AGGREGATE'
       end
 
-      def format_types_array(node)
+      def format_data_types_array(node)
         [
           'ARRAY',
           *if node.bound1 and node.bound2
@@ -1236,7 +1293,7 @@ module Expressir
         ].join('')
       end
 
-      def format_types_bag(node)
+      def format_data_types_bag(node)
         [
           'BAG',
           *if node.bound1 and node.bound2
@@ -1256,7 +1313,7 @@ module Expressir
         ].join('')
       end
 
-      def format_types_binary(node)
+      def format_data_types_binary(node)
         [
           'BINARY',
           *if node.width
@@ -1276,11 +1333,11 @@ module Expressir
         ].join('')
       end
 
-      def format_types_boolean(node)
+      def format_data_types_boolean(node)
         'BOOLEAN'
       end
 
-      def format_types_enumeration(node)
+      def format_data_types_enumeration(node)
         [
           *if node.extensible
             [
@@ -1289,44 +1346,51 @@ module Expressir
             ].join('')
           end,
           'ENUMERATION',
-          *if node.items.length > 0
-            item_indent = INDENT_CHAR * '('.length
-            [
-              ' ',
-              'OF',
-              "\n",
-              indent([
-                '(',
-                node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
-            ].join('')
-          end,
-          *if node.extension_type
+          *if node.based_on
             [
               ' ',
               'BASED_ON',
               ' ',
-              format(node.extension_type)
+              format(node.based_on),
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  ' ',
+                  'WITH',
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
-          end,
-          *if node.extension_items.length > 0
-            item_indent = INDENT_CHAR * '('.length
+          else
             [
-              ' ',
-              'WITH',
-              "\n",
-              indent([
-                '(',
-                node.extension_items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  ' ',
+                  'OF',
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
           end
         ].join('')
       end
 
-      def format_types_generic_entity(node)
+      def format_data_types_enumeration_item(node)
+        node.id
+      end
+
+      def format_data_types_generic_entity(node)
         [
           'GENERIC_ENTITY',
           *if node.id
@@ -1338,7 +1402,7 @@ module Expressir
         ].join('')
       end
 
-      def format_types_generic(node)
+      def format_data_types_generic(node)
         [
           'GENERIC',
           *if node.id
@@ -1350,11 +1414,11 @@ module Expressir
         ].join('')
       end
 
-      def format_types_integer(node)
+      def format_data_types_integer(node)
         'INTEGER'
       end
 
-      def format_types_list(node)
+      def format_data_types_list(node)
         [
           'LIST',
           *if node.bound1 and node.bound2
@@ -1380,15 +1444,15 @@ module Expressir
         ].join('')
       end
 
-      def format_types_logical(node)
+      def format_data_types_logical(node)
         'LOGICAL'
       end
 
-      def format_types_number(node)
+      def format_data_types_number(node)
         'NUMBER'
       end
 
-      def format_types_real(node)
+      def format_data_types_real(node)
         [
           'REAL',
           *if node.precision
@@ -1402,7 +1466,7 @@ module Expressir
         ].join('')
       end
 
-      def format_types_select(node)
+      def format_data_types_select(node)
         [
           *if node.extensible
             [
@@ -1417,42 +1481,45 @@ module Expressir
             ].join('')
           end,
           'SELECT',
-          *if node.items.length > 0
-            item_indent = INDENT_CHAR * '('.length
-            [
-              "\n",
-              indent([
-                '(',
-                node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
-            ].join('')
-          end,
-          *if node.extension_type
+          *if node.based_on
             [
               ' ',
               'BASED_ON',
               ' ',
-              format(node.extension_type)
+              format(node.based_on),
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  ' ',
+                  'WITH',
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
-          end,
-          *if node.extension_items.length > 0
-            item_indent = INDENT_CHAR * '('.length
+          else
             [
-              ' ',
-              'WITH',
-              "\n",
-              indent([
-                '(',
-                node.extension_items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
           end
         ].join('')
       end
 
-      def format_types_set(node)
+      def format_data_types_set(node)
         [
           'SET',
           *if node.bound1 and node.bound2
@@ -1472,7 +1539,7 @@ module Expressir
         ].join('')
       end
 
-      def format_types_string(node)
+      def format_data_types_string(node)
         [
           'STRING',
           *if node.width
@@ -1502,7 +1569,7 @@ module Expressir
             [
               '(*',
               '"',
-              node.path,
+              node.path || node.id,
               '"',
             ].join(''),
             remark,
@@ -1512,7 +1579,7 @@ module Expressir
           [
             '--',
             '"',
-            node.path,
+            node.path || node.id,
             '"',
             ' ',
             remark
@@ -1533,7 +1600,7 @@ module Expressir
       def format_scope_remarks(node)
         [
           *format_remarks(node),
-          *node.children.select{|x| !x.is_a? Model::EnumerationItem or node.is_a? Model::Type}.flat_map{|x| format_scope_remarks(x)}
+          *node.children.select{|x| !x.is_a? Model::DataTypes::EnumerationItem or node.is_a? Model::Declarations::Type}.flat_map{|x| format_scope_remarks(x)}
         ]
       end
     end