Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

issue #329 pt 2

This commit is contained in:
Jan Steemann 2012-12-21 23:58:44 +01:00
parent 54cf382565
commit 09e204651e
2 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arangosh/V8Client/arangosh.cpp
View File

@ -123,7 +123,13 @@ static string StartupPath = "";
/// @brief javascript files to execute /// @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 /// @brief unit file test cases
@ -422,7 +428,8 @@ static void ParseProgramOptions (int argc, char* argv[]) {
ProgramOptionsDescription javascript("JAVASCRIPT options"); ProgramOptionsDescription javascript("JAVASCRIPT options");
javascript 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.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.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") ("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 // 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(); BaseClient.shutup();
} }
} }
@ -931,22 +938,29 @@ static bool RunUnitTests (v8::Handle<v8::Context> context) {
/// @brief executes the Javascript files /// @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::HandleScope scope;
v8::TryCatch tryCatch; v8::TryCatch tryCatch;
bool ok; bool ok;
ok = true; ok = true;
for (size_t i = 0; i < Scripts.size(); ++i) { for (size_t i = 0; i < scripts.size(); ++i) {
if (! FileUtils::exists(Scripts[i])) { if (! FileUtils::exists(scripts[i])) {
cerr << "error: Javascript file not found: '" << Scripts[i].c_str() << "'" << endl; cerr << "error: Javascript file not found: '" << scripts[i].c_str() << "'" << endl;
BaseClient.log("error: Javascript file not found: '%s'\n", Scripts[i].c_str()); BaseClient.log("error: Javascript file not found: '%s'\n", scripts[i].c_str());
ok = false; ok = false;
break; 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()) { if (tryCatch.HasCaught()) {
string exception(TRI_StringifyV8Exception(&tryCatch)); string exception(TRI_StringifyV8Exception(&tryCatch));
@ -1327,7 +1341,7 @@ int main (int argc, char* argv[]) {
// run normal shell // run normal shell
// ............................................................................. // .............................................................................
if (Scripts.empty() && UnitTests.empty() && JsLint.empty()) { if (ExecuteScripts.empty() && CheckScripts.empty() && UnitTests.empty() && JsLint.empty()) {
RunShell(context); RunShell(context);
} }
@ -1338,9 +1352,13 @@ int main (int argc, char* argv[]) {
else { else {
bool ok = false; bool ok = false;
if (! Scripts.empty()) { if (! ExecuteScripts.empty()) {
// we have scripts to execute // we have scripts to execute or syntax check
ok = RunScripts(context); ok = RunScripts(context, ExecuteScripts, true);
}
else if (! CheckScripts.empty()) {
// we have scripts to syntax check
ok = RunScripts(context, CheckScripts, false);
} }
else if (! UnitTests.empty()) { else if (! UnitTests.empty()) {
// we have unit tests // we have unit tests

10
lib/V8/v8-utils.cpp
View File

@ -459,11 +459,13 @@ static bool LoadJavaScriptFile (v8::Handle<v8::Context> context,
return false; return false;
} }
// execute script if (execute) {
v8::Handle<v8::Value> result = script->Run(); // execute script
v8::Handle<v8::Value> result = script->Run();
if (result.IsEmpty()) { if (result.IsEmpty()) {
return false; return false;
}
} }
LOG_TRACE("loaded java script file: '%s'", filename); LOG_TRACE("loaded java script file: '%s'", filename);