diff options
| author | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-07 23:08:26 +0000 |
|---|---|---|
| committer | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-07 23:08:26 +0000 |
| commit | dcbecb4ae20214d8ba9be650a9d9b53d466162fa (patch) | |
| tree | 80f5a915eded87371708fa9af98d2dcba7d8b63d | |
| parent | 9c3d2282e0b65c34b9c3b5622bf84bbd89e975dc (diff) | |
| download | ruby-dcbecb4ae20214d8ba9be650a9d9b53d466162fa.tar.gz ruby-dcbecb4ae20214d8ba9be650a9d9b53d466162fa.tar.xz ruby-dcbecb4ae20214d8ba9be650a9d9b53d466162fa.zip | |
Use define_method instead of module_eval.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/dl/lib/dl/import.rb | 24 | ||||
| -rw-r--r-- | ext/dl/test/test_import.rb | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb index ebd84eb47..4158d9d01 100644 --- a/ext/dl/lib/dl/import.rb +++ b/ext/dl/lib/dl/import.rb @@ -118,12 +118,12 @@ module DL f = import_function(symname, ctype, argtype, opt[:call_type]) name = symname.gsub(/@.+/,'') @func_map[name] = f - #define_method(name){|*args,&block| f.call(*args,&block)} - module_eval(<<-EOS) - def #{name}(*args, &block) - @func_map['#{name}'].call(*args,&block) - end - EOS + define_method(name){|*args,&block| f.call(*args,&block)} + #module_eval(<<-EOS) + # def #{name}(*args, &block) + # @func_map['#{name}'].call(*args,&block) + # end + #EOS module_function(name) f end @@ -142,12 +142,12 @@ module DL raise(RuntimeError, "unknown callback type: #{h[:callback_type]}") end @func_map[name] = f - #define_method(name){|*args,&block| f.call(*args,&block)} - module_eval(<<-EOS) - def #{name}(*args,&block) - @func_map['#{name}'].call(*args,&block) - end - EOS + define_method(name){|*args,&block| f.call(*args,&block)} + #module_eval(<<-EOS) + # def #{name}(*args,&block) + # @func_map['#{name}'].call(*args,&block) + # end + #EOS module_function(name) f end diff --git a/ext/dl/test/test_import.rb b/ext/dl/test/test_import.rb index 14fb1eba6..c96c330a8 100644 --- a/ext/dl/test/test_import.rb +++ b/ext/dl/test/test_import.rb @@ -54,7 +54,7 @@ module DL def test_io() io_in,io_out = IO.pipe() - LIBC.fprintf(DL::CPtr[io_out], "hello") + LIBC.fprintf(io_out, "hello") io_out.flush() io_out.close() str = io_in.read() |