You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/02/20 16:53:37 UTC
svn commit: r1448261 - /openoffice/trunk/main/solenv/inc/lldb4aoo.py
Author: hdu
Date: Wed Feb 20 15:53:37 2013
New Revision: 1448261
URL: http://svn.apache.org/r1448261
Log:
consolidate presentation of AOO-strings in LLDB
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=1448261&r1=1448260&r2=1448261&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/lldb4aoo.py (original)
+++ openoffice/trunk/main/solenv/inc/lldb4aoo.py Wed Feb 20 15:53:37 2013
@@ -26,42 +26,45 @@ def __lldb_init_module( dbg, dict):
# definitions for individual LLDB type summary helpers
+def ret_strinfo( refs, length, ary0):
+ a = ary0.AddressOf().GetPointeeData( 0, length)
+ if ary0.GetByteSize() == 1:
+ s = ''.join([chr(x) for x in a.uint8s])
+ else: # assume UTF-16
+ s = (u''.join([unichr(x) for x in a.uint16s])).encode('utf-8')
+ return ('{refs=%d, len=%d, str="%s"}' % (refs, length, s.encode('string_escape')))
+
def getinfo_for_rtl_String( valobj, dict):
while valobj.TypeIsPointerType():
valobj = valobj.Dereference()
r = valobj.GetChildMemberWithName('refCount').GetValueAsSigned()
l = valobj.GetChildMemberWithName('length').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('buffer').AddressOf().GetPointeeData(0,l)
- s = ''.join([chr(x) for x in a.uint8s])
- return '{refs=%d, len=%d, str="%s"}'%(r,l,s)
- return info
+ a = valobj.GetChildMemberWithName('buffer')
+ return ret_strinfo(r,l,a)
def getinfo_for_rtl_uString( valobj, dict):
while valobj.TypeIsPointerType():
valobj = valobj.Dereference()
r = valobj.GetChildMemberWithName('refCount').GetValueAsSigned()
l = valobj.GetChildMemberWithName('length').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('buffer').AddressOf().GetPointeeData(0,l)
- s = (u''.join([unichr(x) for x in a.uint16s])).encode('utf-8')
- return '{refs=%d, len=%d, str="%s"}'%(r,l,s)
+ a = valobj.GetChildMemberWithName('buffer')
+ return ret_strinfo(r,l,a)
def getinfo_for__ByteStringData( valobj, dict):
while valobj.TypeIsPointerType():
valobj = valobj.Dereference()
r = valobj.GetChildMemberWithName('mnRefCount').GetValueAsSigned()
l = valobj.GetChildMemberWithName('mnLen').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('maStr').AddressOf().GetPointeeData(0,l)
- s = ''.join([chr(x) for x in a.uint8s])
- return '{refs=%d, len=%d, str="%s"}'%(r,l,s)
+ a = valobj.GetChildMemberWithName('maStr')
+ return ret_strinfo(r,l,a)
def getinfo_for__UniStringData( valobj, dict):
while valobj.TypeIsPointerType():
valobj = valobj.Dereference()
r = valobj.GetChildMemberWithName('mnRefCount').GetValueAsSigned()
l = valobj.GetChildMemberWithName('mnLen').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('maStr').AddressOf().GetPointeeData(0,l)
- s = (u''.join([unichr(x) for x in a.uint16s])).encode('utf-8')
- return '{refs=%d, len=%d, str="%s"}'%(r,l,s)
+ a = valobj.GetChildMemberWithName('maStr')
+ return ret_strinfo(r,l,a)
def getinfo_for_rtl_OString( valobj, dict):