From 00966d3cd17d5c9f07990d3e9628767ac5a867b6 Mon Sep 17 00:00:00 2001 From: murphy Date: Sun, 28 Jun 2009 05:30:59 +0000 Subject: Renamed TokenFilter to TokenClassFilter. --- lib/coderay/encoders/comment_filter.rb | 6 +++--- lib/coderay/encoders/token_class_filter.rb | 31 ++++++++++++++++++++++++++++++ lib/coderay/encoders/token_filter.rb | 31 ------------------------------ 3 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 lib/coderay/encoders/token_class_filter.rb delete mode 100644 lib/coderay/encoders/token_filter.rb (limited to 'lib/coderay') diff --git a/lib/coderay/encoders/comment_filter.rb b/lib/coderay/encoders/comment_filter.rb index e30c664..62de696 100644 --- a/lib/coderay/encoders/comment_filter.rb +++ b/lib/coderay/encoders/comment_filter.rb @@ -1,13 +1,13 @@ module CodeRay module Encoders - load :token_filter + load :token_class_filter - class CommentFilter < TokenFilter + class CommentFilter < TokenClassFilter register_for :comment_filter - DEFAULT_OPTIONS = TokenFilter::DEFAULT_OPTIONS.merge \ + DEFAULT_OPTIONS = TokenClassFilter::DEFAULT_OPTIONS.merge \ :exclude => [:comment] end diff --git a/lib/coderay/encoders/token_class_filter.rb b/lib/coderay/encoders/token_class_filter.rb new file mode 100644 index 0000000..69e7c82 --- /dev/null +++ b/lib/coderay/encoders/token_class_filter.rb @@ -0,0 +1,31 @@ +module CodeRay +module Encoders + + load :filter + + class TokenClassFilter < Filter + + include Streamable + register_for :token_class_filter + + DEFAULT_OPTIONS = { + :exclude => [], + :include => :all + } + + protected + def setup options + super + @exclude = options[:exclude] + @include = options[:include] + end + + def text_token text, kind + [text, kind] if !@exclude.include?(kind) && + (@include == :all || @include.include?(kind)) + end + + end + +end +end diff --git a/lib/coderay/encoders/token_filter.rb b/lib/coderay/encoders/token_filter.rb deleted file mode 100644 index 665587b..0000000 --- a/lib/coderay/encoders/token_filter.rb +++ /dev/null @@ -1,31 +0,0 @@ -module CodeRay -module Encoders - - load :filter - - class TokenFilter < Filter - - include Streamable - register_for :token_filter - - DEFAULT_OPTIONS = { - :exclude => [], - :include => :all - } - - protected - def setup options - super - @exclude = options[:exclude] - @include = options[:include] - end - - def text_token text, kind - [text, kind] if !@exclude.include?(kind) && - (@include == :all || @include.include?(kind)) - end - - end - -end -end -- cgit v1.2.1