erubis 2.6.6 → 2.7.0

data/CHANGES.txt

@@ -1,7 +1,83 @@
 # -*- coding: utf-8 -*-
-# $Release: 2.6.6 $
-# copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+# $Release: 2.7.0 $
+# copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 
+- release:   2.7.0
+  date: 2011-04-01
+  enhancements:
+
+    - |
+	New option ':bufvar' supported to specify buffer variable name.
+
+	ex:
+	    input = "Hello <%= name %>!"
+	    eruby = Erubis::Eruby.new(input)
+	    puts eruby.src
+	       #=>  _buf = ''; _buf << "Hello "; _buf << ( name ).to_s; _buf << '!';
+
+	    eruby = Erubis::Eruby.new(input, :bufvar=>'@_out')
+	    puts eruby.src
+	       #=>  @_out = ''; @_out << 'Hello '; @_out << ( name ).to_s; @_out << '!';
+
+    - |
+	New enhancer 'PrefixedLineEnhancer' which is a customizable version
+	of PercentLineEnhancer.
+	The difference between PrefixedLineEnhancer and PercentLineEnhancer is:
+	* You can indent Ruby statetment lines starting with '%'
+	* You can specify prefix character by :prefixchar option.
+
+	ex:
+	    class MyEruby < Erubis::Eruby
+	      include Erubis::PrefixedLineEnhancer
+	    end
+	    input = <<END
+	    <ul>
+	      % for item in @items
+	      <li><%= item %></li>
+	      % end
+	      %% you can indent '%' lines
+	    </ul>
+	    END
+	    eruby = MyEruby.new(input, :prefixchar=>'%')   # default '%'
+	    puts eruby.src
+
+	output:
+	    _buf = ''; _buf << '<ul>
+	    ';   for item in @items
+	     _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
+	    ';   end
+	      % you can indent '%' lines
+	     _buf << '</ul>
+	    ';
+	    _buf.to_s
+
+    - |
+	Add helper CGI script. See 'public_html/README.txt' for details.
+
+    - |
+	Rubinius is supported as first-class Ruby implementation.
+
+    - |
+	C++ support. Try '-l cpp' command-line option.
+
+	
+  changes:
+
+    - |
+	Remove dependency to 'abstract' library.
+	You don't need to install 'abstract' gem.
+
+    - |
+	Erubis::Eruby#load_file() now sets cache file timestamp to the same
+	value as original eRuby file. For example, if you restore eRuby files
+	from backup, Erubis::Eruby#load_file() can detect it and generate
+	cache file again.
+
+	    ## generates cache file (A.rhtml.cache).
+	    eruby = Erubis::Eruby.load_file('A.rhtml')
+	    p File.mtime('A.rhtml') == File.mtime('A.rhtml.cache')  #=> true
+
+	    
 
 - release:   2.6.6
   date: 2010-06-27
@@ -21,7 +97,7 @@
 
 - release:   2.6.4
   date: 2009-02-18
-  enhancemens:
+  enhancements:
 
     - |
 	Rails 2.2 and 2.3 support.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.txt

@@ -1,7 +1,7 @@
 = README
 
-release::	2.6.6
-copyright::	copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+release::	2.7.0
+copyright::	copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 
 
 

data/benchmark/bench.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'erb'

data/bin/erubis

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'erubis/main'

data/contrib/erubis

@@ -1,21 +1,21 @@
 #!/usr/bin/env ruby
 
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 #--begin of require 'erubis/main'
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'yaml'
 #--begin of require 'erubis'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 ##
@@ -62,81 +62,28 @@ require 'yaml'
 
 
 module Erubis
-  VERSION = ('$Release: 2.6.6 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.7.0 $' =~ /([.\d]+)/) && $1
 end
 
 #--begin of require 'erubis/engine'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
 #--begin of require 'erubis/generator'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
-#--begin of require 'abstract'
+#--begin of require 'erubis/util'
 ##
-## $Rev: 1 $
-## $Release: 0.1.0 $
-## copyright(c) 2006 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
-##
-## helper to define abstract method in Ruby.
-##
-##
-## example1. (shorter notation)
-##
-##   require 'abstract'
-##   class Foo
-##     abstract_method 'arg1, arg2=""', :method1, :method2, :method3
-##   end
-##
-##
-## example2. (RDoc friendly notation)
-##
-##   require 'abstract'
-##   class Bar
-##     # ... method1 description ...
-##     def method1(arg1, arg2="")
-##       not_implemented
-##     end
-##
-##     # ... method2 description ...
-##     def method2(arg1, arg2="")
-##       not_implemented
-##     end
-##   end
-##
-
-
-##
-class Module
-
-  ##
-  ## define abstract methods
-  ##
-  def abstract_method args_str, *method_names
-    method_names.each do |name|
-      module_eval <<-END
-        def #{name}(#{args_str})
-          mesg = "class \#{self.class.name} must implement abstract method `#{self.name}##{name}()'."
-          #mesg = "\#{self.class.name}##{name}() is not implemented."
-          err = NotImplementedError.new mesg
-          err.set_backtrace caller()
-          raise err
-        end
-      END
-    end
-  end
-
-end
 
-
-##
 module Kernel
 
   ##
@@ -154,7 +101,7 @@ module Kernel
   private :not_implemented
 
 end
-#--end of require 'abstract'
+#--end of require 'erubis/util'
 
 module Erubis
 
@@ -237,11 +184,11 @@ end
 #--end of require 'erubis/generator'
 #--begin of require 'erubis/converter'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
-#--already included require 'abstract'
+#--already included require 'erubis/util'
 
 module Erubis
 
@@ -596,14 +543,14 @@ end
 #--end of require 'erubis/converter'
 #--begin of require 'erubis/evaluator'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--begin of require 'erubis/error'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis
@@ -627,8 +574,8 @@ end
 #--end of require 'erubis/error'
 #--begin of require 'erubis/context'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -833,17 +780,17 @@ module Erubis
     def self.load_file(filename, properties={})
       cachename = properties[:cachename] || (filename + '.cache')
       properties[:filename] = filename
-      if test(?f, cachename) && File.mtime(filename) <= File.mtime(cachename)
+      timestamp = File.mtime(filename)
+      if test(?f, cachename) && timestamp == File.mtime(cachename)
         engine = self.new(nil, properties)
         engine.src = File.read(cachename)
       else
         input = File.open(filename, 'rb') {|f| f.read }
         engine = self.new(input, properties)
-        File.open(cachename, 'wb') do |f|
-          f.flock(File::LOCK_EX)
-          f.write(engine.src)
-          f.flush()
-        end
+        tmpname = cachename + rand().to_s[1,8]
+        File.open(tmpname, 'wb') {|f| f.write(engine.src) }
+        File.rename(tmpname, cachename)
+        File.utime(timestamp, timestamp, cachename)
       end
       engine.src.untaint   # ok?
       return engine
@@ -909,10 +856,11 @@ end
 #require 'erubis/evaluator'
 #require 'erubis/error'
 #require 'erubis/context'
+#requier 'erubis/util'
 #--begin of require 'erubis/helper'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -960,8 +908,8 @@ end
 #--end of require 'erubis/helper'
 #--begin of require 'erubis/enhancer'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -1028,7 +976,7 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = $stdout;"
+      src << "#{@bufvar} = $stdout;"
     end
 
     def add_postamble(src)
@@ -1053,15 +1001,15 @@ module Erubis
     end
 
     def add_text(src, text)
-      src << " print '" << escape_text(text) << "';" unless text.empty?
+      src << " print '#{escape_text(text)}';" unless text.empty?
     end
 
     def add_expr_literal(src, code)
-      src << ' print((' << code << ').to_s);'
+      src << " print((#{code}).to_s);"
     end
 
     def add_expr_escaped(src, code)
-      src << ' print ' << escaped_expr(code) << ';'
+      src << " print #{escaped_expr(code)};"
     end
 
     def add_postamble(src)
@@ -1123,12 +1071,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = [];"
+      src << "#{@bufvar} = [];"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf\n"
+      src << "#{@bufvar}\n"
     end
 
   end
@@ -1169,12 +1117,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = '';"
+      src << "#{@bufvar} = '';"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.to_s\n"
+      src << "#{@bufvar}.to_s\n"
     end
 
   end
@@ -1192,12 +1140,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = StringIO.new;"
+      src << "#{@bufvar} = StringIO.new;"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.string\n"
+      src << "#{@bufvar}.string\n"
     end
 
   end
@@ -1215,12 +1163,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_erbout = _buf = '';"
+      src << "_erbout = #{@bufvar} = '';"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.to_s\n"
+      src << "#{@bufvar}.to_s\n"
     end
 
   end
@@ -1395,23 +1343,34 @@ module Erubis
 
 
   ##
-  ## regards lines starting with '%' as program code
+  ## regards lines starting with '^[ \t]*%' as program code
   ##
-  ## this is for compatibility to eruby and ERB.
+  ## in addition you can specify prefix character (default '%')
   ##
   ## this is language-independent.
   ##
-  module PercentLineEnhancer
+  module PrefixedLineEnhancer
 
     def self.desc   # :nodoc:
-      "regard lines starting with '%' as program code"
+      "regard lines matched to '^[ \t]*%' as program code"
+    end
+
+    def init_generator(properties={})
+      super
+      @prefixchar = properties[:prefixchar]
     end
 
     def add_text(src, text)
+      unless @prefixrexp
+        @prefixchar ||= '%'
+        @prefixrexp = Regexp.compile("^([ \\t]*)\\#{@prefixchar}(.*?\\r?\\n)")
+      end
       pos = 0
       text2 = ''
-      text.scan(/^\%(.*?\r?\n)/) do
-        line  = $1
+      text.scan(@prefixrexp) do
+        space = $1
+        line  = $2
+        space, line = '', $1 unless $2
         match = Regexp.last_match
         len   = match.begin(0) - pos
         str   = text[pos, len]
@@ -1421,12 +1380,12 @@ module Erubis
         else
           text2 << str
         end
-        if line[0] == ?%
-          text2 << line
+        if line[0, 1] == @prefixchar
+          text2 << space << line
         else
           super(src, text2)
           text2 = ''
-          add_stmt(src, line)
+          add_stmt(src, space + line)
         end
       end
       #rest = pos == 0 ? text : $'             # ruby1.8
@@ -1441,6 +1400,39 @@ module Erubis
   end
 
 
+  ##
+  ## regards lines starting with '%' as program code
+  ##
+  ## this is for compatibility to eruby and ERB.
+  ##
+  ## this is language-independent.
+  ##
+  module PercentLineEnhancer
+    include PrefixedLineEnhancer
+
+    def self.desc   # :nodoc:
+      "regard lines starting with '%' as program code"
+    end
+
+    #--
+    #def init_generator(properties={})
+    #  super
+    #  @prefixchar = '%'
+    #  @prefixrexp = /^\%(.*?\r?\n)/
+    #end
+    #++
+
+    def add_text(src, text)
+      unless @prefixrexp
+        @prefixchar = '%'
+        @prefixrexp = /^\%(.*?\r?\n)/
+      end
+      super(src, text)
+    end
+
+  end
+
+
   ##
   ## [experimental] allow header and footer in eRuby script
   ##
@@ -1615,16 +1607,15 @@ module Erubis
       #src << " _buf << %Q`" << text << "`;"
       if text[-1] == ?\n
         text[-1] = "\\n"
-        src << " _buf << %Q`" << text << "`\n"
+        src << " #{@bufvar} << %Q`#{text}`\n"
       else
-        src << " _buf << %Q`" << text << "`;"
+        src << " #{@bufvar} << %Q`#{text}`;"
       end
     end
 
     def _add_text_to_str(str, text)
       return if !text || text.empty?
-      text.gsub!(/[`\#\\]/, '\\\\\&')
-      str << text
+      str << text.gsub(/[`\#\\]/, '\\\\\&')
     end
 
     def add_expr_escaped(str, code)
@@ -1643,8 +1634,8 @@ end
 #require 'erubis/tiny'
 #--begin of require 'erubis/engine/eruby'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -1665,6 +1656,7 @@ module Erubis
     def init_generator(properties={})
       super
       @escapefunc ||= "Erubis::XmlHelper.escape_xml"
+      @bufvar     = properties[:bufvar] || "_buf"
     end
 
     def self.supported_properties()  # :nodoc:
@@ -1681,12 +1673,12 @@ module Erubis
 
     #--
     #def add_preamble(src)
-    #  src << "_buf = [];"
+    #  src << "#{@bufvar} = [];"
     #end
     #++
 
     def add_text(src, text)
-      src << " _buf << '" << escape_text(text) << "';" unless text.empty?
+      src << " #{@bufvar} << '" << escape_text(text) << "';" unless text.empty?
     end
 
     def add_stmt(src, code)
@@ -1696,11 +1688,11 @@ module Erubis
     end
 
     def add_expr_literal(src, code)
-      src << ' _buf << (' << code << ').to_s;'
+      src << " #{@bufvar} << (" << code << ').to_s;'
     end
 
     def add_expr_escaped(src, code)
-      src << ' _buf << ' << escaped_expr(code) << ';'
+      src << " #{@bufvar} << " << escaped_expr(code) << ';'
     end
 
     def add_expr_debug(src, code)
@@ -1711,7 +1703,7 @@ module Erubis
 
     #--
     #def add_postamble(src)
-    #  src << "\n_buf.join\n"
+    #  src << "\n#{@bufvar}.join\n"
     #end
     #++
 
@@ -1778,8 +1770,8 @@ end
 
 #--begin of require 'erubis/local-setting'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 ##
@@ -1790,8 +1782,8 @@ end
 #--end of require 'erubis'
 #--begin of require 'erubis/tiny'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis
@@ -1936,8 +1928,8 @@ end
 #--end of require 'erubis/tiny'
 #--begin of require 'erubis/engine/enhanced'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/enhancer'
@@ -2040,6 +2032,11 @@ module Erubis
   end
 
 
+  class PrefixedLineEruby < Eruby
+    include PrefixedLineEnhancer
+  end
+
+
   class HeaderFooterEruby < Eruby
     include HeaderFooterEnhancer
   end
@@ -2059,8 +2056,8 @@ end
 #--end of require 'erubis/engine/enhanced'
 #--begin of require 'erubis/engine/optimized'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -2189,8 +2186,8 @@ end
 #--already included require 'erubis/engine/eruby'
 #--begin of require 'erubis/engine/ephp'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2290,8 +2287,8 @@ end
 #--end of require 'erubis/engine/ephp'
 #--begin of require 'erubis/engine/ec'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2407,10 +2404,125 @@ module Erubis
 
 end
 #--end of require 'erubis/engine/ec'
+#--begin of require 'erubis/engine/ecpp'
+##
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
+##
+
+#--already included require 'erubis/engine'
+#--already included require 'erubis/enhancer'
+
+
+module Erubis
+
+
+  module CppGenerator
+    include Generator
+
+    def self.supported_properties()  # :nodoc:
+      return [
+              [:indent, '',       "indent spaces (ex. '  ')"],
+              [:bufvar, '_buf',   "buffer variable name"],
+            ]
+    end
+
+    def init_generator(properties={})
+      super
+      @escapefunc ||= "escape"
+      @indent = properties[:indent] || ''
+      @bufvar = properties[:bufvar] || '_buf'
+    end
+
+    def add_preamble(src)
+      src << "#line 1 \"#{self.filename}\"\n" if self.filename
+    end
+
+    def escape_text(text)
+      @@table_ ||= { "\r"=>"\\r", "\n"=>"\\n", "\t"=>"\\t", '"'=>'\\"', "\\"=>"\\\\" }
+      text.gsub!(/[\r\n\t"\\]/) { |m| @@table_[m] }
+      return text
+    end
+
+    def escaped_expr(code)
+      return "#{@escapefunc}(#{code.strip})"
+    end
+
+    def add_text(src, text)
+      return if text.empty?
+      src << (src.empty? || src[-1] == ?\n ? @indent : ' ')
+      src << "_buf << "
+      i = 0
+      text.each_line do |line|
+        src << "\n" << @indent << "        " if i > 0
+        i += 1
+        src << '"' << escape_text(line) << '"'
+      end
+      src << ";"   #<< (text[-1] == ?\n ? "\n" : "")
+      src << "\n" if text[-1] == ?\n
+    end
+
+    def add_stmt(src, code)
+      src << code
+    end
+
+    def add_expr_literal(src, code)
+      src << @indent if src.empty? || src[-1] == ?\n
+      src << " _buf << (" << code.strip << ");"
+    end
+
+    def add_expr_escaped(src, code)
+      src << @indent if src.empty? || src[-1] == ?\n
+      src << ' ' << escaped_expr(code) << ';'
+    end
+
+    def add_expr_debug(src, code)
+      code.strip!
+      src << @indent if src.empty? || src[-1] == ?\n
+      src << " std::cerr << \"*** debug: #{code.gsub(/(")/, '\\\&')}=\" << (#{code});"
+    end
+
+    def add_postamble(src)
+      # empty
+    end
+
+  end
+
+
+  ##
+  ## engine for C
+  ##
+  class Ecpp < Basic::Engine
+    include CppGenerator
+  end
+
+
+  class EscapedEcpp < Ecpp
+    include EscapeEnhancer
+  end
+
+
+  #class XmlEcpp < Ecpp
+  #  include EscapeEnhancer
+  #end
+
+  class PI::Ecpp < PI::Engine
+    include CppGenerator
+
+    def init_converter(properties={})
+      @pi = 'cpp'
+      super(properties)
+    end
+
+  end
+
+
+end
+#--end of require 'erubis/engine/ecpp'
 #--begin of require 'erubis/engine/ejava'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2426,7 +2538,7 @@ module Erubis
     def self.supported_properties()   # :nodoc:
       return [
               [:indent,   '',       "indent spaces (ex. '  ')"],
-              [:buf,      '_buf',   "output buffer name"],
+              [:bufvar,   '_buf',   "output buffer variable name"],
               [:bufclass, 'StringBuffer', "output buffer class (ex. 'StringBuilder')"],
             ]
     end
@@ -2435,12 +2547,12 @@ module Erubis
       super
       @escapefunc ||= 'escape'
       @indent = properties[:indent] || ''
-      @buf = properties[:buf] || '_buf'
+      @bufvar = properties[:bufvar] || '_buf'
       @bufclass = properties[:bufclass] || 'StringBuffer'
     end
 
     def add_preamble(src)
-      src << "#{@indent}#{@bufclass} #{@buf} = new #{@bufclass}();"
+      src << "#{@indent}#{@bufclass} #{@bufvar} = new #{@bufclass}();"
     end
 
     def escape_text(text)
@@ -2451,7 +2563,7 @@ module Erubis
     def add_text(src, text)
       return if text.empty?
       src << (src.empty? || src[-1] == ?\n ? @indent : ' ')
-      src << @buf << ".append("
+      src << @bufvar << ".append("
       i = 0
       text.each_line do |line|
         src << "\n" << @indent << '          + ' if i > 0
@@ -2468,7 +2580,7 @@ module Erubis
     def add_expr_literal(src, code)
       src << @indent if src.empty? || src[-1] == ?\n
       code.strip!
-      src << " #{@buf}.append(#{code});"
+      src << " #{@bufvar}.append(#{code});"
     end
 
     def add_expr_escaped(src, code)
@@ -2483,8 +2595,8 @@ module Erubis
 
     def add_postamble(src)
       src << "\n" if src[-1] == ?;
-      src << @indent << "return " << @buf << ".toString();\n"
-      #src << @indent << "System.out.print(" << @buf << ".toString());\n"
+      src << @indent << "return " << @bufvar << ".toString();\n"
+      #src << @indent << "System.out.print(" << @bufvar << ".toString());\n"
     end
 
   end
@@ -2521,8 +2633,8 @@ end
 #--end of require 'erubis/engine/ejava'
 #--begin of require 'erubis/engine/escheme'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2637,8 +2749,8 @@ end
 #--end of require 'erubis/engine/escheme'
 #--begin of require 'erubis/engine/eperl'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2734,8 +2846,8 @@ end
 #--end of require 'erubis/engine/eperl'
 #--begin of require 'erubis/engine/ejavascript'
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2751,7 +2863,7 @@ module Erubis
     def self.supported_properties()   # :nodoc:
       list = []
       #list << [:indent,   '',       "indent spaces (ex. '  ')"]
-      #list << [:buf,      '_buf',   "output buffer name"]
+      #list << [:bufvar,      '_buf',   "output buffer variable name"]
       list << [:docwrite, true,     "use 'document.write()' when true"]
       return list
     end
@@ -2760,12 +2872,12 @@ module Erubis
       super
       @escapefunc ||= 'escape'
       @indent = properties[:indent] || ''
-      @buf = properties[:out] || '_buf'
+      @bufvar = properties[:bufvar] || '_buf'
       @docwrite = properties[:docwrite] != false  # '!= false' will be removed in the next release
     end
 
     def add_preamble(src)
-      src << "#{@indent}var #{@buf} = [];"
+      src << "#{@indent}var #{@bufvar} = [];"
     end
 
     def escape_text(text)
@@ -2780,7 +2892,7 @@ module Erubis
     def add_text(src, text)
       return if text.empty?
       add_indent(src, @indent)
-      src << @buf << '.push("'
+      src << @bufvar << '.push("'
       s = escape_text(text)
       if s[-1] == ?\n
         s[-2, 2] = ''
@@ -2797,7 +2909,7 @@ module Erubis
     def add_expr_literal(src, code)
       add_indent(src, @indent)
       code.strip!
-      src << "#{@buf}.push(#{code});"
+      src << "#{@bufvar}.push(#{code});"
     end
 
     def add_expr_escaped(src, code)
@@ -2813,9 +2925,9 @@ module Erubis
     def add_postamble(src)
       src << "\n" if src[-1] == ?;
       if @docwrite
-        src << @indent << 'document.write(' << @buf << ".join(\"\"));\n"
+        src << @indent << 'document.write(' << @bufvar << ".join(\"\"));\n"
       else
-        src << @indent << @buf << ".join(\"\");\n"
+        src << @indent << @bufvar << ".join(\"\");\n"
       end
     end
 
@@ -3069,7 +3181,7 @@ module Erubis
       buf << "  -z            : syntax checking"
       buf << "  -e            : escape (equal to '--E Escape')"
       buf << "  -p pattern    : embedded pattern (default '<% %>')"
-      buf << "  -l lang       : convert but no execute (ruby/php/c/java/scheme/perl/js)"
+      buf << "  -l lang       : convert but no execute (ruby/php/c/cpp/java/scheme/perl/js)"
       buf << "  -E e1,e2,...  : enhancer names (Escape, PercentLine, BiPattern, ...)"
       buf << "  -I path       : library include path"
       buf << "  -K kanji      : kanji code (euc/sjis/utf8) (default none)"
@@ -3107,7 +3219,7 @@ module Erubis
       list << ['(common)', common_props]
       list << ['(basic)',  basic_props - common_props]
       list << ['(pi)',     pi_props    - common_props]
-      %w[ruby php c java scheme perl javascript].each do |lang|
+      %w[ruby php c cpp java scheme perl javascript].each do |lang|
         klass = Erubis.const_get("E#{lang}")
         list << [lang, collect_supported_properties(klass) - basic_props]
       end
@@ -3322,6 +3434,32 @@ module Erubis
       return "#{filename}:#{linenum}: #{message}"
     end
 
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+      def check_syntax(filename, src)
+        require 'compiler'
+        verbose = $VERBOSE
+        msg = nil
+        begin
+          $VERBOSE = true
+          Rubinius::Compiler.compile_string(src, filename)
+        rescue SyntaxError => ex
+          ex_linenum = ex.line
+          linenum = 0
+          srcline = src.each_line do |line|
+            linenum += 1
+            break line if linenum == ex_linenum
+          end
+          msg = "#{ex.message}\n"
+          msg << srcline
+          msg << "\n" unless srcline =~ /\n\z/
+          msg << (" " * (ex.column-1)) << "^\n"
+        ensure
+          $VERBOSE = verbose
+        end
+        return msg
+      end
+    end
+
   end
 
 end