coderay 0.7.1.147 → 0.7.2.165

data/lib/coderay/scanners/_map.rb

@@ -1,14 +1,15 @@
-module CodeRay
-module Scanners
-	
-	map :cpp => :c,
-		:plain => :plaintext,
-		:pascal => :delphi,
-		:irb => :ruby,
-		:xml => :html,
-		:xhtml => :nitro_html
-
-	default :plain
-	
-end
-end
+module CodeRay
+module Scanners
+
+  map :cpp => :c,
+    :plain => :plaintext,
+    :pascal => :delphi,
+    :irb => :ruby,
+    :xml => :html,
+    :xhtml => :nitro_xhtml,
+    :nitro => :nitro_xhtml
+
+  default :plain
+
+end
+end

data/lib/coderay/scanners/c.rb

@@ -1,155 +1,163 @@
-module CodeRay
-module Scanners
-	
-	class C < Scanner
-
-		register_for :c
-		
-		RESERVED_WORDS = [
-			'asm', 'break', 'case', 'continue', 'default', 'do', 'else',
-			'for', 'goto', 'if', 'return', 'switch', 'while',
-			'struct', 'union', 'enum', 'typedef',
-			'static', 'register', 'auto', 'extern',
-			'sizeof',
-			'volatile', 'const',  # C89
-			'inline', 'restrict', # C99			
-		]
-
-		PREDEFINED_TYPES = [
-			'int', 'long', 'short', 'char', 'void',
-			'signed', 'unsigned', 'float', 'double',
-			'bool', 'complex',  # C99
-		]
-
-		PREDEFINED_CONSTANTS = [
-			'EOF', 'NULL',
-			'true', 'false',  # C99
-		]
-
-		IDENT_KIND = WordList.new(:ident).
-			add(RESERVED_WORDS, :reserved).
-			add(PREDEFINED_TYPES, :pre_type).
-			add(PREDEFINED_CONSTANTS, :pre_constant)
-
-		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
-
-			until eos?
-
-				kind = :error
-				match = nil
-
-				case state
-
-				when :initial
-					
-					if scan(/ \s+ | \\\n /x)
-						kind = :space
-						
-					elsif scan(%r! // [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) !mx)
-						kind = :comment
-
-					elsif match = scan(/ \# \s* if \s* 0 /x)
-						match << scan_until(/ ^\# (?:elif|else|endif) .*? $ | \z /xm) unless eos?
-						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(/L?"/)
-						tokens << [:open, :string]
-						if match[0] == ?L
-							tokens << ['L', :modifier]
-							match = '"'
-						end
-						state = :string
-						kind = :delimiter
-						
-					elsif scan(/#\s*(\w*)/)
-						kind = :preprocessor  # FIXME multiline preprocs
-						state = :include_expected if self[1] == 'include'
-						
-					elsif scan(/ L?' (?: [^\'\n\\] | \\ #{ESCAPE} )? '? /ox)
-						kind = :char
-						
-					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
-					end
-					
-				when :string
-					if scan(/[^\\"]+/)
-						kind = :content
-					elsif scan(/"/)
-						tokens << ['"', :delimiter]
-						tokens << [:close, :string]
-						state = :initial
-						next
-					elsif scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox)
-						kind = :char
-					elsif scan(/ \\ | $ /x)
-						kind = :error
-						state = :initial
-					else
-						raise_inspect "else case \" reached; %p not handled." % peek(1), tokens
-					end
-					
-				when :include_expected
-					if scan(/<[^>\n]+>?|"[^"\n\\]*(?:\\.[^"\n\\]*)*"?/)
-						kind = :include
-						state = :initial
-						
-					elsif match = scan(/\s+/)
-						kind = :space
-						state = :initial if match.index ?\n
-						
-					else
-						getch
-						
-					end
-					
-				else
-					raise_inspect 'Unknown state', tokens
-					
-				end
-				
-				match ||= matched
-				if $DEBUG and (not kind or kind == :error)
-					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
+module CodeRay
+module Scanners
+
+  class C < Scanner
+
+    register_for :c
+
+    RESERVED_WORDS = [
+      'asm', 'break', 'case', 'continue', 'default', 'do', 'else',
+      'for', 'goto', 'if', 'return', 'switch', 'while',
+      'struct', 'union', 'enum', 'typedef',
+      'static', 'register', 'auto', 'extern',
+      'sizeof',
+      'volatile', 'const',  # C89
+      'inline', 'restrict', # C99
+    ]
+
+    PREDEFINED_TYPES = [
+      'int', 'long', 'short', 'char', 'void',
+      'signed', 'unsigned', 'float', 'double',
+      'bool', 'complex',  # C99
+    ]
+
+    PREDEFINED_CONSTANTS = [
+      'EOF', 'NULL',
+      'true', 'false',  # C99
+    ]
+
+    IDENT_KIND = WordList.new(:ident).
+      add(RESERVED_WORDS, :reserved).
+      add(PREDEFINED_TYPES, :pre_type).
+      add(PREDEFINED_CONSTANTS, :pre_constant)
+
+    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
+
+      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 match = scan(/ \# \s* if \s* 0 /x)
+            match << scan_until(/ ^\# (?:elif|else|endif) .*? $ | \z /xm) unless eos?
+            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(/L?"/)
+            tokens << [:open, :string]
+            if match[0] == ?L
+              tokens << ['L', :modifier]
+              match = '"'
+            end
+            state = :string
+            kind = :delimiter
+
+          elsif scan(/#\s*(\w*)/)
+            kind = :preprocessor  # FIXME multiline preprocs
+            state = :include_expected if self[1] == 'include'
+
+          elsif scan(/ L?' (?: [^\'\n\\] | \\ #{ESCAPE} )? '? /ox)
+            kind = :char
+
+          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
+
+        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
+
+        when :include_expected
+          if scan(/<[^>\n]+>?|"[^"\n\\]*(?:\\.[^"\n\\]*)*"?/)
+            kind = :include
+            state = :initial
+
+          elsif match = scan(/\s+/)
+            kind = :space
+            state = :initial if match.index ?\n
+
+          else
+            getch
+            kind = :error
+
+          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/delphi.rb

@@ -1,129 +1,131 @@
-module CodeRay
-module Scanners
-	
-	class Delphi < Scanner
-
-		register_for :delphi
-		
-		RESERVED_WORDS = [
-			'and', 'array', 'as', 'at', 'asm', 'at', 'begin', 'case', 'class',
-			'const', 'constructor', 'destructor', 'dispinterface', 'div', 'do',
-			'downto', 'else', 'end', 'except', 'exports', 'file', 'finalization',
-			'finally', 'for', 'function', 'goto', 'if', 'implementation', 'in',
-			'inherited', 'initialization', 'inline', 'interface', 'is', 'label',
-			'library', 'mod', 'nil', 'not', 'object', 'of', 'or', 'out', 'packed',
-			'procedure', 'program', 'property', 'raise', 'record', 'repeat',
-			'resourcestring', 'set', 'shl', 'shr', 'string', 'then', 'threadvar',
-			'to', 'try', 'type', 'unit', 'until', 'uses', 'var', 'while', 'with',
-			'xor', 'on'
-		]
-
-		DIRECTIVES = [
-			'absolute', 'abstract', 'assembler', 'at', 'automated', 'cdecl',
-			'contains', 'deprecated', 'dispid', 'dynamic', 'export',
-			'external', 'far', 'forward', 'implements', 'local', 
-			'near', 'nodefault', 'on', 'overload', 'override',
-			'package', 'pascal', 'platform', 'private', 'protected', 'public',
-			'published', 'read', 'readonly', 'register', 'reintroduce',
-			'requires', 'resident', 'safecall', 'stdcall', 'stored', 'varargs',
-			'virtual', 'write', 'writeonly'
-		]
-
-		IDENT_KIND = CaseIgnoringWordList.new(:ident).
-			add(RESERVED_WORDS, :reserved).
-			add(DIRECTIVES, :directive)
-
-		def scan_tokens tokens, options
-
-			state = :initial
-
-			until eos?
-
-				kind = :error
-				match = nil
-
-				if state == :initial
-					
-					if scan(/ \s+ /x)
-						kind = :space
-						
-					elsif scan(%r! \{ \$ [^}]* \}? | \(\* \$ (?: .*? \*\) | .* ) !mx)
-						kind = :preprocessor
-						
-					elsif scan(%r! // [^\n]* | \{ [^}]* \}? | \(\* (?: .*? \*\) | .* ) !mx)
-						kind = :comment
-						
-					elsif scan(/ [-+*\/=<>:;,.@\^|\(\)\[\]]+ /x)
-						kind = :operator
-						
-					elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
-						kind = IDENT_KIND[match]
-						
-					elsif match = scan(/ ' ( [^\n']|'' ) (?:'|$) /x)
-						tokens << [:open, :char]
-						tokens << ["'", :delimiter]
-						tokens << [self[1], :content]
-						tokens << ["'", :delimiter]
-						tokens << [:close, :char]
-						next
-						
-					elsif match = scan(/ ' /x)
-						tokens << [:open, :string]
-						state = :string
-						kind = :delimiter
-						
-					elsif scan(/ \# (?: \d+ | \$[0-9A-Fa-f]+ ) /x)
-						kind = :char
-						
-					elsif scan(/ \$ [0-9A-Fa-f]+ /x)
-						kind = :hex
-						
-					elsif scan(/ (?: \d+ ) (?![eE]|\.[^.]) /x)
-						kind = :integer
-						
-					elsif scan(/ \d+ (?: \.\d+ (?: [eE][+-]? \d+ )? | [eE][+-]? \d+ ) /x)
-						kind = :float
-
-					else
-						getch
-					end
-					
-				elsif state == :string
-					if scan(/[^\n']+/)
-						kind = :content
-					elsif scan(/''/)
-						kind = :char
-					elsif scan(/'/)
-						tokens << ["'", :delimiter]
-						tokens << [:close, :string]
-						state = :initial
-						next
-					elsif scan(/\n/)
-						state = :initial
-					else
-						raise "else case \' reached; %p not handled." % peek(1), tokens
-					end
-					
-				else
-					raise 'else-case reached', tokens
-					
-				end
-				
-				match ||= matched
-				if $DEBUG and (not kind or kind == :error)
-					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
+module CodeRay
+module Scanners
+  
+  class Delphi < Scanner
+
+    register_for :delphi
+    
+    RESERVED_WORDS = [
+      'and', 'array', 'as', 'at', 'asm', 'at', 'begin', 'case', 'class',
+      'const', 'constructor', 'destructor', 'dispinterface', 'div', 'do',
+      'downto', 'else', 'end', 'except', 'exports', 'file', 'finalization',
+      'finally', 'for', 'function', 'goto', 'if', 'implementation', 'in',
+      'inherited', 'initialization', 'inline', 'interface', 'is', 'label',
+      'library', 'mod', 'nil', 'not', 'object', 'of', 'or', 'out', 'packed',
+      'procedure', 'program', 'property', 'raise', 'record', 'repeat',
+      'resourcestring', 'set', 'shl', 'shr', 'string', 'then', 'threadvar',
+      'to', 'try', 'type', 'unit', 'until', 'uses', 'var', 'while', 'with',
+      'xor', 'on'
+    ]
+
+    DIRECTIVES = [
+      'absolute', 'abstract', 'assembler', 'at', 'automated', 'cdecl',
+      'contains', 'deprecated', 'dispid', 'dynamic', 'export',
+      'external', 'far', 'forward', 'implements', 'local', 
+      'near', 'nodefault', 'on', 'overload', 'override',
+      'package', 'pascal', 'platform', 'private', 'protected', 'public',
+      'published', 'read', 'readonly', 'register', 'reintroduce',
+      'requires', 'resident', 'safecall', 'stdcall', 'stored', 'varargs',
+      'virtual', 'write', 'writeonly'
+    ]
+
+    IDENT_KIND = CaseIgnoringWordList.new(:ident).
+      add(RESERVED_WORDS, :reserved).
+      add(DIRECTIVES, :directive)
+
+    def scan_tokens tokens, options
+
+      state = :initial
+
+      until eos?
+
+        kind = nil
+        match = nil
+
+        if state == :initial
+          
+          if scan(/ \s+ /x)
+            kind = :space
+            
+          elsif scan(%r! \{ \$ [^}]* \}? | \(\* \$ (?: .*? \*\) | .* ) !mx)
+            kind = :preprocessor
+            
+          elsif scan(%r! // [^\n]* | \{ [^}]* \}? | \(\* (?: .*? \*\) | .* ) !mx)
+            kind = :comment
+            
+          elsif scan(/ [-+*\/=<>:;,.@\^|\(\)\[\]]+ /x)
+            kind = :operator
+            
+          elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
+            kind = IDENT_KIND[match]
+            
+          elsif match = scan(/ ' ( [^\n']|'' ) (?:'|$) /x)
+            tokens << [:open, :char]
+            tokens << ["'", :delimiter]
+            tokens << [self[1], :content]
+            tokens << ["'", :delimiter]
+            tokens << [:close, :char]
+            next
+            
+          elsif match = scan(/ ' /x)
+            tokens << [:open, :string]
+            state = :string
+            kind = :delimiter
+            
+          elsif scan(/ \# (?: \d+ | \$[0-9A-Fa-f]+ ) /x)
+            kind = :char
+            
+          elsif scan(/ \$ [0-9A-Fa-f]+ /x)
+            kind = :hex
+            
+          elsif scan(/ (?: \d+ ) (?![eE]|\.[^.]) /x)
+            kind = :integer
+            
+          elsif scan(/ \d+ (?: \.\d+ (?: [eE][+-]? \d+ )? | [eE][+-]? \d+ ) /x)
+            kind = :float
+
+          else
+            kind = :error
+            getch
+
+          end
+          
+        elsif state == :string
+          if scan(/[^\n']+/)
+            kind = :content
+          elsif scan(/''/)
+            kind = :char
+          elsif scan(/'/)
+            tokens << ["'", :delimiter]
+            tokens << [:close, :string]
+            state = :initial
+            next
+          elsif scan(/\n/)
+            state = :initial
+          else
+            raise "else case \' reached; %p not handled." % peek(1), tokens
+          end
+          
+        else
+          raise 'else-case reached', 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
+      
+      tokens
+    end
+
+  end
+
+end
+end