diff mbox

libstdc++/64695 fix Pythin printer for std::tuple

Message ID 20150220144023.GS3360@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely Feb. 20, 2015, 2:40 p.m. UTC 
This updates the Python printers to work with the new std::tuple
layout as well as the old one (I changed std::tuple for GCC 5 to
remove the empty base class that every tuple derived from).

Tested x86_64-linux, committed to trunk.
diff mbox

Patch

commit 5b522ed478febde4220e0e75bb84a0189bea5941
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Feb 20 14:14:42 2015 +0000

    	PR libstdc++/64695
    	* python/libstdcxx/v6/printers.py (StdTuplePrinter): Handle new
    	tuple layout.

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 1263183..5a414c5 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -327,22 +327,35 @@  class StdTuplePrinter:
             return self
 
         def __next__ (self):
-            nodes = self.head.type.fields ()
             # Check for further recursions in the inheritance tree.
+            # For a GCC 5+ tuple self.head is None after visiting all nodes:
+            if not self.head:
+                raise StopIteration
+            nodes = self.head.type.fields ()
+            # For a GCC 4.x tuple there is a final node with no fields:
             if len (nodes) == 0:
                 raise StopIteration
             # Check that this iteration has an expected structure.
-            if len (nodes) != 2:
+            if len (nodes) > 2:
                 raise ValueError("Cannot parse more than 2 nodes in a tuple tree.")
 
-            # - Left node is the next recursion parent.
-            # - Right node is the actual class contained in the tuple.
+            if len (nodes) == 1:
+                # This is the last node of a GCC 5+ std::tuple.
+                impl = self.head.cast (nodes[0].type)
+                self.head = None
+            else:
+                # Either a node before the last node, or the last node of
+                # a GCC 4.x tuple (which has an empty parent).
+
+                # - Left node is the next recursion parent.
+                # - Right node is the actual class contained in the tuple.
 
-            # Process right node.
-            impl = self.head.cast (nodes[1].type)
+                # Process right node.
+                impl = self.head.cast (nodes[1].type)
+
+                # Process left node and set it as head.
+                self.head  = self.head.cast (nodes[0].type)
 
-            # Process left node and set it as head.
-            self.head  = self.head.cast (nodes[0].type)
             self.count = self.count + 1
 
             # Finally, check the implementation.  If it is