2 files changed, 24 insertions, 52 deletions
diff --git a/src/html/entity.nim b/src/html/entity.nim
index 79c57ca0..72c5c452 100644
--- a/src/html/entity.nim
+++ b/src/html/entity.nim
@@ -3,26 +3,15 @@ import json
 import ../utils/radixtree
 
 const entity = staticRead"../../res/entity.json"
-when defined(small):
-  proc genEntityMap(data: seq[tuple[a: string, b: string]]): RadixNode[string] =
-    result = newRadixTree[string]()
-    for pair in data:
-      result[pair.a] = pair.b
+proc genEntityMap(data: seq[tuple[a: string, b: string]]): RadixNode[string] =
+  result = newRadixTree[string]()
+  for pair in data:
+    result[pair.a] = pair.b
 
-  proc genEntityTable(): seq[tuple[a: string, b: string]] =
-    let entityJson = parseJson(entity)
+proc genEntityTable(): seq[tuple[a: string, b: string]] =
+  let entityJson = parseJson(entity)
 
-    for k, v in entityJson:
-      result.add((k.substr(1), v{"characters"}.getStr()))
-  const entityTable = genEntityTable()
-  let entityMap* = genEntityMap(entityTable)
-else:
-  proc genEntityMap(): StaticRadixTree[string] =
-    let entityJson = parseJson(entity)
-    var entityMap = newStaticRadixTree[string]()
-
-    for k, v in entityJson:
-      entityMap[k.substr(1)] = v{"characters"}.getStr()
-
-    return entityMap
-  const entityMap* = genEntityMap()
+  for k, v in entityJson:
+    result.add((k.substr(1), v{"characters"}.getStr()))
+const entityTable = genEntityTable()
+let entityMap* = genEntityMap(entityTable)
diff --git a/src/html/htmlparser.nim b/src/html/htmlparser.nim
index 67aec2e4..94c474f0 100644
--- a/src/html/htmlparser.nim
+++ b/src/html/htmlparser.nim
@@ -89,38 +89,21 @@ proc getescapecmd(buf: string, at: var int): string =
   elif not isAlphaAscii(buf[i]):
     return ""
 
-  when defined(full):
-    var n = 0
-    var s = ""
-    while true:
-      s &= buf[i]
-      if not entityMap.hasPrefix(s, n):
-        break
-      let pn = n
-      n = entityMap{s, n}
-      if n != pn:
-        s = ""
-      inc i
-
-    if entityMap.nodes[n].leaf:
-      at = i
-      return entityMap.nodes[n].value
-  else:
-    var n = entityMap
-    var s = ""
-    while true:
-      s &= buf[i]
-      if not entityMap.hasPrefix(s, n):
-        break
-      let pn = n
-      n = n{s}
-      if n != pn:
-        s = ""
-      inc i
+  var n = entityMap
+  var s = ""
+  while true:
+    s &= buf[i]
+    if not entityMap.hasPrefix(s, n):
+      break
+    let pn = n
+    n = n{s}
+    if n != pn:
+      s = ""
+    inc i
 
-    if n.leaf:
-      at = i
-      return n.value
+  if n.leaf:
+    at = i
+    return n.value
 
   return ""