Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-11 21:04:10 +02:00
Code Activity

Fixed some ToString issues

Browse source
This commit is contained in:
Brian Fiete 2020-07-11 16:21:28 -07:00 • committed by James Orson
parent 5f3329e121
commit ac40bbd12c
2 changed files with 32043 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

61
BeefLibs/corlib/src/Type.bf
View file

@ -748,11 +748,26 @@ namespace System.Reflection
if (mTypeFlags.HasFlag(TypeFlags.Tuple)) if (mTypeFlags.HasFlag(TypeFlags.Tuple))
{ {
strBuffer.Append('('); strBuffer.Append('(');
for (int fieldIdx < mFieldDataCount) if (mFieldDataCount > 0)
{ {
if (fieldIdx > 0) for (int fieldIdx < mFieldDataCount)
strBuffer.Append(", "); {
GetType(mFieldDataPtr[fieldIdx].[Friend]mFieldTypeId).GetFullName(strBuffer); if (fieldIdx > 0)
strBuffer.Append(", ");
GetType(mFieldDataPtr[fieldIdx].[Friend]mFieldTypeId).GetFullName(strBuffer);
}
}
else if ((mTypeFlags.HasFlag(.Splattable)) && (mFieldDataPtr != null))
{
let splatData = (FieldSplatData*)mFieldDataPtr;
for (int i < 3)
{
if (splatData.mSplatTypes[i] == 0)
break;
if (i > 0)
strBuffer.Append(", ");
GetType(splatData.mSplatTypes[i]).GetFullName(strBuffer);
}
} }
strBuffer.Append(')'); strBuffer.Append(')');
} }
@ -764,19 +779,34 @@ namespace System.Reflection
} }
else else
{ {
if (mOuterType != 0) if ((mName != null) && (mName != ""))
{ {
GetType(mOuterType).GetFullName(strBuffer); if (mOuterType != 0)
strBuffer.Append("."); {
} let outerType = GetType(mOuterType);
else if (outerType != null)
{ outerType.GetFullName(strBuffer);
if (!String.IsNullOrEmpty(mNamespace)) else
strBuffer.Append(mNamespace, "."); strBuffer.Append("???");
} strBuffer.Append(".");
}
else
{
if (!String.IsNullOrEmpty(mNamespace))
strBuffer.Append(mNamespace, ".");
}
if (mName != null)
strBuffer.Append(mName); strBuffer.Append(mName);
}
else if (mTypeFlags.HasFlag(.Delegate))
strBuffer.Append("delegate");
else if (mTypeFlags.HasFlag(.Function))
strBuffer.Append("function");
else if (mBaseType != 0)
{
strBuffer.Append("derivative of ");
GetType(mBaseType).GetFullName(strBuffer);
}
} }
} }
@ -1009,7 +1039,8 @@ namespace System.Reflection
// //
WantsMark = 0x8000, WantsMark = 0x8000,
Delegate = 0x10000, Delegate = 0x10000,
HasDestructor = 0x20000, Function = 0x20000,
HasDestructor = 0x40000,
} }
public enum FieldFlags : uint16 public enum FieldFlags : uint16

31997
IDE/mintest/src/roboto_font.bf Normal file
View file

File diff suppressed because it is too large Load diff