vala: Fix and add more to_string() methods to expressions

diff --git a/vala/valaaddressofexpression.vala b/vala/valaaddressofexpression.vala
index 029325264b3d98d83b970484d53f8e8cf350126b..4948a46c2a4ea6f03ab804a540ffb8b9ad4db3aa 100644 (file)
--- a/vala/valaaddressofexpression.vala
+++ b/vala/valaaddressofexpression.vala
@@ -62,6 +62,10 @@ public class Vala.AddressofExpression : Expression {
                inner.accept (visitor);
        }
 
+       public override string to_string () {
+               return "&" + inner.to_string ();
+       }
+
        public override void replace_expression (Expression old_node, Expression new_node) {
                if (inner == old_node) {
                        inner = new_node;

diff --git a/vala/valaarraycreationexpression.vala b/vala/valaarraycreationexpression.vala
index 41b0f351b2ca113c8d0a278273a48c0ab0f1cddb..43cb1e6af92b04a02888684168ce39dd8180133d 100644 (file)
--- a/vala/valaarraycreationexpression.vala
+++ b/vala/valaarraycreationexpression.vala
@@ -127,6 +127,24 @@ public class Vala.ArrayCreationExpression : Expression {
                return true;
        }
 
+       public override string to_string () {
+               var builder = new StringBuilder ("new ");
+               builder.append_printf ("%s[", element_type.to_string ());
+               bool first = true;
+               foreach (var size in sizes) {
+                       if (first) {
+                               builder.append (size.to_string ());
+                               first = false;
+                       } else {
+                               builder.append_printf (", %s", size.to_string ());
+                       }
+               }
+               if (initializer_list != null) {
+                       builder.append (initializer_list.to_string ());
+               }
+               return builder.str;
+       }
+
        public override void replace_expression (Expression old_node, Expression new_node) {
                for (int i = 0; i < sizes.size; i++) {
                        if (sizes[i] == old_node) {

diff --git a/vala/valaassignment.vala b/vala/valaassignment.vala
index a3038c309c294bbc79250a3980e062b0fbb89e4a..af12f1754da272259abb3fabbeba967333950bda 100644 (file)
--- a/vala/valaassignment.vala
+++ b/vala/valaassignment.vala
@@ -84,6 +84,27 @@ public class Vala.Assignment : Expression {
                right.accept (visitor);
        }
 
+       private unowned string get_operator_string () {
+               switch (_operator) {
+               case AssignmentOperator.SIMPLE: return "=";
+               case AssignmentOperator.BITWISE_OR: return "|=";
+               case AssignmentOperator.BITWISE_AND: return "&=";
+               case AssignmentOperator.BITWISE_XOR: return "^=";
+               case AssignmentOperator.ADD: return "+=";
+               case AssignmentOperator.SUB: return "-=";
+               case AssignmentOperator.MUL: return "*=";
+               case AssignmentOperator.DIV: return "/=";
+               case AssignmentOperator.PERCENT: return "%=";
+               case AssignmentOperator.SHIFT_LEFT: return "<<=";
+               case AssignmentOperator.SHIFT_RIGHT: return ">>=";
+               default: assert_not_reached ();
+               }
+       }
+
+       public override string to_string () {
+               return "(%s %s %s)".printf (_left.to_string (), get_operator_string (), _right.to_string ());
+       }
+
        public override void replace_expression (Expression old_node, Expression new_node) {
                if (left == old_node) {
                        left = new_node;

diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index be62ed64da8bf308d69fcee38414406ae24db6b2..531d78a71e1c0fb6f4b408b9386b9776bf8b1040 100644 (file)
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -135,7 +135,7 @@ public class Vala.BinaryExpression : Expression {
        }
 
        public override string to_string () {
-               return _left.to_string () + get_operator_string () + _right.to_string ();
+               return "(%s %s %s)".printf (_left.to_string (), get_operator_string (), _right.to_string ());
        }
 
        public override bool is_constant () {

diff --git a/vala/valacastexpression.vala b/vala/valacastexpression.vala
index 5c050be2a2dc81161fff91259682cb7280675dbd..3d7114df04a964af899bf4747d18d9c4bb74962b 100644 (file)
--- a/vala/valacastexpression.vala
+++ b/vala/valacastexpression.vala
@@ -102,6 +102,16 @@ public class Vala.CastExpression : Expression {
                }
        }
 
+       public override string to_string () {
+               if (is_non_null_cast) {
+                       return "(!) %s".printf (inner.to_string ());
+               } else if (is_silent_cast) {
+                       return "%s as %s".printf (inner.to_string (), type_reference.to_string ());
+               } else {
+                       return "(%s) %s".printf (type_reference.to_string (), inner.to_string ());
+               }
+       }
+
        public override void replace_expression (Expression old_node, Expression new_node) {
                if (inner == old_node) {
                        inner = new_node;

diff --git a/vala/valaconditionalexpression.vala b/vala/valaconditionalexpression.vala
index ad4878b0bc3ff9da8a09c57fdb6ba52ecd4fedc9..e35662c510efe6e583f6c96a83112bf045ef1903 100644 (file)
--- a/vala/valaconditionalexpression.vala
+++ b/vala/valaconditionalexpression.vala
@@ -104,6 +104,10 @@ public class Vala.ConditionalExpression : Expression {
                return condition.is_accessible (sym) && true_expression.is_accessible (sym) && false_expression.is_accessible (sym);
        }
 
+       public override string to_string () {
+               return "(%s ? %s : %s)".printf (condition.to_string (), true_expression.to_string (), false_expression.to_string ());
+       }
+
        public override void replace_expression (Expression old_node, Expression new_node) {
                if (condition == old_node) {
                        condition = new_node;

diff --git a/vala/valaelementaccess.vala b/vala/valaelementaccess.vala
index 755eaf6ee78215843ab1be339462e3af6a9758a2..1725b1100e1b336dbc896028ee44408102d0cd3c 100644 (file)
--- a/vala/valaelementaccess.vala
+++ b/vala/valaelementaccess.vala
@@ -75,6 +75,20 @@ public class Vala.ElementAccess : Expression {
                }
        }
 
+       public override string to_string () {
+               var s = "%s[".printf (container.to_string ());
+               bool first = true;
+               foreach (var index in indices) {
+                       if (first) {
+                               s += index.to_string ();
+                               first = false;
+                       } else {
+                               s += ", %s".printf (index.to_string ());
+                       }
+               }
+               return s + "]";
+       }
+
        public override void replace_expression (Expression old_node, Expression new_node) {
                if (container == old_node) {
                        container = new_node;

diff --git a/vala/valainitializerlist.vala b/vala/valainitializerlist.vala
index 8a601874e2365c5ec633f9e060ba2288b5812d57..a4f0f248614e91489d1d91da9189884c20f04065 100644 (file)
--- a/vala/valainitializerlist.vala
+++ b/vala/valainitializerlist.vala
@@ -106,6 +106,20 @@ public class Vala.InitializerList : Expression {
                return true;
        }
 
+       public override string to_string () {
+               var builder = new StringBuilder ("{");
+               bool first = true;
+               foreach (var initializer in initializers) {
+                       if (first) {
+                               builder.append (initializer.to_string ());
+                               first = false;
+                       } else {
+                               builder.append_printf (", %s", initializer.to_string ());
+                       }
+               }
+               return builder.str;
+       }
+
        public override void replace_expression (Expression old_node, Expression new_node) {
                for (int i = 0; i < initializers.size; i++) {
                        if (initializers[i] == old_node) {

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index 64263ba3e3b7b5cfcf4475dc0bf181dfa16b6366..cef8d7d40012b87ea4564ac48219531c94bb85ae 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -136,7 +136,7 @@ public class Vala.MemberAccess : Expression {
                        if (inner == null) {
                                return member_name;
                        } else {
-                               return "%s.%s".printf (inner.to_string (), member_name);
+                               return "%s%s%s".printf (inner.to_string (), pointer_member_access ? "->" : ".", member_name);
                        }
                } else {
                        // ensure to always use fully-qualified name

diff --git a/vala/valamethodcall.vala b/vala/valamethodcall.vala
index 082e061f7d3b1bc128064eb9db441219cd14d1bd..ea854358832e04eabc159c8ec012710ae40ac6b2 100644 (file)
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -710,4 +710,26 @@ public class Vala.MethodCall : Expression {
 
                return null;
        }
+
+       public override string to_string () {
+               var b = new StringBuilder ();
+               b.append_c ('(');
+               if (is_yield_expression) {
+                       b.append ("yield ");
+               }
+               b.append (call.to_string ());
+               b.append_c ('(');
+
+               bool first = true;
+               foreach (var expr in argument_list) {
+                       if (!first) {
+                               b.append (", ");
+                       }
+                       b.append (expr.to_string ());
+                       first = false;
+               }
+               b.append ("))");
+
+               return b.str;
+       }
 }

diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala
index af062f85c0108c004a7062081c7e6b0728eae6cb..c53fda830c55c6b00cf0fa79e8166710a3d33ccc 100644 (file)
--- a/vala/valanamespace.vala
+++ b/vala/valanamespace.vala
@@ -523,4 +523,12 @@ public class Vala.Namespace : Symbol {
 
                return !error;
        }
+
+       public override string to_string () {
+               if (name == null) {
+                       return "(root namespace)";
+               } else {
+                       return "namespace %s".printf (name);
+               }
+       }
 }

diff --git a/vala/valapointerindirection.vala b/vala/valapointerindirection.vala
index 97f6473a80e42456c32c8e186000650742d9a613..1687efc6745f9aeb5f55d9aba61a6b31ec0af514 100644 (file)
--- a/vala/valapointerindirection.vala
+++ b/vala/valapointerindirection.vala
@@ -120,4 +120,8 @@ public class Vala.PointerIndirection : Expression {
        public override void get_used_variables (Collection<Variable> collection) {
                inner.get_used_variables (collection);
        }
+
+       public override string to_string () {
+               return "(*%s)".printf (inner.to_string ());
+       }
 }

diff --git a/vala/valapostfixexpression.vala b/vala/valapostfixexpression.vala
index 156ffecf0e8d22b881f7980f556a5cc9ee938513..1dd6466255f6fe247db1b6a904b33956cc4b94a1 100644 (file)
--- a/vala/valapostfixexpression.vala
+++ b/vala/valapostfixexpression.vala
@@ -169,4 +169,8 @@ public class Vala.PostfixExpression : Expression {
 
                codegen.visit_expression (this);
        }
+
+       public override string to_string () {
+               return "(%s%s)".printf (inner.to_string (), increment ? "++" : "--");
+       }
 }

diff --git a/vala/valareferencetransferexpression.vala b/vala/valareferencetransferexpression.vala
index 9362bbd1ccec051aecb35a37dc25314e57baafb3..6a06b1d65d6c3bc4f596bdd563a62c4605fa0494 100644 (file)
--- a/vala/valareferencetransferexpression.vala
+++ b/vala/valareferencetransferexpression.vala
@@ -142,4 +142,8 @@ public class Vala.ReferenceTransferExpression : Expression {
                        collection.add (param);
                }
        }
+
+       public override string to_string () {
+               return "(owned) %s".printf (inner.to_string ());
+       }
 }

diff --git a/vala/valasymbol.vala b/vala/valasymbol.vala
index 131969afbbc076765f40ca848611759c5b3fdeb9..59e75a577995533f19de7c99190f6b39de9881cb 100644 (file)
--- a/vala/valasymbol.vala
+++ b/vala/valasymbol.vala
@@ -472,6 +472,10 @@ public abstract class Vala.Symbol : CodeNode {
        public virtual void add_destructor (Destructor d) {
                Report.error (d.source_reference, "unexpected declaration");
        }
+
+       public override string to_string () {
+               return get_full_name ();
+       }
 }
 
 public enum Vala.SymbolAccessibility {

diff --git a/vala/valatypecheck.vala b/vala/valatypecheck.vala
index 5b22d75d474983187ce4fe29d1f311b492295f8e..cb0469a6fcffb6d35011ee3a59e8ff98e163b631 100644 (file)
--- a/vala/valatypecheck.vala
+++ b/vala/valatypecheck.vala
@@ -132,4 +132,8 @@ public class Vala.TypeCheck : Expression {
 
                codegen.visit_expression (this);
        }
+
+       public override string to_string () {
+               return "(%s is %s)".printf (expression.to_string (), type_reference.to_string ());
+       }
 }