refactor: rename base.objtype to std.type internally.

* specs/spec_helper.lua (objtype): Correct a reference to
base.lua:objtype in a comment.
* specs/object_spec.yaml: Show the difference between the object
module table, and the root Object more clearly.
* lib/std/base.lua (objtype): Rename from this...
(type): ...to this.
* lib/std.lua.in, lib/std/container.lua, lib/std/debug.lua,
lib/std/object.lua, lib/std/operator.lua, lib/std/set.lua,
lib/std/tree.lua, lib/std/tuple.lua: Adjust all callers.

Signed-off-by: Gary V. Vaughan <gary@vaughan.pe>

Author: gvvaughan

lib/std.lua.in

@@ -280,7 +280,7 @@ M = {
   -- @param x anything
   -- @treturn string type of *x*
   -- @see std.object.type
-  type = X ("type (?any)", std.objtype),
+  type = X ("type (?any)", std.type),
 
   version = "General Lua libraries / @VERSION@",
 }

lib/std/base.lua

@@ -304,11 +304,6 @@ local function collect (ifn, ...)
 end
 
 
-local function objtype (o)
-  return (getmetatable (o) or {})._type or io.type (o) or type (o)
-end
-
-
 local function reduce (fn, d, ifn, ...)
   local argt = {...}
   if not callable (ifn) then
@@ -466,6 +461,11 @@ return {
   require  = require,
   tostring = tostring,
 
+  type = function (x)
+    return (getmetatable (x) or {})._type or io.type (x) or type (x)
+  end,
+
+
   -- debug.lua --
   argerror = argerror,
 
@@ -482,7 +482,6 @@ return {
   compare = compare,
 
   -- object.lua --
-  objtype = objtype,
 
   -- package.lua --
   dirsep = dirsep,

lib/std/container.lua

@@ -38,7 +38,7 @@ local debug = require "std.debug"
 
 local ipairs, pairs, okeys = std.ipairs, std.pairs, std.okeys
 local insert, len = std.insert, std.len
-local okeys, objtype, tostring = std.okeys, std.objtype, std.tostring
+local okeys, stdtype, tostring = std.okeys, std.type, std.tostring
 local argcheck = debug.argcheck
 
 
@@ -232,7 +232,7 @@ end
 
 function M.__tostring (self)
   local n, k_ = 1, nil
-  local buf = { objtype (self), " {" }		-- pre-buffer object open
+  local buf = { stdtype (self), " {" }		-- pre-buffer object open
   for _, k in ipairs (okeys (self)) do		-- for ordered public members
     local v = self[k]
 
@@ -296,8 +296,8 @@ return setmetatable ({
   -- it has to be done manually.
 
   mapfields = modulefunction (M.mapfields),
-  prototype = modulefunction (objtype),
-  type      = modulefunction (objtype),
+  prototype = modulefunction (stdtype),
+  type      = modulefunction (stdtype),
 }, {
   _type = "Container",
 

lib/std/debug.lua

@@ -34,7 +34,7 @@ local std        = require "std.base"
 
 local _DEBUG = debug_init._DEBUG
 local argerror, raise = std.argerror, std.raise
-local objtype, unpack = std.objtype, std.unpack
+local stdtype, unpack = std.type, std.unpack
 local copy, split, tostring = std.copy, std.split, std.tostring
 local insert, last, len, maxn = std.insert, std.last, std.len, std.maxn
 local ipairs, pairs = std.ipairs, std.pairs
@@ -253,7 +253,7 @@ end
 
 
 local function extramsg_mismatch (expectedtypes, actual, index)
-  local actualtype = objtype (actual)
+  local actualtype = stdtype (actual)
 
   -- Tidy up actual type for display.
   if actualtype == "nil" then
@@ -364,7 +364,7 @@ if _DEBUG.argcheck then
       end
     end
 
-    actualtype = objtype (actual)
+    actualtype = stdtype (actual)
     if check == actualtype then
       return true
     elseif check == "list" or check == "#list" then

lib/std/object.lua

@@ -30,12 +30,12 @@
 -- Container is derived from it.  Confused? ;-)
 
 
-local std       = require "std.base"
 local container = require "std.container"
 local debug     = require "std.debug"
+local std       = require "std.base"
 
 local Container = container {}
-local getmetamethod, objtype = std.getmetamethod, std.objtype
+local getmetamethod = std.getmetamethod
 
 local DEPRECATED = debug.DEPRECATED
 
@@ -122,7 +122,7 @@ return Container {
     --
     -- It's conventional to organise similar objects according to a
     -- string valued *\_type* field, which can then be queried using this
-    -- function.
+    -- method.
     --
     -- Additionally, this function returns the results of @{io.type} for
     -- file objects, or @{type} otherwise.
@@ -152,7 +152,7 @@ return Container {
     -- assert (objtype (h) == io.type (h))
     --
     -- assert (type {} == type {})
-    type = objtype,
+    type = std.type,
 
 
     --- Return *obj* with references to the fields of *src* merged in.
@@ -189,7 +189,7 @@ return Container {
 
 
     -- Backwards compatibility:
-    prototype = DEPRECATED ("41.3", "'std.object.prototype'", objtype),
+    prototype = DEPRECATED ("41.3", "'std.object.prototype'", std.type),
   },
 
 

lib/std/operator.lua

@@ -6,8 +6,8 @@
 
 local std = require "std.base"
 
-local pairs, objtype, tostring =
-  std.pairs, std.objtype, std.tostring
+local pairs, stdtype, tostring =
+  std.pairs, std.type, std.tostring
 
 
 local function eqv (a, b)
@@ -18,7 +18,7 @@ local function eqv (a, b)
   -- Unless we have two tables, what we have cannot be equivalent here.
   if type (a) ~= "table" or type (b) ~= "table" then return false end
 
-  local type_a, type_b = objtype (a), objtype (b)
+  local type_a, type_b = stdtype (a), stdtype (b)
   if type_a ~= type_b then return false end
 
   local keyeqv = {} -- keys requiring recursive equivalence test

lib/std/set.lua

@@ -21,7 +21,7 @@ local std = require "std.base"
 
 local Container = require "std.container" {}
 
-local ielems, pairs, type = std.ielems, std.pairs, std.objtype
+local ielems, pairs, type = std.ielems, std.pairs, std.type
 
 
 local Set -- forward declaration

lib/std/tree.lua

@@ -22,8 +22,8 @@ local operator  = require "std.operator"
 
 local Container = require "std.container" {}
 
-local ielems, ipairs, leaves, pairs, objtype =
-  std.ielems, std.ipairs, std.leaves, std.pairs, std.objtype
+local ielems, ipairs, leaves, pairs, stdtype =
+  std.ielems, std.ipairs, std.leaves, std.pairs, std.type
 local last, len = std.last, std.len
 local reduce = std.reduce
 
@@ -138,12 +138,12 @@ Tree = Container {
   -- @usage
   -- del_other_window = keymap[{"C-x", "4", KEY_DELETE}]
   __index = function (tr, i)
-              if objtype (i) == "table" then
-                return reduce (operator.get, tr, ielems, i)
-              else
-                return rawget (tr, i)
-              end
-            end,
+    if stdtype (i) == "table" then
+      return reduce (operator.get, tr, ielems, i)
+    else
+      return rawget (tr, i)
+    end
+  end,
 
   --- Deep insertion.
   -- @static
@@ -154,18 +154,18 @@ Tree = Container {
   -- @usage
   -- function bindkey (keylist, fn) keymap[keylist] = fn end
   __newindex = function (tr, i, v)
-                 if objtype (i) == "table" then
-                   for n = 1, len (i) - 1 do
-                     if objtype (tr[i[n]]) ~= "Tree" then
-                       rawset (tr, i[n], Tree {})
-                     end
-                     tr = tr[i[n]]
-                   end
-                   rawset (tr, last (i), v)
-                 else
-                   rawset (tr, i, v)
-                 end
-               end,
+    if stdtype (i) == "table" then
+      for n = 1, len (i) - 1 do
+        if stdtype (tr[i[n]]) ~= "Tree" then
+          rawset (tr, i[n], Tree {})
+        end
+        tr = tr[i[n]]
+      end
+      rawset (tr, last (i), v)
+    else
+      rawset (tr, i, v)
+    end
+  end,
 
   _functions = {
     --- Make a deep copy of a tree, including any metatables.

lib/std/tuple.lua

@@ -22,7 +22,7 @@
 ]]
 
 local Container = require "std.container" {}
-local objtype = require "std.base".objtype
+local stdtype = require "std.base".type
 
 
 -- Stringify tuple values, as a memoization key.
@@ -133,6 +133,6 @@ return  Container {
   -- -- 'Tuple ("nil", nil, false)'
   -- print (Tuple ("nil", nil, false))
   __tostring = function (self)
-    return ("%s (%s)"):format (objtype (self), argstr (self))
+    return ("%s (%s)"):format (stdtype (self), argstr (self))
   end,
 }