diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-02-02 10:15:06 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-02-02 10:15:06 -0800 |
| commit | c1ce7caa97b3dd6f7536d5c3b8b482d823c51891 (patch) | |
| tree | 85be09ca58cee5a9dffa27cbcf3ce67a0d2b25f2 /cpp/src/Slice/JavaUtil.cpp | |
| parent | Removed old makedist scripts (diff) | |
| download | ice-c1ce7caa97b3dd6f7536d5c3b8b482d823c51891.tar.bz2 ice-c1ce7caa97b3dd6f7536d5c3b8b482d823c51891.tar.xz ice-c1ce7caa97b3dd6f7536d5c3b8b482d823c51891.zip | |
bug 3644 - improve integration between eclipse plugin and translator
bug 3657 - improve error reporting in translators
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index b67f36055a4..99b617e2146 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -10,6 +10,7 @@ #include <IceUtil/DisableWarnings.h> #include <Slice/JavaUtil.h> #include <Slice/FileTracker.h> +#include <Slice/Util.h> #include <IceUtil/Functional.h> #include <IceUtil/DisableWarnings.h> @@ -3426,7 +3427,7 @@ Slice::JavaGenerator::MetaDataVisitor::visitModuleStart(const ModulePtr& p) if(!ok) { - cerr << file << ": warning: ignoring invalid global metadata `" << s << "'" << endl; + emitWarning(file, "", "ignoring invalid global metadata `" + s + "'"); } } _history.insert(s); @@ -3482,10 +3483,11 @@ Slice::JavaGenerator::MetaDataVisitor::visitOperation(const OperationPtr& p) ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container()); if(!cl->isLocal()) { - cerr << p->definitionContext()->filename() << ":" << p->line() - << ": warning: metadata directive `UserException' applies only to local operations " - << "but enclosing " << (cl->isInterface() ? "interface" : "class") << "`" << cl->name() - << "' is not local" << endl; + ostringstream os; + os << "metadata directive `UserException' applies only to local operations " + << "but enclosing " << (cl->isInterface() ? "interface" : "class") << "`" << cl->name() + << "' is not local"; + emitWarning(p->definitionContext()->filename(), p->line(), os.str()); } } StringList metaData = getMetaData(p); @@ -3498,8 +3500,8 @@ Slice::JavaGenerator::MetaDataVisitor::visitOperation(const OperationPtr& p) { if(q->find("java:type:", 0) == 0) { - cerr << p->definitionContext()->filename() << ":" << p->line() - << ": warning: invalid metadata for operation" << endl; + emitWarning(p->definitionContext()->filename(), p->line(), + "invalid metadata for operation"); break; } } @@ -3597,7 +3599,7 @@ Slice::JavaGenerator::MetaDataVisitor::getMetaData(const ContainedPtr& cont) continue; } - cerr << file << ":" << cont->line() << ": warning: ignoring invalid metadata `" << s << "'" << endl; + emitWarning(file, cont->line(), "ignoring invalid metadata `" + s + "'"); } _history.insert(s); @@ -3630,7 +3632,7 @@ Slice::JavaGenerator::MetaDataVisitor::validateType(const SyntaxTreeBasePtr& p, assert(b); str = b->typeId(); } - cerr << file << ":" << line << ": warning: invalid metadata for " << str << endl; + emitWarning(file, line, "invalid metadata for " + str); } } } @@ -3660,7 +3662,7 @@ Slice::JavaGenerator::MetaDataVisitor::validateGetSet(const SyntaxTreeBasePtr& p assert(b); str = b->typeId(); } - cerr << file << ":" << line << ": warning: invalid metadata for " << str << endl; + emitWarning(file, line, "invalid metadata for " + str); } } } |