From ab733ccb2ba624e18db298b7a2bd639f0aa5e057 Mon Sep 17 00:00:00 2001
From: toole1 <toole1@6fbd10e7-183d-0410-a318-cb416676e4f2>
Date: Sat, 16 Jul 2011 02:38:52 +0000
Subject: [PATCH] jack
git-svn-id: https://subversion.cs.illinois.edu/svn/cs225@3371 6fbd10e7-183d-0410-a318-cb416676e4f2
---
monad.cpp | 19 -------------------
monad_shared.cpp | 22 +++++++++++++++++++++-
monad_shared.h | 10 ++++++++++
proxy.cpp | 12 ------------
proxy.h | 1 -
5 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/monad.cpp b/monad.cpp
index cd848d0..81fe55b 100755
--- a/monad.cpp
+++ b/monad.cpp
@@ -24,7 +24,6 @@ namespace monad
{
void find_base_dir(const char * argv0);
void printHelp();
-void printInfo();
void processArgs(int argc, char ** argv);
void copyRequiredFiles();
void getLibs(const vector<string> & libs);
@@ -57,12 +56,6 @@ bool optimize = false;
#endif
}
-namespace version {
-const char * official_name = "CS 225 Monad";
-const char * version_name = "awakening";
-const char * date = "15 July 2011";
-}
-
}
string kyleGetDate() {
@@ -311,18 +304,6 @@ void monad::printHelp()
}
-void monad::printInfo()
-{
- cout << version::official_name << endl
- << "Version " << version::version_name << endl
- << "Released " << version::date << endl
- << "Developed by Jack Toole Spring/Fall 2011" << endl
- << "Copyright 2011 Jack Toole" << endl
- << "Full rights granted to Jack Toole. Rights to use and modify granted to" << endl
- << "University of Illinois Urbana-Champaign Computer Science Data Structures" << endl
- << "instructors and course staff" << endl;
-}
-
void monad::copyRequiredFiles()
{
diff --git a/monad_shared.cpp b/monad_shared.cpp
index 7fe7d2f..6a853b2 100755
--- a/monad_shared.cpp
+++ b/monad_shared.cpp
@@ -10,8 +10,29 @@ using std::endl;
namespace monad_shared
{
+
+namespace version
+{
+const char * official_name = "CS 225 Monad";
+const char * version_name = "awakening";
+const char * date = "15 July 2011";
+}
+
const char * unit_test::pass_string = "~~PASSED~~";
+void printInfo()
+{
+ cout << version::official_name << endl
+ << "Version " << version::version_name << endl
+ << "Released " << version::date << endl
+ << "Developed by Jack Toole Spring/Fall 2011" << endl
+ << "Copyright 2011 Jack Toole" << endl
+ << "Full rights granted to Jack Toole. Rights to use and modify granted to" << endl
+ << "University of Illinois Urbana-Champaign Computer Science Data Structures" << endl
+ << "instructors and course staff" << endl;
+}
+
+
namespace output
{
@@ -114,7 +135,6 @@ void detailed_info(const unit_test & curr_test)
cout << endl;
}
-
} // namespace output
} // namespace monad_shared
diff --git a/monad_shared.h b/monad_shared.h
index b1136cc..d2c0980 100755
--- a/monad_shared.h
+++ b/monad_shared.h
@@ -6,6 +6,16 @@
namespace monad_shared
{
+
+ namespace version
+ {
+ extern const char * official_name;
+ extern const char * version_name;
+ extern const char * date;
+ }
+
+ void printInfo();
+
struct unit_test
{
typedef std::string return_type;
diff --git a/proxy.cpp b/proxy.cpp
index f8e619c..8659a24 100755
--- a/proxy.cpp
+++ b/proxy.cpp
@@ -671,18 +671,6 @@ long UnitTestContainer::end_timeout()
}
-void RunTests::printInfo()
-{
- cout << "CS 225 RunTests" << endl
- << "Version 1.0 : 2 February 2011" << endl
- << "Developed by Jack Toole Spring 2011" << endl
- << "Copyright 2011 Jack Toole" << endl
- << "Full rights granted to Jack Toole. Rights to use and modify granted to" << endl
- << "University of Illinois Urbana-Champaign Computer Science Data Structures" << endl
- << "instructors and course staff" << endl;
-}
-
-
UnitTestContainer::UnitTestContainer(unit_test & _test, RunTimeEnvironment & env)
: environment(env), test(_test) { }
diff --git a/proxy.h b/proxy.h
index 965184c..31e5352 100755
--- a/proxy.h
+++ b/proxy.h
@@ -91,7 +91,6 @@ namespace proxy
private:
void redirect_glibc_to_stderr();
void process_args(int argc, char ** argv);
- void printInfo();
protected:
int32_t execute_by_mode();
--
GitLab