RubyGems - expressir - Versions diffs - 2.2.0 → 2.3.0 - Mend

expressir 2.2.0 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (192) hide show

checksums.yaml +4 -4
data/.rubocop.yml +1 -1
data/.rubocop_todo.yml +254 -77
data/Gemfile +4 -1
data/README.adoc +63 -26
data/benchmark/srl_benchmark.rb +386 -0
data/benchmark/srl_native_benchmark.rb +142 -0
data/benchmark/srl_ruby_benchmark.rb +130 -0
data/expressir.gemspec +4 -2
data/lib/expressir/benchmark.rb +1 -1
data/lib/expressir/changes/item_change.rb +0 -1
data/lib/expressir/changes/mapping_change.rb +0 -1
data/lib/expressir/changes/schema_change.rb +0 -2
data/lib/expressir/changes/version_change.rb +0 -3
data/lib/expressir/changes.rb +5 -6
data/lib/expressir/cli.rb +10 -24
data/lib/expressir/commands/base.rb +2 -9
data/lib/expressir/commands/changes.rb +0 -2
data/lib/expressir/commands/changes_import_eengine.rb +0 -3
data/lib/expressir/commands/changes_validate.rb +0 -2
data/lib/expressir/commands/format.rb +5 -3
data/lib/expressir/commands/manifest.rb +0 -7
data/lib/expressir/commands/package.rb +93 -101
data/lib/expressir/commands/validate.rb +0 -2
data/lib/expressir/commands/validate_ascii.rb +2 -4
data/lib/expressir/commands/validate_load.rb +8 -5
data/lib/expressir/commands.rb +20 -0
data/lib/expressir/config.rb +0 -2
data/lib/expressir/coverage.rb +11 -4
data/lib/expressir/eengine/arm_compare_report.rb +1 -4
data/lib/expressir/eengine/changes_section.rb +1 -3
data/lib/expressir/eengine/compare_report.rb +1 -13
data/lib/expressir/eengine/mim_compare_report.rb +1 -4
data/lib/expressir/eengine/modified_object.rb +1 -2
data/lib/expressir/eengine.rb +9 -0
data/lib/expressir/errors.rb +113 -0
data/lib/expressir/express/builder.rb +22 -7
data/lib/expressir/express/builder_registry.rb +411 -0
data/lib/expressir/express/builders/attribute_decl_builder.rb +0 -6
data/lib/expressir/express/builders/built_in_builder.rb +1 -16
data/lib/expressir/express/builders/constant_builder.rb +4 -19
data/lib/expressir/express/builders/declaration_builder.rb +0 -4
data/lib/expressir/express/builders/derive_clause_builder.rb +0 -2
data/lib/expressir/express/builders/derived_attr_builder.rb +0 -2
data/lib/expressir/express/builders/domain_rule_builder.rb +0 -2
data/lib/expressir/express/builders/entity_decl_builder.rb +7 -13
data/lib/expressir/express/builders/explicit_attr_builder.rb +5 -8
data/lib/expressir/express/builders/expression_builder.rb +31 -67
data/lib/expressir/express/builders/function_decl_builder.rb +20 -18
data/lib/expressir/express/builders/interface_builder.rb +0 -20
data/lib/expressir/express/builders/inverse_attr_builder.rb +0 -2
data/lib/expressir/express/builders/inverse_attr_type_builder.rb +0 -6
data/lib/expressir/express/builders/inverse_clause_builder.rb +0 -2
data/lib/expressir/express/builders/literal_builder.rb +1 -15
data/lib/expressir/express/builders/procedure_decl_builder.rb +20 -19
data/lib/expressir/express/builders/qualifier_builder.rb +0 -27
data/lib/expressir/express/builders/reference_builder.rb +1 -10
data/lib/expressir/express/builders/rule_decl_builder.rb +21 -19
data/lib/expressir/express/builders/schema_body_decl_builder.rb +0 -4
data/lib/expressir/express/builders/schema_decl_builder.rb +7 -13
data/lib/expressir/express/builders/schema_version_builder.rb +0 -6
data/lib/expressir/express/builders/simple_id_builder.rb +1 -10
data/lib/expressir/express/builders/statement_builder.rb +4 -32
data/lib/expressir/express/builders/subtype_constraint_builder.rb +6 -30
data/lib/expressir/express/builders/syntax_builder.rb +60 -7
data/lib/expressir/express/builders/type_builder.rb +3 -45
data/lib/expressir/express/builders/type_decl_builder.rb +1 -7
data/lib/expressir/express/builders/unique_clause_builder.rb +1 -3
data/lib/expressir/express/builders/unique_rule_builder.rb +0 -2
data/lib/expressir/express/builders/where_clause_builder.rb +1 -3
data/lib/expressir/express/builders.rb +47 -35
data/lib/expressir/express/error.rb +0 -3
data/lib/expressir/express/formatter.rb +17 -19
data/lib/expressir/express/formatters/data_types_formatter.rb +295 -293
data/lib/expressir/express/formatters/declarations_formatter.rb +617 -615
data/lib/expressir/express/formatters/expressions_formatter.rb +146 -144
data/lib/expressir/express/formatters/literals_formatter.rb +35 -33
data/lib/expressir/express/formatters/references_formatter.rb +34 -32
data/lib/expressir/express/formatters/remark_formatter.rb +176 -209
data/lib/expressir/express/formatters/remark_item_formatter.rb +18 -16
data/lib/expressir/express/formatters/statements_formatter.rb +190 -188
data/lib/expressir/express/formatters/supertype_expressions_formatter.rb +41 -39
data/lib/expressir/express/formatters.rb +22 -0
data/lib/expressir/express/parser.rb +40 -41
data/lib/expressir/express/pretty_formatter.rb +68 -47
data/lib/expressir/express/remark_attacher.rb +210 -147
data/lib/expressir/express/streaming_builder.rb +0 -3
data/lib/expressir/express/transformer/remark_handling.rb +1 -2
data/lib/expressir/express.rb +29 -0
data/lib/expressir/manifest/resolver.rb +0 -3
data/lib/expressir/manifest/validator.rb +0 -3
data/lib/expressir/manifest.rb +6 -0
data/lib/expressir/model/cache.rb +1 -1
data/lib/expressir/model/concerns.rb +19 -0
data/lib/expressir/model/data_types/aggregate.rb +1 -1
data/lib/expressir/model/data_types/array.rb +1 -1
data/lib/expressir/model/data_types/bag.rb +1 -1
data/lib/expressir/model/data_types/binary.rb +1 -1
data/lib/expressir/model/data_types/boolean.rb +1 -1
data/lib/expressir/model/data_types/enumeration.rb +1 -1
data/lib/expressir/model/data_types/enumeration_item.rb +1 -1
data/lib/expressir/model/data_types/generic.rb +1 -1
data/lib/expressir/model/data_types/generic_entity.rb +1 -1
data/lib/expressir/model/data_types/integer.rb +1 -1
data/lib/expressir/model/data_types/list.rb +1 -1
data/lib/expressir/model/data_types/logical.rb +1 -1
data/lib/expressir/model/data_types/number.rb +1 -1
data/lib/expressir/model/data_types/real.rb +1 -1
data/lib/expressir/model/data_types/select.rb +1 -1
data/lib/expressir/model/data_types/set.rb +1 -1
data/lib/expressir/model/data_types/string.rb +1 -1
data/lib/expressir/model/data_types.rb +25 -0
data/lib/expressir/model/declarations/attribute.rb +1 -1
data/lib/expressir/model/declarations/constant.rb +1 -1
data/lib/expressir/model/declarations/derived_attribute.rb +1 -1
data/lib/expressir/model/declarations/entity.rb +4 -1
data/lib/expressir/model/declarations/function.rb +3 -1
data/lib/expressir/model/declarations/informal_proposition_rule.rb +2 -1
data/lib/expressir/model/declarations/interface.rb +1 -1
data/lib/expressir/model/declarations/interface_item.rb +1 -1
data/lib/expressir/model/declarations/interfaced_item.rb +1 -1
data/lib/expressir/model/declarations/inverse_attribute.rb +1 -1
data/lib/expressir/model/declarations/parameter.rb +1 -1
data/lib/expressir/model/declarations/procedure.rb +3 -1
data/lib/expressir/model/declarations/remark_item.rb +1 -1
data/lib/expressir/model/declarations/rule.rb +4 -1
data/lib/expressir/model/declarations/schema.rb +2 -1
data/lib/expressir/model/declarations/schema_version.rb +1 -1
data/lib/expressir/model/declarations/schema_version_item.rb +1 -1
data/lib/expressir/model/declarations/subtype_constraint.rb +1 -1
data/lib/expressir/model/declarations/type.rb +4 -1
data/lib/expressir/model/declarations/unique_rule.rb +1 -1
data/lib/expressir/model/declarations/variable.rb +1 -1
data/lib/expressir/model/declarations/where_rule.rb +1 -1
data/lib/expressir/model/declarations.rb +31 -0
data/lib/expressir/model/dependency_resolver.rb +0 -2
data/lib/expressir/model/exp_file.rb +38 -0
data/lib/expressir/model/expressions/aggregate_initializer.rb +1 -1
data/lib/expressir/model/expressions/aggregate_initializer_item.rb +1 -1
data/lib/expressir/model/expressions/binary_expression.rb +1 -1
data/lib/expressir/model/expressions/entity_constructor.rb +1 -1
data/lib/expressir/model/expressions/function_call.rb +1 -1
data/lib/expressir/model/expressions/interval.rb +1 -1
data/lib/expressir/model/expressions/query_expression.rb +1 -1
data/lib/expressir/model/expressions/unary_expression.rb +1 -1
data/lib/expressir/model/expressions.rb +18 -0
data/lib/expressir/model/identifier.rb +5 -1
data/lib/expressir/model/indexes.rb +11 -0
data/lib/expressir/model/literals/binary.rb +1 -1
data/lib/expressir/model/literals/integer.rb +1 -1
data/lib/expressir/model/literals/logical.rb +1 -1
data/lib/expressir/model/literals/real.rb +1 -1
data/lib/expressir/model/literals/string.rb +1 -1
data/lib/expressir/model/literals.rb +13 -0
data/lib/expressir/model/model_element.rb +7 -15
data/lib/expressir/model/references/attribute_reference.rb +1 -1
data/lib/expressir/model/references/group_reference.rb +1 -1
data/lib/expressir/model/references/index_reference.rb +1 -1
data/lib/expressir/model/references/simple_reference.rb +1 -1
data/lib/expressir/model/references.rb +12 -0
data/lib/expressir/model/remark_info.rb +1 -7
data/lib/expressir/model/repository.rb +72 -36
data/lib/expressir/model/repository_validator.rb +0 -2
data/lib/expressir/model/search_engine.rb +6 -30
data/lib/expressir/model/statements/alias.rb +1 -1
data/lib/expressir/model/statements/assignment.rb +1 -1
data/lib/expressir/model/statements/case.rb +1 -1
data/lib/expressir/model/statements/case_action.rb +1 -1
data/lib/expressir/model/statements/compound.rb +1 -1
data/lib/expressir/model/statements/escape.rb +1 -1
data/lib/expressir/model/statements/if.rb +1 -1
data/lib/expressir/model/statements/null.rb +1 -1
data/lib/expressir/model/statements/procedure_call.rb +1 -1
data/lib/expressir/model/statements/repeat.rb +1 -1
data/lib/expressir/model/statements/return.rb +1 -1
data/lib/expressir/model/statements/skip.rb +1 -1
data/lib/expressir/model/statements.rb +20 -0
data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb +1 -1
data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb +1 -1
data/lib/expressir/model/supertype_expressions.rb +12 -0
data/lib/expressir/model.rb +28 -4
data/lib/expressir/package/builder.rb +33 -4
data/lib/expressir/package/metadata.rb +0 -1
data/lib/expressir/package/reader.rb +0 -1
data/lib/expressir/package.rb +8 -0
data/lib/expressir/schema_manifest.rb +5 -6
data/lib/expressir/schema_manifest_entry.rb +3 -4
data/lib/expressir/transformer.rb +7 -0
data/lib/expressir/version.rb +1 -1
data/lib/expressir.rb +23 -173
metadata +64 -9
data/lib/expressir/express/builders/token_builder.rb +0 -15

data/lib/expressir/express/error.rb CHANGED Viewed

@@ -96,8 +96,5 @@ module Expressir
         end
       end
     end
-    # For backward compatibility
-    CacheVersionMismatchError = Error::CacheVersionMismatchError
   end
 end

data/lib/expressir/express/formatter.rb CHANGED Viewed

@@ -1,25 +1,15 @@
-require_relative "formatters/remark_item_formatter"
-require_relative "formatters/remark_formatter"
-require_relative "formatters/literals_formatter"
-require_relative "formatters/references_formatter"
-require_relative "formatters/supertype_expressions_formatter"
-require_relative "formatters/statements_formatter"
-require_relative "formatters/expressions_formatter"
-require_relative "formatters/data_types_formatter"
-require_relative "formatters/declarations_formatter"
 module Expressir
   module Express
     class Formatter
-      include RemarkItemFormatter
-      include RemarkFormatter
-      include LiteralsFormatter
-      include ReferencesFormatter
-      include SupertypeExpressionsFormatter
-      include StatementsFormatter
-      include ExpressionsFormatter
-      include DataTypesFormatter
-      include DeclarationsFormatter
+      include Formatters::RemarkItemFormatter
+      include Formatters::RemarkFormatter
+      include Formatters::LiteralsFormatter
+      include Formatters::ReferencesFormatter
+      include Formatters::SupertypeExpressionsFormatter
+      include Formatters::StatementsFormatter
+      include Formatters::ExpressionsFormatter
+      include Formatters::DataTypesFormatter
+      include Formatters::DeclarationsFormatter
       INDENT_CHAR = " ".freeze
       INDENT_WIDTH = 2
@@ -79,6 +69,8 @@ module Expressir
         case node
         when Model::Repository
           format_repository(node)
+        when Model::ExpFile
+          format_exp_file(node)
         when Model::Declarations::Attribute
           format_declarations_attribute(node)
         when Model::Declarations::Constant
@@ -232,6 +224,12 @@ module Expressir
       private
       def format_repository(node)
+        # Format each file in the repository
+        result = node.files&.map { |f| format(f) }&.join("\n\n")
+        result ? "#{result}\n" : ""
+      end
+      def format_exp_file(node)
         result = node.schemas&.map { |x| format(x) }&.join("\n\n")
         result ? "#{result}\n" : ""
       end

data/lib/expressir/express/formatters/data_types_formatter.rb CHANGED Viewed

@@ -1,316 +1,318 @@
 module Expressir
   module Express
-    module DataTypesFormatter
-      private
+    module Formatters
+      module DataTypesFormatter
+        private
-      def format_data_types_aggregate(_node)
-        "AGGREGATE"
-      end
-      def format_data_types_array(node)
-        [
-          "ARRAY",
-          *if node.bound1 && node.bound2
-             [
-               " ",
-               "[",
-               format(node.bound1),
-               ":",
-               format(node.bound2),
-               "]",
-             ].join
-           end,
-          " ",
-          "OF",
-          *if node.optional
-             [
-               " ",
-               "OPTIONAL",
-             ].join
-           end,
-          *if node.unique
-             [
-               " ",
-               "UNIQUE",
-             ].join
-           end,
-          " ",
-          format(node.base_type),
-        ].join
-      end
+        def format_data_types_aggregate(_node)
+          "AGGREGATE"
+        end
-      def format_data_types_bag(node)
-        [
-          "BAG",
-          *if node.bound1 && node.bound2
-             [
-               " ",
-               "[",
-               format(node.bound1),
-               ":",
-               format(node.bound2),
-               "]",
-             ].join
-           end,
-          " ",
-          "OF",
-          " ",
-          format(node.base_type),
-        ].join
-      end
+        def format_data_types_array(node)
+          [
+            "ARRAY",
+            *if node.bound1 && node.bound2
+               [
+                 " ",
+                 "[",
+                 format(node.bound1),
+                 ":",
+                 format(node.bound2),
+                 "]",
+               ].join
+             end,
+            " ",
+            "OF",
+            *if node.optional
+               [
+                 " ",
+                 "OPTIONAL",
+               ].join
+             end,
+            *if node.unique
+               [
+                 " ",
+                 "UNIQUE",
+               ].join
+             end,
+            " ",
+            format(node.base_type),
+          ].join
+        end
-      def format_data_types_binary(node)
-        [
-          "BINARY",
-          *if node.width
-             [
-               " ",
-               "(",
-               format(node.width),
-               ")",
-             ].join
-           end,
-          *if node.fixed
-             [
-               " ",
-               "FIXED",
-             ].join
-           end,
-        ].join
-      end
+        def format_data_types_bag(node)
+          [
+            "BAG",
+            *if node.bound1 && node.bound2
+               [
+                 " ",
+                 "[",
+                 format(node.bound1),
+                 ":",
+                 format(node.bound2),
+                 "]",
+               ].join
+             end,
+            " ",
+            "OF",
+            " ",
+            format(node.base_type),
+          ].join
+        end
-      def format_data_types_boolean(_node)
-        "BOOLEAN"
-      end
+        def format_data_types_binary(node)
+          [
+            "BINARY",
+            *if node.width
+               [
+                 " ",
+                 "(",
+                 format(node.width),
+                 ")",
+               ].join
+             end,
+            *if node.fixed
+               [
+                 " ",
+                 "FIXED",
+               ].join
+             end,
+          ].join
+        end
-      def format_data_types_enumeration(node)
-        indent_char = self.class.const_get(:INDENT_CHAR)
-        [
-          *if node.extensible
-             [
-               "EXTENSIBLE",
-               " ",
-             ].join
-           end,
-          "ENUMERATION",
-          *if node.based_on
-             [
-               " ",
-               "BASED_ON",
-               " ",
-               format(node.based_on),
-               *if node.items&.length&.positive?
-                  item_indent = indent_char * "(".length
-                  [
-                    " ",
-                    "WITH",
-                    "\n",
-                    indent([
-                      "(",
-                      node.items.map do |x|
-                        format(x)
-                      end.join(",\n#{item_indent}"),
-                      ")",
-                    ].join),
-                  ].join
-                end,
-             ].join
-           else
-             [
-               *if node.items&.length&.positive?
-                  item_indent = indent_char * "(".length
-                  [
-                    " ",
-                    "OF",
-                    "\n",
-                    indent([
-                      "(",
-                      node.items.map do |x|
-                        format(x)
-                      end.join(",\n#{item_indent}"),
-                      ")",
-                    ].join),
-                  ].join
-                end,
-             ].join
-           end,
-        ].join
-      end
+        def format_data_types_boolean(_node)
+          "BOOLEAN"
+        end
-      def format_data_types_enumeration_item(node)
-        node.id
-      end
+        def format_data_types_enumeration(node)
+          indent_char = self.class.const_get(:INDENT_CHAR)
+          [
+            *if node.extensible
+               [
+                 "EXTENSIBLE",
+                 " ",
+               ].join
+             end,
+            "ENUMERATION",
+            *if node.based_on
+               [
+                 " ",
+                 "BASED_ON",
+                 " ",
+                 format(node.based_on),
+                 *if node.items&.length&.positive?
+                    item_indent = indent_char * "(".length
+                    [
+                      " ",
+                      "WITH",
+                      "\n",
+                      indent([
+                        "(",
+                        node.items.map do |x|
+                          format(x)
+                        end.join(",\n#{item_indent}"),
+                        ")",
+                      ].join),
+                    ].join
+                  end,
+               ].join
+             else
+               [
+                 *if node.items&.length&.positive?
+                    item_indent = indent_char * "(".length
+                    [
+                      " ",
+                      "OF",
+                      "\n",
+                      indent([
+                        "(",
+                        node.items.map do |x|
+                          format(x)
+                        end.join(",\n#{item_indent}"),
+                        ")",
+                      ].join),
+                    ].join
+                  end,
+               ].join
+             end,
+          ].join
+        end
-      def format_data_types_generic_entity(node)
-        [
-          "GENERIC_ENTITY",
-          *if node.id
-             [
-               ":",
-               node.id,
-             ]
-           end,
-        ].join
-      end
+        def format_data_types_enumeration_item(node)
+          node.id
+        end
-      def format_data_types_generic(node)
-        [
-          "GENERIC",
-          *if node.id
-             [
-               ":",
-               node.id,
-             ]
-           end,
-        ].join
-      end
+        def format_data_types_generic_entity(node)
+          [
+            "GENERIC_ENTITY",
+            *if node.id
+               [
+                 ":",
+                 node.id,
+               ]
+             end,
+          ].join
+        end
-      def format_data_types_integer(_node)
-        "INTEGER"
-      end
+        def format_data_types_generic(node)
+          [
+            "GENERIC",
+            *if node.id
+               [
+                 ":",
+                 node.id,
+               ]
+             end,
+          ].join
+        end
-      def format_data_types_list(node)
-        [
-          "LIST",
-          *if node.bound1 && node.bound2
-             [
-               " ",
-               "[",
-               format(node.bound1),
-               ":",
-               format(node.bound2),
-               "]",
-             ].join
-           end,
-          " ",
-          "OF",
-          *if node.unique
-             [
-               " ",
-               "UNIQUE",
-             ].join
-           end,
-          " ",
-          format(node.base_type),
-        ].join
-      end
+        def format_data_types_integer(_node)
+          "INTEGER"
+        end
-      def format_data_types_logical(_node)
-        "LOGICAL"
-      end
+        def format_data_types_list(node)
+          [
+            "LIST",
+            *if node.bound1 && node.bound2
+               [
+                 " ",
+                 "[",
+                 format(node.bound1),
+                 ":",
+                 format(node.bound2),
+                 "]",
+               ].join
+             end,
+            " ",
+            "OF",
+            *if node.unique
+               [
+                 " ",
+                 "UNIQUE",
+               ].join
+             end,
+            " ",
+            format(node.base_type),
+          ].join
+        end
-      def format_data_types_number(_node)
-        "NUMBER"
-      end
+        def format_data_types_logical(_node)
+          "LOGICAL"
+        end
-      def format_data_types_real(node)
-        [
-          "REAL",
-          *if node.precision
-             [
-               " ",
-               "(",
-               format(node.precision),
-               ")",
-             ].join
-           end,
-        ].join
-      end
+        def format_data_types_number(_node)
+          "NUMBER"
+        end
-      def format_data_types_select(node)
-        indent_char = self.class.const_get(:INDENT_CHAR)
-        node.items ||= []
-        [
-          *if node.extensible
-             [
-               "EXTENSIBLE",
-               " ",
-             ].join
-           end,
-          *if node.generic_entity
-             [
-               "GENERIC_ENTITY",
-               " ",
-             ].join
-           end,
-          "SELECT",
-          *if node.based_on
-             [
-               " ",
-               "BASED_ON",
-               " ",
-               format(node.based_on),
-               *if node.items&.length&.positive?
-                  item_indent = indent_char * "(".length
-                  [
-                    " ",
-                    "WITH",
-                    "\n",
-                    indent([
-                      "(",
-                      node.items.map do |x|
-                        format(x)
-                      end.join(",\n#{item_indent}"),
-                      ")",
-                    ].join),
-                  ].join
-                end,
-             ].join
-           else
-             indent_char = self.class.const_get(:INDENT_CHAR)
-             item_indent = indent_char * "(".length
-             [
-               "\n",
-               indent([
+        def format_data_types_real(node)
+          [
+            "REAL",
+            *if node.precision
+               [
+                 " ",
                  "(",
-                 node.items.map do |x|
-                   format(x)
-                 end.join(",\n#{item_indent}"),
+                 format(node.precision),
                  ")",
-               ].join),
-             ].join
-           end,
-        ].join
-      end
+               ].join
+             end,
+          ].join
+        end
-      def format_data_types_set(node)
-        [
-          "SET",
-          *if node.bound1 && node.bound2
-             [
-               " ",
-               "[",
-               format(node.bound1),
-               ":",
-               format(node.bound2),
-               "]",
-             ].join
-           end,
-          " ",
-          "OF",
-          " ",
-          format(node.base_type),
-        ].join
-      end
+        def format_data_types_select(node)
+          indent_char = self.class.const_get(:INDENT_CHAR)
+          node.items ||= []
+          [
+            *if node.extensible
+               [
+                 "EXTENSIBLE",
+                 " ",
+               ].join
+             end,
+            *if node.generic_entity
+               [
+                 "GENERIC_ENTITY",
+                 " ",
+               ].join
+             end,
+            "SELECT",
+            *if node.based_on
+               [
+                 " ",
+                 "BASED_ON",
+                 " ",
+                 format(node.based_on),
+                 *if node.items&.length&.positive?
+                    item_indent = indent_char * "(".length
+                    [
+                      " ",
+                      "WITH",
+                      "\n",
+                      indent([
+                        "(",
+                        node.items.map do |x|
+                          format(x)
+                        end.join(",\n#{item_indent}"),
+                        ")",
+                      ].join),
+                    ].join
+                  end,
+               ].join
+             else
+               indent_char = self.class.const_get(:INDENT_CHAR)
+               item_indent = indent_char * "(".length
+               [
+                 "\n",
+                 indent([
+                   "(",
+                   node.items.map do |x|
+                     format(x)
+                   end.join(",\n#{item_indent}"),
+                   ")",
+                 ].join),
+               ].join
+             end,
+          ].join
+        end
+        def format_data_types_set(node)
+          [
+            "SET",
+            *if node.bound1 && node.bound2
+               [
+                 " ",
+                 "[",
+                 format(node.bound1),
+                 ":",
+                 format(node.bound2),
+                 "]",
+               ].join
+             end,
+            " ",
+            "OF",
+            " ",
+            format(node.base_type),
+          ].join
+        end
-      def format_data_types_string(node)
-        [
-          "STRING",
-          *if node.width
-             [
-               " ",
-               "(",
-               format(node.width),
-               ")",
-             ].join
-           end,
-          *if node.fixed
-             [
-               " ",
-               "FIXED",
-             ].join
-           end,
-        ].join
+        def format_data_types_string(node)
+          [
+            "STRING",
+            *if node.width
+               [
+                 " ",
+                 "(",
+                 format(node.width),
+                 ")",
+               ].join
+             end,
+            *if node.fixed
+               [
+                 " ",
+                 "FIXED",
+               ].join
+             end,
+          ].join
+        end
       end
     end
   end