diff options
| author | murphy <murphy@rubychan.de> | 2006-10-20 15:30:17 +0000 |
|---|---|---|
| committer | murphy <murphy@rubychan.de> | 2006-10-20 15:30:17 +0000 |
| commit | 2b70af72174f3c858ac5f6b2b4fff028fe48f6ab (patch) | |
| tree | 46ef645c4a4e752a23bd61dac90ac6523a7dbe31 | |
| parent | c7eb21ded48a2a2e8298d8d22a261f3edb924c78 (diff) | |
| download | coderay-2b70af72174f3c858ac5f6b2b4fff028fe48f6ab.tar.gz | |
Fixed RHTML and NitroXHTML scanners to use new :inline_delimiter tokens.
| -rw-r--r-- | lib/coderay/scanners/nitro_xhtml.rb | 8 | ||||
| -rw-r--r-- | lib/coderay/scanners/rhtml.rb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/coderay/scanners/nitro_xhtml.rb b/lib/coderay/scanners/nitro_xhtml.rb index 19354d9..d7968cc 100644 --- a/lib/coderay/scanners/nitro_xhtml.rb +++ b/lib/coderay/scanners/nitro_xhtml.rb @@ -95,20 +95,20 @@ module Scanners delimiter = CLOSING_PAREN[start_tag[1,1]] end_tag = match[-1,1] == delimiter ? delimiter : '' tokens << [:open, :inline] - tokens << [start_tag, :delimiter] + tokens << [start_tag, :inline_delimiter] code = match[start_tag.size .. -1 - end_tag.size] @ruby_scanner.tokenize code - tokens << [end_tag, :delimiter] unless end_tag.empty? + tokens << [end_tag, :inline_delimiter] unless end_tag.empty? tokens << [:close, :inline] elsif match = scan(/#{NITRO_RUBY_BLOCK}/o) start_tag = '<?r' end_tag = match[-2,2] == '?>' ? '?>' : '' tokens << [:open, :inline] - tokens << [start_tag, :delimiter] + tokens << [start_tag, :inline_delimiter] code = match[start_tag.size .. -(end_tag.size)-1] @ruby_scanner.tokenize code - tokens << [end_tag, :delimiter] unless end_tag.empty? + tokens << [end_tag, :inline_delimiter] unless end_tag.empty? tokens << [:close, :inline] elsif entity = scan(/#{NITRO_ENTITY}/o) diff --git a/lib/coderay/scanners/rhtml.rb b/lib/coderay/scanners/rhtml.rb index 8afb727..18cc60b 100644 --- a/lib/coderay/scanners/rhtml.rb +++ b/lib/coderay/scanners/rhtml.rb @@ -51,10 +51,10 @@ module Scanners start_tag = match[/\A<%[-=]?/] end_tag = match[/-?%?>?\z/] tokens << [:open, :inline] - tokens << [start_tag, :delimiter] + tokens << [start_tag, :inline_delimiter] code = match[start_tag.size .. -1 - end_tag.size] @ruby_scanner.tokenize code - tokens << [end_tag, :delimiter] unless end_tag.empty? + tokens << [end_tag, :inline_delimiter] unless end_tag.empty? tokens << [:close, :inline] else |