[WIP] rewriting ReVIEW::Compiler with kpeg

.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   Exclude:
     - lib/lineinput.rb
     - lib/uuid.rb
+    - lib/review/compiler.rb
   DisplayCopNames: true
 
 inherit_from: .rubocop_todo.yml
@@ -49,6 +50,10 @@ Style/OpMethod:
 Style/VariableName:
   Enabled: true
 
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 4500
+
 Style/ConditionalAssignment:
   Enabled: false
 

Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in review.gemspec
 gemspec
 
+gem "json"

Rakefile

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 begin
   require 'bundler'
   Bundler::GemHelper.install_tasks
@@ -20,6 +22,11 @@ task :rubocop do
   end
 end
 
+task :kpeg do
+  FileUtils.rm_f "lib/review/compiler.rb"
+  sh "kpeg -s lib/review/review.kpeg -o lib/review/compiler.rb"
+end
+
 Rake::TestTask.new("test") do |t|
   t.libs << "test"
   t.test_files = Dir.glob("test/**/test_*.rb")

bin/review-compile → bin/review-compile-peg

@@ -107,7 +107,7 @@ def _main
     exit 1
   end
 
-  begin
+## begin
     loader = ReVIEW::YAMLLoader.new
     if config["yaml"]
       config.deep_merge!(loader.load_file(config["yaml"]))
@@ -166,11 +166,11 @@ def _main
     else
       raise "must not happen: #{mode}"
     end
-  rescue ReVIEW::ApplicationError => err
-    raise if $DEBUG
-    error err.message
-    exit 1
-  end
+#  rescue ReVIEW::ApplicationError => err
+#    raise if $DEBUG
+#    error err.message
+#    exit 1
+#  end
 end
 
 def error(msg)

lib/lineinput.rb

@@ -58,36 +58,6 @@ def next?
     peek() ? true : false
   end
 
-  def skip_blank_lines
-    n = 0
-    while line = gets()
-      unless line.strip.empty?
-        ungets line
-        return n
-      end
-      n += 1
-    end
-    n
-  end
-
-  def gets_if(re)
-    line = gets()
-    if not line or not (re =~ line)
-      ungets line
-      return nil
-    end
-    line
-  end
-
-  def gets_unless(re)
-    line = gets()
-    if not line or re =~ line
-      ungets line
-      return nil
-    end
-    line
-  end
-
   def each
     while line = gets()
       yield line
@@ -144,12 +114,4 @@ def until_terminator(re)
     nil
   end
 
-  def getblock(term_re)
-    buf = []
-    until_terminator(term_re) do |line|
-      buf.push line
-    end
-    buf
-  end
-
 end

lib/review/book/index.rb

@@ -92,10 +92,14 @@ def item_type
       end
 
       def number(id)
-        chapter = @index.fetch(id)
-        chapter.format_number
+        chapter = @index.fetch(id, nil)
+        if chapter
+          return chapter.format_number
+        else
+          return "#{I18n.t("part", chapter.number)}"
+        end
       rescue # part
-        "#{I18n.t("part", chapter.number)}"
+        raise "invalid number error: id:#{id}, capter:#{chapter}"
       end
 
       def title(id)

lib/review/builder.rb

@@ -22,6 +22,9 @@ class Builder
 
     CAPTION_TITLES = %w(note memo tip info warning important caution notice)
 
+    attr_accessor :output
+    attr_accessor :ast
+
     def pre_paragraph
       nil
     end
@@ -43,6 +46,7 @@ def bind(compiler, chapter, location)
       @compiler = compiler
       @chapter = chapter
       @location = location
+      @ast = nil
       @output = StringIO.new
       @book = @chapter.book if @chapter.present?
       @tabwidth = nil
@@ -64,11 +68,11 @@ def result
     alias_method :raw_result, :result
 
     def print(*s)
-      @output.print(*s)
+      raise NotImplementedError, "XXX: `print` method is obsoleted. Do not use it."
     end
 
     def puts(*s)
-      @output.puts(*s)
+      raise NotImplementedError, "XXX: `puts` method is obsoleted. Do not use it."
     end
 
     def target_name
@@ -83,27 +87,33 @@ def headline_prefix(level)
     end
     private :headline_prefix
 
-    def list(lines, id, caption, lang = nil)
+    def list(lines, id, caption = nil, lang = nil)
+      buf = ""
       begin
-        list_header id, caption, lang
+        buf << list_header(id, caption, lang)
       rescue KeyError
         error "no such list: #{id}"
       end
-      list_body id, lines, lang
+      buf << list_body(id, lines, lang)
+      buf
     end
 
-    def listnum(lines, id, caption, lang = nil)
+    def listnum(lines, id, caption = nil, lang = nil)
+      buf = ""
       begin
-        list_header id, caption, lang
+        buf << list_header(id, caption, lang)
       rescue KeyError
         error "no such list: #{id}"
       end
-      listnum_body lines, lang
+      buf << listnum_body(lines, lang)
+      buf
     end
 
-    def source(lines, caption, lang = nil)
-      source_header caption
-      source_body lines, lang
+    def source(lines, caption = nil)
+      buf = ""
+      buf << source_header(caption)
+      buf << source_body(lines, lang)
+      buf
     end
 
     def image(lines, id, caption, metric = nil)
@@ -116,6 +126,7 @@ def image(lines, id, caption, metric = nil)
     end
 
     def table(lines, id = nil, caption = nil)
+      buf = ""
       rows = []
       sepidx = nil
       lines.each_with_index do |line, idx|
@@ -130,26 +141,27 @@ def table(lines, id = nil, caption = nil)
       rows = adjust_n_cols(rows)
 
       begin
-        table_header id, caption unless caption.nil?
+        buf << table_header(id, caption) unless caption.nil?
       rescue KeyError
         error "no such table: #{id}"
       end
-      return if rows.empty?
-      table_begin rows.first.size
+      return buf if rows.empty?
+      buf << table_begin(rows.first.size)
       if sepidx
         sepidx.times do
-          tr rows.shift.map {|s| th(s) }
+          buf << tr(rows.shift.map {|s| th(s) })
         end
         rows.each do |cols|
-          tr cols.map {|s| td(s) }
+          buf << tr(cols.map {|s| td(s) })
         end
       else
         rows.each do |cols|
           h, *cs = *cols
-          tr [th(h)] + cs.map {|s| td(s) }
+          buf << tr([th(h)] + cs.map {|s| td(s) })
         end
       end
-      table_end
+      buf << table_end
+      buf
     end
 
     def adjust_n_cols(rows)
@@ -178,12 +190,12 @@ def adjust_n_cols(rows)
     #  footnote_end
     #end
 
-    def compile_inline(s)
-      @compiler.text(s)
-    end
+#    def compile_inline(s)
+#      @compiler.text(s)
+#    end
 
     def inline_chapref(id)
-      compile_inline @book.chapter_index.display_string(id)
+      @book.chapter_index.display_string(id)
     rescue KeyError
       error "unknown chapter: #{id}"
       nofunc_text("[UnknownChapter:#{id}]")
@@ -197,7 +209,7 @@ def inline_chap(id)
     end
 
     def inline_title(id)
-      compile_inline @book.chapter_index.title(id)
+      @book.chapter_index.title(id)
     rescue KeyError
       error "unknown chapter: #{id}"
       nofunc_text("[UnknownChapter:#{id}]")
@@ -217,8 +229,14 @@ def inline_img(id)
       nofunc_text("[UnknownImage:#{id}]")
     end
 
-    def inline_imgref(id)
-      img = inline_img(id)
+    def node_inline_img(node)
+      id = node[0].to_raw
+      inline_img(id)
+    end
+
+    def node_inline_imgref(node)
+      id = node[0].to_raw
+      img = node_inline_img(node)
 
       if @chapter.image(id).caption
         "#{img}#{I18n.t('image_quote', @chapter.image(id).caption)}"
@@ -245,22 +263,17 @@ def inline_bou(str)
       text(str)
     end
 
-    def inline_ruby(arg)
-      base, *ruby = *arg.scan(/(?:(?:(?:\\\\)*\\,)|[^,\\]+)+/)
-      base = base.gsub(/\\,/, ",") if base
-      ruby = ruby.join(",").gsub(/\\,/, ",") if ruby
+    def inline_ruby(base, ruby)
       compile_ruby(base, ruby)
     end
 
-    def inline_kw(arg)
-      word, alt = *arg.split(',', 2)
+    def inline_kw(word, alt = nil)
       compile_kw(word, alt)
     end
 
-    def inline_href(arg)
-      url, label = *arg.scan(/(?:(?:(?:\\\\)*\\,)|[^,\\]+)+/).map(&:lstrip)
-      url = url.gsub(/\\,/, ",").strip
-      label = label.gsub(/\\,/, ",").strip if label
+    def inline_href(url, label = nil)
+      url = url.strip
+      label = label.strip if label
       compile_href(url, label)
     end
 
@@ -269,15 +282,18 @@ def text(str)
     end
 
     def bibpaper(lines, id, caption)
-      bibpaper_header id, caption
+      buf = ""
+      buf << bibpaper_header(id, caption)
       unless lines.empty?
-        puts ""
-        bibpaper_bibpaper id, caption, lines
+        buf << "\n"
+        buf << bibpaper_bibpaper(id, caption, lines)
       end
-      puts ""
+      buf << "\n"
+      buf
     end
 
-    def inline_hd(id)
+    def node_inline_hd(nodelist)
+      id = nodelist[0].to_raw
       m = /\A([^|]+)\|(.+)/.match(id)
       if m && m[1]
         chapter = @book.contents.detect{|chap| chap.id == m[1]}
@@ -318,12 +334,12 @@ def raw(str)
         builders = matched[1].split(/,/).map{|i| i.gsub(/\s/, '') }
         c = target_name
         if builders.include?(c)
-          print matched[2].gsub("\\n", "\n")
+          matched[2].gsub("\\n", "\n")
         else
           ""
         end
       else
-        print str.gsub("\\n", "\n")
+        str.gsub("\\n", "\n")
       end
     end
 
@@ -332,7 +348,7 @@ def warn(msg)
     end
 
     def error(msg)
-      raise ApplicationError, "#{@location}: error: #{msg}"
+      raise ApplicationError, "error: #{msg} at #{@compiler.show_pos} \n  (#{@compiler.failure_oneline})"
     end
 
     def handle_metric(str)
@@ -418,8 +434,9 @@ def image_ext
       raise NotImplementedError
     end
 
+    ### XXX
     def inline_include(file_name)
-      compile_inline File.read(file_name)
+      File.read(file_name)
     end
 
     def include(file_name)
@@ -433,6 +450,7 @@ def ul_item_begin(lines)
     end
 
     def ul_item_end
+      ""
     end
 
     def inline_raw(args)