rdoc 6.4.1.1 → 6.5.0

data/lib/rdoc/markdown/literals.rb

@@ -39,75 +39,45 @@ class RDoc::Markdown::Literals
     attr_accessor :result, :pos
 
     def current_column(target=pos)
-      if string[target] == "\n" && (c = string.rindex("\n", target-1) || -1)
-        return target - c
-      elsif c = string.rindex("\n", target)
-        return target - c
+      if c = string.rindex("\n", target-1)
+        return target - c - 1
       end
 
       target + 1
     end
 
-    def position_line_offsets
-      unless @position_line_offsets
-        @position_line_offsets = []
-        total = 0
-        string.each_line do |line|
-          total += line.size
-          @position_line_offsets << total
-        end
-      end
-      @position_line_offsets
-    end
-
     if [].respond_to? :bsearch_index
       def current_line(target=pos)
-        if line = position_line_offsets.bsearch_index {|x| x > target }
-          return line + 1
+        unless @line_offsets
+          @line_offsets = []
+          total = 0
+          string.each_line do |line|
+            total += line.size
+            @line_offsets << total
+          end
         end
-        raise "Target position #{target} is outside of string"
+
+        @line_offsets.bsearch_index {|x| x >= target } + 1 || -1
       end
     else
       def current_line(target=pos)
-        if line = position_line_offsets.index {|x| x > target }
-          return line + 1
-        end
+        cur_offset = 0
+        cur_line = 0
 
-        raise "Target position #{target} is outside of string"
-      end
-    end
+        string.each_line do |line|
+          cur_line += 1
+          cur_offset += line.size
+          return cur_line if cur_offset >= target
+        end
 
-    def current_character(target=pos)
-      if target < 0 || target >= string.size
-        raise "Target position #{target} is outside of string"
+        -1
       end
-      string[target, 1]
-    end
-
-    KpegPosInfo = Struct.new(:pos, :lno, :col, :line, :char)
-
-    def current_pos_info(target=pos)
-      l = current_line target
-      c = current_column target
-      ln = get_line(l-1)
-      chr = string[target,1]
-      KpegPosInfo.new(target, l, c, ln, chr)
     end
 
     def lines
-      string.lines
-    end
-
-    def get_line(no)
-      loff = position_line_offsets
-      if no < 0
-        raise "Line No is out of range: #{no} < 0"
-      elsif no >= loff.size
-        raise "Line No is out of range: #{no} >= #{loff.size}"
-      end
-      lend = loff[no]-1
-      lstart = no > 0 ? loff[no-1] : 0
-      string[lstart..lend]
+      lines = []
+      string.each_line { |l| lines << l }
+      lines
     end
 
 
@@ -121,7 +91,6 @@ class RDoc::Markdown::Literals
       @string = string
       @string_size = string ? string.size : 0
       @pos = pos
-      @position_line_offsets = nil
     end
 
     def show_pos
@@ -146,22 +115,30 @@ class RDoc::Markdown::Literals
     end
 
     def failure_caret
-      p = current_pos_info @failing_rule_offset
-      "#{p.line.chomp}\n#{' ' * (p.col - 1)}^"
+      l = current_line @failing_rule_offset
+      c = current_column @failing_rule_offset
+
+      line = lines[l-1]
+      "#{line}\n#{' ' * (c - 1)}^"
     end
 
     def failure_character
-      current_character @failing_rule_offset
+      l = current_line @failing_rule_offset
+      c = current_column @failing_rule_offset
+      lines[l-1][c-1, 1]
     end
 
     def failure_oneline
-      p = current_pos_info @failing_rule_offset
+      l = current_line @failing_rule_offset
+      c = current_column @failing_rule_offset
+
+      char = lines[l-1][c-1, 1]
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
-        "@#{p.lno}:#{p.col} failed rule '#{info.name}', got '#{p.char}'"
+        "@#{l}:#{c} failed rule '#{info.name}', got '#{char}'"
       else
-        "@#{p.lno}:#{p.col} failed rule '#{@failed_rule}', got '#{p.char}'"
+        "@#{l}:#{c} failed rule '#{@failed_rule}', got '#{char}'"
       end
     end
 
@@ -174,9 +151,10 @@ class RDoc::Markdown::Literals
 
     def show_error(io=STDOUT)
       error_pos = @failing_rule_offset
-      p = current_pos_info(error_pos)
+      line_no = current_line(error_pos)
+      col_no = current_column(error_pos)
 
-      io.puts "On line #{p.lno}, column #{p.col}:"
+      io.puts "On line #{line_no}, column #{col_no}:"
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
@@ -185,9 +163,10 @@ class RDoc::Markdown::Literals
         io.puts "Failed to match rule '#{@failed_rule}'"
       end
 
-      io.puts "Got: #{p.char.inspect}"
-      io.puts "=> #{p.line}"
-      io.print(" " * (p.col + 2))
+      io.puts "Got: #{string[error_pos,1].inspect}"
+      line = lines[line_no-1]
+      io.puts "=> #{line}"
+      io.print(" " * (col_no + 3))
       io.puts "^"
     end
 
@@ -296,7 +275,6 @@ class RDoc::Markdown::Literals
     end
 
     def apply_with_args(rule, *args)
-      @result = nil
       memo_key = [rule, args]
       if m = @memoizations[memo_key][@pos]
         @pos = m.pos
@@ -330,7 +308,6 @@ class RDoc::Markdown::Literals
     end
 
     def apply(rule)
-      @result = nil
       if m = @memoizations[rule][@pos]
         @pos = m.pos
         if !m.set

data/lib/rdoc/markdown.kpeg

@@ -187,11 +187,11 @@
 
 %% {
 
-  require 'rdoc'
-  require 'rdoc/markup/to_joined_paragraph'
-  require 'rdoc/markdown/entities'
+  require_relative '../rdoc'
+  require_relative 'markup/to_joined_paragraph'
+  require_relative 'markdown/entities'
 
-  require 'rdoc/markdown/literals'
+  require_relative 'markdown/literals'
 
   ##
   # Supported extensions
@@ -449,7 +449,7 @@
 
       @note_order.each_with_index do |ref, index|
         label = index + 1
-        note = @footnotes[ref]
+        note = @footnotes[ref] or raise ParseError, "footnote [^#{ref}] not found"
 
         link = "{^#{label}}[rdoc-label:footmark-#{label}:foottext-#{label}] "
         note.parts.unshift link
@@ -1135,7 +1135,7 @@ StartList = &.
             { [] }
 
 Line =  @RawLine:a { a }
-RawLine = ( < (!"\r" !"\n" .)* @Newline >
+RawLine = ( < /[^\r\n]*/ @Newline >
         | < .+ > @Eof ) { text }
 
 SkipBlock = HtmlBlock
@@ -1179,7 +1179,7 @@ InlineNote = &{ notes? }
 Notes = ( Note | SkipBlock )*
 
 RawNoteBlock = @StartList:a
-               ( !@BlankLine OptionallyIndentedLine:l { a << l } )+
+               ( !@BlankLine !RawNoteReference OptionallyIndentedLine:l { a << l } )+
                ( < @BlankLine* > { a << text } )
                { a }
 
@@ -1198,19 +1198,26 @@ CodeFence = &{ github? }
             }
 
 Table = &{ github? }
-        TableRow:header TableLine:line TableRow+:body
+        TableHead:header TableLine:line TableRow+:body
         { table = RDoc::Markup::Table.new(header, line, body) }
 
-TableRow = TableItem+:row "|" @Newline
-           { row }
-TableItem = "|" < (!"|" !@Newline .)+ >
-            { text.strip }
-
-TableLine = TableColumn+:line "|" @Newline
-            { line }
-TableColumn = "|" < ( "-"+ ":"? | ":" "-"* ) >
-              { text.start_with?(":") ? :left :
-                text.end_with?(":") ? :right : nil
+TableHead = TableItem2+:items "|"? @Newline
+            { items }
+
+TableRow = ( ( TableItem:item1 TableItem2*:items { [item1, *items] } ):row | TableItem2+:row ) "|"? @Newline
+	   { row }
+TableItem2 = "|" TableItem
+TableItem = < /(?:\\.|[^|\n])+/ >
+	    { text.strip.gsub(/\\(.)/, '\1')  }
+
+TableLine = ( ( TableAlign:align1 TableAlign2*:aligns {[align1, *aligns] } ):line | TableAlign2+:line ) "|"? @Newline
+	    { line }
+TableAlign2 = "|" @Sp TableAlign
+TableAlign = < /:?-+:?/ > @Sp
+              {
+                text.start_with?(":") ?
+                (text.end_with?(":") ? :center : :left) :
+                (text.end_with?(":") ? :right : nil)
               }
 
 DefinitionList = &{ definition_lists? }