rouge 0.2.10 → 0.2.11

data/lib/rouge.rb

@@ -85,6 +85,8 @@ load load_dir.join('rouge/lexers/cpp.rb')
 load load_dir.join('rouge/lexers/java.rb')
 load load_dir.join('rouge/lexers/rust.rb')
 
+load load_dir.join('rouge/lexers/csharp.rb')
+
 load load_dir.join('rouge/lexers/smalltalk.rb')
 
 load load_dir.join('rouge/formatter.rb')

data/lib/rouge/demos/csharp

@@ -0,0 +1,5 @@
+// reverse byte order (16-bit)
+public static UInt16 ReverseBytes(UInt16 value)
+{
+  return (UInt16)((value & 0xFFU) << 8 | (value & 0xFF00U) >> 8);
+}

data/lib/rouge/lexers/asp.rb

@@ -0,0 +1,17 @@
+module Rouge
+  module Lexers
+    class ASP < TemplateLexer
+      tag 'asp'
+      aliases 'asp.net'
+
+      default_options :parent => XML
+
+      state :root do
+        rule /(<%[@=#]?)(.*?)(%>)/ do
+          group 'Name.Tag'
+          group 'Other
+        end
+      end
+    end
+  end
+end

data/lib/rouge/lexers/csharp.rb

@@ -0,0 +1,83 @@
+module Rouge
+  module Lexers
+    class CSharp < RegexLexer
+      tag 'csharp'
+      aliases 'c#', 'cs'
+      filenames '*.cs'
+      mimetypes 'text/x-csharp'
+
+      # TODO: support more of unicode
+      id = /@?[_a-z]\w*/i
+
+      keywords = %w(
+        abstract alias as base break case catch checked const continue
+        default delegate do else enum event explicit extern false
+        finally fixed for foreach global goto if implicit in interface
+        internal is lock new null operator out override params private
+        protected public readonly ref return sealed sizeof stackalloc
+        static switch this throw true try typeof unchecked unsafe
+        virtual void while get set new partial yield add remove value
+      )
+
+      keywords_type = %w(
+        bool byte char decimal double float int long object sbyte
+        short string uint ulong ushort
+      )
+
+      cpp_keywords = %w(
+        if endif else elif define undef line error warning region
+        endregion pragma
+      )
+
+      state :whitespace do
+        rule /\s+/m, 'Text'
+        rule %r(//.*?\n), 'Comment.Single'
+        rule %r(/[*].*?[*]/)m, 'Comment.Multiline'
+      end
+
+      state :root do
+        mixin :whitespace
+
+        rule /^\s*\[.*?\]/, 'Name.Attribute'
+        rule /[$]\s*"/, 'Literal.String', :splice_string
+        rule /[$]\s*<#/, 'Literal.String', :splice_recstring
+        rule /<#/, 'Literal.String', :recstring
+
+        rule /(<\[)\s*(#{id}:)?/, 'Keyword'
+        rule /\]>/, 'Keyword'
+
+        rule /[~!%^&*()+=|\[\]{}:;,.<>\/?-]/, 'Punctuation'
+        rule /@"(\\.|.)*?"/, 'Literal.String'
+        rule /"(\\.|.)*?["\n]/, 'Literal.String'
+        rule /'(\\.|.)'/, 'Literal.String.Char'
+        rule %r(
+          [0-9]
+          ([.][0-9]*)? # decimal
+          (e[+-][0-9]+)? # exponent
+          [fld]? # type
+        )ix, 'Literal.Number'
+        rule /0x[0-9a-f]+l?/i, 'Literal.Number'
+        rule /^#[ \t]*(#{cpp_keywords.join('|')})\b.*?\n/,
+          'Comment.Preproc'
+        rule /\b(#{keywords.join('|')})\b/, 'Keyword'
+        rule /\b(#{keywords_type.join('|')})\b/, 'Keyword.Type'
+        rule /class|struct/, 'Keyword', :class
+        rule /namespace|using/, 'Keyword', :namespace
+        rule /#{id}(?=\s*[(])/, 'Name.Function'
+        rule id, 'Name'
+      end
+
+      state :class do
+        mixin :whitespace
+        rule id, 'Name.Class', :pop!
+      end
+
+      state :namespace do
+        mixin :whitespace
+        rule /(?=[(])/, 'Text', :pop!
+        rule /(#{id}|[.])+/, 'Name.Namespace', :pop!
+      end
+
+    end
+  end
+end

data/lib/rouge/lexers/python.rb

@@ -146,7 +146,16 @@ module Rouge
 
       state :strings do
         rule /%(\([a-z0-9_]+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?/i, 'Literal.String.Interpol'
-        rule /[^\\'"%\n]+/, 'Literal.String'
+      end
+
+      state :strings_double do
+        rule /[^\\"%\n]+/, 'Literal.String'
+        mixin :strings
+      end
+
+      state :strings_single do
+        rule /[^\\'%\n]+/, 'Literal.String'
+        mixin :strings
       end
 
       state :nl do
@@ -169,24 +178,25 @@ module Rouge
       state :dqs do
         rule /"/, 'Literal.String', :pop!
         rule /\\\\|\\"|\\\n/, 'Literal.String.Escape'
-        mixin :strings
+        mixin :strings_double
       end
 
       state :sqs do
         rule /'/, 'Literal.String', :pop!
         rule /\\\\|\\'|\\\n/, 'Literal.String.Escape'
-        mixin :strings
+        mixin :strings_single
       end
 
       state :tdqs do
         rule /"""/, 'Literal.String', :pop!
-        mixin :strings
+        mixin :strings_double
         mixin :nl
       end
 
       state :tsqs do
         rule /'''/, 'Literal.String', :pop!
-        mixin :strings
+        rule /[^\\'%\n]+/, 'Literal.String'
+        mixin :strings_single
         mixin :nl
       end
 

data/lib/rouge/lexers/rust.rb

@@ -33,6 +33,16 @@ module Rouge
         )
       end
 
+      def macro_closed?
+        @macro_delims.values.all?(&:zero?)
+      end
+
+      start {
+        @macro_delims = { ']' => 0, ')' => 0, '}' => 0 }
+      }
+
+      delim_map = { '[' => ']', '(' => ')', '{' => '}' }
+
       id = /[a-z_]\w*/i
       hex = /[0-9a-f]/i
       escapes = %r(
@@ -74,14 +84,15 @@ module Rouge
         rule /[()\[\]{}|,:;]/, 'Punctuation'
         rule /[*!@~&+%^<>=-]/, 'Operator'
 
-        rule /[.]?#{id}(?=\s*[(])/m, 'Name.Function'
-        rule /[.]#{id}/, 'Name.Property'
+        rule /([.]\s*)?#{id}(?=\s*[(])/m, 'Name.Function'
+        rule /[.]\s*#{id}/, 'Name.Property'
         rule /(#{id})(::)/m do
           group 'Name.Namespace'; group 'Punctuation'
         end
 
         # macros
-        rule /#{id}!/, 'Name.Decorator'
+        rule /\bmacro_rules!/, 'Name.Decorator', :macro_rules
+        rule /#{id}!/, 'Name.Decorator', :macro
 
         rule /#{id}/ do |m|
           name = m[0]
@@ -93,11 +104,40 @@ module Rouge
         end
       end
 
+      state :macro do
+        mixin :has_literals
+
+        rule /[\[{(]/ do |m|
+          @macro_delims[delim_map[m[0]]] += 1
+          debug { "    macro_delims: #{@macro_delims.inspect}" }
+          token 'Punctuation'
+        end
+
+        rule /[\]})]/ do |m|
+          @macro_delims[m[0]] -= 1
+          debug { "    macro_delims: #{@macro_delims.inspect}" }
+          pop! if macro_closed?
+          token 'Punctuation'
+        end
+
+        # same as the rule in root, but don't push another macro state
+        rule /#{id}!/, 'Name.Decorator'
+        mixin :root
+
+        # No syntax errors in macros
+        rule /./, 'Text'
+      end
+
+      state :macro_rules do
+        rule /[$]#{id}(:#{id})?/, 'Name.Variable'
+        rule /[$]/, 'Name.Variable'
+
+        mixin :macro
+      end
+
       state :has_literals do
         # constants
         rule /\b(?:true|false|nil)\b/, 'Keyword.Constant'
-        # ()
-        rule /[(]\s*[)]/, 'Keyword.Constant'
         # characters
         rule %r(
           ' (?: #{escapes} | [^\\] ) '

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.2.10"
+    "0.2.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,9 +58,11 @@ files:
 - lib/rouge/lexers/io.rb
 - lib/rouge/lexers/viml.rb
 - lib/rouge/lexers/rust.rb
+- lib/rouge/lexers/csharp.rb
 - lib/rouge/lexers/objective_c.rb
 - lib/rouge/lexers/smalltalk.rb
 - lib/rouge/lexers/php/builtins.rb
+- lib/rouge/lexers/asp.rb
 - lib/rouge/lexers/haskell.rb
 - lib/rouge/lexers/c.rb
 - lib/rouge/lexers/sed.rb
@@ -131,6 +133,7 @@ files:
 - lib/rouge/demos/nginx
 - lib/rouge/demos/rust
 - lib/rouge/demos/tcl
+- lib/rouge/demos/csharp
 - lib/rouge/demos/c
 - lib/rouge/demos/perl
 - lib/rouge/demos/text