comparison gen/tocall.cpp @ 1607:207a8a438dea

Merge DMD r253: refactor: Argument => Parameter --- dmd/arrayop.c | 30 ++++---- dmd/arraytypes.h | 2 +- dmd/class.c | 8 +- dmd/declaration.c | 10 ++-- dmd/declaration.h | 16 ++-- dmd/doc.c | 12 ++-- dmd/dsymbol.c | 4 +- dmd/expression.c | 48 +++++++------- dmd/expression.h | 32 +++++----- dmd/func.c | 78 +++++++++++----------- dmd/init.c | 2 +- dmd/interpret.c | 8 +- dmd/mtype.c | 190 ++++++++++++++++++++++++++-------------------------- dmd/mtype.h | 32 +++++----- dmd/opover.c | 34 +++++----- dmd/parse.c | 40 ++++++------ dmd/parse.h | 2 +- dmd/statement.c | 90 +++++++++++++------------- dmd/statement.h | 14 ++-- dmd/struct.c | 8 +- dmd/template.c | 30 ++++---- gen/functions.cpp | 10 ++-- gen/functions.h | 2 +- gen/tocall.cpp | 10 ++-- gen/typinf.cpp | 6 +- 25 files changed, 359 insertions(+), 359 deletions(-)
author Leandro Lucarella <llucax@gmail.com>
date Wed, 06 Jan 2010 15:18:20 -0300
parents 8d086d552909
children 40bd4a0d4870
comparison
equal deleted inserted replaced
1606:1b24e9c7cc26 1607:207a8a438dea
126 LOG_SCOPE 126 LOG_SCOPE
127 127
128 std::vector<const LLType*> vtypes; 128 std::vector<const LLType*> vtypes;
129 129
130 // number of non variadic args 130 // number of non variadic args
131 int begin = Argument::dim(tf->parameters); 131 int begin = Parameter::dim(tf->parameters);
132 Logger::println("num non vararg params = %d", begin); 132 Logger::println("num non vararg params = %d", begin);
133 133
134 // get n args in arguments list 134 // get n args in arguments list
135 size_t n_arguments = arguments ? arguments->dim : 0; 135 size_t n_arguments = arguments ? arguments->dim : 0;
136 136
230 ++argidx; 230 ++argidx;
231 231
232 // pass non variadic args 232 // pass non variadic args
233 for (int i=0; i<begin; i++) 233 for (int i=0; i<begin; i++)
234 { 234 {
235 Argument* fnarg = Argument::getNth(tf->parameters, i); 235 Parameter* fnarg = Parameter::getNth(tf->parameters, i);
236 DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]); 236 DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]);
237 args.push_back(argval->getRVal()); 237 args.push_back(argval->getRVal());
238 238
239 if (tf->fty.args[i]->attrs) 239 if (tf->fty.args[i]->attrs)
240 { 240 {
418 Logger::undent(); 418 Logger::undent();
419 Logger::cout() << "Function type: " << tf->toChars() << '\n'; 419 Logger::cout() << "Function type: " << tf->toChars() << '\n';
420 //Logger::cout() << "LLVM functype: " << *callable->getType() << '\n'; 420 //Logger::cout() << "LLVM functype: " << *callable->getType() << '\n';
421 } 421 }
422 422
423 size_t n = Argument::dim(tf->parameters); 423 size_t n = Parameter::dim(tf->parameters);
424 424
425 LLSmallVector<unsigned, 10> attrptr(n, 0); 425 LLSmallVector<unsigned, 10> attrptr(n, 0);
426 426
427 // do formal params 427 // do formal params
428 int beg = argiter-argbegin; 428 int beg = argiter-argbegin;
429 for (int i=0; i<n; i++) 429 for (int i=0; i<n; i++)
430 { 430 {
431 Argument* fnarg = Argument::getNth(tf->parameters, i); 431 Parameter* fnarg = Parameter::getNth(tf->parameters, i);
432 assert(fnarg); 432 assert(fnarg);
433 DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]); 433 DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]);
434 434
435 #if 0 435 #if 0
436 if (Logger::enabled()) { 436 if (Logger::enabled()) {
502 // do C varargs 502 // do C varargs
503 if (n_arguments > n) 503 if (n_arguments > n)
504 { 504 {
505 for (int i=n; i<n_arguments; i++) 505 for (int i=n; i<n_arguments; i++)
506 { 506 {
507 Argument* fnarg = Argument::getNth(tf->parameters, i); 507 Parameter* fnarg = Parameter::getNth(tf->parameters, i);
508 DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]); 508 DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]);
509 LLValue* arg = argval->getRVal(); 509 LLValue* arg = argval->getRVal();
510 510
511 // FIXME: do we need any param attrs here ? 511 // FIXME: do we need any param attrs here ?
512 512