Add gcc.Location.__init__

Author: davidmalcolm

docs/locations.rst

@@ -71,6 +71,13 @@ Locations
       a = (foo && bar)
           ~~~~~^~~~~~~
 
+   .. py:method:: __init__(self, caret, start, finish)
+
+      Construct a location, using the caret location of caret as the
+      caret, and the start/finish of start and finish respectively::
+
+        compound_loc = gcc.Location(caret, start, finish)
+
    .. py:attribute:: caret
 
       (:py:class:`gcc.Location`) The caret location within this location.

gcc-python-location.c

@@ -33,6 +33,31 @@
           typedef unsigned int source_location;
 */
 
+int
+PyGccLocation_init(PyGccLocation *self, PyObject *args, PyObject *kwargs)
+{
+    const char *keywords[] = {"caret", "start", "finish",
+                              NULL};
+    PyGccLocation *caret_obj;
+    PyGccLocation *start_obj;
+    PyGccLocation *finish_obj;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+                                     "O!O!O!", (char**)keywords,
+                                     &PyGccLocation_TypeObj, &caret_obj,
+                                     &PyGccLocation_TypeObj, &start_obj,
+                                     &PyGccLocation_TypeObj, &finish_obj)) {
+        return -1;
+    }
+
+    self->loc
+        = gcc_private_make_location (make_location (caret_obj->loc.inner,
+                                                    start_obj->loc.inner,
+                                                    finish_obj->loc.inner));
+
+    return 0;
+}
+
 PyObject *
 PyGccLocation_repr(struct PyGccLocation * self)
 {

gcc-python-wrappers.h

@@ -132,6 +132,9 @@ extern PyObject *
 PyGccPass_New(struct opt_pass *pass);
 
 /* gcc-python-location.c: */
+int
+PyGccLocation_init(PyGccLocation *self, PyObject *args, PyObject *kwargs);
+
 PyObject *
 PyGccLocation_repr(struct PyGccLocation * self);
 

generate-location-c.py

@@ -114,6 +114,7 @@ def generate_location():
                           tp_name = 'gcc.Location',
                           struct_name = 'PyGccLocation',
                           tp_new = 'PyType_GenericNew',
+                          tp_init = '(initproc)PyGccLocation_init',
                           tp_getset = getsettable.identifier,
                           tp_hash = '(hashfunc)PyGccLocation_hash',
                           tp_repr = '(reprfunc)PyGccLocation_repr',