From 11b8ba2adef15fa4047eef16bea1ff6853331059 Mon Sep 17 00:00:00 2001
From: Ryuichi Ueda <ryuichiueda@gmail.com>
Date: Sun, 26 Mar 2017 22:06:02 +0900
Subject: [PATCH] Color the error of the script

---
 src/Script.cc | 27 ++++++++++++++++-----------
 src/Script.h  |  1 +
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Script.cc b/src/Script.cc
index 1c944aa..6b4023c 100644
--- a/src/Script.cc
+++ b/src/Script.cc
@@ -35,15 +35,14 @@ bool Script::parse(void)
 	catch(Element *e){
 		printErrorMsg(e,"Parse error");
 		m_env->removeFiles();
-		cerr << "\tERROR: " << e->m_exit_status << endl;
-		exit(e->m_exit_status);
+		end(e->m_exit_status);
 	}catch(...){
 		cerr << "\nParse error"
 		     << "\nunknown error" << endl;
 		m_env->removeFiles();
-		cerr << "\tERROR: 128" << endl;
-		exit(128);
+		end(128);
 	}
+	return true;
 }
 
 bool Script::parseScript(void)
@@ -92,22 +91,21 @@ int Script::exec(DefFile *f, DefFile *ef, DefStr *s)
 		}
 		m_env->removeFiles();
 		if(exit_status == 0)
-			exit(0);
+			end(0);
 	}catch(Element *e){
 		printErrorMsg(e,"Execution error",m_silent);
 		m_env->removeFiles();
-		exit(e->getExitStatus());
+		end(e->getExitStatus());
 	}catch(...){
 		cerr << "\nExecution error\n"
 		     << "unknown error" << endl;
 		m_env->removeFiles();
-		cerr << "\tERROR: 3" << endl;
-		exit(3);
+		end(3);
 	}
 	cerr << "unknown error (uncatched)" << endl;
 	m_env->removeFiles();
-	cerr << "\tERROR: 3" << endl;
-	exit(3);
+	end(3);
+	return 0;
 }
 
 void Script::printErrorMsg(Element *e,string error_type, bool silent)
@@ -115,7 +113,7 @@ void Script::printErrorMsg(Element *e,string error_type, bool silent)
 	if(silent)
 		return;
 
-	cerr << "\n" << error_type << " at " << e->pos() << endl;
+	cerr << error_type << " at " << e->pos() << endl;
 	e->printErrorPart();
 	cerr << "\n\t" << e->m_error_msg
 	     << "\n\tprocess_level " << e->getLevel()
@@ -123,3 +121,10 @@ void Script::printErrorMsg(Element *e,string error_type, bool silent)
 	     << "\n\tpid " << getpid() << endl;
 }
 
+void Script::end(int exit_status)
+{
+	if(exit_status != 0 and m_env->m_level == 0)
+		cerr << "\e[31mERROR: " << exit_status << "\e[m" << endl;
+	exit(exit_status);
+}
+
diff --git a/src/Script.h b/src/Script.h
index 980884b..00e9da8 100644
--- a/src/Script.h
+++ b/src/Script.h
@@ -27,5 +27,6 @@ class Script : public Element
 	void printErrorMsg(Element *e,string error_type,bool silent = false);
 	bool parseScript(void);
 	bool m_silent;
+	void end(int exit_status);
 };
 #endif