predefined variables and constants

pejuko · pejuko · commit 40f7e82ea010 · 2011-10-04T14:07:21.000+02:00
diff --git a/lib/coderay/scanners/bash.rb b/lib/coderay/scanners/bash.rb
@@ -56,8 +56,8 @@ class Bash < Scanner
       add(COMMANDS, :method).
       add(BASH_COMMANDS, :method).
       add(PROGRAMS, :method).
-      add(VARIABLES, :pre_type).
-      add(BASH_VARIABLES, :pre_type)
+      add(VARIABLES, :predefined).
+      add(BASH_VARIABLES, :predefined)
 
     attr_reader :state, :quote
 
@@ -126,7 +126,7 @@ def scan_tokens encoder, options
           elsif match = scan(/ \$\( [^\)]+ \) /ox)
             kind = :shell
           elsif match = scan(PRE_CONSTANTS)
-            kind = :pre_constant
+            kind = :predefined_constant
           elsif match = scan(/[^\s'"]*[A-Za-z_][A-Za-z_0-9]*\+?=/)
             match =~ /(.*?)([A-Za-z_][A-Za-z_0-9]*)(\+?=)/
             str = $1
@@ -185,7 +185,7 @@ def scan_tokens encoder, options
             next
             #kind = :symbol
           elsif match = scan(PRE_CONSTANTS)
-            kind = :pre_constant
+            kind = :predefined_constant
           elsif match = scan(/ (?: \$\(\(.*?\)\) ) /x)
             kind = :global_variable
           elsif match = scan(/ \$\{?[A-Za-z_][A-Za-z_\d]*\}? /x)
