rouge 3.26.0 → 3.30.0

data/lib/rouge/lexers/stata.rb

@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class Stata < RegexLexer
+      title "Stata"
+      desc "The Stata programming language (www.stata.com)"
+      tag 'stata'
+      filenames '*.do', '*.ado'
+      mimetypes 'application/x-stata', 'text/x-stata'
+
+      ###
+      # Stata reference manual is available online at: https://www.stata.com/features/documentation/
+      ###
+
+      # Partial list of common programming and estimation commands, as of Stata 16
+      # Note: not all abbreviations are included
+      KEYWORDS = %w(
+        do run include clear assert set mata log
+        by bys bysort cap capt capture char class classutil which cdir confirm new existence creturn
+        _datasignature discard di dis disp displ displa display ereturn error _estimates exit file open read write seek close query findfile fvexpand
+        gettoken java home heapmax java_heapmax icd9 icd9p icd10 icd10cm icd10pcs initialize javacall levelsof
+        tempvar tempname tempfile macro shift uniq dups retokenize clean sizeof posof
+        makecns matcproc marksample mark markout markin svymarkout matlist
+        accum define dissimilarity eigenvalues get rowjoinbyname rownames score svd symeigen dir list ren rename
+        more pause plugin call postfile _predict preserve restore program define drop end python qui quietly noi noisily _return return _rmcoll rmsg _robust
+        serset locale_functions locale_ui signestimationsample checkestimationsample sleep syntax sysdir adopath adosize
+        tabdisp timer tokenize trace unab unabcmd varabbrev version viewsource
+        window fopen fsave manage menu push stopbox
+        net from cd link search install sj stb ado update uninstall pwd ssc ls
+        using insheet outsheet mkmat svmat sum summ summarize
+        graph gr_edit twoway histogram kdensity spikeplot
+        mi miss missing var varname order compress append
+        gen gene gener genera generat generate egen replace duplicates
+        estimates nlcom lincom test testnl predict suest
+        _regress reg regr regre regres regress probit logit ivregress logistic svy gmm ivprobit ivtobit
+        bsample assert codebook collapse compare contract copy count cross datasignature d ds desc describe destring tostring
+        drawnorm edit encode decode erase expand export filefilter fillin format frame frget frlink gsort
+        import dbase delimited excel fred haver sas sasxport5 sasxport8 spss infile infix input insobs inspect ipolate isid
+        joinby label language labelbook lookfor memory mem merge mkdir mvencode notes obs odbc order outfile
+        pctile xtile _pctile putmata range recast recode rename group reshape rm rmdir sample save saveold separate shell snapshot sort split splitsample stack statsby sysuse
+        type unicode use varmanage vl webuse xpose zipfile
+        number keep tab table tabulate stset stcox tsset xtset
+      )
+
+      # Complete list of functions by name, as of Stata 16
+      PRIMITIVE_FUNCTIONS = %w(
+        abbrev abs acos acosh age age_frac asin asinh atan atan2 atanh autocode
+        betaden binomial binomialp binomialtail binormal birthday bofd byteorder
+        c _caller cauchy cauchyden cauchytail Cdhms ceil char chi2 chi2den chi2tail Chms
+        chop cholesky clip Clock clock clockdiff cloglog Cmdyhms Cofc cofC Cofd cofd coleqnumb
+        collatorlocale collatorversion colnfreeparms colnumb colsof comb cond corr cos cosh
+        daily date datediff datediff_frac day det dgammapda dgammapdada dgammapdadx dgammapdxdx dhms
+        diag diag0cnt digamma dofb dofC dofc dofh dofm dofq dofw dofy dow doy dunnettprob e el epsdouble
+        epsfloat exp expm1 exponential exponentialden exponentialtail
+        F Fden fileexists fileread filereaderror filewrite float floor fmtwidth frval _frval Ftail
+        fammaden gammap gammaptail get hadamard halfyear halfyearly has_eprop hh hhC hms hofd hours
+        hypergeometric hypergeometricp
+        I ibeta ibetatail igaussian igaussianden igaussiantail indexnot inlist inrange int inv invbinomial invbinomialtail
+        invcauchy invcauchytail invchi2 invchi2tail invcloglog invdunnettprob invexponential invexponentialtail invF
+        invFtail invgammap invgammaptail invibeta invibetatail invigaussian invigaussiantail invlaplace invlaplacetail
+        invlogistic invlogistictail invlogit invnbinomial invnbinomialtail invnchi2 invnchi2tail invnF invnFtail invnibeta invnormal invnt invnttail
+        invpoisson invpoissontail invsym invt invttail invtukeyprob invweibull invweibullph invweibullphtail invweibulltail irecode islepyear issymmetric
+        J laplace laplaceden laplacetail ln ln1m ln1p lncauchyden lnfactorial lngamma lnigammaden lnigaussianden lniwishartden lnlaplaceden lnmvnormalden
+        lnnormal lnnormalden lnnormalden lnnormalden lnwishartden log log10 log1m log1p logistic logisticden logistictail logit
+        matmissing matrix matuniform max maxbyte maxdouble maxfloat maxint maxlong mdy mdyhms mi min minbyte mindouble minfloat minint minlong minutes
+        missing mm mmC mod mofd month monthly mreldif msofhours msofminutes msofseconds
+        nbetaden nbinomial nbinomialp nbinomialtail nchi2 nchi2den nchi2tail nextbirthday nextleapyear nF nFden nFtail nibeta
+        normal normalden npnchi2 npnF npnt nt ntden nttail nullmat
+        plural poisson poissonp poissontail previousbirthday previousleapyear qofd quarter quarterly r rbeta rbinomial rcauchy rchi2 recode
+        real regexm regexr regexs reldif replay return rexponential rgamma rhypergeometric rigaussian rlaplace rlogistic rnormal
+        round roweqnumb rownfreeparms rownumb rowsof rpoisson rt runiform runiformint rweibull rweibullph
+        s scalar seconds sign sin sinh smallestdouble soundex soundex_nara sqrt ss ssC strcat strdup string stritrim strlen strlower
+        strltrim strmatch strofreal strpos strproper strreverse strrpos strrtrim strtoname strtrim strupper subinstr subinword substr sum sweep
+        t tan tanh tC tc td tden th tin tm tobytes tq trace trigamma trunc ttail tukeyprob tw twithin
+        uchar udstrlen udsubstr uisdigit uisletter uniform ustrcompare ustrcompareex ustrfix ustrfrom ustrinvalidcnt ustrleft ustrlen ustrlower
+        ustrltrim ustrnormalize ustrpos ustrregexm ustrregexra ustrregexrf ustrregexs ustrreverse ustrright ustrrpos ustrrtrim ustrsortkey
+        ustrsortkeyex ustrtitle ustrto ustrtohex ustrtoname ustrtrim ustrunescape ustrupper ustrword ustrwordcount usubinstr usubstr
+        vec vecdiag week weekly weibull weibullden weibullph weibullphden weibullphtail weibulltail wofd word wordbreaklocale wordcount
+        year yearly yh ym yofd yq yw
+      )
+
+      # Note: types `str1-str2045` handled separately below
+      def self.type_keywords
+        @type_keywords ||= Set.new %w(byte int long float double str strL numeric string integer scalar matrix local global numlist varlist newlist)
+      end
+
+      # Stata commands used with braces. Includes all valid abbreviations for 'forvalues'.
+      def self.reserved_keywords
+        @reserved_keywords ||= Set.new %w(if else foreach forv forva forval forvalu forvalue forvalues to while in of continue break nobreak)
+      end
+
+      ###
+      # Lexer state and rules
+      ###
+      state :root do
+
+        # Pre-processor commands: #
+        rule %r/^\s*#.*$/, Comment::Preproc
+
+        # Hashbang comments: *!
+        rule %r/^\*!.*$/, Comment::Hashbang
+
+        # Single-line comment: *
+        rule %r/^\s*\*.*$/, Comment::Single
+
+        # Keywords: recognize only when they are the first word
+        rule %r/^\s*(#{KEYWORDS.join('|')})\b/, Keyword
+
+        # Whitespace. Classify `\n` as `Text` to avoid interference with `Comment` and `Keyword` above
+        rule(/[ \t]+/, Text::Whitespace)
+        rule(/[\n\r]+/, Text)
+
+        # In-line comment: //
+        rule %r/\/\/.*?$/, Comment::Single
+
+        # Multi-line comment: /* and */
+        rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
+
+        # Strings indicated by compound double-quotes (`""') and double-quotes ("")
+        rule %r/`"(\\.|.)*?"'/, Str::Double
+        rule %r/"(\\.|.)*?"/, Str::Double
+
+        # Format locals (`') and globals ($) as strings
+        rule %r/`(\\.|.)*?'/, Str::Double
+        rule %r/(?<!\w)\$\w+/, Str::Double
+
+        # Display formats
+        rule %r/\%\S+/, Name::Property
+
+        # Additional string types: str1-str2045
+        rule %r/\bstr(204[0-5]|20[0-3][0-9]|[01][0-9][0-9][0-9]|[0-9][0-9][0-9]|[0-9][0-9]|[1-9])\b/, Keyword::Type
+
+        # Only recognize primitive functions when they are actually used as a function call, i.e. followed by an opening parenthesis
+        # `Name::Builtin` would be more logical, but is not usually highlighted, so use `Name::Function` instead
+        rule %r/\b(#{PRIMITIVE_FUNCTIONS.join('|')})(?=\()/, Name::Function
+
+        # Matrix operator `..` (declare here instead of with other operators, in order to avoid conflict with numbers below)
+        rule %r/\.\.(?=.*\])/, Operator
+
+        # Numbers
+        rule %r/[+-]?(\d+([.]\d+)?|[.]\d+)([eE][+-]?\d+)?/, Num
+
+        # Factor variable and time series operators
+        rule %r/\b[ICOicoLFDSlfds]\w*\./, Operator
+        rule %r/\b[ICOicoLFDSlfds]\w*(?=\(.*\)\.)/, Operator
+
+        rule %r/\w+/ do |m|
+          if self.class.reserved_keywords.include? m[0]
+            token Keyword::Reserved
+          elsif self.class.type_keywords.include? m[0]
+            token Keyword::Type
+          else
+            token Name
+          end
+        end
+
+        rule %r/[\[\]{}();,]/, Punctuation
+
+        rule %r([-<>?*+'^/\\!#.=~:&|]), Operator
+      end
+    end
+  end
+end

data/lib/rouge/lexers/supercollider.rb

@@ -113,4 +113,3 @@ module Rouge
     end
   end
 end
-

data/lib/rouge/lexers/swift.rb

@@ -15,17 +15,17 @@ module Rouge
       id = /#{id_head}#{id_rest}*/
 
       keywords = Set.new %w(
-        break case continue default do else fallthrough if in for return switch where while try catch throw guard defer repeat
+        await break case continue default do else fallthrough if in for return switch where while try catch throw guard defer repeat
 
         as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__
 
-        associativity didSet get infix inout mutating none nonmutating operator override postfix precedence prefix set unowned weak willSet throws rethrows precedencegroup
+        associativity async didSet get infix inout isolated mutating none nonmutating operator override postfix precedence prefix set unowned weak willSet throws rethrows precedencegroup
 
         #available #colorLiteral #column #else #elseif #endif #error #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation #warning
       )
 
       declarations = Set.new %w(
-        class deinit enum convenience extension final func import init internal lazy let optional private protocol public required static struct subscript typealias var dynamic indirect associatedtype open fileprivate some
+        actor class deinit enum convenience extension final func import init internal lazy let nonisolated optional private protocol public required static struct subscript typealias var dynamic indirect associatedtype open fileprivate some
       )
 
       constants = Set.new %w(

data/lib/rouge/lexers/syzlang.rb

@@ -0,0 +1,317 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class Syzlang < RegexLexer
+      title "Syzlang"
+      desc "Syscall description language used by syzkaller"
+      tag 'syzlang'
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          align breaks_returns dec define disabled hex ignore_return in incdir
+          include inet inout oct opt out packed parent prog_timeout pseudo
+          resource size syscall timeout type varlen
+        )
+      end
+
+      def self.keywords_type
+        @keywords_type ||= Set.new %w(
+          array bitsize bool16 bool32 bool64 bool8 boolptr buffer bytesize
+          bytesize2 bytesize4 bytesize8 const csum filename fileoff flags fmt
+          int16 int16be int32 int32be int64 int64be int8 int8be intptr len
+          offsetof optional proc ptr ptr64 string stringnoz text vma vma64 void
+        )
+      end
+
+      comment = /#.*$/
+      inline_spaces = /[ \t]+/
+      eol_spaces = /[\n\r]+/
+      spaces = /\s+/
+
+      state :inline_break do
+        rule inline_spaces, Text
+        rule %r//, Text, :pop!
+      end
+
+      state :space_break do
+        rule spaces, Text
+        rule comment, Comment
+        rule %r//, Text, :pop!
+      end
+
+      id = /[a-zA-Z_][a-zA-Z0-9_]*/
+      num_id = /[a-zA-Z0-9_]+/
+
+      state :mixin_name do
+        rule id, Name
+      end
+
+      state :mixin_number do
+        rule %r/-?0x[\da-f]+/i, Num::Hex
+        rule %r/-?\d+/, Num::Integer
+        rule %r/'[^']?'/, Str::Char
+      end
+
+      state :mixin_string do
+        rule %r/"[^"]*"/, Str::Double
+        rule %r/`[^`]*`/, Str::Backtick
+      end
+
+      state :mixin_term do
+        mixin :mixin_number
+        mixin :mixin_string
+
+        # Keywords.
+        rule id do |m|
+          if self.class.keywords.include?(m[0])
+            token Keyword
+          elsif self.class.keywords_type.include?(m[0])
+            token Keyword::Type
+          else
+            token Name
+          end
+        end
+
+        # Ranges.
+        rule %r/:/, Punctuation
+
+        # "struct$type" struct name format.
+        rule %r/\$/, Name
+      end
+
+      state :term_list do
+        rule spaces, Text
+        rule comment, Comment
+        mixin :mixin_term
+        rule %r/\[/, Punctuation, :term_list
+        rule %r/,/, Punctuation
+        rule %r/[\]\)]/, Punctuation, :pop!
+      end
+
+      state :arg_type do
+        mixin :mixin_term
+        rule %r/\[/, Punctuation, :term_list
+        rule %r//, Text, :pop!
+      end
+
+      state :include do
+        rule %r/(<)([^>]+)(>)/ do |m|
+          groups Punctuation, Str, Punctuation
+        end
+        rule %r//, Text, :pop!
+      end
+
+      state :define_name do
+        mixin :mixin_name
+        rule %r//, Text, :pop!
+      end
+
+      state :define_exp do
+        mixin :mixin_name
+        mixin :mixin_number
+        mixin :mixin_string
+        rule %r/[~!%\^&\*\-\+\/\|<>\?:]/, Operator
+        rule %r/[\(\){}\[\];,]/, Punctuation
+        rule inline_spaces, Text
+        rule %r//, Text, :pop!
+      end
+
+      state :resource_name do
+        mixin :mixin_name
+        rule %r//, Text, :pop!
+      end
+
+      state :resource_type do
+        rule %r/\[/, Punctuation, :arg_type
+        rule %r/\]/, Punctuation, :pop!
+      end
+
+      state :resource_values do
+        rule %r/:/ do
+          token Punctuation
+          push :resource_values_list
+          push :space_break
+        end
+        rule %r//, Text, :pop!
+      end
+
+      state :resource_values_list do
+        rule inline_spaces, Text
+        mixin :mixin_name
+        mixin :mixin_number
+        mixin :mixin_string
+        rule %r/,/, Punctuation, :space_break
+        rule %r//, Text, :pop!
+      end
+
+      state :flags_list do
+        rule inline_spaces, Text
+        rule %r/\./, Punctuation
+        mixin :mixin_name
+        mixin :mixin_number
+        mixin :mixin_string
+        rule %r/,/, Punctuation, :space_break
+        rule %r//, Punctuation, :pop!
+      end
+
+      state :syscall_args do
+        rule spaces, Text
+        rule comment, Comment
+        rule %r/\./, Punctuation
+        rule id do
+          token Name
+          push :arg_type
+          push :space_break
+        end
+        rule %r/,/, Punctuation
+        rule %r/\)/, Punctuation, :pop!
+      end
+
+      state :syscall_retval do
+        mixin :mixin_name
+        rule %r//, Text, :pop!
+      end
+
+      state :syscall_mods do
+        rule %r/\(/, Punctuation, :term_list
+        rule %r//, Text, :pop!
+      end
+
+      state :struct_fields do
+        rule id do
+          token Name
+          push :space_break
+          push :struct_field_mods
+          push :inline_break
+          push :arg_type
+          push :space_break
+        end
+        rule %r/[}\]]/, Punctuation, :pop!
+      end
+
+      state :struct_field_mods do
+        rule %r/\(/, Punctuation, :term_list
+        rule %r//, Text, :pop!
+      end
+
+      state :struct_mods do
+        rule %r/\[/, Punctuation, :term_list
+        rule %r//, Text, :pop!
+      end
+
+      state :type_name do
+        mixin :mixin_name
+        rule %r//, Text, :pop!
+      end
+
+      state :type_args do
+        rule %r/\[/, Punctuation, :type_args_list
+        rule %r//, Text, :pop!
+      end
+
+      state :type_args_list do
+        rule spaces, Text
+        rule comment, Comment
+        mixin :mixin_name
+        rule %r/,/, Punctuation
+        rule %r/\]/, Punctuation, :pop!
+      end
+
+      state :type_body do
+        rule %r/[{\[]/ do
+          token Punctuation
+          pop!
+          push :space_break
+          push :struct_mods
+          push :inline_break
+          push :struct_fields
+          push :space_break
+        end
+        rule %r// do
+          pop!
+          push :arg_type
+        end
+      end
+
+      state :root do
+        # Whitespace.
+        rule spaces, Text
+
+        # Comments.
+        rule comment, Comment
+
+        # Includes.
+        rule %r/(include|incdir)/ do
+          token Keyword
+          push :include
+          push :space_break
+        end
+
+        # Defines.
+        rule %r/define/ do
+          token Keyword
+          push :define_exp
+          push :space_break
+          push :define_name
+          push :space_break
+        end
+
+        # Resources.
+        rule %r/resource/ do
+          token Keyword
+          push :resource_values
+          push :inline_break
+          push :resource_type
+          push :inline_break
+          push :resource_name
+          push :space_break
+        end
+
+        # Flags and strings.
+        rule %r/(#{id}|_)(#{spaces})(=)/ do |m|
+          if m[1] == "_"
+            groups Keyword, Text, Punctuation
+          else
+            groups Name, Text, Punctuation
+          end
+          push :flags_list
+          push :space_break
+        end
+
+        # Syscalls.
+        rule %r/(#{id})(\$)?(#{num_id})?(#{spaces})?(\()/ do |m|
+          groups Name::Function, Punctuation, Name::Function::Magic, Text, Punctuation
+          push :syscall_mods
+          push :inline_break
+          push :syscall_retval
+          push :inline_break
+          push :syscall_args
+          push :space_break
+        end
+
+        # Structs and unions.
+        rule %r/(#{id}|#{id}\$#{num_id})(#{spaces})?([{\[])/ do |m|
+          groups Name, Text, Punctuation
+          push :inline_break
+          push :struct_mods
+          push :inline_break
+          push :struct_fields
+          push :space_break
+        end
+
+        # Types.
+        rule %r/type/ do
+          token Keyword
+          push :type_body
+          push :space_break
+          push :type_args
+          push :type_name
+          push :space_break
+        end
+      end
+
+    end
+  end
+end

data/lib/rouge/lexers/syzprog.rb

@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class Syzprog < RegexLexer
+      title "Syzprog"
+      desc "Program description language used by syzkaller"
+      tag 'syzprog'
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          ANY ANYBLOB ANYPTR ANYPTR64 ANYPTRS ANYRES16 ANYRES32 ANYRES64
+          ANYRESDEC ANYRESHEX ANYRESOCT ANYUNION AUTO false nil true void
+          async fail_nth rerun
+        )
+      end
+
+      comment = /#.*$/
+      inline_spaces = /[ \t]+/
+      eol_spaces = /[\n\r]+/
+      spaces = /\s+/
+
+      id = /[a-zA-Z_][a-zA-Z0-9_]*/
+      num_id = /[a-zA-Z0-9_]+/
+      res_id = /r[0-9]+/
+
+      state :inline_break do
+        rule inline_spaces, Text
+        rule %r//, Text, :pop!
+      end
+
+      state :eol_break do
+        rule eol_spaces, Text
+        rule comment, Comment
+        rule %r//, Text, :pop!
+      end
+
+      state :space_break do
+        rule spaces, Text
+        rule comment, Comment
+        rule %r//, Text, :pop!
+      end
+
+      state :mixin_number do
+        rule %r/-?0x[\da-f]+/i, Num::Hex
+        rule %r/-?\d+/, Num::Integer
+      end
+
+      state :mixin_string do
+        rule %r/"[^"]*"/, Str::Double
+        rule %r/`[^`]*`/, Str::Backtick
+        rule %r/'[^']*'/, Str::Single
+      end
+
+      state :mixin_term do
+        mixin :mixin_number
+        mixin :mixin_string
+
+        rule %r/#{res_id}/, Keyword::Pseudo
+        rule id do |m|
+          if self.class.keywords.include?(m[0])
+            token Keyword
+          else
+            token Name
+          end
+        end
+      end
+
+      state :mods_list do
+        rule spaces, Text
+        rule comment, Comment
+        mixin :mixin_term
+        rule %r/[,:]/, Punctuation
+        rule %r/\)/, Punctuation, :pop!
+      end
+
+      state :syscall_mods do
+        rule %r/\(/, Punctuation, :mods_list
+        rule %r//, Text, :pop!
+      end
+
+      state :syscall_args do
+        rule spaces, Text
+        rule comment, Comment
+        mixin :mixin_term
+        mixin :mixin_number
+        mixin :mixin_string
+        # This punctuation is a part of the syntax:
+        rule %r/[@&=,<>{}\[\]]/, Punctuation
+        # This punctuation is not, highlight just in case:
+        rule %r/[!#\$%\^\*\-\+\/\|~:;.\?]/, Punctuation
+        rule %r/\(/, Punctuation, :syscall_args
+        rule %r/\)/, Punctuation, :pop!
+      end
+
+      state :root do
+        # Whitespace.
+        rule spaces, Text
+
+        # Comments.
+        rule comment, Comment
+
+        # Return values.
+        rule %r/(#{res_id})(#{spaces})(=)/ do
+          groups Keyword::Pseudo, Text, Punctuation
+        end
+
+        # Syscalls.
+        rule %r/(#{id})(\$)?(#{num_id})?(#{spaces})?(\()/ do |m|
+          groups Name::Function, Punctuation, Name::Function::Magic, Text, Punctuation
+          push :syscall_mods
+          push :inline_break
+          push :syscall_args
+          push :space_break
+        end
+
+      end
+
+    end
+  end
+end

data/lib/rouge/lexers/tap.rb

@@ -86,4 +86,3 @@ module Rouge
     end
   end
 end
-

data/lib/rouge/lexers/toml.rb

@@ -11,14 +11,15 @@ module Rouge
       filenames '*.toml', 'Pipfile'
       mimetypes 'text/x-toml'
 
-      identifier = /\S+/
+      # bare keys and quoted keys
+      identifier = %r/(?:\S+|"[^"]+"|'[^']+')/
 
       state :basic do
         rule %r/\s+/, Text
         rule %r/#.*?$/, Comment
         rule %r/(true|false)/, Keyword::Constant
 
-        rule %r/(\S+)(\s*)(=)(\s*)(\{)/ do |m|
+        rule %r/(#{identifier})(\s*)(=)(\s*)(\{)/ do
           groups Name::Namespace, Text, Operator, Text, Punctuation
           push :inline
         end
@@ -27,9 +28,14 @@ module Rouge
 
         rule %r/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, Literal::Date
 
-        rule %r/(\d+\.\d*|\d*\.\d+)([eE][+-]?[0-9]+)?j?/, Num::Float
-        rule %r/\d+[eE][+-]?[0-9]+j?/, Num::Float
-        rule %r/\-?\d+/, Num::Integer
+        rule %r/[+-]?\d+(?:_\d+)*\.\d+(?:_\d+)*(?:[eE][+-]?\d+(?:_\d+)*)?/, Num::Float
+        rule %r/[+-]?\d+(?:_\d+)*[eE][+-]?\d+(?:_\d+)*/, Num::Float
+        rule %r/[+-]?(?:nan|inf)/, Num::Float
+
+        rule %r/0x\h+(?:_\h+)*/, Num::Hex
+        rule %r/0o[0-7]+(?:_[0-7]+)*/, Num::Oct
+        rule %r/0b[01]+(?:_[01]+)*/, Num::Bin
+        rule %r/[+-]?\d+(?:_\d+)*/, Num::Integer
       end
 
       state :root do
@@ -48,6 +54,11 @@ module Rouge
 
       state :content do
         mixin :basic
+
+        rule %r/(#{identifier})(\s*)(=)/ do
+          groups Name::Property, Text, Punctuation
+        end
+
         rule %r/"""/, Str, :mdq
         rule %r/"/, Str, :dq
         rule %r/'''/, Str, :msq
@@ -95,10 +106,6 @@ module Rouge
       state :inline do
         mixin :content
 
-        rule %r/(#{identifier})(\s*)(=)/ do
-          groups Name::Property, Text, Punctuation
-        end
-
         rule %r/\}/, Punctuation, :pop!
       end
     end