rouge 3.3.0 → 3.8.0

data/lib/rouge/lexers/msgtrans.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class MsgTrans < RegexLexer
+      title "MessageTrans"
+      desc "RISC OS message translator messages file"
+      tag 'msgtrans'
+      filenames 'Messages', 'Message[0-9]', 'Message[1-9][0-9]', 'Message[1-9][0-9][0-9]'
+
+      state :root do
+        rule %r/^#[^\n]*/, Comment
+        rule %r/[^\t\n\r ,):?\/]+/, Name::Variable
+        rule %r/[\n\/?]/, Operator
+        rule %r/:/, Operator, :value
+      end
+
+      state :value do
+        rule %r/\n/, Text, :pop!
+        rule %r/%[0-3%]/, Operator
+        rule %r/[^\n%]/, Literal::String
+      end
+    end
+  end
+end

data/lib/rouge/lexers/mxml.rb

@@ -11,56 +11,56 @@ module Rouge
       mimetypes 'application/xv+xml'
 
       state :root do
-        rule /[^<&]+/, Text
-        rule /&\S*?;/, Name::Entity
+        rule %r/[^<&]+/, Text
+        rule %r/&\S*?;/, Name::Entity
 
-        rule /<!\[CDATA\[/m do
+        rule %r/<!\[CDATA\[/m do
           token Comment::Preproc
           push :actionscript_content
         end
 
-        rule /<!--/, Comment, :comment
-        rule /<\?.*?\?>/, Comment::Preproc
-        rule /<![^>]*>/, Comment::Preproc
+        rule %r/<!--/, Comment, :comment
+        rule %r/<\?.*?\?>/, Comment::Preproc
+        rule %r/<![^>]*>/, Comment::Preproc
 
         rule %r(<\s*[\w:.-]+)m, Name::Tag, :tag # opening tags
         rule %r(<\s*/\s*[\w:.-]+\s*>)m, Name::Tag # closing tags
       end
 
       state :comment do
-        rule /[^-]+/m, Comment
-        rule /-->/, Comment, :pop!
-        rule /-/, Comment
+        rule %r/[^-]+/m, Comment
+        rule %r/-->/, Comment, :pop!
+        rule %r/-/, Comment
       end
 
       state :tag do
-        rule /\s+/m, Text
-        rule /[\w.:-]+\s*=/m, Name::Attribute, :attribute
+        rule %r/\s+/m, Text
+        rule %r/[\w.:-]+\s*=/m, Name::Attribute, :attribute
         rule %r(/?\s*>), Name::Tag, :root
       end
 
       state :attribute do
-        rule /\s+/m, Text
-        rule /(")({|@{)/m do
+        rule %r/\s+/m, Text
+        rule %r/(")({|@{)/m do
           groups Str, Punctuation
           push :actionscript_attribute
         end
-        rule /".*?"|'.*?'|[^\s>]+/, Str, :tag
+        rule %r/".*?"|'.*?'|[^\s>]+/, Str, :tag
       end
 
       state :actionscript_content do
-        rule /\]\]\>/m, Comment::Preproc, :pop!
-        rule /.*?(?=\]\]\>)/m do
+        rule %r/\]\]\>/m, Comment::Preproc, :pop!
+        rule %r/.*?(?=\]\]\>)/m do
           delegate Actionscript
         end
       end
 
       state :actionscript_attribute do
-        rule /(})(")/m do
+        rule %r/(})(")/m do
           groups Punctuation, Str
           push :tag
         end
-        rule /.*?(?=}")/m do
+        rule %r/.*?(?=}")/m do
           delegate Actionscript
         end
       end

data/lib/rouge/lexers/nasm.rb

@@ -11,7 +11,6 @@ module Rouge
       title "Nasm"
       desc "Netwide Assembler"
 
-      ws = %r((?:\s|;.*?\n/)+)
       id = /[a-zA-Z_][a-zA-Z0-9_]*/
 
       #todo: pull more instructions from: http://www.nasm.us/doc/nasmdocb.html
@@ -119,57 +118,57 @@ module Rouge
       end
 
       state :inline_whitespace do
-        rule /[ \t\r]+/, Text
+        rule %r/[ \t\r]+/, Text
       end
 
       state :whitespace do
-        rule /\n+/m, Text, :expr_bol
+        rule %r/\n+/m, Text, :expr_bol
         rule %r(//(\\.|.)*?\n), Comment::Single, :expr_bol
         mixin :inline_whitespace
       end
 
       state :expr_whitespace do
-        rule /\n+/m, Text, :expr_bol
+        rule %r/\n+/m, Text, :expr_bol
         mixin :whitespace
       end
 
       state :root do
         mixin :expr_whitespace
         rule(//) { push :statement }
-        rule /^%[a-zA-Z0-9]+/, Comment::Preproc, :statement
+        rule %r/^%[a-zA-Z0-9]+/, Comment::Preproc, :statement
 
         rule(
           %r(&=|[*]=|/=|\\=|\^=|\+=|-=|<<=|>>=|<<|>>|:=|<=|>=|<>|[-&*/\\^+=<>.]),
           Operator
         )
-        rule /;.*/, Comment, :statement
-        rule /^[a-zA-Z]+[a-zA-Z0-9]*:/, Name::Function
-        rule /;.*/, Comment
+        rule %r/;.*/, Comment, :statement
+        rule %r/^[a-zA-Z]+[a-zA-Z0-9]*:/, Name::Function
+        rule %r/;.*/, Comment
       end
 
       state :statement do
         mixin :expr_whitespace
         mixin :statements
-        rule /;.*/, Comment
-        rule /^%[a-zA-Z0-9]+/, Comment::Preproc
-        rule /[a-zA-Z]+%[0-9]+:/, Name::Function
+        rule %r/;.*/, Comment
+        rule %r/^%[a-zA-Z0-9]+/, Comment::Preproc
+        rule %r/[a-zA-Z]+%[0-9]+:/, Name::Function
       end
 
       state :statements do
         mixin :whitespace
-        rule /L?"/, Str, :string
-        rule /[a-zA-Z]+%[0-9]+:/, Name::Function  #labels/subroutines/functions
+        rule %r/L?"/, Str, :string
+        rule %r/[a-zA-Z]+%[0-9]+:/, Name::Function  #labels/subroutines/functions
         rule %r(L?'(\\.|\\[0-7]{1,3}|\\x[a-f0-9]{1,2}|[^\\'\n])')i, Str::Char
-        rule /0x[0-9a-f]+[lu]*/i, Num::Hex
-        rule /\d+[lu]*/i, Num::Integer
+        rule %r/0x[0-9a-f]+[lu]*/i, Num::Hex
+        rule %r/\d+[lu]*/i, Num::Integer
         rule %r(\*/), Error
         rule %r([~&*+=\|?:<>/-]), Operator
-        rule /[(),.]/, Punctuation
-        rule /\[[a-zA-Z0-9]*\]/, Punctuation
-        rule /%[0-9]+/, Keyword::Reserved
-        rule /[a-zA-Z]+%[0-9]+/, Name::Function  #labels/subroutines/functions
+        rule %r/[(),.]/, Punctuation
+        rule %r/\[[a-zA-Z0-9]*\]/, Punctuation
+        rule %r/%[0-9]+/, Keyword::Reserved
+        rule %r/[a-zA-Z]+%[0-9]+/, Name::Function  #labels/subroutines/functions
 
-        #rule /(?<!\.)#{id}/ do |m|
+        #rule %r/(?<!\.)#{id}/ do |m|
         rule id do |m|
           name = m[0]
 
@@ -188,11 +187,11 @@ module Rouge
       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
+        rule %r/"/, Str, :pop!
+        rule %r/\\([\\abfnrtv"']|x[a-fA-F0-9]{2,4}|[0-7]{1,3})/, Str::Escape
+        rule %r/[^\\"\n]+/, Str
+        rule %r/\\\n/, Str
+        rule %r/\\/, Str # stray backslash
       end
     end
   end

data/lib/rouge/lexers/nginx.rb

@@ -13,7 +13,7 @@ module Rouge
       id = /[^\s$;{}()#]+/
 
       state :root do
-        rule /(include)(\s+)([^\s;]+)/ do
+        rule %r/(include)(\s+)([^\s;]+)/ do
           groups Keyword, Text, Name
         end
 
@@ -23,49 +23,49 @@ module Rouge
       end
 
       state :block do
-        rule /}/, Punctuation, :pop!
+        rule %r/}/, Punctuation, :pop!
         rule id, Keyword::Namespace, :statement
         mixin :base
       end
 
       state :statement do
-        rule /{/ do
+        rule %r/{/ do
           token Punctuation; pop!; push :block
         end
 
-        rule /;/, Punctuation, :pop!
+        rule %r/;/, Punctuation, :pop!
 
         mixin :base
       end
 
       state :base do
-        rule /\s+/, Text
+        rule %r/\s+/, Text
 
-        rule /#.*?\n/, Comment::Single
-        rule /(?:on|off)\b/, Name::Constant
-        rule /[$][\w-]+/, Name::Variable
+        rule %r/#.*?\n/, Comment::Single
+        rule %r/(?:on|off)\b/, Name::Constant
+        rule %r/[$][\w-]+/, Name::Variable
 
         # host/port
-        rule /([a-z0-9.-]+)(:)([0-9]+)/i do
+        rule %r/([a-z0-9.-]+)(:)([0-9]+)/i do
           groups Name::Function, Punctuation, Num::Integer
         end
 
         # mimetype
         rule %r([a-z-]+/[a-z-]+)i, Name::Class
 
-        rule /[0-9]+[kmg]?\b/i, Num::Integer
-        rule /(~)(\s*)([^\s{]+)/ do
+        rule %r/[0-9]+[kmg]?\b/i, Num::Integer
+        rule %r/(~)(\s*)([^\s{]+)/ do
           groups Punctuation, Text, Str::Regex
         end
 
-        rule /[:=~]/, Punctuation
+        rule %r/[:=~]/, Punctuation
 
         # pathname
         rule %r(/#{id}?), Name
 
-        rule /[^#\s;{}$\\]+/, Str # catchall
+        rule %r/[^#\s;{}$\\]+/, Str # catchall
 
-        rule /[$;]/, Text
+        rule %r/[$;]/, Text
       end
     end
   end

data/lib/rouge/lexers/nim.rb

@@ -112,7 +112,7 @@ module Rouge
              Punctuation)
 
         # Strings
-        rule(/(?:[\w]+)"/,Str, :rdqs)
+        rule(/(?:\w+)"/,Str, :rdqs)
         rule(/"""/,       Str, :tdqs)
         rule(/"/,         Str, :dqs)
 
@@ -133,11 +133,12 @@ module Rouge
         # Numbers
         # Note: Have to do this with a block to push multiple states first,
         #       since we can't pass array of states like w/ Pygments.
-        rule(/[0-9][0-9_]*(?=([eE.]|'?[fF](32|64)))/) do |number|
+        rule(/[0-9][0-9_]*(?=([eE.]|'?[fF](32|64)))/) do
          push :floatsuffix
          push :floatnumber
          token Num::Float
         end
+
         rule(/0[xX][a-fA-F0-9][a-fA-F0-9_]*/, Num::Hex,     :intsuffix)
         rule(/0[bB][01][01_]*/,               Num,          :intsuffix)
         rule(/0o[0-7][0-7_]*/,                Num::Oct,     :intsuffix)

data/lib/rouge/lexers/nix.rb

@@ -11,34 +11,34 @@ module Rouge
       filenames '*.nix'
 
       state :whitespaces do
-        rule /^\s*\n\s*$/m, Text
-        rule /\s+/, Text
+        rule %r/^\s*\n\s*$/m, Text
+        rule %r/\s+/, Text
       end
 
       state :comment do
-        rule /#.*$/, Comment
-        rule /\/\*/, Comment, :multiline_comment
+        rule %r/#.*$/, Comment
+        rule %r(/\*), Comment, :multiline_comment
       end
 
       state :multiline_comment do
-        rule /\*\//, Comment, :pop!
-        rule /./, Comment
+        rule %r(\*/), Comment, :pop!
+        rule %r/./, Comment
       end
 
       state :number do
-        rule /[0-9]/, Num::Integer
+        rule %r/[0-9]/, Num::Integer
       end
 
       state :null do
-        rule /(null)/, Keyword::Constant
+        rule %r/(null)/, Keyword::Constant
       end
 
       state :boolean do
-        rule /(true|false)/, Keyword::Constant
+        rule %r/(true|false)/, Keyword::Constant
       end
 
       state :binding do
-        rule /[a-zA-Z_][a-zA-Z0-9-]*/, Name::Variable
+        rule %r/[a-zA-Z_][a-zA-Z0-9-]*/, Name::Variable
       end
 
       state :path do
@@ -49,89 +49,89 @@ module Rouge
         tilde = /~#{section}+/.source
         basic = /#{word}(\/#{word})+/.source
         url = /#{prefix}(\/?#{basic})/.source
-        rule /(#{root}|#{tilde}|#{basic}|#{url})/, Str::Other
+        rule %r/(#{root}|#{tilde}|#{basic}|#{url})/, Str::Other
       end
 
       state :string do
-        rule /"/, Str::Double, :double_quoted_string
-        rule /''/, Str::Double, :indented_string
+        rule %r/"/, Str::Double, :double_quoted_string
+        rule %r/''/, Str::Double, :indented_string
       end
 
       state :string_content do
-        rule /\\./, Str::Escape
-        rule /\$\$/, Str::Escape
-        rule /\${/, Str::Interpol, :string_interpolated_arg
+        rule %r/\\./, Str::Escape
+        rule %r/\$\$/, Str::Escape
+        rule %r/\${/, Str::Interpol, :string_interpolated_arg
       end
 
       state :indented_string_content do
-        rule /'''/, Str::Escape
-        rule /''\$/, Str::Escape
-        rule /\$\$/, Str::Escape
-        rule /''\\./, Str::Escape
-        rule /\${/, Str::Interpol, :string_interpolated_arg
+        rule %r/'''/, Str::Escape
+        rule %r/''\$/, Str::Escape
+        rule %r/\$\$/, Str::Escape
+        rule %r/''\\./, Str::Escape
+        rule %r/\${/, Str::Interpol, :string_interpolated_arg
       end
 
       state :string_interpolated_arg do
         mixin :expression
-        rule /}/, Str::Interpol, :pop!
+        rule %r/}/, Str::Interpol, :pop!
       end
 
       state :indented_string do
         mixin :indented_string_content
-        rule /''/, Str::Double, :pop!
-        rule /./, Str::Double
+        rule %r/''/, Str::Double, :pop!
+        rule %r/./, Str::Double
       end
 
       state :double_quoted_string do
         mixin :string_content
-        rule /"/, Str::Double, :pop!
-        rule /./, Str::Double
+        rule %r/"/, Str::Double, :pop!
+        rule %r/./, Str::Double
       end
 
       state :operator do
-        rule /(\.|\?|\+\+|\+|!=|!|\/\/|\=\=|&&|\|\||->|\/|\*|-|<|>|<=|=>)/, Operator
+        rule %r/(\.|\?|\+\+|\+|!=|!|\/\/|\=\=|&&|\|\||->|\/|\*|-|<|>|<=|=>)/, Operator
       end
 
       state :assignment do
-        rule /(=)/, Operator
-        rule /(@)/, Operator
+        rule %r/(=)/, Operator
+        rule %r/(@)/, Operator
       end
 
       state :accessor do
-        rule /(\$)/, Punctuation
+        rule %r/(\$)/, Punctuation
       end
 
       state :delimiter do
-        rule /(;|,|:)/, Punctuation
+        rule %r/(;|,|:)/, Punctuation
       end
 
       state :atom_content do
         mixin :expression
-        rule /\)/, Punctuation, :pop!
+        rule %r/\)/, Punctuation, :pop!
       end
 
       state :atom do
-        rule /\(/, Punctuation, :atom_content
+        rule %r/\(/, Punctuation, :atom_content
       end
 
       state :list do
-        rule /\[/, Punctuation, :list_content
+        rule %r/\[/, Punctuation, :list_content
       end
 
       state :list_content do
-        rule /\]/, Punctuation, :pop!
+        rule %r/\]/, Punctuation, :pop!
         mixin :expression
       end
 
       state :set do
-        rule /{/, Punctuation, :set_content
+        rule %r/{/, Punctuation, :set_content
       end
 
       state :set_content do
-        rule /}/, Punctuation, :pop!
+        rule %r/}/, Punctuation, :pop!
         mixin :expression
       end
-      
+
       state :expression do
         mixin :ignore
         mixin :comment
@@ -161,22 +161,22 @@ module Rouge
 
       state :keywords_namespace do
         keywords = %w(with in inherit)
-        rule /(?:#{keywords.join('|')})\b/, Keyword::Namespace
+        rule %r/(?:#{keywords.join('|')})\b/, Keyword::Namespace
       end
 
       state :keywords_declaration do
         keywords = %w(let)
-        rule /(?:#{keywords.join('|')})\b/, Keyword::Declaration
+        rule %r/(?:#{keywords.join('|')})\b/, Keyword::Declaration
       end
 
       state :keywords_conditional do
         keywords = %w(if then else)
-        rule /(?:#{keywords.join('|')})\b/, Keyword
+        rule %r/(?:#{keywords.join('|')})\b/, Keyword
       end
 
       state :keywords_reserved do
         keywords = %w(rec assert map)
-        rule /(?:#{keywords.join('|')})\b/, Keyword::Reserved
+        rule %r/(?:#{keywords.join('|')})\b/, Keyword::Reserved
       end
 
       state :keywords_builtin do
@@ -192,7 +192,7 @@ module Rouge
           throw
           toString
         )
-        rule /(?:#{keywords.join('|')})\b/, Keyword::Reserved
+        rule %r/(?:#{keywords.join('|')})\b/, Keyword::Reserved
       end
 
       state :ignore do