coradoc-adoc 2.0.34 → 2.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc2b5c2f53fa18844c9b33a2083b07e6f4a4fab8eac18ca2e3f0cc6211f5f4c7
-  data.tar.gz: 8b0d84abd2eef737e536e63811279e2520134d9f23860667dfcd2167855521f9
+  metadata.gz: 66bedce9cc1cf693cd81c4115ea71c4e6e14c7884edd342eaaa41d4d148910dd
+  data.tar.gz: 4c9f6bce16946b3974be7e7f41cec00963ac8c86e92efe6735d44b532d6c17b6
 SHA512:
-  metadata.gz: 5e016f7d12d34b9dc307583120f436f4ab6742fbfec161cbb9b006a72efc373a2413fcc12010b2f395cbacb2586bf9096528a0c0a028cf934a5b4a543aa7ad6f
-  data.tar.gz: ca1cf91e5acca757738b3f39907376777f870b0e4a203fc746b96653b3dec58ab87d7ea2bbb5f7a8a266ed19c7010e6d5e98d8e9fd4623f68802bd34d0993bf3
+  metadata.gz: 5eea4b4d5af74432117a5d53af089ca6c6ce2bd8d4f4ca4e57be0e09500d0a30b1b74b52332a0faafa7a18e5751732f89e6098c05cf13763e52e682f4e3fcbdb
+  data.tar.gz: 4c0d093e8dc45981b1c8872686597b88b04582e972a66661ad831659b59a06f32948d5a1f0277e53de6f6d4aefb9747428c4a187f8df1ba64b38df77f2118e03

data/lib/coradoc/asciidoc/parser/document_attributes.rb

@@ -19,7 +19,12 @@ module Coradoc
 
         def document_attribute
           str(':') >> attribute_name.as(:key) >> str(':') >>
-            space? >> (attribute_value | str('')).as(:value) >> (line_ending | eof?)
+            # attribute_value itself already matches empty (its
+            # zero-width branch), so the former `| str('')` fallback was
+            # dead — ordered choice commits to attribute_value's empty
+            # match first — and the VM's shadowed-alternative lint
+            # (parsanol 1.3.55+) correctly rejects it.
+            space? >> attribute_value.as(:value) >> (line_ending | eof?)
         end
       end
     end

data/lib/coradoc/asciidoc/parser/inline.rb

@@ -138,7 +138,7 @@ module Coradoc
         end
 
         def link
-          ((str('http').present? | str('https').present? | str('ftp').present?) >>
+          ((str('http') | str('https') | str('ftp')).present? >>
             match('[A-Za-z0-9_.\\-:/&?=+,%#~;]+').repeat(1).as(:path) >>
             (str('[') >> match('[^\\]]').repeat(1).as(:text) >> str(']')).maybe
           ).as(:link) |
@@ -201,19 +201,22 @@ module Coradoc
         end
 
         def inline_chars?
-          match('[\[*#_{<^~`]').present? |
-            typographic_quote.present? |
-            str('http').present? |
-            str('https').present? |
-            str('link:').present? |
-            str('image:').present? |
-            str('+++').present? |
-            str('pass:').present? |
-            term_type.present? |
-            str('footnote').present? |
-            stem_type.present? |
-            str('\\<<').present? |
-            hard_line_break_marker?
+          # Single lookahead over the whole dispatch alternation; the former
+          # per-branch .present? chain put zero-width branches in every
+          # non-last slot (shadowed-alternative lint, parsanol 1.3.55+).
+          (match('[\[*#_{<^~`]') |
+             typographic_quote |
+             str('http') |
+             str('https') |
+             str('link:') |
+             str('image:') |
+             str('+++') |
+             str('pass:') |
+             term_type |
+             str('footnote') |
+             stem_type |
+             str('\\<<') |
+             hard_line_break_marker?).present?
         end
 
         # AsciiDoc hard line break: a space followed by `+` at end of line,
@@ -221,8 +224,8 @@ module Coradoc
         # the enclosing paragraph/verse. Recognised ahead of `text_unformatted`
         # so the marker isn't swallowed as plain text.
         def hard_line_break_marker?
-          (str(' +') >> str("\n")).present? |
-            (str('\\') >> str("\n")).present?
+          ((str(' +') >> str("\n")) |
+             (str('\\') >> str("\n"))).present?
         end
 
         def hard_line_break

data/lib/coradoc/asciidoc/parser/list.rb

@@ -7,10 +7,10 @@ module Coradoc
       module List
         def list(nesting_level = 1)
           (
-          unordered_list(nesting_level) |
-             ordered_list(nesting_level) |
-             definition_list
-        ).as(:list)
+            unordered_list(nesting_level) |
+               ordered_list(nesting_level) |
+               definition_list
+          ).as(:list)
         end
 
         def list_continuation
@@ -259,8 +259,8 @@ module Coradoc
         end
 
         def list_body_hard_break_marker?
-          (str(' +') >> str("\n")).present? |
-            (str('\\') >> str("\n")).present?
+          ((str(' +') >> str("\n")) |
+            (str('\\') >> str("\n"))).present?
         end
 
         # Recognizes line endings for a list body source line, including

data/lib/coradoc/asciidoc/parser/paragraph.rb

@@ -49,7 +49,9 @@ module Coradoc
               (paragraph_text_line(true).repeat(1, 1) >>
                    (newline.repeat(1).as(:line_break) | eof?)).repeat(0, 1))
             ).as(:lines) >>
-            (newline.repeat(0) | eof?)
+            # the former "| eof?" was dead: newline.repeat(0) already
+            # matches empty (shadowed-alternative lint, parsanol 1.3.55+)
+            newline.repeat(0)
           ).as(:paragraph)
         end
 

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.34'
+    VERSION = '2.0.35'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-adoc
 version: !ruby/object:Gem::Version
-  version: 2.0.34
+  version: 2.0.35
 platform: ruby
 authors:
 - Ribose Inc.