]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Fix some missing source references for generated nodes
authorJürg Billeter <j@bitron.ch>
Tue, 22 Jun 2010 05:13:24 +0000 (07:13 +0200)
committerJürg Billeter <j@bitron.ch>
Tue, 22 Jun 2010 05:19:23 +0000 (07:19 +0200)
vala/valabinaryexpression.vala
vala/valaforeachstatement.vala
vala/valaparser.vala

index 52cd4d9d01de5a66aca86e1ff4133cd27aad05d2..6e4bbaca936fa4ef5f922c4f52107412bb8d4220 100644 (file)
@@ -263,7 +263,7 @@ public class Vala.BinaryExpression : Expression {
                        // string concatenation
 
                        if (analyzer.context.profile == Profile.DOVA) {
-                               var concat_call = new MethodCall (new MemberAccess (left, "concat"));
+                               var concat_call = new MethodCall (new MemberAccess (left, "concat", source_reference), source_reference);
                                concat_call.add_argument (right);
                                concat_call.target_type = target_type;
                                parent_node.replace_expression (this, concat_call);
@@ -286,7 +286,7 @@ public class Vala.BinaryExpression : Expression {
                    && operator == BinaryOperator.PLUS) {
                        // list concatenation
 
-                       var concat_call = new MethodCall (new MemberAccess (left, "concat"));
+                       var concat_call = new MethodCall (new MemberAccess (left, "concat", source_reference), source_reference);
                        concat_call.add_argument (right);
                        concat_call.target_type = target_type;
                        parent_node.replace_expression (this, concat_call);
index 0de1cb8f72ddf0e8b342a9fd246cf8f9006e57e6..07a38dbec1551d34ca4772ff05dc5e7cc77b93d1 100644 (file)
@@ -210,7 +210,7 @@ public class Vala.ForeachStatement : Block {
                        return false;
                }
 
-               var iterator_call = new MethodCall (new MemberAccess (collection, "iterator"));
+               var iterator_call = new MethodCall (new MemberAccess (collection, "iterator", source_reference), source_reference);
                add_statement (new DeclarationStatement (new LocalVariable (iterator_type, "_%s_it".printf (variable_name), iterator_call, source_reference), source_reference));
 
                var next_value_method = iterator_type.get_member ("next_value") as Method;
index c80b4e093ce968398865bb2d575d381d149b2523..11831424fa73c8f5a56e47dc14dacf2828fce8d0 100644 (file)
@@ -1486,9 +1486,9 @@ public class Vala.Parser : CodeVisitor {
                                                //     return;
                                                var ret_stmt = (ReturnStatement) stmt;
                                                if (ret_stmt.return_expression != null) {
-                                                       var assignment = new Assignment (new MemberAccess.simple ("result"), ret_stmt.return_expression);
+                                                       var assignment = new Assignment (new MemberAccess.simple ("result", stmt.source_reference), ret_stmt.return_expression, AssignmentOperator.SIMPLE, stmt.source_reference);
                                                        ret_stmt.return_expression = null;
-                                                       block.add_statement (new ExpressionStatement (assignment));
+                                                       block.add_statement (new ExpressionStatement (assignment, stmt.source_reference));
                                                }
                                        }
                                        block.add_statement (stmt);