enolib 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88751440ddeb55fc6358a9ad2cafa998f3395787b475f3c42e1701c0ef17293c
-  data.tar.gz: e61d935cf566395b4787f424930fb84fcfdd5b879254c35c6dc452f15963c187
+  metadata.gz: 49f109d1e380fde591e9fd8356d83a1024f5bcfb617d4408cbd803b8723379a0
+  data.tar.gz: 8015043eb20b92a86b6afd8a7ae510eb47f24b5fd10226bcadd0b8fe5021c76c
 SHA512:
-  metadata.gz: a23ff5f077a95e19a302c24658f9f0324a4f7a335fffb53018a4f1a1f9f4fa849ce0ae046c279e49445d85175f7ea82b7d118380a0b1ff98d9aaa646510785b1
-  data.tar.gz: 228ff010c1724b9db258c8989fa47678b78ad34af528d0ee42c788a3d302e0f6e390abc6723c0bf2cc890775114df0d04a4530cddd6c81521f83208a6f10dbfc
+  metadata.gz: 7525f016c0835c764b5b5888c98bf57214a8e1918458bd8253ac44cc424e9563713376fc369ee6198d389c63a52db79e6476c7ab476708780c4884883ba52693
+  data.tar.gz: 3667c043b3089e5ef598567adc6f5fe57e0246f98f82ff3f6052050945adbcb1af03a7f16aac343acb26c710229d7548deedd7108ddb310bdf2da66821a4e83f

data/lib/enolib/constants.rb

@@ -4,10 +4,11 @@ module Enolib
   HUMAN_INDEXING = 1
   PRETTY_TYPES = {
     document: 'document',
-    empty_element: 'empty_element',
+    empty: 'empty',
     field: 'field',
     fieldset: 'fieldset',
     fieldset_entry: 'fieldset_entry',
+    field_or_fieldset_or_list: 'field_or_fieldset_or_list',
     list: 'list',
     list_item: 'list_item',
     multiline_field_begin: 'field',

data/lib/enolib/context.rb

@@ -150,7 +150,7 @@ module Enolib
       result[:comment] = comment(element) if element.has_key?(:comments)
 
       case element[:type]
-      when :empty_element
+      when :field_or_fieldset_or_list, :empty
         result[:key] = element[:key]
       when :field
         result[:key] = element[:key]

data/lib/enolib/elements/section.rb

@@ -348,6 +348,9 @@ module Enolib
 
       element = elements[0]
 
+      # TODO: Other implementations use a direct check here (['type'] == :foo)
+      #       Should this be unified across implementations? Follow up.
+      #       (guess is that the main reason is stricter visibility in ruby currently)
       unless element.yields_empty?
         raise Errors::Validation.unexpected_element_type(
           @context,

data/lib/enolib/elements/section_element.rb

@@ -5,7 +5,9 @@ module Enolib
     attr_reader :instruction # TODO: Revisit this hacky exposition
 
     def _untouched
-      return @instruction unless instance_variable_defined?(:@yielded)
+      unless instance_variable_defined?(:@yielded)
+        return instance_variable_defined?(:@touched) ? false : @instruction
+      end
 
       return @instruction if instance_variable_defined?(:@empty) && !@empty.instance_variable_defined?(:@touched)
       return @instruction if instance_variable_defined?(:@field) && !@field.instance_variable_defined?(:@touched)
@@ -16,17 +18,13 @@ module Enolib
 
     def to_empty
       unless instance_variable_defined?(:@empty)
-        if instance_variable_defined?(:@yielded)
-          raise TypeError, "This element was already yielded as #{PRETTY_TYPES[@yielded]} and can't be yielded again as an empty."
-        end
-
-        unless @instruction[:type] == :empty_element
+        unless @instruction[:type] == :empty
           # TODO: Below and in all implementations - why nil for key as second parameter?
           raise Errors::Validation.unexpected_element_type(@context, nil, @instruction, 'expected_empty')
         end
 
         @empty = Empty.new(@context, @instruction, @parent)
-        @yielded = :empty_element
+        @yielded = :empty
       end
 
       @empty
@@ -40,7 +38,7 @@ module Enolib
 
         unless @instruction[:type] == :field ||
                @instruction[:type] == :multiline_field_begin ||
-               @instruction[:type] == :empty_element
+               @instruction[:type] == :field_or_fieldset_or_list
           raise Errors::Validation.unexpected_element_type(@context, nil, @instruction, 'expected_field')
         end
 
@@ -57,7 +55,7 @@ module Enolib
           raise TypeError, "This element was already yielded as #{PRETTY_TYPES[@yielded]} and can't be yielded again as a fieldset."
         end
 
-        unless @instruction[:type] == :fieldset || @instruction[:type] == :empty_element
+        unless @instruction[:type] == :fieldset || @instruction[:type] == :field_or_fieldset_or_list
           raise Errors::Validation.unexpected_element_type(@context, nil, @instruction, 'expected_fieldset')
         end
 
@@ -74,7 +72,7 @@ module Enolib
           raise TypeError, "This element was already yielded as #{PRETTY_TYPES[@yielded]} and can't be yielded again as a list."
         end
 
-        unless @instruction[:type] == :list || @instruction[:type] == :empty_element
+        unless @instruction[:type] == :list || @instruction[:type] == :field_or_fieldset_or_list
           raise Errors::Validation.unexpected_element_type(@context, nil, @instruction, 'expected_list')
         end
 
@@ -103,35 +101,40 @@ module Enolib
     end
 
     def touch
-      # TODO: Here and other implementations: This needs to touch anyway; possibly not so small implications
-      return unless instance_variable_defined?(:@yielded)
-
       # TODO: Revisit setting touched on foreign instances
-      @empty.touched = true if instance_variable_defined?(:@empty)
-      @field.touched = true if instance_variable_defined?(:@field)
-      @fieldset.touch if instance_variable_defined?(:@fieldset)
-      @list.touch if instance_variable_defined?(:@list)
-      @section.touch if instance_variable_defined?(:@section)
+      if !instance_variable_defined?(:@yielded)
+        @touched = true
+      elsif instance_variable_defined?(:@empty)
+        @empty.touched = true
+      elsif instance_variable_defined?(:@field)
+        @field.touched = true
+      elsif instance_variable_defined?(:@fieldset)
+        @fieldset.touch
+      elsif instance_variable_defined?(:@list)
+        @list.touch
+      elsif instance_variable_defined?(:@section)
+        @section.touch
+      end
     end
 
     def yields_empty?
-      @instruction[:type] == :empty_element
+      @instruction[:type] == :empty
     end
 
     def yields_field?
       @instruction[:type] == :field ||
       @instruction[:type] == :multiline_field_begin ||
-      @instruction[:type] == :empty_element
+      @instruction[:type] == :field_or_fieldset_or_list
     end
 
     def yields_fieldset?
       @instruction[:type] == :fieldset ||
-      @instruction[:type] == :empty_element
+      @instruction[:type] == :field_or_fieldset_or_list
     end
 
     def yields_list?
       @instruction[:type] == :list ||
-      @instruction[:type] == :empty_element
+      @instruction[:type] == :field_or_fieldset_or_list
     end
 
     def yields_section?
@@ -141,8 +144,8 @@ module Enolib
     private
 
     def _yields
-      if @instruction[:type] == :empty_element
-          return "#{PRETTY_TYPES[:empty_element]},#{PRETTY_TYPES[:field]},#{PRETTY_TYPES[:fieldset]},#{PRETTY_TYPES[:list]}"
+      if @instruction[:type] == :field_or_fieldset_or_list
+          return "#{PRETTY_TYPES[:field]},#{PRETTY_TYPES[:fieldset]},#{PRETTY_TYPES[:list]}"
       end
 
       PRETTY_TYPES[@instruction[:type]]

data/lib/enolib/errors/validation.rb

@@ -47,7 +47,7 @@ module Enolib
         selection = {}
 
         if element[:type] == :field ||
-           element[:type] == :empty_element ||
+           element[:type] == :field_or_fieldset_or_list ||
            element[:type] == :multiline_field_begin
           message = context.messages.missing_field_value(element[:key])
 

data/lib/enolib/grammar_regexp.rb

@@ -10,7 +10,7 @@ module Enolib
     REQUIRED = /(\S[^\n]*?)/.source
 
     #
-    EMPTY = /()/.source
+    EMPTY_LINE = /()/.source
     EMPTY_LINE_INDEX = 1
 
     # | value
@@ -78,7 +78,7 @@ module Enolib
 
     # :
     # : value
-    ELEMENT_OR_FIELD = /(:)[^\S\n]*#{OPTIONAL}/.source
+    FIELD_OR_FIELDSET_OR_LIST = /(:)[^\S\n]*#{OPTIONAL}/.source
     ELEMENT_OPERATOR_INDEX = 23
     FIELD_VALUE_INDEX = 24
 
@@ -94,10 +94,10 @@ module Enolib
     COPY_OPERATOR_INDEX = 27
     TEMPLATE_INDEX = 28
 
-    LATE_DETERMINED = /#{KEY}\s*(?:#{ELEMENT_OR_FIELD}|#{FIELDSET_ENTRY}|#{COPY})/.source
+    LATE_DETERMINED = /#{KEY}\s*(?:#{FIELD_OR_FIELDSET_OR_LIST}|#{FIELDSET_ENTRY}|#{COPY})?/.source
 
-    NOT_EMPTY = /(?:#{EARLY_DETERMINED}|#{LATE_DETERMINED})/.source
+    NON_EMPTY_LINE = /(?:#{EARLY_DETERMINED}|#{LATE_DETERMINED})/.source
 
-    REGEX = /[^\S\n]*(?:#{EMPTY}|#{NOT_EMPTY})[^\S\n]*(?=\n|$)/.freeze
+    REGEX = /[^\S\n]*(?:#{EMPTY_LINE}|#{NON_EMPTY_LINE})[^\S\n]*(?=\n|$)/.freeze
   end
 end

data/lib/enolib/locales/de.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-#  GENERATED ON 2019-05-30T07:54:15 - DO NOT EDIT MANUALLY
+#  GENERATED ON 2019-06-18T08:50:41 - DO NOT EDIT MANUALLY
 
 module Enolib
   module Locales
     module De
       CONTENT_HEADER = 'Inhalt'
       EXPECTED_DOCUMENT = 'Das Dokument wurde erwartet.'
-      EXPECTED_EMPTY = 'Ein leeres Element wurde erwartet.'
+      EXPECTED_EMPTY = 'Ein Leerfeld wurde erwartet.'
       EXPECTED_FIELD = 'Ein Feld wurde erwartet.'
       EXPECTED_FIELDS = 'Nur Felder wurden erwartet.'
       EXPECTED_FIELDSET = 'Ein Fieldset wurde erwartet.'
@@ -19,7 +19,7 @@ module Enolib
       EXPECTED_SECTION = 'Eine Sektion wurde erwartet.'
       EXPECTED_SECTIONS = 'Nur Sektionen wurden erwartet.'
       EXPECTED_SINGLE_ELEMENT = 'Nur ein einzelnes Element wurde erwartet.'
-      EXPECTED_SINGLE_EMPTY = 'Nur ein einzelnes leeres Element wurde erwartet.'
+      EXPECTED_SINGLE_EMPTY = 'Nur ein einzelnes Leerfeld wurde erwartet.'
       EXPECTED_SINGLE_FIELD = 'Nur ein einzelnes Feld wurde erwartet.'
       EXPECTED_SINGLE_FIELDSET = 'Nur ein einzelnes Fieldset wurde erwartet.'
       EXPECTED_SINGLE_FIELDSET_ENTRY = 'Nur ein einzelner Fieldset Eintrag wurde erwartet.'
@@ -28,7 +28,7 @@ module Enolib
       GUTTER_HEADER = 'Zeile'
       MISSING_COMMENT = 'Ein erforderlicher Kommentar zu diesem Feld fehlt.'
       MISSING_ELEMENT = 'Ein einzelnes Element ist erforderlich - es kann einen beliebigen Schlüssel haben.'
-      MISSING_EMPTY = 'Ein einzelnes leeres Element ist erforderlich - es kann einen beliebigen Schlüssel haben.'
+      MISSING_EMPTY = 'Ein einzelnes Leerfeld ist erforderlich - es kann einen beliebigen Schlüssel haben.'
       MISSING_FIELD = 'Ein einzelnes Feld ist erforderlich - es kann einen beliebigen Schlüssel haben.'
       MISSING_FIELDSET = 'Ein einzelnes Fieldset ist erforderlich - es kann einen beliebigen Schlüssel haben.'
       MISSING_FIELDSET_ENTRY = 'Ein einzelner Fieldset Eintrag ist erforderlich - er kann einen beliebigen Schlüssel haben.'
@@ -37,7 +37,7 @@ module Enolib
       UNEXPECTED_ELEMENT = 'Dieses Element wurde nicht erwartet, prüfe ob es am richtigen Platz ist und dass der Schlüssel keine Tippfehler enthält.'
       def self.comment_error(message) "Es gibt ein Problem mit dem Kommentar dieses Elements: #{message}" end
       def self.cyclic_dependency(line, key) "In Zeile #{line} wird '#{key}' in sich selbst kopiert." end
-      def self.expected_empty_with_key(key) "Ein leeres Element mit dem Schlüssel '#{key}' wurde erwartet." end
+      def self.expected_empty_with_key(key) "Ein Leerfeld mit dem Schlüssel '#{key}' wurde erwartet." end
       def self.expected_field_with_key(key) "Ein Feld mit dem Schlüssel '#{key}' wurde erwartet." end
       def self.expected_fields_with_key(key) "Nur Felder mit dem Schlüssel '#{key}' wurden erwartet." end
       def self.expected_fieldset_with_key(key) "Ein Fieldset mit dem Schlüssel '#{key}' wurde erwartet." end
@@ -47,7 +47,7 @@ module Enolib
       def self.expected_section_with_key(key) "Eine Sektion mit dem Schlüssel '#{key}' wurde erwartet." end
       def self.expected_sections_with_key(key) "Nur Sektionen mit dem Schlüssel '#{key}' wurden erwartet." end
       def self.expected_single_element_with_key(key) "Nur ein einzelnes Element mit dem Schlüssel '#{key}' wurde erwartet." end
-      def self.expected_single_empty_with_key(key) "Nur ein einzelnes leeres Element mit dem Schlüssel '#{key}' wurde erwartet." end
+      def self.expected_single_empty_with_key(key) "Nur ein einzelnes Leerfeld mit dem Schlüssel '#{key}' wurde erwartet." end
       def self.expected_single_field_with_key(key) "Nur ein einzelnes Feld mit dem Schlüssel '#{key}' wurde erwartet." end
       def self.expected_single_fieldset_entry_with_key(key) "Nur ein einzelner Fieldset Eintrag mit dem Schlüssel '#{key}' wurde erwartet." end
       def self.expected_single_fieldset_with_key(key) "Nur ein einzelnes Fieldset mit dem Schlüssel '#{key}' wurde erwartet." end
@@ -57,7 +57,7 @@ module Enolib
       def self.key_error(message) "Es gibt ein Problem mit dem Schlüssel dieses Elements: #{message}" end
       def self.missing_element_for_continuation(line) "Zeile #{line} enthält eine Zeilenfortsetzung ohne dass davor ein fortsetzbares Element begonnen wurde." end
       def self.missing_element_with_key(key) "Das Element '#{key}' fehlt - falls es angegeben wurde eventuell nach Tippfehlern Ausschau halten und auch die Gross/Kleinschreibung beachten." end
-      def self.missing_empty_with_key(key) "Das leere Element '#{key}' fehlt - falls es angegeben wurde eventuell nach Tippfehlern Ausschau halten und auch die Gross/Kleinschreibung beachten." end
+      def self.missing_empty_with_key(key) "Das Leerfeld '#{key}' fehlt - falls es angegeben wurde eventuell nach Tippfehlern Ausschau halten und auch die Gross/Kleinschreibung beachten." end
       def self.missing_field_value(key) "Das Feld '#{key}' muss einen Wert enthalten." end
       def self.missing_field_with_key(key) "Das Feld '#{key}' fehlt - falls es angegeben wurde eventuell nach Tippfehlern Ausschau halten und auch die Gross/Kleinschreibung beachten." end
       def self.missing_fieldset_entry_value(key) "Der Fieldset Eintrag '#{key}' muss einen Wert enthalten." end

data/lib/enolib/locales/en.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-#  GENERATED ON 2019-05-30T07:54:15 - DO NOT EDIT MANUALLY
+#  GENERATED ON 2019-06-18T08:50:41 - DO NOT EDIT MANUALLY
 
 module Enolib
   module Locales
     module En
       CONTENT_HEADER = 'Content'
       EXPECTED_DOCUMENT = 'The document was expected.'
-      EXPECTED_EMPTY = 'An empty element was expected.'
+      EXPECTED_EMPTY = 'An empty was expected.'
       EXPECTED_FIELD = 'A field was expected.'
       EXPECTED_FIELDS = 'Only fields were expected.'
       EXPECTED_FIELDSET = 'A fieldset was expected.'
@@ -19,7 +19,7 @@ module Enolib
       EXPECTED_SECTION = 'A section was expected.'
       EXPECTED_SECTIONS = 'Only sections were expected.'
       EXPECTED_SINGLE_ELEMENT = 'Only a single element was expected.'
-      EXPECTED_SINGLE_EMPTY = 'Only a single empty element was expected.'
+      EXPECTED_SINGLE_EMPTY = 'Only a single empty was expected.'
       EXPECTED_SINGLE_FIELD = 'Only a single field was expected.'
       EXPECTED_SINGLE_FIELDSET = 'Only a single fieldset was expected.'
       EXPECTED_SINGLE_FIELDSET_ENTRY = 'Only a single fieldset entry was expected.'
@@ -28,7 +28,7 @@ module Enolib
       GUTTER_HEADER = 'Line'
       MISSING_COMMENT = 'A required comment for this element is missing.'
       MISSING_ELEMENT = 'A single element is required - it can have any key.'
-      MISSING_EMPTY = 'A single empty element is required - it can have any key.'
+      MISSING_EMPTY = 'A single empty is required - it can have any key.'
       MISSING_FIELD = 'A single field is required - it can have any key.'
       MISSING_FIELDSET = 'A single fieldset is required - it can have any key.'
       MISSING_FIELDSET_ENTRY = 'A single fieldset entry is required - it can have any key.'
@@ -37,7 +37,7 @@ module Enolib
       UNEXPECTED_ELEMENT = 'This element was not expected, make sure it is at the right place in the document and that its key is not mis-typed.'
       def self.comment_error(message) "There is a problem with the comment of this element: #{message}" end
       def self.cyclic_dependency(line, key) "In line #{line} '#{key}' is copied into itself." end
-      def self.expected_empty_with_key(key) "An empty element with the key '#{key}' was expected." end
+      def self.expected_empty_with_key(key) "An empty with the key '#{key}' was expected." end
       def self.expected_field_with_key(key) "A field with the key '#{key}' was expected." end
       def self.expected_fields_with_key(key) "Only fields with the key '#{key}' were expected." end
       def self.expected_fieldset_with_key(key) "A fieldset with the key '#{key}' was expected." end
@@ -47,7 +47,7 @@ module Enolib
       def self.expected_section_with_key(key) "A section with the key '#{key}' was expected." end
       def self.expected_sections_with_key(key) "Only sections with the key '#{key}' were expected." end
       def self.expected_single_element_with_key(key) "Only a single element with the key '#{key}' was expected." end
-      def self.expected_single_empty_with_key(key) "Only a single empty element with the key '#{key}' was expected." end
+      def self.expected_single_empty_with_key(key) "Only a single empty with the key '#{key}' was expected." end
       def self.expected_single_field_with_key(key) "Only a single field with the key '#{key}' was expected." end
       def self.expected_single_fieldset_entry_with_key(key) "Only a single fieldset entry with the key '#{key}' was expected." end
       def self.expected_single_fieldset_with_key(key) "Only a single fieldset with the key '#{key}' was expected." end
@@ -57,7 +57,7 @@ module Enolib
       def self.key_error(message) "There is a problem with the key of this element: #{message}" end
       def self.missing_element_for_continuation(line) "Line #{line} contains a line continuation without a continuable element being specified before." end
       def self.missing_element_with_key(key) "The element '#{key}' is missing - in case it has been specified look for typos and also check for correct capitalization." end
-      def self.missing_empty_with_key(key) "The empty element '#{key}' is missing - in case it has been specified look for typos and also check for correct capitalization." end
+      def self.missing_empty_with_key(key) "The empty '#{key}' is missing - in case it has been specified look for typos and also check for correct capitalization." end
       def self.missing_field_value(key) "The field '#{key}' must contain a value." end
       def self.missing_field_with_key(key) "The field '#{key}' is missing - in case it has been specified look for typos and also check for correct capitalization." end
       def self.missing_fieldset_entry_value(key) "The fieldset entry '#{key}' must contain a value." end

data/lib/enolib/locales/es.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#  GENERATED ON 2019-05-30T07:54:15 - DO NOT EDIT MANUALLY
+#  GENERATED ON 2019-06-18T08:50:41 - DO NOT EDIT MANUALLY
 
 module Enolib
   module Locales

data/lib/enolib/parser.rb

@@ -77,7 +77,7 @@ module Enolib
             instruction[:type] = :field
             instruction[:value] = value
           else
-            instruction[:type] = :empty_element
+            instruction[:type] = :field_or_fieldset_or_list
           end
 
           instruction[:parent] = last_section
@@ -107,7 +107,7 @@ module Enolib
             raise Errors::Parsing.missing_list_for_list_item(@context, instruction)
           elsif last_non_section_element[:type] == :list
             last_non_section_element[:items].push(instruction)
-          elsif last_non_section_element[:type] == :empty_element
+          elsif last_non_section_element[:type] == :field_or_fieldset_or_list
             last_non_section_element[:items] = [instruction]
             last_non_section_element[:type] = :list
           else
@@ -152,7 +152,7 @@ module Enolib
             raise Errors::Parsing.missing_fieldset_for_fieldset_entry(@context, instruction)
           elsif last_non_section_element[:type] == :fieldset
             last_non_section_element[:entries].push(instruction)
-          elsif last_non_section_element[:type] == :empty_element
+          elsif last_non_section_element[:type] == :field_or_fieldset_or_list
             last_non_section_element[:entries] = [instruction]
             last_non_section_element[:type] = :fieldset
           else
@@ -184,7 +184,7 @@ module Enolib
           if last_continuable_element.has_key?(:continuations)
             last_continuable_element[:continuations].push(instruction)
           else
-            if last_continuable_element[:type] == :empty_element
+            if last_continuable_element[:type] == :field_or_fieldset_or_list
               last_continuable_element[:type] = :field
             end
 
@@ -216,7 +216,7 @@ module Enolib
           if last_continuable_element.has_key?(:continuations)
             last_continuable_element[:continuations].push(instruction)
           else
-            if last_continuable_element[:type] == :empty_element
+            if last_continuable_element[:type] == :field_or_fieldset_or_list
               last_continuable_element[:type] = :field
             end
 
@@ -427,7 +427,7 @@ module Enolib
           instruction[:ranges][:copy_operator] = match.offset(Grammar::COPY_OPERATOR_INDEX)
           instruction[:ranges][:template] = match.offset(Grammar::TEMPLATE_INDEX)
           instruction[:template] = template
-          instruction[:type] = :empty_element
+          instruction[:type] = :field_or_fieldset_or_list
 
           instruction[:key] = match[Grammar::KEY_UNESCAPED_INDEX]
 
@@ -452,6 +452,40 @@ module Enolib
           end
 
           instruction[:copy] = @unresolved_non_section_elements[template]
+        elsif match[Grammar::KEY_UNESCAPED_INDEX]
+
+          if comments
+            instruction[:comments] = comments
+            comments = nil
+          end
+
+          instruction[:key] = match[Grammar::KEY_UNESCAPED_INDEX]
+          instruction[:ranges][:key] = match.offset(Grammar::KEY_UNESCAPED_INDEX)
+          instruction[:type] = :empty
+
+          instruction[:parent] = last_section
+          last_section[:elements].push(instruction)
+          last_continuable_element = nil
+          last_non_section_element = instruction
+
+        elsif match[Grammar::KEY_ESCAPED_INDEX]
+
+          if comments
+            instruction[:comments] = comments
+            comments = nil
+          end
+
+          instruction[:key] = match[Grammar::KEY_ESCAPED_INDEX]
+          instruction[:ranges][:escape_begin_operator] = match.offset(Grammar::KEY_ESCAPE_BEGIN_OPERATOR_INDEX)
+          instruction[:ranges][:escape_end_operator] = match.offset(Grammar::KEY_ESCAPE_END_OPERATOR_INDEX)
+          instruction[:ranges][:key] = match.offset(Grammar::KEY_ESCAPED_INDEX)
+          instruction[:type] = :empty
+
+          instruction[:parent] = last_section
+          last_section[:elements].push(instruction)
+          last_continuable_element = nil
+          last_non_section_element = instruction
+
         end
 
         unless multiline_field
@@ -474,7 +508,7 @@ module Enolib
       end
 
       case element[:type]
-      when :empty_element
+      when :field_or_fieldset_or_list
         case template[:type]
         when :multiline_field_begin
           element[:type] = :field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enolib
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Simon Repp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep-cover