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

Improved handling of strings in const enum payloads

Browse source
This commit is contained in:
Brian Fiete 2022-02-14 12:30:24 -05:00
parent 63ef0fed7a
commit c9f1e37da7
5 changed files with 121 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
IDEHelper/Compiler/BfIRBuilder.cpp
View file

@ -971,6 +971,7 @@ bool BfIRConstHolder::WriteConstant(BfIRValue val, void* ptr, BfType* type)
case BfTypeCode_Int32:
case BfTypeCode_UInt32:
case BfTypeCode_Char32:
case BfTypeCode_StringId:
*(int32*)ptr = constant->mInt32;
return true;
case BfTypeCode_Int64:
@ -1003,7 +1004,7 @@ bool BfIRConstHolder::WriteConstant(BfIRValue val, void* ptr, BfType* type)
return false;
}
return false;
return true;
}
else
{
@ -1055,6 +1056,24 @@ bool BfIRConstHolder::WriteConstant(BfIRValue val, void* ptr, BfType* type)
return WriteConstant(BfIRValue(BfIRValueFlags_Const, constBitCast->mTarget), ptr, type);
}
if (constant->mConstType == BfConstType_GlobalVar)
{
auto constGV = (BfGlobalVar*)constant;
const char* strDataPrefix = "__bfStrData";
if (strncmp(constGV->mName, strDataPrefix, strlen(strDataPrefix)) == 0)
{
*(int32*)ptr = atoi(constGV->mName + strlen(strDataPrefix));
return true;
}
const char* strObjPrefix = "__bfStrObj";
if (strncmp(constGV->mName, strObjPrefix, strlen(strObjPrefix)) == 0)
{
*(int32*)ptr = atoi(constGV->mName + strlen(strObjPrefix));
return true;
}
}
return false;
}
@ -1077,6 +1096,7 @@ BfIRValue BfIRConstHolder::ReadConstant(void* ptr, BfType* type)
case BfTypeCode_Int32:
case BfTypeCode_UInt32:
case BfTypeCode_Char32:
case BfTypeCode_StringId:
return CreateConst(primType->mTypeDef->mTypeCode, *(int32*)ptr);
case BfTypeCode_Int64:
case BfTypeCode_UInt64:
@ -1097,7 +1117,7 @@ BfIRValue BfIRConstHolder::ReadConstant(void* ptr, BfType* type)
return BfIRValue();
}
}
if (type->IsTypedPrimitive())
{
return ReadConstant(ptr, type->GetUnderlyingType());
@ -1164,6 +1184,11 @@ BfIRValue BfIRConstHolder::ReadConstant(void* ptr, BfType* type)
irType.mId = type->mTypeId;
return CreateConstAgg(irType, irValues);
}
if (type->IsInstanceOf(mModule->mCompiler->mStringTypeDef))
{
return CreateConst(BfTypeCode_StringId, *(int32*)ptr);
}
return BfIRValue();
}