Merge GDB 7.5.1

gdb/python/py-block.c

 /* Python interface to blocks.
 
    Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 23 matching lines @@
      store a pointer to the object file for later use.  */
   struct objfile *objfile;
   /* Keep track of all blocks with a doubly-linked list.  Needed for
      block invalidation if the source object file has been freed.  */
   struct blpy_block_object *prev;
   struct blpy_block_object *next;
 } block_object;
 
 typedef struct {
   PyObject_HEAD
-  /* The block dictionary of symbols.  */
-  struct dictionary *dict;
-  /* The iterator for that dictionary.  */
-  struct dict_iterator iter;
+  /* The block.  */
+  const struct block *block;
+  /* The iterator for that block.  */
+  struct block_iterator iter;
   /* Has the iterator been initialized flag.  */
   int initialized_p;
   /* Pointer back to the original source block object.  Needed to
      check if the block is still valid, and has not been invalidated
      when an object file has been freed.  */
   struct blpy_block_object *source;
 } block_syms_iterator_object;
 
 /* Require a valid block.  All access to block_object->block should be
    gated by this call.  */
@@ skipping 29 matching lines @@
   block_syms_iterator_object *block_iter_obj;
   const struct block *block = NULL;
 
   BLPY_REQUIRE_VALID (self, block);
 
   block_iter_obj = PyObject_New (block_syms_iterator_object,
                                  &block_syms_iterator_object_type);
   if (block_iter_obj == NULL)
       return NULL;
 
-  block_iter_obj->dict = BLOCK_DICT (block);
+  block_iter_obj->block = block;
   block_iter_obj->initialized_p = 0;
   Py_INCREF (self);
   block_iter_obj->source = (block_object *) self;
 
   return (PyObject *) block_iter_obj;
 }
 
 static PyObject *
 blpy_get_start (PyObject *self, void *closure)
 {
@@ skipping 196 matching lines @@
 static PyObject *
 blpy_block_syms_iternext (PyObject *self)
 {
   block_syms_iterator_object *iter_obj = (block_syms_iterator_object *) self;
   struct symbol *sym;
 
   BLPY_ITER_REQUIRE_VALID (iter_obj->source);
 
   if (!iter_obj->initialized_p)
     {
-      sym = dict_iterator_first (iter_obj->dict,  &(iter_obj->iter));
+      sym = block_iterator_first (iter_obj->block,  &(iter_obj->iter));
       iter_obj->initialized_p = 1;
     }
   else
-    sym = dict_iterator_next (&(iter_obj->iter));
+    sym = block_iterator_next (&(iter_obj->iter));
 
   if (sym == NULL)
     {
       PyErr_SetString (PyExc_StopIteration, _("Symbol is null."));
       return NULL;
     }
 
   return symbol_to_symbol_object (sym);
 }
 
@@ skipping 211 matching lines @@
   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_ITER,  /*tp_flags*/
   "GDB block syms iterator object",           /*tp_doc */
   0,                              /*tp_traverse */
   0,                              /*tp_clear */
   0,                              /*tp_richcompare */
   0,                              /*tp_weaklistoffset */
   blpy_block_syms_iter,           /*tp_iter */
   blpy_block_syms_iternext,       /*tp_iternext */
   block_iterator_object_methods   /*tp_methods */
 };