coderay 0.7.2.176 → 0.7.4.196

data/FOLDERS

@@ -46,7 +46,7 @@ Some files to enhance Rake, including the Autumnal Rdoc template and some script
 
 == test - Tests
 
-Test for the scanners.
+Tests for the scanners.
 
 Each language has its own subfolder and sub-suite.
 

data/README

@@ -24,7 +24,7 @@ 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 168 2006-07-11 13:39:47Z murphy $
+Subversion:: $Id: README 195 2006-10-18 10:32:41Z murphy $
 
 -----
 
@@ -73,19 +73,26 @@ Please report errors in this documentation to <coderay cycnus de>.
 
 === Thanks to
 
-* Caleb Clausen for writing RubyLexer (see http://rubyforge.org/projects/rubylexer) and lots
-  of very interesting mails traffic
+* Caleb Clausen for writing RubyLexer (see
+  http://rubyforge.org/projects/rubylexer) and lots of very interesting mail
+  traffic
+* birkenfeld (Georg Brandl) and mitsuhiku (Arnim Ronacher) for PyKleur. You
+  guys rock!
 * Jamis Buck for writing Syntax (see http://rubyforge.org/projects/syntax)
   I got some useful ideas from it.
-* Doug Kearns and everyone else who worked on ruby.vim - it not only helped me coding CodeRay,
-  but also gave me a wonderful target to reach for the Ruby scanner.
-* everyone who used CodeRay on http://www.rubyforen.de and http://www.infhu.de/mx
+* Doug Kearns and everyone else who worked on ruby.vim - it not only helped me
+  coding CodeRay, but also gave me a wonderful target to reach for the Ruby
+  scanner.
+* everyone who used CodeBB on http://www.rubyforen.de and
+  http://www.infhu.de/mx
 * iGEL, magichisoka, manveru, WoN�Do and everyone I forgot from rubyforen.de
 * Daniel and Dethix from ruby-mine.de
-* Dookie (who is no longer with us...) and Leonidas from http://www.python-forum.de
+* Dookie (who is no longer with us...) and Leonidas from
+  http://www.python-forum.de
 * matz and all Ruby gods and gurus
-* The inventors of: the computer, the internet, the true color display, HTML & CSS, VIM, RUBY,
-  pizza, microwaves, guitars, scouting, programming, anime, manga, coke and green ice tea.
+* The inventors of: the computer, the internet, the true color display, HTML &
+  CSS, VIM, RUBY, pizza, microwaves, guitars, scouting, programming, anime, 
+  manga, coke and green ice tea.
 
 Where would we be without all those people?
 

data/lib/coderay.rb

@@ -1,6 +1,6 @@
 # = CodeRay Library
 #
-# $Id: coderay.rb 162 2006-07-11 06:03:43Z murphy $
+# $Id: coderay.rb 188 2006-10-17 11:18:01Z murphy $
 #
 # CodeRay is a Ruby library for syntax highlighting.
 #
@@ -133,7 +133,7 @@ module CodeRay
   # Minor: odd for beta, even for stable
   # Teeny: development state
   # Revision: Subversion Revision number (generated on rake)
-  Version = '0.7.2'
+  VERSION = '0.7.4'
 
   require 'coderay/tokens'
   require 'coderay/scanner'

data/lib/coderay/encoder.rb

@@ -130,7 +130,7 @@ module CodeRay
       # By default, it calls text_token or block_token, depending on
       # whether +text+ is a String.
       def token text, kind
-        if text.is_a? ::String
+        if text.instance_of? ::String  # Ruby 1.9: :open.is_a? String
           text_token text, kind
         elsif text.is_a? ::Symbol
           block_token text, kind

data/lib/coderay/helpers/plugin.rb

@@ -1,6 +1,6 @@
 # = PluginHost
 #
-# $Id: plugin.rb 174 2006-10-15 09:08:50Z murphy $
+# $Id: plugin.rb 188 2006-10-17 11:18:01Z murphy $
 #
 # A simple subclass plugin system.
 #
@@ -32,9 +32,9 @@ module PluginHost
   PLUGIN_HOSTS = []
   PLUGIN_HOSTS_BY_ID = {}  # dummy hash
 
-  # Loads all plugins using all_plugin_names and load.
+  # Loads all plugins using list and load.
   def load_all
-    for plugin in all_plugin_names
+    for plugin in list
       load plugin
     end
   end
@@ -160,7 +160,7 @@ module PluginHost
   # Returns an array of all .rb files in the plugin path.
   #
   # The extension .rb is not included.
-  def all_plugin_names
+  def list
     Dir[path_to('*')].select do |file|
       File.basename(file)[/^(?!_)\w+\.rb$/]
     end.map do |file|

data/lib/coderay/scanners/ruby.rb

@@ -24,7 +24,7 @@ module Scanners
   private
     def scan_tokens tokens, options
       last_token_dot = false
-      fancy_allowed = regexp_allowed = true
+      value_expected = true
       heredocs = nil
       last_state = nil
       state = :initial
@@ -68,7 +68,7 @@ module Scanners
               tokens << [modifiers, :modifier] unless modifiers.empty?
             end
             tokens << [:close, state.type]
-            fancy_allowed = regexp_allowed = false
+            value_expected = false
             state = state.next_state
 
           when '\\'
@@ -93,7 +93,7 @@ module Scanners
             case peek(1)[0]
             when ?{
               inline_block_stack << [state, depth, heredocs]
-              fancy_allowed = regexp_allowed = true
+              value_expected = true
               state = :initial
               depth = 1
               tokens << [:open, :inline]
@@ -123,7 +123,6 @@ module Scanners
 # {{{
           if match = scan(/ [ \t\f]+ | \\? \n | \# .* /x) or
             ( bol? and match = scan(/#{patterns::RUBYDOC_OR_DATA}/o) )
-            fancy_allowed = true
             case m = match[0]
             when ?\s, ?\t, ?\f
               match << scan(/\s*/) unless eos? or heredocs
@@ -131,7 +130,7 @@ module Scanners
             when ?\n, ?\\
               kind = :space
               if m == ?\n
-                regexp_allowed = true
+                value_expected = true  # FIXME not quite true
                 state = :initial if state == :undef_comma_expected
               end
               if heredocs
@@ -145,9 +144,10 @@ module Scanners
               end
             when ?#, ?=, ?_
               kind = :comment
-              regexp_allowed = true
+              value_expected = true
             else
-              raise_inspect 'else-case _ reached, because case %p was not handled' % [matched[0].chr], tokens
+              raise_inspect 'else-case _ reached, because case %p was
+                not handled' % [matched[0].chr], tokens
             end
             tokens << [match, kind]
             next
@@ -167,13 +167,17 @@ module Scanners
                 end
               end
               ## experimental!
-              fancy_allowed = regexp_allowed = :set if patterns::REGEXP_ALLOWED[match] or check(/\s+(?:%\S|\/\S)/)
+              value_expected = :set if
+                patterns::REGEXP_ALLOWED[match] or check(/#{patterns::VALUE_FOLLOWS}/o)
+            
+            elsif last_token_dot and match = scan(/#{patterns::METHOD_NAME_OPERATOR}/o)
+              kind = :ident
+              value_expected = :set if check(/#{patterns::VALUE_FOLLOWS}/o)
 
             # OPERATORS #
-            elsif (not last_token_dot and match = scan(/ ==?=? | \.\.?\.? | [\(\)\[\]\{\}] | :: | , /x)) or
-              (last_token_dot and match = scan(/#{patterns::METHOD_NAME_OPERATOR}/o))
+            elsif not last_token_dot and match = scan(/ ==?=? | \.\.?\.? | [\(\)\[\]\{\}] | :: | , /x)
               if match !~ / [.\)\]\}] /x or match =~ /\.\.\.?/
-                regexp_allowed = fancy_allowed = :set
+                value_expected = :set
               end
               last_token_dot = :set if match == '.' or match == '::'
               kind = :operator
@@ -200,7 +204,7 @@ module Scanners
             elsif match = scan(/#{patterns::INSTANCE_VARIABLE}/o)
               kind = :instance_variable
 
-            elsif regexp_allowed and match = scan(/\//)
+            elsif value_expected and match = scan(/\//)
               tokens << [:open, :regexp]
               kind = :delimiter
               interpreted = true
@@ -222,10 +226,10 @@ module Scanners
               end
 
             elsif match = scan(/ [-+!~^]=? | [*|&]{1,2}=? | >>? /x)
-              regexp_allowed = fancy_allowed = :set
+              value_expected = :set
               kind = :operator
 
-            elsif fancy_allowed and match = scan(/#{patterns::HEREDOC_OPEN}/o)
+            elsif value_expected and match = scan(/#{patterns::HEREDOC_OPEN}/o)
               indented = self[1] == '-'
               quote = self[3]
               delim = self[quote ? 4 : 2]
@@ -237,7 +241,7 @@ module Scanners
               heredocs ||= []  # create heredocs if empty
               heredocs << heredoc
 
-            elsif fancy_allowed and match = scan(/#{patterns::FANCY_START_SAVE}/o)
+            elsif value_expected and match = scan(/#{patterns::FANCY_START_CORRECT}/o)
               kind, interpreted = *patterns::FancyStringType.fetch(self[1]) do
                 raise_inspect 'Unknown fancy string: %%%p' % k, tokens
               end
@@ -245,11 +249,11 @@ module Scanners
               state = patterns::StringState.new kind, interpreted, self[2]
               kind = :delimiter
 
-            elsif fancy_allowed and match = scan(/#{patterns::CHARACTER}/o)
+            elsif value_expected and match = scan(/#{patterns::CHARACTER}/o)
               kind = :integer
 
             elsif match = scan(/ [\/%]=? | <(?:<|=>?)? | [?:;] /x)
-              regexp_allowed = fancy_allowed = :set
+              value_expected = :set
               kind = :operator
 
             elsif match = scan(/`/)
@@ -326,8 +330,7 @@ module Scanners
           end
 # }}}
 
-          regexp_allowed = regexp_allowed == :set
-          fancy_allowed = fancy_allowed == :set
+          value_expected = value_expected == :set
           last_token_dot = last_token_dot == :set
 
           if $DEBUG and not kind

data/lib/coderay/scanners/ruby/patterns.rb

@@ -21,7 +21,8 @@ module Scanners
       add(MODULE_KEYWORDS, :module_expected)
 
     IDENTS_ALLOWING_REGEXP = %w[
-      and or not while until unless if then elsif when sub sub! gsub gsub! scan slice slice! split
+      and or not while until unless if then elsif when sub sub! gsub gsub!
+      scan slice slice! split
     ]
     REGEXP_ALLOWED = WordList.new(false).
       add(IDENTS_ALLOWING_REGEXP, :set)
@@ -126,6 +127,19 @@ module Scanners
       .*?
       (?: \Z | (?=^\#CODE) )
     /mx
+    
+    # Checks for a valid value to follow. This enables
+    # fancy_allowed in method calls.
+    VALUE_FOLLOWS = /
+      \s+
+      (?:
+        [%\/][^\s=]
+      |
+        <<-?\S
+      |
+        #{CHARACTER}
+      )
+    /x
 
     RUBYDOC_OR_DATA = / #{RUBYDOC} | #{DATA} /xo
 

metadata

@@ -3,114 +3,91 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.7.2.176
-date: 2006-10-15 00:00:00 +02:00
+  version: 0.7.4.196
+date: 2006-10-18 00:00:00 +02:00
 summary: CodeRay is a fast syntax highlighter engine for many languages.
 require_paths: 
-  - lib
+- lib
 email: murphy@cYcnus.de
 homepage: http://coderay.rubychan.de
 rubyforge_project: coderay
-description: "CodeRay is a Ruby library for syntax highlighting. I try to make CodeRay easy to
-  use and intuitive, but at the same time fully featured, complete, fast and
-  efficient.  Usage is simple: require 'coderay' code = 'some %q(weird (Ruby)
-  can't shock) me!' puts CodeRay.scan(code, :ruby).html"
+description: "CodeRay is a Ruby library for syntax highlighting. I try to make CodeRay easy to use and intuitive, but at the same time fully featured, complete, fast and efficient.  Usage is simple: require 'coderay' code = 'some %q(weird (Ruby) can't shock) me!' puts CodeRay.scan(code, :ruby).html"
 autorequire: coderay
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.2
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 post_install_message: 
 authors: 
-  - murphy
+- murphy
 files: 
-  - "./lib/coderay.rb"
-  - "./lib/coderay/tokens.rb"
-  - "./lib/coderay/encoder.rb"
-  - "./lib/coderay/style.rb"
-  - "./lib/coderay/duo.rb"
-  - "./lib/coderay/scanner.rb"
-  - "./lib/coderay/encoders/tokens.rb"
-  - "./lib/coderay/encoders/debug.rb"
-  - "./lib/coderay/encoders/text.rb"
-  - "./lib/coderay/encoders/page.rb"
-  - "./lib/coderay/encoders/null.rb"
-  - "./lib/coderay/encoders/yaml.rb"
-  - "./lib/coderay/encoders/span.rb"
-  - "./lib/coderay/encoders/count.rb"
-  - "./lib/coderay/encoders/statistic.rb"
-  - "./lib/coderay/encoders/xml.rb"
-  - "./lib/coderay/encoders/html.rb"
-  - "./lib/coderay/encoders/div.rb"
-  - "./lib/coderay/encoders/_map.rb"
-  - "./lib/coderay/encoders/html/classes.rb"
-  - "./lib/coderay/encoders/html/css.rb"
-  - "./lib/coderay/encoders/html/numerization.rb"
-  - "./lib/coderay/encoders/html/output.rb"
-  - "./lib/coderay/helpers/gzip_simple.rb"
-  - "./lib/coderay/helpers/filetype.rb"
-  - "./lib/coderay/helpers/word_list.rb"
-  - "./lib/coderay/helpers/plugin.rb"
-  - "./lib/coderay/scanners/c.rb"
-  - "./lib/coderay/scanners/rhtml.rb"
-  - "./lib/coderay/scanners/html.rb"
-  - "./lib/coderay/scanners/plaintext.rb"
-  - "./lib/coderay/scanners/_map.rb"
-  - "./lib/coderay/scanners/delphi.rb"
-  - "./lib/coderay/scanners/xml.rb"
-  - "./lib/coderay/scanners/ruby.rb"
-  - "./lib/coderay/scanners/nitro_xhtml.rb"
-  - "./lib/coderay/scanners/ruby/patterns.rb"
-  - "./lib/coderay/styles/cycnus.rb"
-  - "./lib/coderay/styles/murphy.rb"
-  - "./lib/coderay/styles/_map.rb"
-  - "./demo/demo_tokens.rb"
-  - "./demo/suite.rb"
-  - "./demo/demo_css.rb"
-  - "./demo/demo_div.rb"
-  - "./demo/demo_highlight.rb"
-  - "./demo/demo_simple.rb"
-  - "./demo/demo_encoder.rb"
-  - "./demo/demo_html2.rb"
-  - "./demo/demo_load_scanner.rb"
-  - "./demo/demo_html.rb"
-  - "./demo/demo_dump.rb"
-  - "./demo/demo_cache.rb"
-  - "./demo/demo_more.rb"
-  - "./demo/demo_html_list.rb"
-  - "./demo/demo_global_vars.rb"
-  - "./demo/demo_global_vars2.rb"
-  - "./demo/demo_stream2.rb"
-  - "./demo/demo_load_encoder.rb"
-  - "./demo/demo_stream.rb"
-  - "./demo/demo_scanner.rb"
-  - "./demo/demo_count.rb"
-  - "./demo/demo_server.rb"
-  - "./README"
-  - "./LICENSE"
-  - "./FOLDERS"
+- ./lib/coderay.rb
+- ./lib/coderay/duo.rb
+- ./lib/coderay/encoder.rb
+- ./lib/coderay/scanner.rb
+- ./lib/coderay/style.rb
+- ./lib/coderay/tokens.rb
+- ./lib/coderay/encoders/_map.rb
+- ./lib/coderay/encoders/count.rb
+- ./lib/coderay/encoders/debug.rb
+- ./lib/coderay/encoders/div.rb
+- ./lib/coderay/encoders/html.rb
+- ./lib/coderay/encoders/null.rb
+- ./lib/coderay/encoders/page.rb
+- ./lib/coderay/encoders/span.rb
+- ./lib/coderay/encoders/statistic.rb
+- ./lib/coderay/encoders/text.rb
+- ./lib/coderay/encoders/tokens.rb
+- ./lib/coderay/encoders/xml.rb
+- ./lib/coderay/encoders/yaml.rb
+- ./lib/coderay/encoders/html/classes.rb
+- ./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/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/delphi.rb
+- ./lib/coderay/scanners/html.rb
+- ./lib/coderay/scanners/nitro_xhtml.rb
+- ./lib/coderay/scanners/plaintext.rb
+- ./lib/coderay/scanners/rhtml.rb
+- ./lib/coderay/scanners/ruby.rb
+- ./lib/coderay/scanners/xml.rb
+- ./lib/coderay/scanners/ruby/patterns.rb
+- ./lib/coderay/styles/_map.rb
+- ./lib/coderay/styles/cycnus.rb
+- ./lib/coderay/styles/murphy.rb
+- ./README
+- ./LICENSE
+- ./FOLDERS
 test_files: []
+
 rdoc_options: 
-  - "-SNw2"
-  - "-mREADME"
-  - "-a"
-  - "-t CodeRay Documentation"
+- -SNw2
+- -mREADME
+- -a
+- -t CodeRay Documentation
 extra_rdoc_files: 
-  - "./README"
-  - "./FOLDERS"
+- ./README
+- ./FOLDERS
 executables: 
-  - coderay
-  - coderay_stylesheet
+- coderay
+- coderay_stylesheet
 extensions: []
+
 requirements: 
-  - strscan
-dependencies: []
+- strscan
+dependencies: []
+

data/demo/demo_cache.rb

@@ -1,12 +0,0 @@
-require 'coderay'
-
-html_encoder = CodeRay.encoder :html
-
-scanner = Hash.new do |h, lang|
-	h[lang] = CodeRay.scanner lang
-end
-
-for lang in [:ruby, :html]
-	tokens = scanner[lang].tokenize 'test <test>'
-	puts html_encoder.encode_tokens(tokens)
-end