Implemented “check-syntax” command.
This commit is contained in:
parent
89edafb586
commit
b8bd42d361
@ -5,6 +5,7 @@
|
||||
#include <string>
|
||||
|
||||
#include <plasp-app/commands/CommandBeautify.h>
|
||||
#include <plasp-app/commands/CommandCheckSyntax.h>
|
||||
#include <plasp-app/commands/CommandHelp.h>
|
||||
#include <plasp-app/commands/CommandNormalize.h>
|
||||
#include <plasp-app/commands/CommandTranslate.h>
|
||||
@ -59,7 +60,7 @@ const auto parseCommandType =
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
using AvailableCommands = std::tuple<CommandTranslate, CommandNormalize, CommandBeautify, CommandHelp, CommandVersion>;
|
||||
using AvailableCommands = std::tuple<CommandTranslate, CommandNormalize, CommandCheckSyntax, CommandBeautify, CommandHelp, CommandVersion>;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
25
app/include/plasp-app/commands/CommandCheckSyntax.h
Normal file
25
app/include/plasp-app/commands/CommandCheckSyntax.h
Normal file
@ -0,0 +1,25 @@
|
||||
#ifndef __PLASP_APP__COMMANDS__COMMAND_CHECK_SYNTAX_H
|
||||
#define __PLASP_APP__COMMANDS__COMMAND_CHECK_SYNTAX_H
|
||||
|
||||
#include <plasp-app/Command.h>
|
||||
#include <plasp-app/OptionGroups.h>
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Command Check Syntax
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class CommandCheckSyntax : public Command<CommandCheckSyntax, OptionGroupBasic, OptionGroupOutput, OptionGroupParser>
|
||||
{
|
||||
public:
|
||||
static constexpr auto Name = "check-syntax";
|
||||
static constexpr auto Description = "Check the syntax of PDDL specifications";
|
||||
|
||||
public:
|
||||
int run(int argc, char **argv);
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#endif
|
145
app/src/plasp-app/commands/CommandCheckSyntax.cpp
Normal file
145
app/src/plasp-app/commands/CommandCheckSyntax.cpp
Normal file
@ -0,0 +1,145 @@
|
||||
#include <plasp-app/commands/CommandCheckSyntax.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
#include <cxxopts.hpp>
|
||||
|
||||
#include <colorlog/ColorStream.h>
|
||||
#include <colorlog/Logger.h>
|
||||
#include <colorlog/Priority.h>
|
||||
|
||||
#include <pddl/AST.h>
|
||||
#include <pddl/ASTOutput.h>
|
||||
#include <pddl/Exception.h>
|
||||
#include <pddl/Mode.h>
|
||||
#include <pddl/Parse.h>
|
||||
|
||||
#include <plasp/LanguageDetection.h>
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Command Check Syntax
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
int CommandCheckSyntax::run(int argc, char **argv)
|
||||
{
|
||||
parseOptions(argc, argv);
|
||||
|
||||
const auto &basicOptions = std::get<OptionGroupBasic>(m_optionGroups);
|
||||
const auto &outputOptions = std::get<OptionGroupOutput>(m_optionGroups);
|
||||
const auto &parserOptions = std::get<OptionGroupParser>(m_optionGroups);
|
||||
|
||||
if (basicOptions.help)
|
||||
{
|
||||
printHelp();
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
if (basicOptions.version)
|
||||
{
|
||||
printVersion();
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
colorlog::Logger logger;
|
||||
logger.setColorPolicy(outputOptions.colorPolicy);
|
||||
logger.setLogPriority(outputOptions.logPriority);
|
||||
|
||||
if (basicOptions.warningsAsErrors)
|
||||
logger.setAbortPriority(colorlog::Priority::Warning);
|
||||
|
||||
const auto printCompatibilityInfo =
|
||||
[&]()
|
||||
{
|
||||
if (parserOptions.parsingMode != pddl::Mode::Compatibility)
|
||||
logger.log(colorlog::Priority::Info, "try using --parsing-mode=compatibility for extended legacy feature support");
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
tokenize::Tokenizer<tokenize::CaseInsensitiveTokenizerPolicy> tokenizer;
|
||||
|
||||
if (!parserOptions.inputFiles.empty())
|
||||
std::for_each(parserOptions.inputFiles.cbegin(), parserOptions.inputFiles.cend(),
|
||||
[&](const auto &inputFile)
|
||||
{
|
||||
tokenizer.read(inputFile);
|
||||
});
|
||||
else
|
||||
{
|
||||
logger.log(colorlog::Priority::Info, "reading from stdin");
|
||||
tokenizer.read("std::cin", std::cin);
|
||||
}
|
||||
|
||||
const auto detectLanguage =
|
||||
[&]()
|
||||
{
|
||||
if (parserOptions.language == plasp::Language::Type::Automatic)
|
||||
return plasp::detectLanguage(tokenizer);
|
||||
|
||||
return parserOptions.language;
|
||||
};
|
||||
|
||||
switch (detectLanguage())
|
||||
{
|
||||
case plasp::Language::Type::Automatic:
|
||||
case plasp::Language::Type::Unknown:
|
||||
{
|
||||
logger.log(colorlog::Priority::Error, "unknown input language");
|
||||
std::cout << std::endl;
|
||||
printHelp();
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
// TODO: get rid of unknown language type, use exception instead
|
||||
case plasp::Language::Type::PDDL:
|
||||
{
|
||||
const auto logWarning =
|
||||
[&](const auto &location, const auto &warning)
|
||||
{
|
||||
logger.log(colorlog::Priority::Warning, location, warning);
|
||||
};
|
||||
|
||||
auto context = pddl::Context(std::move(tokenizer), logWarning);
|
||||
context.mode = parserOptions.parsingMode;
|
||||
auto description = pddl::parseDescription(context);
|
||||
logger.log(colorlog::Priority::Info, "no syntax errors found");
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
case plasp::Language::Type::SAS:
|
||||
{
|
||||
logger.log(colorlog::Priority::Error, "Syntax checking is only supported for PDDL specifications");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (const tokenize::TokenizerException &e)
|
||||
{
|
||||
logger.log(colorlog::Priority::Error, e.location(), e.message().c_str());
|
||||
|
||||
printCompatibilityInfo();
|
||||
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
catch (const pddl::ParserException &e)
|
||||
{
|
||||
if (e.location())
|
||||
logger.log(colorlog::Priority::Error, e.location().value(), e.message().c_str());
|
||||
else
|
||||
logger.log(colorlog::Priority::Error, e.message().c_str());
|
||||
|
||||
printCompatibilityInfo();
|
||||
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
logger.log(colorlog::Priority::Error, e.what());
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
@ -36,6 +36,10 @@ int CommandHelp::run(int argc, char **argv)
|
||||
CommandBeautify().printHelp();
|
||||
return EXIT_SUCCESS;
|
||||
|
||||
case CommandType::CheckSyntax:
|
||||
CommandCheckSyntax().printHelp();
|
||||
return EXIT_SUCCESS;
|
||||
|
||||
default:
|
||||
logger.log(colorlog::Priority::Error, std::string("command “") + argv[1] + "” not yet implemented");
|
||||
exit(EXIT_FAILURE);
|
||||
|
@ -109,7 +109,7 @@ int CommandNormalize::run(int argc, char **argv)
|
||||
auto description = pddl::parseDescription(context);
|
||||
auto normalizedDescription = pddl::normalize(std::move(description));
|
||||
logger.outputStream() << normalizedDescription << std::endl;
|
||||
break;
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
case plasp::Language::Type::SAS:
|
||||
|
@ -115,7 +115,7 @@ int CommandTranslate::run(int argc, char **argv)
|
||||
auto normalizedDescription = pddl::normalize(std::move(description));
|
||||
const auto translator = plasp::pddl::TranslatorASP(std::move(normalizedDescription), logger.outputStream());
|
||||
translator.translate();
|
||||
break;
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
case plasp::Language::Type::SAS:
|
||||
@ -123,7 +123,7 @@ int CommandTranslate::run(int argc, char **argv)
|
||||
const auto description = plasp::sas::Description::fromTokenizer(std::move(tokenizer));
|
||||
const auto translator = plasp::sas::TranslatorASP(description, logger.outputStream());
|
||||
translator.translate();
|
||||
break;
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -47,6 +47,9 @@ int main(int argc, char **argv)
|
||||
case CommandType::Beautify:
|
||||
return CommandBeautify().run(argc - 1, &argv[1]);
|
||||
|
||||
case CommandType::CheckSyntax:
|
||||
return CommandCheckSyntax().run(argc - 1, &argv[1]);
|
||||
|
||||
default:
|
||||
logger.log(colorlog::Priority::Error, std::string("command “") + argv[1] + "” not yet implemented");
|
||||
exit(EXIT_FAILURE);
|
||||
|
Reference in New Issue
Block a user