Implemented “beautify” command.

app/include/plasp-app/CommandType.h

@@ -4,6 +4,7 @@
 #include <map>
 #include <string>
 
+#include <plasp-app/commands/CommandBeautify.h>
 #include <plasp-app/commands/CommandHelp.h>
 #include <plasp-app/commands/CommandNormalize.h>
 #include <plasp-app/commands/CommandTranslate.h>
@@ -21,7 +22,7 @@ enum class CommandType
 	Version,
 	CheckSyntax,
 	Requirements,
-	PrettyPrint,
+	Beautify,
 	Normalize,
 	Translate
 };
@@ -38,7 +39,7 @@ static const std::map<std::string, CommandType> commandNames =
 		{"--version", CommandType::Version},
 		{"check-syntax", CommandType::CheckSyntax},
 		{"requirements", CommandType::Requirements},
-		{"pretty-print", CommandType::PrettyPrint},
+		{"beautify", CommandType::Beautify},
 		{"normalize", CommandType::Normalize},
 		{"translate", CommandType::Translate},
 	};
@@ -58,7 +59,7 @@ const auto parseCommandType =
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-using AvailableCommands = std::tuple<CommandTranslate, CommandNormalize, CommandHelp, CommandVersion>;
+using AvailableCommands = std::tuple<CommandTranslate, CommandNormalize, CommandBeautify, CommandHelp, CommandVersion>;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 

app/include/plasp-app/commands/CommandBeautify.h

@@ -0,0 +1,25 @@
+#ifndef __PLASP_APP__COMMANDS__COMMAND_BEAUTIFY_H
+#define __PLASP_APP__COMMANDS__COMMAND_BEAUTIFY_H
+
+#include <plasp-app/Command.h>
+#include <plasp-app/OptionGroups.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// Command Beautify
+//
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+class CommandBeautify : public Command<CommandBeautify, OptionGroupBasic, OptionGroupOutput, OptionGroupParser>
+{
+	public:
+		static constexpr auto Name = "beautify";
+		static constexpr auto Description = "Cleanly format PDDL specifications";
+
+	public:
+		int run(int argc, char **argv);
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#endif

app/src/plasp-app/commands/CommandBeautify.cpp

@@ -0,0 +1,145 @@
+#include <plasp-app/commands/CommandBeautify.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 Beautify
+//
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+int CommandBeautify::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.outputStream() << description << std::endl;
+				break;
+			}
+
+			case plasp::Language::Type::SAS:
+			{
+				logger.log(colorlog::Priority::Error, "Beautification 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;
+}

app/src/plasp-app/commands/CommandHelp.cpp

@@ -24,12 +24,16 @@ int CommandHelp::run(int argc, char **argv)
 				case CommandType::Version:
 					break;
 
+				case CommandType::Translate:
+					CommandTranslate().printHelp();
+					return EXIT_SUCCESS;
+
 				case CommandType::Normalize:
 					CommandNormalize().printHelp();
 					return EXIT_SUCCESS;
 
-				case CommandType::Translate:
+				case CommandType::Beautify:
-					CommandTranslate().printHelp();
+					CommandBeautify().printHelp();
 					return EXIT_SUCCESS;
 
 				default:

app/src/plasp-app/commands/CommandNormalize.cpp

@@ -19,8 +19,6 @@
 
 #include <plasp/LanguageDetection.h>
 
-#include <plasp-app/Version.h>
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // Command Normalize

app/src/plasp-app/main.cpp

@@ -38,11 +38,14 @@ int main(int argc, char **argv)
 			case CommandType::Version:
 				return CommandVersion().run(argc - 1, &argv[1]);
 
+			case CommandType::Translate:
+				return CommandTranslate().run(argc - 1, &argv[1]);
+
 			case CommandType::Normalize:
 				return CommandNormalize().run(argc - 1, &argv[1]);
 
-			case CommandType::Translate:
+			case CommandType::Beautify:
-				return CommandTranslate().run(argc - 1, &argv[1]);
+				return CommandBeautify().run(argc - 1, &argv[1]);
 
 			default:
 				logger.log(colorlog::Priority::Error, std::string("command “") + argv[1] + "” not yet implemented");