summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners/html.rb
diff options
context:
space:
mode:
authormurphy <murphy@rubychan.de>2009-10-19 17:34:39 +0000
committermurphy <murphy@rubychan.de>2009-10-19 17:34:39 +0000
commit9eba0c7decb383e3ef73a3fee375e725442cde56 (patch)
tree0e88e051c045bb2a7c5db6020024d8c47466676f /lib/coderay/scanners/html.rb
parenteada01e24c1402c6e390579d60ca174f15e74f6b (diff)
downloadcoderay-9eba0c7decb383e3ef73a3fee375e725442cde56.tar.gz
Updating scanners: Ruby 1.9 warnings, KINDS_NOT_LOC
* Also, DATABASE is a SQL keyword.
Diffstat (limited to 'lib/coderay/scanners/html.rb')
-rw-r--r--lib/coderay/scanners/html.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb
index 1f4d8fe..d59fa69 100644
--- a/lib/coderay/scanners/html.rb
+++ b/lib/coderay/scanners/html.rb
@@ -6,6 +6,13 @@ module Scanners
include Streamable
register_for :html
+
+ KINDS_NOT_LOC = [
+ :comment, :doctype, :preprocessor,
+ :tag, :attribute_name, :operator,
+ :attribute_value, :delimiter, :content,
+ :plain, :entity, :error
+ ]
ATTR_NAME = /[\w.:-]+/
ATTR_VALUE_UNQUOTED = ATTR_NAME
@@ -68,9 +75,9 @@ module Scanners
kind = :preprocessor
elsif scan(/<\?.*?\?>|<%.*?%>/m)
kind = :comment
- elsif scan(/<\/[-\w_.:]*>/m)
+ elsif scan(/<\/[-\w.:]*>/m)
kind = :tag
- elsif match = scan(/<[-\w_.:]+>?/m)
+ elsif match = scan(/<[-\w.:]+>?/m)
kind = :tag
state = :attribute unless match[-1] == ?>
elsif scan(/[^<>&]+/)