don't output full source file path in generated C code

2008-01-18  Juerg Billeter  <j@bitron.ch>

	* vala/valacodenode.vala, vala/valasemanticanalyzer.vala: don't output
	  full source file path in generated C code

svn path=/trunk/; revision=855

diff --git a/ChangeLog b/ChangeLog
index c2abda200ea8143d0489d80f5d051a1892db8237..66ba9df33c4e8fb7f43502a5e4c82b0eb0ac5b5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-18  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valacodenode.vala, vala/valasemanticanalyzer.vala: don't output
+         full source file path in generated C code
+
 2008-01-18  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodegenerator.vala: don't generate public setter for

diff --git a/vala/valacodenode.vala b/vala/valacodenode.vala
index d47aefd365fd1e8ad6b01ac00d6176b8e1d11f34..d4d81b0335e5533adef67a9aa333e9bbc7656ec9 100644 (file)
--- a/vala/valacodenode.vala
+++ b/vala/valacodenode.vala
@@ -1,6 +1,6 @@
 /* valacodenode.vala
  *
- * Copyright (C) 2006-2007  Jürg Billeter
+ * Copyright (C) 2006-2008  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -55,7 +55,7 @@ public abstract class Vala.CodeNode : Object {
                set {
                        if (source_reference != null) {
                                value.line = new CCodeLineDirective (
-                                       Path.build_filename (Environment.get_current_dir (), source_reference.file.filename),
+                                       Path.get_basename (source_reference.file.filename),
                                        source_reference.first_line);
                        }
 

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 988dd86526bebd89fee63f6fc6afe1bf7afe6fc9..45ae599621c66aa98d75c00d698acd15545e7d20 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1652,7 +1652,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                        var format_arg = prev_arg;
                        if (format_arg is LiteralExpression) {
                                var format_lit = (StringLiteral) ((LiteralExpression) format_arg).literal;
-                               format_lit.value = "\"%s:%d: %s".printf (expr.source_reference.file.filename, expr.source_reference.first_line, format_lit.value.offset (1));
+                               format_lit.value = "\"%s:%d: %s".printf (Path.get_basename (expr.source_reference.file.filename), expr.source_reference.first_line, format_lit.value.offset (1));
                        }
                }