Slicelib cleanup (#1678)

zeroc-ice · Jan 17, 2024 · f8789e3 · f8789e3
1 parent 4939ee2
commit f8789e3
Show file tree

Hide file tree

Showing 24 changed files with 400 additions and 1,067 deletions.
diff --git a/cpp/Makefile b/cpp/Makefile
@@ -20,6 +20,7 @@ load_first = Ice IceSSL IceBox IcePatch2Lib Glacier2Lib IceGridLib IceStormLib
 #
 projects :=
 $(foreach t,$(wildcard $(lang_srcdir)/src/slice2*),$(eval $(call create-translator-project,$(call project,$t))))
+$(eval $(call create-translator-project,$(call project,$(lang_srcdir)/src/ice2slice)))
 include $(foreach p,$(load_first),src/$p/Makefile.mk)
 include $(filter-out $(foreach p,$(load_first),%/src/$p/Makefile.mk),$(shell find $(lang_srcdir)/src -name Makefile.mk))
 $(call make-projects,$(projects),make-cpp-src-project,,$(filter all cpp,$(ICE_BIN_DIST)))

diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h
@@ -5,8 +5,6 @@
 #ifndef FILE_TRACKER_H
 #define FILE_TRACKER_H
 
-#include <IceUtil/Shared.h>
-#include <IceUtil/Handle.h>
 #include <Slice/Parser.h>
 
 namespace Slice

diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
@@ -2499,7 +2499,7 @@ YYLTYPE yylloc = yyloc_default;
     else
     {
         string typeId = currentUnit->getTypeId(static_cast<int>(id));
-        if(!typeId.empty() && !currentUnit->ignRedefs())
+        if(!typeId.empty())
         {
             currentUnit->error("invalid compact id for class: already assigned to class `" + typeId + "'");
         }
@@ -2592,7 +2592,7 @@ YYLTYPE yylloc = yyloc_default;
     else
     {
         string typeId = currentUnit->getTypeId(id);
-        if(!typeId.empty() && !currentUnit->ignRedefs())
+        if(!typeId.empty())
         {
             currentUnit->error("invalid compact id for class: already assigned to class `" + typeId + "'");
         }

diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
@@ -819,7 +819,7 @@ class_id
     else
     {
         string typeId = currentUnit->getTypeId(static_cast<int>(id));
-        if(!typeId.empty() && !currentUnit->ignRedefs())
+        if(!typeId.empty())
         {
             currentUnit->error("invalid compact id for class: already assigned to class `" + typeId + "'");
         }
@@ -908,7 +908,7 @@ class_id
     else
     {
         string typeId = currentUnit->getTypeId(id);
-        if(!typeId.empty() && !currentUnit->ignRedefs())
+        if(!typeId.empty())
         {
             currentUnit->error("invalid compact id for class: already assigned to class `" + typeId + "'");
         }