coderay 0.7.4.196 → 0.7.4.215

data/README

@@ -18,13 +18,12 @@ And with line numbers.
 * is what everybody should have on their website
 * solves all your problems and makes the girls run after you
 
-Version: 0.7.2 (2006.july.11)
+Version: 0.7.4 (2006.october.20)
 Author:: murphy (Kornelius Kalnbach)
 Contact:: murphy rubychan de
 Website:: coderay.rubychan.de[http://coderay.rubychan.de]
-Old Website:: rd.cYcnus.de/coderay[http://rd.cYcnus.de/coderay]
 License:: GNU LGPL; see LICENSE file in the main directory.
-Subversion:: $Id: README 195 2006-10-18 10:32:41Z murphy $
+Subversion:: $Id: README 206 2006-10-19 19:46:56Z murphy $
 
 -----
 
@@ -42,7 +41,7 @@ Since CodeRay is still in beta stage, nightly buildy may be useful:
 === Dependencies
 
 CodeRay needs Ruby 1.8 and the strscan[http://www.ruby-doc.org/stdlib/libdoc/strscan/rdoc/index.htm] library
-(part of the standard library.)
+(part of the standard library.)  It should also run with Ruby 1.9 and yarv.
 
 
 == Example Usage

data/bin/coderay

@@ -13,7 +13,7 @@ begin
 
   if ARGV.empty?
     puts <<-USAGE
-CodeRay #{CodeRay::Version} (http://rd.cYcnus.de/coderay)
+CodeRay #{CodeRay::VERSION} (http://rd.cYcnus.de/coderay)
 Usage:
   coderay -<lang> [-<format>] < file > output
   coderay file [-<format>]
@@ -72,6 +72,6 @@ rescue => boom
   err "Error: #{boom.message}\n"
   err boom.backtrace
   err '-' * 50
-  err ARGV.options
+  err ARGV
   exit 1
 end

data/lib/coderay.rb

@@ -1,6 +1,6 @@
 # = CodeRay Library
 #
-# $Id: coderay.rb 188 2006-10-17 11:18:01Z murphy $
+# $Id: coderay.rb 213 2006-10-20 07:12:31Z murphy $
 #
 # CodeRay is a Ruby library for syntax highlighting.
 #
@@ -170,7 +170,7 @@ module CodeRay
     def scan_file filename, lang = :auto, options = {}, &block
       file = IO.read filename
       if lang == :auto
-        require 'coderay/helpers/filetype'
+        require 'coderay/helpers/file_type'
         lang = FileType.fetch filename, :plaintext, true
       end
       scan file, lang, options = {}, &block

data/lib/coderay/encoders/html.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module CodeRay
 module Encoders
 
@@ -10,7 +12,8 @@ module Encoders
   #
   #  require 'coderay'
   #  puts CodeRay.scan('Some /code/', :ruby).html  #-> a HTML page
-  #  puts CodeRay.scan('Some /code/', :ruby).html(:wrap => :span) #-> <span class="CodeRay"><span class="co">Some</span> /code/</span>
+  #  puts CodeRay.scan('Some /code/', :ruby).html(:wrap => :span)
+  #  #-> <span class="CodeRay"><span class="co">Some</span> /code/</span>
   #  puts CodeRay.scan('Some /code/', :ruby).span  #-> the same
   #  
   #  puts CodeRay.scan('Some code', :ruby).html(
@@ -55,7 +58,8 @@ module Encoders
   #
   # === :hint
   # Include some information into the output using the title attribute.
-  # Can be :info (show token type on mouse-over), :info_long (with full path) or :debug (via inspect).
+  # Can be :info (show token type on mouse-over), :info_long (with full path)
+  # or :debug (via inspect).
   #
   # Default: false
   class HTML < Encoder
@@ -115,6 +119,10 @@ module Encoders
         end
     }
 
+    TRANSPARENT_TOKEN_KINDS = Set[
+      :delimiter, :modifier, :content, :escape, :inline_delimiter,
+    ]
+
     # Generate a hint about the given +classes+ in a +hint+ style.
     #
     # +hint+ may be :info, :info_long or :debug.
@@ -143,7 +151,8 @@ module Encoders
 
       hint = options[:hint]
       if hint and not [:debug, :info, :info_long].include? hint
-        raise ArgumentError, "Unknown value %p for :hint; expected :info, :debug, false or nil." % hint
+        raise ArgumentError, "Unknown value %p for :hint; \
+          expected :info, :debug, false, or nil." % hint
       end
 
       case options[:css]
@@ -176,9 +185,8 @@ module Encoders
           if classes.first == :NO_HIGHLIGHT and not hint
             h[k] = false
           else
-            styles.shift if [:delimiter, :modifier, :content, :escape].include? styles.first
+            styles.shift if TRANSPARENT_TOKEN_KINDS.include? styles.first
             title = HTML.token_path_to_hint hint, styles
-            classes.delete 'il'
             style = @css[*classes]
             h[k] =
               if style
@@ -198,7 +206,9 @@ module Encoders
     def finish options
       not_needed = @opened.shift
       @out << '</span>' * @opened.size
-      warn '%d tokens still open: %p' % [@opened.size, @opened] unless @opened.empty?
+      unless @opened.empty?
+        warn '%d tokens still open: %p' % [@opened.size, @opened]
+      end
 
       @out.extend Output
       @out.css = @css
@@ -229,8 +239,9 @@ module Encoders
           if @opened.empty?
             # nothing to close
           else
-            if @opened.size == 1 or @opened.last != type
-              raise 'Malformed token stream: Trying to close a token (%p) that is not open. Open are: %p.' % [type, @opened[1..-1]] if $DEBUG
+            if $DEBUG and (@opened.size == 1 or @opened.last != type)
+              raise 'Malformed token stream: Trying to close a token (%p) \
+                that is not open. Open are: %p.' % [type, @opened[1..-1]]
             end
             @out << '</span>'
             @opened.pop

data/lib/coderay/encoders/html/classes.rb

@@ -34,6 +34,7 @@ module Encoders
       :hex => 'hx',
       :include => 'ic',
       :inline => 'il',
+      :inline_delimiter => 'idl',
       :instance_variable => 'iv',
       :integer => 'i',
       :interpreted => 'in',

data/lib/coderay/helpers/{filetype.rb → file_type.rb}

@@ -1,10 +1,11 @@
-# =FileType
+# = FileType
 #
-# A simple filetype recognizer
+# A simple filetype recognizer.
 #
-# Author: murphy (mail to murphy cYcnus de)
+# Copyright (c) 2006 by murphy (Kornelius Kalnbach) <murphy rubychan de>
 #
-# Version: 0.1 (2005.september.1)
+# License:: LGPL / ask the author
+# Version:: 0.1 (2005-09-01)
 #
 # == Documentation
 #
@@ -84,6 +85,7 @@ module FileType
     'htm' => :html,
     'html' => :html,
     'xhtml' => :xhtml,
+    'raydebug' => :debug,
     'rhtml' => :rhtml,
     'yaml' => :yaml,
     'yml' => :yaml,

data/lib/coderay/helpers/word_list.rb

@@ -1,15 +1,17 @@
 # = WordList
-#
-# Copyright (c) 2006 by murphy (Kornelius Kalnbach) <murphy cYcnus de>
+# 
+# <b>A Hash subclass designed for mapping word lists to token types.</b>
+# 
+# Copyright (c) 2006 by murphy (Kornelius Kalnbach) <murphy rubychan de>
 #
 # License:: LGPL / ask the author
-# Version:: 1.0 (2006-Feb-3)
+# Version:: 1.1 (2006-Oct-19)
 #
 # A WordList is a Hash with some additional features.
 # It is intended to be used for keyword recognition.
 #
 # WordList is highly optimized to be used in Scanners,
-# typically to decide whether a given ident is a keyword.
+# typically to decide whether a given ident is a special token.
 #
 # For case insensitive words use CaseIgnoringWordList.
 #
@@ -47,25 +49,30 @@
 #      ...
 class WordList < Hash
 
-  # Create a WordList for the given +words+.
-  #
-  # This WordList responds to [] with +true+, if the word is
-  # in +words+, and with +false+ otherwise.
-  def self.for words
-    new.add words
-  end
-
   # Creates a new WordList with +default+ as default value.
-  def initialize default = false, &block
-    super default, &block
-  end
-
-  # Checks if a word is included.
-  def include? word
-    has_key? word
+  # 
+  # You can activate +caching+ to store the results for every [] request.
+  # 
+  # With caching, methods like +include?+ or +delete+ may no longer behave
+  # as you expect. Therefore, it is recommended to use the [] method only.
+  def initialize default = false, caching = false, &block
+    if block
+      raise ArgumentError, 'Can\'t combine block with caching.' if caching
+      super(&block)
+    else
+      if caching
+        super() do |h, k|
+          h[k] = h.fetch k, default
+        end
+      else
+        super default
+      end
+    end
   end
 
   # Add words to the list and associate them with +kind+.
+  # 
+  # Returns +self+, so you can concat add calls.
   def add words, kind = true
     words.each do |word|
       self[word] = kind
@@ -78,24 +85,30 @@ end
 
 # A CaseIgnoringWordList is like a WordList, only that
 # keys are compared case-insensitively.
+# 
+# Ignoring the text case is realized by sending the +downcase+ message to
+# all keys.
+# 
+# Caching usually makes a CaseIgnoringWordList faster, but it has to be
+# activated explicitely.
 class CaseIgnoringWordList < WordList
 
-  # Creates a new WordList with +default+ as default value.
-  #
-  # Text case is ignored.
-  def initialize default = false, &block
-    block ||= proc do |h, k|
-      h[k] = h.fetch k.downcase, default
+  # Creates a new case-insensitive WordList with +default+ as default value.
+  # 
+  # You can activate caching to store the results for every [] request.
+  def initialize default = false, caching = false
+    if caching
+      super(default, false) do |h, k|
+        h[k] = h.fetch k.downcase, default
+      end
+    else
+      def self.[] key  # :nodoc:
+        super(key.downcase)
+      end
     end
-    super default
   end
 
-  # Checks if a word is included.
-  def include? word
-    has_key? word.downcase
-  end
-
-  # Add words to the list and associate them with +kind+.
+  # Add +words+ to the list and associate them with +kind+.
   def add words, kind = true
     words.each do |word|
       self[word.downcase] = kind

data/lib/coderay/scanners/debug.rb

@@ -0,0 +1,60 @@
+module CodeRay
+module Scanners
+
+  # = Debug Scanner
+  class Debug < Scanner
+
+    include Streamable
+    register_for :debug
+
+  protected
+    def scan_tokens tokens, options
+
+      opened_tokens = []
+
+      until eos?
+
+        kind = nil
+        match = nil
+
+          if scan(/\s+/)
+            tokens << [matched, :space]
+            next
+            
+          elsif scan(/ (\w+) \( ( [^\)\\]* ( \\. [^\)\\]* )* ) \) /x)
+            kind = self[1].to_sym
+            match = self[2].gsub(/\\(.)/, '\1')
+            
+          elsif scan(/ (\w+) < /x)
+            kind = self[1].to_sym
+            opened_tokens << kind
+            match = :open
+            
+          elsif scan(/ > /x)
+            kind = opened_tokens.pop
+            match = :close
+            
+          else
+            kind = :error
+            getch
+
+          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
+      
+      tokens
+    end
+
+  end
+
+end
+end

data/lib/coderay/scanners/delphi.rb

@@ -29,13 +29,18 @@ module Scanners
       'virtual', 'write', 'writeonly'
     ]
 
-    IDENT_KIND = CaseIgnoringWordList.new(:ident).
+    IDENT_KIND = CaseIgnoringWordList.new(:ident, caching=true).
       add(RESERVED_WORDS, :reserved).
       add(DIRECTIVES, :directive)
+    
+    NAME_FOLLOWS = CaseIgnoringWordList.new(false, caching=true).
+      add(%w(procedure function .))
 
+  private
     def scan_tokens tokens, options
 
       state = :initial
+      last_token = ''
 
       until eos?
 
@@ -45,19 +50,29 @@ module Scanners
         if state == :initial
           
           if scan(/ \s+ /x)
-            kind = :space
+            tokens << [matched, :space]
+            next
             
           elsif scan(%r! \{ \$ [^}]* \}? | \(\* \$ (?: .*? \*\) | .* ) !mx)
-            kind = :preprocessor
+            tokens << [matched, :preprocessor]
+            next
             
           elsif scan(%r! // [^\n]* | \{ [^}]* \}? | \(\* (?: .*? \*\) | .* ) !mx)
-            kind = :comment
+            tokens << [matched, :comment]
+            next
             
-          elsif scan(/ [-+*\/=<>:;,.@\^|\(\)\[\]]+ /x)
+          elsif match = scan(/ <[>=]? | >=? | :=? | [-+=*\/;,@\^|\(\)\[\]] | \.\. /x)
             kind = :operator
+          
+          elsif match = scan(/\./)
+            kind = :operator
+            if last_token == 'end'
+              tokens << [match, kind]
+              next
+            end
             
           elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
-            kind = IDENT_KIND[match]
+            kind = NAME_FOLLOWS[last_token] ? :ident : IDENT_KIND[match]
             
           elsif match = scan(/ ' ( [^\n']|'' ) (?:'|$) /x)
             tokens << [:open, :char]
@@ -101,6 +116,7 @@ module Scanners
             state = :initial
             next
           elsif scan(/\n/)
+            tokens << [:close, :string]
             kind = :error
             state = :initial
           else
@@ -119,6 +135,7 @@ module Scanners
         end
         raise_inspect 'Empty token', tokens unless match
 
+        last_token = match
         tokens << [match, kind]
         
       end

data/lib/coderay/scanners/ruby.rb

@@ -97,7 +97,7 @@ module Scanners
               state = :initial
               depth = 1
               tokens << [:open, :inline]
-              tokens << [match + getch, :delimiter]
+              tokens << [match + getch, :inline_delimiter]
             when ?$, ?@
               tokens << [match, :escape]
               last_state = state  # scan one token as normal code, then return here
@@ -189,7 +189,7 @@ module Scanners
                   depth -= 1
                   if depth == 0  # closing brace of inline block reached
                     state, depth, heredocs = inline_block_stack.pop
-                    tokens << [match, :delimiter]
+                    tokens << [match, :inline_delimiter]
                     kind = :inline
                     match = :close
                   end

data/lib/coderay/styles/cycnus.rb

@@ -76,7 +76,7 @@ ol.CodeRay li { white-space: pre }
 .il { background: #eee }
 .il .il { background: #ddd }
 .il .il .il { background: #ccc }
-.il .dl { font-weight: bold ! important; color: #888 ! important }
+.il .idl { font-weight: bold; color: #888 }
 
 .in { color:#B2B; font-weight:bold }
 .iv { color:#33B }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.7.4.196
-date: 2006-10-18 00:00:00 +02:00
+  version: 0.7.4.215
+date: 2006-10-20 00:00:00 +02:00
 summary: CodeRay is a fast syntax highlighter engine for many languages.
 require_paths: 
 - lib
@@ -52,12 +52,13 @@ files:
 - ./lib/coderay/encoders/html/css.rb
 - ./lib/coderay/encoders/html/numerization.rb
 - ./lib/coderay/encoders/html/output.rb
-- ./lib/coderay/helpers/filetype.rb
+- ./lib/coderay/helpers/file_type.rb
 - ./lib/coderay/helpers/gzip_simple.rb
 - ./lib/coderay/helpers/plugin.rb
 - ./lib/coderay/helpers/word_list.rb
 - ./lib/coderay/scanners/_map.rb
 - ./lib/coderay/scanners/c.rb
+- ./lib/coderay/scanners/debug.rb
 - ./lib/coderay/scanners/delphi.rb
 - ./lib/coderay/scanners/html.rb
 - ./lib/coderay/scanners/nitro_xhtml.rb