coderay 1.0.0 → 1.0.0.598.pre

data/lib/coderay/scanners/delphi.rb

@@ -9,7 +9,7 @@ module Scanners
     register_for :delphi
     file_extension 'pas'
     
-    KEYWORDS = [
+    RESERVED_WORDS = [
       'and', 'array', 'as', 'at', 'asm', 'at', 'begin', 'case', 'class',
       'const', 'constructor', 'destructor', 'dispinterface', 'div', 'do',
       'downto', 'else', 'end', 'except', 'exports', 'file', 'finalization',
@@ -33,11 +33,11 @@ module Scanners
       'virtual', 'write', 'writeonly',
     ]  # :nodoc:
     
-    IDENT_KIND = WordList::CaseIgnoring.new(:ident).
-      add(KEYWORDS, :keyword).
+    IDENT_KIND = CaseIgnoringWordList.new(:ident).
+      add(RESERVED_WORDS, :reserved).
       add(DIRECTIVES, :directive)  # :nodoc:
     
-    NAME_FOLLOWS = WordList::CaseIgnoring.new(false).
+    NAME_FOLLOWS = CaseIgnoringWordList.new(false).
       add(%w(procedure function .))  # :nodoc:
     
   protected

data/lib/coderay/scanners/diff.rb

@@ -11,7 +11,7 @@ module Scanners
     
     DEFAULT_OPTIONS = {
       :highlight_code => true,
-      :inline_diff    => true,
+      :inline_diff => true,
     }
     
   protected
@@ -50,9 +50,7 @@ module Scanners
             if match = scan(/.*?(?=$|[\t\n\x00]|  \(revision)/)
               encoder.text_token match, :filename
               if options[:highlight_code]
-                file_type = FileType.fetch(match, :text)
-                file_type = :text if file_type == :diff
-                content_scanner = scanners[file_type]
+                content_scanner = scanners[FileType.fetch(match, :plaintext)]
                 content_scanner_entry_state = nil
               end
             end
@@ -69,10 +67,13 @@ module Scanners
             next unless match = scan(/.+/)
             encoder.text_token match, :plain
             state = :added
-          elsif match = scan(/\\ .*/)
-            encoder.text_token match, :comment
+          elsif match = scan(/\\ /)
+            encoder.begin_line line_kind = :change
+            encoder.text_token match, :change
+            next unless match = scan(/.+/)
+            encoder.text_token match, :plain
           elsif match = scan(/@@(?>[^@\n]*)@@/)
-            content_scanner.state = :initial unless match?(/\n\+/)
+            content_scanner.instance_variable_set(:@state, :initial) unless match?(/\n\+/)
             content_scanner_entry_state = nil
             if check(/\n|$/)
               encoder.begin_line line_kind = :change
@@ -80,7 +81,7 @@ module Scanners
               encoder.begin_group :change
             end
             encoder.text_token match[0,2], :change
-            encoder.text_token match[2...-2], :plain
+            encoder.text_token match[2...-2], :plain if match.size > 4
             encoder.text_token match[-2,2], :change
             encoder.end_group :change unless line_kind
             next unless match = scan(/.+/)
@@ -105,39 +106,36 @@ module Scanners
             encoder.begin_line line_kind = :delete
             encoder.text_token match, :delete
             if options[:inline_diff] && deleted_lines == 1 && check(/(?>.*)\n\+(?>.*)$(?!\n\+)/)
-              content_scanner_entry_state = content_scanner.state
-              skip(/(.*)\n\+(.*)$/)
-              head, deletion, insertion, tail = diff self[1], self[2]
-              pre, deleted, post = content_scanner.tokenize [head, deletion, tail], :tokens => Tokens.new
-              encoder.tokens pre
-              unless deleted.empty?
-                encoder.begin_group :eyecatcher
-                encoder.tokens deleted
-                encoder.end_group :eyecatcher
+              if content_scanner.instance_variable_defined?(:@state)
+                content_scanner_entry_state = content_scanner.instance_variable_get(:@state)
               end
+              skip(/(.*)(.*?)(.*)\n\+\1(.*)\3$/)
+              pre, deleted, post = content_scanner.tokenize [self[1], self[2], self[3]], :tokens => Tokens.new
+              encoder.tokens pre
+              encoder.begin_group :eyecatcher
+              encoder.tokens deleted
+              encoder.end_group :eyecatcher
               encoder.tokens post
               encoder.end_line line_kind
               encoder.text_token "\n", :space
               encoder.begin_line line_kind = :insert
               encoder.text_token '+', :insert
-              content_scanner.state = content_scanner_entry_state || :initial
-              pre, inserted, post = content_scanner.tokenize [head, insertion, tail], :tokens => Tokens.new
+              content_scanner.instance_variable_set(:@state, content_scanner_entry_state || :initial)
+              pre, inserted, post = content_scanner.tokenize [self[1], self[4], self[3]], :tokens => Tokens.new
               encoder.tokens pre
-              unless inserted.empty?
-                encoder.begin_group :eyecatcher
-                encoder.tokens inserted
-                encoder.end_group :eyecatcher
-              end
+              encoder.begin_group :eyecatcher
+              encoder.tokens inserted
+              encoder.end_group :eyecatcher
               encoder.tokens post
             elsif match = scan(/.*/)
               if options[:highlight_code]
-                if deleted_lines == 1
-                  content_scanner_entry_state = content_scanner.state
+                if deleted_lines == 1 && content_scanner.instance_variable_defined?(:@state)
+                  content_scanner_entry_state = content_scanner.instance_variable_get(:@state)
                 end
                 content_scanner.tokenize match, :tokens => encoder unless match.empty?
                 if !match?(/\n-/)
                   if match?(/\n\+/)
-                    content_scanner.state = content_scanner_entry_state || :initial
+                    content_scanner.instance_variable_set(:@state, content_scanner_entry_state || :initial)
                   end
                   content_scanner_entry_state = nil
                 end
@@ -179,22 +177,6 @@ module Scanners
       encoder
     end
     
-  private
-    
-    def diff a, b
-      # i will be the index of the leftmost difference from the left.
-      i_max = [a.size, b.size].min
-      i = 0
-      i += 1 while i < i_max && a[i] == b[i]
-      # j_min will be the index of the leftmost difference from the right.
-      j_min = i - i_max
-      # j will be the index of the rightmost difference from the right which
-      # does not precede the leftmost one from the left.
-      j = -1
-      j -= 1 while j >= j_min && a[j] == b[j]
-      return a[0...i], a[i..j], b[i..j], (j < -1) ? a[j+1..-1] : ''
-    end
-    
   end
   
 end

data/lib/coderay/scanners/groovy.rb

@@ -130,7 +130,7 @@ module Scanners
             if match = scan(/0[xX][0-9A-Fa-f]+/)
               encoder.text_token match, :hex
             elsif match = scan(/(?>0[0-7]+)(?![89.eEfF])/)
-              encoder.text_token match, :octal
+              encoder.text_token match, :oct
             elsif match = scan(/\d+[fFdD]|\d*\.\d+(?:[eE][+-]?\d+)?[fFdD]?|\d+[eE][+-]?\d+[fFdD]?/)
               encoder.text_token match, :float
             elsif match = scan(/\d+[lLgG]?/)
@@ -220,7 +220,7 @@ module Scanners
             encoder.text_token match, :content
             
           elsif match = scan(/ \\. /mx)
-            encoder.text_token match, :content  # TODO: Shouldn't this be :error?
+            encoder.text_token match, :content  # FIXME: Shouldn't this be :error?
             
           elsif match = scan(/ \\ | \n /x)
             encoder.end_group state

data/lib/coderay/scanners/html.rb

@@ -13,28 +13,10 @@ module Scanners
     KINDS_NOT_LOC = [
       :comment, :doctype, :preprocessor,
       :tag, :attribute_name, :operator,
-      :attribute_value, :string,
+      :attribute_value, :delimiter, :content,
       :plain, :entity, :error,
     ]  # :nodoc:
     
-    EVENT_ATTRIBUTES = %w(
-      onabort onafterprint onbeforeprint onbeforeunload onblur oncanplay
-      oncanplaythrough onchange onclick oncontextmenu oncuechange ondblclick
-      ondrag ondragdrop ondragend ondragenter ondragleave ondragover
-      ondragstart ondrop ondurationchange onemptied onended onerror onfocus
-      onformchange onforminput onhashchange oninput oninvalid onkeydown
-      onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart
-      onmessage onmousedown onmousemove onmouseout onmouseover onmouseup
-      onmousewheel onmove onoffline ononline onpagehide onpageshow onpause
-      onplay onplaying onpopstate onprogress onratechange onreadystatechange
-      onredo onreset onresize onscroll onseeked onseeking onselect onshow
-      onstalled onstorage onsubmit onsuspend ontimeupdate onundo onunload
-      onvolumechange onwaiting
-    )
-    
-    IN_ATTRIBUTE = WordList::CaseIgnoring.new(nil).
-      add(EVENT_ATTRIBUTES, :script)
-    
     ATTR_NAME = /[\w.:-]+/  # :nodoc:
     TAG_END = /\/?>/  # :nodoc:
     HEX = /[0-9a-fA-F]/  # :nodoc:
@@ -58,10 +40,10 @@ module Scanners
       '"' => /[^&">\n]+/,
     }  # :nodoc:
     
-    def reset
+    def reset  # :nodoc:
+      # FIXME: why not overwrite reset_instance?
       super
       @state = :initial
-      @plain_string_content = nil
     end
     
   protected
@@ -71,25 +53,14 @@ module Scanners
       @plain_string_content = nil
     end
     
-    def scan_java_script encoder, code
-      if code && !code.empty?
-        @java_script_scanner ||= Scanners::JavaScript.new '', :keep_tokens => true
-        # encoder.begin_group :inline
-        @java_script_scanner.tokenize code, :tokens => encoder
-        # encoder.end_group :inline
-      end
-    end
-    
     def scan_tokens encoder, options
-      state = options[:state] || @state
-      plain_string_content = @plain_string_content
-      in_tag = in_attribute = nil
       
-      encoder.begin_group :string if state == :attribute_value_string
+      state = @state
+      plain_string_content = @plain_string_content
       
       until eos?
         
-        if state != :in_special_tag && match = scan(/\s+/m)
+        if match = scan(/\s+/m)
           encoder.text_token match, :space
           
         else
@@ -97,61 +68,49 @@ module Scanners
           case state
           
           when :initial
-            if match = scan(/<!--(?:.*?-->|.*)/m)
+            if match = scan(/<!--.*?-->/m)
               encoder.text_token match, :comment
-            elsif match = scan(/<!DOCTYPE(?:.*?>|.*)/m)
+            elsif match = scan(/<!DOCTYPE.*?>/m)
               encoder.text_token match, :doctype
-            elsif match = scan(/<\?xml(?:.*?\?>|.*)/m)
+            elsif match = scan(/<\?xml.*?\?>/m)
               encoder.text_token match, :preprocessor
-            elsif match = scan(/<\?(?:.*?\?>|.*)/m)
+            elsif match = scan(/<\?.*?\?>|<%.*?%>/m)
               encoder.text_token match, :comment
-            elsif match = scan(/<\/[-\w.:]*>?/m)
-              in_tag = nil
+            elsif match = scan(/<\/[-\w.:]*>/m)
               encoder.text_token match, :tag
-            elsif match = scan(/<(?:(script)|[-\w.:]+)(>)?/m)
+            elsif match = scan(/<[-\w.:]+>?/m)
               encoder.text_token match, :tag
-              in_tag = self[1]
-              if self[2]
-                state = :in_special_tag if in_tag
-              else
-                state = :attribute
-              end
+              state = :attribute unless match[-1] == ?>
             elsif match = scan(/[^<>&]+/)
               encoder.text_token match, :plain
             elsif match = scan(/#{ENTITY}/ox)
               encoder.text_token match, :entity
             elsif match = scan(/[<>&]/)
-              in_tag = nil
               encoder.text_token match, :error
             else
               raise_inspect '[BUG] else-case reached with state %p' % [state], encoder
             end
             
           when :attribute
-            if match = scan(/#{TAG_END}/o)
+            if match = scan(/#{TAG_END}/)
               encoder.text_token match, :tag
-              in_attribute = nil
-              if in_tag
-                state = :in_special_tag
-              else
-                state = :initial
-              end
+              state = :initial
             elsif match = scan(/#{ATTR_NAME}/o)
-              in_attribute = IN_ATTRIBUTE[match]
               encoder.text_token match, :attribute_name
               state = :attribute_equal
             else
-              in_tag = nil
               encoder.text_token getch, :error
             end
             
           when :attribute_equal
-            if match = scan(/=/)  #/
+            if match = scan(/=/)
               encoder.text_token match, :operator
               state = :attribute_value
-            elsif scan(/#{ATTR_NAME}/o) || scan(/#{TAG_END}/o)
-              state = :attribute
-              next
+            elsif match = scan(/#{ATTR_NAME}/o)
+              encoder.text_token match, :attribute_name
+            elsif match = scan(/#{TAG_END}/o)
+              encoder.text_token match, :tag
+              state = :initial
             else
               encoder.text_token getch, :error
               state = :attribute
@@ -162,26 +121,11 @@ module Scanners
               encoder.text_token match, :attribute_value
               state = :attribute
             elsif match = scan(/["']/)
-              if in_attribute == :script
-                encoder.begin_group :inline
-                encoder.text_token match, :inline_delimiter
-                if scan(/javascript:[ \t]*/)
-                  encoder.text_token matched, :comment
-                end
-                code = scan_until(match == '"' ? /(?="|\z)/ : /(?='|\z)/)
-                scan_java_script encoder, code
-                match = scan(/["']/)
-                encoder.text_token match, :inline_delimiter if match
-                encoder.end_group :inline
-                state = :attribute
-                in_attribute = nil
-              else
-                encoder.begin_group :string
-                state = :attribute_value_string
-                plain_string_content = PLAIN_STRING_CONTENT[match]
-                encoder.text_token match, :delimiter
-              end
-            elsif match = scan(/#{TAG_END}/o)
+              encoder.begin_group :string
+              state = :attribute_value_string
+              plain_string_content = PLAIN_STRING_CONTENT[match]
+              encoder.text_token match, :delimiter
+            elsif scan(/#{TAG_END}/o)
               encoder.text_token match, :tag
               state = :initial
             else
@@ -205,29 +149,6 @@ module Scanners
               encoder.text_token match, :error
             end
             
-          when :in_special_tag
-            case in_tag
-            when 'script'
-              encoder.text_token match, :space if match = scan(/[ \t]*\n/)
-              if scan(/(\s*<!--)(?:(.*?)(-->)|(.*))/m)
-                code = self[2] || self[4]
-                closing = self[3]
-                encoder.text_token self[1], :comment
-              else
-                code = scan_until(/(?=(?:\n\s*)?<\/script>)|\z/)
-                closing = false
-              end
-              unless code.empty?
-                encoder.begin_group :inline
-                scan_java_script encoder, code
-                encoder.end_group :inline
-              end
-              encoder.text_token closing, :comment if closing
-              state = :initial
-            else
-              raise 'unknown special tag: %p' % [in_tag]
-            end
-            
           else
             raise_inspect 'Unknown state: %p' % [state], encoder
             
@@ -240,10 +161,12 @@ module Scanners
       if options[:keep_state]
         @state = state
         @plain_string_content = plain_string_content
+      else
+        if state == :attribute_value_string
+          encoder.end_group :string
+        end
       end
       
-      encoder.end_group :string if state == :attribute_value_string
-      
       encoder
     end
     

data/lib/coderay/scanners/java.rb

@@ -3,10 +3,9 @@ module Scanners
   
   # Scanner for Java.
   class Java < Scanner
-    
+
     register_for :java
-    
-    autoload :BuiltinTypes, 'coderay/scanners/java/builtin_types'
+    helper :builtin_types
     
     # http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html
     KEYWORDS = %w[
@@ -30,10 +29,10 @@ module Scanners
     IDENT_KIND = WordList.new(:ident).
       add(KEYWORDS, :keyword).
       add(RESERVED, :reserved).
-      add(CONSTANTS, :predefined_constant).
+      add(CONSTANTS, :pre_constant).
       add(MAGIC_VARIABLES, :local_variable).
       add(TYPES, :type).
-      add(BuiltinTypes::List, :predefined_type).
+      add(BuiltinTypes::List, :pre_type).
       add(BuiltinTypes::List.select { |builtin| builtin[/(Error|Exception)$/] }, :exception).
       add(DIRECTIVES, :directive)  # :nodoc:
 
@@ -107,7 +106,7 @@ module Scanners
             if match = scan(/0[xX][0-9A-Fa-f]+/)
               encoder.text_token match, :hex
             elsif match = scan(/(?>0[0-7]+)(?![89.eEfF])/)
-              encoder.text_token match, :octal
+              encoder.text_token match, :oct
             elsif match = scan(/\d+[fFdD]|\d*\.\d+(?:[eE][+-]?\d+)?[fFdD]?|\d+[eE][+-]?\d+[fFdD]?/)
               encoder.text_token match, :float
             elsif match = scan(/\d+[lL]?/)

data/lib/coderay/scanners/java/builtin_types.rb

@@ -3,7 +3,6 @@ module Scanners
   
   module Java::BuiltinTypes  # :nodoc:
     
-    #:nocov:
     List = %w[
       AbstractAction AbstractBorder AbstractButton AbstractCellEditor AbstractCollection
       AbstractColorChooserPanel AbstractDocument AbstractExecutorService AbstractInterruptibleChannel
@@ -413,7 +412,6 @@ module Scanners
       XPathFactoryConfigurationException XPathFunction XPathFunctionException XPathFunctionResolver
       XPathVariableResolver ZipEntry ZipException ZipFile ZipInputStream ZipOutputStream ZoneView
     ]
-    #:nocov:
     
   end
   

data/lib/coderay/scanners/java_script.rb

@@ -35,7 +35,7 @@ module Scanners
     
     IDENT_KIND = WordList.new(:ident).
       add(RESERVED_WORDS, :reserved).
-      add(PREDEFINED_CONSTANTS, :predefined_constant).
+      add(PREDEFINED_CONSTANTS, :pre_constant).
       add(MAGIC_VARIABLES, :local_variable).
       add(KEYWORDS, :keyword)  # :nodoc:
     
@@ -48,8 +48,8 @@ module Scanners
       '/' => /[^\\\/]+/,
     }  # :nodoc:
     KEY_CHECK_PATTERN = {
-      "'" => / (?> [^\\']* (?: \\. [^\\']* )* ) ' \s* : /mx,
-      '"' => / (?> [^\\"]* (?: \\. [^\\"]* )* ) " \s* : /mx,
+      "'" => / [^\\']* (?: \\.? [^\\']* )* '? \s* : /x,
+      '"' => / [^\\"]* (?: \\.? [^\\"]* )* "? \s* : /x,
     }  # :nodoc:
     
   protected
@@ -81,7 +81,7 @@ module Scanners
             if match = scan(/0[xX][0-9A-Fa-f]+/)
               encoder.text_token match, :hex
             elsif match = scan(/(?>0[0-7]+)(?![89.eEfF])/)
-              encoder.text_token match, :octal
+              encoder.text_token match, :oct
             elsif match = scan(/\d+[fF]|\d*\.\d+(?:[eE][+-]?\d+)?[fF]?|\d+[eE][+-]?\d+[fF]?/)
               encoder.text_token match, :float
             elsif match = scan(/\d+/)
@@ -89,7 +89,7 @@ module Scanners
             end
             
           elsif value_expected && match = scan(/<([[:alpha:]]\w*) (?: [^\/>]*\/> | .*?<\/\1>)/xim)
-            # TODO: scan over nested tags
+            # FIXME: scan over nested tags
             xml_scanner.tokenize match, :tokens => encoder
             value_expected = false
             next
@@ -134,7 +134,7 @@ module Scanners
             string_delimiter = match
             encoder.text_token match, :delimiter
             
-          elsif value_expected && (match = scan(/\//))
+          elsif value_expected && (match = scan(/\/(?=\S)/))
             encoder.begin_group :regexp
             state = :regexp
             string_delimiter = '/'