monad update: quotes and removed total score

git-svn-id: https://subversion.cs.illinois.edu/svn/cs225@5704 6fbd10e7-183d-0410-a318-cb416676e4f2

.monadid

 monad identification file
 This file is used for monad directory identification
-Built by toole1 on linux3.ews.illinois.edu
-Build Date: Fri Dec 9 15:37:13 CST 2011
+Built by toole1 on linux1.ews.illinois.edu
+Build Date: Sat Dec 10 03:45:14 CST 2011

ccmonad.cpp

@@ -77,7 +77,7 @@ int main(int argc, const char * const * argv)
 			string line;
 			getline(input, line);
 			vector<string> tokens = tokenize(line, " \t");
-			if (tokens.size() == 2 && tokens[0] == "#if" && tokens[1] == "MONAD_SPLIT")
+			if (tokens.size() >= 2 && tokens[0] == "#if" && tokens[1] == "MONAD_SPLIT")
 				splits.push_back(line_i);
 		}
 
@@ -92,6 +92,14 @@ int main(int argc, const char * const * argv)
 			args.push_back("-DMONAD_SPLIT_LINE_NUMBER=" + lexical_cast<string>(splits[split_i]));
 			args.push_back("-o");
 			args.push_back(outputFile + "." + split_i);
+		
+#if 0
+			cout << "\tmonacc: " << compiler;
+			for (size_t i = 0; i < args.size(); i++)
+				cout << ' ' << args[i];
+			cout << endl;
+#endif
+
 			int8_t result2 = exec(compiler, args);
 			if (result2 == 0)
 				intermediate_outputs.push_back(outputFile + "." + split_i);

monad.cpp

@@ -38,6 +38,7 @@ bool newtests = false;
 bool provided = false;
 
 bool verbose  = false;
+bool buffer   = true;
 bool valgrind = false;
 bool parallel = false;
 
@@ -139,9 +140,11 @@ int main(int argc, const char * const * argv)
 	// TODO exec("make", "--quiet", "--warn-undefined-variables", 
 
 	cout << endl << endl;
-	const char * verboseflag  = (opts::verbose  ? "--verbose"  : NULL);
-	const char * valgrindflag = (opts::valgrind ? "--valgrind" : NULL);
-	int score = exec("./proxy", verboseflag, valgrindflag);
+	vector<string> args;
+	if (opts::verbose) args.push_back("--verbose");
+	if (opts::valgrind) args.push_back("--valgrind");
+	if (!opts::buffer) args.push_back("--noredirect");
+	int score = exec("./proxy", args);
 
 	// TODO (toole1): this causes weird output when scores are like 200
 	if (score < 0)
@@ -187,6 +190,7 @@ void monad::processArgs(int argc, const char * const * argv)
 	
 	options.addOption("optimize", opts::optimize);
 	options.addOption("verbose",  opts::verbose);
+	options.addOption("buffer",   opts::buffer);
 	options.addOption("valgrind", opts::valgrind);
 	options.addOption("parallel", opts::parallel);
 

proxy.cpp

@@ -305,7 +305,7 @@ int RunTests::run_all_tests()
 
 	cout << endl << endl;
 	output_detailed_info_if_any_failed(results, score);
-	output::total_score(score, get_sum_points());
+	output::total_score(score, -1);
 	
 	return score;
 }
@@ -352,7 +352,7 @@ void RunTests::output_detailed_info_if_any_failed(const vector<unit_test_result>
 	
 void RunTests::output_detailed_tests_info(const vector<unit_test_result> & results, int32_t score)
 {
-	output::total_score(score, get_sum_points());
+	output::total_score(score, -1);
 	cout << endl << endl;
 	
 	output::header("Detailed test output");