From f94c46a7454c50311654579c90108ea8de4ef07f Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 25 Jun 2008 04:44:32 +0000
Subject: * lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.

* lib/erb.rb (ERB::Compiler#compile): fix for broken input.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/erb.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/erb.rb b/lib/erb.rb
index e1f0782855..d48d00ac3e 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -486,10 +486,10 @@ class ERB
     end
 
     class Buffer # :nodoc:
-      def initialize(compiler)
+      def initialize(compiler, enc=nil)
 	@compiler = compiler
 	@line = []
-	@script = ""
+        @script = enc ? "#coding:#{enc.to_s}\n" : ""
 	@compiler.pre_cmd.each do |x|
 	  push(x)
 	end
@@ -517,11 +517,10 @@ class ERB
     end
 
     def compile(s)
-      out = Buffer.new(self)
-      out.push("# -*- coding: #{s.encoding} -*-\n")
+      out = Buffer.new(self, s.encoding)
 
       content = ''
-      scanner = make_scanner(s)
+      scanner = make_scanner(s.dup.force_encoding("ASCII-8BIT"))
       scanner.scan do |token|
 	if scanner.stag.nil?
 	  case token
-- 
cgit v1.2.3