Merge branch '2.3.x'

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13
+FROM golang:1.15
 
 RUN apt-get update
 RUN apt-get install bash make git curl jq -y

VERSION

@@ -1 +1 @@
-2.2.2
+2.3.0

docs/playground.md

@@ -13,26 +13,18 @@ without having to download and install it in your system.
 <script src="/wasm_exec.js"></script>
 
 <script>
-  if (!WebAssembly.instantiateStreaming) {
-    // polyfill
-    WebAssembly.instantiateStreaming = async (resp, importObject) => {
-      const source = await (await resp).arrayBuffer();
-      return await WebAssembly.instantiate(source, importObject);
-    };
-  }
-
   const go = new Go();
-
   let mod, inst;
 
-  WebAssembly.instantiateStreaming(fetch("/abs.wasm"), go.importObject).then(
-    async result => {
-      mod = result.module;
-      inst = result.instance;
-      // document.getElementById("runButton").disabled = false;
-      await go.run(inst);
-    }
-  );
+  async function fetch_wasm_module() {
+    const response = await fetch("/abs.wasm");
+    const buffer = await response.arrayBuffer();
+    const obj = await WebAssembly.instantiate(buffer, go.importObject);
+    mod = obj.module;
+    inst = obj.instance;
+    await go.run(inst);
+  }
+  fetch_wasm_module()
 
   function run() {
     var editor = ace.edit("editor");

docs/wasm_exec.js

@@ -27,7 +27,10 @@
 	}
 
 	if (!global.fs && global.require) {
-		global.fs = require("fs");
+		const fs = require("fs");
+		if (Object.keys(fs) !== 0) {
+			global.fs = fs;
+		}
 	}
 
 	const enosys = () => {
@@ -172,37 +175,19 @@
 			const storeValue = (addr, v) => {
 				const nanHead = 0x7FF80000;
 
-				if (typeof v === "number") {
+				if (typeof v === "number" && v !== 0) {
 					if (isNaN(v)) {
 						this.mem.setUint32(addr + 4, nanHead, true);
 						this.mem.setUint32(addr, 0, true);
 						return;
 					}
-					if (v === 0) {
-						this.mem.setUint32(addr + 4, nanHead, true);
-						this.mem.setUint32(addr, 1, true);
-						return;
-					}
 					this.mem.setFloat64(addr, v, true);
 					return;
 				}
 
-				switch (v) {
-					case undefined:
-						this.mem.setFloat64(addr, 0, true);
-						return;
-					case null:
-						this.mem.setUint32(addr + 4, nanHead, true);
-						this.mem.setUint32(addr, 2, true);
-						return;
-					case true:
-						this.mem.setUint32(addr + 4, nanHead, true);
-						this.mem.setUint32(addr, 3, true);
-						return;
-					case false:
-						this.mem.setUint32(addr + 4, nanHead, true);
-						this.mem.setUint32(addr, 4, true);
-						return;
+				if (v === undefined) {
+					this.mem.setFloat64(addr, 0, true);
+					return;
 				}
 
 				let id = this._ids.get(v);
@@ -216,8 +201,13 @@
 					this._ids.set(v, id);
 				}
 				this._goRefCounts[id]++;
-				let typeFlag = 1;
+				let typeFlag = 0;
 				switch (typeof v) {
+					case "object":
+						if (v !== null) {
+							typeFlag = 1;
+						}
+						break;
 					case "string":
 						typeFlag = 2;
 						break;
@@ -440,14 +430,14 @@
 
 					// func valueInstanceOf(v ref, t ref) bool
 					"syscall/js.valueInstanceOf": (sp) => {
-						this.mem.setUint8(sp + 24, loadValue(sp + 8) instanceof loadValue(sp + 16));
+						this.mem.setUint8(sp + 24, (loadValue(sp + 8) instanceof loadValue(sp + 16)) ? 1 : 0);
 					},
 
 					// func copyBytesToGo(dst []byte, src ref) (int, bool)
 					"syscall/js.copyBytesToGo": (sp) => {
 						const dst = loadSlice(sp + 8);
 						const src = loadValue(sp + 32);
-						if (!(src instanceof Uint8Array)) {
+						if (!(src instanceof Uint8Array || src instanceof Uint8ClampedArray)) {
 							this.mem.setUint8(sp + 48, 0);
 							return;
 						}
@@ -461,7 +451,7 @@
 					"syscall/js.copyBytesToJS": (sp) => {
 						const dst = loadValue(sp + 8);
 						const src = loadSlice(sp + 16);
-						if (!(dst instanceof Uint8Array)) {
+						if (!(dst instanceof Uint8Array || dst instanceof Uint8ClampedArray)) {
 							this.mem.setUint8(sp + 48, 0);
 							return;
 						}
@@ -490,10 +480,17 @@
 				global,
 				this,
 			];
-			this._goRefCounts = []; // number of references that Go has to a JS value, indexed by reference id
-			this._ids = new Map();  // mapping from JS values to reference ids
-			this._idPool = [];      // unused ids that have been garbage collected
-			this.exited = false;    // whether the Go program has exited
+			this._goRefCounts = new Array(this._values.length).fill(Infinity); // number of references that Go has to a JS value, indexed by reference id
+			this._ids = new Map([ // mapping from JS values to reference ids
+				[0, 1],
+				[null, 2],
+				[true, 3],
+				[false, 4],
+				[global, 5],
+				[this, 6],
+			]);
+			this._idPool = [];   // unused ids that have been garbage collected
+			this.exited = false; // whether the Go program has exited
 
 			// Pass command line arguments and environment variables to WebAssembly by writing them to the linear memory.
 			let offset = 4096;

lexer/lexer.go

@@ -138,9 +138,10 @@ func (l *Lexer) NextToken() token.Token {
 		}
 	case '/':
 		if l.peekChar() == '/' {
-			tok.Type = token.COMMENT
-			tok.Position = l.position
-			tok.Literal = l.readLine()
+			// comment chunk - skip it
+			_ = l.readLine()
+			l.readChar()
+			return l.NextToken()
 		} else if l.peekChar() == '=' {
 			tok.Type = token.COMP_SLASH
 			tok.Position = l.position
@@ -150,9 +151,10 @@ func (l *Lexer) NextToken() token.Token {
 			tok = l.newToken(token.SLASH)
 		}
 	case '#':
-		tok.Type = token.COMMENT
-		tok.Position = l.position
-		tok.Literal = l.readLine()
+		// comment chunk - skip it
+		_ = l.readLine()
+		l.readChar()
+		return l.NextToken()
 	case '&':
 		if l.peekChar() == '&' {
 			tok.Type = token.AND

lexer/lexer_test.go

@@ -286,8 +286,6 @@ f hello(x, y) {
 		{token.IDENT, "a"},
 		{token.DOT, "."},
 		{token.IDENT, "prop"},
-		{token.COMMENT, "# Comment"},
-		{token.COMMENT, "// Comment"},
 		{token.IDENT, "hello"},
 		{token.COMMAND, "command; command"},
 		{token.COMMAND, "command2; command2"},

main.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/abs-lang/abs/install"
 	"github.com/abs-lang/abs/repl"
+	"github.com/abs-lang/abs/util"
 )
 
 // Version of the ABS interpreter
@@ -19,6 +20,15 @@ func main() {
 		return
 	}
 
+	if len(args) == 2 && args[1] == "--check-update" {
+		if newver, update := util.UpdateAvailable(Version); update {
+			fmt.Printf("Update available: %s (your version is %s)\n", newver, Version)
+			os.Exit(1)
+		} else {
+			return
+		}
+	}
+
 	if len(args) == 3 && args[1] == "get" {
 		install.Install(args[2])
 		return

parser/parser.go

@@ -109,7 +109,6 @@ func New(l *lexer.Lexer) *Parser {
 	p.registerPrefix(token.LBRACKET, p.ParseArrayLiteral)
 	p.registerPrefix(token.LBRACE, p.ParseHashLiteral)
 	p.registerPrefix(token.COMMAND, p.parseCommand)
-	p.registerPrefix(token.COMMENT, p.parseComment)
 	p.registerPrefix(token.BREAK, p.parseBreak)
 	p.registerPrefix(token.CONTINUE, p.parseContinue)
 	p.registerPrefix(token.CURRENT_ARGS, p.parseCurrentArgsLiteral)

repl/repl.go

@@ -1,9 +1,11 @@
 package repl
 
 import (
+	"crypto/rand"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"math/big"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -228,6 +230,13 @@ func BeginRepl(args []string, version string) {
 			panic(err)
 		}
 		fmt.Printf("Hello %s, welcome to the ABS (%s) programming language!\n", user.Username, version)
+		// check for new version about 10% of the time,
+		// to avoid too many hangups
+		if r, e := rand.Int(rand.Reader, big.NewInt(100)); e == nil && r.Int64() < 10 {
+			if newver, update := util.UpdateAvailable(version); update {
+				fmt.Printf("*** Update available: %s (your version is %s) ***\n", newver, version)
+			}
+		}
 		fmt.Printf("Type 'quit' when you're done, 'help' if you get lost!\n")
 		Start(os.Stdin, os.Stdout)
 	} else {

scripts/release.abs

@@ -28,6 +28,9 @@
 # "netbsd/386",
 # "netbsd/amd64",
 # "netbsd/arm"
+#
+# dropped by Go
+# "darwin/386",
 
 platforms = [
     "linux/386",
@@ -41,7 +44,6 @@ platforms = [
     "windows/amd64",
     "windows/386",
     "darwin/amd64",
-    "darwin/386",
     "js/wasm"
 ]
 

token/token.go

@@ -10,7 +10,6 @@ const (
 	IDENT        = "IDENT"  // add, foobar, x, y, ...
 	NUMBER       = "NUMBER" // 1343456, 1.23456
 	STRING       = "STRING" // "foobar"
-	COMMENT      = "#"      // # Comment
 	AT           = "@"      // @ At symbol
 	NULL         = "NULL"   // # null
 	CURRENT_ARGS = "..."    // # ... function args

util/check_update.go

@@ -0,0 +1,30 @@
+package util
+
+import (
+	"io/ioutil"
+	"net/http"
+	"strings"
+)
+
+const verUrl = "https://raw.githubusercontent.com/abs-lang/abs/master/VERSION"
+
+// Returns latest version, plus "new version available?" bool
+func UpdateAvailable(version string) (string, bool) {
+	resp, err := http.Get(verUrl)
+	if err != nil {
+		return version, false
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return version, false
+	}
+
+	latest := strings.TrimSpace(string(body))
+	if version != latest {
+		return latest, true
+	}
+
+	return version, false
+}

util/check_update_test.go

@@ -0,0 +1,12 @@
+package util
+
+import (
+	"testing"
+)
+
+func TestUpdateAvailable(t *testing.T) {
+	_, outdated := UpdateAvailable("1.0")
+	if !outdated {
+		t.Fatalf("expected 1.0 to be outdated")
+	}
+}