Trim util

1 files changed, 4 insertions, 3 deletions

@@ -4,7 +4,8 @@ local m = {}
 local type = require("type")
 local eof, input_port = type.eof, type.input_port
 local util = require("util")
-local constantly, error, pop = util.constantly, util.error, util.pop
+local error, pop = util.error, util.pop
+local utf8_char = require("utf8").char
 
 local token_separators = "[%s#()\"'`,@;]"
 
@@ -127,7 +128,7 @@ local function consume_string_hexvalue (cs)
                 table.insert(u8ch, c)
         until c == ";"
         table.remove(u8ch) -- discard ';'
-        return utf8.char(tonumber(table.concat(u8ch), 16)), cs
+        return utf8_char(tonumber(table.concat(u8ch), 16)), cs
 end
 
 local function consume_string (cs)
@@ -258,7 +259,7 @@ m.readmacros = {
                         table.insert(Q, m.read(port))
                         return type.list(Q)
                 end,
-        comment = constantly(nil), -- throw comments away
+        comment = function (_,_,_) return nil end,
 }
 
 ---[[ READ ]]---