coderay 0.7.4.215 → 0.8.260

data/lib/coderay/scanners/sql.Keith.rb

@@ -0,0 +1,143 @@
+# by Keith Pitt
+module CodeRay
+module Scanners
+  
+  class SQL < Scanner
+
+    register_for :sql
+    
+    include Streamable
+
+    RESERVED_WORDS = %w(
+      all alter and any as asc at authid avg begin between 
+      body bulk by case char check close cluster coalesce 
+      collect comment commit compress connect constant create
+      current currval cursor day declare default delete 
+      desc distinct do drop else elsif end exception exclusive
+      execute exists exit extends extract fetch for forall 
+      from function goto group having heap hour if immediate in 
+      index indicator insert interface intersect
+      interval into is isolation java level like limited lock
+      loop max min minus minute mlslabel mod mode month natural 
+      naturaln new nextval nocopy not nowait null nullif
+      number_base ocirowid of on opaque open operator option or 
+      order organization others out package partition pctfree 
+      pls_integer positive positiven pragma prior private procedure 
+      public raise range raw real record ref release return reverse 
+      rollback row rowid rownum rowtype savepoint second select
+      separate set share space sql sqlcode sqlerrm start 
+      stddev subtype successful sum synonym sysdate table then
+      timezone_region timezone_abbr timezone_minute 
+      to trigger true type uid union unique update 
+      use user validate values variance view when 
+      whenever where while with work write year zone
+    )
+
+    PREDEFINED_TYPES = %w(
+      array bigint bit binary blob boolean binary_integer char
+      character clob date decimal double float char_base
+      int integer nchar nclob smallint timestamp long number
+      timestamp_hour timestamp_minute varchar varying smallint
+      varchar2 nvarchar money time
+    )
+
+    PREDEFINED_CONSTANTS = %w(
+      NULL true false
+    )
+
+    IDENT_KIND = CaseIgnoringWordList.new(:ident).
+      add(RESERVED_WORDS, :reserved).
+      add(PREDEFINED_TYPES, :pre_type).
+      add(PREDEFINED_CONSTANTS, :pre_constant)
+
+    def scan_tokens tokens, options
+
+      state = :initial
+      
+      until eos?
+
+        kind = nil
+        match = nil
+        
+        case state
+
+        when :initial
+
+          if scan(/ \s+ | \\\n /x)
+            kind = :space
+
+          elsif scan(%r! -- [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) !mx)
+            kind = :comment
+
+          elsif scan(/ [-+*\/=<>?:;,!&^|()~%]+ | \.(?!\d) /x)
+            kind = :operator
+
+          elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
+            kind = IDENT_KIND[match]
+            if kind == :ident and check(/:(?!:)/)
+              match << scan(/:/)
+              kind = :label
+            end
+
+          elsif match = scan(/'/)
+            tokens << [:open, :string]
+            state = :string
+            kind = :delimiter
+
+          elsif scan(/(?:\d+)(?![.eEfF])/)
+            kind = :integer
+
+          elsif scan(/\d[fF]?|\d*\.\d+(?:[eE][+-]?\d+)?[fF]?|\d+[eE][+-]?\d+[fF]?/)
+            kind = :float
+
+          else
+            getch
+            kind = :error
+
+          end
+
+        when :string
+          if scan(/[^\\\n']+/)
+            kind = :content
+          elsif scan(/'/)
+            tokens << ["'", :delimiter]
+            tokens << [:close, :string]
+            state = :initial
+            next
+          elsif scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox)
+            kind = :char
+          elsif scan(/ \\ | $ /x)
+            tokens << [:close, :string]
+            kind = :error
+            state = :initial
+          else
+            raise_inspect "else case \" reached; %p not handled." % peek(1), tokens
+          end
+
+        else
+          raise_inspect 'Unknown state', tokens
+
+        end
+
+        match ||= matched
+        if $DEBUG and not kind
+          raise_inspect 'Error token %p in line %d' %
+            [[match, kind], line], tokens
+        end
+        raise_inspect 'Empty token', tokens unless match
+
+        tokens << [match, kind]
+
+      end
+
+      if state == :string
+        tokens << [:close, :string]
+      end
+
+      tokens
+    end
+
+  end
+
+end
+end

data/lib/coderay/scanners/sql.rb

@@ -0,0 +1,154 @@
+# by Josh Goebel
+module CodeRay module Scanners
+  
+  class SQL < Scanner
+
+    register_for :sql
+    
+    RESERVED_WORDS = %w(
+      create table index trigger drop primary key set select
+      insert update delete replace into
+      on from values before and or if exists case when
+      then else as group order by avg where
+      join inner outer union engine not
+      like
+    )
+    
+    PREDEFINED_TYPES = %w(
+      char varchar enum binary text tinytext mediumtext
+      longtext blob tinyblob mediumblob longblob timestamp
+      date time datetime year double decimal float int
+      integer tinyint mediumint bigint smallint unsigned bit
+      bool boolean
+    )
+    
+    PREDEFINED_FUNCTIONS = %w( sum cast abs pi count min max avg )
+    
+    DIRECTIVES = %w( auto_increment unique default charset )
+
+    PREDEFINED_CONSTANTS = %w( null true false )
+    
+    IDENT_KIND = CaseIgnoringWordList.new(:ident).
+      add(RESERVED_WORDS, :reserved).
+      add(PREDEFINED_TYPES, :pre_type).
+      add(PREDEFINED_CONSTANTS, :pre_constant).
+      add(PREDEFINED_FUNCTIONS, :predefined).
+      add(DIRECTIVES, :directive)
+    
+    ESCAPE = / [rbfnrtv\n\\\/'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x
+    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x
+
+    def scan_tokens tokens, options
+
+      state = :initial
+      string_type = nil
+      string_content = ''
+
+      until eos?
+
+        kind = nil
+        match = nil
+
+        if state == :initial
+          
+          if scan(/ \s+ | \\\n /x)
+            kind = :space
+          
+          elsif scan(/^(?:--\s|#).*/)
+            kind = :comment
+
+          elsif scan(%r! /\* (?: .*? \*/ | .* ) !mx)
+            kind = :comment
+
+          elsif scan(/ [-+*\/=<>;,!&^|()\[\]{}~%] | \.(?!\d) /x)
+            kind = :operator
+            
+          elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
+            kind = IDENT_KIND[match.downcase]
+            
+          elsif match = scan(/[`"']/)
+            tokens << [:open, :string]
+            string_type = matched
+            state = :string
+            kind = :delimiter
+            
+          elsif scan(/0[xX][0-9A-Fa-f]+/)
+            kind = :hex
+            
+          elsif scan(/0[0-7]+(?![89.eEfF])/)
+            kind = :oct
+            
+          elsif scan(/\d+(?![.eEfF])/)
+            kind = :integer
+            
+          elsif scan(/\d[fF]?|\d*\.\d+(?:[eE][+-]?\d+)?[fF]?|\d+[eE][+-]?\d+[fF]?/)
+            kind = :float
+
+          else
+            getch
+            kind = :error
+            
+          end
+          
+        elsif state == :string
+          if match = scan(/[^\\"'`]+/)
+            string_content << match
+            next
+          elsif match = scan(/["'`]/)
+            if string_type == match
+              if peek(1) == string_type  # doubling means escape
+                string_content << string_type << getch
+                next
+              end
+              unless string_content.empty?
+                tokens << [string_content, :content]
+                string_content = ''
+              end
+              tokens << [matched, :delimiter]
+              tokens << [:close, :string]
+              state = :initial
+              string_type = nil
+              next
+            else
+              string_content << match
+            end
+            next
+          elsif scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox)
+            unless string_content.empty?
+              tokens << [string_content, :content]
+              string_content = ''
+            end
+            kind = :char
+          elsif match = scan(/ \\ . /mox)
+            string_content << match
+            next
+          elsif scan(/ \\ | $ /x)
+            unless string_content.empty?
+              tokens << [string_content, :content]
+              string_content = ''
+            end
+            kind = :error
+            state = :initial
+          else
+            raise "else case \" reached; %p not handled." % peek(1), tokens
+          end
+          
+        else
+          raise 'else-case reached', tokens
+          
+        end
+        
+        match ||= matched
+#        raise [match, kind], tokens if kind == :error
+        
+        tokens << [match, kind]
+        
+      end
+#      RAILS_DEFAULT_LOGGER.info tokens.inspect
+      tokens
+      
+    end
+
+  end
+
+end end

data/lib/coderay/scanners/xml.rb

@@ -11,6 +11,7 @@ module Scanners
   class XML < HTML
 
     register_for :xml
+    file_extension 'xml'
 
   end
 

data/lib/coderay/styles/cycnus.rb

@@ -42,12 +42,15 @@ ol.CodeRay li { white-space: pre }
     MAIN
 
     TOKEN_COLORS = <<-'TOKENS'
+.debug { color:white ! important; background:blue ! important; }
+
 .af { color:#00C }
 .an { color:#007 }
+.at { color:#f08 }
 .av { color:#700 }
 .aw { color:#C00 }
 .bi { color:#509; font-weight:bold }
-.c  { color:#888 }
+.c  { color:#666; }
 
 .ch { color:#04D }
 .ch .k { color:#04D }
@@ -78,18 +81,25 @@ ol.CodeRay li { white-space: pre }
 .il .il .il { background: #ccc }
 .il .idl { font-weight: bold; color: #888 }
 
+.im { color:#f00; }
 .in { color:#B2B; font-weight:bold }
 .iv { color:#33B }
 .la { color:#970; font-weight:bold }
 .lv { color:#963 }
 .oc { color:#40E; font-weight:bold }
-.on { color:#000; font-weight:bold }
+.of { color:#000; font-weight:bold }
 .op { }
 .pc { color:#038; font-weight:bold }
 .pd { color:#369; font-weight:bold }
-.pp { color:#579 }
+.pp { color:#579; }
+.ps { color:#00C; font-weight: bold; }
 .pt { color:#339; font-weight:bold }
-.r  { color:#080; font-weight:bold }
+.r, .kw  { color:#080; font-weight:bold }
+
+.ke { color: #808; }
+.ke .dl { color: #606; }
+.ke .ch { color: #80f; }
+.vl { color: #088; }
 
 .rx { background-color:#fff0ff }
 .rx .k { color:#808 }
@@ -97,11 +107,12 @@ ol.CodeRay li { white-space: pre }
 .rx .mod { color:#C2C }
 .rx .fu  { color:#404; font-weight: bold }
 
-.s  { background-color:#fff0f0 }
-.s  .s { background-color:#ffe0e0 }
-.s  .s  .s { background-color:#ffd0d0 }
-.s  .k { color:#D20 }
-.s  .dl { color:#710 }
+.s { background-color:#fff0f0 }
+.s .s { background-color:#ffe0e0 }
+.s .s  .s { background-color:#ffd0d0 }
+.s .k { color: #D20; }
+.s .ch { color: #b0b; }
+.s .dl { color: #710; }
 
 .sh { background-color:#f0fff0 }
 .sh .k { color:#2B2 }
@@ -117,6 +128,16 @@ ol.CodeRay li { white-space: pre }
 .ty { color:#339; font-weight:bold }
 .v  { color:#036 }
 .xt { color:#444 }
+
+.ins { background: #afa; }
+.del { background: #faa; }
+.chg { color: #aaf; background: #007; }
+.head { color: #f8f; background: #505 }
+
+.ins .ins { color: #080; font-weight:bold }
+.del .del { color: #800; font-weight:bold }
+.chg .chg { color: #66f; }
+.head .head { color: #f4f; }
     TOKENS
 
   end

data/lib/coderay/styles/murphy.rb

@@ -47,7 +47,7 @@ ol.CodeRay li { white-space: pre; }
 .av { color:#700; }
 .aw { color:#C00; }
 .bi { color:#509; font-weight:bold; }
-.c  { color:#666; }
+.c  { color:#555; background-color: black; }
 
 .ch { color:#88F; }
 .ch .k { color:#04D; }
@@ -77,13 +77,16 @@ ol.CodeRay li { white-space: pre; }
 .la { color:#970; font-weight:bold; }
 .lv { color:#963; }
 .oc { color:#40E; font-weight:bold; }
-.on { color:#000; font-weight:bold; }
+.of { color:#000; font-weight:bold; }
 .op { }
 .pc { color:#08f; font-weight:bold; }
 .pd { color:#369; font-weight:bold; }
 .pp { color:#579; }
 .pt { color:#66f; font-weight:bold; }
 .r  { color:#5de; font-weight:bold; }
+.r, .kw  { color:#5de; font-weight:bold }
+
+.ke { color: #808; }
 
 .rx { background-color:#221133; }
 .rx .k { color:#f8f; }
@@ -111,6 +114,16 @@ ol.CodeRay li { white-space: pre; }
 .ty { color:#339; font-weight:bold; }
 .v  { color:#036; }
 .xt { color:#444; }
+
+.ins { background: #afa; }
+.del { background: #faa; }
+.chg { color: #aaf; background: #007; }
+.head { color: #f8f; background: #505 }
+
+.ins .ins { color: #080; font-weight:bold }
+.del .del { color: #800; font-weight:bold }
+.chg .chg { color: #66f; }
+.head .head { color: #f4f; }
     TOKENS
 
   end

data/lib/coderay/{encoders/html/classes.rb → token_classes.rb}

@@ -1,12 +1,10 @@
 module CodeRay
-module Encoders
-
-  class HTML
-
+  class Tokens
     ClassOfKind = Hash.new do |h, k|
       h[k] = k.to_s
     end
     ClassOfKind.update with = {
+      :annotation => 'at',
       :attribute_name => 'an',
       :attribute_name_fat => 'af',
       :attribute_value => 'av',
@@ -32,21 +30,25 @@ module Encoders
       :function => 'fu',
       :global_variable => 'gv',
       :hex => 'hx',
+      :important => 'im',
       :include => 'ic',
       :inline => 'il',
       :inline_delimiter => 'idl',
       :instance_variable => 'iv',
       :integer => 'i',
       :interpreted => 'in',
+      :keyword => 'kw',
+      :key => 'ke',
       :label => 'la',
       :local_variable => 'lv',
       :modifier => 'mod',
       :oct => 'oc',
-      :operator_name => 'on',
+      :operator_fat => 'of',
       :pre_constant => 'pc',
       :pre_type => 'pt',
       :predefined => 'pd',
       :preprocessor => 'pp',
+      :pseudo_class => 'ps',
       :regexp => 'rx',
       :reserved => 'r',
       :shell => 'sh',
@@ -57,7 +59,13 @@ module Encoders
       :tag_special => 'ts',
       :type => 'ty',
       :variable => 'v',
+      :value => 'vl',
       :xml_text => 'xt',
+      
+      :insert => 'ins',
+      :delete => 'del',
+      :change => 'chg',
+      :head => 'head',
 
       :ident => :NO_HIGHLIGHT, # 'id'
       #:operator => 'op',
@@ -70,8 +78,5 @@ module Encoders
     ClassOfKind[:nesting_delimiter] = ClassOfKind[:delimiter]
     ClassOfKind[:escape] = ClassOfKind[:delimiter]
     #ClassOfKind.default = ClassOfKind[:error] or raise 'no class found for :error!'
-
   end
-
-end
-end
+end