rouge 3.13.0 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05162378ada50863a8c1a08984934c22af14e5288510b83fef150bae1f6be77
-  data.tar.gz: c3785466ac705a0acac1af6d60f73c0a697fa4b7504874b8d58db6a2efcaf21d
+  metadata.gz: d43552856d88e799ffb7f4255d865641bfaafd5dac3945b2646540ff816628c4
+  data.tar.gz: 5768d921766cf2eb677fc63e783b707ee0f52a7320b73f4bbbc333ee14e79f77
 SHA512:
-  metadata.gz: cffd7cde0caf543698b605bbdf64394a529c4fb11c025bd6ffa00d04d336f8a5cff8663d3d5a7e3f57a0f061d152d01914e2c3fbeaead37d6daf37ea491169bc
-  data.tar.gz: faefcadccccee11a7e896fc408dcbfddf858c73f44697b5961777285e4f7d878fcd7ee0eefd3d42a9cd5442946dfc9ded90d6875b5d12771a6bd1eb631b57c43
+  metadata.gz: fdfd25582e56396cb78b370372b4587b243c1608fa7d4ee32a9659f13fc8939bba2305b5add8d83569543766eefed1abbb8ff5f0d76593964db2b3624b1d112b
+  data.tar.gz: 5d2f0526caf091491969d89180fab9a30441ddc5390bbb10c8acb2ea8b9af96b044e91ed32e6db58fa9783a12c530eb3a25d829f031c0ecb7a7e02858592da57

data/lib/rouge/demos/nesasm

@@ -0,0 +1,11 @@
+  .bank 0
+  .org $C000
+Reset:	
+        jsr WaitSync	; wait for VSYNC
+        jsr ClearRAM	; clear RAM
+        jsr WaitSync	; wait for VSYNC (and PPU warmup)
+
+	lda #$3f	; $3F -> A register
+        ldy #$00	; $00 -> Y register
+        sta PPU_ADDR	; write #HIGH byte first
+        sty PPU_ADDR    ; $3F00 -> PPU address

data/lib/rouge/demos/slice

@@ -0,0 +1,10 @@
+// Printer.ice
+module Demo
+{
+    interface Printer
+    {
+        // A client can invoke this operation on a server.
+        // In this example we print the string s
+        void printString(string s);
+    }
+}

data/lib/rouge/lexers/d.rb

@@ -48,7 +48,7 @@ module Rouge
       state :root do
         mixin :whitespace
         # Comments
-        rule %r(//(.*?)\n), Comment::Single
+        rule %r(//.*), Comment::Single
         rule %r(/(\\\n)?[*](.|\n)*?[*](\\\n)?/), Comment::Multiline
         rule %r(/\+), Comment::Multiline, :nested_comment
         # Keywords

data/lib/rouge/lexers/dot.rb

@@ -17,8 +17,8 @@ module Rouge
 
       state :comments_and_whitespace do
         rule %r/\s+/, Text
-        rule %r(#.*?\n), Comment::Single
-        rule %r(//.*?\n), Comment::Single
+        rule %r(#.*), Comment::Single
+        rule %r(//.*?$), Comment::Single
         rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
       end
 

data/lib/rouge/lexers/io.rb

@@ -27,8 +27,8 @@ module Rouge
 
       state :root do
         rule %r/\s+/m, Text
-        rule %r(//.*?\n), Comment::Single
-        rule %r(#.*?\n), Comment::Single
+        rule %r(//.*), Comment::Single
+        rule %r(#.*), Comment::Single
         rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
         rule %r(/[+]), Comment::Multiline, :nested_comment
 

data/lib/rouge/lexers/json_doc.rb

@@ -6,16 +6,17 @@ module Rouge
     load_lexer 'json.rb'
 
     class JSONDOC < JSON
-      desc "JavaScript Object Notation with extenstions for documentation"
+      desc "JavaScript Object Notation with extensions for documentation"
       tag 'json-doc'
 
-      prepend :root do
+      prepend :name do
         rule %r/([$\w]+)(\s*)(:)/ do
           groups Name::Attribute, Text, Punctuation
         end
+      end
 
+      prepend :value do
         rule %r(/[*].*?[*]/), Comment
-
         rule %r(//.*?$), Comment::Single
         rule %r/(\.\.\.)/, Comment::Single
       end

data/lib/rouge/lexers/liquid.rb

@@ -266,7 +266,7 @@ module Rouge
         end
 
         rule %r/(with|for)\b/, Name::Tag
-        rule %r/[^\s\.]+(\.[^\s\.]+)+\b/, Name::Other
+        rule %r/[\/\w-]+(\.[\w-]+)+\b/, Text
 
         mixin :variable_tag_markup
       end

data/lib/rouge/lexers/m68k.rb

@@ -87,8 +87,8 @@ module Rouge
 
       state :whitespace do
         rule %r/\n+/m, Text, :expr_bol
-        rule %r(^\*(\\.|.)*?\n), Comment::Single, :expr_bol
-        rule %r(;(\\.|.)*?\n), Comment::Single, :expr_bol
+        rule %r(^\*(\\.|.)*?$), Comment::Single, :expr_bol
+        rule %r(;(\\.|.)*?$), Comment::Single, :expr_bol
         mixin :inline_whitespace
       end
 

data/lib/rouge/lexers/magik.rb

@@ -22,7 +22,7 @@ module Rouge
            _throw
            _lock _endlock
            _if _then _elif _else _endif
-           _for _over _while _loop _endloop _loopbody _continue _leave
+           _for _over _while _loop _finally _endloop _loopbody _continue _leave
            _return
            _class
            _local _constant _recursive _global _dynamic _import

data/lib/rouge/lexers/nesasm.rb

@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class NesAsm < RegexLexer
+      title "NesAsm"
+      desc "Nesasm3 assembly (6502 asm)"
+      tag 'nesasm'
+      aliases 'nes'
+      filenames '*.nesasm'
+
+      def self.keywords
+        @keywords ||= %w(
+          ADC AND ASL BIT BRK CMP CPX CPY DEC EOR INC JMP JSR LDA LDX LDY LSR
+          NOP ORA ROL ROR RTI RTS SBC STA STX STY TAX TXA DEX INX TAY TYA DEY
+          INY BPL BMI BVC BVS BCC BCS BNE BEQ CLC SEC CLI SEI CLV CLD SED TXS
+          TSX PHA PLA PHP PLP
+        )
+      end
+
+      def self.keywords_type
+        @keywords_type ||= %w(
+          DB DW BYTE WORD 
+        )
+      end
+
+      def self.keywords_reserved
+        @keywords_reserved ||= %w(
+          INCBIN INCLUDE ORG BANK RSSET RS MACRO ENDM DS PROC ENDP PROCGROUP
+          ENDPROCGROUP INCCHR DEFCHR ZP BSS CODE DATA IF IFDEF IFNDEF ELSE
+          ENDIF FAIL INESPRG INESCHR INESMAP INESMIR FUNC
+        )
+      end
+      
+      state :root do
+        rule %r/\s+/m, Text
+        rule %r(;.*), Comment::Single
+
+        rule %r/[\(\)\,\.\[\]]/, Punctuation 
+        rule %r/\#?\%[0-1]+/, Num::Bin # #%00110011 %00110011
+        rule %r/\#?\$\h+/, Num::Hex  # $1f #$1f
+        rule %r/\#?\d+/, Num # 10 #10
+        rule %r([~&*+=\|?:<>/-]), Operator
+
+        rule %r/\#?\w+:?/i do |m|
+          name = m[0].upcase
+          
+          if self.class.keywords.include? name
+            token Keyword
+          elsif self.class.keywords_type.include? name
+            token Keyword::Type
+          elsif self.class.keywords_reserved.include? name
+            token Keyword::Reserved
+          else
+            token Name::Function
+          end
+        end
+
+        rule %r/\#?(?:LOW|HIGH)\(.*\)/i, Keyword::Reserved # LOW() #HIGH()
+        
+        rule %r/\#\(/, Punctuation # #()
+
+        rule %r/"/, Str, :string
+
+        rule %r/'\w'/, Str::Char # 'A' for example
+        
+        rule %r/\\\??[\d@#]/, Name::Builtin # builtin parameters for use inside macros and functions:   \1-\9 , \?1-\?9 , \# , \@
+      end
+
+      state :string do
+        rule %r/"/, Str, :pop!
+        rule %r/\\"?/, Str::Escape
+        rule %r/[^"\\]+/m, Str
+      end
+    end
+  end
+end

data/lib/rouge/lexers/nginx.rb

@@ -41,7 +41,7 @@ module Rouge
       state :base do
         rule %r/\s+/, Text
 
-        rule %r/#.*?\n/, Comment::Single
+        rule %r/#.*/, Comment::Single
         rule %r/(?:on|off)\b/, Name::Constant
         rule %r/[$][\w-]+/, Name::Variable
 

data/lib/rouge/lexers/pony.rb

@@ -46,7 +46,7 @@ module Rouge
       state :root do
         mixin :whitespace
         rule %r/"""/, Str::Doc, :docstring
-        rule %r{//(.*?)\n}, Comment::Single
+        rule %r{//.*}, Comment::Single
         rule %r{/(\\\n)?[*](.|\n)*?[*](\\\n)?/}, Comment::Multiline
         rule %r/"/, Str, :string
         rule %r([~!%^&*+=\|?:<>/-]), Operator

data/lib/rouge/lexers/protobuf.rb

@@ -17,7 +17,7 @@ module Rouge
       state :root do
         rule %r/[\s]+/, Text
         rule %r/[,;{}\[\]()]/, Punctuation
-        rule %r/\/(\\\n)?\/(\n|(.|\n)*?[^\\]\n)/, Comment::Single
+        rule %r/\/(\\\n)?\/($|(.|\n)*?[^\\]$)/, Comment::Single
         rule %r/\/(\\\n)?\*(.|\n)*?\*(\\\n)?\//, Comment::Multiline
         rule kw, Keyword
         rule datatype, Keyword::Type

data/lib/rouge/lexers/scala.rb

@@ -43,7 +43,7 @@ module Rouge
         rule %r/'#{idrest}[^']/, Str::Symbol
         rule %r/[^\S\n]+/, Text
 
-        rule %r(//.*?\n), Comment::Single
+        rule %r(//.*), Comment::Single
         rule %r(/\*), Comment::Multiline, :comment
 
         rule %r/@#{idrest}/, Name::Decorator
@@ -117,7 +117,7 @@ module Rouge
         rule %r/\s+/, Text
         rule %r/{/, Operator, :pop!
         rule %r/\(/, Operator, :pop!
-        rule %r(//.*?\n), Comment::Single, :pop!
+        rule %r(//.*), Comment::Single, :pop!
         rule %r(#{idrest}|#{op}+|`[^`]+`), Name::Class, :pop!
       end
 
@@ -142,7 +142,7 @@ module Rouge
           pop!
         end
 
-        rule %r(//.*?\n), Comment::Single, :pop!
+        rule %r(//.*), Comment::Single, :pop!
         rule %r/\.|#{idrest}|#{op}+|`[^`]+`/, Keyword::Type
       end
 

data/lib/rouge/lexers/sieve.rb

@@ -58,7 +58,7 @@ module Rouge
 
       state :comments_and_whitespace do
         rule %r/\s+/, Text
-        rule %r(#.*?\n), Comment::Single
+        rule %r(#.*), Comment::Single
         rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
       end
 

data/lib/rouge/lexers/slice.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    load_lexer 'c.rb'
+
+    class Slice < C
+      tag 'slice'
+      filenames '*.ice'
+      mimetypes 'text/slice'
+
+      title "Slice"
+      desc "Specification Language for Ice (doc.zeroc.com)"
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          extends implements enum interface struct class module dictionary
+          const optional out throws exception local idempotent sequence
+
+          Object LocalObject Value
+        )
+      end
+
+      def self.keywords_type
+        @keywords_type ||= Set.new %w(
+          bool string byte long float double int void short
+        )
+      end
+    end
+  end
+end

data/lib/rouge/lexers/sqf.rb

@@ -65,7 +65,7 @@ module Rouge
 
         # Preprocessor instructions
         rule %r"/\*.*?\*/"m, Comment::Multiline
-        rule %r"//.*\n", Comment::Single
+        rule %r"//.*", Comment::Single
         rule %r"#(define|undef|if(n)?def|else|endif|include)", Comment::Preproc
         rule %r"\\\r?\n", Comment::Preproc
         rule %r"__(EVAL|EXEC|LINE__|FILE__)", Name::Builtin

data/lib/rouge/lexers/toml.rb

@@ -17,6 +17,12 @@ module Rouge
         rule %r/\s+/, Text
         rule %r/#.*?$/, Comment
         rule %r/(true|false)/, Keyword::Constant
+
+        rule %r/(\S+)(\s*)(=)(\s*)(\{)/ do |m|
+          groups Name::Namespace, Text, Operator, Text, Punctuation
+          push :inline
+        end
+
         rule %r/(?<!=)\s*\[[\S]+\]/, Name::Namespace
 
         rule %r/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, Literal::Date
@@ -33,7 +39,6 @@ module Rouge
           groups Name::Property, Text, Punctuation
           push :value
         end
-
       end
 
       state :value do
@@ -63,6 +68,16 @@ module Rouge
         mixin :content
         rule %r/\]/, Punctuation, :pop!
       end
+
+      state :inline do
+        mixin :content
+
+        rule %r/(#{identifier})(\s*)(=)/ do
+          groups Name::Property, Text, Punctuation
+        end
+
+        rule %r/\}/, Punctuation, :pop!
+      end
     end
   end
 end

data/lib/rouge/lexers/verilog.rb

@@ -100,7 +100,7 @@ module Rouge
 
       state :whitespace do
         rule %r/\n+/m, Text, :bol
-        rule %r(//(\\.|.)*?\n), Comment::Single, :bol
+        rule %r(//(\\.|.)*?$), Comment::Single, :bol
         mixin :inline_whitespace
       end
 

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "3.13.0"
+    "3.14.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.14.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -130,6 +130,7 @@ files:
 - lib/rouge/demos/msgtrans
 - lib/rouge/demos/mxml
 - lib/rouge/demos/nasm
+- lib/rouge/demos/nesasm
 - lib/rouge/demos/nginx
 - lib/rouge/demos/nim
 - lib/rouge/demos/nix
@@ -167,6 +168,7 @@ files:
 - lib/rouge/demos/sed
 - lib/rouge/demos/shell
 - lib/rouge/demos/sieve
+- lib/rouge/demos/slice
 - lib/rouge/demos/slim
 - lib/rouge/demos/smalltalk
 - lib/rouge/demos/smarty
@@ -331,6 +333,7 @@ files:
 - lib/rouge/lexers/msgtrans.rb
 - lib/rouge/lexers/mxml.rb
 - lib/rouge/lexers/nasm.rb
+- lib/rouge/lexers/nesasm.rb
 - lib/rouge/lexers/nginx.rb
 - lib/rouge/lexers/nim.rb
 - lib/rouge/lexers/nix.rb
@@ -371,6 +374,7 @@ files:
 - lib/rouge/lexers/sed.rb
 - lib/rouge/lexers/shell.rb
 - lib/rouge/lexers/sieve.rb
+- lib/rouge/lexers/slice.rb
 - lib/rouge/lexers/slim.rb
 - lib/rouge/lexers/smalltalk.rb
 - lib/rouge/lexers/smarty.rb