From 4c8b5dac9d881b916a49e20401659bf107168e0b Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Thu, 16 Jun 2011 00:53:18 +0000
Subject: changed :reserved to :keyword in Ruby scanner (issue #43)

---
 lib/coderay/scanners/ruby.rb          | 2 +-
 lib/coderay/scanners/ruby/patterns.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb
index 549ae87..299accc 100644
--- a/lib/coderay/scanners/ruby.rb
+++ b/lib/coderay/scanners/ruby.rb
@@ -90,7 +90,7 @@ module Scanners
                 if match[/\A[A-Z]/] && !(match[/[!?]$/] || match?(/\(/))
                   kind = :constant
                 end
-              elsif kind == :reserved
+              elsif kind == :keyword
                 state = patterns::KEYWORD_NEW_STATE[match]
                 value_expected = true if patterns::KEYWORDS_EXPECTING_VALUE[match]
               end
diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb
index 5acb25e..a52198e 100644
--- a/lib/coderay/scanners/ruby/patterns.rb
+++ b/lib/coderay/scanners/ruby/patterns.rb
@@ -4,7 +4,7 @@ module Scanners
 
   module Ruby::Patterns  # :nodoc: all
 
-    RESERVED_WORDS = %w[
+    KEYWORDS = %w[
       and def end in or unless begin
       defined? ensure module redo super until
       BEGIN break do next rescue then
@@ -26,7 +26,7 @@ module Scanners
     ]
 
     IDENT_KIND = WordList.new(:ident).
-      add(RESERVED_WORDS, :reserved).
+      add(KEYWORDS, :keyword).
       add(PREDEFINED_CONSTANTS, :predefined_constant)
 
     KEYWORD_NEW_STATE = WordList.new(:initial).
-- 
cgit v1.2.1