enolib 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89fe9af4b84d3d1ee96f31944f7033f6bcb1662f89b649922e09cb469131575e
-  data.tar.gz: 80ae58d7bc69a97f80245ba0f29e24590fbe2d578bd4a1b673b60f8598f29eb8
+  metadata.gz: 88751440ddeb55fc6358a9ad2cafa998f3395787b475f3c42e1701c0ef17293c
+  data.tar.gz: e61d935cf566395b4787f424930fb84fcfdd5b879254c35c6dc452f15963c187
 SHA512:
-  metadata.gz: 225c429cb9734ad04b34c73ff523bf07cb94c9af9a153fb729349ca3b2aead904a93d17f48c8e23ee71e375b21beae9df7188ff5256f4ea06fbe621899395b97
-  data.tar.gz: f7381ea648ed461ee0dc263cfb4dacfe3117464f74d9064b0485b3b0f13da918126699749e4a501f20c55634d6b6d926cdb685f1334f685cb6a9a62fd00b19a1
+  metadata.gz: a23ff5f077a95e19a302c24658f9f0324a4f7a335fffb53018a4f1a1f9f4fa849ce0ae046c279e49445d85175f7ea82b7d118380a0b1ff98d9aaa646510785b1
+  data.tar.gz: 228ff010c1724b9db258c8989fa47678b78ad34af528d0ee42c788a3d302e0f6e390abc6723c0bf2cc890775114df0d04a4530cddd6c81521f83208a6f10dbfc

data/lib/enolib/parser.rb

@@ -26,7 +26,7 @@ module Enolib
         match = Grammar::REGEX.match(@context.input, @index)
 
         unless match && match.begin(0) == @index
-          instruction = tokenize_error_context
+          instruction = parse_after_error
           raise Errors::Parsing.invalid_line(@context, instruction)
         end
 
@@ -40,10 +40,11 @@ module Enolib
 
         multiline_field = false
 
+        # TODO: In all implementations we could optimize the often occurring
+        #       empty line case - we need not allocate the instruction object
+        #       because it is discarded anyway
         if match[Grammar::EMPTY_LINE_INDEX]
 
-          instruction[:type] = :empty_line
-
           if comments
             @context.meta.concat(comments)
             comments = nil
@@ -102,7 +103,7 @@ module Enolib
           end
 
           if !last_non_section_element
-            instruction = tokenize_error_context
+            parse_after_error(instruction)
             raise Errors::Parsing.missing_list_for_list_item(@context, instruction)
           elsif last_non_section_element[:type] == :list
             last_non_section_element[:items].push(instruction)
@@ -110,7 +111,7 @@ module Enolib
             last_non_section_element[:items] = [instruction]
             last_non_section_element[:type] = :list
           else
-            instruction = tokenize_error_context
+            parse_after_error(instruction)
             raise Errors::Parsing.missing_list_for_list_item(@context, instruction)
           end
 
@@ -147,7 +148,7 @@ module Enolib
           end
 
           if !last_non_section_element
-            instruction = tokenize_error_context
+            parse_after_error(instruction)
             raise Errors::Parsing.missing_fieldset_for_fieldset_entry(@context, instruction)
           elsif last_non_section_element[:type] == :fieldset
             last_non_section_element[:entries].push(instruction)
@@ -155,7 +156,7 @@ module Enolib
             last_non_section_element[:entries] = [instruction]
             last_non_section_element[:type] = :fieldset
           else
-            instruction = tokenize_error_context
+            parse_after_error(instruction)
             raise Errors::Parsing.missing_fieldset_for_fieldset_entry(@context, instruction)
           end
 
@@ -164,11 +165,6 @@ module Enolib
 
         elsif match[Grammar::SPACED_LINE_CONTINUATION_OPERATOR_INDEX]
 
-          unless last_continuable_element
-            instruction = tokenize_error_context
-            raise Errors::Parsing.missing_element_for_continuation(@context, instruction)
-          end
-
           instruction[:spaced] = true
           instruction[:ranges][:spaced_line_continuation_operator] = match.offset(Grammar::SPACED_LINE_CONTINUATION_OPERATOR_INDEX)
           instruction[:type] = :continuation
@@ -180,6 +176,11 @@ module Enolib
             instruction[:value] = value
           end
 
+          unless last_continuable_element
+            parse_after_error(instruction)
+            raise Errors::Parsing.missing_element_for_continuation(@context, instruction)
+          end
+
           if last_continuable_element.has_key?(:continuations)
             last_continuable_element[:continuations].push(instruction)
           else
@@ -197,11 +198,6 @@ module Enolib
 
         elsif match[Grammar::DIRECT_LINE_CONTINUATION_OPERATOR_INDEX]
 
-          unless last_continuable_element
-            instruction = tokenize_error_context
-            raise Errors::Parsing.missing_element_for_continuation(@context, instruction)
-          end
-
           instruction[:ranges][:direct_line_continuation_operator] = match.offset(Grammar::DIRECT_LINE_CONTINUATION_OPERATOR_INDEX)
           instruction[:type] = :continuation
 
@@ -212,6 +208,11 @@ module Enolib
             instruction[:value] = value
           end
 
+          unless last_continuable_element
+            parse_after_error(instruction)
+            raise Errors::Parsing.missing_element_for_continuation(@context, instruction)
+          end
+
           if last_continuable_element.has_key?(:continuations)
             last_continuable_element[:continuations].push(instruction)
           else
@@ -238,28 +239,6 @@ module Enolib
           instruction[:ranges][:section_operator] = match.offset(Grammar::SECTION_OPERATOR_INDEX)
           instruction[:type] = :section
 
-          new_depth = instruction[:ranges][:section_operator][1] - instruction[:ranges][:section_operator][0]
-
-          if new_depth == @depth + 1
-            instruction[:parent] = last_section
-            @depth = new_depth
-          elsif new_depth == @depth
-            instruction[:parent] = last_section[:parent]
-          elsif new_depth < @depth
-            while new_depth < @depth
-              last_section = last_section[:parent]
-              @depth -= 1
-            end
-
-            instruction[:parent] = last_section[:parent]
-          else
-            instruction = tokenize_error_context
-            raise Errors::Parsing.section_hierarchy_layer_skip(@context, instruction, last_section)
-          end
-
-          instruction[:parent][:elements].push(instruction)
-          last_section = instruction
-
           instruction[:key] = match[Grammar::SECTION_KEY_UNESCAPED_INDEX]
 
           if instruction[:key]
@@ -277,12 +256,6 @@ module Enolib
             instruction[:ranges][:template] = match.offset(Grammar::SECTION_TEMPLATE_INDEX)
             instruction[:template] = template
 
-            parent = instruction[:parent]
-            while parent[:type] != :document
-              parent[:deep_resolve] = true
-              parent = parent[:parent]
-            end
-
             copy_operator_offset = match.offset(Grammar::SECTION_COPY_OPERATOR_INDEX)
 
             if copy_operator_offset[1] - copy_operator_offset[0] == 2
@@ -301,6 +274,36 @@ module Enolib
             instruction[:copy] = @unresolved_sections[template]
           end
 
+          new_depth = instruction[:ranges][:section_operator][1] - instruction[:ranges][:section_operator][0]
+
+          if new_depth == @depth + 1
+            instruction[:parent] = last_section
+            @depth = new_depth
+          elsif new_depth == @depth
+            instruction[:parent] = last_section[:parent]
+          elsif new_depth < @depth
+            while new_depth < @depth
+              last_section = last_section[:parent]
+              @depth -= 1
+            end
+
+            instruction[:parent] = last_section[:parent]
+          else
+            parse_after_error(instruction)
+            raise Errors::Parsing.section_hierarchy_layer_skip(@context, instruction, last_section)
+          end
+
+          instruction[:parent][:elements].push(instruction)
+
+          if template
+            parent = instruction[:parent]
+            while parent[:type] != :document
+              parent[:deep_resolve] = true
+              parent = parent[:parent]
+            end
+          end
+
+          last_section = instruction
           last_continuable_element = nil
           last_non_section_element = nil
 
@@ -333,7 +336,7 @@ module Enolib
           @line += 1
 
           unless terminator_match
-            tokenize_error_context
+            parse_after_error
             raise Errors::Parsing.unterminated_multiline_field(@context, instruction)
           end
 
@@ -659,42 +662,32 @@ module Enolib
       end
     end
 
-    def tokenize_error_context
-      first_instruction = nil
-
-      loop do
-        end_of_line_index = @context.input.index("\n", @index)
-
-        if end_of_line_index
-          instruction = {
-            line: @line,
-            ranges: { line: [@index, end_of_line_index] }
-          }
+    def parse_after_error(error_instruction = nil)
+      if error_instruction
+        @context.meta.push(error_instruction)
+        @index = error_instruction[:ranges][:line][RANGE_END]
+        @line += 1
+      end
 
-          @context.meta.push(instruction)
+      while @index < @context.input.length
+        end_of_line_index = @context.input.index("\n", @index) || @context.input.length
 
-          if first_instruction
-            instruction[:type] = :unparsed
-          else
-            first_instruction = instruction
-          end
+        instruction = {
+          line: @line,
+          ranges: { line: [@index, end_of_line_index] },
+          type: :unparsed
+        }
 
-          @index = end_of_line_index + 1
-          @line += 1
-        else
-          instruction = {
-            line: @line,
-            ranges: { line: [@index, @context.input.length] }
-          }
+        error_instruction ||= instruction
 
-          instruction[:type] = :unparsed if first_instruction
+        @context.meta.push(instruction)
+        @index = end_of_line_index + 1
+        @line += 1
+      end
 
-          @context.line_count = @line + 1
-          @context.meta.push(instruction)
+      @context.line_count = @context.input[-1] == "\n" ? @line + 1 : @line
 
-          return first_instruction || instruction
-        end
-      end
+      error_instruction
     end
   end
 end

metadata

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