lua-stdlib
diff --git a/‎build-aux/sanity-cfg.mk‎
Lines changed: 1 addition & 1 deletion b/‎build-aux/sanity-cfg.mk‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/std/base.lua‎
Lines changed: 8 additions & 1 deletion b/‎lib/std/base.lua‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎specs/base_spec.yaml‎
Lines changed: 29 additions & 0 deletions b/‎specs/base_spec.yaml‎
Lines changed: 29 additions & 0 deletions
@@ -1,3 +1,3 @@
-exclude_file_name_regexp--sc_error_message_uppercase = ^lib/std/(list|optparse).lua|specs/debug_spec.yaml$$
+exclude_file_name_regexp--sc_error_message_uppercase = ^lib/std/(list|optparse).lua|specs/(base|debug)_spec.yaml$$
 
 EXTRA_DIST += build-aux/sanity-cfg.mk
@@ -522,7 +522,7 @@ local function export (M, decl, fn, ...)
       argerror (fname, 2, "at least 1 argument type expected, got 0")
     end
 
-    local name = M[1] .. "." .. name
+    local name = M[1] .. (M[2] and ":" or ".") .. name
 
     -- If the final element of types ends with "*", then set max to a
     -- sentinel value to denote type-checking of *all* remaining
@@ -542,6 +542,13 @@ local function export (M, decl, fn, ...)
       local args = {...}
       local argc, bestmismatch, at = arglen (args), 0, 0
 
+      -- For object methods, report type mismatch on self as argument 0.
+      if M[2] then
+	argcheck (name, 0, M[2], args[1], 2)
+	table.remove (args, 1)
+	argc = argc - 1
+      end
+
       for i, types in ipairs (type_specs) do
 	local mismatch = match (types, args, max == math.huge)
 	if mismatch == nil then
 
@@ -192,3 +192,32 @@ specify std.base:
     - it accepts correct argument types:
         expect (chk ("two")).to_equal (MAGIC) -- should be .to_be?
         expect (chk (1, "two")).to_equal (MAGIC) -- should be .to_be?
+  - context when checking self on an object method:
+    - before:
+        fake_module = "base_spec.yaml"
+        M = { fake_module, "Object" }
+        fname = "chk_method"
+        msg = function (...)
+                return badarg (nil, fake_module .. ":" .. fname, ...)
+              end
+        f (M, "chk_method (string)", function (self, x) return x end)
+        Object = require "std.object" {}
+        Bad = Object { _type = "Bad" }
+        obj = Object { chk = M.chk_method }
+    - it diagnoses missing arguments:
+        expect (obj.chk ()).to_error (msg (0, "Object"))
+        expect (obj:chk ()).to_error (msg (1, "string"))
+    - it diagnoses wrong argument types:
+        expect (obj.chk ({})).to_error (msg (0, "Object", "empty table"))
+        expect (obj.chk (Bad)).to_error (msg (0, "Object", "Bad"))
+        expect (obj:chk ({})).to_error (msg (1, "string", "empty table"))
+        expect (obj:chk (obj)).to_error (msg (1, "string", "Object"))
+    - it diagnoses too many arguments:
+        expect (obj.chk (obj, "str", false)).
+          to_error (toomanyarg (nil, fake_module .. ":" .. fname, 1, 2))
+        expect (obj:chk ("str", false)).
+          to_error (toomanyarg (nil, fake_module .. ":" .. fname, 1, 2))
+    - it accepts correct argument types:
+        expect (obj.chk (obj, "str")).to_be "str"
+        expect (obj.chk (Object, "str")).to_be "str"
+        expect (obj:chk ("str")).to_be "str"
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-exclude_file_name_regexp--sc_error_message_uppercase = ^lib/std/(list\|optparse).lua\|specs/debug_spec.yaml$$`
	`1`	`+exclude_file_name_regexp--sc_error_message_uppercase = ^lib/std/(list\|optparse).lua\|specs/(base\|debug)_spec.yaml$$`
`2`	`2`
`3`	`3`	`EXTRA_DIST += build-aux/sanity-cfg.mk`