diff --git a/internal/app/appbuild/appbuild.go b/internal/app/appbuild/appbuild.go index 66564868..6ad7bcdc 100644 --- a/internal/app/appbuild/appbuild.go +++ b/internal/app/appbuild/appbuild.go @@ -56,9 +56,6 @@ func CmdBuildAction(c *cli.Context) error { var opt = appbase.BuildOptions(c) _, _, err := BuildApp(opt, input, outfile) - if err != nil { - return err - } return err } diff --git a/internal/backends/compiler_wat/js_binding_tmpl.js b/internal/backends/compiler_wat/js_binding_tmpl.js index b0341c94..98256d4e 100644 --- a/internal/backends/compiler_wat/js_binding_tmpl.js +++ b/internal/backends/compiler_wat/js_binding_tmpl.js @@ -103,7 +103,6 @@ class WaApp { }, print_i32: (i) => { this._wa_print_buf += i }, print_u64: (i) => { this._wa_print_buf += i }, - print_u64: (i) => { this._wa_print_buf += i }, print_i64: (i) => { this._wa_print_buf += i }, print_f32: (f) => { this._wa_print_buf += f }, print_f64: (f) => { this._wa_print_buf += f }, diff --git a/internal/loader/loader.go b/internal/loader/loader.go index dd36d6ae..129728a4 100644 --- a/internal/loader/loader.go +++ b/internal/loader/loader.go @@ -6,7 +6,6 @@ import ( "fmt" "io/fs" "os" - "path" pathpkg "path" "path/filepath" "sort" @@ -24,7 +23,6 @@ import ( "wa-lang.org/wa/internal/types" "wa-lang.org/wa/internal/wamime" wasrc "wa-lang.org/wa/waroot/src" - wastd "wa-lang.org/wa/waroot/src" ) var _loadRuntime bool = true @@ -601,7 +599,7 @@ func (p *_Loader) ParseDir(pkgpath string) (filenames []string, files []*ast.Fil f.EmbedMap = make(map[string]string) } - vpath := path.Join(pkgpath, info.Embed) + vpath := pathpkg.Join(pkgpath, info.Embed) data, err := fs.ReadFile(pkgVFS, vpath) if err != nil { continue @@ -681,7 +679,7 @@ func (p *_Loader) hasExt(name string, extensions ...string) bool { } func (p *_Loader) isStdPkg(pkgpath string) bool { - return wastd.IsStdPkg(pkgpath) + return wasrc.IsStdPkg(pkgpath) } func (p *_Loader) isSelfPkg(pkgpath string) bool {