diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 6 | ||||
| -rw-r--r-- | lib/weakref.rb | 50 |
2 files changed, 28 insertions, 28 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c042561e13..cab2b769a7 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -365,6 +365,10 @@ def create_makefile(target) f.sub!(/(#{SRC_EXT.join(%q{|})})$/, $OBJEXT) $objs.push f end + else + for i in $objs + i.sub!(/\.o\z/, ".#{$OBJEXT}") + end end $objs = $objs.join(" ") @@ -459,7 +463,7 @@ EOMF dfile = open("depend", "r") mfile.printf "###\n" while line = dfile.gets() - mfile.printf "%s", line.gsub(/\.o/, ".#{$OBJEXT}") + mfile.printf "%s", line.gsub(/\.o\b/, ".#{$OBJEXT}") end dfile.close end diff --git a/lib/weakref.rb b/lib/weakref.rb index a6519e64c0..3307a2e5aa 100644 --- a/lib/weakref.rb +++ b/lib/weakref.rb @@ -18,33 +18,33 @@ class WeakRef<Delegator ID_MAP = {} # obj -> [ref,...] ID_REV_MAP = {} # ref -> obj - ObjectSpace.add_finalizer(lambda{|id| - __old_status = Thread.critical - Thread.critical = true - begin - rids = ID_MAP[id] - if rids - for rid in rids - ID_REV_MAP[rid] = nil - end - ID_MAP[id] = nil - end - rid = ID_REV_MAP[id] - if rid - ID_REV_MAP[id] = nil - ID_MAP[rid].delete(id) - ID_MAP[rid] = nil if ID_MAP[rid].empty? - end - ensure - Thread.critical = __old_status - end - }) + @@final = lambda{|id| + __old_status = Thread.critical + Thread.critical = true + begin + rids = ID_MAP[id] + if rids + for rid in rids + ID_REV_MAP[rid] = nil + end + ID_MAP[id] = nil + end + rid = ID_REV_MAP[id] + if rid + ID_REV_MAP[id] = nil + ID_MAP[rid].delete(id) + ID_MAP[rid] = nil if ID_MAP[rid].empty? + end + ensure + Thread.critical = __old_status + end + } def initialize(orig) super @__id = orig.__id__ - ObjectSpace.call_finalizer orig - ObjectSpace.call_finalizer self + ObjectSpace.define_finalizer orig, @@final + ObjectSpace.defin_finalizer self, @@final ID_MAP[@__id] = [] unless ID_MAP[@__id] ID_MAP[@__id].push self.__id__ ID_REV_MAP[self.id] = @__id @@ -64,10 +64,6 @@ class WeakRef<Delegator false end end - - def [] - __getobj__ - end end if __FILE__ == $0 |