Skip to content

Fix argument parsing: Properly handle -- to separate files and script arguments #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aatxe merged 2 commits into from
Feb 26, 2025
Merged

Fix argument parsing: Properly handle -- to separate files and script arguments #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f83732f
Update CMakeLists.txt
Feb 26, 2025
d986e5e
Update main.cpp
Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion cli/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,28 @@ int main(int argc, char** argv)
program_argc = argc - program_args;
program_argv = &argv[program_args];

const std::vector<std::string> files = getSourceFiles(argc, argv);
std::vector<std::string> files;

bool parsingFiles = true;

for (int i = 1; i < argc; i++)
{
if (strcmp(argv[i], "--") == 0)
{
parsingFiles = false; // stop collecting files
program_argc = argc - (i + 1);
program_argv = &argv[i + 1];
break;
}

if (parsingFiles)
files.push_back(std::string(argv[i])); // fix: Explicit conversion
}

if (program_argc == 0) // default to just running the script if no args are passed
{
program_argv = nullptr;
}

// Given the source files, perform a typecheck here
if (runTypecheck)
Expand Down
2 changes: 1 addition & 1 deletion extern/luau/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if(EXT_PLATFORM_STRING)
return()
endif()

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

option(LUAU_BUILD_CLI "Build CLI" ON)
option(LUAU_BUILD_TESTS "Build tests" ON)
Expand Down
⚡