Pimki 1.3.092 → 1.4.092

data/libraries/diff/diff_test.rb

@@ -1,80 +1,80 @@
-require 'test/unit'
-require 'diff'
-
-include Diff
-
-class DiffTest < Test::Unit::TestCase
-  def test_init
-    assert(1 == 1, "tests working")
-    assert_nothing_raised("object created") do
-      s = SequenceMatcher.new "private Thread currentThread;",
-        "private volatile Thread currentThread;",
-        proc { |x| x == ' ' }
-    end
-  end
-  
-  def test_matching_blocks
-    s = SequenceMatcher.new "abxcd", "abcd"
-    assert(s.get_matching_blocks == [[0, 0, 2], [3, 2, 2], [5, 4, 0]],
-           "get_matching_blocks works")
-  end
-  
-  def test_ratio
-    s = SequenceMatcher.new "abcd", "bcde"
-    assert(s.ratio == 0.75, "ratio works")
-    assert(s.quick_ratio == 0.75, "quick_ratio works")
-    assert(s.real_quick_ratio == 1.0, "real_quick_ratio works")
-  end
-  
-  def test_longest_match
-    s = SequenceMatcher.new(" abcd", "abcd abcd")
-    assert(s.find_longest_match(0, 5, 0, 9) == [0, 4, 5], 
-           "find_longest_match works")
-    s = SequenceMatcher.new()
-  end
-  
-  def test_opcodes
-    s = SequenceMatcher.new("qabxcd", "abycdf")
-    assert(s.get_opcodes == [
-             [:delete, 0, 1, 0, 0],
-             [:equal, 1, 3, 0, 2],
-             [:replace, 3, 4, 2, 3],
-             [:equal, 4, 6, 3, 5],
-             [:insert, 6, 6, 5, 6]], "get_opcodes works")
-  end
-
-
-  def test_count_leading
-    assert(Diff.count_leading('   abc', ' ') == 3, 
-           "count_leading works")
-  end
-
-  def test_html2list
-    a = "here is the original text"
-    #p HTMLDiff.html2list(a)
-  end
-
-  def test_html_diff
-    a = "this was the original string"
-    b = "this is the super string"
-    assert_equal 'this <del class="diffmod">was </del>' + 
-           '<ins class="diffmod">is </ins>the ' +
-           '<del class="diffmod">original </del>' + 
-           '<ins class="diffmod">super </ins>string',
-           HTMLDiff.diff(a, b)
-  end
-  
-  def test_html_diff_with_multiple_paragraphs
-    a = "<p>this was the original string</p>"
-    b = "<p>this is</p>\r\n<p>the super string</p>\r\n<p>around the world</p>"
-
-    assert_equal(
-      "<p>this <del class=\"diffmod\">was </del>" + 
-      "<ins class=\"diffmod\">is</ins></p>\r\n<p>the " +
-      "<del class=\"diffmod\">original </del>" + 
-      "<ins class=\"diffmod\">super </ins>string</p>\r\n" +
-      "<p><ins class=\"diffins\">around the world</ins></p>",
-      HTMLDiff.diff(a, b)
-    )
-  end
+require 'test/unit'
+require 'diff'
+
+include Diff
+
+class DiffTest < Test::Unit::TestCase
+  def test_init
+    assert(1 == 1, "tests working")
+    assert_nothing_raised("object created") do
+      s = SequenceMatcher.new "private Thread currentThread;",
+        "private volatile Thread currentThread;",
+        proc { |x| x == ' ' }
+    end
+  end
+  
+  def test_matching_blocks
+    s = SequenceMatcher.new "abxcd", "abcd"
+    assert(s.get_matching_blocks == [[0, 0, 2], [3, 2, 2], [5, 4, 0]],
+           "get_matching_blocks works")
+  end
+  
+  def test_ratio
+    s = SequenceMatcher.new "abcd", "bcde"
+    assert(s.ratio == 0.75, "ratio works")
+    assert(s.quick_ratio == 0.75, "quick_ratio works")
+    assert(s.real_quick_ratio == 1.0, "real_quick_ratio works")
+  end
+  
+  def test_longest_match
+    s = SequenceMatcher.new(" abcd", "abcd abcd")
+    assert(s.find_longest_match(0, 5, 0, 9) == [0, 4, 5], 
+           "find_longest_match works")
+    s = SequenceMatcher.new()
+  end
+  
+  def test_opcodes
+    s = SequenceMatcher.new("qabxcd", "abycdf")
+    assert(s.get_opcodes == [
+             [:delete, 0, 1, 0, 0],
+             [:equal, 1, 3, 0, 2],
+             [:replace, 3, 4, 2, 3],
+             [:equal, 4, 6, 3, 5],
+             [:insert, 6, 6, 5, 6]], "get_opcodes works")
+  end
+
+
+  def test_count_leading
+    assert(Diff.count_leading('   abc', ' ') == 3, 
+           "count_leading works")
+  end
+
+  def test_html2list
+    a = "here is the original text"
+    #p HTMLDiff.html2list(a)
+  end
+
+  def test_html_diff
+    a = "this was the original string"
+    b = "this is the super string"
+    assert_equal 'this <del class="diffmod">was </del>' + 
+           '<ins class="diffmod">is </ins>the ' +
+           '<del class="diffmod">original </del>' + 
+           '<ins class="diffmod">super </ins>string',
+           HTMLDiff.diff(a, b)
+  end
+  
+  def test_html_diff_with_multiple_paragraphs
+    a = "<p>this was the original string</p>"
+    b = "<p>this is</p>\r\n<p>the super string</p>\r\n<p>around the world</p>"
+
+    assert_equal(
+      "<p>this <del class=\"diffmod\">was </del>" + 
+      "<ins class=\"diffmod\">is</ins></p>\r\n<p>the " +
+      "<del class=\"diffmod\">original </del>" + 
+      "<ins class=\"diffmod\">super </ins>string</p>\r\n" +
+      "<p><ins class=\"diffins\">around the world</ins></p>",
+      HTMLDiff.diff(a, b)
+    )
+  end
 end

data/libraries/erb.rb

@@ -1,490 +1,490 @@
-# Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002,2003 Masatoshi SEKI 
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-class ERB
-  Revision = '$Date: 2004/11/09 02:03:12 $' 	#'
-
-  def self.version
-    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
-  end
-end
-
-# ERB::Compiler
-class ERB
-  class Compiler
-    class PercentLine
-      def initialize(str)
-        @value = str
-      end
-      attr_reader :value
-      alias :to_s :value
-    end
-
-    class Scanner
-      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-
-      @scanner_map = {}
-      def self.regist_scanner(klass, trim_mode, percent)
-	@scanner_map[[trim_mode, percent]] = klass
-      end
-
-      def self.default_scanner=(klass)
-	@default_scanner = klass
-      end
-
-      def self.make_scanner(src, trim_mode, percent)
-	klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
-	klass.new(src, trim_mode, percent)
-      end
-
-      def initialize(src, trim_mode, percent)
-	@src = src
-	@stag = nil
-      end
-      attr_accessor :stag
-
-      def scan; end
-    end
-
-    class TrimScanner < Scanner
-      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
-
-      def initialize(src, trim_mode, percent)
-	super
-	@trim_mode = trim_mode
-	@percent = percent
-	if @trim_mode == '>'
-	  @scan_line = self.method(:trim_line1)
-	elsif @trim_mode == '<>'
-	  @scan_line = self.method(:trim_line2)
-	elsif @trim_mode == '-'
-	  @scan_line = self.method(:explicit_trim_line)
-	else
-	  @scan_line = self.method(:scan_line)
-	end
-      end
-      attr_accessor :stag
-      
-      def scan(&block)
-	@stag = nil
-	if @percent
-	  @src.each do |line|
-	    percent_line(line, &block)
-	  end
-	else
-	  @src.each do |line|
-	    @scan_line.call(line, &block)
-	  end
-	end
-	nil
-      end
-
-      def percent_line(line, &block)
-	if @stag || line[0] != ?%
-	  return @scan_line.call(line, &block)
-	end
-
-	line[0] = ''
-	if line[0] == ?%
-	  @scan_line.call(line, &block)
-	else
-          yield(PercentLine.new(line.chomp))
-	end
-      end
-
-      def scan_line(line)
-	line.split(SplitRegexp).each do |token|
-	  next if token.empty?
-	  yield(token)
-	end
-      end
-
-      def trim_line1(line)
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  if token == "%>\n"
-	    yield('%>')
-	    yield(:cr)
-	    break
-	  end
-	  yield(token)
-	end
-      end
-
-      def trim_line2(line)
-	head = nil
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  head = token unless head
-	  if token == "%>\n"
-	    yield('%>')
-	    if  is_erb_stag?(head)
-	      yield(:cr)
-	    else
-	      yield("\n")
-	    end
-	    break
-	  end
-	  yield(token)
-	end
-      end
-
-      ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-      def explicit_trim_line(line)
-	line.split(ExplicitTrimRegexp).each do |token|
-	  next if token.empty?
-	  if @stag.nil? && /[ \t]*<%-/ =~ token
-	    yield('<%')
-	  elsif @stag && /-%>\n/ =~ token
-	    yield('%>')
-	    yield(:cr)
-	  elsif @stag && token == '-%>'
-	    yield('%>')
-	  else
-	    yield(token)
-	  end
-	end
-      end
-
-      ERB_STAG = %w(<%= <%# <%)
-      def is_erb_stag?(s)
-	ERB_STAG.member?(s)
-      end
-    end
-
-    Scanner.default_scanner = TrimScanner
-
-    class SimpleScanner < Scanner
-      def scan
-	@src.each do |line|
-	  line.split(SplitRegexp).each do |token|
-	    next if token.empty?
-	    yield(token)
-	  end
-	end
-      end
-    end
-    
-    Scanner.regist_scanner(SimpleScanner, nil, false)
-
-    begin
-      require 'strscan'
-      class SimpleScanner2 < Scanner
-        def scan
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-            scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-          end
-        end
-      end
-      Scanner.regist_scanner(SimpleScanner2, nil, false)
-
-      class PercentScanner < Scanner
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil?
-	      if scanner.scan(/%%/)
-		yield('%')
-		new_line = false
-		next
-	      elsif scanner.scan(/%/)
-		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-		next
-	      end
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-	    new_line = (elem == "\n")
-          end
-        end
-      end
-      Scanner.regist_scanner(PercentScanner, nil, true)
-
-      class ExplicitScanner < Scanner
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
-	      yield('<%')
-	      new_line = false
-	      next
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-	    new_line = (elem == "\n")
-            yield(text) unless text.empty?
-	    if elem == '-%>'
-	      yield('%>')
-	      if scanner.scan(/(\n|\z)/)
-		yield(:cr)
-		new_line = true
-	      end
-	    elsif elem == '<%-'
-	      yield('<%')
-	    else
-	      yield(elem) unless elem.empty?
-	    end
-          end
-        end
-      end
-      Scanner.regist_scanner(ExplicitScanner, '-', false)
-
-    rescue LoadError
-    end
-
-    class Buffer
-      def initialize(compiler)
-	@compiler = compiler
-	@line = []
-	@script = ''
-	@compiler.pre_cmd.each do |x|
-	  push(x)
-	end
-      end
-      attr_reader :script
-
-      def push(cmd)
-	@line << cmd
-      end
-      
-      def cr
-	@script << (@line.join('; '))
-	@line = []
-	@script << "\n"
-      end
-      
-      def close
-	return unless @line
-	@compiler.post_cmd.each do |x|
-	  push(x)
-	end
-	@script << (@line.join('; '))
-	@line = nil
-      end
-    end
-
-    class Buffer16 < Buffer
-      def initialize(compiler)
-	super(compiler)
-	@script = []
-      end
-
-      def script
-	@script.join('')
-      end
-    end
-
-    def make_buffer
-      if RUBY_VERSION > '1.8'
-	Buffer.new(self)
-      else
-	Buffer16.new(self)
-      end
-    end
-
-    def compile(s)
-      out = make_buffer
-
-      content = ''
-      scanner = make_scanner(s)
-      scanner.scan do |token|
-	if scanner.stag.nil?
-	  case token
-          when PercentLine
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-	    content = ''
-            out.push(token.to_s)
-            out.cr
-	  when :cr
-	    out.cr
-	  when '<%', '<%=', '<%#'
-	    scanner.stag = token
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-	    content = ''
-	  when "\n"
-	    content << "\n"
-	    out.push("#{@put_cmd} #{content.dump}")
-	    out.cr
-	    content = ''
-	  when '<%%'
-	    content << '<%'
-	  else
-	    content << token
-	  end
-	else
-	  case token
-	  when '%>'
-	    case scanner.stag
-	    when '<%'
-	      if content[-1] == ?\n
-		content.chop!
-		out.push(content)
-		out.cr
-	      else
-		out.push(content)
-	      end
-	    when '<%='
-	      out.push("#{@put_cmd}((#{content}).to_s)")
-	    when '<%#'
-	      # out.push("# #{content.dump}")
-	    end
-	    scanner.stag = nil
-	    content = ''
-	  when '%%>'
-	    content << '%>'
-	  else
-	    content << token
-	  end
-	end
-      end
-      out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-      out.close
-      out.script
-    end
-
-    def prepare_trim_mode(mode)
-      case mode
-      when 1
-	return [false, '>']
-      when 2
-	return [false, '<>']
-      when 0
-	return [false, nil]
-      when String
-	perc = mode.include?('%')
-	if mode.include?('-')
-	  return [perc, '-']
-	elsif mode.include?('<>')
-	  return [perc, '<>']
-	elsif mode.include?('>')
-	  return [perc, '>']
-	else
-	  [perc, nil]
-	end
-      else
-	return [false, nil]
-      end
-    end
-
-    def make_scanner(src)
-      Scanner.make_scanner(src, @trim_mode, @percent)
-    end
-
-    def initialize(trim_mode)
-      @percent, @trim_mode = prepare_trim_mode(trim_mode)
-      @put_cmd = 'print'
-      @pre_cmd = []
-      @post_cmd = []
-    end
-    attr_reader :percent, :trim_mode
-    attr_accessor :put_cmd, :pre_cmd, :post_cmd
-  end
-end
-
-# ERB
-class ERB
-  def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
-    @safe_level = safe_level
-    compiler = ERB::Compiler.new(trim_mode)
-    set_eoutvar(compiler, eoutvar)
-    @src = compiler.compile(str)
-  end
-  attr :src
-
-  def set_eoutvar(compiler, eoutvar = '_erbout')
-    compiler.put_cmd = "#{eoutvar}.concat"
-
-    cmd = []
-    cmd.push "#{eoutvar} = ''"
-    
-    compiler.pre_cmd = cmd
-
-    cmd = []
-    cmd.push(eoutvar)
-
-    compiler.post_cmd = cmd
-  end
-
-  def run(b=TOPLEVEL_BINDING)
-    print self.result(b)
-  end
-
-  def result(b=TOPLEVEL_BINDING)
-    if @safe_level
-      th = Thread.start { 
-	$SAFE = @safe_level
-	eval(@src, b)
-      }
-      return th.value
-    else
-      return eval(@src, b)
-    end
-  end
-
-  def def_method(mod, methodname, fname='(ERB)')
-    mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
-  end
-
-  def def_module(methodname='erb')
-    mod = Module.new
-    def_method(mod, methodname)
-    mod
-  end
-
-  def def_class(superklass=Object, methodname='result')
-    cls = Class.new(superklass)
-    def_method(cls, methodname)
-    cls
-  end
-end
-
-# ERB::Util
-class ERB
-  module Util
-    public
-    def html_escape(s)
-      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
-    end
-    alias h html_escape
-    
-    def url_encode(s)
-      s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
-    end
-    alias u url_encode
-  end
-end
-
-# ERB::DefMethod
-class ERB
-  module DefMethod
-    public
-    def def_erb_method(methodname, erb)
-      if erb.kind_of? String
-	fname = erb
-	File.open(fname) {|f| erb = ERB.new(f.read) }
-	erb.def_method(self, methodname, fname)
-      else
-	erb.def_method(self, methodname)
-      end
-    end
-    module_function :def_erb_method
-  end
-end
+# Tiny eRuby --- ERB2
+# Copyright (c) 1999-2000,2002,2003 Masatoshi SEKI 
+# You can redistribute it and/or modify it under the same terms as Ruby.
+
+class ERB
+  Revision = '$Date: 2004/11/09 02:03:12 $' 	#'
+
+  def self.version
+    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
+  end
+end
+
+# ERB::Compiler
+class ERB
+  class Compiler
+    class PercentLine
+      def initialize(str)
+        @value = str
+      end
+      attr_reader :value
+      alias :to_s :value
+    end
+
+    class Scanner
+      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
+
+      @scanner_map = {}
+      def self.regist_scanner(klass, trim_mode, percent)
+	@scanner_map[[trim_mode, percent]] = klass
+      end
+
+      def self.default_scanner=(klass)
+	@default_scanner = klass
+      end
+
+      def self.make_scanner(src, trim_mode, percent)
+	klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
+	klass.new(src, trim_mode, percent)
+      end
+
+      def initialize(src, trim_mode, percent)
+	@src = src
+	@stag = nil
+      end
+      attr_accessor :stag
+
+      def scan; end
+    end
+
+    class TrimScanner < Scanner
+      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
+
+      def initialize(src, trim_mode, percent)
+	super
+	@trim_mode = trim_mode
+	@percent = percent
+	if @trim_mode == '>'
+	  @scan_line = self.method(:trim_line1)
+	elsif @trim_mode == '<>'
+	  @scan_line = self.method(:trim_line2)
+	elsif @trim_mode == '-'
+	  @scan_line = self.method(:explicit_trim_line)
+	else
+	  @scan_line = self.method(:scan_line)
+	end
+      end
+      attr_accessor :stag
+      
+      def scan(&block)
+	@stag = nil
+	if @percent
+	  @src.each do |line|
+	    percent_line(line, &block)
+	  end
+	else
+	  @src.each do |line|
+	    @scan_line.call(line, &block)
+	  end
+	end
+	nil
+      end
+
+      def percent_line(line, &block)
+	if @stag || line[0] != ?%
+	  return @scan_line.call(line, &block)
+	end
+
+	line[0] = ''
+	if line[0] == ?%
+	  @scan_line.call(line, &block)
+	else
+          yield(PercentLine.new(line.chomp))
+	end
+      end
+
+      def scan_line(line)
+	line.split(SplitRegexp).each do |token|
+	  next if token.empty?
+	  yield(token)
+	end
+      end
+
+      def trim_line1(line)
+	line.split(TrimSplitRegexp).each do |token|
+	  next if token.empty?
+	  if token == "%>\n"
+	    yield('%>')
+	    yield(:cr)
+	    break
+	  end
+	  yield(token)
+	end
+      end
+
+      def trim_line2(line)
+	head = nil
+	line.split(TrimSplitRegexp).each do |token|
+	  next if token.empty?
+	  head = token unless head
+	  if token == "%>\n"
+	    yield('%>')
+	    if  is_erb_stag?(head)
+	      yield(:cr)
+	    else
+	      yield("\n")
+	    end
+	    break
+	  end
+	  yield(token)
+	end
+      end
+
+      ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
+      def explicit_trim_line(line)
+	line.split(ExplicitTrimRegexp).each do |token|
+	  next if token.empty?
+	  if @stag.nil? && /[ \t]*<%-/ =~ token
+	    yield('<%')
+	  elsif @stag && /-%>\n/ =~ token
+	    yield('%>')
+	    yield(:cr)
+	  elsif @stag && token == '-%>'
+	    yield('%>')
+	  else
+	    yield(token)
+	  end
+	end
+      end
+
+      ERB_STAG = %w(<%= <%# <%)
+      def is_erb_stag?(s)
+	ERB_STAG.member?(s)
+      end
+    end
+
+    Scanner.default_scanner = TrimScanner
+
+    class SimpleScanner < Scanner
+      def scan
+	@src.each do |line|
+	  line.split(SplitRegexp).each do |token|
+	    next if token.empty?
+	    yield(token)
+	  end
+	end
+      end
+    end
+    
+    Scanner.regist_scanner(SimpleScanner, nil, false)
+
+    begin
+      require 'strscan'
+      class SimpleScanner2 < Scanner
+        def scan
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
+          etag_reg = /(.*?)(%%>|%>|\n|\z)/
+          scanner = StringScanner.new(@src)
+          while ! scanner.eos?
+            scanner.scan(@stag ? etag_reg : stag_reg)
+            text = scanner[1]
+            elem = scanner[2]
+            yield(text) unless text.empty?
+            yield(elem) unless elem.empty?
+          end
+        end
+      end
+      Scanner.regist_scanner(SimpleScanner2, nil, false)
+
+      class PercentScanner < Scanner
+	def scan
+	  new_line = true
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
+          etag_reg = /(.*?)(%%>|%>|\n|\z)/
+          scanner = StringScanner.new(@src)
+          while ! scanner.eos?
+	    if new_line && @stag.nil?
+	      if scanner.scan(/%%/)
+		yield('%')
+		new_line = false
+		next
+	      elsif scanner.scan(/%/)
+		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
+		next
+	      end
+	    end
+	    scanner.scan(@stag ? etag_reg : stag_reg)
+            text = scanner[1]
+            elem = scanner[2]
+            yield(text) unless text.empty?
+            yield(elem) unless elem.empty?
+	    new_line = (elem == "\n")
+          end
+        end
+      end
+      Scanner.regist_scanner(PercentScanner, nil, true)
+
+      class ExplicitScanner < Scanner
+	def scan
+	  new_line = true
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
+          etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
+          scanner = StringScanner.new(@src)
+          while ! scanner.eos?
+	    if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
+	      yield('<%')
+	      new_line = false
+	      next
+	    end
+	    scanner.scan(@stag ? etag_reg : stag_reg)
+            text = scanner[1]
+            elem = scanner[2]
+	    new_line = (elem == "\n")
+            yield(text) unless text.empty?
+	    if elem == '-%>'
+	      yield('%>')
+	      if scanner.scan(/(\n|\z)/)
+		yield(:cr)
+		new_line = true
+	      end
+	    elsif elem == '<%-'
+	      yield('<%')
+	    else
+	      yield(elem) unless elem.empty?
+	    end
+          end
+        end
+      end
+      Scanner.regist_scanner(ExplicitScanner, '-', false)
+
+    rescue LoadError
+    end
+
+    class Buffer
+      def initialize(compiler)
+	@compiler = compiler
+	@line = []
+	@script = ''
+	@compiler.pre_cmd.each do |x|
+	  push(x)
+	end
+      end
+      attr_reader :script
+
+      def push(cmd)
+	@line << cmd
+      end
+      
+      def cr
+	@script << (@line.join('; '))
+	@line = []
+	@script << "\n"
+      end
+      
+      def close
+	return unless @line
+	@compiler.post_cmd.each do |x|
+	  push(x)
+	end
+	@script << (@line.join('; '))
+	@line = nil
+      end
+    end
+
+    class Buffer16 < Buffer
+      def initialize(compiler)
+	super(compiler)
+	@script = []
+      end
+
+      def script
+	@script.join('')
+      end
+    end
+
+    def make_buffer
+      if RUBY_VERSION > '1.8'
+	Buffer.new(self)
+      else
+	Buffer16.new(self)
+      end
+    end
+
+    def compile(s)
+      out = make_buffer
+
+      content = ''
+      scanner = make_scanner(s)
+      scanner.scan do |token|
+	if scanner.stag.nil?
+	  case token
+          when PercentLine
+	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+	    content = ''
+            out.push(token.to_s)
+            out.cr
+	  when :cr
+	    out.cr
+	  when '<%', '<%=', '<%#'
+	    scanner.stag = token
+	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+	    content = ''
+	  when "\n"
+	    content << "\n"
+	    out.push("#{@put_cmd} #{content.dump}")
+	    out.cr
+	    content = ''
+	  when '<%%'
+	    content << '<%'
+	  else
+	    content << token
+	  end
+	else
+	  case token
+	  when '%>'
+	    case scanner.stag
+	    when '<%'
+	      if content[-1] == ?\n
+		content.chop!
+		out.push(content)
+		out.cr
+	      else
+		out.push(content)
+	      end
+	    when '<%='
+	      out.push("#{@put_cmd}((#{content}).to_s)")
+	    when '<%#'
+	      # out.push("# #{content.dump}")
+	    end
+	    scanner.stag = nil
+	    content = ''
+	  when '%%>'
+	    content << '%>'
+	  else
+	    content << token
+	  end
+	end
+      end
+      out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+      out.close
+      out.script
+    end
+
+    def prepare_trim_mode(mode)
+      case mode
+      when 1
+	return [false, '>']
+      when 2
+	return [false, '<>']
+      when 0
+	return [false, nil]
+      when String
+	perc = mode.include?('%')
+	if mode.include?('-')
+	  return [perc, '-']
+	elsif mode.include?('<>')
+	  return [perc, '<>']
+	elsif mode.include?('>')
+	  return [perc, '>']
+	else
+	  [perc, nil]
+	end
+      else
+	return [false, nil]
+      end
+    end
+
+    def make_scanner(src)
+      Scanner.make_scanner(src, @trim_mode, @percent)
+    end
+
+    def initialize(trim_mode)
+      @percent, @trim_mode = prepare_trim_mode(trim_mode)
+      @put_cmd = 'print'
+      @pre_cmd = []
+      @post_cmd = []
+    end
+    attr_reader :percent, :trim_mode
+    attr_accessor :put_cmd, :pre_cmd, :post_cmd
+  end
+end
+
+# ERB
+class ERB
+  def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
+    @safe_level = safe_level
+    compiler = ERB::Compiler.new(trim_mode)
+    set_eoutvar(compiler, eoutvar)
+    @src = compiler.compile(str)
+  end
+  attr :src
+
+  def set_eoutvar(compiler, eoutvar = '_erbout')
+    compiler.put_cmd = "#{eoutvar}.concat"
+
+    cmd = []
+    cmd.push "#{eoutvar} = ''"
+    
+    compiler.pre_cmd = cmd
+
+    cmd = []
+    cmd.push(eoutvar)
+
+    compiler.post_cmd = cmd
+  end
+
+  def run(b=TOPLEVEL_BINDING)
+    print self.result(b)
+  end
+
+  def result(b=TOPLEVEL_BINDING)
+    if @safe_level
+      th = Thread.start { 
+	$SAFE = @safe_level
+	eval(@src, b)
+      }
+      return th.value
+    else
+      return eval(@src, b)
+    end
+  end
+
+  def def_method(mod, methodname, fname='(ERB)')
+    mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
+  end
+
+  def def_module(methodname='erb')
+    mod = Module.new
+    def_method(mod, methodname)
+    mod
+  end
+
+  def def_class(superklass=Object, methodname='result')
+    cls = Class.new(superklass)
+    def_method(cls, methodname)
+    cls
+  end
+end
+
+# ERB::Util
+class ERB
+  module Util
+    public
+    def html_escape(s)
+      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+    end
+    alias h html_escape
+    
+    def url_encode(s)
+      s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+    end
+    alias u url_encode
+  end
+end
+
+# ERB::DefMethod
+class ERB
+  module DefMethod
+    public
+    def def_erb_method(methodname, erb)
+      if erb.kind_of? String
+	fname = erb
+	File.open(fname) {|f| erb = ERB.new(f.read) }
+	erb.def_method(self, methodname, fname)
+      else
+	erb.def_method(self, methodname)
+      end
+    end
+    module_function :def_erb_method
+  end
+end