git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use consistent naming for value type attributes. 

* python/libstdcxx/v6/xmethods.py (ArrayWorkerBase): Rename _valtype
	to _val_type.
	(ArraySizeWorker, ArrayEmptyWorker): Ditto.
	(ArrayFrontWorker, ArrayBackWorker): Ditto.
	(ArrayAtWorker, ArraySubscriptWorker): Ditto.
	(DequeWorkerBase): Rename elemtype to val_type.
	(ForwardListWorkerBase): Rename _elem_type to _val_type.
	(ForwardListFrontWorker): Ditto.  And rename elem_address to
	val_address.
	(ForwardListMethodsMatcher): Rename elem_type to val_type.
	(VectorWorkerBase): Rename _elemtype to _val_type.

From-SVN: r222596
This commit is contained in:
Doug Evans 2015-04-29 21:57:04 +00:00 committed by Doug Evans
parent 081564faed
commit b693b8792e
2 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,18 @@
2015-04-29 Doug Evans <dje@google.com>
Use consistent naming for value type attributes.
* python/libstdcxx/v6/xmethods.py (ArrayWorkerBase): Rename _valtype
to _val_type.
(ArraySizeWorker, ArrayEmptyWorker): Ditto.
(ArrayFrontWorker, ArrayBackWorker): Ditto.
(ArrayAtWorker, ArraySubscriptWorker): Ditto.
(DequeWorkerBase): Rename elemtype to val_type.
(ForwardListWorkerBase): Rename _elem_type to _val_type.
(ForwardListFrontWorker): Ditto. And rename elem_address to
val_address.
(ForwardListMethodsMatcher): Rename elem_type to val_type.
(VectorWorkerBase): Rename _elemtype to _val_type.
2015-04-29 Jonathan Wakely <jwakely@redhat.com> 2015-04-29 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/65760 PR libstdc++/65760

54
libstdc++-v3/python/libstdcxx/v6/xmethods.py
View File

@ -29,17 +29,17 @@ class LibStdCxxXMethod(gdb.xmethod.XMethod):
# Xmethods for std::array # Xmethods for std::array
class ArrayWorkerBase(gdb.xmethod.XMethodWorker): class ArrayWorkerBase(gdb.xmethod.XMethodWorker):
def __init__(self, valtype, size): def __init__(self, val_type, size):
self._valtype = valtype self._val_type = val_type
self._size = size self._size = size
def null_value(self): def null_value(self):
nullptr = gdb.parse_and_eval('(void *) 0') nullptr = gdb.parse_and_eval('(void *) 0')
return nullptr.cast(self._valtype.pointer()).dereference() return nullptr.cast(self._val_type.pointer()).dereference()
class ArraySizeWorker(ArrayWorkerBase): class ArraySizeWorker(ArrayWorkerBase):
def __init__(self, valtype, size): def __init__(self, val_type, size):
ArrayWorkerBase.__init__(self, valtype, size) ArrayWorkerBase.__init__(self, val_type, size)
def get_arg_types(self): def get_arg_types(self):
return None return None
@ -48,8 +48,8 @@ class ArraySizeWorker(ArrayWorkerBase):
return self._size return self._size
class ArrayEmptyWorker(ArrayWorkerBase): class ArrayEmptyWorker(ArrayWorkerBase):
def __init__(self, valtype, size): def __init__(self, val_type, size):
ArrayWorkerBase.__init__(self, valtype, size) ArrayWorkerBase.__init__(self, val_type, size)
def get_arg_types(self): def get_arg_types(self):
return None return None
@ -58,8 +58,8 @@ class ArrayEmptyWorker(ArrayWorkerBase):
return (int(self._size) == 0) return (int(self._size) == 0)
class ArrayFrontWorker(ArrayWorkerBase): class ArrayFrontWorker(ArrayWorkerBase):
def __init__(self, valtype, size): def __init__(self, val_type, size):
ArrayWorkerBase.__init__(self, valtype, size) ArrayWorkerBase.__init__(self, val_type, size)
def get_arg_types(self): def get_arg_types(self):
return None return None
@ -71,8 +71,8 @@ class ArrayFrontWorker(ArrayWorkerBase):
return self.null_value() return self.null_value()
class ArrayBackWorker(ArrayWorkerBase): class ArrayBackWorker(ArrayWorkerBase):
def __init__(self, valtype, size): def __init__(self, val_type, size):
ArrayWorkerBase.__init__(self, valtype, size) ArrayWorkerBase.__init__(self, val_type, size)
def get_arg_types(self): def get_arg_types(self):
return None return None
@ -84,8 +84,8 @@ class ArrayBackWorker(ArrayWorkerBase):
return self.null_value() return self.null_value()
class ArrayAtWorker(ArrayWorkerBase): class ArrayAtWorker(ArrayWorkerBase):
def __init__(self, valtype, size): def __init__(self, val_type, size):
ArrayWorkerBase.__init__(self, valtype, size) ArrayWorkerBase.__init__(self, val_type, size)
def get_arg_types(self): def get_arg_types(self):
return gdb.lookup_type('std::size_t') return gdb.lookup_type('std::size_t')
@ -97,8 +97,8 @@ class ArrayAtWorker(ArrayWorkerBase):
return obj['_M_elems'][index] return obj['_M_elems'][index]
class ArraySubscriptWorker(ArrayWorkerBase): class ArraySubscriptWorker(ArrayWorkerBase):
def __init__(self, valtype, size): def __init__(self, val_type, size):
ArrayWorkerBase.__init__(self, valtype, size) ArrayWorkerBase.__init__(self, val_type, size)
def get_arg_types(self): def get_arg_types(self):
return gdb.lookup_type('std::size_t') return gdb.lookup_type('std::size_t')
@ -139,8 +139,8 @@ class ArrayMethodsMatcher(gdb.xmethod.XMethodMatcher):
# Xmethods for std::deque # Xmethods for std::deque
class DequeWorkerBase(gdb.xmethod.XMethodWorker): class DequeWorkerBase(gdb.xmethod.XMethodWorker):
def __init__(self, elemtype): def __init__(self, val_type):
self._bufsize = (512 / elemtype.sizeof) or 1 self._bufsize = (512 / val_type.sizeof) or 1
def size(self, obj): def size(self, obj):
first_node = obj['_M_impl']['_M_start']['_M_node'] first_node = obj['_M_impl']['_M_start']['_M_node']
@ -232,8 +232,8 @@ class DequeMethodsMatcher(gdb.xmethod.XMethodMatcher):
# Xmethods for std::forward_list # Xmethods for std::forward_list
class ForwardListWorkerBase(gdb.xmethod.XMethodMatcher): class ForwardListWorkerBase(gdb.xmethod.XMethodMatcher):
def __init__(self, elem_type, node_type): def __init__(self, val_type, node_type):
self._elem_type = elem_type self._val_type = val_type
self._node_type = node_type self._node_type = node_type
def get_arg_types(self): def get_arg_types(self):
@ -246,8 +246,8 @@ class ForwardListEmptyWorker(ForwardListWorkerBase):
class ForwardListFrontWorker(ForwardListWorkerBase): class ForwardListFrontWorker(ForwardListWorkerBase):
def __call__(self, obj): def __call__(self, obj):
node = obj['_M_impl']['_M_head']['_M_next'].cast(self._node_type) node = obj['_M_impl']['_M_head']['_M_next'].cast(self._node_type)
elem_address = node['_M_storage']['_M_storage'].address val_address = node['_M_storage']['_M_storage'].address
return elem_address.cast(self._elem_type.pointer()).dereference() return val_address.cast(self._val_type.pointer()).dereference()
class ForwardListMethodsMatcher(gdb.xmethod.XMethodMatcher): class ForwardListMethodsMatcher(gdb.xmethod.XMethodMatcher):
def __init__(self): def __init__(self):
@ -265,9 +265,9 @@ class ForwardListMethodsMatcher(gdb.xmethod.XMethodMatcher):
method = self._method_dict.get(method_name) method = self._method_dict.get(method_name)
if method is None or not method.enabled: if method is None or not method.enabled:
return None return None
elem_type = class_type.template_argument(0) val_type = class_type.template_argument(0)
node_type = gdb.lookup_type(str(class_type) + '::_Node').pointer() node_type = gdb.lookup_type(str(class_type) + '::_Node').pointer()
return method.worker_class(elem_type, node_type) return method.worker_class(val_type, node_type)
# Xmethods for std::list # Xmethods for std::list
@ -330,11 +330,11 @@ class ListMethodsMatcher(gdb.xmethod.XMethodMatcher):
# Xmethods for std::vector # Xmethods for std::vector
class VectorWorkerBase(gdb.xmethod.XMethodWorker): class VectorWorkerBase(gdb.xmethod.XMethodWorker):
def __init__(self, elemtype): def __init__(self, val_type):
self._elemtype = elemtype self._val_type = val_type
def size(self, obj): def size(self, obj):
if self._elemtype.code == gdb.TYPE_CODE_BOOL: if self._val_type.code == gdb.TYPE_CODE_BOOL:
start = obj['_M_impl']['_M_start']['_M_p'] start = obj['_M_impl']['_M_start']['_M_p']
finish = obj['_M_impl']['_M_finish']['_M_p'] finish = obj['_M_impl']['_M_finish']['_M_p']
finish_offset = obj['_M_impl']['_M_finish']['_M_offset'] finish_offset = obj['_M_impl']['_M_finish']['_M_offset']
@ -344,7 +344,7 @@ class VectorWorkerBase(gdb.xmethod.XMethodWorker):
return obj['_M_impl']['_M_finish'] - obj['_M_impl']['_M_start'] return obj['_M_impl']['_M_finish'] - obj['_M_impl']['_M_start']
def get(self, obj, index): def get(self, obj, index):
if self._elemtype.code == gdb.TYPE_CODE_BOOL: if self._val_type.code == gdb.TYPE_CODE_BOOL:
start = obj['_M_impl']['_M_start']['_M_p'] start = obj['_M_impl']['_M_start']['_M_p']
bit_size = start.dereference().type.sizeof * 8 bit_size = start.dereference().type.sizeof * 8
valp = start + index / bit_size valp = start + index / bit_size