lmika/ucl
1
0
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases Wiki Activity

Fixed package

Browse source
This commit is contained in:
Leon Mika 2024-04-27 10:15:04 +10:00
parent 60147d8fdf
commit 76219ccec2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/playwasm/jsiter.go
View file

@ -9,6 +9,7 @@ import (
"github.com/alecthomas/participle/v2" "github.com/alecthomas/participle/v2"
"github.com/lmika/ucl/ucl" "github.com/lmika/ucl/ucl"
"strings" "strings"
"syscall/js"
) )
func invokeUCLCallback(name string, args ...any) { func invokeUCLCallback(name string, args ...any) {
@ -18,7 +19,7 @@ func invokeUCLCallback(name string, args ...any) {
} }
func initJS(ctx context.Context) { func initJS(ctx context.Context) {
ucl := make(map[string]any) uclObj := make(map[string]any)
inst := ucl.New(ucl.WithOut(&uclOut{ inst := ucl.New(ucl.WithOut(&uclOut{
lineBuffer: new(bytes.Buffer), lineBuffer: new(bytes.Buffer),
@ -27,7 +28,7 @@ func initJS(ctx context.Context) {
}, },
})) }))
ucl["eval"] = js.FuncOf(func(this js.Value, args []js.Value) any { uclObj["eval"] = js.FuncOf(func(this js.Value, args []js.Value) any {
if len(args) != 2 { if len(args) != 2 {
return nil return nil
} }
@ -39,7 +40,7 @@ func initJS(ctx context.Context) {
} }
wantContinue := args[1].Bool() wantContinue := args[1].Bool()
if err := inst.EvalAndDisplay(ctx, cmdLine); err != nil { if err := ucl.EvalAndDisplay(ctx, inst, cmdLine); err != nil {
var p participle.Error var p participle.Error
if errors.As(err, &p) && wantContinue { if errors.As(err, &p) && wantContinue {
invokeUCLCallback("onContinue") invokeUCLCallback("onContinue")
@ -51,7 +52,7 @@ func initJS(ctx context.Context) {
invokeUCLCallback("onNewCommand") invokeUCLCallback("onNewCommand")
return nil return nil
}) })
js.Global().Set("ucl", ucl) js.Global().Set("ucl", uclObj)
} }
type uclOut struct { type uclOut struct {