kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/pathname/lib/pathname.rb (Pathname#initialize): removed.

Browse source 
* ext/pathname/pathname.c (path_initialize): implemented.
  (get_strpath): new function.
  (set_strpath): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-07-17 15:03:31 +00:00
parent 327da86aaf
commit 03bb750d56
3 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Jul 18 00:02:19 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/lib/pathname.rb (Pathname#initialize): removed.
* ext/pathname/pathname.c (path_initialize): implemented.
(get_strpath): new function.
(set_strpath): ditto.
Sat Jul 17 19:01:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jul 17 19:01:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit.rb (MiniTest::Unit#process_args): refactored. * lib/test/unit.rb (MiniTest::Unit#process_args): refactored.

15
ext/pathname/lib/pathname.rb
View file

@ -208,21 +208,6 @@ class Pathname
# :startdoc: # :startdoc:
#
# Create a Pathname object from the given String (or String-like object).
# If +path+ contains a NUL character (<tt>\0</tt>), an ArgumentError is raised.
#
def initialize(path)
path = path.__send__(TO_PATH) if path.respond_to? TO_PATH
@path = path.dup
if /\0/ =~ @path
raise ArgumentError, "pathname contains \\0: #{@path.inspect}"
end
self.taint if @path.tainted?
end
def freeze() super; @path.freeze; self end def freeze() super; @path.freeze; self end
def taint() super; @path.taint; self end def taint() super; @path.taint; self end
def untaint() super; @path.untaint; self end def untaint() super; @path.untaint; self end

37
ext/pathname/pathname.c
View file

@ -1,9 +1,46 @@
#include "ruby.h" #include "ruby.h"
static VALUE rb_cPathname; static VALUE rb_cPathname;
static ID id_at_path, id_to_path;
static VALUE
get_strpath(VALUE obj)
{
return rb_ivar_get(obj, id_at_path);
}
static void
set_strpath(VALUE obj, VALUE val)
{
rb_ivar_set(obj, id_at_path, val);
}
/*
* Create a Pathname object from the given String (or String-like object).
* If +path+ contains a NUL character (<tt>\0</tt>), an ArgumentError is raised.
*/
static VALUE
path_initialize(VALUE self, VALUE arg)
{
VALUE str;
str = rb_check_funcall(arg, id_to_path, 0, NULL);
if (str == Qundef)
str = arg;
StringValue(str);
if (memchr(RSTRING_PTR(str), '\0', RSTRING_LEN(str)))
rb_raise(rb_eArgError, "pathname contains null byte");
str = rb_obj_dup(str);
set_strpath(self, str);
OBJ_INFECT(self, str);
}
void void
Init_pathname() Init_pathname()
{ {
id_at_path = rb_intern("@path");
id_to_path = rb_intern("to_path");
rb_cPathname = rb_define_class("Pathname", rb_cObject); rb_cPathname = rb_define_class("Pathname", rb_cObject);
rb_define_method(rb_cPathname, "initialize", path_initialize, 1);
} }