svn commit: r355661 - in stable: 11/stand/lua 12/stand/lua

[Kyle Evans]

Author: kevans
Date: Thu Dec 12 18:51:32 2019
New Revision: 355661
URL: https://svnweb.freebsd.org/changeset/base/355661

Log:
  MFC r354247, r355349: lualoader try_include improvement
  
  r354247: lualoader: rewrite try_include using lfs + dofile
  
  Actual modules get require()'d in, rather than try_include(). All instances
  of try_include should be provided with proper hooks/API in the rest of
  loader to do the work they need to do, since we can't rely on them to exist.
  Convert this now to lfs + dofile since we won't really be treating them as
  modules.
  
  lfs is required because dofile will properly throw an error if the file
  doesn't exist, which is not in the spirit of 'optionally included'.
  
  Getting out of the pcall game allows us to provide a loader.exit() style
  call that backs out to the common bits of loader (autoboot sequence unless
  disabled with a loader.setenv("autoboot_delay", "NO")). The most ideal way
  identified so far to implement loader.exit() is to throw a special
  abort-style error that indicates to the caller in interp_lua that we've not
  actually errored out, just continue execution. Otherwise, we have to hack in
  logic to bubble up and return from loader.lua without continuing further,
  which gets kind of ugly depending on the context in which we're aborting.
  
  A compat shim is provided temporarily in case the executing loader doesn't
  yet have loader.lua_path, which was just added in r354246.
  
  r355349: lualoader: correct a typo from r354247
  
  r354247 converted try_include to lfs + dofile with the loader.lua_path added
  just before. Fortunately, there was a hardcoded /boot/lua fallback in case
  loader.lua_path wasn't being set yet- I typo'd it as loader.lua_paths.
  
  Fix the typo.

Modified:
  stable/11/stand/lua/core.lua
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/stand/lua/core.lua
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/stand/lua/core.lua
==============================================================================
--- stable/11/stand/lua/core.lua	Thu Dec 12 18:45:31 2019	(r355660)
+++ stable/11/stand/lua/core.lua	Thu Dec 12 18:51:32 2019	(r355661)
@@ -69,12 +69,28 @@ end
 -- try_include will return the loaded module on success, or false and the error
 -- message on failure.
 function try_include(module)
-	local status, ret = pcall(require, module)
-	-- ret is the module if we succeeded.
-	if status then
-		return ret
+	if module:sub(1, 1) ~= "/" then
+		local lua_path = loader.lua_path
+		-- XXX Temporary compat shim; this should be removed once the
+		-- loader.lua_path export has sufficiently spread.
+		if lua_path == nil then
+			lua_path = "/boot/lua"
+		end
+		module = lua_path .. "/" .. module
+		-- We only attempt to append an extension if an absolute path
+		-- wasn't specified.  This assumes that the caller either wants
+		-- to treat this like it would require() and specify just the
+		-- base filename, or they know what they're doing as they've
+		-- specified an absolute path and we shouldn't impede.
+		if module:match(".lua$") == nil then
+			module = module .. ".lua"
+		end
 	end
-	return false, ret
+	if lfs.attributes(module, "mode") ~= "file" then
+		return
+	end
+
+	return dofile(module)
 end
 
 -- Module exports