Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix pretty printers #119

Merged
merged 1 commit into from
Nov 25, 2021
Merged

Fix pretty printers #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/pretty-printers/gdb/cista_hash_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import gdb.xmethod

def is_cista_hash_storage(gdb_type):
type_str = str(gdb_type.strip_typedefs())
type_str = str(gdb_type.strip_typedefs().unqualified())
return type_str.startswith("cista::hash_storage") and not type_str.endswith("::ctrl_t")

class CistaHashStorage:
Expand Down
2 changes: 1 addition & 1 deletion tools/pretty-printers/gdb/cista_pointer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def to_string(self):

def my_pp_func(val):
regex = re.compile("cista::offset_ptr")
if regex.match(str(val.type.strip_typedefs())):
if regex.match(str(val.type.strip_typedefs().unqualified())):
return CistaOffsetPointerPrinter(val)

gdb.pretty_printers.append(my_pp_func)
Expand Down
2 changes: 1 addition & 1 deletion tools/pretty-printers/gdb/cista_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def to_string(self):

def my_pp_func(val):
regex = re.compile("cista::basic_string")
if regex.match(str(val.type.strip_typedefs())):
if regex.match(str(val.type.strip_typedefs().unqualified())):
return CistaStringPrinter(val)

gdb.pretty_printers.append(my_pp_func)
Expand Down
2 changes: 1 addition & 1 deletion tools/pretty-printers/gdb/cista_tuple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def to_string(self):

def my_pp_func(val):
regex = re.compile("cista::tuple")
if regex.match(str(val.type.strip_typedefs())):
if regex.match(str(val.type.strip_typedefs().unqualified())):
return CistaTuplePrinter(val)

gdb.pretty_printers.append(my_pp_func)
Expand Down
2 changes: 1 addition & 1 deletion tools/pretty-printers/gdb/cista_variant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def to_string(self):

def my_pp_func(val):
regex = re.compile("cista::variant")
if regex.match(str(val.type.strip_typedefs())):
if regex.match(str(val.type.strip_typedefs().unqualified())):
return CistaVariantPrinter(val)

gdb.pretty_printers.append(my_pp_func)
Expand Down
2 changes: 1 addition & 1 deletion tools/pretty-printers/gdb/cista_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import gdb.xmethod

def is_cista_vector(gdb_type):
return str(gdb_type.strip_typedefs()).startswith("cista::basic_vector")
return str(gdb_type.strip_typedefs().unqualified()).startswith("cista::basic_vector")

def is_raw_vector(gdb_type):
return not str(gdb_type.strip_typedefs().template_argument(1)).startswith("cista::offset_ptr")
Expand Down
2 changes: 1 addition & 1 deletion tools/pretty-printers/gdb/offset_pointer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ def dereference(self):
return self.as_raw_ptr().dereference()

def is_offset_ptr(type):
return str(type.strip_typedefs()).startswith("cista::offset_ptr")
return str(type.strip_typedefs().unqualified()).startswith("cista::offset_ptr")