comparison dmd/doc.c @ 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 def7a1d494fd
children c61782a76dff
comparison
equal deleted inserted replaced
1606:1b24e9c7cc26 1607:207a8a438dea
94 unsigned skippastident(OutBuffer *buf, size_t i); 94 unsigned skippastident(OutBuffer *buf, size_t i);
95 unsigned skippastURL(OutBuffer *buf, size_t i); 95 unsigned skippastURL(OutBuffer *buf, size_t i);
96 void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset); 96 void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
97 void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset); 97 void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
98 void highlightCode2(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset); 98 void highlightCode2(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
99 Argument *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len); 99 Parameter *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len);
100 100
101 int isIdStart(unsigned char *p); 101 int isIdStart(unsigned char *p);
102 int isIdTail(unsigned char *p); 102 int isIdTail(unsigned char *p);
103 int utfStride(unsigned char *p); 103 int utfStride(unsigned char *p);
104 104
771 if (i) 771 if (i)
772 buf->writestring(", "); 772 buf->writestring(", ");
773 tp->toCBuffer(buf, &hgs); 773 tp->toCBuffer(buf, &hgs);
774 } 774 }
775 buf->writeByte(')'); 775 buf->writeByte(')');
776 Argument::argsToCBuffer(buf, &hgs, tf->parameters, tf->varargs); 776 Parameter::argsToCBuffer(buf, &hgs, tf->parameters, tf->varargs);
777 buf->writestring(";\n"); 777 buf->writestring(";\n");
778 778
779 highlightCode(NULL, this, buf, o); 779 highlightCode(NULL, this, buf, o);
780 } 780 }
781 else 781 else
788 void CtorDeclaration::toDocBuffer(OutBuffer *buf) 788 void CtorDeclaration::toDocBuffer(OutBuffer *buf)
789 { 789 {
790 HdrGenState hgs; 790 HdrGenState hgs;
791 791
792 buf->writestring("this"); 792 buf->writestring("this");
793 Argument::argsToCBuffer(buf, &hgs, arguments, varargs); 793 Parameter::argsToCBuffer(buf, &hgs, arguments, varargs);
794 buf->writestring(";\n"); 794 buf->writestring(";\n");
795 } 795 }
796 796
797 797
798 void AggregateDeclaration::toDocBuffer(OutBuffer *buf) 798 void AggregateDeclaration::toDocBuffer(OutBuffer *buf)
1152 1152
1153 unsigned char *textstart; 1153 unsigned char *textstart;
1154 unsigned textlen; 1154 unsigned textlen;
1155 1155
1156 unsigned o; 1156 unsigned o;
1157 Argument *arg; 1157 Parameter *arg;
1158 1158
1159 buf->writestring("$(DDOC_PARAMS \n"); 1159 buf->writestring("$(DDOC_PARAMS \n");
1160 while (p < pend) 1160 while (p < pend)
1161 { 1161 {
1162 // Skip to start of macro 1162 // Skip to start of macro
1619 } 1619 }
1620 1620
1621 /**************************************************** 1621 /****************************************************
1622 */ 1622 */
1623 1623
1624 Argument *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len) 1624 Parameter *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len)
1625 { 1625 {
1626 FuncDeclaration *f = s->isFuncDeclaration(); 1626 FuncDeclaration *f = s->isFuncDeclaration();
1627 1627
1628 /* f->type may be NULL for template members. 1628 /* f->type may be NULL for template members.
1629 */ 1629 */
1638 tf = (TypeFunction *)f->type; 1638 tf = (TypeFunction *)f->type;
1639 1639
1640 if (tf->parameters) 1640 if (tf->parameters)
1641 { 1641 {
1642 for (size_t k = 0; k < tf->parameters->dim; k++) 1642 for (size_t k = 0; k < tf->parameters->dim; k++)
1643 { Argument *arg = (Argument *)tf->parameters->data[k]; 1643 { Parameter *arg = (Parameter *)tf->parameters->data[k];
1644 1644
1645 if (arg->ident && cmp(arg->ident->toChars(), p, len) == 0) 1645 if (arg->ident && cmp(arg->ident->toChars(), p, len) == 0)
1646 { 1646 {
1647 return arg; 1647 return arg;
1648 } 1648 }