module DParse
  module DSL
    def alt(*ps)
      DParse::Parsers::Alt.new(*ps)
    end

    def char(c)
      DParse::Parsers::Char.new(c)
    end

    def char_in(cs)
      DParse::Parsers::CharIn.new(cs)
    end

    def char_not(c)
      DParse::Parsers::CharNot.new(c)
    end

    def char_not_in(cs)
      DParse::Parsers::CharNotIn.new(cs)
    end

    def eof
      DParse::Parsers::EOF.new
    end

    def intersperse(a, b)
      DParse::Parsers::Intersperse.new(a, b)
    end

    def lazy(&block)
      DParse::Parsers::Lazy.new(&block)
    end

    def opt(p)
      DParse::Parsers::Opt.new(p)
    end

    def rename(p, name)
      DParse::Parsers::Rename.new(p, name)
    end

    def repeat(p)
      DParse::Parsers::Repeat.new(p)
    end

    def seq(*ps)
      DParse::Parsers::Seq.new(*ps)
    end

    def string(s)
      DParse::Parsers::String.new(s)
    end

    def succeed
      DParse::Parsers::Succeed.new
    end

    def whitespace_char
      DParse::Parsers::WhitespaceChar.new
    end
  end
end

module DParse
  module DSL
    def alt(*ps)
      DParse::Parsers::Alt.new(*ps)
    end

    def char(c)
      DParse::Parsers::Char.new(c)
    end

    def char_in(cs)
      DParse::Parsers::CharIn.new(cs)
    end

    def char_not(c)
      DParse::Parsers::CharNot.new(c)
    end

    def char_not_in(cs)
      DParse::Parsers::CharNotIn.new(cs)
    end

    def eof
      DParse::Parsers::EOF.new
    end

    def intersperse(a, b)
      DParse::Parsers::Intersperse.new(a, b)
    end

    def lazy(&block)
      DParse::Parsers::Lazy.new(&block)
    end

    def opt(p)
      DParse::Parsers::Opt.new(p)
    end

    def rename(p, message)
      DParse::Parsers::Rename.new(p, message)
    end

    def repeat(p)
      DParse::Parsers::Repeat.new(p)
    end

    def seq(*ps)
      DParse::Parsers::Seq.new(*ps)
    end

    def string(s)
      DParse::Parsers::String.new(s)
    end

    def succeed
      DParse::Parsers::Succeed.new
    end

    def whitespace_char
      DParse::Parsers::WhitespaceChar.new
    end
  end
end

--- 
+++ 
@@ -36,8 +36,8 @@
       DParse::Parsers::Opt.new(p)
     end
 
-    def rename(p, message)
-      DParse::Parsers::Rename.new(p, message)
+    def rename(p, name)
+      DParse::Parsers::Rename.new(p, name)
     end
 
     def repeat(p)
refactor(core): Use better name for rename argument in DSL
