Merge pull request #36 from tromey/add-values-to-EnumeralType

document EnumeralType; add 'values' attribute

Author: davidmalcolm

docs/tree.rst

@@ -542,6 +542,17 @@ Additional attributes for various :py:class:`gcc.Type` subclasses:
       The :py:class:`gcc.Type` that this type points to.  In the above
       example (`int *`), this would be the `int` type.
 
+.. py:class:: gcc.EnumeralType
+
+   Subclass of :py:class:`gcc.Type` representing an enumeral type.
+
+   .. py:attribute:: values
+
+      A list of tuple representing the constants defined in this
+      enumeration.  Each tuple consists of two elements; the first
+      being the name of the constant, a :py:class:`gcc.IdentifierNode`;
+      and the second being the value, a :py:class:`gcc.Constant`.
+
 .. py:class:: gcc.ArrayType
 
    Subclass of :py:class:`gcc.Type` representing an array type.  For example,

gcc-python-tree.c

@@ -1152,7 +1152,7 @@ PyGcc_TreeMakeListFromTreeList(tree t)
   Extract a list of objects for the values
  */
 PyObject *
-gcc_tree_list_of_pairs_from_tree_list_chain(tree t)
+PyGcc_TreeMakeListOfPairsFromTreeListChain(tree t)
 {
     PyObject *result = NULL;
 

generate-tree-c.py

@@ -485,6 +485,11 @@ def add_complex_getter(name, doc):
                               'PyGcc_TreeListFromChain(TYPE_METHODS(self->t.inner))',
                               "The methods of this type")
 
+        if tree_type.SYM == 'ENUMERAL_TYPE':
+            add_simple_getter('values',
+                              'PyGcc_TreeMakeListOfPairsFromTreeListChain(TYPE_VALUES(self->t.inner))',
+                              "The values of this type")
+
         if tree_type.SYM == 'IDENTIFIER_NODE':
             add_simple_getter('name',
                               'PyGccStringOrNone(IDENTIFIER_POINTER(self->t.inner))',

tests/plugin/enum-type/input.c

@@ -0,0 +1,28 @@
+/*
+   Copyright 2015 Tom Tromey <tom@tromey.com>
+
+   This 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.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+enum the_enum
+{
+  ONE = 1,
+  TWO = 2,
+  MINUS_ONE = -1
+};
+
+/* We need a variable because some versions of gcc don't call
+   PLUGIN_FINISH_TYPE for an enum.  */
+enum the_enum variable;

tests/plugin/enum-type/script.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+#   Copyright 2015 Tom Tromey <tom@tromey.com>
+#
+#   This 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.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see
+#   <http://www.gnu.org/licenses/>.
+
+import gcc
+
+def on_decl(v, *args, **kwargs):
+    if v.name != 'variable':
+        return
+
+    t = v.type
+    print(t.name)
+    print('length = %d' % len(t.values))
+    for (name, value) in t.values:
+        print('%s = %s' % (name, value))
+
+gcc.register_callback(gcc.PLUGIN_FINISH_DECL, on_decl)

tests/plugin/enum-type/stdout.txt

@@ -0,0 +1,5 @@
+the_enum
+length = 3
+ONE = 1
+TWO = 2
+MINUS_ONE = -1