static Persistent<String> emit_symbol;
+static bool print_eval = false;
static char *eval_string = NULL;
static int option_end_index = 0;
static bool use_debug_agent = false;
// -e, --eval
if (eval_string) {
process->Set(String::NewSymbol("_eval"), String::New(eval_string));
+ process->Set(String::NewSymbol("_print_eval"), Boolean::New(print_eval));
}
size_t size = 2*PATH_MAX;
"Options:\n"
" -v, --version print node's version\n"
" -e, --eval script evaluate script\n"
+ " -p, --print print result of --eval\n"
" --v8-options print v8 command line options\n"
" --vars print various compiled-in variables\n"
" --max-stack-size=val set max v8 stack size (bytes)\n"
} else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
PrintHelp();
exit(0);
- } else if (strcmp(arg, "--eval") == 0 || strcmp(arg, "-e") == 0) {
+ } else if (strcmp(arg, "--eval") == 0 || strcmp(arg, "-e") == 0 ||
+ strcmp(arg, "-pe") == 0) {
if (argc <= i + 1) {
fprintf(stderr, "Error: --eval requires an argument\n");
exit(1);
}
+ if (arg[1] == 'p') {
+ print_eval = true;
+ }
argv[i] = const_cast<char*>("");
eval_string = argv[++i];
+ } else if (strcmp(arg, "--print") == 0 || strcmp(arg, "-p") == 0) {
+ print_eval = true;
+ argv[i] = const_cast<char*>("");
} else if (strcmp(arg, "--v8-options") == 0) {
argv[i] = const_cast<char*>("--help");
} else if (argv[i][0] != '-') {
var module = new Module('eval');
module.filename = path.join(cwd, 'eval');
module.paths = Module._nodeModulePaths(cwd);
- module._compile('eval(process._eval)', 'eval');
-
+ var result = module._compile('return eval(process._eval)', 'eval');
+ if (process._print_eval) console.log(result);
} else if (process.argv[1]) {
// make process.argv[1] into a full path
var path = NativeModule.require('path');
assert.equal(stderr, '42\n');
});
+// assert that nothing is written to stdout
+['--print --eval', '-p -e', '-pe'].forEach(function(s) {
+ var cmd = nodejs + ' ' + s + ' ';
+
+ child.exec(cmd + '42',
+ function(err, stdout, stderr) {
+ assert.equal(stdout, '42\n');
+ });
+
+ child.exec(cmd + "'[]'",
+ function(err, stdout, stderr) {
+ assert.equal(stdout, '[]\n');
+ });
+});
+
// assert that module loading works
child.exec(nodejs + ' --eval "require(\'' + filename + '\')"',
function(status, stdout, stderr) {