Merge 9e2264c into db10c42

mbasso · Sep 2, 2018 · 86232fe · 86232fe
2 parents db10c42 + 9e2264c
commit 86232fe
Show file tree

Hide file tree

Showing 45 changed files with 370 additions and 551 deletions.
diff --git a/Makefile b/Makefile
@@ -60,6 +60,7 @@ WASM_OPTIONS = \
 	--llvm-opts 3 \
 	--js-opts 1 \
 	--closure 1 \
+	-s ENVIRONMENT=node \
 	-s MODULARIZE=1 \
 	-s ALLOW_MEMORY_GROWTH=1 \
 	-s AGGRESSIVE_VARIABLE_ELIMINATION=1 \
@@ -79,6 +80,7 @@ ASMJS_OPTIONS = \
 	--llvm-opts 3 \
 	--js-opts 1 \
 	--closure 1 \
+	-s ENVIRONMENT=node \
 	-s MODULARIZE=1 \
 	-s AGGRESSIVE_VARIABLE_ELIMINATION=1 \
 	-s ELIMINATE_DUPLICATE_FUNCTIONS=1 \

diff --git a/compiled/asm-dom.a b/compiled/asm-dom.a
diff --git a/compiled/asm-dom.bc b/compiled/asm-dom.bc
diff --git a/compiled/asm-dom.o b/compiled/asm-dom.o
diff --git a/compiled/asmjs/asm-dom.asm.js b/compiled/asmjs/asm-dom.asm.js
diff --git a/compiled/wasm/asm-dom.js b/compiled/wasm/asm-dom.js
diff --git a/compiled/wasm/asm-dom.wasm b/compiled/wasm/asm-dom.wasm
diff --git a/cpp/Config/Config.cpp b/cpp/Config/Config.cpp
@@ -0,0 +1,8 @@
+#include "Config.hpp"
+
+namespace asmdom {
+
+	bool CLEAR_MEMORY = true;
+	bool UNSAFE_PATCH = false;
+
+}
diff --git a/cpp/Config/Config.hpp b/cpp/Config/Config.hpp
@@ -0,0 +1,16 @@
+#ifndef asmdom_Config_hpp
+#define asmdom_Config_hpp
+
+namespace asmdom {
+
+	extern bool CLEAR_MEMORY;
+	extern bool UNSAFE_PATCH;
+
+	struct Config {
+		bool clearMemory = true;
+		bool unsafePatch = false;
+	};
+
+}
+
+#endif
diff --git a/cpp/Init/init.cpp b/cpp/Init/init.cpp
@@ -1,13 +1,12 @@
 #include "init.hpp"
-#include "../VDOMConfig/VDOMConfig.hpp"
+#include "../Config/Config.hpp"
 #include <emscripten.h>
 
 namespace asmdom {
 
 	void init(const Config& config) {
-		VDOMConfig& vdomconfig = VDOMConfig::getConfig();
-		vdomconfig.setClearMemory(config.clearMemory);
-		vdomconfig.setUnsafePatch(config.unsafePatch);
+		CLEAR_MEMORY = config.clearMemory;
+		UNSAFE_PATCH = config.unsafePatch;
 
 		EM_ASM(
 			#ifndef ASMDOM_JS_SIDE

diff --git a/cpp/Init/init.hpp b/cpp/Init/init.hpp
@@ -1,12 +1,9 @@
 #ifndef asmdom_Init_hpp
 #define asmdom_Init_hpp
 
-namespace asmdom {
+#include "../Config/Config.hpp"
 
-	struct Config { 
-		bool clearMemory = true;
-		bool unsafePatch = false;
-	};
+namespace asmdom {
 
 	void init(const Config& config);
 

diff --git a/cpp/Patch/patch.cpp b/cpp/Patch/patch.cpp
@@ -2,7 +2,7 @@
 #include "../Diff/diff.hpp"
 #include "../VNode/VNode.hpp"
 #include "../h/h.hpp"
-#include "../VDOMConfig/VDOMConfig.hpp"
+#include "../Config/Config.hpp"
 #include <emscripten/val.h>
 #include <algorithm>
 #include <cstdint>
@@ -26,6 +26,8 @@ namespace asmdom {
 	#ifdef ASMDOM_TEST
 		void reset() {
 			currentNode = NULL;
+			CLEAR_MEMORY = true;
+			UNSAFE_PATCH = false;
 		};
 	#endif
 
@@ -146,15 +148,15 @@ namespace asmdom {
 			} else if (!oldEndVnode) {
 				oldEndVnode = oldCh[--oldEndIdx];
 			} else if (sameVNode(oldStartVnode, newStartVnode)) {
-				patchVNode(oldStartVnode, newStartVnode, parentElm);
+				if (oldStartVnode != newStartVnode) patchVNode(oldStartVnode, newStartVnode, parentElm);
 				oldStartVnode = oldCh[++oldStartIdx];
 				newStartVnode = newCh[++newStartIdx];
 			} else if (sameVNode(oldEndVnode, newEndVnode)) {
-				patchVNode(oldEndVnode, newEndVnode, parentElm);
+				if (oldEndVnode != newEndVnode) patchVNode(oldEndVnode, newEndVnode, parentElm);
 				oldEndVnode = oldCh[--oldEndIdx];
 				newEndVnode = newCh[--newEndIdx];
 			} else if (sameVNode(oldStartVnode, newEndVnode)) {
-				patchVNode(oldStartVnode, newEndVnode, parentElm);
+				if (oldStartVnode != newEndVnode) patchVNode(oldStartVnode, newEndVnode, parentElm);
 
 				EM_ASM_({
 					Module.insertBefore(
@@ -166,7 +168,7 @@ namespace asmdom {
 				oldStartVnode = oldCh[++oldStartIdx];
 				newEndVnode = newCh[--newEndIdx];
 			} else if (sameVNode(oldEndVnode, newStartVnode)) {
-				patchVNode(oldEndVnode, newStartVnode, parentElm);
+				if (oldEndVnode != newStartVnode) patchVNode(oldEndVnode, newStartVnode, parentElm);
 
 				EM_ASM_({
 					Module.insertBefore($0, $1, $2);
@@ -195,7 +197,7 @@ namespace asmdom {
 							Module.insertBefore($0, $1, $2);
 						}, parentElm, createElm(newStartVnode), oldStartVnode->elm);
 					} else {
-						patchVNode(elmToMove, newStartVnode, parentElm);
+						if (elmToMove != newStartVnode) patchVNode(elmToMove, newStartVnode, parentElm);
 						oldCh[oldKeyToIdx[newStartVnode->key]] = NULL;
 						EM_ASM_({
 							Module.insertBefore($0, $1, $2);
@@ -240,17 +242,16 @@ namespace asmdom {
 	VNode* patch(const emscripten::val& element, VNode* const vnode) {
 		VNode* oldVnode = toVNode(element);
 		VNode* result = patch(oldVnode, vnode);
-		if (!VDOMConfig::getConfig().getClearMemory()) {
+		if (!CLEAR_MEMORY) {
 			deleteVNode(oldVnode);
 		}
 		return result;
 	};
 
 	VNode* patch(VNode* const oldVnode, VNode* const vnode) {
 		#ifndef ASMDOM_JS_SIDE
-			VDOMConfig& config = VDOMConfig::getConfig();
 			if (
-				!config.getUnsafePatch() &&
+				!UNSAFE_PATCH &&
 				currentNode != oldVnode && currentNode
 			) return NULL;
 		#endif
@@ -278,7 +279,7 @@ namespace asmdom {
 		}
 
 		#ifndef ASMDOM_JS_SIDE
-			if (config.getClearMemory()) {
+			if (CLEAR_MEMORY) {
 				deleteVNode(oldVnode);
 			}
 		#endif

diff --git a/cpp/VDOMConfig/VDOMConfig.cpp b/cpp/VDOMConfig/VDOMConfig.cpp
diff --git a/cpp/VDOMConfig/VDOMConfig.hpp b/cpp/VDOMConfig/VDOMConfig.hpp
diff --git a/cpp/asm-dom.cpp b/cpp/asm-dom.cpp
@@ -1,4 +1,4 @@
-#include "VDOMConfig/VDOMConfig.cpp"
+#include "Config/Config.cpp"
 #include "VNode/VNode.cpp"
 #include "h/h.cpp"
 #include "toVNode/toVNode.cpp"

diff --git a/cpp/asm-dom.js b/cpp/asm-dom.js
diff --git a/cpp/domApi.js b/cpp/domApi.js
@@ -16,8 +16,8 @@ var addPtr = function addPtr(node) {
   if (node === null) return 0;
   if (node.asmDomPtr !== undefined) return node.asmDomPtr;
   nodes[++lastPtr] = node;
-  node.asmDomPtr = lastPtr;
-  return lastPtr;
+  // eslint-disable-next-line
+  return node.asmDomPtr = lastPtr;
 };
 
 exports['default'] = {

diff --git a/cpp/domRecycler.js b/cpp/domRecycler.js
@@ -5,20 +5,12 @@ var recycler = {
   create: function create(name) {
     name = name.toUpperCase();
     var list = recycler.nodes[name];
-    if (list !== undefined) {
-      var node = list.pop();
-      if (node !== undefined) return node;
-    }
-    return document.createElement(name);
+    return list !== undefined && list.pop() || document.createElement(name);
   },
   createNS: function createNS(name, ns) {
     name = name.toUpperCase();
     var list = recycler.nodes[name + ns];
-    if (list !== undefined) {
-      var _node = list.pop();
-      if (_node !== undefined) return _node;
-    }
-    var node = document.createElementNS(ns, name);
+    var node = list !== undefined && list.pop() || document.createElementNS(ns, name);
     node.asmDomNS = ns;
     return node;
   },

diff --git a/cpp/toHTML/toHTML.cpp b/cpp/toHTML/toHTML.cpp
@@ -1,7 +1,7 @@
 #include "toHTML.hpp"
 #include "../utils/utils.hpp"
 #include "../VNode/VNode.hpp"
-#include "../VDOMConfig/VDOMConfig.hpp"
+#include "../Config/Config.hpp"
 #include <emscripten/val.h>
 #include <unordered_map>
 #include <string>
@@ -171,8 +171,8 @@ namespace asmdom {
 		toHTML(vnode, html);
 
 		#ifndef ASMDOM_JS_SIDE
-			if (vnode && VDOMConfig::getConfig().getClearMemory()) {
-				deleteVNode(vnode);
+			if (vnode && CLEAR_MEMORY) {
+        deleteVNode(vnode);
 			}
 		#endif