Skip to content

Commit

Permalink
Merge pull request #1700 from yebblies/classinfo_typeid
Browse files Browse the repository at this point in the history 
Convert x.classinfo to typeid(x)
  • Loading branch information
Iain Buclaw committed Nov 18, 2013
2 parents c7ee793 + 92358ab commit 19bed56
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
50 changes: 25 additions & 25 deletions std/format.d
View file
Expand Up @@ -4830,11 +4830,11 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
{
for (;;)
{
if (valti.classinfo.name.length == 18 &&
valti.classinfo.name[9..18] == "Invariant")
if (typeid(valti).name.length == 18 &&
typeid(valti).name[9..18] == "Invariant")
valti = (cast(TypeInfo_Invariant)valti).next;
else if (valti.classinfo.name.length == 14 &&
valti.classinfo.name[9..14] == "Const")
else if (typeid(valti).name.length == 14 &&
typeid(valti).name[9..14] == "Const")
valti = (cast(TypeInfo_Const)valti).next;
else
break;
Expand Down Expand Up @@ -4991,9 +4991,9 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)

static Mangle getMan(TypeInfo ti)
{
auto m = cast(Mangle)ti.classinfo.name[9];
if (ti.classinfo.name.length == 20 &&
ti.classinfo.name[9..20] == "StaticArray")
auto m = cast(Mangle)typeid(ti).name[9];
if (typeid(ti).name.length == 20 &&
typeid(ti).name[9..20] == "StaticArray")
m = cast(Mangle)'G';
return m;
}
Expand All @@ -5012,7 +5012,7 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
auto tiSave = ti;
auto mSave = m;
ti = valti;
//printf("\n%.*s\n", valti.classinfo.name.length, valti.classinfo.name.ptr);
//printf("\n%.*s\n", typeid(valti).name.length, typeid(valti).name.ptr);
m = getMan(valti);
while (len--)
{
Expand Down Expand Up @@ -5280,12 +5280,12 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)

case Mangle.Tarray:
int mi = 10;
if (ti.classinfo.name.length == 14 &&
ti.classinfo.name[9..14] == "Array")
if (typeid(ti).name.length == 14 &&
typeid(ti).name[9..14] == "Array")
{ // array of non-primitive types
TypeInfo tn = (cast(TypeInfo_Array)ti).next;
tn = skipCI(tn);
switch (cast(Mangle)tn.classinfo.name[9])
switch (cast(Mangle)typeid(tn).name[9])
{
case Mangle.Tchar: goto LarrayChar;
case Mangle.Twchar: goto LarrayWchar;
Expand All @@ -5297,8 +5297,8 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
putArray(va.ptr, va.length, tn);
return;
}
if (ti.classinfo.name.length == 25 &&
ti.classinfo.name[9..25] == "AssociativeArray")
if (typeid(ti).name.length == 25 &&
typeid(ti).name[9..25] == "AssociativeArray")
{ // associative array
ubyte[long] vaa = va_arg!(ubyte[long])(argptr);
putAArray(vaa,
Expand All @@ -5309,7 +5309,7 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)

while (1)
{
m2 = cast(Mangle)ti.classinfo.name[mi];
m2 = cast(Mangle)typeid(ti).name[mi];
switch (m2)
{
case Mangle.Tchar:
Expand Down Expand Up @@ -5353,13 +5353,13 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)

case Mangle.Ttypedef:
ti = (cast(TypeInfo_Typedef)ti).base;
m = cast(Mangle)ti.classinfo.name[9];
m = cast(Mangle)typeid(ti).name[9];
formatArg(fc);
return;

case Mangle.Tenum:
ti = (cast(TypeInfo_Enum)ti).base;
m = cast(Mangle)ti.classinfo.name[9];
m = cast(Mangle)typeid(ti).name[9];
formatArg(fc);
return;

Expand Down Expand Up @@ -5545,7 +5545,7 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
for (int j = 0; j < arguments.length; )
{
ti = arguments[j++];
//printf("arg[%d]: '%.*s' %d\n", j, ti.classinfo.name.length, ti.classinfo.name.ptr, ti.classinfo.name.length);
//printf("arg[%d]: '%.*s' %d\n", j, typeid(ti).name.length, typeid(ti).name.ptr, typeid(ti).name.length);
//ti.print();

flags = 0;
Expand All @@ -5556,19 +5556,19 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
int mi = 9;
do
{
if (ti.classinfo.name.length <= mi)
if (typeid(ti).name.length <= mi)
goto Lerror;
m = cast(Mangle)ti.classinfo.name[mi++];
m = cast(Mangle)typeid(ti).name[mi++];
} while (m == Mangle.Tconst || m == Mangle.Timmutable);

if (m == Mangle.Tarray)
{
if (ti.classinfo.name.length == 14 &&
ti.classinfo.name[9..14] == "Array")
if (typeid(ti).name.length == 14 &&
typeid(ti).name[9..14] == "Array")
{
TypeInfo tn = (cast(TypeInfo_Array)ti).next;
tn = skipCI(tn);
switch (cast(Mangle)tn.classinfo.name[9])
switch (cast(Mangle)typeid(tn).name[9])
{
case Mangle.Tchar:
case Mangle.Twchar:
Expand All @@ -5581,7 +5581,7 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
}
}
L1:
Mangle m2 = cast(Mangle)ti.classinfo.name[mi];
Mangle m2 = cast(Mangle)typeid(ti).name[mi];
string fmt; // format string
wstring wfmt;
dstring dfmt;
Expand Down Expand Up @@ -5650,7 +5650,7 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
if (j == arguments.length)
throw new FormatException("too few arguments");
ti = arguments[j++];
m = cast(Mangle)ti.classinfo.name[9];
m = cast(Mangle)typeid(ti).name[9];
if (m != Mangle.Tint)
throw new FormatException("int argument expected");
return va_arg!(int)(argptr);
Expand Down Expand Up @@ -5738,7 +5738,7 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
mi = 9;
do
{
m = cast(Mangle)ti.classinfo.name[mi++];
m = cast(Mangle)typeid(ti).name[mi++];
} while (m == Mangle.Tconst || m == Mangle.Timmutable);

if (c > 0x7F) // if UTF sequence
Expand Down
4 changes: 2 additions & 2 deletions std/parallelism.d
View file
Expand Up @@ -1431,7 +1431,7 @@ public:
*/
this(size_t nWorkers) @trusted
{
synchronized(TaskPool.classinfo)
synchronized(typeid(TaskPool))
{
instanceStartIndex = nextInstanceIndex;

Expand Down Expand Up @@ -3272,7 +3272,7 @@ terminating the main thread.

if(!initialized)
{
synchronized(TaskPool.classinfo)
synchronized(typeid(TaskPool))
{
if(!pool)
{
Expand Down

0 comments on commit 19bed56

Please sign in to comment.