coradoc 1.1.2 → 1.1.4

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

@@ -1,3 +1,7 @@
+require "parslet"
+require "parslet/convenience"
+
+
 require_relative "admonition"
 require_relative "attribute_list"
 require_relative "bibliography"
@@ -12,11 +16,12 @@ require_relative "paragraph"
 require_relative "section"
 require_relative "table"
 require_relative "term"
+require_relative "text"
 
 module Coradoc
   module Parser
     module Asciidoc
-      module Base
+      class Base < Parslet::Parser
         include Coradoc::Parser::Asciidoc::Admonition
         include Coradoc::Parser::Asciidoc::AttributeList
         include Coradoc::Parser::Asciidoc::Bibliography
@@ -31,141 +36,54 @@ module Coradoc
         include Coradoc::Parser::Asciidoc::Section
         include Coradoc::Parser::Asciidoc::Table
         include Coradoc::Parser::Asciidoc::Term
-
-        def space?
-          space.maybe
-        end
-
-        def space
-          str(' ').repeat(1)
-        end
-
-        def text
-          match("[^\n]").repeat(1)
-        end
-
-        def line_ending
-          str("\n")
-        end
-
-        def endline
-          newline | any.absent?
-        end
-
-        def newline
-          (str("\n") | str("\r\n")).repeat(1)
-        end
-
-        def newline_single
-          (str("\n") | str("\r\n"))
-        end
-
-        def keyword
-          (match('[a-zA-Z0-9_\-.,]') | str(".")).repeat(1)
-        end
-
-        def empty_line
-          match("^\n")
-        end
-
-        def digit
-          match("[0-9]")
-        end
-
-        def digits
-          match("[0-9]").repeat(1)
-        end
-
-        def word
-          match("[a-zA-Z0-9_-]").repeat(1)
-        end
-
-        def words
-          word >> (space? >> word).repeat
-        end
-
-        def rich_texts
-          rich_text >> (space? >> rich_text).repeat
-        end
-
-        def rich_text
-          (match("[a-zA-Z0-9_-]") | str(".") | str("*") | match("@")).repeat(1)
-        end
-
-        def email
-          word >> str("@") >> word >> str(".") >> word
-        end
-
-        def special_character
-          match("^[*:=-]") | str("[#") | str("[[")
-        end
-
-        def date
-          digit.repeat(2, 4) >> str("-") >>
-            digit.repeat(1, 2) >> str("-") >> digit.repeat(1, 2)
-        end
-
-        def attr_name
-          match("[^\t\s]").repeat(1)
+        include Coradoc::Parser::Asciidoc::Text
+
+        def rule_dispatch(rule_name, *args, **kwargs)
+          @dispatch_data = {} unless @dispatch_data
+          dispatch_key = [rule_name, args, kwargs.to_a.sort]
+          dispatch_hash = dispatch_key.hash.abs
+          unless @dispatch_data.has_key?(dispatch_hash)
+            alias_name = "#{rule_name}_#{dispatch_hash}".to_sym
+            Coradoc::Parser::Asciidoc::Base.class_exec do
+              rule(alias_name) do
+                send(rule_name, *args, **kwargs)
+              end
+            end
+            @dispatch_data[dispatch_hash] = alias_name
+          end
+          dispatch_method = @dispatch_data[dispatch_hash]
+          send(dispatch_method)
+        end
+
+        add_dispatch = true
+        with_params = true
+
+        parser_methods = (Coradoc::Parser::Asciidoc.constants - [:Base]).map{ |const|
+          Coradoc::Parser::Asciidoc.const_get(const).instance_methods
+        }.flatten.uniq
+
+        parser_methods.each do |rule_name|
+          params = Coradoc::Parser::Asciidoc::Base.instance_method(rule_name).parameters
+          if add_dispatch && params == []
+            alias_name = "alias_nondispatch_#{rule_name}".to_sym
+            Coradoc::Parser::Asciidoc::Base.class_exec do
+              alias_method alias_name, rule_name
+              rule(rule_name) do
+                send(alias_name)
+              end
+            end
+          elsif add_dispatch && with_params
+            alias_name = "alias_dispatch_#{rule_name}".to_sym
+            Coradoc::Parser::Asciidoc::Base.class_exec do
+              alias_method alias_name, rule_name
+              define_method(rule_name) do |*args, **kwargs|
+                rule_dispatch(alias_name, *args, **kwargs)
+              end
+
+            end
+          end
         end
 
-        def file_path
-          match('[^\[]').repeat(1)
-        end
-
-        def include_directive
-          (str("include::") >> 
-            file_path.as(:path) >>
-            attribute_list >>
-          (newline | str("")).as(:line_break)
-          ).as(:include)
-        end
-
-        def inline_image
-          (str("image::") >> 
-            file_path.as(:path) >>
-            attribute_list >>
-          (line_ending)
-          ).as(:inline_image)
-        end
-
-        def block_image
-          (block_id.maybe >>
-            block_title.maybe >>
-            (attribute_list >> newline).maybe >>
-            match('^i') >> str("mage::") >>
-            file_path.as(:path) >>
-            attribute_list(:attribute_list_macro) >>
-            newline.as(:line_break)
-            ).as(:block_image)
-        end
-
-        def comment_line
-          tag.absent? >>
-          (str('//') >> str("/").absent? >>
-            space? >>
-            text.as(:comment_text)
-            ).as(:comment_line)
-        end
-
-        def tag
-          (str('//') >> str('/').absent? >>
-            space? >>
-            (str('tag') | str('end')).as(:prefix) >>
-            str('::') >> str(':').absent? >>
-            match('[^\[]').repeat(1).as(:name) >>
-            attribute_list >>
-            line_ending.maybe.as(:line_break)
-            ).as(:tag)
-        end
-
-        def comment_block
-          ( str('////') >> line_ending >>
-          ((line_ending >> str('////')).absent? >> any
-            ).repeat.as(:comment_text) >> 
-          line_ending >> str('////')
-          ).as(:comment_block)
-        end
       end
     end
   end

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

@@ -3,77 +3,90 @@ module Coradoc
     module Asciidoc
       module Block
 
-        def block
-          sidebar_block |
-          example_block |
-          source_block |
-          quote_block |
-          pass_block
+        def block(n_deep = 3)
+          (example_block(n_deep) |
+          sidebar_block(n_deep) |
+          source_block(n_deep) |
+          quote_block(n_deep) |
+          pass_block(n_deep)).as(:block)
         end
 
-        def source_block
-          block_style("-", 2)
+        def example_block(n_deep)
+          block_style(n_deep, "=")
         end
 
-        def pass_block
-          block_style("+", 4, :pass)
+        def pass_block(n_deep)
+          block_style(n_deep, "+", 4, :pass)
         end
 
-        def source_block
-          block_style("-", 2)
+        def quote_block(n_deep)
+          block_style(n_deep, "_")
         end
 
-        def quote_block
-          block_style("_")
+        def sidebar_block(n_deep)
+          block_style(n_deep, "*")
         end
 
-        def block_content(n_deep = 2)
-          c = block_image |
-            list |
-            text_line |
-            empty_line.as(:line_break)
-          c = c | block_content(n_deep - 1) if (n_deep > 0)
-          c.repeat(1)
-        end
-
-        def sidebar_block
-          block_style("*")
-        end
-
-        def example_block
-          block_style("=")
+        def source_block(n_deep)
+          block_style(n_deep, "-", 2)
         end
 
         def block_title
-          match('^\\.') >> space.absent? >> text.as(:title) >> newline
+          str('.') >> space.absent? >> text.as(:title) >> newline
         end
 
         def block_type(type)
-          (match('^\[') >> str("[").absent? >>
+          (str("[") >> str("[").absent? >>
             str(type).as(:type) >>
             str("]")) | 
           (match('^\[') >> keyword.as(:type) >> str("]")) >> newline
         end
 
         def block_id
-          (match('^\[') >> str("[") >> str('[').absent? >> keyword.as(:id) >> str("]]") |
+          line_start? >>
+          (str("[[") >> str('[').absent? >> keyword.as(:id) >> str("]]") |
             str("[#") >> keyword.as(:id) >> str("]")) >> newline
         end
 
-        def block_style(delimiter = "*", repeater = 4, type = nil)
+        def block_content(n_deep = 3)
+          c = block_image |
+            list |
+            text_line |
+            empty_line.as(:line_break)
+          c = c | block(n_deep - 1) if (n_deep > 0)
+          c.repeat(1)
+        end
+
+        def block_delimiter
+          line_start? >> 
+          ((str("*") |
+            str("=") |
+            str("_") |
+            str("+") |
+            str("-")).repeat(4) |
+            str("-").repeat(2,2)) >>
+            newline
+        end
+
+        def block_style(n_deep = 3, delimiter = "*", repeater = 4, type = nil)
+          block_title.maybe >>
           block_id.maybe >>
+            (attribute_list >> newline ).maybe >>
           block_title.maybe >>
             newline.maybe >>
-            (attribute_list >> newline ).maybe >>
+            (line_start? >> str('[').present? >> attribute_list >> newline ).maybe >>
             block_id.maybe >>
-            (attribute_list >> newline ).maybe >>
-            str(delimiter).repeat(repeater).as(:delimiter) >> newline >>
+            (str('[').present? >> attribute_list >> newline ).maybe >>
+            line_start? >>
+            str(delimiter).repeat(repeater).capture(:delimit).as(:delimiter) >> newline >>
             if type == :pass
               (text_line | empty_line.as(:line_break)).repeat(1).as(:lines)
             else
-              block_content.as(:lines)
+              block_delimiter.absent? >> block_content(n_deep-1).as(:lines)
             end >>
-            str(delimiter).repeat(repeater) >> newline
+            line_start? >>
+            dynamic { |s,c| str(c.captures[:delimit].to_s.strip) } >> newline
+            # str(delimiter).repeat(repeater) >> str(delimiter).absent? >> newline
         end
 
       end

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

@@ -25,9 +25,19 @@ module Coradoc
           literal_space.maybe
         end
 
+        def list_prefix
+          (line_start? >> match('^[*\.]') >> str(' '))
+        end
+
+        def section_prefix
+          (line_start? >> match('^[=]') >> str('=').repeat(0) >> match('[^\n]'))
+        end
+
         # Text
-        def text_line(many_breaks = false)
-            tl = (asciidoc_char_with_id.absent? | text_id) >> literal_space? >>
+        def text_line(many_breaks = false)  #:zero :one :many
+            tl = #section_prefix.absent? >>
+                 # list_prefix.absent? >>
+            (asciidoc_char_with_id.absent? | text_id) >> literal_space? >>
             text.as(:text)
             if many_breaks
               tl >> line_ending.repeat(1).as(:line_break)
@@ -37,7 +47,7 @@ module Coradoc
         end
 
         def asciidoc_char
-          match('^[*_:=\-+]')
+          line_start? >> match['*_:+=\-']
         end
 
         def asciidoc_char_with_id

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

@@ -1,30 +1,30 @@
+# $DEBUG = true
 module Coradoc
   module Parser
     module Asciidoc
       module List
 
-        def list
-          (
-          unordered_list |
-             ordered_list # definition_list |
+        def list(nesting_level = 1)
+          ( 
+          unordered_list(nesting_level) |
+             ordered_list(nesting_level) |
+             definition_list
             ).as(:list)
         end
 
+        def list_continuation
+          line_start? >> str("+\n")
+        end
+
         def ordered_list(nesting_level = 1)
           attrs = (attribute_list >> newline).maybe
           r = olist_item(nesting_level)
-          if nesting_level <= 8
-            r = r | ordered_list(nesting_level + 1)
-          end
-          attrs >> r.repeat(1).as(:ordered)
+          attrs >> olist_item(nesting_level).present? >> r.repeat(1).as(:ordered)
         end
 
         def unordered_list(nesting_level = 1)
           attrs = (attribute_list >> newline).maybe
           r = ulist_item(nesting_level)
-          if nesting_level <= 8
-            r = r | unordered_list(nesting_level + 1)
-          end
           attrs >> r.repeat(1).as(:unordered)
         end
 
@@ -34,23 +34,57 @@ module Coradoc
           dlist_item(delimiter).absent?
         end
 
+        def list_marker(nesting_level = 1)
+          olist_marker(nesting_level) | ulist_marker(nesting_level)
+        end
+
+        def olist_marker(nesting_level = 1)
+          line_start? >> str('.' * nesting_level) >> str('.').absent?
+        end
+
         def olist_item(nesting_level = 1)
-          nl2 = nesting_level - 1
-          marker = match(/^\./)
-          marker = marker >>  str(".").repeat(nl2, nl2) if nl2 > 0
-          str("").as(:list_item) >> 
-          marker.as(:marker) >> str(".").absent? >>
-          match("\n").absent? >> space >> text_line(true)
+          item = olist_marker(nesting_level).as(:marker) >>
+          match("\n").absent? >> space >> text_line(true)# >>
+          # (list_continuation.present? >> list_continuation >> 
+          # paragraph #| example_block(n_deep: 1)
+          # ).repeat(0).as(:attached)
+
+          att = (list_continuation.present? >>
+                  list_continuation >> 
+                  (admonition_line | paragraph | block) #(n_deep: 1))
+                ).repeat(0).as(:attached)
+          item = item >> att.maybe
+
+
+          if nesting_level <= 4
+            item = item >>
+              (list_marker(nesting_level + 1).present? >>
+              list(nesting_level + 1)).repeat(0).as(:nested)#).maybe
+          end
+          olist_marker(nesting_level).present? >> item.as(:list_item)
+        end
+
+        def ulist_marker(nesting_level = 1)
+          line_start? >> str('*' * nesting_level) >> str('*').absent?
         end
 
         def ulist_item(nesting_level = 1)
-          nl2 = nesting_level - 1
-          marker = match(/^\*/)
-          marker = marker >>  str("*").repeat(nl2, nl2) if nl2 > 0
-          str("").as(:list_item) >>
-          marker.as(:marker) >> str("*").absent? >>
+          item = ulist_marker(nesting_level).as(:marker) >>
           str(' [[[').absent? >>
           match("\n").absent? >> space >> text_line(true)
+
+          att = (list_continuation.present? >>
+                  list_continuation >> 
+                  (admonition_line | paragraph | block) #(n_deep: 1))
+                ).repeat(0).as(:attached)
+          item = item >> att.maybe
+
+          if nesting_level <= 4
+            item = item >>
+              (list_marker(nesting_level + 1).present? >>
+              list(nesting_level + 1)).repeat(0).as(:nested)#).maybe
+          end
+          ulist_marker(nesting_level).present? >> item.as(:list_item)
         end
 
         def dlist_delimiter

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

@@ -3,10 +3,22 @@ module Coradoc
     module Asciidoc
       module Paragraph
 
+        def line_not_text?
+          line_start? >>
+          attribute_list.absent? >>
+          block_delimiter.absent? >>
+          list.absent? >>
+          # list_prefix.absent? >>
+          section_id.absent? >>
+          section_prefix.absent?
+        end
+
         def paragraph_text_line
+          line_not_text? >>
           (asciidoc_char_with_id.absent? | text_id ) >>
           literal_space? >>
-          (text_formatted.as(:text) # >>
+          (line_not_text? >>
+            text_formatted.as(:text) # >>
           ) | term | term2
         end
 
@@ -14,9 +26,9 @@ module Coradoc
           ( block_id.maybe >>
             block_title.maybe >>
             (attribute_list >> newline).maybe >>
-            (paragraph_text_line.repeat(1,1) >> any.absent? |
-              (paragraph_text_line >> newline_single.as(:line_break)).repeat(1) >>
-              (paragraph_text_line.repeat(1,1)).repeat(0,1)
+            (line_not_text? >> paragraph_text_line.repeat(1,1) >> any.absent? |
+              (line_not_text? >> paragraph_text_line >> newline_single.as(:line_break)).repeat(1) >>
+              (line_not_text? >> paragraph_text_line.repeat(1,1)).repeat(0,1)
             ).as(:lines) >>
             newline.repeat(0)
           ).as(:paragraph)

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

@@ -14,7 +14,7 @@ module Coradoc
             comment_line |
             include_directive |
             admonition_line |
-            block.as(:block) |
+            block |
             table.as(:table) |
             highlight.as(:highlight) |
             glossaries.as(:glossaries) |
@@ -35,12 +35,14 @@ module Coradoc
 
         # Section id
         def section_id
+          line_start? >>
           (str("[[") >> keyword.as(:id) >> str("]]") |
             str("[#") >> keyword.as(:id) >> str("]")) >> newline
         end
 
         # Heading
         def section_title(level = 2, max_level = 8)
+          line_start? >>
           match("=").repeat(level, max_level).as(:level) >>
             str('=').absent? >>
             space? >> text.as(:text) >> endline.as(:line_break)

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

@@ -7,12 +7,14 @@ module Coradoc
         end
 
         def term
+          line_start? >>
           term_type >> str(':[') >>
           match('[^\]]').repeat(1).as(:term) >>
           str("]") >> str("\n").repeat(1).as(:line_break)
         end
 
         def term2
+          line_start? >>
           match('^\[') >> term_type >> str(']#') >>
           match('[^\#]').repeat(1).as(:term2) >> str('#') >>
           str("\n").repeat(1).as(:line_break)