summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java
diff options
context:
space:
mode:
authorAustin Henriksen <austin@zeroc.com>2019-10-30 05:14:29 -0400
committerJoe George <joe@zeroc.com>2021-02-01 16:46:35 -0500
commit452f57976a135c8b72fc8d8f580d5d50618c0cae (patch)
tree0233eedd3cdc380126fd613b04b8b468beb289c0 /cpp/src/slice2java
parentRemove IcePatch2 (#602) (diff)
downloadice-452f57976a135c8b72fc8d8f580d5d50618c0cae.tar.bz2
ice-452f57976a135c8b72fc8d8f580d5d50618c0cae.tar.xz
ice-452f57976a135c8b72fc8d8f580d5d50618c0cae.zip
Remove checksum support (#607)
* Removed checksum sources from swift mapping project file. * Removed checksum tests from Python. * Removed checksum from Python mapping. * Removed checksum tests from PHP mapping. * Removed checksum support from PHP mapping. * Removed checksum sources from MATLAB project file. * Removed checksum option from slice2x manpages. * Removed checksum sources from JavaScript mapping. * Removed checksum tests from Java mapping. * Removed outdated checksum metadata from Java mapping. * Removed checksum support from Java mapping. * Removed checksum tests from csharp. * Removed checksum support from csharp mapping. * Removed checksum tests from cpp * Removed checksum support from IceBox. * Removed checksum support from IceStorm. * Removed Slice checksum support from IceGrid. * Fixed broken filters file for Slice VS project. * Removed checksum support from cpp mapping. * Removed checksum support from Slice definitions. * Removed checksum support from cpp98 mapping.
Diffstat (limited to 'cpp/src/slice2java')
-rw-r--r--cpp/src/slice2java/Gen.cpp58
-rw-r--r--cpp/src/slice2java/Gen.h3
-rw-r--r--cpp/src/slice2java/GenCompat.cpp56
-rw-r--r--cpp/src/slice2java/GenCompat.h3
-rw-r--r--cpp/src/slice2java/Main.cpp32
5 files changed, 0 insertions, 152 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 160ab5c238d..41299779644 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -3,7 +3,6 @@
//
#include <Gen.h>
-#include <Slice/Checksum.h>
#include <Slice/Util.h>
#include <IceUtil/Functional.h>
#include <IceUtil/Iterator.h>
@@ -2277,63 +2276,6 @@ Slice::Gen::generateImpl(const UnitPtr& p)
p->visit(&implVisitor, false);
}
-void
-Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m)
-{
- //
- // Attempt to open the source file for the checksum class.
- //
- JavaOutput out;
- out.openClass(checksumClass, dir);
-
- //
- // Get the class name.
- //
- string className;
- string::size_type pos = checksumClass.rfind('.');
- if(pos == string::npos)
- {
- className = checksumClass;
- }
- else
- {
- className = checksumClass.substr(pos + 1);
- }
-
- //
- // Emit the class.
- //
- out << sp;
- out << nl << "/** @hidden */";
- out << nl << "public class " << className;
- out << sb;
-
- //
- // Use a static initializer to populate the checksum map.
- //
- out << sp << nl << "public static final java.util.Map<String, String> checksums;";
- out << sp << nl << "static";
- out << sb;
- out << nl << "java.util.Map<String, String> map = new java.util.HashMap<>();";
- for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p)
- {
- out << nl << "map.put(\"" << p->first << "\", \"";
- ostringstream str;
- str.flags(ios_base::hex);
- str.fill('0');
- for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q)
- {
- str << static_cast<int>(*q);
- }
- out << str.str() << "\");";
- }
- out << nl << "checksums = java.util.Collections.unmodifiableMap(map);";
-
- out << eb;
- out << eb;
- out << nl;
-}
-
Slice::Gen::PackageVisitor::PackageVisitor(const string& dir) :
JavaVisitor(dir)
{
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index d9e286d1ad9..4a44bfff6c4 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -7,7 +7,6 @@
#include <Slice/Parser.h>
#include <Slice/JavaUtil.h>
-#include <Slice/Checksum.h>
namespace Slice
{
@@ -121,8 +120,6 @@ public:
void generate(const UnitPtr&);
void generateImpl(const UnitPtr&);
- static void writeChecksumClass(const std::string&, const std::string&, const ChecksumMap&);
-
private:
std::string _base;
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index 0f390f01057..d3578fca4ca 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -3,7 +3,6 @@
//
#include <GenCompat.h>
-#include <Slice/Checksum.h>
#include <Slice/Util.h>
#include <IceUtil/Functional.h>
#include <IceUtil/Iterator.h>
@@ -2440,61 +2439,6 @@ Slice::GenCompat::generateImplTie(const UnitPtr& p)
p->visit(&implTieVisitor, false);
}
-void
-Slice::GenCompat::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m)
-{
- //
- // Attempt to open the source file for the checksum class.
- //
- JavaOutput out;
- out.openClass(checksumClass, dir);
-
- //
- // Get the class name.
- //
- string className;
- string::size_type pos = checksumClass.rfind('.');
- if(pos == string::npos)
- {
- className = checksumClass;
- }
- else
- {
- className = checksumClass.substr(pos + 1);
- }
-
- //
- // Emit the class.
- //
- out << sp << nl << "public class " << className;
- out << sb;
-
- //
- // Use a static initializer to populate the checksum map.
- //
- out << sp << nl << "public static final java.util.Map<String, String> checksums;";
- out << sp << nl << "static";
- out << sb;
- out << nl << "java.util.Map<String, String> map = new java.util.HashMap<String, String>();";
- for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p)
- {
- out << nl << "map.put(\"" << p->first << "\", \"";
- ostringstream str;
- str.flags(ios_base::hex);
- str.fill('0');
- for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q)
- {
- str << static_cast<int>(*q);
- }
- out << str.str() << "\");";
- }
- out << nl << "checksums = java.util.Collections.unmodifiableMap(map);";
-
- out << eb;
- out << eb;
- out << nl;
-}
-
Slice::GenCompat::OpsVisitor::OpsVisitor(const string& dir) :
JavaCompatVisitor(dir)
{
diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h
index 8000f941d0d..4d10bb9c9ef 100644
--- a/cpp/src/slice2java/GenCompat.h
+++ b/cpp/src/slice2java/GenCompat.h
@@ -7,7 +7,6 @@
#include <Slice/Parser.h>
#include <Slice/JavaUtil.h>
-#include <Slice/Checksum.h>
namespace Slice
{
@@ -133,8 +132,6 @@ public:
void generateImpl(const UnitPtr&);
void generateImplTie(const UnitPtr&);
- static void writeChecksumClass(const std::string&, const std::string&, const ChecksumMap&);
-
private:
std::string _base;
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index a62eb17ed25..2474e0bded0 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -75,7 +75,6 @@ usage(const string& n)
"--tie Generate tie classes. (Java Compat Only)\n"
"--impl Generate sample implementations.\n"
"--impl-tie Generate sample tie implementations. (Java Compat Only)\n"
- "--checksum CLASS Generate checksums for Slice definitions into CLASS.\n"
"--meta META Define file metadata directive META.\n"
"--list-generated Emit list of generated files in XML format.\n"
"--ice Allow reserved Ice prefix in Slice identifiers\n"
@@ -107,7 +106,6 @@ compile(const vector<string>& argv)
opts.addOpt("d", "debug");
opts.addOpt("", "ice");
opts.addOpt("", "underscore");
- opts.addOpt("", "checksum", IceUtilInternal::Options::NeedArg);
opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
opts.addOpt("", "compat");
@@ -178,8 +176,6 @@ compile(const vector<string>& argv)
bool underscore = opts.isSet("underscore");
- string checksumClass = opts.optArg("checksum");
-
bool listGenerated = opts.isSet("list-generated");
StringList globalMetadata;
@@ -235,8 +231,6 @@ compile(const vector<string>& argv)
int status = EXIT_SUCCESS;
- ChecksumMap checksums;
-
IceUtil::CtrlCHandler ctrlCHandler;
ctrlCHandler.setCallback(interruptedCallback);
@@ -366,15 +360,6 @@ compile(const vector<string>& argv)
gen.generateImpl(p);
}
}
-
- if(!checksumClass.empty())
- {
- //
- // Calculate checksums for the Slice definitions in the unit.
- //
- ChecksumMap m = createChecksums(p);
- copy(m.begin(), m.end(), inserter(checksums, checksums.begin()));
- }
}
catch(const Slice::FileException& ex)
{
@@ -417,23 +402,6 @@ compile(const vector<string>& argv)
writeDependencies(os.str(), dependFile);
}
- if(status == EXIT_SUCCESS && !checksumClass.empty() && !dependxml)
- {
- try
- {
- Gen::writeChecksumClass(checksumClass, output, checksums);
- }
- catch(const Slice::FileException& ex)
- {
- //
- // If a file could not be created, then cleanup any created files.
- //
- FileTracker::instance()->cleanup();
- consoleErr << argv[0] << ": error: " << ex.reason() << endl;
- return EXIT_FAILURE;
- }
- }
-
if(listGenerated)
{
FileTracker::instance()->dumpxml();