mirrors
/
codon
mirror of https://github.com/exaloop/codon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update docgen signature

pull/6/head
A. R. Shajii 2021-11-03 10:34:33 -04:00
parent 33a82967d8
commit f09ac6d85f
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codon/app/main.cpp
View File

@ -65,9 +65,9 @@ int docMode(const std::vector<const char *> &args, const std::string &argv0) {
files.push_back(line);
auto compiler = std::make_unique<codon::Compiler>(args[0]);
std::string result;
bool failed = false;
llvm::handleAllErrors(compiler->docgen(files, &result),
auto result = compiler->docgen(files);
llvm::handleAllErrors(result.takeError(),
[&failed](const codon::error::ParserErrorInfo &e) {
display(e);
failed = true;
@ -75,7 +75,7 @@ int docMode(const std::vector<const char *> &args, const std::string &argv0) {
if (failed)
return EXIT_FAILURE;
fmt::print("{}\n", result);
fmt::print("{}\n", *result);
return EXIT_SUCCESS;
}

7
codon/compiler/compiler.cpp
View File

@ -100,16 +100,13 @@ void Compiler::compile() {
llvisitor->visit(module.get());
}
llvm::Error Compiler::docgen(const std::vector<std::string> &files,
std::string *output) {
llvm::Expected<std::string> Compiler::docgen(const std::vector<std::string> &files) {
try {
auto j = ast::DocVisitor::apply(argv0, files);
if (output)
*output = j->toString();
return j->toString();
} catch (exc::ParserException &e) {
return llvm::make_error<error::ParserErrorInfo>(e);
}
return llvm::Error::success();
}
} // namespace codon

2
codon/compiler/compiler.h
View File

@ -49,7 +49,7 @@ public:
int testFlags = 0,
const std::unordered_map<std::string, std::string> &defines = {});
void compile();
llvm::Error docgen(const std::vector<std::string> &files, std::string *output);
llvm::Expected<std::string> docgen(const std::vector<std::string> &files);
};
} // namespace codon