sammyette/Hilbish
2
2
Fork 0
mirror of https://github.com/Hilbis/Hilbish synced 2025-07-01 00:32:03 +00:00
Code Issues Releases Wiki Activity

fix: reimpl commander, fix bait build

Browse Source
This commit is contained in:
sammyette 2025-06-14 12:30:06 -04:00
parent 4f4a836f05
commit d01655e803
Signed by: sammyette
GPG Key ID: 904FC49417B44DCD
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golibs/bait/bait.go
View File

@ -262,7 +262,7 @@ end)
#example
*/
func (b *Bait) bcatch(mlr *moonlight.Runtime, c *moonlight.GoCont) (moonlight.Cont, error) {
name, catcher, err := util.HandleStrCallback(mlr, c)
name, catcher, err := util.HandleStrCallback(mlr)
if err != nil {
return nil, err
}

25
golibs/commander/commander.go
View File

@ -54,11 +54,9 @@ func New(rtm *moonlight.Runtime) *Commander {
func (c *Commander) Loader(rtm *moonlight.Runtime) moonlight.Value {
exports := map[string]moonlight.Export{
/*
"register": {c.cregister, 2, false},
"deregister": {c.cderegister, 1, false},
"registry": {c.cregistry, 0, false},
*/
"register": {c.cregister, 2, false},
"deregister": {c.cderegister, 1, false},
"registry": {c.cregistry, 0, false},
}
mod := moonlight.NewTable()
rtm.SetExports(mod, exports)
@ -83,21 +81,20 @@ commander.register('hello', function(args, sinks)
end)
#example
*/
func (c *Commander) cregister(mlr *moonlight.Runtime, ct *moonlight.GoCont) (moonlight.Cont, error) {
cmdName, cmd, err := util.HandleStrCallback(mlr, ct)
func (c *Commander) cregister(mlr *moonlight.Runtime) error {
cmdName, cmd, err := util.HandleStrCallback(mlr)
if err != nil {
return nil, err
return err
}
c.Commands[cmdName] = cmd
return ct.Next(), err
return nil
}
// deregister(name)
// Removes the named command. Note that this will only remove Commander-registered commands.
// #param name string Name of the command to remove.
/*
func (c *Commander) cderegister(mlr *moonlight.Runtime) error {
if err := mlr.Check1Arg(); err != nil {
return err
@ -111,13 +108,12 @@ func (c *Commander) cderegister(mlr *moonlight.Runtime) error {
return err
}
*/
// registry() -> table
// Returns all registered commanders. Returns a list of tables with the following keys:
// - `exec`: The function used to run the commander. Commanders require args and sinks to be passed.
// #returns table
/*func (c *Commander) cregistry(mlr *moonlight.Runtime, ct *moonlight.GoCont) (moonlight.Cont, error) {
func (c *Commander) cregistry(mlr *moonlight.Runtime) error {
registryLua := moonlight.NewTable()
for cmdName, cmd := range c.Commands {
cmdTbl := moonlight.NewTable()
@ -128,5 +124,6 @@ func (c *Commander) cderegister(mlr *moonlight.Runtime) error {
registryLua.SetField(cmdName, moonlight.TableValue(cmdTbl))
}
return mlr.PushNext1(ct, moonlight.TableValue(registryLua)), nil
}*/
mlr.PushNext1(moonlight.TableValue(registryLua))
return nil
}

2
util/util.go
View File

@ -17,7 +17,7 @@ func SetField(module *rt.Table, field string, value rt.Value) {
// HandleStrCallback handles function parameters for Go functions which take
// a string and a closure.
func HandleStrCallback(mlr *moonlight.Runtime, c *moonlight.GoCont) (string, *moonlight.Closure, error) {
func HandleStrCallback(mlr *moonlight.Runtime) (string, *moonlight.Closure, error) {
if err := mlr.CheckNArgs(2); err != nil {
return "", nil, err
}