BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-15 00:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made flatc error messages look like what other compilers output.

Browse Source 
Looks like MSVC on Windows and like gcc everywhere else.
For enhanced IDE clickability.

Bug: 17208371
Change-Id: Ie3e02658fccd3edfd464b4bacf4bc68c613a8570
Tested: on Linux and Windows.
This commit is contained in:
Wouter van Oortmerssen
2014-09-22 17:17:13 -07:00
parent 30642c5a6f
commit 85c9c83844
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/flatc.cpp
View File

@@ -19,7 +19,7 @@
#include "flatbuffers/util.h"
static void Error(const char *err, const char *obj = nullptr,
bool usage = false);
bool usage = false, bool show_exe_name = true);
namespace flatbuffers {
@@ -89,8 +89,10 @@ const Generator generators[] = {
const char *program_name = NULL;
static void Error(const char *err, const char *obj, bool usage) {
printf("%s: %s", program_name, err);
static void Error(const char *err, const char *obj, bool usage,
bool show_exe_name) {
if (show_exe_name) printf("%s: ", program_name);
printf("%s", err);
if (obj) printf(": %s", obj);
printf("\n");
if (usage) {
@@ -196,7 +198,7 @@ int main(int argc, const char *argv[]) {
include_directories.push_back(nullptr);
if (!parser.Parse(contents.c_str(), &include_directories[0],
file_it->c_str()))
Error((*file_it + ": " + parser.error_).c_str());
Error(parser.error_.c_str(), nullptr, false, false);
include_directories.pop_back();
include_directories.pop_back();
}

11
src/idl_parser.cpp
View File

@@ -907,7 +907,7 @@ bool Parser::Parse(const char *source, const char **include_paths,
// included_files_.
// This is recursive, but only go as deep as the number of include
// statements.
return Parse(source, include_paths);
return Parse(source, include_paths, source_filename);
}
Expect(';');
}
@@ -981,7 +981,14 @@ bool Parser::Parse(const char *source, const char **include_paths,
}
}
} catch (const std::string &msg) {
error_ = "line " + NumToString(line_) + ": " + msg;
error_ = source_filename ? AbsolutePath(source_filename) : "";
#ifdef _WIN32
error_ += "(" + NumToString(line_) + ")"; // MSVC alike
#else
if (source_filename) error_ += ":";
error_ += NumToString(line_) + ":0"; // gcc alike
#endif
error_ += ": error: " + msg;
return false;
}
assert(!struct_stack_.size());