Merge pull request #757 from lmorg/develop

v5.2

.github/workflows/clean-build.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.18' ]
+        go-version: [ '1.21' ]
     steps:
 
       - name: Setup Go ${{ matrix.go-version }}

.github/workflows/murex-downloads.yaml

@@ -63,7 +63,9 @@ jobs:
               echo "Compiling WebAssembly...."
               export GOOS=js
               export GOARCH=wasm
-              go build -o ./gen/website/wasm/murex.wasm
+              export LD_FLAGS="-extldflags=-static"
+              export tags="$(cat builtins/optional/standard-opts.txt),sqlite_omit_load_extension,osusergo,netgo"
+              go build -ldflags "$LD_FLAGS" -tags "$tags" -o ./gen/website/wasm/murex.wasm
               cp -v "$(go env GOROOT)/misc/wasm/wasm_exec.js" ./gen/website/wasm/
           #fi
 

.github/workflows/murex-tests.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.18', '1.19', '1.20', '1.21' ]
+        go-version: [ '1.20', '1.21' ]
     env:
       MUREX_BUILD_FLAGS: --no-colour
       MUREX_TEST_NO_EXEC_DEPS: true

INSTALL.md

@@ -81,7 +81,7 @@ sudo port install murex
 
 You will need `go` (Golang) compiler, and `git` installed.
 
-> Go 1.18 or higher is required.
+> Go 1.20 or higher is required.
 
 These should be easy to install on most operating systems however Windows is a
 lot more tricky with regards to `gcc`. Please check with your operating systems

app/app.go

@@ -14,8 +14,8 @@ const Name = "murex"
 const (
 	version  = "%d.%d.%d"
 	Major    = 5
-	Minor    = 1
-	Revision = 2300
+	Minor    = 2
+	Revision = 7610
 )
 
 // Copyright is the copyright owner string

app/whatsnew/whatsnew.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/lmorg/murex/app"
 	"github.com/lmorg/murex/config/profile"
-	"github.com/lmorg/murex/lang/tty"
 )
 
 func Display() {
@@ -35,7 +34,7 @@ func Display() {
 	}
 
 changelog:
-	fmt.Fprintf(tty.Stdout, "Welcome to murex %d.%d.%d\nChangelog: https://murex.rocks/CHANGELOG.html\nOr run `help changelog/v%d.%d` from the command line\n",
+	fmt.Fprintf(os.Stdout, "Welcome to murex %d.%d.%d\nChangelog: https://murex.rocks/CHANGELOG.html\nOr run `help changelog/v%d.%d` from the command line\n",
 		app.Major, app.Minor, app.Revision, app.Major, app.Minor)
 
 	f, err = os.OpenFile(profile.ModulePath()+"/version", os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)

behavioural/try_control.mx

@@ -0,0 +1,22 @@
+# control
+
+function: control.scope.block.fn.fail {
+    a: [1..2] -> foreach i { err: $i | out: bar }
+}
+
+test: unit function control.scope.block.fn.fail {
+    "StderrMatch": "1\n2\n",
+    "StdoutMatch": "bar\nbar\n"
+}
+
+function: control.runmode.fail {
+    out "foo"
+    runmode try function
+    out "bar"
+}
+
+test: unit function control.runmode.fail {
+    "StdoutMatch": "foo\nbar\n",
+    "StderrRegex": "should only be used as the first statement in a block",
+    "ExitNum": 0
+}

behavioural/try_scopes.mx

@@ -1,26 +1,3 @@
-# control
-
-function: control.scope.block.fn.fail {
-    a: [1..2] -> foreach i { err: $i | out: bar }
-}
-
-test: unit function control.scope.block.fn.fail {
-    "StderrMatch": "1\n2\n",
-    "StdoutMatch": "bar\nbar\n"
-}
-
-function: control.runmode.fail {
-    out "foo"
-    runmode try function
-    out "bar"
-}
-
-test: unit function control.runmode.fail {
-    "StdoutMatch": "foo\nbar\n",
-    "StderrRegex": "should only be used as the first statement in a block",
-    "ExitNum": 0
-}
-
 # try
 
 function: try.scope.block.pass {
@@ -68,7 +45,7 @@ function: try.scope.block.foreach.fail {
 
 test: unit function try.scope.block.foreach.fail {
     "StderrMatch": "1\n2\n",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 ## function
@@ -91,7 +68,7 @@ function: try.scope.fn.foreach.fail {
 
 test: unit function try.scope.fn.foreach.fail {
     "StderrMatch": "1\n2\n",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 function try.scope.fn.read.fail {
@@ -103,12 +80,12 @@ function try.scope.fn.read.fail {
         read: q "? "
         out: "!"
     }
-    sleep: 2
+    sleep: 1
 }
 
 test: unit function try.scope.fn.read.fail {
     "StderrRegex": "cannot read from",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 ## module
@@ -131,7 +108,7 @@ function: try.scope.mod.foreach.fail {
 
 test: unit function try.scope.mod.foreach.fail {
     "StderrMatch": "1\n2\n",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 function try.scope.mod.read.fail {
@@ -143,12 +120,12 @@ function try.scope.mod.read.fail {
         read: q "? "
         out: "!"
     }
-    sleep: 2
+    sleep: 1
 }
 
 test: unit function try.scope.mod.read.fail {
     "StderrRegex": "cannot read from",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 # trypipe
@@ -199,7 +176,7 @@ function: trypipe.scope.block.foreach.fail {
 
 test: unit function trypipe.scope.block.foreach.fail {
     "StderrMatch": "1\n2\n",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 ### function
@@ -222,7 +199,7 @@ function: trypipe.scope.fn.foreach.fail {
 
 test: unit function trypipe.scope.fn.foreach.fail {
     "StderrMatch": "1\n2\n",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 function trypipe.scope.fn.read.fail {
@@ -234,12 +211,12 @@ function trypipe.scope.fn.read.fail {
         read: q "? "
         out: "!"
     }
-    sleep: 2
+    sleep: 1
 }
 
 test: unit function trypipe.scope.fn.read.fail {
     "StderrRegex": "cannot read from",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 ## module
@@ -262,7 +239,7 @@ function: trypipe.scope.mod.foreach.fail {
 
 test: unit function trypipe.scope.mod.foreach.fail {
     "StderrMatch": "1\n2\n",
-    "ExitNum": 1
+    "ExitNum": 0
 }
 
 function trypipe.scope.mod.read.fail {
@@ -274,10 +251,10 @@ function trypipe.scope.mod.read.fail {
         read: q "? "
         out: "!"
     }
-    sleep: 2
+    sleep: 1
 }
 
 test: unit function trypipe.scope.mod.read.fail {
     "StderrRegex": "cannot read from",
-    "ExitNum": 1
+    "ExitNum": 0
 }