From 53192a5f757064b9f8873ea3fcfc7f9cd01e587c Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Wed, 8 Jun 2016 11:18:52 +0530
Subject: made changes to stdio evaluator and added bash evaluator with test
 cases

---
 yaksh/stdio_evaluator.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'yaksh/stdio_evaluator.py')

diff --git a/yaksh/stdio_evaluator.py b/yaksh/stdio_evaluator.py
index 037ad3d..236c0ab 100644
--- a/yaksh/stdio_evaluator.py
+++ b/yaksh/stdio_evaluator.py
@@ -1,23 +1,22 @@
 class Evaluator(object):
-
     def evaluate(self, user_answer, proc, expected_input, expected_output):
+        
         success = False
-        if expected_input:
-            ip = expected_input.replace(",", " ")
-            proc.stdin.write('{0}\n'.format(ip))
-            error_msg = " Given Input is {0} \n Expected Output is {1} ".\
-                        format(expected_input, expected_output)
-        else:
-            error_msg = "Expected output is {0}".format(expected_output)
-        output_err = proc.stderr.read()
-        user_output = proc.stdout.read()
+        ip = expected_input.replace(",", " ")
+        user_output, output_err = proc.communicate(input='{0}\n'.format(ip))
         expected_output = expected_output.replace("\r", "")
+        if not expected_input:
+            error_msg = "Expected Output is {0} ".\
+                        format(repr(expected_output))
+        else:
+            error_msg = " Given Input is {0} \n Expected Output is {1} ".\
+                        format(expected_input, repr(expected_output))
         if output_err == '':
             if user_output == expected_output:
                 success, err = True, "Correct Answer"
             else:
                 err = " Incorrect Answer\n" + error_msg +\
-                      "\n Your output is {0}".format(user_output)
+                      "\n Your output is {0}".format(repr(user_output))
         else:
             err = "Error:"+"\n"+output_err
         return success, err
-- 
cgit