From: Jürg Billeter Date: Thu, 20 Nov 2008 19:39:32 +0000 (+0000) Subject: Rename InvocationExpression to MethodCall X-Git-Tag: VALA_0_5_2~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2af5cc83c487aab712e036bbeae608cd4692390b;p=thirdparty%2Fvala.git Rename InvocationExpression to MethodCall 2008-11-20 Jürg Billeter * vala/Makefile.am: * vala/valacodevisitor.vala: * vala/valadynamicmethod.vala: * vala/valaflowanalyzer.vala: * vala/valagenieparser.vala: * vala/valamemberaccess.vala: * vala/valamethodcall.vala: * vala/valanullchecker.vala: * vala/valaparser.vala: * vala/valasemanticanalyzer.vala: * vala/valasymbolresolver.vala: * gobject/Makefile.am: * gobject/valaccodearraymodule.vala: * gobject/valaccodebasemodule.vala: * gobject/valaccodedelegatemodule.vala: * gobject/valaccodegenerator.vala: * gobject/valaccodemethodcallmodule.vala: * gobject/valaccodemodule.vala: Rename InvocationExpression to MethodCall svn path=/trunk/; revision=2039 --- diff --git a/ChangeLog b/ChangeLog index 60a34e156..b83deaae5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2008-11-20 Jürg Billeter + + * vala/Makefile.am: + * vala/valacodevisitor.vala: + * vala/valadynamicmethod.vala: + * vala/valaflowanalyzer.vala: + * vala/valagenieparser.vala: + * vala/valamemberaccess.vala: + * vala/valamethodcall.vala: + * vala/valanullchecker.vala: + * vala/valaparser.vala: + * vala/valasemanticanalyzer.vala: + * vala/valasymbolresolver.vala: + * gobject/Makefile.am: + * gobject/valaccodearraymodule.vala: + * gobject/valaccodebasemodule.vala: + * gobject/valaccodedelegatemodule.vala: + * gobject/valaccodegenerator.vala: + * gobject/valaccodemethodcallmodule.vala: + * gobject/valaccodemodule.vala: + + Rename InvocationExpression to MethodCall + 2008-11-20 Jürg Billeter * vala/valainvocationexpression.vala: diff --git a/gobject/Makefile.am b/gobject/Makefile.am index c3614486f..9f6bc18ae 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -19,8 +19,8 @@ libvala_la_VALASOURCES = \ valaccodecontrolflowmodule.vala \ valaccodedelegatemodule.vala \ valaccodegenerator.vala \ - valaccodeinvocationexpressionmodule.vala \ valaccodememberaccessmodule.vala \ + valaccodemethodcallmodule.vala \ valaccodemethodmodule.vala \ valaccodemodule.vala \ valaccodestructmodule.vala \ diff --git a/gobject/valaccodearraymodule.vala b/gobject/valaccodearraymodule.vala index 8754a657a..8ca987f8a 100644 --- a/gobject/valaccodearraymodule.vala +++ b/gobject/valaccodearraymodule.vala @@ -27,7 +27,7 @@ using Gee; /** * The link between an assignment and generated code. */ -public class Vala.CCodeArrayModule : CCodeInvocationExpressionModule { +public class Vala.CCodeArrayModule : CCodeMethodCallModule { private int next_array_dup_id = 0; public CCodeArrayModule (CCodeGenerator codegen, CCodeModule? next) { @@ -136,8 +136,8 @@ public class Vala.CCodeArrayModule : CCodeInvocationExpressionModule { Gee.List size = ((ArrayCreationExpression) array_expr).get_sizes (); var length_expr = size[dim - 1]; return (CCodeExpression) get_ccodenode (length_expr); - } else if (array_expr is InvocationExpression) { - var invocation_expr = (InvocationExpression) array_expr; + } else if (array_expr is MethodCall) { + var invocation_expr = (MethodCall) array_expr; Gee.List size = invocation_expr.get_array_sizes (); return size[dim - 1]; } else if (array_expr.symbol_reference != null) { diff --git a/gobject/valaccodebasemodule.vala b/gobject/valaccodebasemodule.vala index 4f29b6b64..2026f167a 100644 --- a/gobject/valaccodebasemodule.vala +++ b/gobject/valaccodebasemodule.vala @@ -1778,7 +1778,7 @@ public class Vala.CCodeBaseModule : CCodeModule { stmt.ccodenode = new CCodeExpressionStatement ((CCodeExpression) stmt.expression.ccodenode); - var invoc = stmt.expression as InvocationExpression; + var invoc = stmt.expression as MethodCall; if (invoc != null) { var m = invoc.call.symbol_reference as Method; var ma = invoc.call as MemberAccess; diff --git a/gobject/valaccodedelegatemodule.vala b/gobject/valaccodedelegatemodule.vala index 801363cc7..c105cb7a0 100644 --- a/gobject/valaccodedelegatemodule.vala +++ b/gobject/valaccodedelegatemodule.vala @@ -82,8 +82,8 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule { } } - if (delegate_expr is InvocationExpression) { - var invocation_expr = (InvocationExpression) delegate_expr; + if (delegate_expr is MethodCall) { + var invocation_expr = (MethodCall) delegate_expr; return invocation_expr.delegate_target; } else if (delegate_expr is LambdaExpression) { if ((current_method != null && current_method.binding == MemberBinding.INSTANCE) || in_constructor) { diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala index b463023d2..8913ac522 100644 --- a/gobject/valaccodegenerator.vala +++ b/gobject/valaccodegenerator.vala @@ -38,7 +38,7 @@ public class Vala.CCodeGenerator : CodeGenerator { head = new CCodeControlFlowModule (this, head); head = new CCodeMemberAccessModule (this, head); head = new CCodeAssignmentModule (this, head); - head = new CCodeInvocationExpressionModule (this, head); + head = new CCodeMethodCallModule (this, head); head = new CCodeArrayModule (this, head); head = new CCodeDelegateModule (this, head); head = new GErrorModule (this, head); @@ -267,8 +267,8 @@ public class Vala.CCodeGenerator : CodeGenerator { head.visit_member_access (expr); } - public override void visit_invocation_expression (InvocationExpression expr) { - head.visit_invocation_expression (expr); + public override void visit_method_call (MethodCall expr) { + head.visit_method_call (expr); } public override void visit_element_access (ElementAccess expr) { diff --git a/gobject/valaccodeinvocationexpressionmodule.vala b/gobject/valaccodemethodcallmodule.vala similarity index 98% rename from gobject/valaccodeinvocationexpressionmodule.vala rename to gobject/valaccodemethodcallmodule.vala index afa325075..a3fcceba0 100644 --- a/gobject/valaccodeinvocationexpressionmodule.vala +++ b/gobject/valaccodemethodcallmodule.vala @@ -1,4 +1,4 @@ -/* valaccodeinvocationexpressionmodule.vala +/* valaccodemethodcallmodule.vala * * Copyright (C) 2006-2008 Jürg Billeter, Raffaele Sandrini * @@ -24,12 +24,12 @@ using GLib; using Gee; -public class Vala.CCodeInvocationExpressionModule : CCodeAssignmentModule { - public CCodeInvocationExpressionModule (CCodeGenerator codegen, CCodeModule? next) { +public class Vala.CCodeMethodCallModule : CCodeAssignmentModule { + public CCodeMethodCallModule (CCodeGenerator codegen, CCodeModule? next) { base (codegen, next); } - public override void visit_invocation_expression (InvocationExpression expr) { + public override void visit_method_call (MethodCall expr) { expr.accept_children (codegen); // the bare function call @@ -217,7 +217,7 @@ public class Vala.CCodeInvocationExpressionModule : CCodeAssignmentModule { cexpr = handle_struct_argument (param, arg, cexpr); - if (multiple_cargs && arg is InvocationExpression) { + if (multiple_cargs && arg is MethodCall) { // if vala argument is invocation expression // the auxiliary C argument(s) will depend on the main C argument diff --git a/gobject/valaccodemodule.vala b/gobject/valaccodemodule.vala index c165e2e93..efd33e60d 100644 --- a/gobject/valaccodemodule.vala +++ b/gobject/valaccodemodule.vala @@ -264,8 +264,8 @@ public abstract class Vala.CCodeModule { next.visit_member_access (expr); } - public virtual void visit_invocation_expression (InvocationExpression expr) { - next.visit_invocation_expression (expr); + public virtual void visit_method_call (MethodCall expr) { + next.visit_method_call (expr); } public virtual void visit_element_access (ElementAccess expr) { diff --git a/vala/Makefile.am b/vala/Makefile.am index b53002042..97c012e85 100644 --- a/vala/Makefile.am +++ b/vala/Makefile.am @@ -79,7 +79,6 @@ libvalacore_la_VALASOURCES = \ valainterfacetype.vala \ valainterfacewriter.vala \ valainvalidtype.vala \ - valainvocationexpression.vala \ valalambdaexpression.vala \ valaliteral.vala \ valalocalvariable.vala \ @@ -89,6 +88,7 @@ libvalacore_la_VALASOURCES = \ valamemberaccess.vala \ valamemberinitializer.vala \ valamethod.vala \ + valamethodcall.vala \ valamethodtype.vala \ valanamespace.vala \ valanullchecker.vala \ diff --git a/vala/valacodevisitor.vala b/vala/valacodevisitor.vala index 520b0caad..90de7141d 100644 --- a/vala/valacodevisitor.vala +++ b/vala/valacodevisitor.vala @@ -488,7 +488,7 @@ public abstract class Vala.CodeVisitor { * * @param expr an invocation expression */ - public virtual void visit_invocation_expression (InvocationExpression expr) { + public virtual void visit_method_call (MethodCall expr) { } /** diff --git a/vala/valadynamicmethod.vala b/vala/valadynamicmethod.vala index 70beff6f8..96f0cfa5c 100644 --- a/vala/valadynamicmethod.vala +++ b/vala/valadynamicmethod.vala @@ -29,7 +29,7 @@ using Gee; public class Vala.DynamicMethod : Method { public DataType dynamic_type { get; set; } - public InvocationExpression invocation { get; set; } + public MethodCall invocation { get; set; } private string cname; static int dynamic_method_id; diff --git a/vala/valaflowanalyzer.vala b/vala/valaflowanalyzer.vala index 24fe771c0..fdd3fd6f4 100644 --- a/vala/valaflowanalyzer.vala +++ b/vala/valaflowanalyzer.vala @@ -530,8 +530,8 @@ public class Vala.FlowAnalyzer : CodeVisitor { handle_errors (stmt); - if (stmt.expression is InvocationExpression) { - var expr = (InvocationExpression) stmt.expression; + if (stmt.expression is MethodCall) { + var expr = (MethodCall) stmt.expression; var ma = expr.call as MemberAccess; if (ma != null && ma.symbol_reference != null && ma.symbol_reference.get_attribute ("NoReturn") != null) { current_block = null; diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala index fc4e67ee6..5eac65b97 100644 --- a/vala/valagenieparser.vala +++ b/vala/valagenieparser.vala @@ -589,7 +589,7 @@ public class Vala.Genie.Parser : CodeVisitor { expr = parse_pointer_member_access (begin, expr); break; case TokenType.OPEN_PARENS: - expr = parse_invocation_expression (begin, expr); + expr = parse_method_call (begin, expr); break; case TokenType.OPEN_BRACKET: expr = parse_element_access (begin, expr); @@ -725,7 +725,7 @@ public class Vala.Genie.Parser : CodeVisitor { accept (TokenType.CLOSE_PARENS); - var print_expr = new InvocationExpression (expr, get_src (begin)); + var print_expr = new MethodCall (expr, get_src (begin)); foreach (Expression arg in arg_list) { print_expr.add_argument (arg); @@ -747,7 +747,7 @@ public class Vala.Genie.Parser : CodeVisitor { accept (TokenType.CLOSE_PARENS); - var assert_expr = new InvocationExpression (expr, get_src (begin)); + var assert_expr = new MethodCall (expr, get_src (begin)); foreach (Expression arg in arg_list) { assert_expr.add_argument (arg); @@ -757,7 +757,7 @@ public class Vala.Genie.Parser : CodeVisitor { } - Expression parse_invocation_expression (SourceLocation begin, Expression inner) throws ParseError { + Expression parse_method_call (SourceLocation begin, Expression inner) throws ParseError { expect (TokenType.OPEN_PARENS); var arg_list = parse_argument_list (); expect (TokenType.CLOSE_PARENS); @@ -778,7 +778,7 @@ public class Vala.Genie.Parser : CodeVisitor { } return expr; } else { - var expr = new InvocationExpression (inner, get_src (begin)); + var expr = new MethodCall (inner, get_src (begin)); foreach (Expression arg in arg_list) { expr.add_argument (arg); } diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala index 573aaf5e1..9dcb342b8 100644 --- a/vala/valamemberaccess.vala +++ b/vala/valamemberaccess.vala @@ -311,8 +311,8 @@ public class Vala.MemberAccess : Expression { if (symbol_reference == null && inner.value_type != null && inner.value_type.is_dynamic) { // allow late bound members for dynamic types var dynamic_object_type = (ObjectType) inner.value_type; - if (parent_node is InvocationExpression) { - var invoc = (InvocationExpression) parent_node; + if (parent_node is MethodCall) { + var invoc = (MethodCall) parent_node; if (invoc.call == this) { // dynamic method DataType ret_type; diff --git a/vala/valainvocationexpression.vala b/vala/valamethodcall.vala similarity index 98% rename from vala/valainvocationexpression.vala rename to vala/valamethodcall.vala index f51c97c90..0dc389802 100644 --- a/vala/valainvocationexpression.vala +++ b/vala/valamethodcall.vala @@ -1,4 +1,4 @@ -/* valainvocationexpression.vala +/* valamethodcall.vala * * Copyright (C) 2006-2008 Jürg Billeter * @@ -26,7 +26,7 @@ using Gee; /** * Represents an invocation expression in the source code. */ -public class Vala.InvocationExpression : Expression { +public class Vala.MethodCall : Expression { /** * The method to call. */ @@ -52,7 +52,7 @@ public class Vala.InvocationExpression : Expression { * @param source_reference reference to source code * @return newly created invocation expression */ - public InvocationExpression (Expression call, SourceReference? source_reference = null) { + public MethodCall (Expression call, SourceReference? source_reference = null) { this.source_reference = source_reference; this.call = call; } @@ -92,7 +92,7 @@ public class Vala.InvocationExpression : Expression { } public override void accept (CodeVisitor visitor) { - visitor.visit_invocation_expression (this); + visitor.visit_method_call (this); visitor.visit_expression (this); } diff --git a/vala/valanullchecker.vala b/vala/valanullchecker.vala index 996af7cf1..7cd940d75 100644 --- a/vala/valanullchecker.vala +++ b/vala/valanullchecker.vala @@ -198,7 +198,7 @@ public class Vala.NullChecker : CodeVisitor { stmt.accept_children (this); } - public override void visit_invocation_expression (InvocationExpression expr) { + public override void visit_method_call (MethodCall expr) { expr.accept_children (this); var mtype = expr.call.value_type as MethodType; diff --git a/vala/valaparser.vala b/vala/valaparser.vala index dac4f5c3e..4d4230abb 100644 --- a/vala/valaparser.vala +++ b/vala/valaparser.vala @@ -492,7 +492,7 @@ public class Vala.Parser : CodeVisitor { expr = parse_pointer_member_access (begin, expr); break; case TokenType.OPEN_PARENS: - expr = parse_invocation_expression (begin, expr); + expr = parse_method_call (begin, expr); break; case TokenType.OPEN_BRACKET: expr = parse_element_access (begin, expr); @@ -582,7 +582,7 @@ public class Vala.Parser : CodeVisitor { return expr; } - Expression parse_invocation_expression (SourceLocation begin, Expression inner) throws ParseError { + Expression parse_method_call (SourceLocation begin, Expression inner) throws ParseError { expect (TokenType.OPEN_PARENS); var arg_list = parse_argument_list (); expect (TokenType.CLOSE_PARENS); @@ -603,7 +603,7 @@ public class Vala.Parser : CodeVisitor { } return expr; } else { - var expr = new InvocationExpression (inner, get_src (begin)); + var expr = new MethodCall (inner, get_src (begin)); foreach (Expression arg in arg_list) { expr.add_argument (arg); } diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala index 4bc3f74be..ec91d6f0a 100644 --- a/vala/valasemanticanalyzer.vala +++ b/vala/valasemanticanalyzer.vala @@ -307,7 +307,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { Report.error (expr.source_reference, "Too few arguments, method `%s' does not take %d arguments".printf (mtype.to_string (), args.size)); return false; } else { - var invocation_expr = expr as InvocationExpression; + var invocation_expr = expr as MethodCall; var object_creation_expr = expr as ObjectCreationExpression; if (invocation_expr != null) { invocation_expr.add_argument (param.default_expression); diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala index d547f0ef7..bef33c34e 100644 --- a/vala/valasymbolresolver.vala +++ b/vala/valasymbolresolver.vala @@ -378,7 +378,7 @@ public class Vala.SymbolResolver : CodeVisitor { expr.accept_children (this); } - public override void visit_invocation_expression (InvocationExpression expr) { + public override void visit_method_call (MethodCall expr) { expr.accept_children (this); }