Changeset 21104

Timestamp:

10/11/08 08:36:18 (3 months ago)

Author:

tokuhirom

Message:

added --eval option support with gengetopt++

Location:

lang/cplusplus/llv8call/trunk

Files:

• Sconstruct (modified) (2 diffs)
• src/SConscript (modified) (1 diff)
• src/cmdline.c (added)
• src/cmdline.h (added)
• src/llv8call.ggo (added)
• src/main.cc (modified) (3 diffs)

lang/cplusplus/llv8call/trunk/Sconstruct

@@ +1 @@
+PACKAGE='llv8call'
 VERSION='0.12'
 
@@ -63 +64 @@
     '-DPATHSEP=%s' % fixquote(re.sub("\\\\", "\\\\\\\\", os.pathsep)),
     '-DVERSION=%s' % fixquote(VERSION),
+    '-DCMDLINE_PARSER_VERSION=%s' % fixquote(VERSION),
+    '-DCMDLINE_PARSER_PACKAGE=%s' % fixquote(PACKAGE),
     '-DSHLIBPREFIX=%s' % fixquote(env.subst(env['SHLIBPREFIX'])),
     '-DSHLIBSUFFIX=%s' % fixquote(env.subst(env['SHLIBSUFFIX'])),

lang/cplusplus/llv8call/trunk/src/SConscript

@@ -16 +16 @@
 prog = env.Program(
     "llv8call",
-    Split("main.cc util.cc builtins.cc ../v8ext/v8ext.cc sys.cc "),
+    Split("main.cc util.cc builtins.cc ../v8ext/v8ext.cc sys.cc cmdline.c"),
     LIBS=libs,
 )

lang/cplusplus/llv8call/trunk/src/main.cc

@@ -12 +12 @@
 #endif
 #include "util.h"
+#include "cmdline.h"
 #include "v8ext.h"
 
@@ -117 +118 @@
 
 int main(int argc, char ** argv) {
+    gengetopt_args_info args_info;
+    if (cmdline_parser (argc, argv, &args_info) != 0) {
+        return 1;
+    }
+
     // initialize
     V8::SetFlagsFromCommandLine(&argc, argv, true);
@@ -134 +140 @@
 
     // setup argv
-    Handle<Array> ARGV = Array::New(argc);
-    for (int i=1; i<argc; i++) {
-        ARGV->Set(Int32::New(i-1), String::New(argv[i]));
+    Handle<Array> ARGV = Array::New(args_info.inputs_num);
+    for (unsigned int i=1; i<args_info.inputs_num; i++) {
+        ARGV->Set(Int32::New(i-1), String::New(args_info.inputs[i]));
     }
     context->Global()->Set(String::New("ARGV"), ARGV);
 
     // process main
-    if (argc >= 2) {
+    if (args_info.eval_given) {
+        if (!Exec(String::New(args_info.eval_arg), Undefined(), false)) {
+            return 1;
+        } else {
+            return 0;
+        }
+    } else if (args_info.inputs_num >= 1) {
         const char *srcfile = argv[1];
         Handle<String> file_name = String::New(srcfile);