diff options
| author | Michi Henning <michi@zeroc.com> | 2004-12-29 06:14:33 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-12-29 06:14:33 +0000 |
| commit | 40eeffd4c53635bc26f96e757539b232e7050264 (patch) | |
| tree | e5ac62f0723e614951438ae392b27d9707a3051f /cpp/src | |
| parent | Backed out previous check-in of IcePatch2 files -- they were checked in by (diff) | |
| download | ice-40eeffd4c53635bc26f96e757539b232e7050264.tar.bz2 ice-40eeffd4c53635bc26f96e757539b232e7050264.tar.xz ice-40eeffd4c53635bc26f96e757539b232e7050264.zip | |
Improved diagnostics for invalid metadata.
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/Slice/CsUtil.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 12 | ||||
| -rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 7 | ||||
| -rwxr-xr-x | cpp/src/Slice/VbUtil.cpp | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 362b5272b37..813280e3a73 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -1066,7 +1066,7 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) continue; } } - cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; + cout << file << ":" << cont->line() << ": warning: ignoring invalid metadata `" << s << "'" << endl; } _history.insert(s); } diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index c11e889d3b1..b6812e20bb2 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -2374,17 +2374,23 @@ Slice::JavaGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) string::size_type pos = s.find(':', prefix.size()); if(pos == string::npos) { - cout << file << ": warning: metadata `" << s << "' uses deprecated syntax" << endl; + cout << file << ":" << cont->line() << ": warning: metadata `" << s << "' uses deprecated syntax" + << endl; } else if(s.substr(prefix.size(), pos - prefix.size()) != "type") { - cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; + cout << file << ":" << cont->line() << ": warning: ignoring invalid metadata `" << s << "'" << endl; } if(SequencePtr::dynamicCast(cont)) { continue; } - cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; + DataMemberPtr m = DataMemberPtr::dynamicCast(cont); + if(m && SequencePtr::dynamicCast(m->type())) + { + continue; + } + cout << file << ":" << cont->line() << ": warning: ignoring invalid metadata `" << s << "'" << endl; } _history.insert(s); } diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 564c582c9af..7db9f2fa3e9 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -2000,17 +2000,18 @@ Slice::Python::MetaDataVisitor::validate(const ContainedPtr& cont) string::size_type pos = s.find(':', prefix.size()); if(pos == string::npos) { - cout << file << ": warning: metadata `" << s << "' uses deprecated syntax" << endl; + cout << file << ":" << cont->line() << ": warning: metadata `" << s << "' uses deprecated syntax" + << endl; } else if(s.substr(prefix.size(), pos - prefix.size()) != "type") { - cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; + cout << file << ":" << cont->line() << ": warning: ignoring invalid metadata `" << s << "'" << endl; } if(SequencePtr::dynamicCast(cont)) { continue; } - cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; + cout << file << ":" << cont->line() << ": warning: ignoring invalid metadata `" << s << "'" << endl; } _history.insert(s); } diff --git a/cpp/src/Slice/VbUtil.cpp b/cpp/src/Slice/VbUtil.cpp index 5e17fb464e3..d872e67c22e 100755 --- a/cpp/src/Slice/VbUtil.cpp +++ b/cpp/src/Slice/VbUtil.cpp @@ -1115,7 +1115,7 @@ Slice::VbGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) continue; } } - cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; + cout << file << ":" << cont->line() << ": warning: ignoring invalid metadata `" << s << "'" << endl; } _history.insert(s); } |