Fixed some label issues

Added PROC queueing (to prevent symbol
This commit is contained in:
David Anderson
2004-08-12 16:31:50 +00:00
parent 796a7ad4d7
commit 2a00a62bcb
13 changed files with 175 additions and 50 deletions

View File

@ -22,6 +22,18 @@
#include "amxasm.h"
ProcMngr::ProcMngr()
{
CError = 0;
printf("Instantiated without a compiler!\n");
assert(CError);
}
ProcMngr::ProcMngr(ErrorMngr *e)
{
CError = e;
}
ProcMngr::~ProcMngr()
{
Clear();
@ -40,7 +52,7 @@ void ProcMngr::Clear()
List.clear();
}
void ProcMngr::AddProc(SymbolList::Symbol *Symbol, Asm *ASM)
ProcMngr::AsmProc *ProcMngr::AddProc(SymbolList::Symbol *Symbol, Asm *ASM)
{
ProcMngr::AsmProc *a = new ProcMngr::AsmProc;
@ -49,6 +61,8 @@ void ProcMngr::AddProc(SymbolList::Symbol *Symbol, Asm *ASM)
a->pb = false;
List.push_back(a);
return a;
}
bool ProcMngr::SetPublic(std::string &sym)
@ -99,9 +113,46 @@ int ProcMngr::GetCip(std::string &sym)
p = FindProc(sym);
if (p == NULL)
if (p == NULL || p->ASM == NULL)
return ncip;
return p->ASM->cip;
}
void ProcMngr::QueueProc(std::string &sym, Asm *ASM)
{
std::string d(sym);
PQ[d].push(ASM);
}
void ProcMngr::CompleteQueue()
{
std::map<std::string,std::stack<Asm *> >::iterator i;
std::string search;
ProcMngr::AsmProc *p = 0;
std::stack<Asm *> *stk = 0;
for (i=PQ.begin(); i!=PQ.end(); i++)
{
search.assign( (*i).first );
p = FindProc(search);
stk = &((*i).second);
if (p == NULL || p->ASM == NULL)
{
while (!stk->empty())
{
CError->SetLine(stk->top()->line);
CError->ErrorMsg(Err_Invalid_Proc);
stk->pop();
}
} else {
while (!stk->empty())
{
stk->top()->cip = p->ASM->cip;
stk->top()->params[0] = p->ASM->cip;
stk->pop();
}
}
}
}