make properties work at ct

Author: nitely

CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.7.2
+==================
+
+* Make `properties` module work at CT
+
 v0.7.1
 ==================
 

src/unicodedb/properties.nim

@@ -195,10 +195,38 @@ proc properties*(cp: Rune): UnicodeProps =
   ## raw data for some of the properties, so one of
   ## the auxiliary procedures must be used in conjuntion.
   assert cp.int <= 0x10FFFF
-  let
-    blockOffset = (propsOffsets[cp.int div blockSize]).int * blockSize
-    idx = propsIndices[blockOffset + cp.int mod blockSize]
-  result = propsData[idx]
+  when nimvm:
+    const N = propsIndices.len
+    const N2 = N div 4
+    const t0 = propsIndices[0 ..< N2]
+    const t1 = propsIndices[N2 ..< 2*N2]
+    const t2 = propsIndices[2*N2 ..< 3*N2]
+    const t3 = propsIndices[3*N2 ..< N]
+
+    proc getTypeIndex(sub: static[int], ind: int): auto =
+      when sub == 0: return t0[ind]
+      elif sub == 1: return t1[ind]
+      elif sub == 2: return t2[ind]
+      else: return t3[ind]
+    let blockOffset = (propsOffsets[cp.int div blockSize]).int * blockSize
+    block:
+      let ind = blockOffset + cp.int mod blockSize
+      let ind2 = ind div N2
+      let j = ind mod N2
+      var idx = 0'u8
+      case ind2
+      of 0: idx = getTypeIndex(0, j)
+      of 1: idx = getTypeIndex(1, j)
+      of 2: idx = getTypeIndex(2, j)
+      of 3: idx = getTypeIndex(3, j)
+      else: assert false
+      result = propsData[idx]
+  else:
+    block:
+      let
+        blockOffset = (propsOffsets[cp.int div blockSize]).int * blockSize
+        idx = propsIndices[blockOffset + cp.int mod blockSize]
+      result = propsData[idx]
 
 proc unicodeCategory*(props: UnicodeProps): UnicodeCategory {.inline.} =
   ## Return category for a given `UnicodeProps`

src/unicodedb/types.nim

@@ -51,7 +51,6 @@ proc unicodeTypes*(cp: Rune): int {.inline.} =
       of 2: idx = getTypeIndex(2, j)
       else: assert false
       result = typesData[idx]
-
   else:
     block:
       let blockOffset = (typesOffsets[cp.int div blockSize]).int * blockSize

tests/tests.nim

@@ -128,6 +128,20 @@ test "Test some categories":
   check unicodeCategory(0x1CF2.Rune) == ctgLo
   check unicodeCategory(0xA9BD.Rune) == ctgMn
 
+test "Test some categories at CT":
+  static:
+    doAssert unicodeCategory(64110.Rune) == ctgCn
+    doAssert unicodeCategory(7913.Rune) == ctgLl
+    doAssert unicodeCategory(0.Rune) == ctgCc
+    doAssert unicodeCategory(1048576.Rune) == ctgCo
+    doAssert unicodeCategory(0x860.Rune) == ctgLo
+    doAssert unicodeCategory(70089.Rune) == ctgMn
+    doAssert unicodeCategory(72199.Rune) == ctgMn
+    doAssert unicodeCategory(72200.Rune) == ctgMn
+    doAssert unicodeCategory(0x166D.Rune) == ctgSo
+    doAssert unicodeCategory(0x1CF2.Rune) == ctgLo
+    doAssert unicodeCategory(0xA9BD.Rune) == ctgMn
+
 test "Test bidirectional class":
   for cpData in allBidis:
     for cp in cpData.cpFirst .. cpData.cpLast:

unicodedb.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version = "0.7.1"
+version = "0.7.2"
 author = "Esteban Castro Borsani (@nitely)"
 description = "Unicode Character Database (UCD) access for Nim"
 license = "MIT"