gcc.Location: add caret, start, finish attributes

Author: davidmalcolm

docs/locations.rst

@@ -60,6 +60,27 @@ Locations
          if decl.location.in_system_header:
              return
 
+   From GCC 6 onwards, these values can represent both a caret and a range,
+   e.g.::
+
+      a = (foo && bar)
+          ~~~~~^~~~~~~
+
+   .. py:attribute:: caret
+
+      (:py:class:`gcc.Location`) The caret location within this location.
+      In the above example, the caret is on the first '&' character.
+
+   .. py:attribute:: start
+
+      (:py:class:`gcc.Location`) The start location of this range.
+      In the above example, the start is on the opening parenthesis.
+
+   .. py:attribute:: start
+
+      (:py:class:`gcc.Location`) The finish location of this range.
+      In the above example, the finish is on the closing parenthesis.
+
 .. py:class:: gcc.RichLocation
 
    Wrapper around GCC's `rich_location`, representing one or more locations

gcc-c-api/gcc-location.c

@@ -1,6 +1,6 @@
 /*
-   Copyright 2012 David Malcolm <dmalcolm@redhat.com>
-   Copyright 2012 Red Hat, Inc.
+   Copyright 2012, 2017 David Malcolm <dmalcolm@redhat.com>
+   Copyright 2012, 2017 Red Hat, Inc.
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -62,6 +62,24 @@ GCC_IMPLEMENT_PUBLIC_API (bool) gcc_location_get_in_system_header (gcc_location
   return in_system_header_at (loc.inner);
 }
 
+GCC_IMPLEMENT_PUBLIC_API (gcc_location)
+gcc_location_get_caret (gcc_location loc)
+{
+  return gcc_private_make_location (get_pure_location (loc.inner));
+}
+
+GCC_IMPLEMENT_PUBLIC_API (gcc_location)
+gcc_location_get_start (gcc_location loc)
+{
+  return gcc_private_make_location (get_start (loc.inner));
+}
+
+GCC_IMPLEMENT_PUBLIC_API (gcc_location)
+gcc_location_get_finish (gcc_location loc)
+{
+  return gcc_private_make_location (get_finish (loc.inner));
+}
+
 GCC_IMPLEMENT_PUBLIC_API (void) gcc_set_input_location (gcc_location loc)
 {
   input_location = loc.inner;

gcc-c-api/location.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright 2012 David Malcolm <dmalcolm@redhat.com>
-   Copyright 2012 Red Hat, Inc.
+   Copyright 2012, 2017 David Malcolm <dmalcolm@redhat.com>
+   Copyright 2012, 2017 Red Hat, Inc.
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -36,6 +36,13 @@
 
     <attribute name="in_system_header" kind="bool">
     </attribute>
+
+    <attribute name="caret" kind="location">
+    </attribute>
+    <attribute name="start" kind="location">
+    </attribute>
+    <attribute name="finish" kind="location">
+    </attribute>
   </type>
 
   <attribute name="input_location" kind="location" access="rw">

generate-location-c.py

@@ -60,12 +60,39 @@ def generate_location():
 {
     return PyGccInt_FromLong(gcc_location_get_column(self->loc));
 }
+""")
+
+    cu.add_defn("""
+static PyObject *
+PyGccLocation_get_caret(struct PyGccLocation *self, void *closure)
+{
+    return PyGccLocation_New(gcc_location_get_caret(self->loc));
+}
+""")
+
+    cu.add_defn("""
+static PyObject *
+PyGccLocation_get_start(struct PyGccLocation *self, void *closure)
+{
+    return PyGccLocation_New(gcc_location_get_start(self->loc));
+}
+""")
+
+    cu.add_defn("""
+static PyObject *
+PyGccLocation_get_finish(struct PyGccLocation *self, void *closure)
+{
+    return PyGccLocation_New(gcc_location_get_finish(self->loc));
+}
 """)
 
     getsettable = PyGetSetDefTable('PyGccLocation_getset_table',
                                    [PyGetSetDef('file', 'PyGccLocation_get_file', None, 'Name of the source file'),
                                     PyGetSetDef('line', 'PyGccLocation_get_line', None, 'Line number within source file'),
                                     PyGetSetDef('column', 'PyGccLocation_get_column', None, 'Column number within source file'),
+                                    PyGetSetDef('caret', 'PyGccLocation_get_caret', None, 'Location of caret'),
+                                    PyGetSetDef('start', 'PyGccLocation_get_start', None, 'Starting location of range'),
+                                    PyGetSetDef('finish', 'PyGccLocation_get_finish', None, 'End location of range'),
                                     ],
                                    identifier_prefix='PyGccLocation',
                                    typename='PyGccLocation')