From: Juerg Billeter Date: Sun, 2 Dec 2007 14:39:54 +0000 (+0000) Subject: rename replace method to replace_expression and require arguments of type X-Git-Tag: VALA_0_1_6~119 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1376567aa297b3ed9479e2c87c641f0b0eed2276;p=platform%2Fupstream%2Fvala.git rename replace method to replace_expression and require arguments of type 2007-12-02 Juerg Billeter * vala/valaaddressofexpression.vala, vala/valaassignment.vala, vala/valabinaryexpression.vala, vala/valacastexpression.vala, vala/valacodenode.vala, vala/valadostatement.vala, vala/valaexpressionstatement.vala, vala/valaforeachstatement.vala, vala/valaforstatement.vala, vala/valaifstatement.vala, vala/valainvocationexpression.vala, vala/valamemberaccess.vala, vala/valaobjectcreationexpression.vala, vala/valaparenthesizedexpression.vala, vala/valapointerindirection.vala, vala/valareferencetransferexpression.vala, vala/valareturnstatement.vala, vala/valasemanticanalyzer.vala, vala/valaswitchstatement.vala, vala/valathrowstatement.vala, vala/valaunaryexpression.vala, vala/valavariabledeclarator.vala, vala/valawhilestatement.vala: rename replace method to replace_expression and require arguments of type Expression svn path=/trunk/; revision=748 --- diff --git a/ChangeLog b/ChangeLog index 336adad..099df45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2007-12-02 Jürg Billeter + * vala/valaaddressofexpression.vala, vala/valaassignment.vala, + vala/valabinaryexpression.vala, vala/valacastexpression.vala, + vala/valacodenode.vala, vala/valadostatement.vala, + vala/valaexpressionstatement.vala, vala/valaforeachstatement.vala, + vala/valaforstatement.vala, vala/valaifstatement.vala, + vala/valainvocationexpression.vala, vala/valamemberaccess.vala, + vala/valaobjectcreationexpression.vala, + vala/valaparenthesizedexpression.vala, + vala/valapointerindirection.vala, + vala/valareferencetransferexpression.vala, + vala/valareturnstatement.vala, vala/valasemanticanalyzer.vala, + vala/valaswitchstatement.vala, vala/valathrowstatement.vala, + vala/valaunaryexpression.vala, vala/valavariabledeclarator.vala, + vala/valawhilestatement.vala: rename replace method to + replace_expression and require arguments of type Expression + +2007-12-02 Jürg Billeter + * vala/valaclass.vala, vala/valainterface.vala: prevent conflicts in type macros diff --git a/vala/valaaddressofexpression.vala b/vala/valaaddressofexpression.vala index 4ddf9e8..509db04 100644 --- a/vala/valaaddressofexpression.vala +++ b/vala/valaaddressofexpression.vala @@ -56,9 +56,9 @@ public class Vala.AddressofExpression : Expression { visitor.visit_addressof_expression (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (inner == old_node) { - inner = (Expression) new_node; + inner = new_node; } } diff --git a/vala/valaassignment.vala b/vala/valaassignment.vala index 07ecb6c..23ff065 100644 --- a/vala/valaassignment.vala +++ b/vala/valaassignment.vala @@ -79,12 +79,12 @@ public class Vala.Assignment : Expression { right.accept (visitor); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (left == old_node) { - left = (Expression) new_node; + left = new_node; } if (right == old_node) { - right = (Expression) new_node; + right = new_node; } } diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala index c189b34..7a7665d 100644 --- a/vala/valabinaryexpression.vala +++ b/vala/valabinaryexpression.vala @@ -85,12 +85,12 @@ public class Vala.BinaryExpression : Expression { visitor.visit_binary_expression (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (left == old_node) { - left = (Expression) new_node; + left = new_node; } if (right == old_node) { - right = (Expression) new_node; + right = new_node; } } diff --git a/vala/valacastexpression.vala b/vala/valacastexpression.vala index 1616586..a42ddcd 100644 --- a/vala/valacastexpression.vala +++ b/vala/valacastexpression.vala @@ -68,9 +68,9 @@ public class Vala.CastExpression : Expression { visitor.visit_cast_expression (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (inner == old_node) { - inner = (Expression) new_node; + inner = new_node; } } diff --git a/vala/valacodenode.vala b/vala/valacodenode.vala index 3fe38b3..c360567 100644 --- a/vala/valacodenode.vala +++ b/vala/valacodenode.vala @@ -94,7 +94,7 @@ public abstract class Vala.CodeNode : Object { public virtual void accept_children (CodeVisitor! visitor) { } - public virtual void replace (CodeNode! old_node, CodeNode! new_node) { + public virtual void replace_expression (Expression! old_node, Expression! new_node) { } /** diff --git a/vala/valadostatement.vala b/vala/valadostatement.vala index e463ce1..3d23795 100644 --- a/vala/valadostatement.vala +++ b/vala/valadostatement.vala @@ -76,9 +76,9 @@ public class Vala.DoStatement : CodeNode, Statement { visitor.visit_do_statement (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (condition == old_node) { - condition = (Expression) new_node; + condition = new_node; } } } diff --git a/vala/valaexpressionstatement.vala b/vala/valaexpressionstatement.vala index 994ca3b..f407881 100644 --- a/vala/valaexpressionstatement.vala +++ b/vala/valaexpressionstatement.vala @@ -58,9 +58,9 @@ public class Vala.ExpressionStatement : CodeNode, Statement { visitor.visit_expression_statement (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (expression == old_node) { - expression = (Expression) new_node; + expression = new_node; } } diff --git a/vala/valaforeachstatement.vala b/vala/valaforeachstatement.vala index e834a78..c384df1 100644 --- a/vala/valaforeachstatement.vala +++ b/vala/valaforeachstatement.vala @@ -106,9 +106,9 @@ public class Vala.ForeachStatement : Block { body.accept (visitor); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (collection == old_node) { - collection = (Expression) new_node; + collection = new_node; } } } diff --git a/vala/valaforstatement.vala b/vala/valaforstatement.vala index 8067be7..7d6327b 100644 --- a/vala/valaforstatement.vala +++ b/vala/valaforstatement.vala @@ -128,21 +128,21 @@ public class Vala.ForStatement : CodeNode, Statement { visitor.visit_for_statement (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (condition == old_node) { - condition = (Expression) new_node; + condition = new_node; return; } for (int i = 0; i < initializer.size; i++) { if (initializer[i] == old_node) { - initializer[i] = (Expression) new_node; + initializer[i] = new_node; return; } } for (int i = 0; i < iterator.size; i++) { if (iterator[i] == old_node) { - iterator[i] = (Expression) new_node; + iterator[i] = new_node; return; } } diff --git a/vala/valaifstatement.vala b/vala/valaifstatement.vala index e52f7e2..b12916a 100644 --- a/vala/valaifstatement.vala +++ b/vala/valaifstatement.vala @@ -79,9 +79,9 @@ public class Vala.IfStatement : CodeNode, Statement { visitor.visit_if_statement (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (condition == old_node) { - condition = (Expression) new_node; + condition = new_node; } } } diff --git a/vala/valainvocationexpression.vala b/vala/valainvocationexpression.vala index c26d120..550a6a5 100644 --- a/vala/valainvocationexpression.vala +++ b/vala/valainvocationexpression.vala @@ -99,14 +99,14 @@ public class Vala.InvocationExpression : Expression { } } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (call == old_node) { - call = (Expression) new_node; + call = new_node; } int index = argument_list.index_of (old_node); if (index >= 0 && new_node.parent_node == null) { - argument_list[index] = (Expression) new_node; + argument_list[index] = new_node; new_node.parent_node = this; } } diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala index 4e3c598..d464d2a 100644 --- a/vala/valamemberaccess.vala +++ b/vala/valamemberaccess.vala @@ -113,9 +113,9 @@ public class Vala.MemberAccess : Expression { } } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (inner == old_node) { - inner = (Expression) new_node; + inner = new_node; } } diff --git a/vala/valaobjectcreationexpression.vala b/vala/valaobjectcreationexpression.vala index 1dc3af5..62ea314 100644 --- a/vala/valaobjectcreationexpression.vala +++ b/vala/valaobjectcreationexpression.vala @@ -118,10 +118,10 @@ public class Vala.ObjectCreationExpression : Expression { } } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { int index = argument_list.index_of (old_node); if (index >= 0 && new_node.parent_node == null) { - argument_list[index] = (Expression) new_node; + argument_list[index] = new_node; new_node.parent_node = this; } } diff --git a/vala/valaparenthesizedexpression.vala b/vala/valaparenthesizedexpression.vala index 8eef1ea..dd0e392 100644 --- a/vala/valaparenthesizedexpression.vala +++ b/vala/valaparenthesizedexpression.vala @@ -59,9 +59,9 @@ public class Vala.ParenthesizedExpression : Expression { visitor.visit_parenthesized_expression (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (inner == old_node) { - inner = (Expression) new_node; + inner = new_node; } } diff --git a/vala/valapointerindirection.vala b/vala/valapointerindirection.vala index ce92522..918e5a5 100644 --- a/vala/valapointerindirection.vala +++ b/vala/valapointerindirection.vala @@ -56,9 +56,9 @@ public class Vala.PointerIndirection : Expression { visitor.visit_pointer_indirection (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (inner == old_node) { - inner = (Expression) new_node; + inner = new_node; } } diff --git a/vala/valareferencetransferexpression.vala b/vala/valareferencetransferexpression.vala index 9bcb25c..8ba9e83 100644 --- a/vala/valareferencetransferexpression.vala +++ b/vala/valareferencetransferexpression.vala @@ -56,9 +56,9 @@ public class Vala.ReferenceTransferExpression : Expression { visitor.visit_reference_transfer_expression (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (inner == old_node) { - inner = (Expression) new_node; + inner = new_node; } } diff --git a/vala/valareturnstatement.vala b/vala/valareturnstatement.vala index a588622..399f2d2 100644 --- a/vala/valareturnstatement.vala +++ b/vala/valareturnstatement.vala @@ -63,9 +63,9 @@ public class Vala.ReturnStatement : CodeNode, Statement { } } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (return_expression == old_node) { - return_expression = (Expression) new_node; + return_expression = new_node; } } } diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala index 64eaefb..d3ec32c 100644 --- a/vala/valasemanticanalyzer.vala +++ b/vala/valasemanticanalyzer.vala @@ -2137,7 +2137,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { var assignment = context.create_assignment (ma, bin, AssignmentOperator.SIMPLE, expr.source_reference); var parenthexp = new ParenthesizedExpression (assignment, expr.source_reference); - expr.parent_node.replace (expr, parenthexp); + expr.parent_node.replace_expression (expr, parenthexp); parenthexp.accept (this); return; } else if (expr.operator == UnaryOperator.REF) { @@ -2305,7 +2305,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { var concat_call = new InvocationExpression (new MemberAccess (expr.left, "concat")); concat_call.add_argument (expr.right); - expr.parent_node.replace (expr, concat_call); + expr.parent_node.replace_expression (expr, concat_call); concat_call.accept (this); } else if (expr.operator == BinaryOperator.PLUS diff --git a/vala/valaswitchstatement.vala b/vala/valaswitchstatement.vala index 3dc7543..201567f 100644 --- a/vala/valaswitchstatement.vala +++ b/vala/valaswitchstatement.vala @@ -84,9 +84,9 @@ public class Vala.SwitchStatement : CodeNode, Statement { visitor.visit_switch_statement (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (expression == old_node) { - expression = (Expression) new_node; + expression = new_node; } } } diff --git a/vala/valathrowstatement.vala b/vala/valathrowstatement.vala index 4fa0456..39e9320 100644 --- a/vala/valathrowstatement.vala +++ b/vala/valathrowstatement.vala @@ -63,9 +63,9 @@ public class Vala.ThrowStatement : CodeNode, Statement { } } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (error_expression == old_node) { - error_expression = (Expression) new_node; + error_expression = new_node; } } } diff --git a/vala/valaunaryexpression.vala b/vala/valaunaryexpression.vala index 0dc297e..c4653c2 100644 --- a/vala/valaunaryexpression.vala +++ b/vala/valaunaryexpression.vala @@ -68,9 +68,9 @@ public class Vala.UnaryExpression : Expression { visitor.visit_unary_expression (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (inner == old_node) { - inner = (Expression) new_node; + inner = new_node; } } diff --git a/vala/valavariabledeclarator.vala b/vala/valavariabledeclarator.vala index aa055c5..dc5822e 100644 --- a/vala/valavariabledeclarator.vala +++ b/vala/valavariabledeclarator.vala @@ -98,9 +98,9 @@ public class Vala.VariableDeclarator : Symbol, Invokable { return (type_reference.data_type is Callback); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (initializer == old_node) { - initializer = (Expression) new_node; + initializer = new_node; } } } diff --git a/vala/valawhilestatement.vala b/vala/valawhilestatement.vala index 6aa5ce6..a1afdce 100644 --- a/vala/valawhilestatement.vala +++ b/vala/valawhilestatement.vala @@ -76,9 +76,9 @@ public class Vala.WhileStatement : CodeNode, Statement { visitor.visit_while_statement (this); } - public override void replace (CodeNode! old_node, CodeNode! new_node) { + public override void replace_expression (Expression! old_node, Expression! new_node) { if (condition == old_node) { - condition = (Expression) new_node; + condition = new_node; } } }