+2008-11-20 Jürg Billeter <j@bitron.ch>
+
+ * 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 <j@bitron.ch>
* vala/valainvocationexpression.vala:
valaccodecontrolflowmodule.vala \
valaccodedelegatemodule.vala \
valaccodegenerator.vala \
- valaccodeinvocationexpressionmodule.vala \
valaccodememberaccessmodule.vala \
+ valaccodemethodcallmodule.vala \
valaccodemethodmodule.vala \
valaccodemodule.vala \
valaccodestructmodule.vala \
/**
* 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) {
Gee.List<Expression> 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<CCodeExpression> size = invocation_expr.get_array_sizes ();
return size[dim - 1];
} else if (array_expr.symbol_reference != null) {
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;
}
}
- 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) {
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);
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) {
-/* valaccodeinvocationexpressionmodule.vala
+/* valaccodemethodcallmodule.vala
*
* Copyright (C) 2006-2008 Jürg Billeter, Raffaele Sandrini
*
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
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
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) {
valainterfacetype.vala \
valainterfacewriter.vala \
valainvalidtype.vala \
- valainvocationexpression.vala \
valalambdaexpression.vala \
valaliteral.vala \
valalocalvariable.vala \
valamemberaccess.vala \
valamemberinitializer.vala \
valamethod.vala \
+ valamethodcall.vala \
valamethodtype.vala \
valanamespace.vala \
valanullchecker.vala \
*
* @param expr an invocation expression
*/
- public virtual void visit_invocation_expression (InvocationExpression expr) {
+ public virtual void visit_method_call (MethodCall expr) {
}
/**
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;
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;
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);
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);
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);
}
- 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);
}
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);
}
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;
-/* valainvocationexpression.vala
+/* valamethodcall.vala
*
* Copyright (C) 2006-2008 Jürg Billeter
*
/**
* Represents an invocation expression in the source code.
*/
-public class Vala.InvocationExpression : Expression {
+public class Vala.MethodCall : Expression {
/**
* The method to call.
*/
* @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;
}
}
public override void accept (CodeVisitor visitor) {
- visitor.visit_invocation_expression (this);
+ visitor.visit_method_call (this);
visitor.visit_expression (this);
}
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;
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);
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);
}
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);
}
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);
expr.accept_children (this);
}
- public override void visit_invocation_expression (InvocationExpression expr) {
+ public override void visit_method_call (MethodCall expr) {
expr.accept_children (this);
}
projects / thirdparty / vala.git / commitdiff
