kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

import erb-2.0.4b4

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
seki 2003-07-31 14:49:19 +00:00
parent fabe115f9b
commit 6b43c9bfbf
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Jul 31 23:44:00 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/erb.rb: import erb-2.0.4b4.
Thu Jul 31 23:02:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/etc/etc.c: revert getenv()'s prototype. use it only when _WIN32

18
lib/erb.rb
View file

@ -130,7 +130,7 @@ class ERB
end
end
ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?$)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
def explicit_trim_line(line)
line.split(ExplicitTrimRegexp).each do |token|
next if token.empty?
@ -172,8 +172,8 @@ class ERB
require 'strscan'
class SimpleScanner2 < Scanner
def scan
stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|$)/
etag_reg = /(.*?)(%%>|%>|\n|$)/
stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
etag_reg = /(.*?)(%%>|%>|\n|\z)/
scanner = StringScanner.new(@src)
while ! scanner.eos?
scanner.scan(@stag ? etag_reg : stag_reg)
@ -189,8 +189,8 @@ class ERB
class PercentScanner < Scanner
def scan
new_line = true
stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|$)/
etag_reg = /(.*?)(%%>|%>|\n|$)/
stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
etag_reg = /(.*?)(%%>|%>|\n|\z)/
scanner = StringScanner.new(@src)
while ! scanner.eos?
if new_line && @stag.nil?
@ -199,7 +199,7 @@ class ERB
new_line = false
next
elsif scanner.scan(/%/)
yield(PercentLine.new(scanner.scan(/.*?(\n|$)/).chomp))
yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
next
end
end
@ -217,8 +217,8 @@ class ERB
class ExplicitScanner < Scanner
def scan
new_line = true
stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|$)/
etag_reg = /(.*?)(%%>|-%>|%>|\n|$)/
stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
scanner = StringScanner.new(@src)
while ! scanner.eos?
if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
@ -233,7 +233,7 @@ class ERB
yield(text) unless text.empty?
if elem == '-%>'
yield('%>')
if scanner.scan(/(\n|$)/)
if scanner.scan(/(\n|\z)/)
yield(:cr)
new_line = true
end