Revert "semanticanalyzer: Transform replaced_nodes field into method"

This reverts commit c81d1f941e06a656deef48d11e795739c94dc8c4.

diff --git a/vala/valaassignment.vala b/vala/valaassignment.vala
index ffeffe7d6a40a4cb2e6a3e0039ff31d903664f8e..1c62fcdc903e9a12817f21a7581ebf894cf6f6b7 100644 (file)
--- a/vala/valaassignment.vala
+++ b/vala/valaassignment.vala
@@ -133,7 +133,7 @@ public class Vala.Assignment : Expression {
                                i++;
                        }
 
-                       context.analyzer.add_replaced_node (this);
+                       context.analyzer.replaced_nodes.add (this);
                        parent_node.replace_expression (this, stmt.expression);
                        return stmt.expression.check (context);
                }

diff --git a/vala/valamethodcall.vala b/vala/valamethodcall.vala
index 3080ae546e15f45a290a912199f55de54a48b8ce..76f2403820645612aa05a0fdb72832af6e9d8041 100644 (file)
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -295,7 +295,7 @@ public class Vala.MethodCall : Expression {
                                struct_creation_expression.add_argument (arg);
                        }
                        struct_creation_expression.target_type = target_type;
-                       context.analyzer.add_replaced_node (this);
+                       context.analyzer.replaced_nodes.add (this);
                        parent_node.replace_expression (this, struct_creation_expression);
                        struct_creation_expression.check (context);
                        return true;

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 20e68ebf9062a24eb0fa2538548f06c2505f3c75..5424d7fd0b718fdb7cd99fcbc3c98dca020d397b 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -165,7 +165,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 
        // keep replaced alive to make sure they remain valid
        // for the whole execution of CodeNode.accept
-       List<CodeNode> replaced_nodes;
+       public List<CodeNode> replaced_nodes = new ArrayList<CodeNode> ();
 
        public SemanticAnalyzer () {
        }
@@ -177,7 +177,6 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
         */
        public void analyze (CodeContext context) {
                this.context = context;
-               replaced_nodes = new ArrayList<CodeNode> ();
 
                var root_symbol = context.root;
 
@@ -223,14 +222,9 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                context.root.check (context);
                context.accept (this);
 
-               replaced_nodes = null;
                this.context = null;
        }
 
-       public void add_replaced_node (CodeNode node) {
-               replaced_nodes.add (node);
-       }
-
        public override void visit_source_file (SourceFile file) {
                current_source_file = file;
 

diff --git a/vala/valatemplate.vala b/vala/valatemplate.vala
index 514e716dd1487fa3fbe62e6d627f4e0a5292226f..5e27a7b8e7ca7d625cfe56e444241428787985db 100644 (file)
--- a/vala/valatemplate.vala
+++ b/vala/valatemplate.vala
@@ -81,7 +81,7 @@ public class Vala.Template : Expression {
                }
                expr.target_type = target_type;
 
-               context.analyzer.add_replaced_node (this);
+               context.analyzer.replaced_nodes.add (this);
                parent_node.replace_expression (this, expr);
                return expr.check (context);
        }

diff --git a/vala/valaunaryexpression.vala b/vala/valaunaryexpression.vala
index 650e41cd6f3229fe671d988172e88344494199c6..95b0d4fc48c27f689ba142aaf165dbdf85842dda 100644 (file)
--- a/vala/valaunaryexpression.vala
+++ b/vala/valaunaryexpression.vala
@@ -224,7 +224,7 @@ public class Vala.UnaryExpression : Expression {
 
                        var assignment = new Assignment (ma, bin, AssignmentOperator.SIMPLE, source_reference);
                        assignment.target_type = target_type;
-                       context.analyzer.add_replaced_node (this);
+                       context.analyzer.replaced_nodes.add (this);
                        parent_node.replace_expression (this, assignment);
                        assignment.check (context);
                        return true;