Adjust cparser to extended debug information retrieval of libFirm, which includes...

diff --git a/ast2firm.c b/ast2firm.c
index 300c90a..a9edec0 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -128,14 +128,14 @@ static ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
        return new_r_Unknown(irg, mode);
 }
 
-static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
+static src_loc_t dbg_retrieve(const dbg_info *dbg)
 {
-       const source_position_t *pos = (const source_position_t*) dbg;
-       if (pos == NULL)
-               return NULL;
-       if (line != NULL)
-               *line = pos->lineno;
-       return pos->input_name;
+       source_position_t const *const pos = (source_position_t const*)dbg;
+       if (pos) {
+               return (src_loc_t){ pos->input_name, pos->lineno, pos->colno };
+       } else {
+               return (src_loc_t){ NULL, 0, 0 };
+       }
 }
 
 static dbg_info *get_dbg_info(const source_position_t *pos)

diff --git a/libfirm b/libfirm
index b255081..c7311e9 160000 (submodule)
--- a/libfirm
+++ b/libfirm
@@ -1 +1 @@
-Subproject commit b25508140d6b04b693038502fb5a51056d348c31
+Subproject commit c7311e9112a4b5addacdc3de37be4b43b17908df