Skip to content

Commit 8e4f816

Browse files
authored
Merge pull request yuin#361 from 0x501D/package.config
add package.config
2 parents 68a3d49 + f4be710 commit 8e4f816

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

config.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,22 @@ var LuaPath = "LUA_PATH"
2222
var LuaLDir string
2323
var LuaPathDefault string
2424
var LuaOS string
25+
var LuaDirSep string
26+
var LuaPathSep = ";"
27+
var LuaPathMark = "?"
28+
var LuaExecDir = "!"
29+
var LuaIgMark = "-"
2530

2631
func init() {
2732
if os.PathSeparator == '/' { // unix-like
2833
LuaOS = "unix"
2934
LuaLDir = "/usr/local/share/lua/5.1"
35+
LuaDirSep = "/"
3036
LuaPathDefault = "./?.lua;" + LuaLDir + "/?.lua;" + LuaLDir + "/?/init.lua"
3137
} else { // windows
3238
LuaOS = "windows"
3339
LuaLDir = "!\\lua"
40+
LuaDirSep = "\\"
3441
LuaPathDefault = ".\\?.lua;" + LuaLDir + "\\?.lua;" + LuaLDir + "\\?\\init.lua"
3542
}
3643
}

loadlib.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ func OpenPackage(L *LState) int {
6565
L.SetField(packagemod, "path", LString(loGetPath(LuaPath, LuaPathDefault)))
6666
L.SetField(packagemod, "cpath", emptyLString)
6767

68+
L.SetField(packagemod, "config", LString(LuaDirSep+"\n"+LuaPathSep+
69+
"\n"+LuaPathMark+"\n"+LuaExecDir+"\n"+LuaIgMark+"\n"))
70+
6871
L.Push(packagemod)
6972
return 1
7073
}

0 commit comments

Comments
 (0)