Changeset 20090

Timestamp:

04/21/21 18:48:47 (4 years ago)

Author:

tbretz

Message:

ObjectTemplates can not hold non primitive values anymore, therefore implemented a workaround.

Location:

trunk/FACT++/src

Files:

• InterpreterV8-4.cc (modified) (4 diffs)
• InterpreterV8-4.h (modified) (1 diff)

trunk/FACT++/src/InterpreterV8-4.cc

@@ -479 +479 @@
 }
 
+void InterpreterV8::GetterCallback(Local< Name > name, const PropertyCallbackInfo< Value > &info)
+{
+    //const string server = *String::Utf8Value(name);
+    info.GetReturnValue().Set(info.Data());
+}
+
+
+void InterpreterV8::SetProperty(Handle<ObjectTemplate> &obj, const char *name, const Local<Value> &val)
+{
+    // My answer on: https://bugs.chromium.org/p/v8/issues/detail?id=4997
+    obj->SetNativeDataProperty(String::NewFromUtf8(Isolate::GetCurrent(), name),
+                               GetterCallback,
+                               nullptr,
+                               val,
+                               ReadOnly,
+                               Local<AccessorSignature>(),
+                               ALL_CAN_READ);
+}
+
+
 void InterpreterV8::FuncState(const Arguments& args)
 {
@@ -515 +535 @@
     MaybeLocal<Value> date = Date::New(isolate->GetCurrentContext(), rc.time.JavaDate());
     if (rc.index>-256 && !date.IsEmpty())
-        obj->Set(String::NewFromUtf8(isolate, "time"), date.ToLocalChecked());
+        SetProperty(obj, "time", date.ToLocalChecked());
 
     args.GetReturnValue().Set(obj->NewInstance());
@@ -1977 +1997 @@
          MaybeLocal<Value> date = Date::New(isolate->GetCurrentContext(), state.time.JavaDate());
          if (!date.IsEmpty())
+             SetProperty(obj, "time", date.ToLocalChecked());
+         /*
          {
              obj->Set(String::NewFromUtf8(isolate, "time"), date.ToLocalChecked()->ToString(), ReadOnly);
@@ -1982 +2004 @@
              // This crahshes when called a secont time. I don't know why.
              // obj->Set(String::NewFromUtf8(isolate, "time"), date.ToLocalChecked(), ReadOnly);
-         }
+         }*/
     }
 

trunk/FACT++/src/InterpreterV8-4.h

@@ -84 +84 @@
 
     static void TerminateExecution(v8::Isolate*);
+
+
+    static void GetterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value> &info);
+    static void SetProperty(v8::Handle<v8::ObjectTemplate> &obj, const char *name, const v8::Local<v8::Value> &val);
+
 
     void FuncWait(const FactArguments& args);