rouge 1.10.1 → 1.11.0

data/lib/rouge/lexers/tap.rb

@@ -0,0 +1,91 @@
+module Rouge
+  module Lexers
+    class Tap < RegexLexer
+      title 'TAP'
+      desc 'Test Anything Protocol'
+      tag 'tap'
+      aliases 'tap'
+      filenames '*.tap'
+
+      mimetypes 'text/x-tap', 'application/x-tap'
+
+      def self.analyze_text(text)
+        return 0
+      end
+
+      state :root do
+        # A TAP version may be specified.
+        rule /^TAP version \d+\n/, Name::Namespace
+
+        # Specify a plan with a plan line.
+        rule /^1\.\.\d+/, Keyword::Declaration, :plan
+
+        # A test failure
+        rule /^(not ok)([^\S\n]*)(\d*)/ do
+          groups Generic::Error, Text, Literal::Number::Integer
+          push :test
+        end
+
+        # A test success
+        rule /^(ok)([^\S\n]*)(\d*)/ do
+          groups Keyword::Reserved, Text, Literal::Number::Integer
+          push :test
+        end
+
+        # Diagnostics start with a hash.
+        rule /^#.*\n/, Comment
+
+        # TAP's version of an abort statement.
+        rule /^Bail out!.*\n/, Generic::Error
+
+        # # TAP ignores any unrecognized lines.
+        rule /^.*\n/, Text
+      end
+
+      state :plan do
+        # Consume whitespace (but not newline).
+        rule /[^\S\n]+/, Text
+
+        # A plan may have a directive with it.
+        rule /#/, Comment, :directive
+
+        # Or it could just end.
+        rule /\n/, Comment, :pop!
+
+        # Anything else is wrong.
+        rule /.*\n/, Generic::Error, :pop!
+      end
+
+      state :test do
+        # Consume whitespace (but not newline).
+        rule /[^\S\n]+/, Text
+
+        # A test may have a directive with it.
+        rule /#/, Comment, :directive
+
+        rule /\S+/, Text
+
+        rule /\n/, Text, :pop!
+      end
+
+      state :directive do
+        # Consume whitespace (but not newline).
+        rule /[^\S\n]+/, Comment
+
+        # Extract todo items.
+        rule /(?i)\bTODO\b/, Comment::Preproc
+
+        # Extract skip items.
+        rule /(?i)\bSKIP\S*/, Comment::Preproc
+
+        rule /\S+/, Comment
+
+        rule /\n/ do
+          token Comment
+          pop! 2
+        end
+      end
+    end
+  end
+end
+

data/lib/rouge/lexers/twig.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    load_lexer 'jinja.rb'
+
+    class Twig < Jinja
+      title "Twig"
+      desc "Twig template engine (twig.sensiolabs.org)"
+
+      tag "twig"
+
+      mimetypes 'application/x-twig', 'text/html+twig'
+
+      def self.keywords
+        @@keywords ||= %w(as do extends flush from import include use else starts
+                          ends with without autoescape endautoescape block endblock
+                          embed endembed filter endfilter for endfor if endif
+                          macro endmacro sandbox endsandbox set endset
+                          spaceless endspaceless verbatim endverbatim)
+      end
+
+      def self.tests
+        @@tests ||= %w(constant defined divisibleby empty even iterable null odd
+                       sameas)
+      end
+
+      def self.pseudo_keywords
+        @@pseudo_keywords ||= %w(true false none)
+      end
+
+      def self.word_operators
+        @@word_operators ||= %w(b-and b-or b-xor is in and or not)
+      end
+    end
+  end
+end

data/lib/rouge/lexers/typescript.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    load_lexer 'javascript.rb'
+
+    class Typescript < Javascript
+      title "TypeScript"
+      desc "TypeScript, a superset of JavaScript"
+
+      tag 'typescript'
+      aliases 'ts'
+      
+      filenames '*.ts', '*.d.ts'
+                
+      mimetypes 'text/typescript'
+
+      def self.keywords
+        @keywords ||= super + Set.new(%w(
+          import export from as is
+          namespace new static private protected public
+          super async await extends implements readonly
+        ))
+      end
+      
+      def self.declarations
+        @declarations ||= super + Set.new(%w(
+          const type constructor abstract
+        ))
+      end
+
+      def self.reserved
+        @reserved ||= super + Set.new(%w(
+          string any number namespace module
+          declare default interface         
+        ))
+      end
+      
+      def self.builtins
+        @builtins ||= super + %w(
+          Promise Set Map WeakSet WeakMap Symbol
+        )
+      end
+    end
+  end
+end

data/lib/rouge/lexers/verilog.rb

@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    class Verilog < RegexLexer
+      title "Verilog and System Verilog"
+      desc "The System Verilog hardware description language"
+      tag 'verilog'
+      filenames '*.v', '*.sv', '*.svh'
+      mimetypes 'text/x-verilog', 'text/x-systemverilog'
+
+      # optional comment or whitespace
+      ws = %r((?:\s|//.*?\n|/[*].*?[*]/)+)
+      id = /[a-zA-Z_][a-zA-Z0-9_]*/
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          alias always always_comb always_ff always_latch assert assert_strobe
+          assign assume automatic attribute before begin bind bins binsof break
+          case casex casez clocking config constraint context continue cover
+          covergroup coverpoint cross deassign defparam default design dist do
+          else end endattribute endcase endclass endclocking endconfig
+          endfunction endgenerate endgroup endinterface endmodule endpackage
+          endprimitive endprogram endproperty endspecify endsequence endtable
+          endtask expect export extends extern final first_match for force
+          foreach fork forkjoin forever function generate genvar if iff ifnone
+          ignore_bins illegal_bins import incdir include initial inside instance
+          interface intersect join join_any join_none liblist library local
+          localparam  matches module modport new noshowcancelled null package
+          parameter primitive priority program property protected
+          pulsestyle_onevent  pulsestyle_ondetect pure rand randc randcase
+          randsequence release return sequence showcancelled solve specify super
+          table task this throughout timeprecision timeunit type typedef unique
+          use wait wait_order while wildcard with within
+        )
+      end
+
+      def self.keywords_type
+        @keywords_type ||= Set.new %w(
+          and bit buf bufif0 bufif1 byte cell chandle class cmos const disable
+          edge enum event highz0 highz1 initial inout input int integer join
+          logic longint macromodule medium nand negedge nmos nor not
+          notif0 notif1 or output packed parameter pmos posedge pull0 pull1
+          pulldown pullup rcmos real realtime ref reg repeat rnmos rpmos rtran
+          rtranif0 rtranif1 scalared shortint shortreal signed  specparam
+          static string strength strong0 strong1 struct supply0 supply1 tagged
+          time tran tranif0 tranif1 tri tri0 tri1 triand trior trireg union
+          unsigned uwire var vectored virtual void wait wand weak[01] wire wor
+          xnor xor
+        )
+      end
+
+      def self.keywords_system_task
+        @keyword_system_task ||= Set.new %w(
+          acos acosh asin asinh assertfailoff assertfailon  assertkill
+          assertnonvacuouson assertoff asserton assertpassoff assertpasson
+          assertvacuousoff atan atan2 atanh bits bitstoreal  bitstoshortreal
+          cast ceil changed changed_gclk changing_gclk clog2 cos cosh countones
+          coverage_control coverage_get coverage_get_max coverage_merge
+          coverage_save dimensions display displayb displayh displayo
+          dist_chi_square dist_erlang dist_exponential dist_normal dist_poisson
+          dist_t dist_uniform dumpall dumpfile dumpflush dumplimit dumpoff
+          dumpon dumpports dumpportsall dumpportsflush dumpportslimit
+          dumpportsoff dumpportson dumpvars error exit exp falling_gclk fclose
+          fdisplay fdisplayb fdisplayh fdisplayo fell fell_gclk feof ferror
+          fflush fgetc fgets finish floor fmonitor fmonitorb fmonitorh fmonitoro
+          fopen fread fscanf fseek fstrobe fstrobeb fstrobeh fstrobeo ftell
+          future_gclk fwrite fwriteb fwriteh fwriteo get_coverage high hypot
+          increment info isunbounded isunknown itor left ln load_coverage_db
+          log10 low monitor monitorb monitorh monitoro monitoroff monitoron
+          onehot onehot0 past past_gclk pow printtimescale q_add q_exam q_full
+          q_initialize q_remove random readmemb readmemh realtime realtobits
+          rewind right rising_gclk rose rose_gclk rtoi sampled
+          set_coverage_db_name sformat sformatf shortrealtobits signed sin sinh
+          size sqrt sscanf stable stable_gclk steady_gclk stime stop strobe
+          strobeb strobeh strobeo swrite swriteb swriteh swriteo system tan tanh
+          time timeformat typename ungetc unpacked_dimensions unsigned warning
+          write writeb writeh writememb writememh writeo
+        )
+      end
+
+      state :expr_bol do
+        mixin :inline_whitespace
+        rule /`define/, Comment::Preproc, :macro
+
+        rule(//) { pop! }
+      end
+
+      # :expr_bol is the same as :bol but without labels, since
+      # labels can only appear at the beginning of a statement.
+      state :bol do
+        rule /#{id}:(?!:)/, Name::Label
+        mixin :expr_bol
+      end
+
+      state :inline_whitespace do
+        rule /[ \t\r]+/, Text
+        rule /\\\n/, Text # line continuation
+        rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
+      end
+
+      state :whitespace do
+        rule /\n+/m, Text, :bol
+        rule %r(//(\\.|.)*?\n), Comment::Single, :bol
+        mixin :inline_whitespace
+      end
+
+      state :expr_whitespace do
+        rule /\n+/m, Text, :expr_bol
+        mixin :whitespace
+      end
+
+      state :string do
+        rule /"/, Str, :pop!
+        rule /\\([\\abfnrtv"']|x[a-fA-F0-9]{2,4}|[0-7]{1,3})/, Str::Escape
+        rule /[^\\"\n]+/, Str
+        rule /\\\n/, Str
+        rule /\\/, Str # stray backslash
+      end
+
+      state :statement do
+        mixin :whitespace
+        rule /L?"/, Str, :string
+        rule /(\d+\.\d*|\d*\.\d+)(e[+-]?[0-9]+)?/i, Num::Float
+        rule /\d+e[+-]?[0-9]+/i, Num::Float
+        rule /[0-9]*'h[0-9a-fA-F]+/, Num::Hex
+        rule /[0-9]*'b?[01xz]+/, Num::Bin
+        rule /[0-9]*'d[0-9]+/, Num::Integer
+        rule /\d+[lu]*/i, Num::Integer
+        rule %r([~!%^&*+-=\|?:<>/@{}]), Operator
+        rule /[()\[\],.$\#]/, Punctuation
+        rule /`(\w+)/, Comment::Preproc
+
+        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.keywords_system_task.include? name
+            token Name::Builtin
+          else
+            token Name
+          end
+        end
+      end
+
+      state :root do
+        mixin :expr_whitespace
+        rule(//) { push :statement }
+      end
+
+      state :macro do
+        rule /\n/, Comment::Preproc, :pop!
+        mixin :inline_whitespace
+        rule /;/, Punctuation
+        rule /\=/, Operator
+        rule /(\w+)/, Text
+      end
+
+    end
+  end
+end

data/lib/rouge/regex_lexer.rb

@@ -191,7 +191,7 @@ module Rouge
       replace_state(name, dsl.prepended(&b))
     end
 
-    def self.append(state, &b)
+    def self.append(name, &b)
       name = name.to_s
       dsl = state_definitions[name] or raise "no such state #{name.inspect}"
       replace_state(name, dsl.appended(&b))

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "1.10.1"
+    "1.11.0"
   end
 end

data/rouge.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "rouge"
   s.files = Dir['Gemfile', 'LICENSE', 'rouge.gemspec', 'lib/**/*.rb', 'lib/**/*.yml', 'bin/rougify', 'lib/rouge/demos/*']
   s.executables = %w(rougify)
-  s.license = 'MIT (see LICENSE file)'
+  s.license = 'MIT, 2-clause BSD'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -23,25 +23,35 @@ files:
 - bin/rougify
 - lib/rouge.rb
 - lib/rouge/cli.rb
+- lib/rouge/demos/actionscript
 - lib/rouge/demos/apache
+- lib/rouge/demos/apiblueprint
 - lib/rouge/demos/applescript
+- lib/rouge/demos/biml
 - lib/rouge/demos/c
+- lib/rouge/demos/ceylon
 - lib/rouge/demos/clojure
+- lib/rouge/demos/cmake
 - lib/rouge/demos/coffeescript
 - lib/rouge/demos/common_lisp
 - lib/rouge/demos/conf
+- lib/rouge/demos/coq
 - lib/rouge/demos/cpp
 - lib/rouge/demos/csharp
 - lib/rouge/demos/css
+- lib/rouge/demos/d
 - lib/rouge/demos/dart
 - lib/rouge/demos/diff
+- lib/rouge/demos/eiffel
 - lib/rouge/demos/elixir
 - lib/rouge/demos/erb
 - lib/rouge/demos/erlang
 - lib/rouge/demos/factor
+- lib/rouge/demos/fortran
 - lib/rouge/demos/gherkin
 - lib/rouge/demos/glsl
 - lib/rouge/demos/go
+- lib/rouge/demos/gradle
 - lib/rouge/demos/groovy
 - lib/rouge/demos/haml
 - lib/rouge/demos/handlebars
@@ -52,8 +62,11 @@ files:
 - lib/rouge/demos/io
 - lib/rouge/demos/java
 - lib/rouge/demos/javascript
+- lib/rouge/demos/jinja
 - lib/rouge/demos/json
 - lib/rouge/demos/json-doc
+- lib/rouge/demos/jsonnet
+- lib/rouge/demos/julia
 - lib/rouge/demos/liquid
 - lib/rouge/demos/literate_coffeescript
 - lib/rouge/demos/literate_haskell
@@ -63,6 +76,7 @@ files:
 - lib/rouge/demos/markdown
 - lib/rouge/demos/matlab
 - lib/rouge/demos/moonscript
+- lib/rouge/demos/nasm
 - lib/rouge/demos/nginx
 - lib/rouge/demos/nim
 - lib/rouge/demos/objective_c
@@ -74,6 +88,7 @@ files:
 - lib/rouge/demos/praat
 - lib/rouge/demos/prolog
 - lib/rouge/demos/properties
+- lib/rouge/demos/protobuf
 - lib/rouge/demos/puppet
 - lib/rouge/demos/python
 - lib/rouge/demos/qml
@@ -87,47 +102,62 @@ files:
 - lib/rouge/demos/scss
 - lib/rouge/demos/sed
 - lib/rouge/demos/shell
+- lib/rouge/demos/shell_session
 - lib/rouge/demos/slim
 - lib/rouge/demos/smalltalk
+- lib/rouge/demos/smarty
 - lib/rouge/demos/sml
 - lib/rouge/demos/sql
 - lib/rouge/demos/swift
+- lib/rouge/demos/tap
 - lib/rouge/demos/tcl
 - lib/rouge/demos/tex
 - lib/rouge/demos/toml
 - lib/rouge/demos/tulip
+- lib/rouge/demos/twig
+- lib/rouge/demos/typescript
 - lib/rouge/demos/vb
+- lib/rouge/demos/verilog
 - lib/rouge/demos/viml
 - lib/rouge/demos/xml
 - lib/rouge/demos/yaml
 - lib/rouge/formatter.rb
 - lib/rouge/formatters/html.rb
-- lib/rouge/formatters/html_inline.rb
-- lib/rouge/formatters/html_linewise.rb
+- lib/rouge/formatters/html_wrapper.rb
 - lib/rouge/formatters/null.rb
 - lib/rouge/formatters/terminal256.rb
 - lib/rouge/lexer.rb
+- lib/rouge/lexers/actionscript.rb
 - lib/rouge/lexers/apache.rb
 - lib/rouge/lexers/apache/keywords.yml
+- lib/rouge/lexers/apiblueprint.rb
 - lib/rouge/lexers/apple_script.rb
+- lib/rouge/lexers/biml.rb
 - lib/rouge/lexers/c.rb
+- lib/rouge/lexers/ceylon.rb
 - lib/rouge/lexers/clojure.rb
+- lib/rouge/lexers/cmake.rb
 - lib/rouge/lexers/coffeescript.rb
 - lib/rouge/lexers/common_lisp.rb
 - lib/rouge/lexers/conf.rb
+- lib/rouge/lexers/coq.rb
 - lib/rouge/lexers/cpp.rb
 - lib/rouge/lexers/csharp.rb
 - lib/rouge/lexers/css.rb
+- lib/rouge/lexers/d.rb
 - lib/rouge/lexers/dart.rb
 - lib/rouge/lexers/diff.rb
+- lib/rouge/lexers/eiffel.rb
 - lib/rouge/lexers/elixir.rb
 - lib/rouge/lexers/erb.rb
 - lib/rouge/lexers/erlang.rb
 - lib/rouge/lexers/factor.rb
+- lib/rouge/lexers/fortran.rb
 - lib/rouge/lexers/gherkin.rb
 - lib/rouge/lexers/gherkin/keywords.rb
 - lib/rouge/lexers/glsl.rb
 - lib/rouge/lexers/go.rb
+- lib/rouge/lexers/gradle.rb
 - lib/rouge/lexers/groovy.rb
 - lib/rouge/lexers/haml.rb
 - lib/rouge/lexers/handlebars.rb
@@ -138,6 +168,9 @@ files:
 - lib/rouge/lexers/io.rb
 - lib/rouge/lexers/java.rb
 - lib/rouge/lexers/javascript.rb
+- lib/rouge/lexers/jinja.rb
+- lib/rouge/lexers/jsonnet.rb
+- lib/rouge/lexers/julia.rb
 - lib/rouge/lexers/liquid.rb
 - lib/rouge/lexers/literate_coffeescript.rb
 - lib/rouge/lexers/literate_haskell.rb
@@ -149,6 +182,7 @@ files:
 - lib/rouge/lexers/matlab.rb
 - lib/rouge/lexers/matlab/builtins.rb
 - lib/rouge/lexers/moonscript.rb
+- lib/rouge/lexers/nasm.rb
 - lib/rouge/lexers/nginx.rb
 - lib/rouge/lexers/nim.rb
 - lib/rouge/lexers/objective_c.rb
@@ -161,6 +195,7 @@ files:
 - lib/rouge/lexers/praat.rb
 - lib/rouge/lexers/prolog.rb
 - lib/rouge/lexers/properties.rb
+- lib/rouge/lexers/protobuf.rb
 - lib/rouge/lexers/puppet.rb
 - lib/rouge/lexers/python.rb
 - lib/rouge/lexers/qml.rb
@@ -175,16 +210,22 @@ files:
 - lib/rouge/lexers/scss.rb
 - lib/rouge/lexers/sed.rb
 - lib/rouge/lexers/shell.rb
+- lib/rouge/lexers/shell_session.rb
 - lib/rouge/lexers/slim.rb
 - lib/rouge/lexers/smalltalk.rb
+- lib/rouge/lexers/smarty.rb
 - lib/rouge/lexers/sml.rb
 - lib/rouge/lexers/sql.rb
 - lib/rouge/lexers/swift.rb
+- lib/rouge/lexers/tap.rb
 - lib/rouge/lexers/tcl.rb
 - lib/rouge/lexers/tex.rb
 - lib/rouge/lexers/toml.rb
 - lib/rouge/lexers/tulip.rb
+- lib/rouge/lexers/twig.rb
+- lib/rouge/lexers/typescript.rb
 - lib/rouge/lexers/vb.rb
+- lib/rouge/lexers/verilog.rb
 - lib/rouge/lexers/viml.rb
 - lib/rouge/lexers/viml/keywords.rb
 - lib/rouge/lexers/xml.rb
@@ -207,7 +248,7 @@ files:
 - rouge.gemspec
 homepage: http://rouge.jneen.net/
 licenses:
-- MIT (see LICENSE file)
+- MIT, 2-clause BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -225,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rouge
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments