Changeset 14084 for trunk/FACT++/src/InterpreterV8.cc

Timestamp:

06/05/12 17:28:10 (12 years ago)

Author:

tbretz

Message:

Removed 'name' function and return a state-object instead.

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (5 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -204 +204 @@
         return ThrowException(String::New("Argument 1 must be a string."));
 
-    const HandleScope handle_scope;
+    // Return state.name/state.index
+
+    HandleScope handle_scope;
 
     const String::Utf8Value str(args[0]);
-    return Integer::New(JsState(*str));
-}
-
-Handle<Value> InterpreterV8::FuncName(const Arguments& args)
-{
-    if (args.Length()!=1)
-        return ThrowException(String::New("Number of arguments must be exactly 1."));
-
-    if (!args[0]->IsString())
-        return ThrowException(String::New("Argument 1 must be a string."));
-
-    const HandleScope handle_scope;
-
-    const String::Utf8Value str(args[0]);
-    return String::New(JsName(*str).c_str());
+
+    const pair<int32_t, string> rc = JsState(*str);
+
+    Handle<ObjectTemplate> obj = ObjectTemplate::New();
+    obj->Set(String::New("index"), rc.first <=-256?Undefined():Integer::New(rc.first),          ReadOnly);
+    obj->Set(String::New("name"),  rc.first <=-256?Undefined():String::New (rc.second.c_str()), ReadOnly);
+ 
+    return handle_scope.Close(obj->NewInstance());
 }
 
@@ -281 +276 @@
     return String::New(V8::GetVersion());
 }
-
-#include <iostream>
 
 bool InterpreterV8::JsRun(const string &filename, const map<string, string> &map)
@@ -299 +292 @@
     dim->Set(String::New("send"),    FunctionTemplate::New(WrapSend),    ReadOnly);
     dim->Set(String::New("state"),   FunctionTemplate::New(WrapState),   ReadOnly);
-    dim->Set(String::New("name"),    FunctionTemplate::New(WrapName),    ReadOnly);
     dim->Set(String::New("sleep"),   FunctionTemplate::New(WrapSleep),   ReadOnly);
 
@@ -331 +323 @@
     v8::Locker::StopPreemption();
     //context->Exit();
+
+    //context.Dispose();
 
     JsEnd(filename);
@@ -348 +342 @@
 
 #endif
+