frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto parameters in lambdas

This commit is contained in:
drmortalwombat 2023-09-14 10:30:52 +02:00
parent 64b3bfa30f
commit 0e6cb5557a
5 changed files with 258 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
oscar64/Declaration.cpp
View File

@ -883,7 +883,7 @@ Expression* Expression::ConstantFold(Errors * errors, LinkerSection * dataSectio
Declaration::Declaration(const Location& loc, DecType type) Declaration::Declaration(const Location& loc, DecType type)
: mLocation(loc), mEndLocation(loc), mType(type), mScope(nullptr), mData(nullptr), mIdent(nullptr), mQualIdent(nullptr), mMangleIdent(nullptr), : mLocation(loc), mEndLocation(loc), mType(type), mScope(nullptr), mData(nullptr), mIdent(nullptr), mQualIdent(nullptr), mMangleIdent(nullptr),
mSize(0), mOffset(0), mFlags(0), mComplexity(0), mLocalSize(0), mSize(0), mOffset(0), mFlags(0), mComplexity(0), mLocalSize(0), mNumVars(0),
mBase(nullptr), mParams(nullptr), mValue(nullptr), mNext(nullptr), mPrev(nullptr), mBase(nullptr), mParams(nullptr), mValue(nullptr), mNext(nullptr), mPrev(nullptr),
mConst(nullptr), mMutable(nullptr), mConst(nullptr), mMutable(nullptr),
mDefaultConstructor(nullptr), mDestructor(nullptr), mCopyConstructor(nullptr), mCopyAssignment(nullptr), mMoveConstructor(nullptr), mMoveAssignment(nullptr), mDefaultConstructor(nullptr), mDestructor(nullptr), mCopyConstructor(nullptr), mCopyAssignment(nullptr), mMoveConstructor(nullptr), mMoveAssignment(nullptr),
@ -964,6 +964,11 @@ Declaration* Declaration::NonRefBase(void)
return this; return this;
} }
bool Declaration::IsAuto(void) const
{
return (mType == DT_TYPE_AUTO || IsReference() && mBase->mType == DT_TYPE_AUTO);
}
Declaration* Declaration::DeduceAuto(Declaration * dec) Declaration* Declaration::DeduceAuto(Declaration * dec)
{ {
if (mType == DT_TYPE_AUTO || IsReference() && mBase->mType == DT_TYPE_AUTO) if (mType == DT_TYPE_AUTO || IsReference() && mBase->mType == DT_TYPE_AUTO)
@ -1114,6 +1119,61 @@ const Ident* Declaration::MangleIdent(void)
return mMangleIdent; return mMangleIdent;
} }
Declaration* Declaration::ExpandTemplate(DeclarationScope* scope)
{
if (mType == DT_CONST_FUNCTION)
{
Declaration* dec = this->Clone();
dec->mBase = dec->mBase->ExpandTemplate(scope);
return dec;
}
else if (mType == DT_TYPE_FUNCTION)
{
Declaration* dec = this->Clone();
dec->mParams = mParams ? mParams->ExpandTemplate(scope) : nullptr;
dec->mBase = mBase->ExpandTemplate(scope);
Declaration* pdec = dec->mParams;
if (pdec)
{
int vi = pdec->mVarIndex;
while (pdec)
{
pdec->mVarIndex = vi;
vi += pdec->mSize;
pdec = pdec->mNext;
}
}
return dec;
}
else if (mType == DT_ARGUMENT)
{
Declaration* ndec = mNext ? mNext->ExpandTemplate(scope) : nullptr;
Declaration* bdec = mBase->ExpandTemplate(scope);
if (ndec != mNext || bdec != mBase)
{
Declaration* dec = this->Clone();
dec->mBase = bdec;
dec->mSize = bdec->mSize;
dec->mNext = ndec;
return dec;
}
}
else if (mType == DT_TYPE_REFERENCE || mType == DT_TYPE_POINTER || mType == DT_TYPE_RVALUEREF)
{
Declaration* bdec = mBase->ExpandTemplate(scope);
if (bdec != mBase)
{
Declaration* dec = this->Clone();
dec->mBase = bdec;
return dec;
}
}
else if (mType == DT_TYPE_TEMPLATE)
return scope->Lookup(mIdent);
return this;
}
bool Declaration::ResolveTemplate(Expression* pexp, Declaration* tdec) bool Declaration::ResolveTemplate(Expression* pexp, Declaration* tdec)
{ {
Declaration* pdec = tdec->mBase->mParams; Declaration* pdec = tdec->mBase->mParams;

30
oscar64/Declaration.h
View File

@ -92,26 +92,27 @@ static const uint64 DTF_TEMPORARY = (1ULL << 29);
static const uint64 DTF_COMPLETED = (1ULL << 30); static const uint64 DTF_COMPLETED = (1ULL << 30);
static const uint64 DTF_CONSTEXPR = (1ULL << 31); static const uint64 DTF_CONSTEXPR = (1ULL << 31);
static const uint64 DTF_FUNC_VARIABLE = (1ULL << 32); static const uint64 DTF_AUTO_TEMPLATE = (1ULL << 32);
static const uint64 DTF_FUNC_ASSEMBLER = (1ULL << 33);
static const uint64 DTF_FUNC_RECURSIVE = (1ULL << 34);
static const uint64 DTF_FUNC_ANALYZING = (1ULL << 35);
static const uint64 DTF_FUNC_CONSTEXPR = (1ULL << 36); static const uint64 DTF_FUNC_VARIABLE = (1ULL << 36);
static const uint64 DTF_FUNC_INTRSAVE = (1ULL << 37); static const uint64 DTF_FUNC_ASSEMBLER = (1ULL << 37);
static const uint64 DTF_FUNC_INTRCALLED = (1ULL << 38); static const uint64 DTF_FUNC_RECURSIVE = (1ULL << 38);
static const uint64 DTF_FUNC_PURE = (1ULL << 39); static const uint64 DTF_FUNC_ANALYZING = (1ULL << 39);
static const uint64 DTF_FPARAM_CONST = (1ULL << 40); static const uint64 DTF_FUNC_CONSTEXPR = (1ULL << 40);
static const uint64 DTF_FPARAM_NOCONST = (1ULL << 41); static const uint64 DTF_FUNC_INTRSAVE = (1ULL << 41);
static const uint64 DTF_VAR_ADDRESS = (1ULL << 42); static const uint64 DTF_FUNC_INTRCALLED = (1ULL << 42);
static const uint64 DTF_FUNC_PURE = (1ULL << 43);
static const uint64 DTF_FUNC_THIS = (1ULL << 43); static const uint64 DTF_FPARAM_CONST = (1ULL << 44);
static const uint64 DTF_FPARAM_NOCONST = (1ULL << 45);
static const uint64 DTF_VAR_ADDRESS = (1ULL << 46);
static const uint64 DTF_FUNC_THIS = (1ULL << 47);
static const uint64 DTF_VAR_ALIASING = (1ULL << 48); static const uint64 DTF_VAR_ALIASING = (1ULL << 48);
class Declaration; class Declaration;
enum ScopeLevel enum ScopeLevel
@ -311,6 +312,7 @@ public:
Declaration* BuildConstRValueRef(const Location& loc); Declaration* BuildConstRValueRef(const Location& loc);
Declaration* NonRefBase(void); Declaration* NonRefBase(void);
Declaration* DeduceAuto(Declaration* dec); Declaration* DeduceAuto(Declaration* dec);
bool IsAuto(void) const;
DecType ValueType(void) const; DecType ValueType(void) const;
@ -318,6 +320,8 @@ public:
bool ResolveTemplate(Declaration* fdec, Declaration * tdec); bool ResolveTemplate(Declaration* fdec, Declaration * tdec);
bool ResolveTemplate(Expression* pexp, Declaration* tdec); bool ResolveTemplate(Expression* pexp, Declaration* tdec);
Declaration* ExpandTemplate(DeclarationScope* scope);
const Ident* MangleIdent(void); const Ident* MangleIdent(void);
int Stride(void) const; int Stride(void) const;

2
oscar64/GlobalAnalyzer.cpp
View File

@ -159,7 +159,7 @@ void GlobalAnalyzer::AutoInline(void)
dec = dec->mNext; dec = dec->mNext;
} }
int cost = (f->mComplexity - 20 * nparams); int cost = (f->mComplexity - 20 * nparams - 20);
// printf("CHEK INLINING %s %d * (%d - 1)\n", f->mIdent->mString, cost, f->mCallers.Size()); // printf("CHEK INLINING %s %d * (%d - 1)\n", f->mIdent->mString, cost, f->mCallers.Size());

215
oscar64/Parser.cpp
View File

@ -2142,7 +2142,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
cdec->mVarIndex = -1; cdec->mVarIndex = -1;
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
cdec->mValue = new Expression(mScanner->mLocation, EX_VOID); cdec->mValue = new Expression(mScanner->mLocation, EX_VOID);
} }
@ -2186,7 +2185,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
cdec->mVarIndex = -1; cdec->mVarIndex = -1;
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
cdec->mValue = new Expression(mScanner->mLocation, EX_VOID); cdec->mValue = new Expression(mScanner->mLocation, EX_VOID);
} }
@ -2355,7 +2353,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
} }
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
} }
} }
@ -2528,8 +2525,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
} }
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
} }
} }
@ -2576,7 +2571,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
cdec->mVarIndex = -1; cdec->mVarIndex = -1;
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE); Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE);
pexp->mDecType = vthis; pexp->mDecType = vthis;
@ -2653,7 +2647,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
cdec->mVarIndex = -1; cdec->mVarIndex = -1;
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE); Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE);
pexp->mDecType = vthis; pexp->mDecType = vthis;
@ -2739,7 +2732,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
cdec->mVarIndex = -1; cdec->mVarIndex = -1;
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE); Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE);
pexp->mDecType = vthis; pexp->mDecType = vthis;
@ -2843,7 +2835,6 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
cdec->mVarIndex = -1; cdec->mVarIndex = -1;
cdec->mFlags |= DTF_DEFINED; cdec->mFlags |= DTF_DEFINED;
cdec->mNumVars = mLocalIndex;
Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE); Expression* pexp = new Expression(mScanner->mLocation, EX_VARIABLE);
pexp->mDecType = vthis; pexp->mDecType = vthis;
@ -3451,8 +3442,10 @@ void Parser::ParseVariableInit(Declaration* ndec)
{ {
ndec->mValue = pexp; ndec->mValue = pexp;
} }
else else if (pexp)
mErrors->Error(pexp->mLocation, EERR_INCOMPATIBLE_TYPES, "Can not initialize variable with expression", ndec->mIdent); mErrors->Error(pexp->mLocation, EERR_INCOMPATIBLE_TYPES, "Can not initialize variable with expression", ndec->mIdent);
else
mErrors->Error(mScanner->mLocation, EERR_INCOMPATIBLE_TYPES, "Can not initialize variable with expression", ndec->mIdent);
} }
Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool expression, Declaration* pthis, Declaration* ptempl) Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool expression, Declaration* pthis, Declaration* ptempl)
@ -4028,6 +4021,10 @@ Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool ex
if (mCompilerOptions & COPT_NATIVE) if (mCompilerOptions & COPT_NATIVE)
ndec->mFlags |= DTF_NATIVE; ndec->mFlags |= DTF_NATIVE;
Declaration* ntdec = FunctionAutoParamsToTemplate(ndec);
if (ntdec)
return ntdec;
} }
if (ndec->mIdent) if (ndec->mIdent)
@ -4603,6 +4600,7 @@ Expression* Parser::ParseLambdaExpression(void)
Declaration* fdec = new Declaration(mScanner->mLocation, DT_CONST_FUNCTION); Declaration* fdec = new Declaration(mScanner->mLocation, DT_CONST_FUNCTION);
fdec->mIdent = Ident::Unique("operator()"); fdec->mIdent = Ident::Unique("operator()");
fdec->mQualIdent = cdec->mScope->Mangle(fdec->mIdent); fdec->mQualIdent = cdec->mScope->Mangle(fdec->mIdent);
fdec->mCompilerOptions = mCompilerOptions;
cdec->mScope->Insert(fdec->mIdent, fdec); cdec->mScope->Insert(fdec->mIdent, fdec);
Declaration* pdec = new Declaration(mScanner->mLocation, DT_ARGUMENT); Declaration* pdec = new Declaration(mScanner->mLocation, DT_ARGUMENT);
@ -4727,6 +4725,7 @@ Expression* Parser::ParseLambdaExpression(void)
fdec->mVarIndex = -1; fdec->mVarIndex = -1;
int li = mLocalIndex; int li = mLocalIndex;
DeclarationScope * oscope = mCaptureScope; DeclarationScope * oscope = mCaptureScope;
@ -4735,6 +4734,12 @@ Expression* Parser::ParseLambdaExpression(void)
while (mScope->mLevel >= SLEVEL_NAMESPACE) while (mScope->mLevel >= SLEVEL_NAMESPACE)
mScope = mScope->mParent; mScope = mScope->mParent;
Declaration* tfdec = FunctionAutoParamsToTemplate(fdec);
if (tfdec)
{
fdec = tfdec;
}
else
fdec->mValue = ParseFunction(fdec->mBase); fdec->mValue = ParseFunction(fdec->mBase);
mScope = mCaptureScope; mScope = mCaptureScope;
@ -5548,9 +5553,7 @@ int Parser::OverloadDistance(Declaration* fdec, Expression* pexp)
{ {
Declaration* tdec = new Declaration(mScanner->mLocation, DT_TEMPLATE); Declaration* tdec = new Declaration(mScanner->mLocation, DT_TEMPLATE);
tdec->mScope = new DeclarationScope(nullptr, SLEVEL_TEMPLATE); tdec->mScope = new DeclarationScope(nullptr, SLEVEL_TEMPLATE);
if (tdec->CanResolveTemplate(pexp, fdec)) if (!tdec->CanResolveTemplate(pexp, fdec))
return 16;
else
return NOOVERLOAD; return NOOVERLOAD;
} }
@ -5576,27 +5579,31 @@ int Parser::OverloadDistance(Declaration* fdec, Expression* pexp)
if (etype->mType == DT_TYPE_REFERENCE) if (etype->mType == DT_TYPE_REFERENCE)
etype = etype->mBase; etype = etype->mBase;
if (ptype->mType == DT_TYPE_INTEGER && etype->mType == DT_TYPE_INTEGER) if (ptype->mType == DT_TYPE_TEMPLATE)
{
dist += 1;
}
else if (ptype->mType == DT_TYPE_INTEGER && etype->mType == DT_TYPE_INTEGER)
{ {
if (ptype->mSize == etype->mSize) if (ptype->mSize == etype->mSize)
{ {
if ((ptype->mFlags & DTF_SIGNED) == (etype->mFlags & DTF_SIGNED)) if ((ptype->mFlags & DTF_SIGNED) == (etype->mFlags & DTF_SIGNED))
dist += 0; dist += 0;
else else
dist += 4; dist += 8;
} }
else if (ptype->mSize > etype->mSize) else if (ptype->mSize > etype->mSize)
{ {
if (ptype->mFlags & DTF_SIGNED) if (ptype->mFlags & DTF_SIGNED)
{ {
dist += 1; dist += 2;
} }
else if (etype->mFlags & DTF_SIGNED) else if (etype->mFlags & DTF_SIGNED)
{ {
dist += 4; dist += 8;
} }
else else
dist += 1; dist += 2;
} }
else if (ex->mType == EX_CONSTANT && ex->mDecValue->mType == DT_CONST_INTEGER) else if (ex->mType == EX_CONSTANT && ex->mDecValue->mType == DT_CONST_INTEGER)
{ {
@ -5605,53 +5612,53 @@ int Parser::OverloadDistance(Declaration* fdec, Expression* pexp)
if (ptype->mFlags & DTF_SIGNED) if (ptype->mFlags & DTF_SIGNED)
{ {
if (v >= -128 && v <= 127) if (v >= -128 && v <= 127)
dist += 1; dist += 2;
else if (ptype->mSize >= 2 && v >= -32768 && v <= 32767) else if (ptype->mSize >= 2 && v >= -32768 && v <= 32767)
dist += 1; dist += 2;
else if (ptype->mSize == 4) else if (ptype->mSize == 4)
dist += 1; dist += 2;
else else
dist += 16; dist += 32;
} }
else if (v >= 0) else if (v >= 0)
{ {
if (v <= 255) if (v <= 255)
dist += 1; dist += 2;
else if (ptype->mSize >= 2 && v <= 65535) else if (ptype->mSize >= 2 && v <= 65535)
dist += 1; dist += 2;
else if (ptype->mSize == 4) else if (ptype->mSize == 4)
dist += 1; dist += 2;
else else
dist += 16; dist += 32;
} }
else else
dist += 16; dist += 32;
} }
else else
dist += 16; dist += 32;
} }
else if (ptype->mType == DT_TYPE_FLOAT && etype->mType == DT_TYPE_FLOAT) else if (ptype->mType == DT_TYPE_FLOAT && etype->mType == DT_TYPE_FLOAT)
dist += 0; dist += 0;
else if (ptype->mType == DT_TYPE_INTEGER && etype->mType == DT_TYPE_FLOAT) else if (ptype->mType == DT_TYPE_INTEGER && etype->mType == DT_TYPE_FLOAT)
dist += 8; dist += 16;
else if (ptype->mType == DT_TYPE_FLOAT && etype->mType == DT_TYPE_INTEGER) else if (ptype->mType == DT_TYPE_FLOAT && etype->mType == DT_TYPE_INTEGER)
dist += 4; dist += 8;
else if (ptype->IsSame(ex->mDecType)) else if (ptype->IsSame(ex->mDecType))
; ;
else if (CanCoerceExpression(ex, ptype)) else if (CanCoerceExpression(ex, ptype))
{ {
dist += 512; dist += 512;
if (ptype->mType == DT_TYPE_REFERENCE) if (ptype->mType == DT_TYPE_REFERENCE)
dist += 4; dist += 8;
else if (ptype->mType == DT_TYPE_RVALUEREF) else if (ptype->mType == DT_TYPE_RVALUEREF)
dist += 2; dist += 4;
} }
else if (ptype->mType == DT_TYPE_REFERENCE && ptype->mBase->mType == DT_TYPE_STRUCT && etype->mType == DT_TYPE_STRUCT) else if (ptype->mType == DT_TYPE_REFERENCE && ptype->mBase->mType == DT_TYPE_STRUCT && etype->mType == DT_TYPE_STRUCT)
{ {
if (ex->IsLValue()) if (ex->IsLValue())
dist += 2;
else if (ptype->mBase->mFlags & DTF_CONST)
dist += 4; dist += 4;
else if (ptype->mBase->mFlags & DTF_CONST)
dist += 8;
else else
return NOOVERLOAD; return NOOVERLOAD;
@ -5668,13 +5675,13 @@ int Parser::OverloadDistance(Declaration* fdec, Expression* pexp)
if ((etype->mFlags & DTF_CONST) && !(ptype->mBase->mFlags & DTF_CONST)) if ((etype->mFlags & DTF_CONST) && !(ptype->mBase->mFlags & DTF_CONST))
return NOOVERLOAD; return NOOVERLOAD;
dist += 16 * ncast; dist += 32 * ncast;
} }
else else
return NOOVERLOAD; return NOOVERLOAD;
} }
else if (ptype->mType == DT_TYPE_POINTER && (etype->mType == DT_TYPE_ARRAY || etype->mType == DT_TYPE_POINTER) && ptype->mBase->IsSameMutable(etype->mBase)) else if (ptype->mType == DT_TYPE_POINTER && (etype->mType == DT_TYPE_ARRAY || etype->mType == DT_TYPE_POINTER) && ptype->mBase->IsSameMutable(etype->mBase))
dist += 1; dist += 2;
else if (ptype->mType == DT_TYPE_POINTER && etype->mType == DT_TYPE_FUNCTION && ptype->mBase->IsSame(etype)) else if (ptype->mType == DT_TYPE_POINTER && etype->mType == DT_TYPE_FUNCTION && ptype->mBase->IsSame(etype))
dist += 0; dist += 0;
else if (ptype->mType == DT_TYPE_POINTER && etype->mType == DT_TYPE_POINTER && etype->mBase->mType == DT_TYPE_VOID) else if (ptype->mType == DT_TYPE_POINTER && etype->mType == DT_TYPE_POINTER && etype->mBase->mType == DT_TYPE_VOID)
@ -5683,14 +5690,14 @@ int Parser::OverloadDistance(Declaration* fdec, Expression* pexp)
dist += 256; dist += 256;
else if (ptype->mType == DT_TYPE_RVALUEREF && ptype->mBase->IsSameMutable(etype) && ex->IsRValue()) else if (ptype->mType == DT_TYPE_RVALUEREF && ptype->mBase->IsSameMutable(etype) && ex->IsRValue())
{ {
dist += 1; dist += 2;
} }
else if (ptype->mType == DT_TYPE_REFERENCE && ptype->mBase->IsSameMutable(etype)) else if (ptype->mType == DT_TYPE_REFERENCE && ptype->mBase->IsSameMutable(etype))
{ {
if (ex->IsLValue()) if (ex->IsLValue())
dist += 2;
else if (ptype->mBase->mFlags & DTF_CONST)
dist += 4; dist += 4;
else if (ptype->mBase->mFlags & DTF_CONST)
dist += 8;
else else
return NOOVERLOAD; return NOOVERLOAD;
} }
@ -8337,7 +8344,6 @@ Expression* Parser::ParseSwitchStatement(void)
Declaration* Parser::ParseTemplateExpansion(Declaration* tmpld, Declaration* expd) Declaration* Parser::ParseTemplateExpansion(Declaration* tmpld, Declaration* expd)
{ {
Declaration * tdec = new Declaration(mScanner->mLocation, DT_TEMPLATE); Declaration * tdec = new Declaration(mScanner->mLocation, DT_TEMPLATE);
tdec->mScope = new DeclarationScope(nullptr, SLEVEL_TEMPLATE); tdec->mScope = new DeclarationScope(nullptr, SLEVEL_TEMPLATE);
@ -8436,6 +8442,34 @@ Declaration* Parser::ParseTemplateExpansion(Declaration* tmpld, Declaration* exp
tmpld->mNext = tdec; tmpld->mNext = tdec;
p->mTemplateScope = tdec->mScope; p->mTemplateScope = tdec->mScope;
if (tmpld->mFlags & DTF_AUTO_TEMPLATE)
{
Declaration * ndec = tmpld->mBase->ExpandTemplate(tdec->mScope);
Declaration* pdec = tmpld->mBase;
if (pdec)
{
Declaration* pcdec = nullptr;
while (pdec && !ndec->mBase->IsSameParams(pdec->mBase))
{
pcdec = pdec;
pdec = pdec->mNext;
}
if (!pdec)
pcdec->mNext = ndec;
}
tdec->mBase = ndec;
ndec->mValue = p->ParseFunction(ndec->mBase);
ndec->mFlags |= DTF_DEFINED;
ndec->mIdent = ndec->mIdent->Mangle(tdec->mScope->mName->mString);
ndec->mQualIdent = ndec->mQualIdent->Mangle(tdec->mScope->mName->mString);
}
else
tdec->mBase = p->ParseDeclaration(nullptr, true, false, nullptr, tdec); tdec->mBase = p->ParseDeclaration(nullptr, true, false, nullptr, tdec);
p->mTemplateScope = nullptr; p->mTemplateScope = nullptr;
@ -8503,6 +8537,107 @@ void Parser::CompleteTemplateExpansion(Declaration* tmpld)
} }
Declaration* Parser::FunctionAutoParamsToTemplate(Declaration* fdec)
{
Declaration* pdec = fdec->mBase->mParams;
while (pdec && !pdec->mBase->IsAuto())
pdec = pdec->mNext;
if (pdec)
{
Declaration* tdec = new Declaration(fdec->mLocation, DT_TEMPLATE);
tdec->mParser = this->Clone();
tdec->mScope = new DeclarationScope(nullptr, SLEVEL_TEMPLATE);
Declaration* ppdec = nullptr;
int ntp = 0;
pdec = fdec->mBase->mParams;
while (pdec)
{
Declaration* ptdec = nullptr;
if (pdec->mBase->mType == DT_TYPE_AUTO)
{
ptdec = new Declaration(mScanner->mLocation, DT_TYPE_TEMPLATE);
pdec->mBase = ptdec;
}
else if (pdec->mBase->IsReference() && pdec->mBase->mBase->mType == DT_TYPE_AUTO)
{
ptdec = new Declaration(mScanner->mLocation, DT_TYPE_TEMPLATE);
pdec->mBase->mBase = ptdec;
}
if (ptdec)
{
ptdec->mIdent = Ident::Unique("T" + ntp++);
tdec->mScope->Insert(ptdec->mIdent, ptdec);
ptdec->mFlags |= DTF_DEFINED;
if (ppdec)
ppdec->mNext = ptdec;
else
tdec->mParams = ptdec;
ppdec = ptdec;
}
pdec = pdec->mNext;
}
fdec->mCompilerOptions = mCompilerOptions;
fdec->mBase->mCompilerOptions = mCompilerOptions;
tdec->mBase = fdec;
fdec->mTemplate = tdec;
mScanner->BeginRecord();
if (ConsumeTokenIf(TK_OPEN_BRACE))
{
int qdepth = 1;
while (qdepth)
{
if (ConsumeTokenIf(TK_OPEN_BRACE))
qdepth++;
else if (ConsumeTokenIf(TK_CLOSE_BRACE))
qdepth--;
else
mScanner->NextToken();
}
}
tdec->mTokens = mScanner->CompleteRecord();
tdec->mIdent = tdec->mBase->mIdent;
tdec->mQualIdent = tdec->mBase->mQualIdent;
tdec->mScope->mName = tdec->mQualIdent;
tdec->mFlags |= DTF_AUTO_TEMPLATE;
if (tdec->mQualIdent == mScope->Mangle(tdec->mIdent))
mScope->Insert(tdec->mIdent, tdec->mBase);
Declaration* pdec = mCompilationUnits->mScope->Insert(tdec->mQualIdent, tdec->mBase);
if (pdec)
{
Declaration* ppdec = pdec;
while (pdec && !pdec->IsSameTemplate(tdec->mBase))
{
ppdec = pdec;
pdec = pdec->mNext;
}
if (!pdec)
{
ppdec->mNext = tdec->mBase;
tdec->mBase->mNext = nullptr;
}
}
return fdec;
}
else
return nullptr;
}
void Parser::ParseTemplateDeclaration(void) void Parser::ParseTemplateDeclaration(void)
{ {
ConsumeToken(TK_LESS_THAN); ConsumeToken(TK_LESS_THAN);

2
oscar64/Parser.h
View File

@ -106,6 +106,8 @@ protected:
void ExpandFunctionCallTemplate(Expression* exp); void ExpandFunctionCallTemplate(Expression* exp);
void ParseTemplateDeclaration(void); void ParseTemplateDeclaration(void);
Declaration* FunctionAutoParamsToTemplate(Declaration* fdec);
Declaration* ParseTemplateExpansion(Declaration* tmpld, Declaration* expd); Declaration* ParseTemplateExpansion(Declaration* tmpld, Declaration* expd);
void CompleteTemplateExpansion(Declaration* tmpld); void CompleteTemplateExpansion(Declaration* tmpld);