rouge 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d3e680acd54b6dc00269cb0a68721463fa898e6
-  data.tar.gz: 704addb88b523c80da72a59db3999e01ac502282
+  metadata.gz: f82ff03bdf4a459c29452a02d4e3b220f5153588
+  data.tar.gz: a4d96c1f9407192aa7df705eb4d8d6925b0e85fd
 SHA512:
-  metadata.gz: d5ac2591c06af1cc03516c314af662998dce6de22cf97be2b021f72e9aaa897c3662e01085c97cb806dfcea3737c7ca7d899dc194969438250eb3af4daa44367
-  data.tar.gz: 031632f8628d96c61f4ad3ce771f32676a0021a00cfa35c7521d3849085669b43a7a1cf5174efcf7fd148310a0ba84f03e66fa14fcce558e9268d429f6043a2c
+  metadata.gz: b630dfbb83ed9a4913f2bf427a8d410348ec82c36f4d950209921ca08df736a473051da8b31cc9dfb3927941adbd2584e6adf2db40dad39d8f8f4ce392babdad
+  data.tar.gz: 1165e7a648cd8b0e112b31ce9889256b4c41cde6cdee8d74de302225caf14af8d022cc2a5aa348aee31c08d89249a7515078fd6d0cc223c62b783a6e7b817120

data/lib/rouge/lexers/swift.rb

@@ -24,7 +24,13 @@ module Rouge
 
       def self.declarations
         @declarations ||= Set.new %w(
-          class deinit enum extension func import init let protocol static struct subscript typealias var
+          class deinit enum extension final func import init internal lazy let optional private protocol public required static struct subscript typealias var dynamic
+        )
+      end
+
+      def self.at_keywords
+        @at_keywords ||= %w(
+          autoclosure IBAction IBDesignable IBInspectable IBOutlet noreturn NSCopying NSManaged objc UIApplicationMain
         )
       end
 
@@ -34,6 +40,7 @@ module Rouge
           Double Float
           Bool
           String Character
+          AnyObject Any
         )
       end
 
@@ -64,7 +71,7 @@ module Rouge
         rule /0b[01]+(?:_[01]+)*/, Num::Bin
         rule %r{[\d]+(?:_\d+)*}, Num::Integer
 
-        rule /(?!\b(if|while|for)\b)\b#{id}(?=\s*[(])/, Name::Function
+        rule /(?!\b(if|while|for|private|internal|@objc)\b)\b#{id}(?=\s*[(])/, Name::Function
 
         rule /(#?#{id})(\s*)(:)/ do
           groups Name::Variable, Text, Punctuation
@@ -74,11 +81,27 @@ module Rouge
           groups Keyword, Text, Name::Variable
         end
 
+        rule /@(#{id})/ do |m|
+          if m[1] == 'objc'
+            token Keyword::Declaration
+            push :objc_setting
+          elsif self.class.at_keywords.include? m[1]
+            token Keyword
+          else
+            token Error
+          end
+        end
+
         rule id do |m|
           if self.class.keywords.include? m[0]
             token Keyword
           elsif self.class.declarations.include? m[0]
             token Keyword::Declaration
+            if %w(private internal).include? m[0]
+              push :access_control_setting
+            elsif %w(protocol class extension).include? m[0]
+              push :type_definition
+            end
           elsif self.class.types.include? m[0]
             token Keyword::Type
           elsif self.class.constants.include? m[0]
@@ -89,13 +112,31 @@ module Rouge
         end
         rule id, Name
       end
+      
+      state :access_control_setting do
+        rule /\( *(\w+) *\)/ do |m|
+          if m[1] == 'set'
+            token Keyword::Declaration
+          else
+            token Error
+          end
+        end
+        rule //, Keyword::Declaration, :pop!
+      end
+      
+      state :objc_setting do
+        rule /(\( *)(\w+)( *\))/ do |m|
+          token Keyword::Declaration, m[1]
+          token Name::Class, m[2]
+          token Keyword::Declaration, m[3]
+        end
+        rule //, Keyword::Declaration, :pop!
+      end
 
       state :dq do
         rule /\\[\\0tnr'"]/, Str::Escape
         rule /\\[(]/, Str::Escape, :interp
-        rule /\\x\h{2}/, Str::Escape
-        rule /\\u\h{4}/, Str::Escape
-        rule /\\U\h{8}/, Str::Escape
+        rule /\\u\{\h{1,8}\}/, Str::Escape
         rule /[^\\"]+/, Str
         rule /"/, Str, :pop!
       end
@@ -112,7 +153,7 @@ module Rouge
         mixin :root
       end
 
-      state :class do
+      state :type_definition do
         mixin :whitespace
         rule id, Name::Class, :pop!
       end
@@ -122,7 +163,6 @@ module Rouge
         rule /(?=[(])/, Text, :pop!
         rule /(#{id}|[.])+/, Name::Namespace, :pop!
       end
-
     end
   end
 end

data/lib/rouge/regex_lexer.rb

@@ -432,6 +432,7 @@ module Rouge
   private
     def yield_token(tok, val)
       return if val.nil? || val.empty?
+      puts "    yielding #{tok.qualname}, #{val.inspect}" if @debug
       @output_stream.yield(tok, val)
     end
   end

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "1.6.1"
+    "1.6.2"
   end
 end

data/rouge.gemspec

@@ -3,14 +3,14 @@ require './lib/rouge/version'
 Gem::Specification.new do |s|
   s.name = "rouge"
   s.version = Rouge.version
-  s.authors = ["Jay Adkisson"]
-  s.email = ["jjmadkisson@gmail.com"]
+  s.authors = ["Jeanine Adkisson"]
+  s.email = ["jneen@jneen.net"]
   s.summary = "A pure-ruby colorizer based on pygments"
   s.description = <<-desc.strip.gsub(/\s+/, ' ')
     Rouge aims to a be a simple, easy-to-extend drop-in replacement
     for pygments.
   desc
-  s.homepage = "http://github.com/jayferd/rouge"
+  s.homepage = "http://github.com/jneen/rouge"
   s.rubyforge_project = "rouge"
   s.files = Dir['Gemfile', 'LICENSE', 'rouge.gemspec', 'lib/**/*.rb', 'bin/rougify', 'lib/rouge/demos/*']
   s.executables = %w(rougify)

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
-- Jay Adkisson
+- Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
-- jjmadkisson@gmail.com
+- jneen@jneen.net
 executables:
 - rougify
 extensions: []
@@ -184,7 +184,7 @@ files:
 - lib/rouge/util.rb
 - lib/rouge/version.rb
 - rouge.gemspec
-homepage: http://github.com/jayferd/rouge
+homepage: http://github.com/jneen/rouge
 licenses:
 - MIT (see LICENSE file)
 metadata: {}