Author: Lars Wassermann <[email protected]>
Branch:
Changeset: r59:d9338ab06c51
Date: 2013-02-19 13:33 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/d9338ab06c51/
Log: (cfbolz, lwassermann, krono): be consistent with shadows and rename
to _w_self
diff --git a/spyvm/test/test_wrapper.py b/spyvm/test/test_wrapper.py
--- a/spyvm/test/test_wrapper.py
+++ b/spyvm/test/test_wrapper.py
@@ -83,7 +83,7 @@
w_first = space.w_nil
w_last = space.w_nil
for w_process in processes_w[::-1]:
- w_first = newprocess(w_first, w_processlist).w_self
+ w_first = newprocess(w_first, w_processlist)._w_self
if w_last is space.w_nil:
w_last = w_first
pl = wrapper.ProcessListWrapper(space, w_processlist)
@@ -100,8 +100,8 @@
w_prioritylist = model.W_PointersObject(None, maxpriority)
prioritylist = wrapper.Wrapper(space, w_prioritylist)
for i in range(maxpriority):
- prioritylist.write(i, new_processlist(prioritydict.get(i, [])).w_self)
-
+ prioritylist.write(i, new_processlist(prioritydict.get(i, []))._w_self)
+
return prioritylist
def new_scheduler(w_process=space.w_nil, prioritydict=None):
@@ -109,7 +109,7 @@
w_scheduler = model.W_PointersObject(None, 2)
scheduler = wrapper.SchedulerWrapper(space, w_scheduler)
scheduler.store_active_process(w_process)
- scheduler.write(0, priority_list.w_self)
+ scheduler.write(0, priority_list._w_self)
return scheduler
def new_semaphore(excess_signals=0):
@@ -118,7 +118,7 @@
semaphore.store_excess_signals(excess_signals)
return semaphore
-
+
class TestScheduler(object):
def setup_method(self, meth):
self.old_scheduler = wrapper.scheduler
@@ -133,7 +133,7 @@
process.put_to_sleep()
process_list = wrapper.scheduler(space).get_process_list(2)
assert process_list.first_link() is process_list.last_link()
- assert process_list.first_link() is process.w_self
+ assert process_list.first_link() is process._w_self
def test_suspend_asleep(self):
interp, process, old_process = self.make_processes(4, 2,
space.w_false, space.w_true)
@@ -150,23 +150,23 @@
assert process_list.first_link() is process_list.last_link()
assert process_list.first_link() is space.w_nil
assert old_process.my_list() is space.w_nil
- assert wrapper.scheduler(space).active_process() is process.w_self
+ assert wrapper.scheduler(space).active_process() is process._w_self
def new_process_consistency(self, process, old_process, interp,
old_active_context, new_active_context):
scheduler = wrapper.scheduler(space)
assert interp.w_active_context() is new_active_context
- assert scheduler.active_process() is process.w_self
+ assert scheduler.active_process() is process._w_self
priority_list =
wrapper.scheduler(space).get_process_list(process.priority())
assert priority_list.first_link() is priority_list.last_link()
# activate does not remove the process from the process_list.
# The caller of activate is responsible
- assert priority_list.first_link() is process.w_self
+ assert priority_list.first_link() is process._w_self
def old_process_consistency(self, old_process, old_process_context):
assert old_process.suspended_context() is old_process_context
priority_list =
wrapper.scheduler(space).get_process_list(old_process.priority())
- assert priority_list.first_link() is old_process.w_self
+ assert priority_list.first_link() is old_process._w_self
def make_processes(self, sleepingpriority, runningpriority,
sleepingcontext, runningcontext):
@@ -176,7 +176,7 @@
w_suspended_context=sleepingcontext)
sleeping.put_to_sleep()
running = new_process(priority=runningpriority)
- scheduler.store_active_process(running.w_self)
+ scheduler.store_active_process(running._w_self)
interp.store_w_active_context(runningcontext)
return interp, sleeping, running
@@ -187,7 +187,7 @@
process.activate(interp)
self.new_process_consistency(process, old_process, interp,
space.w_true, space.w_false)
-
+
def test_resume(self):
interp, process, old_process = self.make_processes(4, 2,
space.w_false, space.w_true)
process.resume(interp)
@@ -213,17 +213,17 @@
process.put_to_sleep()
old_process.put_to_sleep()
highest = wrapper.scheduler(space).highest_priority_process()
- assert highest is process.w_self
+ assert highest is process._w_self
highest = wrapper.scheduler(space).highest_priority_process()
- assert highest is old_process.w_self
+ assert highest is old_process._w_self
py.test.raises(FatalError,
wrapper.scheduler(space).highest_priority_process)
def test_semaphore_wait(self):
semaphore = new_semaphore()
interp, process, old_process = self.make_processes(4, 2,
space.w_false, space.w_true)
semaphore.wait(interp)
- assert semaphore.first_link() is old_process.w_self
- assert wrapper.scheduler(space).active_process() is process.w_self
+ assert semaphore.first_link() is old_process._w_self
+ assert wrapper.scheduler(space).active_process() is process._w_self
def test_semaphore_signal_wait(self):
semaphore = new_semaphore()
@@ -232,10 +232,10 @@
interp, process, old_process = self.make_processes(4, 2,
space.w_false, space.w_true)
semaphore.wait(interp)
assert semaphore.is_empty_list()
- assert wrapper.scheduler(space).active_process() is old_process.w_self
+ assert wrapper.scheduler(space).active_process() is old_process._w_self
semaphore.wait(interp)
- assert semaphore.first_link() is old_process.w_self
- assert wrapper.scheduler(space).active_process() is process.w_self
+ assert semaphore.first_link() is old_process._w_self
+ assert wrapper.scheduler(space).active_process() is process._w_self
py.test.raises(FatalError, semaphore.wait, interp)
@@ -244,19 +244,19 @@
interp, process, old_process = self.make_processes(4, 2,
space.w_false, space.w_true)
semaphore.wait(interp)
- assert wrapper.scheduler(space).active_process() is process.w_self
+ assert wrapper.scheduler(space).active_process() is process._w_self
semaphore.signal(interp)
- assert wrapper.scheduler(space).active_process() is process.w_self
+ assert wrapper.scheduler(space).active_process() is process._w_self
process_list =
wrapper.scheduler(space).get_process_list(old_process.priority())
- assert process_list.remove_first_link_of_list() is old_process.w_self
+ assert process_list.remove_first_link_of_list() is old_process._w_self
- process.write(2, space.wrap_int(1))
+ process.write(2, space.wrap_int(1))
old_process.resume(interp)
- assert wrapper.scheduler(space).active_process() is old_process.w_self
+ assert wrapper.scheduler(space).active_process() is old_process._w_self
semaphore.wait(interp)
- assert wrapper.scheduler(space).active_process() is process.w_self
+ assert wrapper.scheduler(space).active_process() is process._w_self
semaphore.signal(interp)
- assert wrapper.scheduler(space).active_process() is old_process.w_self
+ assert wrapper.scheduler(space).active_process() is old_process._w_self
process_list =
wrapper.scheduler(space).get_process_list(process.priority())
- assert process_list.first_link() is process.w_self
+ assert process_list.first_link() is process._w_self
diff --git a/spyvm/wrapper.py b/spyvm/wrapper.py
--- a/spyvm/wrapper.py
+++ b/spyvm/wrapper.py
@@ -5,29 +5,29 @@
def __init__(self, space, w_self):
if not isinstance(w_self, model.W_PointersObject):
raise WrapperException("Unexpected instance given to wrapper")
- self.w_self = w_self
+ self._w_self = w_self
self.space = space
def read(self, index0):
try:
- return self.w_self.fetch(self.space, index0)
+ return self._w_self.fetch(self.space, index0)
# XXX Index error never raised after translation
except IndexError:
raise WrapperException("Unexpected instance layout. Too small")
def write(self, index0, w_new):
try:
- self.w_self.store(self.space, index0, w_new)
+ self._w_self.store(self.space, index0, w_new)
# XXX Index error never raised after translation
except IndexError:
raise WrapperException("Unexpected instance layout. Too small")
class VarsizedWrapper(Wrapper):
def at0(self, i0):
- return self.w_self.at0(self.space, i0)
+ return self._w_self.at0(self.space, i0)
def atput0(self, i0, w_value):
- return self.w_self.atput0(self.space, i0, w_value)
+ return self._w_self.atput0(self.space, i0, w_value)
def make_getter(index0):
@@ -69,11 +69,11 @@
sched = scheduler(self.space)
priority = self.priority()
process_list = sched.get_process_list(priority)
- process_list.add_process(self.w_self)
+ process_list.add_process(self._w_self)
def activate(self, interp):
sched = scheduler(self.space)
- sched.store_active_process(self.w_self)
+ sched.store_active_process(self._w_self)
interp.store_w_active_context(self.suspended_context())
self.store_suspended_context(interp.space.w_nil)
self.store_my_list(interp.space.w_nil)
@@ -94,7 +94,7 @@
self.put_to_sleep()
def is_active_process(self):
- return
self.w_self.is_same_object(scheduler(self.space).active_process())
+ return
self._w_self.is_same_object(scheduler(self.space).active_process())
def suspend(self, interp):
if self.is_active_process():
@@ -103,7 +103,7 @@
process = ProcessWrapper(self.space, w_process).activate(interp)
else:
process_list = ProcessListWrapper(self.space, self.my_list())
- process_list.remove(self.w_self)
+ process_list.remove(self._w_self)
self.store_my_list(interp.space.w_nil)
class LinkedListWrapper(Wrapper):
@@ -145,7 +145,7 @@
w_tail = LinkWrapper(self.space, w_next).next_link()
current.store_next_link(w_tail)
if w_tail.is_same_object(self.space.w_nil):
- self.store_last_link(current.w_self)
+ self.store_last_link(current._w_self)
return
current = LinkWrapper(self.space, w_next)
w_next = current.next_link()
@@ -154,7 +154,7 @@
class ProcessListWrapper(LinkedListWrapper):
def add_process(self, w_process):
self.add_last_link(w_process)
- ProcessWrapper(self.space, w_process).store_my_list(self.w_self)
+ ProcessWrapper(self.space, w_process).store_my_list(self._w_self)
class AssociationWrapper(Wrapper):
key = make_getter(0)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
