fix autoloading of DSL scanners

korny · korny · commit 738aae54b580 · 2017-11-05T17:58:59.000+01:00
diff --git a/lib/coderay.rb b/lib/coderay.rb
@@ -153,11 +153,6 @@ def self.coderay_path *path
   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
@@ -21,6 +21,12 @@ module Scanners
     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
@@ -1,4 +1,5 @@
 require 'set'
+require 'coderay/simple_scanner_dsl'
 
 module CodeRay
   module Scanners

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require 'set'`
	`2`	`+require 'coderay/simple_scanner_dsl'`
`2`	`3`
`3`	`4`	`module CodeRay`
`4`	`5`	`module Scanners`