Fixed require setup for generated parsers.

yorickpeterse · Feb 12, 2015 · 4202b63 · 4202b63
1 parent 35ad6d0
commit 4202b63
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/lib/ll.rb b/lib/ll.rb
@@ -6,23 +6,11 @@
 require 'ast'
 require 'ansi/code'
 
-require_relative 'll/version'
-require_relative 'll/driver'
-require_relative 'll/driver_config'
-
-require_relative 'libll'
-
-#:nocov:
-if RUBY_PLATFORM == 'java'
-  org.libll.Libll.load(JRuby.runtime)
-end
-#:nocov:
-
+require_relative 'll/setup'
 require_relative 'll/source_line'
 require_relative 'll/lexer'
 require_relative 'll/token'
 require_relative 'll/parser'
-require_relative 'll/parser_error'
 require_relative 'll/grammar_compiler'
 require_relative 'll/code_generator'
 require_relative 'll/compiled_grammar'

diff --git a/lib/ll/driver_template.erb b/lib/ll/driver_template.erb
@@ -2,9 +2,7 @@
 # is not recommended as any changes will be lost the next time this parser is
 # re-generated.
 <%- if @add_requires -%>
-require 'll/driver'
-require 'll/driver_config'
-require 'll/parser_error'
+require 'll/setup'
 <%- end -%>
 
 <%- @config.namespace.each do |part| -%>

diff --git a/lib/ll/setup.rb b/lib/ll/setup.rb
@@ -0,0 +1,11 @@
+require_relative 'version'
+require_relative 'driver'
+require_relative 'driver_config'
+require_relative 'parser_error'
+require_relative '../libll'
+
+#:nocov:
+if RUBY_PLATFORM == 'java'
+  org.libll.Libll.load(JRuby.runtime)
+end
+#:nocov: