Revert "Fixing rlp"

This reverts commit ea850c9.

undo changes in rlp

Author: demon1999

rlp/main.cpp

@@ -1,7 +1,7 @@
 /*
 	This file is part of cpp-ethereum.
-	cpp-ethereum is free software: you can redistribute it and/or modify
 
+	cpp-ethereum is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
@@ -81,6 +81,7 @@ to set locale to fail, so there are only two possible actions, the first is to
 throw a runtime exception and cause the program to quit (default behaviour),
 or the second is to modify the environment to something sensible (least
 surprising behaviour).
+
 The follow code produces the least surprising behaviour. It will use the user
 specified default locale if it is valid, and if not then it will modify the
 environment the process is running in to use a sensible default. This also means
@@ -164,13 +165,8 @@ class RLPStreamer
 			for (auto i: _d)
 			{
 				m_out << (j++ ?
-<<<<<<< Updated upstream
 					(m_prefs.indent.empty() ? ", " : ("," + newline)) :
 					(m_prefs.indent.empty() ? " " : newline));
-=======
-						  (m_prefs.indent.empty() ? ", " : ("," + newline)) :
-						  (m_prefs.indent.empty() ? " " : newline));
->>>>>>> Stashed changes
 				output(i, _level + 1);
 			}
 			newline = newline.substr(0, newline.size() - m_prefs.indent.size());
@@ -220,44 +216,7 @@ int main(int argc, char** argv)
 	bool encrypt = false;
 	RLPStreamer::Prefs prefs;
 
-<<<<<<< Updated upstream
 	for (int i = 1; i < argc; ++i)
-=======
-	po::options_description renderOptions("Render options");
-	renderOptions.add_options()
-		("indent,i", po::value<string> (), "<string>  Use string as the level indentation (default '  ').")
-		("hex-ints", "Render integers in hex.")
-		("string-ints", "Render integers in the same way as strings.")
-		("ascii-strings", "Render data as C-style strings or hex depending on content being ASCII.")
-		("force-string", "Force all data to be rendered as C-style strings.")
-		("force-escape", "When rendering as C-style strings, force all characters to be escaped.")
-		("force-hex", "Force all data to be rendered as raw hex.");
-
-	po::options_description generalOptions("General options");
-	generalOptions.add_options()
-		("dapp,D", "Dapp-building mode; equivalent to --encrypt --64.")
-		("encrypt,e", "Encrypt the RLP data prior to output.")
-		("lenience,L", "Try not to bomb out early if possible.")
-		("hex,x", "Treat input RLP as hex encoded data.")
-		("base-16", "Treat input RLP as hex encoded data.")
-		("keccak,k", "Output Keccak-256 hash only.")
-		("base-64", "Treat input RLP as base-64 encoded data.")
-		("64", "Treat input RLP as base-64 encoded data.")
-		("bin,b", "Treat input RLP as raw binary data.")
-		("base-256", "Treat input RLP as raw binary data.")
-		("quiet,q", "Don't place additional information on stderr.")
-		("help,h", "Print this help message and exit.")
-		("version,V", "Show the version and exit.");
-
-	po::options_description allowedOptions("Allowed options");
-	allowedOptions.add(generalOptions).add(renderOptions);
-	po::parsed_options parsed = po::command_line_parser(argc, argv).options(allowedOptions).allow_unregistered().run();
-	vector<string> unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
-	po::variables_map vm;
-	po::store(parsed, vm);
-	po::notify(vm);
-	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
->>>>>>> Stashed changes
 	{
 		string arg = argv[i];
 		if (arg == "-h" || arg == "--help")
@@ -311,53 +270,6 @@ int main(int argc, char** argv)
 		else
 			otherInputs.push_back(arg);
 	}
-<<<<<<< Updated upstream
-=======
-	if (vm.count("help")) {
-		cout << "Usage rlp <mode> [OPTIONS]\nModes:\n"
-			 << "    create   <json>  Given a simplified JSON string, output the RLP." << endl
-			 << "    render   [ <file> | -- ]  Render the given RLP. Options:" << endl
-			 << "    list     [ <file> | -- ]  List the items in the RLP list by hash and size." << endl
-			 << "    extract  [ <file> | -- ]  Extract all items in the RLP list, named by hash." << endl
-			 << "    assemble [ <manifest> | <base path> ] <file> ...  Given a manifest & files, output the RLP." << endl
-			 << renderOptions << generalOptions;
-		exit(0);
-	}
-	if (vm.count("lenience"))
-		lenience = true;
-	if (vm.count("dapp"))
-		encrypt = true, encoding = Encoding::Base64;
-	if (vm.count("version"))
-		version();
-	if (vm.count("quiet"))
-		quiet = true;
-	if (vm.count("hex") || vm.count("base-16"))
-		encoding = Encoding::Hex;
-	if (vm.count("keccak"))
-		encoding = Encoding::Keccak;
-	if (vm.count("64") || vm.count("base-64"))
-		encoding = Encoding::Base64;
-	if (vm.count("bin") || vm.count("base-256"))
-		encoding = Encoding::Binary;
-	if (vm.count("encrypt"))
-		encrypt = true;
-	if (vm.count("indent"))
-		prefs.indent = vm["indent"].as<string>();
-	if (vm.count("hex-ints"))
-		prefs.hexInts = true;
-	if (vm.count("string-ints"))
-		prefs.stringInts = true;
-	if (vm.count("ascii-strings"))
-		prefs.forceString = prefs.forceHex = false;
-	if (vm.count("force-string"))
-		prefs.forceString = true;
-	if (vm.count("force-hex"))
-		prefs.forceHex = true, prefs.forceString = false;
-	if (vm.count("force-escape"))
-		prefs.escapeAll = true;
-	if (vm.count("nice"))
-		prefs.forceString = true, prefs.stringInts = false, prefs.forceHex = false, prefs.indent = "  ";
->>>>>>> Stashed changes
 
 	bytes in;
 	if (inputFile == "--")
@@ -590,4 +502,4 @@ int main(int argc, char** argv)
 	}
 
 	return 0;
-}
+}