summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners
diff options
context:
space:
mode:
Diffstat (limited to 'lib/coderay/scanners')
-rw-r--r--lib/coderay/scanners/c.rb4
-rw-r--r--lib/coderay/scanners/clojure.rb4
-rw-r--r--lib/coderay/scanners/cpp.rb4
-rw-r--r--lib/coderay/scanners/java.rb4
-rw-r--r--lib/coderay/scanners/java_script.rb2
-rw-r--r--lib/coderay/scanners/php.rb6
-rw-r--r--lib/coderay/scanners/python.rb2
-rw-r--r--lib/coderay/scanners/ruby/patterns.rb2
-rw-r--r--lib/coderay/scanners/scheme.rb2
-rw-r--r--lib/coderay/scanners/sql.rb6
10 files changed, 18 insertions, 18 deletions
diff --git a/lib/coderay/scanners/c.rb b/lib/coderay/scanners/c.rb
index 9f33074..03bc1b9 100644
--- a/lib/coderay/scanners/c.rb
+++ b/lib/coderay/scanners/c.rb
@@ -32,9 +32,9 @@ module Scanners
IDENT_KIND = WordList.new(:ident).
add(RESERVED_WORDS, :reserved).
- add(PREDEFINED_TYPES, :pre_type).
+ add(PREDEFINED_TYPES, :predefined_type).
add(DIRECTIVES, :directive).
- add(PREDEFINED_CONSTANTS, :pre_constant) # :nodoc:
+ add(PREDEFINED_CONSTANTS, :predefined_constant) # :nodoc:
ESCAPE = / [rbfntv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x # :nodoc:
UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x # :nodoc:
diff --git a/lib/coderay/scanners/clojure.rb b/lib/coderay/scanners/clojure.rb
index a16abdc..4d7ff3e 100644
--- a/lib/coderay/scanners/clojure.rb
+++ b/lib/coderay/scanners/clojure.rb
@@ -84,7 +84,7 @@ module CodeRay
IDENT_KIND = CaseIgnoringWordList.new(:ident).
add(SPECIAL_FORMS, :reserved).
add(CORE_FORMS, :reserved).
- add(PREDEFINED_CONSTANTS, :pre_constant)
+ add(PREDEFINED_CONSTANTS, :predefined_constant)
BASIC_IDENTIFIER = /[a-zA-Z$%*\/_+!?&<>\-=][a-zA-Z0-9$&*+!\/_?<>\-\#]*/
IDENTIFIER = /(?:[@']?(?:#{BASIC_IDENTIFIER}\.)*#{BASIC_IDENTIFIER}(?:\/#{BASIC_IDENTIFIER})?\.?)|\.\.?/
@@ -154,7 +154,7 @@ module CodeRay
elsif match = scan(/\#\\(?:newline|space|.?)/)
encoder.text_token match, :char
elsif match = scan(/\#[ft]/)
- encoder.text_token match, :pre_constant
+ encoder.text_token match, :predefined_constant
elsif match = scan(/#{IDENTIFIER}/o)
encoder.text_token match, ident_kind[matched]
elsif match = scan(/#{SYMBOL}/o)
diff --git a/lib/coderay/scanners/cpp.rb b/lib/coderay/scanners/cpp.rb
index cb79768..10b4c04 100644
--- a/lib/coderay/scanners/cpp.rb
+++ b/lib/coderay/scanners/cpp.rb
@@ -41,10 +41,10 @@ module Scanners
IDENT_KIND = WordList.new(:ident).
add(RESERVED_WORDS, :reserved).
- add(PREDEFINED_TYPES, :pre_type).
+ add(PREDEFINED_TYPES, :predefined_type).
add(PREDEFINED_VARIABLES, :local_variable).
add(DIRECTIVES, :directive).
- add(PREDEFINED_CONSTANTS, :pre_constant) # :nodoc:
+ add(PREDEFINED_CONSTANTS, :predefined_constant) # :nodoc:
ESCAPE = / [rbfntv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x # :nodoc:
UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x # :nodoc:
diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb
index ef3d8f8..0ad8a41 100644
--- a/lib/coderay/scanners/java.rb
+++ b/lib/coderay/scanners/java.rb
@@ -30,10 +30,10 @@ module Scanners
IDENT_KIND = WordList.new(:ident).
add(KEYWORDS, :keyword).
add(RESERVED, :reserved).
- add(CONSTANTS, :pre_constant).
+ add(CONSTANTS, :predefined_constant).
add(MAGIC_VARIABLES, :local_variable).
add(TYPES, :type).
- add(BuiltinTypes::List, :pre_type).
+ add(BuiltinTypes::List, :predefined_type).
add(BuiltinTypes::List.select { |builtin| builtin[/(Error|Exception)$/] }, :exception).
add(DIRECTIVES, :directive) # :nodoc:
diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
index 68bf786..9ebda6f 100644
--- a/lib/coderay/scanners/java_script.rb
+++ b/lib/coderay/scanners/java_script.rb
@@ -35,7 +35,7 @@ module Scanners
IDENT_KIND = WordList.new(:ident).
add(RESERVED_WORDS, :reserved).
- add(PREDEFINED_CONSTANTS, :pre_constant).
+ add(PREDEFINED_CONSTANTS, :predefined_constant).
add(MAGIC_VARIABLES, :local_variable).
add(KEYWORDS, :keyword) # :nodoc:
diff --git a/lib/coderay/scanners/php.rb b/lib/coderay/scanners/php.rb
index 7f09de9..ed1095e 100644
--- a/lib/coderay/scanners/php.rb
+++ b/lib/coderay/scanners/php.rb
@@ -183,12 +183,12 @@ module Scanners
IDENT_KIND = CaseIgnoringWordList.new(:ident).
add(KEYWORDS, :reserved).
- add(TYPES, :pre_type).
+ add(TYPES, :predefined_type).
add(LANGUAGE_CONSTRUCTS, :reserved).
add(BUILTIN_FUNCTIONS, :predefined).
- add(CLASSES, :pre_constant).
+ add(CLASSES, :predefined_constant).
add(EXCEPTIONS, :exception).
- add(CONSTANTS, :pre_constant)
+ add(CONSTANTS, :predefined_constant)
VARIABLE_KIND = WordList.new(:local_variable).
add(PREDEFINED, :predefined)
diff --git a/lib/coderay/scanners/python.rb b/lib/coderay/scanners/python.rb
index 56b9ae6..f0504c7 100644
--- a/lib/coderay/scanners/python.rb
+++ b/lib/coderay/scanners/python.rb
@@ -58,7 +58,7 @@ module Scanners
add(KEYWORDS, :keyword).
add(OLD_KEYWORDS, :old_keyword).
add(PREDEFINED_METHODS_AND_TYPES, :predefined).
- add(PREDEFINED_VARIABLES_AND_CONSTANTS, :pre_constant).
+ add(PREDEFINED_VARIABLES_AND_CONSTANTS, :predefined_constant).
add(PREDEFINED_EXCEPTIONS, :exception) # :nodoc:
NAME = / [^\W\d] \w* /x # :nodoc:
diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb
index 9effc9a..5acb25e 100644
--- a/lib/coderay/scanners/ruby/patterns.rb
+++ b/lib/coderay/scanners/ruby/patterns.rb
@@ -27,7 +27,7 @@ module Scanners
IDENT_KIND = WordList.new(:ident).
add(RESERVED_WORDS, :reserved).
- add(PREDEFINED_CONSTANTS, :pre_constant)
+ add(PREDEFINED_CONSTANTS, :predefined_constant)
KEYWORD_NEW_STATE = WordList.new(:initial).
add(%w[ def ], :def_expected).
diff --git a/lib/coderay/scanners/scheme.rb b/lib/coderay/scanners/scheme.rb
index c29641e..e2c36e6 100644
--- a/lib/coderay/scanners/scheme.rb
+++ b/lib/coderay/scanners/scheme.rb
@@ -90,7 +90,7 @@ module CodeRay
elsif match = scan(/#\\(?:newline|space|.?)/)
encoder.text_token match, :char
elsif match = scan(/#[ft]/)
- encoder.text_token match, :pre_constant
+ encoder.text_token match, :predefined_constant
elsif match = scan(/#{IDENTIFIER}/o)
encoder.text_token match, ident_kind[matched]
elsif match = scan(/\./)
diff --git a/lib/coderay/scanners/sql.rb b/lib/coderay/scanners/sql.rb
index effaa94..392866e 100644
--- a/lib/coderay/scanners/sql.rb
+++ b/lib/coderay/scanners/sql.rb
@@ -41,8 +41,8 @@ module CodeRay module Scanners
add(RESERVED_WORDS, :reserved).
add(OBJECTS, :type).
add(COMMANDS, :class).
- add(PREDEFINED_TYPES, :pre_type).
- add(PREDEFINED_CONSTANTS, :pre_constant).
+ add(PREDEFINED_TYPES, :predefined_type).
+ add(PREDEFINED_CONSTANTS, :predefined_constant).
add(PREDEFINED_FUNCTIONS, :predefined).
add(DIRECTIVES, :directive)
@@ -99,7 +99,7 @@ module CodeRay module Scanners
encoder.text_token match, :float
elsif match = scan(/\\N/)
- encoder.text_token match, :pre_constant
+ encoder.text_token match, :predefined_constant
else
encoder.text_token getch, :error
View Lorry Controller Status