update moonscript.util moon.mtype -> mtype to differentiate between the type function in moon

leafo · leafo · commit 06191f0dffb7 · 2026-02-26T16:22:32.000-08:00
diff --git a/moonscript/cmd/lint.lua b/moonscript/cmd/lint.lua
@@ -5,7 +5,7 @@ Set = require("moonscript.data").Set
 local Block
 Block = require("moonscript.compile").Block
 local mtype
-mtype = require("moonscript.util").moon.type
+mtype = require("moonscript.util").mtype
 local default_whitelist = Set({
   '_G',
   '_VERSION',
diff --git a/moonscript/cmd/lint.moon b/moonscript/cmd/lint.moon
@@ -3,7 +3,7 @@ import insert from table
 import Set from require "moonscript.data"
 import Block from require "moonscript.compile"
 
-{type: mtype} = require("moonscript.util").moon
+import mtype from require "moonscript.util"
 
 -- globals allowed to be referenced
 default_whitelist = Set {
diff --git a/moonscript/compile.lua b/moonscript/compile.lua
@@ -20,9 +20,8 @@ do
   local _obj_0 = table
   concat, insert = _obj_0.concat, _obj_0.insert
 end
-local pos_to_line, get_closest_line, trim, unpack
-pos_to_line, get_closest_line, trim, unpack = util.pos_to_line, util.get_closest_line, util.trim, util.unpack
-local mtype = util.moon.type
+local pos_to_line, get_closest_line, trim, unpack, mtype
+pos_to_line, get_closest_line, trim, unpack, mtype = util.pos_to_line, util.get_closest_line, util.trim, util.unpack, util.mtype
 local indent_char = "  "
 local Line, DelayedLine, Lines, Block, RootBlock
 do
diff --git a/moonscript/compile.moon b/moonscript/compile.moon
@@ -11,9 +11,7 @@ statement_compilers = require "moonscript.compile.statement"
 value_compilers = require "moonscript.compile.value"
 
 import concat, insert from table
-import pos_to_line, get_closest_line, trim, unpack from util
-
-mtype = util.moon.type
+import pos_to_line, get_closest_line, trim, unpack, mtype from util
 
 indent_char = "  "
 
diff --git a/moonscript/types.lua b/moonscript/types.lua
@@ -36,7 +36,7 @@ ntype = function(node)
 end
 local mtype
 do
-  local moon_type = util.moon.type
+  local moon_type = util.mtype
   mtype = function(val)
     local mt = getmetatable(val)
     if mt and mt.smart_node then
diff --git a/moonscript/types.moon b/moonscript/types.moon
@@ -33,7 +33,7 @@ ntype = (node) ->
 
 -- gets the class of a type if possible
 mtype = do
-  moon_type = util.moon.type
+  moon_type = util.mtype
   -- lets us check a smart node without throwing an error
   (val) ->
     mt = getmetatable val
diff --git a/moonscript/util.lua b/moonscript/util.lua
@@ -16,18 +16,19 @@ local moon = {
       return mt and rawget(mt, "__index") == mt and rawget(value, "__index") ~= value
     end
     return false
-  end,
-  type = function(value)
-    local base_type = type(value)
-    if base_type == "table" then
-      local cls = value.__class
-      if cls and rawget(value, "__class") == nil then
-        return cls
-      end
-    end
-    return base_type
   end
 }
+local mtype
+mtype = function(value)
+  local base_type = type(value)
+  if base_type == "table" then
+    local cls = value.__class
+    if cls and rawget(value, "__class") == nil then
+      return cls
+    end
+  end
+  return base_type
+end
 local pos_to_line
 pos_to_line = function(str, pos)
   local line = 1
@@ -200,6 +201,7 @@ safe_module = function(name, tbl)
 end
 return {
   moon = moon,
+  mtype = mtype,
   pos_to_line = pos_to_line,
   get_closest_line = get_closest_line,
   get_line = get_line,
diff --git a/moonscript/util.moon b/moonscript/util.moon
@@ -17,15 +17,16 @@ moon = {
       return mt and rawget(mt, "__index") == mt and rawget(value, "__index") != value
     false
 
-  type: (value) -> -- the moonscript object class
-    base_type = type value
-    if base_type == "table"
-      cls = value.__class
-      if cls and rawget(value, "__class") == nil
-        return cls
-    base_type
 }
 
+mtype = (value) -> -- the moonscript object class
+  base_type = type value
+  if base_type == "table"
+    cls = value.__class
+    if cls and rawget(value, "__class") == nil
+      return cls
+  base_type
+
 -- convet position in text to line number
 pos_to_line = (str, pos) ->
   line = 1
@@ -135,7 +136,7 @@ safe_module = (name, tbl) ->
   }
 
 {
-  :moon, :pos_to_line, :get_closest_line, :get_line, :trim, :split, :dump,
+  :moon, :mtype, :pos_to_line, :get_closest_line, :get_line, :trim, :split, :dump,
   :debug_posmap, :getfenv, :setfenv, :get_options, :unpack, :safe_module
 }
 
