luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-05-04 10:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

undo drive-by formatting

Browse source
This commit is contained in:
JohnnyMorganz 2023-11-18 12:20:08 +01:00
parent 7b5e2f337f
commit b80b399842
1 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Analysis/src/Frontend.cpp
View file

@ -284,11 +284,9 @@ static ErrorVec accumulateErrors(
Module& module = *modulePtr; Module& module = *modulePtr;
std::sort(module.errors.begin(), module.errors.end(), std::sort(module.errors.begin(), module.errors.end(), [](const TypeError& e1, const TypeError& e2) -> bool {
[](const TypeError& e1, const TypeError& e2) -> bool return e1.location.begin > e2.location.begin;
{ });
return e1.location.begin > e2.location.begin;
});
result.insert(result.end(), module.errors.begin(), module.errors.end()); result.insert(result.end(), module.errors.begin(), module.errors.end());
} }
@ -515,11 +513,9 @@ std::vector<ModuleName> Frontend::checkQueuedModules(std::optional<FrontendOptio
} }
std::vector<ModuleName> queue; std::vector<ModuleName> queue;
bool cycleDetected = parseGraph(queue, name, frontendOptions.forAutocomplete, bool cycleDetected = parseGraph(queue, name, frontendOptions.forAutocomplete, [&seen](const ModuleName& name) {
[&seen](const ModuleName& name) return seen.contains(name);
{ });
return seen.contains(name);
});
addBuildQueueItems(buildQueueItems, queue, cycleDetected, seen, frontendOptions); addBuildQueueItems(buildQueueItems, queue, cycleDetected, seen, frontendOptions);
} }
@ -539,8 +535,7 @@ std::vector<ModuleName> Frontend::checkQueuedModules(std::optional<FrontendOptio
// Default task execution is single-threaded and immediate // Default task execution is single-threaded and immediate
if (!executeTask) if (!executeTask)
{ {
executeTask = [](std::function<void()> task) executeTask = [](std::function<void()> task) {
{
task(); task();
}; };
} }
@ -552,8 +547,7 @@ std::vector<ModuleName> Frontend::checkQueuedModules(std::optional<FrontendOptio
size_t processing = 0; size_t processing = 0;
size_t remaining = buildQueueItems.size(); size_t remaining = buildQueueItems.size();
auto itemTask = [&](size_t i) auto itemTask = [&](size_t i) {
{
BuildQueueItem& item = buildQueueItems[i]; BuildQueueItem& item = buildQueueItems[i];
try try
@ -573,22 +567,18 @@ std::vector<ModuleName> Frontend::checkQueuedModules(std::optional<FrontendOptio
cv.notify_one(); cv.notify_one();
}; };
auto sendItemTask = [&](size_t i) auto sendItemTask = [&](size_t i) {
{
BuildQueueItem& item = buildQueueItems[i]; BuildQueueItem& item = buildQueueItems[i];
item.processing = true; item.processing = true;
processing++; processing++;
executeTask( executeTask([&itemTask, i]() {
[&itemTask, i]() itemTask(i);
{ });
itemTask(i);
});
}; };
auto sendCycleItemTask = [&] auto sendCycleItemTask = [&] {
{
for (size_t i = 0; i < buildQueueItems.size(); i++) for (size_t i = 0; i < buildQueueItems.size(); i++)
{ {
BuildQueueItem& item = buildQueueItems[i]; BuildQueueItem& item = buildQueueItems[i];
@ -637,11 +627,9 @@ std::vector<ModuleName> Frontend::checkQueuedModules(std::optional<FrontendOptio
std::unique_lock guard(mtx); std::unique_lock guard(mtx);
// If nothing is ready yet, wait // If nothing is ready yet, wait
cv.wait(guard, cv.wait(guard, [&readyQueueItems] {
[&readyQueueItems] return !readyQueueItems.empty();
{ });
return !readyQueueItems.empty();
});
// Handle checked items // Handle checked items
for (size_t i : readyQueueItems) for (size_t i : readyQueueItems)
@ -1354,8 +1342,7 @@ ModulePtr Frontend::check(const SourceModule& sourceModule, Mode mode, std::vect
{ {
if (FFlag::DebugLuauDeferredConstraintResolution) if (FFlag::DebugLuauDeferredConstraintResolution)
{ {
auto prepareModuleScopeWrap = [this, forAutocomplete](const ModuleName& name, const ScopePtr& scope) auto prepareModuleScopeWrap = [this, forAutocomplete](const ModuleName& name, const ScopePtr& scope) {
{
if (prepareModuleScope) if (prepareModuleScope)
prepareModuleScope(name, scope, forAutocomplete); prepareModuleScope(name, scope, forAutocomplete);
}; };
@ -1381,8 +1368,7 @@ ModulePtr Frontend::check(const SourceModule& sourceModule, Mode mode, std::vect
if (prepareModuleScope) if (prepareModuleScope)
{ {
typeChecker.prepareModuleScope = [this, forAutocomplete](const ModuleName& name, const ScopePtr& scope) typeChecker.prepareModuleScope = [this, forAutocomplete](const ModuleName& name, const ScopePtr& scope) {
{
prepareModuleScope(name, scope, forAutocomplete); prepareModuleScope(name, scope, forAutocomplete);
}; };
} }