rouge 4.7.0 → 5.0.0

data/lib/rouge/lexers/isbl.rb

@@ -9,23 +9,6 @@ module Rouge
       tag 'isbl'
       filenames '*.isbl'
 
-      def self.builtins
-        Kernel::load File.join(Lexers::BASE_DIR, 'isbl/builtins.rb')
-        self.builtins
-      end
-
-      def self.constants
-        @constants ||= self.builtins["const"].merge(self.builtins["enum"]).collect!(&:downcase)
-      end
-
-      def self.interfaces
-        @interfaces ||= self.builtins["interface"].collect!(&:downcase)
-      end
-
-      def self.globals
-        @globals ||= self.builtins["global"].collect!(&:downcase)
-      end
-
       def self.keywords
         @keywords = Set.new %w(
           and и else иначе endexcept endfinally endforeach конецвсе endif конецесли endwhile
@@ -41,30 +24,16 @@ module Rouge
 
       state :dotted do
         mixin :whitespace
-        rule %r/[a-zа-яё_0-9]+/i do |m|
-          name = m[0]
-          if self.class.constants.include? name.downcase
-            token Name::Builtin
-          elsif in_state? :type
-            token Keyword::Type
-          else
-            token Name
-          end
+        rule %r/\p{Alnum}+/i do |m|
+          token(in_state?(:type) ? Keyword::Type : Name)
+
           pop!
         end
       end
 
       state :type do
         mixin :whitespace
-        rule %r/[a-zа-яё_0-9]+/i do |m|
-          name = m[0]
-          if self.class.interfaces.include? name.downcase
-            token Keyword::Type
-          else
-            token Name
-          end
-          pop!
-        end
+        rule %r/\p{Word}+/, Name, :pop!
         rule %r/[.]/, Punctuation, :dotted
         rule(//) { pop! }
       end
@@ -75,15 +44,10 @@ module Rouge
         rule %r/[.]/, Punctuation, :dotted
         rule %r/[\[\]();]/, Punctuation
         rule %r([&*+=<>/-]), Operator
-        rule %r/\b[a-zа-яё_][a-zа-яё_0-9]*(?=[(])/i, Name::Function
-        rule %r/[a-zа-яё_!][a-zа-яё_0-9]*/i do |m|
-          name = m[0]
-          if self.class.keywords.include? name.downcase
+        rule %r/[\p{Alpha}_!]\p{Word}*(?=[(])/i, Name::Function
+        rule %r/[\p{Alpha}_!]\p{Word}*/i do |m|
+          if self.class.keywords.include?(m[0].downcase)
             token Keyword
-          elsif self.class.constants.include? name.downcase
-            token Name::Builtin
-          elsif self.class.globals.include? name.downcase
-            token Name::Variable::Global
           else
             token Name::Variable
           end

data/lib/rouge/lexers/j.rb

@@ -32,7 +32,7 @@ module Rouge
       end
 
       def self.primitive_table
-        @primitive_table ||= Hash.new([:name]).tap do |h|
+        @primitive_table ||= Hash.new([:name].freeze).tap do |h|
           {
             '()' => [:other],
             '=' => [:verb, :other, :other],

data/lib/rouge/lexers/json5.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'json'
+
 module Rouge
   module Lexers
-    load_lexer 'json.rb'
-
     class JSON5 < JSON
       title 'JSON 5'
       tag 'json5'

data/lib/rouge/lexers/json_doc.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'json'
+
 module Rouge
   module Lexers
-    load_lexer 'json.rb'
-
     class JSONDOC < JSON
       desc "JavaScript Object Notation with extensions for documentation"
       tag 'json-doc'

data/lib/rouge/lexers/jsp.rb

@@ -1,119 +1,119 @@
-# -*- coding: utf-8 -*- #
-# frozen_string_literal: true
-
-module Rouge
-  module Lexers
-    class JSP < TemplateLexer
-      desc 'JSP'
-      tag 'jsp'
-      filenames '*.jsp'
-      mimetypes 'text/x-jsp', 'application/x-jsp'
-
-      def initialize(*)
-        super
-        @java = Java.new
-      end
-
-      directives = %w(page include taglib)
-      actions = %w(scriptlet declaration expression)
-
-      state :root do
-
-        rule %r/<%--/, Comment, :jsp_comment
-
-        rule %r/<%@\s*(#{directives.join('|')})\s*/, Name::Tag, :jsp_directive
-
-        rule %r/<jsp:directive\.(#{directives.join('|')})/, Name::Tag, :jsp_directive2
-
-        rule %r/<jsp:(#{actions.join('|')})>/, Name::Tag, :jsp_expression
-
-        # start of tag, e.g. <c:if>
-        rule %r/<[a-zA-Z]*:[a-zA-Z]*\s*/, Name::Tag, :jsp_tag
-
-        # end of tag, e.g. </c:if>
-        rule %r(</[a-zA-Z]*:[a-zA-Z]*>), Name::Tag
-
-        rule %r/<%[!=]?/, Name::Tag, :jsp_expression2
-
-        # fallback to HTML
-        rule(/(.+?)(?=(<%|<\/?[a-zA-Z]*:))/m) { delegate parent }
-        rule(/.+/m) { delegate parent }
-      end
-
-      state :jsp_comment do
-        rule %r/(--%>)/, Comment, :pop!
-        rule %r/./m, Comment
-      end
-
-      state :jsp_directive do
-        rule %r/(%>)/, Name::Tag, :pop!
-        mixin :attributes
-        rule(/(.+?)(?=%>)/m) { delegate parent }
-      end
-
-      state :jsp_directive2 do
-        rule %r!(/>)!, Name::Tag, :pop!
-        mixin :attributes
-        rule(/(.+?)(?=\/>)/m) { delegate parent }
-      end
-
-      state :jsp_expression do
-        rule %r/<\/jsp:(#{actions.join('|')})>/, Name::Tag, :pop!
-        mixin :attributes
-        rule(/[^<\/]+/) { delegate @java }
-      end
-
-      state :jsp_expression2 do
-        rule %r/%>/, Name::Tag, :pop!
-        rule(/[^%>]+/) { delegate @java }
-      end
-
-      state :jsp_tag do
-        rule %r/\/?>/, Name::Tag, :pop!
-        mixin :attributes
-        rule(/(.+?)(?=\/?>)/m) { delegate parent }
-      end
-
-      state :attributes do
-        rule %r/\s*[a-zA-Z0-9_:-]+\s*=\s*/m, Name::Attribute, :attr
-      end
-
-      state :attr do
-        rule %r/"/ do
-          token Str
-          goto :double_quotes
-        end
-
-        rule %r/'/ do
-          token Str
-          goto :single_quotes
-        end
-
-        rule %r/[^\s>]+/, Str, :pop!
-      end
-
-      state :double_quotes do
-        rule %r/"/, Str, :pop!
-        rule %r/\$\{/, Str::Interpol, :jsp_interp
-        rule %r/[^"]+/, Str
-      end
-
-      state :single_quotes do
-        rule %r/'/, Str, :pop!
-        rule %r/\$\{/, Str::Interpol, :jsp_interp
-        rule %r/[^']+/, Str
-      end
-
-      state :jsp_interp do
-        rule %r/\}/, Str::Interpol, :pop!
-        rule %r/'/, Literal, :jsp_interp_literal_start
-        rule(/[^'\}]+/) { delegate @java }
-      end
-
-      state :jsp_interp_literal_start do
-        rule %r/'/, Literal, :pop!
-        rule %r/[^']+/, Literal
-      end
-    end
-  end
-end
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class JSP < TemplateLexer
+      desc 'JSP'
+      tag 'jsp'
+      filenames '*.jsp'
+      mimetypes 'text/x-jsp', 'application/x-jsp'
+
+      def initialize(*)
+        super
+        @java = Java.new
+      end
+
+      directives = %w(page include taglib)
+      actions = %w(scriptlet declaration expression)
+
+      state :root do
+
+        rule %r/<%--/, Comment, :jsp_comment
+
+        rule %r/<%@\s*(#{directives.join('|')})\s*/, Name::Tag, :jsp_directive
+
+        rule %r/<jsp:directive\.(#{directives.join('|')})/, Name::Tag, :jsp_directive2
+
+        rule %r/<jsp:(#{actions.join('|')})>/, Name::Tag, :jsp_expression
+
+        # start of tag, e.g. <c:if>
+        rule %r/<[a-zA-Z]*:[a-zA-Z]*\s*/, Name::Tag, :jsp_tag
+
+        # end of tag, e.g. </c:if>
+        rule %r(</[a-zA-Z]*:[a-zA-Z]*>), Name::Tag
+
+        rule %r/<%[!=]?/, Name::Tag, :jsp_expression2
+
+        # fallback to HTML
+        rule(/(.+?)(?=(<%|<\/?[a-zA-Z]*:))/m) { delegate parent }
+        rule(/.+/m) { delegate parent }
+      end
+
+      state :jsp_comment do
+        rule %r/(--%>)/, Comment, :pop!
+        rule %r/./m, Comment
+      end
+
+      state :jsp_directive do
+        rule %r/(%>)/, Name::Tag, :pop!
+        mixin :attributes
+        rule(/(.+?)(?=%>)/m) { delegate parent }
+      end
+
+      state :jsp_directive2 do
+        rule %r!(/>)!, Name::Tag, :pop!
+        mixin :attributes
+        rule(/(.+?)(?=\/>)/m) { delegate parent }
+      end
+
+      state :jsp_expression do
+        rule %r/<\/jsp:(#{actions.join('|')})>/, Name::Tag, :pop!
+        mixin :attributes
+        rule(/[^<\/]+/) { delegate @java }
+      end
+
+      state :jsp_expression2 do
+        rule %r/%>/, Name::Tag, :pop!
+        rule(/[^%>]+/) { delegate @java }
+      end
+
+      state :jsp_tag do
+        rule %r/\/?>/, Name::Tag, :pop!
+        mixin :attributes
+        rule(/(.+?)(?=\/?>)/m) { delegate parent }
+      end
+
+      state :attributes do
+        rule %r/\s*[a-zA-Z0-9_:-]+\s*=\s*/m, Name::Attribute, :attr
+      end
+
+      state :attr do
+        rule %r/"/ do
+          token Str
+          goto :double_quotes
+        end
+
+        rule %r/'/ do
+          token Str
+          goto :single_quotes
+        end
+
+        rule %r/[^\s>]+/, Str, :pop!
+      end
+
+      state :double_quotes do
+        rule %r/"/, Str, :pop!
+        rule %r/\$\{/, Str::Interpol, :jsp_interp
+        rule %r/[^"]+/, Str
+      end
+
+      state :single_quotes do
+        rule %r/'/, Str, :pop!
+        rule %r/\$\{/, Str::Interpol, :jsp_interp
+        rule %r/[^']+/, Str
+      end
+
+      state :jsp_interp do
+        rule %r/\}/, Str::Interpol, :pop!
+        rule %r/'/, Literal, :jsp_interp_literal_start
+        rule(/[^'\}]+/) { delegate @java }
+      end
+
+      state :jsp_interp_literal_start do
+        rule %r/'/, Literal, :pop!
+        rule %r/[^']+/, Literal
+      end
+    end
+  end
+end

data/lib/rouge/lexers/jsx.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'javascript'
+
 module Rouge
   module Lexers
-    load_lexer 'javascript.rb'
-
     class JSX < Javascript
       title 'JSX'
       desc 'An XML-like syntax extension to JavaScript (facebook.github.io/jsx/)'

data/lib/rouge/lexers/kick_assembler.rb

@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+
+    # Find the reference for the KickAssembler syntax at
+    # https://www.theweb.dk/KickAssembler/KickAssembler.pdf
+    class KickAssembler < RegexLexer
+      title 'KickAssembler'
+      desc 'Kick assembler NMOS 65xx syntax'
+      tag 'kick_assembler'
+      aliases 'kickass'
+      filenames '*.asm'
+      mimetypes 'text/x-asm', 'text/x-assembly'
+
+      def self.mnemonics
+        @mnemonics ||= Set.new %w(
+          lda ldx ldy sta stx sty tax tay txa tya tsx txs pha php pla plp
+          and eor ora bit adc sbc cmp cpx cpy inc inx iny dec dex dey asl
+          lsr rol ror jmp jsr rts rti bcc bcs beq bmi bne bpl bvc bvs
+          clc cld cli clv sec sed sei brk nop
+          phx plx phy ply
+          stz trb tsb bra
+          neg asr dea ina
+          ahx alr anc anc2 arr axs dcp isc las lax rla rra sax shx shy slo sre tas xaa
+        )
+      end
+
+      def self.type_directives
+        @type_directives ||= Set.new %w(
+          .align .assert .asserterror .break .by .byte .cpu
+          .disk .dword .dw .encoding .enum .error .errorif .eval
+          .file .fill .fillword .for .function .import .importonce
+          .label .lohifill .macro .memblock .modify .namespace
+          .pc .print .printnow .pseudocommand .pseudopc .return
+          .segment .segmentdef .struct .text .var .word .while .zp
+        )
+      end
+
+      def self.preprocessor_directives
+        @preprocessor_directives ||= Set.new %w(
+          define undef import importonce importif
+          if endif else elif
+          print printnow error asserterror
+        )
+      end
+
+      state :root do
+        rule %r(//.*?$), Comment::Single
+
+        rule %r/"(?:[^"\\]|\\.)*"/, Literal::String
+        rule %r/'.'/, Literal::String::Char
+
+        rule %r/\#?\%[0-1]+/, Literal::Number # Binary
+        rule %r/\#?\$[0-9a-fA-F]+/, Literal::Number # Hexa
+        rule %r/\#?\d+/, Literal::Number # Decimal
+
+        rule %r/[+\-*\/=<>!]/, Operator
+
+        rule %r/#\w+/i do |m|
+          directive = m[0][1..-1].downcase
+          if self.class.preprocessor_directives.include?(directive)
+            token Keyword
+          else
+            token Punctuation
+          end
+        end
+
+        rule %r/#/, Punctuation
+        rule %r/[(){},]/, Punctuation
+
+        rule %r/[a-z$._?][\w$.?#@~]*:/i, Name::Label
+
+        rule %r/\.\w+/i do |m|
+          if m[0] == '.const'
+            token Keyword::Constant
+          elsif m[0] =~ /^\.(for|while|macro|function|pseudopc|pseudocommand)$/io
+            token Keyword::Reserved
+          elsif self.class.type_directives.include?(m[0].downcase)
+            token Keyword::Declaration
+          else
+            token Keyword
+          end
+        end
+
+        rule %r/\b\w+\b/i do |m|
+          word = m[0].downcase
+          if self.class.mnemonics.include?(word)
+            token Keyword
+          else
+            token Name
+          end
+        end
+
+        rule %r/[ \t\r\n]+/, Text
+      end
+    end
+  end
+end

data/lib/rouge/lexers/kotlin.rb

@@ -24,6 +24,8 @@ module Rouge
         while yield
       )
 
+      use_site_targets = %w(file property field get set receiver param setparam delegate)
+
       name_chars = %r'[-\p{Lu}\p{Ll}\p{Lt}\p{Lm}\p{Nl}\p{Nd}\p{Pc}\p{Cf}\p{Mn}\p{Mc}]*'
 
       class_name = %r'`?[\p{Lu}]#{name_chars}`?'
@@ -85,6 +87,9 @@ module Rouge
         rule %r'"(\\\\|\\"|[^"\n])*["\n]'m, Str
         rule %r"'\\.'|'[^\\]'", Str::Char
         rule %r'(@#{class_name})', Name::Decorator
+        rule %r'(@)(#{use_site_targets.join('|')})(:)' do
+          groups Name::Decorator, Keyword, Punctuation
+        end
         rule %r'(#{class_name})(<)' do
           groups Name::Class, Punctuation
           push :generic_parameters