From 3ecbf30a0336c30e7bcad1a1f8aa8a1892adbf9f Mon Sep 17 00:00:00 2001
From: Arnaud Bouchez <fakeaddress@synopse.info>
Date: Tue, 17 Jul 2018 21:07:43 +0200
Subject: [PATCH] synch SyNode with github repo

---
 SyNode/SpiderMonkey.pas         | 33 ++-------------------------------
 SyNode/SyNodeRemoteDebugger.pas | 20 +++++++++-----------
 SynopseCommit.inc               |  2 +-
 3 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/SyNode/SpiderMonkey.pas b/SyNode/SpiderMonkey.pas
index 527b2eb6c..227aed0ec 100644
--- a/SyNode/SpiderMonkey.pas
+++ b/SyNode/SpiderMonkey.pas
@@ -486,19 +486,7 @@ interface
   PJSStringFinalizer = ^JSStringFinalizer;
 
 // jsid
-  JSIdType = (
-    JSID_TYPE_STRING = $0,
-    JSID_TYPE_INT    = $1,
-    JSID_TYPE_VOID   = $2,
-    JSID_TYPE_SYMBOL = $4
-  );
-
-  jsid = record
-    asBits: size_t;
-    function isString: Boolean;
-    function asJSString: PJSString;
-  end;
-
+  jsid = size_t;
   TjsidVector = array[0..(MaxInt div sizeof(jsid))-2] of jsid;
   PjsidVector = ^TjsidVector;
 
@@ -3444,6 +3432,7 @@ procedure ShutDownJS;
   JS_ShutDown;
 end;
 
+
 { JSString }
 
 procedure JSString.ToJSONString(cx: PJSContext; W: TTextWriter);
@@ -5040,24 +5029,6 @@ function JSArgRec.getThisObject(cx: PJSContext): PJSObject;
   Result := this[cx].asObject;
 end;
 
-{ jsid }
-
-const
-  JSID_TYPE_MASK = $7;
-
-function jsid.isString: Boolean;
-begin
-  Result := JSIdType(asBits and JSID_TYPE_MASK) = JSID_TYPE_STRING;
-end;
-
-function jsid.asJSString: PJSString;
-begin
-{$ifdef WITHASSERT}
-  Assert(isString);
-{$endif}
-  Result := PJSString(asBits);
-end;
-
 { JSIdArray }
 
 procedure JSIdArray.init(cx: PJSContext);
diff --git a/SyNode/SyNodeRemoteDebugger.pas b/SyNode/SyNodeRemoteDebugger.pas
index 8695854df..a8bfb8353 100644
--- a/SyNode/SyNodeRemoteDebugger.pas
+++ b/SyNode/SyNodeRemoteDebugger.pas
@@ -438,7 +438,6 @@ procedure TSMRemoteDebuggerCommunicationThread.HandleMessage(const request: Vari
   data: RawUTF8;
   i: integer;
   debuggerIndex: integer;
-  debugger: TSMDebugger;
   Writer: TTextWriter;
   engine: TSMEngine;
 begin
@@ -450,33 +449,32 @@ procedure TSMRemoteDebuggerCommunicationThread.HandleMessage(const request: Vari
         fParent.fDebuggers.Safe.Lock;
         try
           for I := 0 to fParent.fDebuggers.Count - 1 do begin
-            debugger := TSMDebugger(fParent.fDebuggers[i]);
-            engine := fParent.fManager.EngineForThread(debugger.fSmThreadID);
+            engine := fParent.fManager.EngineForThread(TSMDebugger(fParent.fDebuggers[i]).fSmThreadID);
             if engine <> nil then begin
               // Actor represent debug thread here, setting proper name with coxtext thread id
               // Writer.AddShort('{"actor":"server1.conn1.addon');
               // Writer.Add(TSMDebugger(fParent.fDebuggers[i]).fIndex);
               Writer.AddShort('{"actor":"');
-              Writer.AddShort(debugger.fDebuggerName);
+              Writer.AddShort(TSMDebugger(fParent.fDebuggers[i]).fDebuggerName);
               Writer.AddShort('.conn1.thread_');
               { TODO : check that in multithread mode this field equal thread id with js context that we debug, otherwire replace with proper assigment }
-              Writer.Add(debugger.fSmThreadID);
+              Writer.Add(TSMDebugger(fParent.fDebuggers[i]).fSmThreadID);
               // id should be addon id, value from DoOnGetEngineName event
               // Writer.AddShort('","id":"server1.conn1.addon');
               // Writer.Add(TSMDebugger(fParent.fDebuggers[i]).fIndex);
               Writer.AddShort('","id":"');
-              Writer.AddString(debugger.fNameForDebug);
+              Writer.AddString(TSMDebugger(fParent.fDebuggers[i]).fNameForDebug);
               Writer.AddShort('","name":"');
-              Writer.AddString(debugger.fNameForDebug);
+              Writer.AddString(TSMDebugger(fParent.fDebuggers[i]).fNameForDebug);
               // url most likly should be addon folder in format: file:///drive:/path/
               // Writer.AddShort('","url":"server1.conn1.addon');
               // Writer.Add(TSMDebugger(fParent.fDebuggers[i]).fIndex);
               { TODO : replace with path generation, should be context home dir in format file:///drive:/path/ }
-              Writer.AddShort('","url":"file:///' + StringReplaceAll(debugger.fWebAppRootPath, '\', '/'));
+              Writer.AddShort('","url":"file:///' + StringReplaceAll(TSMDebugger(fParent.fDebuggers[i]).fWebAppRootPath, '\', '/'));
               Writer.AddShort('","debuggable":');
-              Writer.Add(debugger.fCommunicationThread = nil);
+              Writer.Add(TSMDebugger(fParent.fDebuggers[i]).fCommunicationThread = nil);
               Writer.AddShort(',"consoleActor":"console');
-              Writer.Add(debugger.fIndex);
+              Writer.Add(TSMDebugger(fParent.fDebuggers[i]).fIndex);
               Writer.AddShort('"},');
             end;
           end;
@@ -576,7 +574,7 @@ procedure TSMRemoteDebuggerCommunicationThread.sockWrite(const packet: RawUTF8);
   fCommunicationSock.SockSend(@tmp[1], length(tmp));
   fCommunicationSock.SockSend(@sep[1], length(sep));
   fCommunicationSock.SockSend(@packet[1], length(packet));
-  fCommunicationSock.SockSendFlush('');
+  fCommunicationSock.SockSendFlush;
 end;
 
 procedure TSMRemoteDebuggerCommunicationThread.startListening(socket: TCrtSocket);
diff --git a/SynopseCommit.inc b/SynopseCommit.inc
index b10ab8a1a..15e63cf8b 100644
--- a/SynopseCommit.inc
+++ b/SynopseCommit.inc
@@ -1 +1 @@
-'1.18.4667'
+'1.18.4668'