From 738aae54b580d34966ba72f3465513185d385c1c Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 5 Nov 2017 17:58:59 +0100 Subject: fix autoloading of DSL scanners --- lib/coderay.rb | 5 ----- lib/coderay/scanners.rb | 6 ++++++ lib/coderay/simple_scanner.rb | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/coderay.rb b/lib/coderay.rb index e43f6bb..c3de20b 100644 --- a/lib/coderay.rb +++ b/lib/coderay.rb @@ -153,11 +153,6 @@ module CodeRay autoload :Encoders, coderay_path('encoders') autoload :Styles, coderay_path('styles') - # DSL Scanner - autoload :RuleBasedScanner, coderay_path('rule_based_scanner') - autoload :SingleStateRuleBasedScanner, coderay_path('single_state_rule_based_scanner') - autoload :StateBasedScanner, coderay_path('state_based_scanner') - # convenience access and reusable Encoder/Scanner pair autoload :Duo, coderay_path('duo') diff --git a/lib/coderay/scanners.rb b/lib/coderay/scanners.rb index 3c7e594..0935458 100644 --- a/lib/coderay/scanners.rb +++ b/lib/coderay/scanners.rb @@ -21,6 +21,12 @@ module CodeRay plugin_path File.dirname(__FILE__), 'scanners' autoload :Scanner, CodeRay.coderay_path('scanners', 'scanner') + + # DSL Scanners + autoload :RuleBasedScanner, CodeRay.coderay_path('rule_based_scanner') + autoload :SingleStateRuleBasedScanner, CodeRay.coderay_path('single_state_rule_based_scanner') + autoload :StateBasedScanner, CodeRay.coderay_path('state_based_scanner') + autoload :SimpleScanner, CodeRay.coderay_path('simple_scanner') end diff --git a/lib/coderay/simple_scanner.rb b/lib/coderay/simple_scanner.rb index 6873f88..96a0e51 100644 --- a/lib/coderay/simple_scanner.rb +++ b/lib/coderay/simple_scanner.rb @@ -1,4 +1,5 @@ require 'set' +require 'coderay/simple_scanner_dsl' module CodeRay module Scanners -- cgit v1.2.1