Author: Stephan <[email protected]>
Branch:
Changeset: r350:9f8d4517536f
Date: 2013-02-06 17:49 +0100
http://bitbucket.org/pypy/lang-js/changeset/9f8d4517536f/
Log: unified new_map
diff --git a/js/environment_record.py b/js/environment_record.py
--- a/js/environment_record.py
+++ b/js/environment_record.py
@@ -1,8 +1,4 @@
-from js.object_map import ROOT_MAP
-
-
-def _new_map():
- return ROOT_MAP
+from js.object_map import new_map
class EnvironmentRecord(object):
@@ -33,11 +29,11 @@
def __init__(self, size=0, resize=True):
EnvironmentRecord.__init__(self)
- self._binding_map_ = _new_map()
+ self._binding_map_ = new_map()
self._binding_slots_ = [None] * size
self._binding_resize_ = resize
- self._mutable_bindings_map_ = _new_map()
- self._deletable_bindings_map_ = _new_map()
+ self._mutable_bindings_map_ = new_map()
+ self._deletable_bindings_map_ = new_map()
def _is_mutable_binding(self, identifier):
return self._mutable_bindings_map_.contains(identifier)
diff --git a/js/jsobj.py b/js/jsobj.py
--- a/js/jsobj.py
+++ b/js/jsobj.py
@@ -8,11 +8,7 @@
from js.property_descriptor import PropertyDescriptor, DataPropertyDescriptor,
AccessorPropertyDescriptor, is_data_descriptor, is_generic_descriptor,
is_accessor_descriptor
from js.property import DataProperty, AccessorProperty
-from js.object_map import ROOT_MAP
-
-
-def _new_map():
- return ROOT_MAP
+from js.object_map import new_map
@jit.elidable
@@ -183,7 +179,7 @@
def __init__(self):
from js.object_space import newnull
- self._property_map_ = _new_map()
+ self._property_map_ = new_map()
self._property_slots_ = []
self._prototype_ = newnull()
@@ -921,7 +917,7 @@
from js.object_space import object_space
_map = object_space.new_obj()
- mapped_names = _new_map()
+ mapped_names = new_map()
indx = _len - 1
while indx >= 0:
val = args[indx]
diff --git a/js/object_map.py b/js/object_map.py
--- a/js/object_map.py
+++ b/js/object_map.py
@@ -97,5 +97,5 @@
ROOT_MAP = MapRoot()
-def root_map():
+def new_map():
return ROOT_MAP
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
