rouge 4.6.1 → 5.0.0

data/lib/rouge/lexers/lua/keywords.rb

@@ -9,19 +9,17 @@
 module Rouge
   module Lexers
     class Lua
-      def self.builtins
-        @builtins ||= {}.tap do |b|
-          b["basic"] = Set.new ["_g", "_version", "assert", "collectgarbage", "dofile", "error", "getmetatable", "ipairs", "load", "loadfile", "next", "pairs", "pcall", "print", "rawequal", "rawget", "rawlen", "rawset", "select", "setmetatable", "tonumber", "tostring", "type", "xpcall", "file:close", "file:flush", "file:lines", "file:read", "file:seek", "file:setvbuf", "file:write", "lua_cpath", "lua_cpath_5_3", "lua_init", "lua_init_5_3", "lua_path", "lua_path_5_3", "luaopen_base", "luaopen_coroutine", "luaopen_debug", "luaopen_io", "luaopen_math", "luaopen_os", "luaopen_package", "luaopen_string", "luaopen_table", "luaopen_utf8", "lua_errerr", "lua_errfile", "lua_errgcmm", "lua_errmem", "lua_errrun", "lua_errsyntax", "lua_hookcall", "lua_hookcount", "lua_hookline", "lua_hookret", "lua_hooktailcall", "lua_maskcall", "lua_maskcount", "lua_maskline", "lua_maskret", "lua_maxinteger", "lua_mininteger", "lua_minstack", "lua_multret", "lua_noref", "lua_ok", "lua_opadd", "lua_opband", "lua_opbnot", "lua_opbor", "lua_opbxor", "lua_opdiv", "lua_opeq", "lua_opidiv", "lua_ople", "lua_oplt", "lua_opmod", "lua_opmul", "lua_oppow", "lua_opshl", "lua_opshr", "lua_opsub", "lua_opunm", "lua_refnil", "lua_registryindex", "lua_ridx_globals", "lua_ridx_mainthread", "lua_tboolean", "lua_tfunction", "lua_tlightuserdata", "lua_tnil", "lua_tnone", "lua_tnumber", "lua_tstring", "lua_ttable", "lua_tthread", "lua_tuserdata", "lua_use_apicheck", "lua_yield", "lual_buffersize"]
-          b["modules"] = Set.new ["require", "package.config", "package.cpath", "package.loaded", "package.loadlib", "package.path", "package.preload", "package.searchers", "package.searchpath"]
-          b["coroutine"] = Set.new ["coroutine.create", "coroutine.isyieldable", "coroutine.resume", "coroutine.running", "coroutine.status", "coroutine.wrap", "coroutine.yield"]
-          b["debug"] = Set.new ["debug.debug", "debug.gethook", "debug.getinfo", "debug.getlocal", "debug.getmetatable", "debug.getregistry", "debug.getupvalue", "debug.getuservalue", "debug.sethook", "debug.setlocal", "debug.setmetatable", "debug.setupvalue", "debug.setuservalue", "debug.traceback", "debug.upvalueid", "debug.upvaluejoin"]
-          b["io"] = Set.new ["io.close", "io.flush", "io.input", "io.lines", "io.open", "io.output", "io.popen", "io.read", "io.stderr", "io.stdin", "io.stdout", "io.tmpfile", "io.type", "io.write"]
-          b["math"] = Set.new ["math.abs", "math.acos", "math.asin", "math.atan", "math.ceil", "math.cos", "math.deg", "math.exp", "math.floor", "math.fmod", "math.huge", "math.log", "math.max", "math.maxinteger", "math.min", "math.mininteger", "math.modf", "math.pi", "math.rad", "math.random", "math.randomseed", "math.sin", "math.sqrt", "math.tan", "math.tointeger", "math.type", "math.ult"]
-          b["os"] = Set.new ["os.clock", "os.date", "os.difftime", "os.execute", "os.exit", "os.getenv", "os.remove", "os.rename", "os.setlocale", "os.time", "os.tmpname"]
-          b["string"] = Set.new ["string.byte", "string.char", "string.dump", "string.find", "string.format", "string.gmatch", "string.gsub", "string.len", "string.lower", "string.match", "string.pack", "string.packsize", "string.rep", "string.reverse", "string.sub", "string.unpack", "string.upper"]
-          b["table"] = Set.new ["table.concat", "table.insert", "table.move", "table.pack", "table.remove", "table.sort", "table.unpack"]
-          b["utf8"] = Set.new ["utf8.char", "utf8.charpattern", "utf8.codepoint", "utf8.codes", "utf8.len", "utf8.offset"]
-        end
+      BUILTINS = {}.tap do |b|
+        b["basic"] = Set["_g", "_version", "assert", "collectgarbage", "dofile", "error", "file:close", "file:flush", "file:lines", "file:read", "file:seek", "file:setvbuf", "file:write", "getmetatable", "ipairs", "load", "loadfile", "lua_cpath", "lua_cpath_5_3", "lua_errerr", "lua_errfile", "lua_errgcmm", "lua_errmem", "lua_errrun", "lua_errsyntax", "lua_hookcall", "lua_hookcount", "lua_hookline", "lua_hookret", "lua_hooktailcall", "lua_init", "lua_init_5_3", "lua_maskcall", "lua_maskcount", "lua_maskline", "lua_maskret", "lua_maxinteger", "lua_mininteger", "lua_minstack", "lua_multret", "lua_noref", "lua_ok", "lua_opadd", "lua_opband", "lua_opbnot", "lua_opbor", "lua_opbxor", "lua_opdiv", "lua_opeq", "lua_opidiv", "lua_ople", "lua_oplt", "lua_opmod", "lua_opmul", "lua_oppow", "lua_opshl", "lua_opshr", "lua_opsub", "lua_opunm", "lua_path", "lua_path_5_3", "lua_refnil", "lua_registryindex", "lua_ridx_globals", "lua_ridx_mainthread", "lua_tboolean", "lua_tfunction", "lua_tlightuserdata", "lua_tnil", "lua_tnone", "lua_tnumber", "lua_tstring", "lua_ttable", "lua_tthread", "lua_tuserdata", "lua_use_apicheck", "lua_yield", "lual_buffersize", "luaopen_base", "luaopen_coroutine", "luaopen_debug", "luaopen_io", "luaopen_math", "luaopen_os", "luaopen_package", "luaopen_string", "luaopen_table", "luaopen_utf8", "next", "pairs", "pcall", "print", "rawequal", "rawget", "rawlen", "rawset", "select", "setmetatable", "tonumber", "tostring", "type", "xpcall"]
+        b["modules"] = Set["package.config", "package.cpath", "package.loaded", "package.loadlib", "package.path", "package.preload", "package.searchers", "package.searchpath", "require"]
+        b["coroutine"] = Set["coroutine.create", "coroutine.isyieldable", "coroutine.resume", "coroutine.running", "coroutine.status", "coroutine.wrap", "coroutine.yield"]
+        b["debug"] = Set["debug.debug", "debug.gethook", "debug.getinfo", "debug.getlocal", "debug.getmetatable", "debug.getregistry", "debug.getupvalue", "debug.getuservalue", "debug.sethook", "debug.setlocal", "debug.setmetatable", "debug.setupvalue", "debug.setuservalue", "debug.traceback", "debug.upvalueid", "debug.upvaluejoin"]
+        b["io"] = Set["io.close", "io.flush", "io.input", "io.lines", "io.open", "io.output", "io.popen", "io.read", "io.stderr", "io.stdin", "io.stdout", "io.tmpfile", "io.type", "io.write"]
+        b["math"] = Set["math.abs", "math.acos", "math.asin", "math.atan", "math.ceil", "math.cos", "math.deg", "math.exp", "math.floor", "math.fmod", "math.huge", "math.log", "math.max", "math.maxinteger", "math.min", "math.mininteger", "math.modf", "math.pi", "math.rad", "math.random", "math.randomseed", "math.sin", "math.sqrt", "math.tan", "math.tointeger", "math.type", "math.ult"]
+        b["os"] = Set["os.clock", "os.date", "os.difftime", "os.execute", "os.exit", "os.getenv", "os.remove", "os.rename", "os.setlocale", "os.time", "os.tmpname"]
+        b["string"] = Set["string.byte", "string.char", "string.dump", "string.find", "string.format", "string.gmatch", "string.gsub", "string.len", "string.lower", "string.match", "string.pack", "string.packsize", "string.rep", "string.reverse", "string.sub", "string.unpack", "string.upper"]
+        b["table"] = Set["table.concat", "table.insert", "table.move", "table.pack", "table.remove", "table.sort", "table.unpack"]
+        b["utf8"] = Set["utf8.char", "utf8.charpattern", "utf8.codepoint", "utf8.codes", "utf8.len", "utf8.offset"]
       end
     end
   end

data/lib/rouge/lexers/lua.rb

@@ -14,26 +14,27 @@ module Rouge
       option :function_highlighting, 'Whether to highlight builtin functions (default: true)'
       option :disabled_modules, 'builtin modules to disable'
 
+      lazy auto: false do
+        require_relative 'lua/keywords'
+      end
+
       def initialize(opts={})
         @function_highlighting = opts.delete(:function_highlighting) { true }
         @disabled_modules = opts.delete(:disabled_modules) { [] }
         super(opts)
+
+        self.class.eager_load! if @function_highlighting
       end
 
       def self.detect?(text)
         return true if text.shebang? 'lua'
       end
 
-      def self.builtins
-        Kernel::load File.join(Lexers::BASE_DIR, 'lua/keywords.rb')
-        builtins
-      end
-
       def builtins
         return [] unless @function_highlighting
 
         @builtins ||= Set.new.tap do |builtins|
-          self.class.builtins.each do |mod, fns|
+          BUILTINS.each do |mod, fns|
             next if @disabled_modules.include? mod
             builtins.merge(fns)
           end
@@ -77,7 +78,7 @@ module Rouge
             push :gsub
           elsif self.builtins.include?(name)
             token Name::Builtin
-          elsif name =~ /\./
+          elsif name.include?('.')
             a, b = name.split('.', 2)
             token Name, a
             token Punctuation, '.'

data/lib/rouge/lexers/lutin.rb

@@ -2,10 +2,11 @@
 # frozen_string_literal: true
 #
 # adapted from lustre.rf (adapted from ocaml.rb), hence some ocaml-ism migth remains
+
+require_relative 'lustre'
+
 module Rouge
   module Lexers
-    load_lexer 'lustre.rb'
-
     class Lutin < Lustre
       title "Lutin"
       desc 'The Lutin programming language (Verimag)'
@@ -16,13 +17,13 @@ module Rouge
       def self.keywords
         @keywords ||= Set.new %w(
           let in node extern system returns weak strong assert raise try catch
-          trap do exist erun run type ref exception include false true 
+          trap do exist erun run type ref exception include false true
         )
       end
 
       def self.word_operators
         @word_operators ||= Set.new %w(
-           div and xor mod or not nor if then else pre) 
+           div and xor mod or not nor if then else pre)
       end
 
       def self.primitives

data/lib/rouge/lexers/m68k.rb

@@ -40,7 +40,7 @@ module Rouge
 
           tas trap trapcc TODO trapv tst
 
-          unlk unpk eori
+          unlk unpk
         )
       end
 
@@ -55,10 +55,10 @@ module Rouge
           include incdir incbin end endf endfunc endmain endproc fpu func machine main mmu opword proc set opt section
           rept endr
           ifeq ifne ifgt ifge iflt ifle iif ifd ifnd ifc ifnc elseif else endc
-          even cnop fail machine
+          even cnop fail
           output radix __G2 __LK
           list nolist plen llen ttl subttl spc page listchar format
-          equ equenv equr set reg
+          equ equenv equr reg
           rsreset rsset offset
           cargs
           fequ.s fequ.d fequ.x fequ.p fequ.w fequ.l fopt

data/lib/rouge/lexers/mason.rb

@@ -1,110 +1,110 @@
-# -*- coding: utf-8 -*- #
-# frozen_string_literal: true
-
-module Rouge
-  module Lexers
-    class Mason < TemplateLexer
-      title 'Mason'
-      desc 'The HTML::Mason framework (https://metacpan.org/pod/HTML::Mason)'
-      tag 'mason'
-      filenames '*.mi', '*.mc', '*.mas', '*.m', '*.mhtml', '*.mcomp', 'autohandler', 'dhandler'
-      mimetypes 'text/x-mason', 'application/x-mason'
-
-      def initialize(*)
-        super
-        @perl = Perl.new
-      end
-  
-      # Note: If you add a tag in the lines below, you also need to modify "disambiguate '*.m'" in file disambiguation.rb
-      TEXT_BLOCKS = %w(text doc)
-      PERL_BLOCKS = %w(args flags attr init once shared perl cleanup filter)
-      COMPONENTS = %w(def method)
-  
-      state :root do
-        mixin :mason_tags
-      end
-
-      state :mason_tags do
-        rule %r/\s+/, Text::Whitespace
-
-        rule %r/<%(#{TEXT_BLOCKS.join('|')})>/oi, Comment::Preproc, :text_block
-
-        rule %r/<%(#{PERL_BLOCKS.join('|')})>/oi, Comment::Preproc, :perl_block
-
-        rule %r/(<%(#{COMPONENTS.join('|')}))([^>]*)(>)/oi do |m|
-          token Comment::Preproc, m[1]
-          token Name, m[3]
-          token Comment::Preproc, m[4]
-          push :component_block
-        end
-        
-        # perl line
-        rule %r/^(%)(.*)$/ do |m|
-          token Comment::Preproc, m[1]
-          delegate @perl, m[2]
-        end
-
-        # start of component call
-        rule %r/<%/, Comment::Preproc, :component_call
-
-         # start of component with content
-        rule %r/<&\|/ do
-          token Comment::Preproc
-          push :component_with_content
-          push :component_sub
-        end
-
-        # start of component substitution
-        rule %r/<&/, Comment::Preproc, :component_sub
-
-        # fallback to HTML until a mason tag is encountered
-        rule(/(.+?)(?=(<\/?&|<\/?%|^%|^#))/m) { delegate parent }
-
-        # if we get here, there's no more mason tags, so we parse the rest of the doc as HTML
-        rule(/.+/m) { delegate parent }
-      end
-
-      state :perl_block do
-        rule %r/<\/%(#{PERL_BLOCKS.join('|')})>/oi, Comment::Preproc, :pop!
-        rule %r/\s+/, Text::Whitespace
-        rule %r/^(#.*)$/, Comment
-        rule(/(.*?[^"])(?=<\/%)/m) { delegate @perl }
-      end
-
-      state :text_block do
-        rule %r/<\/%(#{TEXT_BLOCKS.join('|')})>/oi, Comment::Preproc, :pop!
-        rule %r/\s+/, Text::Whitespace
-        rule %r/^(#.*)$/, Comment
-        rule %r/(.*?[^"])(?=<\/%)/m, Comment
-      end
-
-      state :component_block do
-        rule %r/<\/%(#{COMPONENTS.join('|')})>/oi, Comment::Preproc, :pop!
-        rule %r/\s+/, Text::Whitespace
-        rule %r/^(#.*)$/, Comment
-        mixin :mason_tags
-      end
-
-      state :component_with_content do
-        rule %r/<\/&>/ do 
-          token Comment::Preproc
-          pop!
-        end
-
-        mixin :mason_tags
-      end
-
-      state :component_sub do
-        rule %r/&>/, Comment::Preproc, :pop!
-
-        rule(/(.*?)(?=&>)/m) { delegate @perl }
-      end
-
-      state :component_call do
-        rule %r/%>/, Comment::Preproc, :pop!
-
-        rule(/(.*?)(?=%>)/m) { delegate @perl }
-      end
-    end
-  end
-end
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class Mason < TemplateLexer
+      title 'Mason'
+      desc 'The HTML::Mason framework (https://metacpan.org/pod/HTML::Mason)'
+      tag 'mason'
+      filenames '*.mi', '*.mc', '*.mas', '*.m', '*.mhtml', '*.mcomp', 'autohandler', 'dhandler'
+      mimetypes 'text/x-mason', 'application/x-mason'
+
+      def initialize(*)
+        super
+        @perl = Perl.new
+      end
+
+      # Note: If you add a tag in the lines below, you also need to modify "disambiguate '*.m'" in file disambiguation.rb
+      TEXT_BLOCKS = %w(text doc)
+      PERL_BLOCKS = %w(args flags attr init once shared perl cleanup filter)
+      COMPONENTS = %w(def method)
+
+      state :root do
+        mixin :mason_tags
+      end
+
+      state :mason_tags do
+        rule %r/\s+/, Text::Whitespace
+
+        rule %r/<%(#{TEXT_BLOCKS.join('|')})>/oi, Comment::Preproc, :text_block
+
+        rule %r/<%(#{PERL_BLOCKS.join('|')})>/oi, Comment::Preproc, :perl_block
+
+        rule %r/(<%(#{COMPONENTS.join('|')}))([^>]*)(>)/oi do |m|
+          token Comment::Preproc, m[1]
+          token Name, m[3]
+          token Comment::Preproc, m[4]
+          push :component_block
+        end
+
+        # perl line
+        rule %r/^(%)(.*)$/ do |m|
+          token Comment::Preproc, m[1]
+          delegate @perl, m[2]
+        end
+
+        # start of component call
+        rule %r/<%/, Comment::Preproc, :component_call
+
+         # start of component with content
+        rule %r/<&\|/ do
+          token Comment::Preproc
+          push :component_with_content
+          push :component_sub
+        end
+
+        # start of component substitution
+        rule %r/<&/, Comment::Preproc, :component_sub
+
+        # fallback to HTML until a mason tag is encountered
+        rule(/(.+?)(?=(<\/?&|<\/?%|^%|^#))/m) { delegate parent }
+
+        # if we get here, there's no more mason tags, so we parse the rest of the doc as HTML
+        rule(/.+/m) { delegate parent }
+      end
+
+      state :perl_block do
+        rule %r/<\/%(#{PERL_BLOCKS.join('|')})>/oi, Comment::Preproc, :pop!
+        rule %r/\s+/, Text::Whitespace
+        rule %r/^(#.*)$/, Comment
+        rule(/(.*?[^"])(?=<\/%)/m) { delegate @perl }
+      end
+
+      state :text_block do
+        rule %r/<\/%(#{TEXT_BLOCKS.join('|')})>/oi, Comment::Preproc, :pop!
+        rule %r/\s+/, Text::Whitespace
+        rule %r/^(#.*)$/, Comment
+        rule %r/(.*?[^"])(?=<\/%)/m, Comment
+      end
+
+      state :component_block do
+        rule %r/<\/%(#{COMPONENTS.join('|')})>/oi, Comment::Preproc, :pop!
+        rule %r/\s+/, Text::Whitespace
+        rule %r/^(#.*)$/, Comment
+        mixin :mason_tags
+      end
+
+      state :component_with_content do
+        rule %r/<\/&>/ do
+          token Comment::Preproc
+          pop!
+        end
+
+        mixin :mason_tags
+      end
+
+      state :component_sub do
+        rule %r/&>/, Comment::Preproc, :pop!
+
+        rule(/(.*?)(?=&>)/m) { delegate @perl }
+      end
+
+      state :component_call do
+        rule %r/%>/, Comment::Preproc, :pop!
+
+        rule(/(.*?)(?=%>)/m) { delegate @perl }
+      end
+    end
+  end
+end