src/formatters/json.cr

@@ -12,7 +12,7 @@ module Tartrazine
 
     def format(text : String, lexer : BaseLexer, io : IO) : Nil
       tokenizer = lexer.tokenizer(text)
-      io << Tartrazine::RegexLexer.collapse_tokens(tokenizer.to_a).to_json
+      io << Tartrazine::Lexer.collapse_tokens(tokenizer.to_a).to_json
     end
   end
 end

src/lexer.cr

@@ -1,6 +1,5 @@
-require "./constants/lexers"
-require "./heuristics"
 require "baked_file_system"
+require "./constants/lexers"
 
 module Tartrazine
   class LexerFiles
@@ -15,14 +14,14 @@ module Tartrazine
     return lexer_by_filename(filename) if filename
     return lexer_by_mimetype(mimetype) if mimetype
 
-    RegexLexer.from_xml(LexerFiles.get("/#{LEXERS_BY_NAME["plaintext"]}.xml").gets_to_end)
+    Lexer.from_xml(LexerFiles.get("/#{LEXERS_BY_NAME["plaintext"]}.xml").gets_to_end)
   end
 
   private def self.lexer_by_mimetype(mimetype : String) : BaseLexer
     lexer_file_name = LEXERS_BY_MIMETYPE.fetch(mimetype, nil)
     raise Exception.new("Unknown mimetype: #{mimetype}") if lexer_file_name.nil?
 
-    RegexLexer.from_xml(LexerFiles.get("/#{lexer_file_name}.xml").gets_to_end)
+    Lexer.from_xml(LexerFiles.get("/#{lexer_file_name}.xml").gets_to_end)
   end
 
   private def self.lexer_by_name(name : String) : BaseLexer
@@ -30,7 +29,7 @@ module Tartrazine
     return create_delegating_lexer(name) if lexer_file_name.nil? && name.includes? "+"
     raise Exception.new("Unknown lexer: #{name}") if lexer_file_name.nil?
 
-    RegexLexer.from_xml(LexerFiles.get("/#{lexer_file_name}.xml").gets_to_end)
+    Lexer.from_xml(LexerFiles.get("/#{lexer_file_name}.xml").gets_to_end)
   end
 
   private def self.lexer_by_filename(filename : String) : BaseLexer
@@ -53,7 +52,7 @@ module Tartrazine
       end
     end
 
-    RegexLexer.from_xml(LexerFiles.get("/#{lexer_file_name}.xml").gets_to_end)
+    Lexer.from_xml(LexerFiles.get("/#{lexer_file_name}.xml").gets_to_end)
   end
 
   private def self.lexer_by_content(fname : String) : String?
@@ -153,9 +152,7 @@ module Tartrazine
     end
   end
 
-  alias BaseLexer = Lexer
+  abstract class BaseLexer
-
-  abstract class Lexer
     property config = {
       name:             "",
       priority:         0.0,
@@ -177,7 +174,7 @@ module Tartrazine
   # For explanations on what actions and states do
   # the Pygments documentation is a good place to start.
   # https://pygments.org/docs/lexerdevelopment/
-  class RegexLexer < BaseLexer
+  class Lexer < BaseLexer
     # Collapse consecutive tokens of the same type for easier comparison
     # and smaller output
     def self.collapse_tokens(tokens : Array(Tartrazine::Token)) : Array(Tartrazine::Token)
@@ -201,7 +198,7 @@ module Tartrazine
     end
 
     def self.from_xml(xml : String) : Lexer
-      l = RegexLexer.new
+      l = Lexer.new
       lexer = XML.parse(xml).first_element_child
       if lexer
         config = lexer.children.find { |node|
@@ -266,7 +263,7 @@ module Tartrazine
   #
   # This is useful for things like template languages, where
   # you have Jinja + HTML or Jinja + CSS and so on.
-  class DelegatingLexer < Lexer
+  class DelegatingLexer < BaseLexer
     property language_lexer : BaseLexer
     property root_lexer : BaseLexer
 

src/main.cr

@@ -1,5 +1,5 @@
 require "docopt"
-require "./tartrazine"
+require "./**"
 
 HELP = <<-HELP
 tartrazine: a syntax highlighting tool

src/tartrazine.cr

@@ -1,6 +1,5 @@
 require "./actions"
 require "./formatter"
-require "./formatters/**"
 require "./rules"
 require "./styles"
 require "./tartrazine"