Add gcc.Location.offset_column

Author: davidmalcolm

docs/locations.rst

@@ -60,6 +60,11 @@ Locations
          if decl.location.in_system_header:
              return
 
+   .. py:method:: offset_column(self, offset)
+
+      Generate a new :py:class:`gcc.Location` based on the caret location
+      of this location, offsetting the column by the given amount.
+
    From GCC 6 onwards, these values can represent both a caret and a range,
    e.g.::
 

gcc-c-api/gcc-location.c

@@ -80,6 +80,14 @@ gcc_location_get_finish (gcc_location loc)
   return gcc_private_make_location (get_finish (loc.inner));
 }
 
+GCC_IMPLEMENT_PUBLIC_API(gcc_location)
+gcc_location_offset_column (gcc_location loc, int offset)
+{
+  return gcc_private_make_location
+    (linemap_position_for_loc_and_offset (line_table, loc.inner,
+                                          offset));
+}
+
 GCC_IMPLEMENT_PUBLIC_API (void) gcc_set_input_location (gcc_location loc)
 {
   input_location = loc.inner;

gcc-c-api/location.xml

@@ -43,6 +43,11 @@
     </attribute>
     <attribute name="finish" kind="location">
     </attribute>
+
+    <function name="offset_column" returntype="location">
+      <parameter name="offset" type="int"/>
+    </function>
+
   </type>
 
   <attribute name="input_location" kind="location" access="rw">

gcc-python-location.c

@@ -164,6 +164,18 @@ PyGccLocation_hash(struct PyGccLocation * self)
     return self->loc.inner;
 }
 
+PyObject *
+PyGccLocation_offset_column(PyGccLocation *self, PyObject *args)
+{
+    int offset;
+
+    if (!PyArg_ParseTuple(args, "i", &offset)) {
+        return NULL;
+    }
+
+    return PyGccLocation_New(gcc_location_offset_column(self->loc, offset));
+}
+
 PyObject *
 PyGccLocation_New(gcc_location loc)
 {

gcc-python-wrappers.h

@@ -144,6 +144,9 @@ PyGccLocation_richcompare(PyObject *o1, PyObject *o2, int op);
 long
 PyGccLocation_hash(struct PyGccLocation * self);
 
+PyObject *
+PyGccLocation_offset_column(PyGccLocation *self, PyObject *args);
+
 PyObject *
 PyGccRichLocation_add_fixit_replace(PyGccRichLocation *self, PyObject *args,
                                     PyObject *kwargs);

generate-location-c.py

@@ -102,6 +102,13 @@ def generate_location():
                                   'Boolean: is this location within a system header?')
     cu.add_defn(getsettable.c_defn())
 
+    methods = PyMethodTable('PyGccLocation_methods', [])
+    methods.add_method('offset_column',
+                       '(PyCFunction)PyGccLocation_offset_column',
+                       'METH_VARARGS',
+                       "")
+    cu.add_defn(methods.c_defn())
+
     pytype = PyGccWrapperTypeObject(identifier = 'PyGccLocation_TypeObj',
                           localname = 'Location',
                           tp_name = 'gcc.Location',
@@ -111,6 +118,7 @@ def generate_location():
                           tp_hash = '(hashfunc)PyGccLocation_hash',
                           tp_repr = '(reprfunc)PyGccLocation_repr',
                           tp_str = '(reprfunc)PyGccLocation_str',
+                          tp_methods = methods.identifier,
                           tp_richcompare = 'PyGccLocation_richcompare',
                           tp_dealloc = 'PyGccWrapper_Dealloc')
     cu.add_defn(pytype.c_defn())