diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2013-12-16 16:14:56 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2013-12-16 16:14:56 -0800 |
| commit | 6aa65ed7c16f9dc43835916cdabebae2085f0e62 (patch) | |
| tree | 38e0faffcb3f2492b7992ab6cf6f5374c9323909 /lib/ffi_yajl/parser.rb | |
| parent | 47037d045b5fd5c09992e07d66e8bb8d71d9c150 (diff) | |
| download | ffi-yajl-6aa65ed7c16f9dc43835916cdabebae2085f0e62.tar.gz | |
code rearrangement
Diffstat (limited to 'lib/ffi_yajl/parser.rb')
| -rw-r--r-- | lib/ffi_yajl/parser.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/ffi_yajl/parser.rb b/lib/ffi_yajl/parser.rb index 25acd3a..33bb2c3 100644 --- a/lib/ffi_yajl/parser.rb +++ b/lib/ffi_yajl/parser.rb @@ -19,16 +19,19 @@ module FFI_Yajl do_yajl_parse(str, yajl_opts) end - if ENV['FORCE_FFI_YAJL'] == "ffi" || defined?(Yajl) + if ENV['FORCE_FFI_YAJL'] == "ext" + require 'ffi_yajl/ext/parser' + include FFI_Yajl::Ext::Parser + elsif ENV['FORCE_FFI_YAJL'] == "ffi" || defined?(Yajl) # on Linux yajl-ruby and non-FFI ffi_yajl conflict - require 'ffi_yajl/ffi' + require 'ffi_yajl/ffi/parser' include FFI_Yajl::FFI::Parser else begin - require 'ffi_yajl/ext' + require 'ffi_yajl/ext/parser' include FFI_Yajl::Ext::Parser rescue LoadError - require 'ffi_yajl/ffi' + require 'ffi_yajl/ffi/parser' include FFI_Yajl::FFI::Parser end end |