Support null source references in more places

Fixes bug 617713.

diff --git a/vala/valablock.vala b/vala/valablock.vala
index 85a74cdb7232d13d66444f73e322ea43bbaaa6dd..5b570a75444a589d2d63b8e92539c8954bfa1b67 100644 (file)
--- a/vala/valablock.vala
+++ b/vala/valablock.vala
@@ -42,7 +42,7 @@ public class Vala.Block : Symbol, Statement {
         *
         * @param source reference to source code
         */
-       public Block (SourceReference source_reference) {
+       public Block (SourceReference? source_reference) {
                base (null, source_reference);
        }
        

diff --git a/vala/valabreakstatement.vala b/vala/valabreakstatement.vala
index 9ac82a71774f298488960492b4944dca1fdd7a32..97e93df09dba0e78981891c203ec5b382c7831eb 100644 (file)
--- a/vala/valabreakstatement.vala
+++ b/vala/valabreakstatement.vala
@@ -32,7 +32,7 @@ public class Vala.BreakStatement : CodeNode, Statement {
         * @param source reference to source code
         * @return       newly created break statement
         */
-       public BreakStatement (SourceReference source) {
+       public BreakStatement (SourceReference? source) {
                source_reference = source;
        }
        

diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index 99ef1c1db1220bb234b0708e817cec7e9e90acdb..6adb5bc2180f04203247f96df5e79bfb43617406 100644 (file)
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -104,13 +104,15 @@ public class Vala.CodeWriter : CodeVisitor {
                write_indent ();
                write_string ("[CCode (cprefix = \"%s\", lower_case_cprefix = \"%s\"".printf (ns.get_cprefix (), ns.get_lower_case_cprefix ()));
 
-               if (ns.source_reference.file.gir_namespace != null) {
-                       write_string (", ");
-                       write_string ("gir_namespace = \"%s\"".printf (ns.source_reference.file.gir_namespace));
-               }
-               if (ns.source_reference.file.gir_version != null) {
-                       write_string(", ");
-                       write_string ("gir_version = \"%s\"".printf (ns.source_reference.file.gir_version));
+               if (ns.source_reference != null) {
+                       if (ns.source_reference.file.gir_namespace != null) {
+                               write_string (", ");
+                               write_string ("gir_namespace = \"%s\"".printf (ns.source_reference.file.gir_namespace));
+                       }
+                       if (ns.source_reference.file.gir_version != null) {
+                               write_string(", ");
+                               write_string ("gir_version = \"%s\"".printf (ns.source_reference.file.gir_version));
+                       }
                }
 
                write_string (")]");

diff --git a/vala/valaconstructor.vala b/vala/valaconstructor.vala
index 7f89a8f05eb9b36640350b3f3bc1841b80c04335..02bc199bc8033d8e094e54bac8f578270d1171f0 100644 (file)
--- a/vala/valaconstructor.vala
+++ b/vala/valaconstructor.vala
@@ -47,7 +47,7 @@ public class Vala.Constructor : Symbol {
         * @param source reference to source code
         * @return       newly created constructor
         */
-       public Constructor (SourceReference source) {
+       public Constructor (SourceReference? source) {
                base (null, source);
        }
 

diff --git a/vala/valaswitchsection.vala b/vala/valaswitchsection.vala
index 5247f37295e5ec70a500752edffdbf2f95e73092..944035c24080dfb8f575b54847222e0a987345de 100644 (file)
--- a/vala/valaswitchsection.vala
+++ b/vala/valaswitchsection.vala
@@ -34,7 +34,7 @@ public class Vala.SwitchSection : Block {
         * @param source_reference reference to source code
         * @return                 newly created switch section
         */
-       public SwitchSection (SourceReference source_reference) {
+       public SwitchSection (SourceReference? source_reference) {
                base (source_reference);
        }
        

diff --git a/vala/valaswitchstatement.vala b/vala/valaswitchstatement.vala
index 976e7d46c17d8fa4e9f92cd9a506aeb842d3bd1b..be38a296406c66833740fc413ed10faa3841b8a6 100644 (file)
--- a/vala/valaswitchstatement.vala
+++ b/vala/valaswitchstatement.vala
@@ -49,7 +49,7 @@ public class Vala.SwitchStatement : CodeNode, Statement {
         * @param source_reference reference to source code
         * @return                 newly created switch statement
         */
-       public SwitchStatement (Expression expression, SourceReference source_reference) {
+       public SwitchStatement (Expression expression, SourceReference? source_reference) {
                this.source_reference = source_reference;
                this.expression = expression;
        }