AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-14 20:46:08 +00:00
Code Issues Projects Releases Wiki Activity

HECL Compiler bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-10-14 13:06:47 -10:00
parent 2148bc2459
commit a86b5f8c1d
13 changed files with 230 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hecl/lib/Database/Project.cpp
View File

@@ -385,14 +385,14 @@ static void VisitDirectory(const ProjectPath& dir, bool recursive,
std::vector<SpecInst>& specInsts,
CookProgress& progress)
{
std::vector<ProjectPath> children;
std::map<SystemString, ProjectPath> children;
dir.getDirChildren(children);
/* Pass 1: child file count */
int childFileCount = 0;
for (ProjectPath& child : children)
for (auto& child : children)
{
switch (child.getPathType())
switch (child.second.getPathType())
{
case ProjectPath::PT_FILE:
{
@@ -401,7 +401,7 @@ static void VisitDirectory(const ProjectPath& dir, bool recursive,
}
case ProjectPath::PT_LINK:
{
ProjectPath target = child.resolveLink();
ProjectPath target = child.second.resolveLink();
if (target.getPathType() == ProjectPath::PT_FILE)
++childFileCount;
break;
@@ -414,19 +414,19 @@ static void VisitDirectory(const ProjectPath& dir, bool recursive,
int progNum = 0;
float progDenom = childFileCount;
progress.changeDir(dir.getLastComponent());
for (ProjectPath& child : children)
for (auto& child : children)
{
switch (child.getPathType())
switch (child.second.getPathType())
{
case ProjectPath::PT_FILE:
{
progress.changeFile(child.getLastComponent(), progNum++/progDenom);
VisitFile(child, specInsts, progress);
progress.changeFile(child.first.c_str(), progNum++/progDenom);
VisitFile(child.second, specInsts, progress);
break;
}
case ProjectPath::PT_LINK:
{
ProjectPath target = child.resolveLink();
ProjectPath target = child.second.resolveLink();
if (target.getPathType() == ProjectPath::PT_FILE)
{
progress.changeFile(target.getLastComponent(), progNum++/progDenom);
@@ -442,13 +442,13 @@ static void VisitDirectory(const ProjectPath& dir, bool recursive,
/* Pass 3: child directories */
if (recursive)
{
for (ProjectPath& child : children)
for (auto& child : children)
{
switch (child.getPathType())
switch (child.second.getPathType())
{
case ProjectPath::PT_DIRECTORY:
{
VisitDirectory(child, recursive, specInsts, progress);
VisitDirectory(child.second, recursive, specInsts, progress);
break;
}
default: break;