xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

change 'global' & 'local' in codegen to std::unordered_map & std::vector<std::unordered_map>>

This commit is contained in:
ValKmjolnir 2022-02-02 23:52:00 +08:00
parent bf780514e6
commit d6d90ab7c8
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nasal_codegen.h
View File

@ -198,8 +198,10 @@ private:
std::vector<opcode> code; std::vector<opcode> code;
std::list<std::vector<int>> continue_ptr; std::list<std::vector<int>> continue_ptr;
std::list<std::vector<int>> break_ptr; std::list<std::vector<int>> break_ptr;
std::vector<std::string> global; // global : max 4095 values // global : max 4095 values
std::list<std::vector<std::string>> local; // local : max 32768 upvalues 65536 values std::unordered_map<std::string,int> global;
// local : max 32768 upvalues 65536 values
std::list<std::unordered_map<std::string,int>> local;
void die(std::string,const uint32_t); void die(std::string,const uint32_t);
void regist_number(const double); void regist_number(const double);
@ -306,34 +308,28 @@ void nasal_codegen::add_sym(const std::string& name)
{ {
if(local.empty()) if(local.empty())
{ {
for(auto& sym:global) if(global.count(name))
if(sym==name) return;
return; int index=global.size();
global.push_back(name); global[name]=index;
return; return;
} }
for(auto& sym:local.back()) if(local.back().count(name))
if(sym==name) return;
return; int index=local.back().size();
local.back().push_back(name); local.back()[name]=index;
} }
int nasal_codegen::local_find(const std::string& name) int nasal_codegen::local_find(const std::string& name)
{ {
if(local.empty()) if(local.empty())
return -1; return -1;
for(uint32_t i=0;i<local.back().size();++i) return local.back().count(name)?local.back()[name]:-1;
if(local.back()[i]==name)
return i;
return -1;
} }
int nasal_codegen::global_find(const std::string& name) int nasal_codegen::global_find(const std::string& name)
{ {
for(int i=0;i<global.size();++i) return global.count(name)?global[name]:-1;
if(global[i]==name)
return i;
return -1;
} }
int nasal_codegen::upvalue_find(const std::string& name) int nasal_codegen::upvalue_find(const std::string& name)
@ -345,9 +341,8 @@ int nasal_codegen::upvalue_find(const std::string& name)
return -1; return -1;
auto iter=local.begin(); auto iter=local.begin();
for(uint32_t i=0;i<size-1;++i,++iter) for(uint32_t i=0;i<size-1;++i,++iter)
for(uint32_t j=0;j<iter->size();++j) if(iter->count(name))
if((*iter)[j]==name) index=((i<<16)|(*iter)[name]);
index=((i<<16)|j);
return index; return index;
} }
@ -400,7 +395,7 @@ void nasal_codegen::func_gen(const nasal_ast& ast)
// this keyword is set to nil as default value // this keyword is set to nil as default value
// after calling a hash, this keyword is set to this hash // after calling a hash, this keyword is set to this hash
// this symbol's index will be 0 // this symbol's index will be 0
local.push_back({"me"}); local.push_back({{"me",0}});
// generate parameter list // generate parameter list
for(auto& tmp:ast[0].child()) for(auto& tmp:ast[0].child())