Simplify error message.

zeroc-ice · Jan 14, 2025 · 47a0803 · 47a0803
1 parent f28ad12
commit 47a0803
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
@@ -1191,10 +1191,8 @@ Slice::Container::createClassDef(const string& name, int id, const ClassDefPtr&
         }
         else
         {
-            bool declared = dynamic_pointer_cast<InterfaceDecl>(matches.front()) != nullptr;
             ostringstream os;
-            os << "class '" << name << "' was previously " << (declared ? "declared" : "defined") << " as "
-               << prependA(matches.front()->kindOf());
+            os << "class '" << name << "' was previously defined as " << prependA(matches.front()->kindOf());
             _unit->error(os.str());
         }
         return nullptr;
@@ -1253,10 +1251,8 @@ Slice::Container::createClassDecl(const string& name)
         }
         else
         {
-            bool declared = dynamic_pointer_cast<InterfaceDecl>(matches.front()) != nullptr;
             ostringstream os;
-            os << "class '" << name << "' was previously " << (declared ? "declared" : "defined") << " as "
-               << prependA(matches.front()->kindOf());
+            os << "class '" << name << "' was previously defined as " << prependA(matches.front()->kindOf());
             _unit->error(os.str());
         }
         return nullptr;
@@ -1340,8 +1336,7 @@ Slice::Container::createInterfaceDef(const string& name, const InterfaceList& ba
         {
             bool declared = dynamic_pointer_cast<ClassDecl>(matches.front()) != nullptr;
             ostringstream os;
-            os << "interface '" << name << "' was previously " << (declared ? "declared" : "defined") << " as "
-               << prependA(matches.front()->kindOf());
+            os << "interface '" << name << "' was previously defined as " << prependA(matches.front()->kindOf());
             _unit->error(os.str());
         }
         return nullptr;
@@ -1404,8 +1399,7 @@ Slice::Container::createInterfaceDecl(const string& name)
         {
             bool declared = dynamic_pointer_cast<ClassDecl>(matches.front()) != nullptr;
             ostringstream os;
-            os << "interface '" << name << "' was previously " << (declared ? "declared" : "defined") << " as "
-               << prependA(matches.front()->kindOf());
+            os << "interface '" << name << "' was previously defined as " << prependA(matches.front()->kindOf());
             _unit->error(os.str());
         }
         return nullptr;

diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.err b/cpp/test/Slice/errorDetection/InterfaceMismatch.err
@@ -1,6 +1,6 @@
-InterfaceMismatch.ice:9: class 'Foo1' was previously declared as an interface
-InterfaceMismatch.ice:10: class 'Foo1' was previously declared as an interface
+InterfaceMismatch.ice:9: class 'Foo1' was previously defined as an interface
+InterfaceMismatch.ice:10: class 'Foo1' was previously defined as an interface
 InterfaceMismatch.ice:13: class 'Foo2' was previously defined as an interface
-InterfaceMismatch.ice:16: interface 'Foo3' was previously declared as a class
-InterfaceMismatch.ice:17: interface 'Foo3' was previously declared as a class
+InterfaceMismatch.ice:16: interface 'Foo3' was previously defined as a class
+InterfaceMismatch.ice:17: interface 'Foo3' was previously defined as a class
 InterfaceMismatch.ice:20: interface 'Foo4' was previously defined as a class