rouge 0.2.7 → 0.2.8

data/lib/rouge/demos/nginx

@@ -0,0 +1,5 @@
+server {
+  listen          80;
+  server_name     example.com *.example.com;
+  rewrite ^       http://www.domain.com$request_uri? permanent;
+}

data/lib/rouge/formatters/html.rb

@@ -40,6 +40,9 @@ module Rouge
           span(tok, val) { |str| code << str }
         end
 
+        # add an extra line number for non-newline-terminated strings
+        num_lines += 1 if code[-1] != "\n"
+
         # generate a string of newline-separated line numbers for the gutter
         numbers = num_lines.times.map do |x|
           %<<div class="lineno">#{x+1}</div>>

data/lib/rouge/lexers/nginx.rb

@@ -0,0 +1,67 @@
+module Rouge
+  module Lexers
+    class Nginx < RegexLexer
+      tag 'nginx'
+      mimetypes 'text/x-nginx-conf'
+
+      id = /[^\s$;{}()#]+/
+
+      state :root do
+        rule /(include)(\s+)([^\s;]+)/ do
+          group 'Keyword'; group 'Text'; group 'Name'
+        end
+
+        rule id, 'Keyword', :statement
+
+        mixin :base
+      end
+
+      state :block do
+        rule /}/, 'Punctuation', :pop!
+        rule id, 'Keyword.Namespace', :statement
+        mixin :base
+      end
+
+      state :statement do
+        rule /{/ do
+          token 'Punctuation'; pop!; push :block
+        end
+
+        rule /;/, 'Punctuation', :pop!
+
+        mixin :base
+      end
+
+      state :base do
+        rule /\s+/, 'Text'
+
+        rule /#.*?\n/, 'Comment.Single'
+        rule /(?:on|off)\b/, 'Name.Constant'
+        rule /[$][\w-]+/, 'Name.Variable'
+
+        # host/port
+        rule /([a-z0-9.-]+)(:)([0-9]+)/i do
+          group 'Name.Function'; group 'Punctuation'
+          group 'Literal.Number.Integer'
+        end
+
+        # mimetype
+        rule %r([a-z-]+/[a-z-]+)i, 'Name.Class'
+
+        rule /[0-9]+[kmg]?\b/i, 'Literal.Number.Integer'
+        rule /(~)(\s*)([^\s{]+)/ do
+          group 'Punctuation'; group 'Text'; group 'Literal.String.Regex'
+        end
+
+        rule /[:=~]/, 'Punctuation'
+
+        # pathname
+        rule %r(/#{id}?), 'Name'
+
+        rule /[^#\s;{}$\\]+/, 'Literal.String' # catchall
+
+        rule /[$;]/, 'Text'
+      end
+    end
+  end
+end

data/lib/rouge/lexers/objective_c.rb

@@ -0,0 +1,104 @@
+module Rouge
+  module Lexers
+    class ObjectiveC < RegexLexer
+      tag 'objective_c'
+      aliases 'objective-c', 'objectivec', 'obj_c', 'obj-c', 'objc'
+      # XXX TODO: objc has .h files too
+      filenames '*.m'
+      mimetypes 'text/x-objective-c'
+
+      id = /[a-zA-Z$_][a-zA-Z0-9$_]*/
+
+      def self.decorators
+        @decorators = Set.new %w(
+          private protected public encode synchronized try throw catch
+          finally end property synthesize dynamic selector
+        )
+      end
+
+      def self.keywords_type
+        @keywords_type ||= Set.new %w(
+          int long float short double char unsigned signed void id BOOL
+          IBOutlet IBAction SEL
+        )
+      end
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          auto break case const continue default do else enum extern
+          for goto if register restricted return sizeof static struct
+          switch typedef union volatile virtual while in
+        )
+      end
+
+      def self.reserved
+        @reserved ||= Set.new %w(
+          inline naked restrict thread typename
+          _inline _naked _restrict _thread _typename
+          __inline __naked __restrict __thread __typename
+
+          __asm __int8 __based __except __int16 __stdcall __cdecl
+          __fastcall __int32 __declspec __finally __int64 __try __leave
+        )
+      end
+
+      state :whitespace do
+        rule /^\s*#if\s+0/, 'Comment', :if0
+        rule /^\s*#/, 'Comment.Preproc', :macro
+        rule /\n/, 'Text'
+        rule /\s+/, 'Text'
+        rule /\\\n/, 'Literal.String.Escape'
+        rule %r(//(\\.|.)*?\n), 'Comment.Single'
+        rule %r(/[*].*?[*]/), 'Comment.Multiline'
+      end
+
+      state :statements do
+        rule /[L@]?"/, 'Literal.String', :string
+        rule /(L|@)?'(\\[0-7]{1,3}|\\x[a-fA-F0-9]{1,2}|[^\\'\n]|\\.)'/,
+          'Literal.String.Char'
+        rule /(\d+[.]\d*|[.]\d+|\d+)e[+-]?\d+l?/i, 'Literal.Number.Float'
+        rule /(\d+[.]\d*|[.]\d+)f?/i, 'Literal.Number.Float'
+        rule /\d+f/i, 'Literal.Number.Float'
+        rule /0x[0-9a-f]+l?/i, 'Literal.Number.Hex'
+        rule /0[0-7]+l?/i, 'Literal.Number.Oct'
+        rule /\d+l?/i, 'Literal.Number.Integer'
+        rule %r([~!%^&*+=|?:<>/-]), 'Operator'
+        rule /[()\[\],.]/, 'Punctuation'
+
+        rule /#{id}:(?!:)/, 'Name.Label'
+
+        rule /@(#{id})/ do |m|
+          if self.class.decorators.include? m[1]
+            token 'Keyword'
+          else
+            token 'Error'
+          end
+        end
+
+        rule /(TRUE|FALSE|nil|NULL)\b/, 'Name.Builtin'
+
+        rule id do |m|
+          name = m[0]
+
+          if self.class.keywords.include? name
+            token 'Keyword'
+          elsif self.class.keywords_type.include? name
+            token 'Keyword.Type'
+          elsif self.class.reserved.include? name
+            token 'Keyword.Reserved'
+          end
+        end
+      end
+
+      state :root do
+        mixin :whitespace
+
+        rule %r(
+          ([a-zA-Z0-9_*\s]+?[\s*]) # return arguments
+          (#{id}) # method name
+          (\s*[(][^;]*?[)]) # signature
+        )x
+      end
+    end
+  end
+end

data/lib/rouge/regex_lexer.rb

@@ -328,7 +328,10 @@ module Rouge
       raise 'empty stack!' if stack.empty?
 
       debug { "    popping stack: #{times}" }
-      times.times { stack.pop }
+
+      stack.pop(times)
+
+      nil
     end
 
     # reset the stack back to `[:root]`.

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.2.7"
+    "0.2.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -37,6 +37,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - lib/rouge/util.rb
+- lib/rouge/lexers/nginx.rb
 - lib/rouge/lexers/python.rb
 - lib/rouge/lexers/sql.rb
 - lib/rouge/lexers/common_lisp.rb
@@ -53,6 +54,7 @@ files:
 - lib/rouge/lexers/javascript.rb
 - lib/rouge/lexers/diff.rb
 - lib/rouge/lexers/viml.rb
+- lib/rouge/lexers/objective_c.rb
 - lib/rouge/lexers/smalltalk.rb
 - lib/rouge/lexers/php/builtins.rb
 - lib/rouge/lexers/haskell.rb
@@ -118,6 +120,7 @@ files:
 - lib/rouge/demos/yaml
 - lib/rouge/demos/sql
 - lib/rouge/demos/groovy
+- lib/rouge/demos/nginx
 - lib/rouge/demos/tcl
 - lib/rouge/demos/c
 - lib/rouge/demos/perl