Permalink
Browse files

rename gcinfo to rtinfo

  • Loading branch information...
1 parent 70f0e69 commit 01de50915a06067f8e5ff5ccdf37b48626b4885d @WalterBright WalterBright committed Apr 18, 2012
Showing with 21 additions and 21 deletions.
  1. +1 −1 src/aggregate.h
  2. +1 −1 src/idgen.c
  3. +1 −1 src/mtype.c
  4. +1 −1 src/mtype.h
  5. +5 −5 src/struct.c
  6. +2 −2 src/template.c
  7. +6 −6 src/toobj.c
  8. +4 −4 src/typinf.c
View
2 src/aggregate.h
@@ -81,7 +81,7 @@ struct AggregateDeclaration : ScopeDsymbol
FuncDeclarations methods; // flat list of all methods for debug information
#endif
- Expression *getGCInfo; // pointer to GC info generated by object.GCInfo(this)
+ Expression *getRTInfo; // pointer to GC info generated by object.gcinfo(this)
@ricochet1k
ricochet1k Apr 18, 2012

Comment still says gcinfo

AggregateDeclaration(Loc loc, Identifier *id);
void semantic2(Scope *sc);
View
2 src/idgen.c
@@ -66,7 +66,7 @@ Msgtable msgtable[] =
{ "outer" },
{ "Exception" },
{ "AssociativeArray" },
- { "GCInfo" },
+ { "RTInfo" },
{ "Throwable" },
{ "Error" },
{ "withSym", "__withSym" },
View
2 src/mtype.c
@@ -114,7 +114,7 @@ ClassDeclaration *Type::typeinfoshared;
ClassDeclaration *Type::typeinfowild;
TemplateDeclaration *Type::associativearray;
-TemplateDeclaration *Type::gcinfo;
+TemplateDeclaration *Type::rtinfo;
Type *Type::tvoidptr;
Type *Type::tstring;
View
2 src/mtype.h
@@ -204,7 +204,7 @@ struct Type : Object
static ClassDeclaration *typeinfowild;
static TemplateDeclaration *associativearray;
- static TemplateDeclaration *gcinfo;
+ static TemplateDeclaration *rtinfo;
static Type *basic[TMAX];
static unsigned char mangleChar[TMAX];
View
10 src/struct.c
@@ -57,7 +57,7 @@ AggregateDeclaration::AggregateDeclaration(Loc loc, Identifier *id)
noDefaultCtor = FALSE;
#endif
dtor = NULL;
- getGCInfo = NULL;
+ getRTInfo = NULL;
}
enum PROT AggregateDeclaration::prot()
@@ -97,19 +97,19 @@ void AggregateDeclaration::semantic3(Scope *sc)
}
sc->pop();
- if (!getGCInfo)
- { // Evaluate: GCInfo!type
+ if (!getRTInfo)
+ { // Evaluate: gcinfo!type
Objects *tiargs = new Objects();
tiargs->push(type);
- TemplateInstance *ti = new TemplateInstance(loc, Type::gcinfo, tiargs);
+ TemplateInstance *ti = new TemplateInstance(loc, Type::rtinfo, tiargs);
ti->semantic(sc);
ti->semantic2(sc);
ti->semantic3(sc);
Dsymbol *s = ti->toAlias();
Expression *e = new DsymbolExp(0, s, 0);
e = e->semantic(ti->tempdecl->scope);
e = e->optimize(WANTvalue | WANTinterpret);
- getGCInfo = e;
+ getRTInfo = e;
}
}
}
View
4 src/template.c
@@ -439,8 +439,8 @@ void TemplateDeclaration::semantic(Scope *sc)
{
if (ident == Id::AssociativeArray)
Type::associativearray = this;
- else if (ident == Id::GCInfo)
- Type::gcinfo = this;
+ else if (ident == Id::RTInfo)
+ Type::rtinfo = this;
}
if (sc->func)
View
12 src/toobj.c
@@ -484,7 +484,7 @@ void ClassDeclaration::toObjFile(int multiobj)
OffsetTypeInfo[] offTi;
void *defaultConstructor;
//const(MemberInfo[]) function(string) xgetMembers; // module getMembers() function
- void *xgetGCInfo;
+ void *xgetRTInfo;
//TypeInfo typeinfo;
}
*/
@@ -606,9 +606,9 @@ void ClassDeclaration::toObjFile(int multiobj)
dtsize_t(&dt, 0); // module getMembers() function
#endif
- // xgetGCInfo
- if (getGCInfo)
- getGCInfo->toDt(&dt);
+ // xgetRTInfo
+ if (getRTInfo)
+ getRTInfo->toDt(&dt);
else if (flags & 2)
dtsize_t(&dt, 0); // no pointers
else
@@ -988,7 +988,7 @@ void InterfaceDeclaration::toObjFile(int multiobj)
void *defaultConstructor;
#if DMDV2
//const(MemberInfo[]) function(string) xgetMembers; // module getMembers() function
- void* xgetGCInfo;
+ void* xgetRTInfo;
#endif
//TypeInfo typeinfo;
}
@@ -1063,7 +1063,7 @@ void InterfaceDeclaration::toObjFile(int multiobj)
// xgetMembers
//dtsize_t(&dt, 0);
- // xgetGCInfo
+ // xgetRTInfo
dtsize_t(&dt, 0x12345678);
#endif
View
8 src/typinf.c
@@ -518,7 +518,7 @@ void TypeInfoStructDeclaration::toDt(dt_t **pdt)
* version (X86_64)
* TypeInfo m_arg1;
* TypeInfo m_arg2;
- * xgetGCInfo
+ * xgetRTInfo
*
* name[]
*/
@@ -696,9 +696,9 @@ void TypeInfoStructDeclaration::toDt(dt_t **pdt)
}
}
- // xgetGCInfo
- if (sd->getGCInfo)
- sd->getGCInfo->toDt(pdt);
+ // xgetRTInfo
+ if (sd->getRTInfo)
+ sd->getRTInfo->toDt(pdt);
else if (m_flags)
dtsize_t(pdt, 1); // has pointers
else

0 comments on commit 01de509

Please sign in to comment.