Refactor type.character

1 files changed, 14 insertions, 7 deletions

@@ -31,20 +31,27 @@ m.character_names = {
 }
 
 function m.character (x)
-        local s = tostring(x)
-        local uc = utf8.codepoint(s)
+        local char, code
+        if m.luatype(x) == "number" then
+                code = x
+                char = utf8_char(x)
+        elseif m.luatype(x) == "string" then
+                code = utf8_codepoint(x)
+                char = utf8_char(code)
+        end
         local t = {
-                v = utf8.char(uc),
-                u = uc,
+                char = char,
+                code = code,
         }
         local mt = {
                 __type = "char", -- scheme name
                 -- compare using codepoints since they're just numbers
-                __eq = function (a, b) return a.u == b.u end,
-                __lt = function (a, b) return a.u < b.u end,
+                __eq = function (a, b) return a.code == b.code end,
+                -- comparing codepoints is probably not the *best* idea
+                __lt = function (a, b) return a.code < b.code end,
                 __tostring =
                         function (self)
-                                local v = self.v
+                                local v = self.char
                                 if m.character_names[v] then
                                         v = m.character_names[v]
                                 end