fixed getNameInLocation
This commit is contained in:
@@ -199,15 +199,6 @@ static set<string> fillUsedSymbols(SgStatement *loop)
|
||||
return usedS;
|
||||
}
|
||||
|
||||
static string correctSymbolModuleName(const string& origFull)
|
||||
{
|
||||
auto it = origFull.find("::");
|
||||
if (it == string::npos)
|
||||
return origFull;
|
||||
else
|
||||
return origFull.substr(it + 2);
|
||||
}
|
||||
|
||||
static SgStatement* getModuleScope(const string& origFull, vector<SgStatement*>& moduleList, SgStatement *local)
|
||||
{
|
||||
auto it = origFull.find("::");
|
||||
@@ -959,7 +950,7 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
|
||||
SgSymbol* redS;
|
||||
string clearName = correctSymbolModuleName(red);
|
||||
if (clearName != red)
|
||||
redS = getNameInLocation(parentFunc, clearName, getModuleScope(red, moduleList, parentFunc)->symbol()->identifier());
|
||||
redS = getNameInLocation(parentFunc, red, getModuleScope(red, moduleList, parentFunc)->symbol()->identifier());
|
||||
else
|
||||
redS = findSymbolOrCreate(file, clearName, NULL, parentFunc);
|
||||
|
||||
@@ -1017,12 +1008,12 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
|
||||
string clearName2 = correctSymbolModuleName(get<1>(list));
|
||||
|
||||
if (clearName1 != get<0>(list))
|
||||
redS1 = getNameInLocation(parentFunc, clearName1, getModuleScope(get<0>(list), moduleList, parentFunc)->symbol()->identifier());
|
||||
redS1 = getNameInLocation(parentFunc, get<0>(list), getModuleScope(get<0>(list), moduleList, parentFunc)->symbol()->identifier());
|
||||
else
|
||||
redS1 = findSymbolOrCreate(file, clearName1, NULL, parentFunc);
|
||||
|
||||
if (clearName2 != get<1>(list))
|
||||
redS2 = getNameInLocation(parentFunc, clearName2, getModuleScope(get<1>(list), moduleList, parentFunc)->symbol()->identifier());
|
||||
redS2 = getNameInLocation(parentFunc, get<1>(list), getModuleScope(get<1>(list), moduleList, parentFunc)->symbol()->identifier());
|
||||
else
|
||||
redS2 = findSymbolOrCreate(file, clearName2, NULL, parentFunc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user