Extending operators

jimtahu · Apr 25, 2013 · 2aa2379 · 2aa2379
1 parent 0dbea4f
commit 2aa2379
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/LangS.cpp b/LangS.cpp
@@ -62,12 +62,30 @@ string getValue(string name){
 * @return The result of the operation on the two values.
 */
 string binOP(string op, string a, string b){
+	if(!op.compare("+")){
 	try{
 		double x=str2num(a);
 		double y=str2num(b);
 		return num2str(x+y);
 	}catch(string tx){
 		return a+b;
-	}
+	}//end try
+	}else if(!op.compare("-")){
+	try{
+		double x=str2num(a);
+                double y=str2num(b);
+                return num2str(x-y);
+	}catch(string tx){
+		return "NaN";
+	}//end try
+	}else if(!op.compare("*")){
+	try{
+		double x=str2num(a);
+		double y=str2num(b);
+		return num2str(x*y);
+	}catch(string tx){
+		return "NaN";
+	}//end try
+	}else return a+b;
 }//end binOP