Merge Optional github

1 files changed, 13 insertions, 5 deletions

diff --git a/theme/javascript/utils/execute.js b/theme/javascript/utils/execute.js
index 76033f6..eb2a19b 100644
--- a/theme/javascript/utils/execute.js
+++ b/theme/javascript/utils/execute.js
@@ -71,13 +71,21 @@ define([
         repl.loadLanguage(lang.id, eventHandler);
     };
 
-    var execute = function(lang, solution, validation, callback) {
+    var execute = function(lang, solution, validation, context, callback) {
+        // Language data
+        var langd =  LANGUAGES[lang];
+
         // Check language is supported
-        if (!LANGUAGES[lang]) return callback(new Error("Language '"+lang+"' not available for execution"));
+        if (!langd) return callback(new Error("Language '"+lang+"' not available for execution"));
 
         // Validate with validation code
-        var code = [solution, LANGUAGES[lang].assertCode, validation].join(";\n");
-        evalJS(LANGUAGES[lang], code, function(err, res) {
+        var code = [
+            context,
+            solution,
+            langd.assertCode,
+            validation,
+        ].join(langd.sep);
+        evalJS(langd, code, function(err, res) {
             if(err) return callback(err);
 
             if (res.type == "error") callback(new Error(res.value));
@@ -86,4 +94,4 @@ define([
     };
 
     return execute;
-});
\ No newline at end of file
+});