svn commit: r1448669 - /openoffice/trunk/main/solenv/inc/lldb4aoo.py

[hd...@apache.org]

Author: hdu
Date: Thu Feb 21 14:48:28 2013
New Revision: 1448669

URL: http://svn.apache.org/r1448669
Log:
lldb4aoo: remove info-string parameter from walk_ptrchar

Modified:
    openoffice/trunk/main/solenv/inc/lldb4aoo.py

Modified: openoffice/trunk/main/solenv/inc/lldb4aoo.py
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/lldb4aoo.py?rev=1448669&r1=1448668&r2=1448669&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/lldb4aoo.py (original)
+++ openoffice/trunk/main/solenv/inc/lldb4aoo.py Thu Feb 21 14:48:28 2013
@@ -1,4 +1,4 @@
-# to activate the AOO-LLDB helper script run the line below into LLDB
+# to activate the AOO-LLDB helper script type the line below into LLDB
 #	command script import path-to-script/lldb4aoo.py
 # or activate it automatically by adding the line to ~/.lldbinit
 
@@ -17,22 +17,22 @@ def __lldb_init_module( dbg, dict):
 	# register a generic helper function for pimpl types
 	dbg.HandleCommand( 'type summary add -F %s.%s -v -C yes -n PIMPL %s' % ( __name__,'get_pimpl_info', ' '.join(pimpl_types)))
 
+
 # local functions for use by the AOO-type summary providers
 
-def walk_ptrchain( v, info):
+def walk_ptrchain( v):
+	info = ''
 	while v.TypeIsPointerType():
 		n = v.GetValueAsUnsigned()
 		if n == 0:
 			info += 'NULL'
 			return (None, info)
-		else:
-			info += '0x%04X-> ' % (n)
-			v = v.Dereference()
+		info += '0x%04X-> ' % (n)
+		v = v.Dereference()
 	return (v, info)
 
 def ret_strdata_info( v, refvar, lenvar, aryvar):
-	info = ''
-	(v, info) = walk_ptrchain( v, info)
+	(v, info) = walk_ptrchain( v)
 	if not v:
 		return info
 	r = v.GetChildMemberWithName( refvar).GetValueAsSigned()
@@ -50,12 +50,13 @@ def ret_strdata_info( v, refvar, lenvar,
 # definitions for our individual LLDB type summary providers
 
 def get_pimpl_info( valobj, dict):
-	v = walk_ptrchain( valobj, '')
+	(v, info) = walk_ptrchain( valobj)
 	p = v.GetChildAtIndex(0)
-	info = v.GetName()
-	if v.GetValueAsUnsigned() == 0:
-		return '(%s==NULL)' % (info)
-	info = '(%s=0x%04X)-> ' % (info,n)
+	pname = p.GetName()
+	n = p.GetValueAsUnsigned()
+	if n == 0:
+		return '%s(%s==NULL)' % (info, pname)
+	info = '%s(%s=0x%04X)-> ' % (info, pname, n)
 	return info + p.Dereference().GetSummary()
 
 
@@ -71,4 +72,3 @@ def getinfo_for__ByteStringData( valobj,
 def getinfo_for__UniStringData( valobj, dict):
 	return ret_strdata_info( valobj, 'mnRefCount', 'mnLen', 'maStr') 
 
-