Skip to content

Development #212

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
X39 merged 4 commits into from
May 1, 2023
Merged

Development #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43b4376
added cmake-build-debug to gitignore
X39 Feb 17, 2022
22719d1
update of cli hints
X39 Feb 17, 2022
f220907
fixing CLI not returning correct error codes when using --parse-only
X39 May 1, 2023
d165f41
Merge remote-tracking branch 'origin/master'
X39 May 1, 2023
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
cmake-build-debug

/DLL2
/sqfvm-cpp/DLL2
Expand Down
6 changes: 3 additions & 3 deletions src/cli/cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void cli::handle_files()
if (m_parse_only)
{
auto success = m_runtime.parser_sqf().check_syntax(m_runtime, *ppedStr, { path.string(), {} });
m_good = m_good && !success;
m_good = m_good && success;
}
else
{
Expand Down Expand Up @@ -404,8 +404,8 @@ int cli::run(size_t argc, const char** argv)
// Input - File
CMDADD(TCLAP::MultiArg<std::string>, inputArg, "i", "input", "Loads provided file from disk. File-Type is determined using default file extensions (sqf, cpp, hpp, pbo). " RELPATHHINT "!BE AWARE! This is case-sensitive!", false, "PATH");
CMDADD(TCLAP::MultiArg<std::string>, inputSqfArg, "", "input-sqf", "Loads provided SQF file from disk. Will be executed as if it was spawned. " RELPATHHINT "!BE AWARE! This is case-sensitive!", false, "PATH");
CMDADD(TCLAP::MultiArg<std::string>, inputConfigArg, "", "input-config", "Loads provided config file from disk. Will be parsed before files, added using '--input'. " RELPATHHINT "!BE AWARE! This is case-sensitive!", false, "PATH");
CMDADD(TCLAP::MultiArg<std::string>, inputPboArg, "", "input-pbo", "Loads provided PBO file from disk. Will be parsed before files, added using '--input'. " RELPATHHINT "!BE AWARE! This is case-sensitive!", false, "PATH");
CMDADD(TCLAP::MultiArg<std::string>, inputConfigArg, "", "input-config", "Loads provided config file from disk. Will be parsed prior to files, added using '--input'. " RELPATHHINT "!BE AWARE! This is case-sensitive!", false, "PATH");
CMDADD(TCLAP::MultiArg<std::string>, inputPboArg, "", "input-pbo", "Loads provided PBO file from disk and mounts it to SQF-VMs virtual file system (see `--virtual`). If the PBO contains a config.cpp (not binarized), it will be loaded into the config tree. Will be parsed prior to files, added using '--input'. " RELPATHHINT "!BE AWARE! This is case-sensitive!", false, "PATH");

// Input - Raw
CMDADD(TCLAP::MultiArg<std::string>, sqfArg, "", "sqf", "Loads provided sqf-code directly into the VM. Input is getting preprocessed! Will be executed as if it was spawned.", false, "CODE");
Expand Down