Revert "Switched to local functions"

ankane · ankane · commit f21fdabf6c6a · 2025-06-07T11:07:45.000-07:00
This reverts commit 64f9d18.
diff --git a/src/pgvector.lua b/src/pgvector.lua
@@ -34,14 +34,28 @@ end
 
 -- halfvec
 
-local function halfvec_serialize(v)
+local halfvec_mt = {
+  pgmoon_serialize = function(v)
+    return 0, halfvec_serialize(v)
+  end
+}
+
+function pgvector.halfvec(v)
+  local vec = {}
+  for _, x in ipairs(v) do
+    table.insert(vec, x)
+  end
+  return setmetatable(vec, halfvec_mt)
+end
+
+function halfvec_serialize(v)
   for _, v in ipairs(v) do
     assert(type(v) == "number")
   end
   return "[" .. table.concat(v, ",") .. "]"
 end
 
-local function halfvec_deserialize(v)
+function halfvec_deserialize(v)
   local vec = {}
   for x in string.gmatch(string.sub(v, 2, -2), "[^,]+") do
     table.insert(vec, tonumber(x))
@@ -50,31 +64,37 @@ local function halfvec_deserialize(v)
   return setmetatable(vec, halfvec_mt)
 end
 
-local halfvec_mt = {
+-- sparsevec
+
+local sparsevec_mt = {
   pgmoon_serialize = function(v)
-    return 0, halfvec_serialize(v)
+    return 0, sparsevec_serialize(v)
   end
 }
 
-function pgvector.halfvec(v)
-  local vec = {}
-  for _, x in ipairs(v) do
-    table.insert(vec, x)
+function pgvector.sparsevec(elements, dim)
+  for k, v in pairs(elements) do
+    assert(type(k) == "number")
+    assert(type(v) == "number")
   end
-  return setmetatable(vec, halfvec_mt)
-end
+  assert(type(dim) == "number")
 
--- sparsevec
+  local vec = {
+    elements = elements,
+    dim = dim
+  }
+  return setmetatable(vec, sparsevec_mt)
+end
 
-local function sparsevec_serialize(vec)
+function sparsevec_serialize(vec)
   local elements = {}
   for i, v in pairs(vec["elements"]) do
     table.insert(elements, tonumber(i) .. ":" .. tonumber(v))
   end
   return "{" .. table.concat(elements, ",") .. "}/" .. tonumber(vec["dim"])
 end
 
-local function sparsevec_deserialize(v)
+function sparsevec_deserialize(v)
   local m = string.gmatch(v, "[^/]+")
   local elements = {}
   for e in string.gmatch(string.sub(m(), 2, -2), "[^,]+") do
@@ -90,26 +110,6 @@ local function sparsevec_deserialize(v)
   return setmetatable(vec, sparsevec_mt)
 end
 
-local sparsevec_mt = {
-  pgmoon_serialize = function(v)
-    return 0, sparsevec_serialize(v)
-  end
-}
-
-function pgvector.sparsevec(elements, dim)
-  for k, v in pairs(elements) do
-    assert(type(k) == "number")
-    assert(type(v) == "number")
-  end
-  assert(type(dim) == "number")
-
-  local vec = {
-    elements = elements,
-    dim = dim
-  }
-  return setmetatable(vec, sparsevec_mt)
-end
-
 -- register
 
 function pgvector.setup_vector(pg)
