From 09e204651ee1f87a1f03b6bc4bccae53e584d49b Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Fri, 21 Dec 2012 23:58:44 +0100
Subject: [PATCH] issue #329 pt 2

---
 arangosh/V8Client/arangosh.cpp | 44 ++++++++++++++++++++++++----------
 lib/V8/v8-utils.cpp            | 10 ++++----
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/arangosh/V8Client/arangosh.cpp b/arangosh/V8Client/arangosh.cpp
index e9897589fc..6fe2084768 100644
--- a/arangosh/V8Client/arangosh.cpp
+++ b/arangosh/V8Client/arangosh.cpp
@@ -123,7 +123,13 @@ static string StartupPath = "";
 /// @brief javascript files to execute
 ////////////////////////////////////////////////////////////////////////////////
 
-static vector<string> Scripts;
+static vector<string> ExecuteScripts;
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief javascript files to syntax check
+////////////////////////////////////////////////////////////////////////////////
+
+static vector<string> CheckScripts;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief unit file test cases
@@ -422,7 +428,8 @@ static void ParseProgramOptions (int argc, char* argv[]) {
   ProgramOptionsDescription javascript("JAVASCRIPT options");
 
   javascript
-    ("javascript.execute", &Scripts, "execute Javascript code from file")
+    ("javascript.execute", &ExecuteScripts, "execute Javascript code from file")
+    ("javascript.check", &CheckScripts, "syntax check code Javascript code from file")
     ("javascript.modules-path", &StartupModules, "one or more directories separated by cola")
     ("javascript.startup-directory", &StartupPath, "startup paths containing the JavaScript files; multiple directories can be separated by cola")
     ("javascript.unit-tests", &UnitTests, "do not start as shell, run unit tests instead")
@@ -462,7 +469,7 @@ static void ParseProgramOptions (int argc, char* argv[]) {
   }
 
   // disable excessive output in non-interactive mode
-  if (! Scripts.empty() || ! UnitTests.empty() || ! JsLint.empty()) {
+  if (! ExecuteScripts.empty() || ! CheckScripts.empty() || ! UnitTests.empty() || ! JsLint.empty()) {
     BaseClient.shutup();
   }
 }
@@ -931,22 +938,29 @@ static bool RunUnitTests (v8::Handle<v8::Context> context) {
 /// @brief executes the Javascript files
 ////////////////////////////////////////////////////////////////////////////////
 
-static bool RunScripts (v8::Handle<v8::Context> context) {
+static bool RunScripts (v8::Handle<v8::Context> context, 
+                        const vector<string>& scripts, 
+                        const bool execute) {
   v8::HandleScope scope;
   v8::TryCatch tryCatch;
   bool ok;
 
   ok = true;
 
-  for (size_t i = 0;  i < Scripts.size();  ++i) {
-    if (! FileUtils::exists(Scripts[i])) {
-      cerr << "error: Javascript file not found: '" << Scripts[i].c_str() << "'" << endl;
-      BaseClient.log("error: Javascript file not found: '%s'\n", Scripts[i].c_str());
+  for (size_t i = 0;  i < scripts.size();  ++i) {
+    if (! FileUtils::exists(scripts[i])) {
+      cerr << "error: Javascript file not found: '" << scripts[i].c_str() << "'" << endl;
+      BaseClient.log("error: Javascript file not found: '%s'\n", scripts[i].c_str());
       ok = false;
       break;
     }
 
-    TRI_ExecuteJavaScriptFile(context, Scripts[i].c_str());
+    if (execute) {
+      TRI_ExecuteJavaScriptFile(context, scripts[i].c_str());
+    }
+    else {
+      TRI_LoadJavaScriptFile(context, scripts[i].c_str());
+    }
   
     if (tryCatch.HasCaught()) {
       string exception(TRI_StringifyV8Exception(&tryCatch));
@@ -1327,7 +1341,7 @@ int main (int argc, char* argv[]) {
   // run normal shell
   // .............................................................................
 
-  if (Scripts.empty() && UnitTests.empty() && JsLint.empty()) {
+  if (ExecuteScripts.empty() && CheckScripts.empty() && UnitTests.empty() && JsLint.empty()) {
     RunShell(context);
   }
 
@@ -1338,9 +1352,13 @@ int main (int argc, char* argv[]) {
   else {
     bool ok = false;
 
-    if (! Scripts.empty()) {
-      // we have scripts to execute
-      ok = RunScripts(context);
+    if (! ExecuteScripts.empty()) {
+      // we have scripts to execute or syntax check
+      ok = RunScripts(context, ExecuteScripts, true);
+    }
+    else if (! CheckScripts.empty()) {
+      // we have scripts to syntax check
+      ok = RunScripts(context, CheckScripts, false);
     }
     else if (! UnitTests.empty()) {
       // we have unit tests
diff --git a/lib/V8/v8-utils.cpp b/lib/V8/v8-utils.cpp
index b304a40fe1..aa75b14907 100644
--- a/lib/V8/v8-utils.cpp
+++ b/lib/V8/v8-utils.cpp
@@ -459,11 +459,13 @@ static bool LoadJavaScriptFile (v8::Handle<v8::Context> context,
     return false;
   }
 
-  // execute script
-  v8::Handle<v8::Value> result = script->Run();
+  if (execute) {
+    // execute script
+    v8::Handle<v8::Value> result = script->Run();
 
-  if (result.IsEmpty()) {
-    return false;
+    if (result.IsEmpty()) {
+      return false;
+    }
   }
 
   LOG_TRACE("loaded java script file: '%s'", filename);