fix internal warnings on syntax errors

2007-09-01  Juerg Billeter  <j@bitron.ch>

	* vala/parser.y: fix internal warnings on syntax errors

svn path=/trunk/; revision=569

diff --git a/ChangeLog b/ChangeLog
index bf47a0e0b4a3e5fbfdb680b6f9e688462e30b6f1..fdf0d73cea1316a0c42fa03f1c3f5d22bdb7fcce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-01  Jürg Billeter  <j@bitron.ch>
+
+       * vala/parser.y: fix internal warnings on syntax errors
+
 2007-09-01  Jürg Billeter  <j@bitron.ch>
 
        * vapi/curses.vala: use subtyping, patch by Ed Schouten

diff --git a/vala/parser.y b/vala/parser.y
index a7a39904e320f1d1a8a3b6be9819a310f310e166..c2653e5f2c5b90d5d5660b139f203874bdf1ba4d 100644 (file)
--- a/vala/parser.y
+++ b/vala/parser.y
@@ -763,8 +763,12 @@ invocation_expression
                if ($3 != NULL) {
                        GList *l;
                        for (l = $3; l != NULL; l = l->next) {
-                               vala_invocation_expression_add_argument (VALA_INVOCATION_EXPRESSION ($$), l->data);
-                               g_object_unref (l->data);
+                               if (l->data == NULL) {
+                                       // error in subexpression
+                               } else {
+                                       vala_invocation_expression_add_argument (VALA_INVOCATION_EXPRESSION ($$), l->data);
+                                       g_object_unref (l->data);
+                               }
                        }
                        g_list_free ($3);
                }
@@ -778,8 +782,12 @@ element_access
                ValaSourceReference *src = src(@1);
                $$ = VALA_EXPRESSION (vala_element_access_new ($1, src));
                for (l = $3; l != NULL; l = l->next) {
-                       vala_element_access_append_index (VALA_ELEMENT_ACCESS ($$), VALA_EXPRESSION (l->data));
-                       g_object_unref (l->data);
+                       if (l->data == NULL) {
+                               // error in subexpression
+                       } else {
+                               vala_element_access_append_index (VALA_ELEMENT_ACCESS ($$), VALA_EXPRESSION (l->data));
+                               g_object_unref (l->data);
+                       }
                }
                g_list_free ($3);
                g_object_unref ($1);