Changeset 14641 for trunk/FACT++

Timestamp:

11/17/12 15:52:14 (12 years ago)

Author:

tbretz

Message:

Converted dim.subscrib into object Subscription

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (5 diffs)
• InterpreterV8.h (modified) (2 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -1116 +1116 @@
 }*/
 
-Handle<Value> InterpreterV8::FuncSubscribe(const Arguments &args)
-{
+Handle<Value> InterpreterV8::FuncSubscription(const Arguments &args)
+{
+    if (!args.IsConstructCall())
+        return ThrowException(String::New("Subscription must be calles as constructor."));
+
     if (args.Length()!=1)
         return ThrowException(String::New("Number of arguments must be exactly 1."));
@@ -1123 +1126 @@
     if (!args[0]->IsString())
         return ThrowException(String::New("Argument 1 must be a string."));
-
-    //if (!args.IsConstructCall())
-    //    return ThrowException(String::New("Must be used as constructor."));
 
     const String::Utf8Value str(args[0]);
@@ -1139 +1139 @@
     HandleScope handle_scope;
 
-    Handle<ObjectTemplate> tem = ObjectTemplate::New();
-    tem->Set(String::New("get"),    FunctionTemplate::New(WrapGetData),  ReadOnly);
-    tem->Set(String::New("close"),  FunctionTemplate::New(WrapClose),    ReadOnly);
-    tem->Set(String::New("name"),   String::New(*str), ReadOnly);
-    tem->Set(String::New("isOpen"), Boolean::New(true));
-    tem->SetInternalFieldCount(1);
-    //tem->Set(String::New("toString"), String::New(("[object Dim "+string(*str)+"]").c_str()), ReadOnly);
-
-    Handle<Object> obj = tem->NewInstance();
-    if (obj.IsEmpty())
-        return Undefined();
-
-    obj->SetInternalField(0, External::New(ptr));
-
-    fReverseMap[*str] = Persistent<Object>::New(obj);
-
-    return handle_scope.Close(obj);
+    Handle<Object> This = args.This();
+    This->Set(String::New("get"),    FunctionTemplate::New(WrapGetData)->GetFunction(),  ReadOnly);
+    This->Set(String::New("close"),  FunctionTemplate::New(WrapClose)->GetFunction(),    ReadOnly);
+    This->Set(String::New("name"),   String::New(*str), ReadOnly);
+    This->Set(String::New("isOpen"), Boolean::New(true));
+    This->SetInternalField(0, External::New(ptr));
+
+    fReverseMap[*str] = Persistent<Object>::New(This);
+
+    return Undefined();//handle_scope.Close(obj);
 
     // Persistent<Object> p = Persistent<Object>::New(obj->NewInstance());
@@ -1698 +1691 @@
     dim->Set(String::New("getState"),  FunctionTemplate::New(WrapGetState),  ReadOnly);
     dim->Set(String::New("sleep"),     FunctionTemplate::New(WrapSleep),     ReadOnly);
-    dim->Set(String::New("kill"),      FunctionTemplate::New(WrapKill),      ReadOnly);
-    dim->Set(String::New("subscribe"), FunctionTemplate::New(WrapSubscribe), ReadOnly);
     dim->Set(String::New("file"),      FunctionTemplate::New(WrapFile),      ReadOnly);
 
-    // timeout   -> Thread  - class?
-    // subscribe -> Service - class?
     // file      -> File    - class?
     // new class State ?
@@ -1719 +1708 @@
     global->Set(String::New("exit"),     FunctionTemplate::New(WrapExit),                   ReadOnly);
     global->Set(String::New("version"),  FunctionTemplate::New(InterpreterV8::FuncVersion), ReadOnly);
+
+    Handle<FunctionTemplate> sub = FunctionTemplate::New(WrapSubscription);
+    sub->SetClassName(String::New("Subscription"));
+    sub->InstanceTemplate()->SetInternalFieldCount(1);
+    global->Set(String::New("Subscription"), sub, ReadOnly);
 
     Handle<FunctionTemplate> db = FunctionTemplate::New(WrapDatabase);

trunk/FACT++/src/InterpreterV8.h

@@ -73 +73 @@
     v8::Handle<v8::Value> FuncNewState(const v8::Arguments& args);
     //v8::Handle<v8::Value> FuncOpen(const v8::Arguments& args);
-    v8::Handle<v8::Value> FuncSubscribe(const v8::Arguments& args);
+    v8::Handle<v8::Value> FuncSubscription(const v8::Arguments& args);
     v8::Handle<v8::Value> FuncGetData(const v8::Arguments &args);
     v8::Handle<v8::Value> FuncClose(const v8::Arguments &args);
@@ -114 +114 @@
     static v8::Handle<v8::Value> WrapGetState(const v8::Arguments &args) { if (This) return This->FuncGetState(args); else return v8::Undefined(); }
     //static v8::Handle<v8::Value> WrapOpen(const v8::Arguments &args)     { if (This) return This->FuncOpen(args);     else return v8::Undefined(); }
-    static v8::Handle<v8::Value> WrapSubscribe(const v8::Arguments &args){ if (This) return This->FuncSubscribe(args);else return v8::Undefined(); }
+    static v8::Handle<v8::Value> WrapSubscription(const v8::Arguments &args){ if (This) return This->FuncSubscription(args);else return v8::Undefined(); }
     static v8::Handle<v8::Value> WrapGetData(const v8::Arguments &args)  { if (This) return This->FuncGetData(args);  else return v8::Undefined(); }
     static v8::Handle<v8::Value> WrapClose(const v8::Arguments &args)    { if (This) return This->FuncClose(args);    else return v8::Undefined(); }