diff --git a/README.md b/README.md index 072bde0f85a64e4ef4b69d1a2f8766ab833aba45..66b11d208295f88c9c7b53e527fd28cc237d73d5 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,12 @@ +------------+ ``` +安装和测试: + +1. `go install github.com/wa-lang/wa@latest` +2. `wa init -name=_examples/hi` +3. `wa run _examples/hi` + ## 设计目标 - 披着 Go 和 Rust 语法外衣的 C++ 语言; diff --git a/_examples/hello/src/main.wa b/_examples/hello/src/main.wa index daf73f65c3ed8308e8bf9948ac7b326d3b229577..45c681d89eb795cd719440c93870b1f799a0b405 100644 --- a/_examples/hello/src/main.wa +++ b/_examples/hello/src/main.wa @@ -1,7 +1,5 @@ // 版权 @2022 _examples/hello 作者。保留所有权利。 -package main - import ( "fmt" diff --git a/_examples/hello/src/mypkg/pkg.wa b/_examples/hello/src/mypkg/pkg.wa index 6f815e5cef3b83275c78a2620b1bc139ace764a9..0caeea5f54fe23b872cb038fa8c97e32480d1d96 100644 --- a/_examples/hello/src/mypkg/pkg.wa +++ b/_examples/hello/src/mypkg/pkg.wa @@ -1,7 +1,5 @@ // 版权 @2022 _examples/hello 作者。保留所有权利。 -package mypkg - fn Println(x int) { println(x) } diff --git a/_examples/hello/vendor/3rdparty/pkg/pkg.wa b/_examples/hello/vendor/3rdparty/pkg/pkg.wa index 9545d6c71b9a1fa4062db688a95ceeb7d36ea9a9..0caeea5f54fe23b872cb038fa8c97e32480d1d96 100644 --- a/_examples/hello/vendor/3rdparty/pkg/pkg.wa +++ b/_examples/hello/vendor/3rdparty/pkg/pkg.wa @@ -1,7 +1,5 @@ // 版权 @2022 _examples/hello 作者。保留所有权利。 -package pkg - fn Println(x int) { println(x) } diff --git a/internal/app/app.wa.go b/internal/app/app.wa.go index df1aaf3654dca25881b906840a961fd38b0d6334..525e4dbee0104712bf9b31dbd1f5e1168c8cd823 100644 --- a/internal/app/app.wa.go +++ b/internal/app/app.wa.go @@ -6,7 +6,6 @@ import ( "bytes" "errors" "fmt" - "html/template" "io" "io/fs" "os" @@ -15,6 +14,7 @@ import ( "runtime" "sort" "strings" + "text/template" "time" "github.com/wa-lang/wa/internal/ast" diff --git a/internal/waroot/_example_template/src/main.wa b/internal/waroot/_example_template/src/main.wa index 1a3b04f1c67ecc61e8505829ad652e519725b239..886b750a4f472cab5e9ba71924f65cfaaeee274b 100644 --- a/internal/waroot/_example_template/src/main.wa +++ b/internal/waroot/_example_template/src/main.wa @@ -1,8 +1,5 @@ // 版权 @{{.Year}} {{.Name}} 作者。保留所有权利。 -// 例子: 命令行程序 -package main - import ( "fmt" diff --git a/internal/waroot/_example_template/src/mypkg/pkg.wa b/internal/waroot/_example_template/src/mypkg/pkg.wa index f09b500a795455ad6732736951d2f36d6e84c102..06a312aa63e745aca55a3b1fccccffe8b1c19f02 100644 --- a/internal/waroot/_example_template/src/mypkg/pkg.wa +++ b/internal/waroot/_example_template/src/mypkg/pkg.wa @@ -1,7 +1,5 @@ // 版权 @{{.Year}} {{.Name}} 作者。保留所有权利。 -package mypkg - // 打印整数 fn Println(x int) { println(x) diff --git a/internal/waroot/_example_template/vendor/3rdparty/pkg/pkg.wa b/internal/waroot/_example_template/vendor/3rdparty/pkg/pkg.wa index 2844e82cfb4c2d19836cdda9369f65a871b55a0e..8e525972139d9037764f8e2b22786a94a9289152 100644 --- a/internal/waroot/_example_template/vendor/3rdparty/pkg/pkg.wa +++ b/internal/waroot/_example_template/vendor/3rdparty/pkg/pkg.wa @@ -1,7 +1,5 @@ // 版权 @{{.Year}} {{.Name}} 作者。保留所有权利。 -package pkg - fn Println(x int) { println(x) } diff --git a/internal/waroot/_waroot/src/fmt/print.wa b/internal/waroot/_waroot/src/fmt/print.wa index 4e9962cb67b619b91617c12a05bf99160c1777f4..677a199489e7344fef58c147d0b8a871f2833f3e 100644 --- a/internal/waroot/_waroot/src/fmt/print.wa +++ b/internal/waroot/_waroot/src/fmt/print.wa @@ -1,7 +1,5 @@ // 版权 @2019 凹语言 作者。保留所有权利。 -package fmt - fn Println(x int) { println(x) } diff --git a/internal/waroot/_waroot/src/runtime/runtime.wa b/internal/waroot/_waroot/src/runtime/runtime.wa index 360af587c4f80b883cc5c0fbdae96dbc6570bcfa..8005df06da0adfcdd9d2d1912b5ef17ef357c8a3 100644 --- a/internal/waroot/_waroot/src/runtime/runtime.wa +++ b/internal/waroot/_waroot/src/runtime/runtime.wa @@ -1,3 +1 @@ // 版权 @2019 凹语言 作者。保留所有权利。 - -package runtime diff --git a/internal/waroot/_waroot/src/syscall/syscall.wa b/internal/waroot/_waroot/src/syscall/syscall.wa index 07c8dfe098ef40097662fce30f719c5d6df3cbaf..49ca598b9dfb0ae98e1fdee4c5231f7df0a69155 100644 --- a/internal/waroot/_waroot/src/syscall/syscall.wa +++ b/internal/waroot/_waroot/src/syscall/syscall.wa @@ -1,6 +1,4 @@ // 版权 @2019 凹语言 作者。保留所有权利。 -package syscall - //wa:linkname write fn Write(int32 fs, uintptr data, int size) int