Merge branch 'master' of https://gitee.com/wa-lang/wa

README-zh.md

@@ -10,8 +10,8 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/wa-lang/wa)](https://goreportcard.com/report/github.com/wa-lang/wa)
 [![Coverage Status](https://coveralls.io/repos/github/wa-lang/wa/badge.svg)](https://coveralls.io/github/wa-lang/wa)
 [![GitHub release](https://img.shields.io/github/v/tag/wa-lang/wa.svg?label=release)](https://github.com/wa-lang/wa/releases)
-[![Go Reference](https://pkg.go.dev/badge/github.com/wa-lang/wa.svg)](https://pkg.go.dev/github.com/wa-lang/wa)
-[![license](https://img.shields.io/github/license/wa-lang/wa.svg)](https://github.com/wa-lang/wa/blob/master/LICENSE)
+[![Go Reference](https://pkg.go.dev/badge/wa-lang.org/wa.svg)](https://pkg.go.dev/wa-lang.org/wa)
+[![license](https://img.shields.io/github/license/wa-lang/wa.svg)](https://gitee.com/wa-lang/wa/blob/master/LICENSE)
 
 </div>
 
@@ -20,12 +20,12 @@
 ![](docs/images/logo/logo-animate1.svg)
 
 - 主页: [https://wa-lang.org](https://wa-lang.org)
-- 代码仓库 (Gitee):  [https://gitee.com/wa-lang/wa](https://gitee.com/wa-lang/wa)
-- 代码仓库 (Github): [https://github.com/wa-lang/wa](https://github.com/wa-lang/wa)
-- Go 参考文档: [https://pkg.go.dev/github.com/wa-lang/wa](https://pkg.go.dev/github.com/wa-lang/wa)
+- 仓库: [https://gitee.com/wa-lang/wa](https://gitee.com/wa-lang/wa)
 - 开发工具: [Playground](https://wa-lang.org/playground), [VSCode 插件](https://marketplace.visualstudio.com/items?itemName=xxxDeveloper.vscode-wa), [Fleet 插件](https://github.com/wa-lang/fleet-wa), [Vim 插件](https://github.com/wa-lang/vim-wa)
 - 开发组: [柴树杉(chai2010)](https://github.com/chai2010)、[丁尔男(Ending)](https://github.com/3dgen)、[史斌(Benshi)](https://github.com/benshi001)、[扈梦明(xxxDeveloper)](https://github.com/xxxDeveloper)、[刘云峰(leaftree)](https://github.com/leaftree)、[宋汝阳(ShiinaOrez)](https://github.com/ShiinaOrez)
 
+> 说明: 凹语言的主仓库在 https://gitee.com/wa-lang/wa. 在 Github 同时有一个镜像仓库 https://github.com/wa-lang/wa. 凹语言代码除非特别声明，均以 AGPL-v3 开源协议授权, 具体可以参考 LICENSE 文件.
+
 ## Playground 在线预览
 
 [https://wa-lang.org/playground](https://wa-lang.org/playground)
@@ -35,7 +35,7 @@
 
 ## 本地安装和测试:
 
-1. `go install github.com/wa-lang/wa@latest`
+1. `go install wa-lang.org/wa@latest`
 2. `wa init -name=_examples/hi`
 3. `wa run _examples/hi`
 

README.md

@@ -11,7 +11,7 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/wa-lang/wa)](https://goreportcard.com/report/github.com/wa-lang/wa)
 [![Coverage Status](https://coveralls.io/repos/github/wa-lang/wa/badge.svg)](https://coveralls.io/github/wa-lang/wa)
 [![GitHub release](https://img.shields.io/github/v/tag/wa-lang/wa.svg?label=release)](https://github.com/wa-lang/wa/releases)
-[![Go Reference](https://pkg.go.dev/badge/github.com/wa-lang/wa.svg)](https://pkg.go.dev/github.com/wa-lang/wa)
+[![Go Reference](https://pkg.go.dev/badge/wa-lang.org/wa.svg)](https://pkg.go.dev/wa-lang.org/wa)
 [![license](https://img.shields.io/github/license/wa-lang/wa.svg)](https://github.com/wa-lang/wa/blob/master/LICENSE)
 
 </div>
@@ -22,12 +22,10 @@ Instead of requiring complex toolchains to set up, you can simply go install it
 ![](docs/images/logo/logo-animate1.svg)
 
 - Homepage: [https://wa-lang.org](https://wa-lang.org)
-- Github: [https://github.com/wa-lang/wa](https://github.com/wa-lang/wa)
-- Gitee:  [https://gitee.com/wa-lang/wa](https://gitee.com/wa-lang/wa)
-- Go Doc: [https://pkg.go.dev/github.com/wa-lang/wa](https://pkg.go.dev/github.com/wa-lang/wa)
-- Develop Tools: [Playground](https://wa-lang.org/playground), [VSCode](https://marketplace.visualstudio.com/items?itemName=xxxDeveloper.vscode-wa), [Fleet](https://github.com/wa-lang/fleet-wa), [Vim](https://github.com/wa-lang/vim-wa)
 - Core Team: [柴树杉(chai2010)](https://github.com/chai2010)、[丁尔男(Ending)](https://github.com/3dgen)、[史斌(Benshi)](https://github.com/benshi001)、[扈梦明(xxxDeveloper)](https://github.com/xxxDeveloper)、[刘云峰(leaftree)](https://github.com/leaftree)、[宋汝阳(ShiinaOrez)](https://github.com/ShiinaOrez)
 
+> Note: Our canonical Git repository is located at https://gitee.com/wa-lang/wa. There is a mirror of the repository at https://github.com/wa-lang/wa. Unless otherwise noted, the Wa source files are distributed under the AGPL-v3 license found in the LICENSE file.
+
 ## Playground
 
 [https://wa-lang.org/playground](https://wa-lang.org/playground)
@@ -37,7 +35,7 @@ Instead of requiring complex toolchains to set up, you can simply go install it
 
 ## Install and Run:
 
-1. `go install github.com/wa-lang/wa@latest`
+1. `go install wa-lang.org/wa@latest`
 2. `wa init -name=_examples/hi`
 3. `wa run _examples/hi`
 

_examples/arduino-wat/Makefile

+# 版权 @2022 凹语言 作者。保留所有权利。
+
+default:
+	go run ../../main.go -target=arduino hello.wat
+
+clean:
+	-rm *.wasm

_examples/arduino-wat/hello.wat

+;; 版权 @2022 凹语言 作者。保留所有权利。
+
+(module $wa-arduino-hello
+	(import "arduino" "getPinLED" (func $getPinLED (result i32)))
+	(import "arduino" "pinMode" (func $pinMode (param $pin i32) (param $mode i32)))
+	(import "arduino" "digitalWrite" (func $digitalWrite (param $pin i32) (param $value i32)))
+	(import "arduino" "delay" (func $delay (param $ms i32)))
+
+	(memory (;0;) 1)
+	(export "memory" (memory 0))
+	(export "_start" (func $main))
+
+	(func $main (local $tmp i32)
+		;; var LED i32 = getPinLED()
+		;; &LED == 1024
+		i32.const 1024
+		call $getPinLED
+		local.tee $tmp
+		i32.store
+
+		;; pinMode(LED, 1)
+		local.get $tmp
+		i32.const 1
+		call $pinMode
+
+		;; for {}
+		loop $label0 ;; label = @1
+			;; digitalWrite(LED, 1)
+			i32.const 1024
+			i32.load
+			i32.const 1
+			call $digitalWrite
+
+			;; delay(100)
+			i32.const 100
+			call $delay
+
+			;; digitalWrite(LED, 0)
+			i32.const 1024
+			i32.load
+			i32.const 0
+			call $digitalWrite
+
+			;; delay(900)
+			i32.const 900
+			call $delay
+
+			;; continue
+			br $label0 (;@1;)
+		end
+
+		;; panic("unreachable")
+		unreachable
+	)
+)

docs/images/logo/logo-animate1-blue.svg

 <!-- 
 // 版权 @2019 凹语言 作者。保留所有权利。
-// https://github.com/wa-lang
+// https://wa-lang.org
 -->
 
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" width="400" height="400" fill="none">

docs/images/logo/logo-animate1.svg

 <!-- 
 // 版权 @2019 凹语言 作者。保留所有权利。
-// https://github.com/wa-lang
+// https://wa-lang.org
 -->
 
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" width="400" height="400" fill="none">

docs/images/logo/logo-animate2.svg

 <!-- 
 // 版权 @2019 凹语言 作者。保留所有权利。
-// https://github.com/wa-lang
+// https://wa-lang.org
 -->
 
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" width="400" height="400" fill="none">

docs/images/logo/logo-round-color-LightSeaGreen.svg

 <!-- 
 // 版权 @2019 凹语言 作者。保留所有权利。
-// https://github.com/wa-lang
+// https://wa-lang.org
 -->
 
 <svg xmlns="http://www.w3.org/2000/svg"

docs/images/logo/logo-round.svg

 <!-- 
 // 版权 @2019 凹语言 作者。保留所有权利。
-// https://github.com/wa-lang
+// https://wa-lang.org
 -->
 
 <svg xmlns="http://www.w3.org/2000/svg"

docs/images/logo/logo.svg

 <!-- 
 // 版权 @2019 凹语言 作者。保留所有权利。
-// https://github.com/wa-lang
+// https://wa-lang.org
 -->
 
 <svg xmlns="http://www.w3.org/2000/svg"

go.sum

 github.com/tetratelabs/wazero v1.0.0-pre.3 h1:Z5fbogMUGcERzaQb9mQU8+yJSy0bVvv2ce3dfR4wcZg=
 github.com/tetratelabs/wazero v1.0.0-pre.3/go.mod h1:M8UDNECGm/HVjOfq0EOe4QfCY9Les1eq54IChMLETbc=
-github.com/wa-lang/wabt-go v1.1.0 h1:0ois7H69M+6lJhjqU/3c5HxTGeQjwTW0Ncj+SLEW96o=
-github.com/wa-lang/wabt-go v1.1.0/go.mod h1:I/qIi3rHMN4ECgmZ8FzYwpNr2KfLs4TiXuTi7Ql7H3g=
 wa-lang.org/wabt-go v1.2.3 h1:xwGW3+IrCMAPDx+ngQFx7vl0xBc1vuooRNql7i2yCiA=
 wa-lang.org/wabt-go v1.2.3/go.mod h1:v4fKY/p4oMiKwQ2S2aC/wOXvJ2bk2MgtLmwK0TKTNx0=

internal/app/wawasm/main_wasm.go

@@ -8,14 +8,26 @@ import (
 	"wa-lang.org/wa/api"
 )
 
-func main() {
-	window := js.Global().Get("window")
-	waCode := window.Get("waCode").String()
+func waGenerateWat(code string) string {
+	wat, err := api.BuildFile(api.DefaultConfig(), "hello.wa", code)
+	if err != nil {
+		return err.Error()
+	}
+	return string(wat)
+}
 
-	wat, err := api.BuildFile(api.DefaultConfig(), "hello.wa", waCode)
+func waFormatCode(code string) string {
+	newCode, err := api.FormatCode("hello.wa", code)
 	if err != nil {
-		window.Set("waWat", err.Error())
-	} else {
-		window.Set("waWat", string(wat))
+		return err.Error()
 	}
+	return newCode
+}
+
+func main() {
+	window := js.Global().Get("window")
+	waCode := window.Get("__WA_CODE__").String()
+
+	window.Set("__WA_WAT__", waGenerateWat(waCode))
+	window.Set("__WA_FMT_CODE__", waFormatCode(waCode))
 }

main.go

@@ -70,38 +70,7 @@ func main() {
 
 	// 没有参数时对应 run 命令
 	cliApp.Action = func(c *cli.Context) error {
-		if c.NArg() == 0 {
-			cli.ShowAppHelpAndExit(c, 0)
-		}
-
-		app := app.NewApp(build_Options(c))
-		output, err := app.WASM(c.Args().First())
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		outfile := "a.out.wat"
-		if !c.Bool("debug") {
-			defer os.Remove(outfile)
-		}
-
-		if err = os.WriteFile(outfile, []byte(output), 0666); err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		stdoutStderr, err := apputil.RunWasm(app.GetConfig(), outfile)
-		if err != nil {
-			if len(stdoutStderr) > 0 {
-				fmt.Println(string(stdoutStderr))
-			}
-			fmt.Println(err)
-			os.Exit(1)
-		}
-		if len(stdoutStderr) > 0 {
-			fmt.Println(string(stdoutStderr))
-		}
+		cliRun(c)
 		return nil
 	}
 
@@ -172,40 +141,7 @@ func main() {
 				},
 			},
 			Action: func(c *cli.Context) error {
-				if c.NArg() == 0 {
-					fmt.Fprintf(os.Stderr, "no input file")
-					os.Exit(1)
-				}
-
-				app := app.NewApp(build_Options(c))
-				output, err := app.WASM(c.Args().First())
-				if err != nil {
-					fmt.Println(err)
-					os.Exit(1)
-				}
-
-				outfile := "a.out.wat"
-				if !c.Bool("debug") {
-					defer os.Remove(outfile)
-				}
-
-				if err = os.WriteFile(outfile, []byte(output), 0666); err != nil {
-					fmt.Println(err)
-					os.Exit(1)
-				}
-
-				stdoutStderr, err := apputil.RunWasm(app.GetConfig(), outfile)
-				if err != nil {
-					if len(stdoutStderr) > 0 {
-						fmt.Println(string(stdoutStderr))
-					}
-					fmt.Println(err)
-					os.Exit(1)
-				}
-				if len(stdoutStderr) > 0 {
-					fmt.Println(string(stdoutStderr))
-				}
-
+				cliRun(c)
 				return nil
 			},
 		},
@@ -489,3 +425,55 @@ func build_Options(c *cli.Context, isLLVMBackend ...bool) *app.Option {
 	}
 	return opt
 }
+
+func cliRun(c *cli.Context) {
+	if c.NArg() == 0 {
+		cli.ShowAppHelpAndExit(c, 0)
+	}
+
+	var app = app.NewApp(build_Options(c))
+	var infile = c.Args().First()
+	var outfile string
+	var output []byte
+	var err error
+
+	if !c.Bool("debug") {
+		defer os.Remove(outfile)
+	}
+
+	switch {
+	case strings.HasSuffix(infile, ".wat"):
+		outfile = infile
+		output, err = os.ReadFile(infile)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+	case strings.HasSuffix(infile, ".wasm"):
+		outfile = infile
+		output, err = os.ReadFile(infile)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+	default:
+		outfile = "a.out.wat"
+		output, err = app.WASM(infile)
+		if err = os.WriteFile(outfile, []byte(output), 0666); err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+	}
+
+	stdoutStderr, err := apputil.RunWasm(app.GetConfig(), outfile)
+	if err != nil {
+		if len(stdoutStderr) > 0 {
+			fmt.Println(string(stdoutStderr))
+		}
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	if len(stdoutStderr) > 0 {
+		fmt.Println(string(stdoutStderr))
+	}
+}