All openers are now LGFunction, all tests pass.

Author: Cathal Garvey

baselib.go

@@ -11,13 +11,15 @@ import (
 
 /* basic functions {{{ */
 
-func baseOpen(L *LState) {
+// OpenBase opens the base functions of Lua.
+func OpenBase(L *LState) int {
 	global := L.Get(GlobalsIndex).(*LTable)
 	L.SetGlobal("_G", global)
 	L.SetGlobal("_VERSION", LString(PackageName+" "+PackageVersion))
 	L.RegisterModule("_G", baseFuncs)
 	global.RawSetString("ipairs", L.NewClosure(baseIpairs, L.NewFunction(ipairsaux)))
 	global.RawSetString("pairs", L.NewClosure(basePairs, L.NewFunction(pairsaux)))
+	return 0
 }
 
 var baseFuncs = map[string]LGFunction{

linit.go

@@ -19,9 +19,14 @@ const (
 	ChannelLibName = "channel"
 	// CoroutineLibName is the name of the coroutine Library.
 	CoroutineLibName = "coroutine"
+	// BaseLibName is here for consistency; the base functions have no namespace/library.
+	BaseLibName = "_baseLib"
+	// LoadLibName is here for consistency; the loading system has no namespace/library.
+	LoadLibName = "_loadLib"
 )
 
-// LuaLibs are the built-in Gopher-lua libraries as opened by LState.OpenLibs().
+// LuaLibs are the built-in Gopher-lua libraries as opened by LState.OpenLibs(),
+// including Base/Load.
 var LuaLibs = map[string]LGFunction{
 	TabLibName:       OpenTable,
 	IoLibName:        OpenIo,
@@ -31,31 +36,23 @@ var LuaLibs = map[string]LGFunction{
 	DebugLibName:     OpenDebug,
 	ChannelLibName:   OpenChannel,
 	CoroutineLibName: OpenCoroutine,
+	BaseLibName:      OpenBase,
+	LoadLibName:      OpenLoad,
 }
 
-// OpenLibs loads the built-in libraries. It is equivalent to iterating over
-// LuaLibs, preloading each, and requiring each to its own name.
+// OpenLibs loads the built-in libraries. It is equivalent to running OpenLoad,
+// then OpenBase, then iterating over the other OpenXXX functions in any order.
 func (ls *LState) OpenLibs() {
-	// TODO: Remove when ready.
-	ls.oldOpenLibs()
-
+	// NB: Map iteration order in Go is deliberately randomised, so must open Load/Base
+	// prior to iterating.
+	OpenLoad(ls)
+	OpenBase(ls)
 	for name, loader := range LuaLibs {
+		if name == BaseLibName || name == LoadLibName {
+			continue
+		}
 		ls.PreloadModule(name, loader)
+		// TODO: Are all built-ins normally "required"
 		ls.DoString(fmt.Sprintf(`%s = require "%s"`, name, name))
 	}
 }
-
-/// Deprecating for linit.go/OpenLibs for https://github.com/yuin/gopher-lua/issues/55
-func (ls *LState) oldOpenLibs() {
-	// loadlib must be loaded 1st
-	loadOpen(ls)
-	baseOpen(ls)
-	//coroutineOpen(ls)
-	//ioOpen(ls)
-	//stringOpen(ls)
-	//tableOpen(ls)
-	//mathOpen(ls)
-	//osOpen(ls)
-	//debugOpen(ls)
-	//channelOpen(ls)
-} // */

loadlib.go

@@ -46,7 +46,9 @@ func loFindFile(L *LState, name, pname string) (string, string) {
 	return "", strings.Join(messages, "\n\t")
 }
 
-func loadOpen(L *LState) {
+// OpenLoad opens the loading system of Lua; it is essential to load this before
+// other built-ins or third-party modules.
+func OpenLoad(L *LState) int {
 	packagemod := L.RegisterModule("package", loFuncs)
 
 	L.SetField(packagemod, "preload", L.NewTable())
@@ -64,6 +66,7 @@ func loadOpen(L *LState) {
 
 	L.SetField(packagemod, "path", LString(loGetPath(LuaPath, LuaPathDefault)))
 	L.SetField(packagemod, "cpath", LString(""))
+	return 0
 }
 
 var loFuncs = map[string]LGFunction{