Skip to content

Commit

Permalink
Merge pull request #776 from lmorg/develop
Browse files Browse the repository at this point in the history
v5.3.5000
  • Loading branch information
lmorg authored Dec 19, 2023
2 parents bd88e3c + b8cfd5a commit 96dc071
Show file tree
Hide file tree
Showing 58 changed files with 1,074 additions and 857 deletions.
10 changes: 5 additions & 5 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ page to select your platform.

[![Test Clean Install](https://github.com/lmorg/murex/actions/workflows/clean-build.yaml/badge.svg)](https://github.com/lmorg/murex/actions/workflows/clean-build.yaml)

> Murex is designed to be as easy to compile as possible. However if you do not
> have any prior experience with compiling software from source then the
> recommended approach for installing Murex is either via a package manager (if
> your platform is already supported) or downloading one of our pre-compiled
> binaries.
Murex is designed to be as easy to compile as possible. However if you do not
have any prior experience with compiling software from source then the
recommended approach for installing Murex is either via a package manager (if
your platform is already supported) or downloading one of our pre-compiled
binaries.

### Prerequisites

Expand Down
2 changes: 1 addition & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (
version = "%d.%d.%d"
Major = 5
Minor = 3
Revision = 4000
Revision = 5000
)

// Copyright is the copyright owner string
Expand Down
8 changes: 8 additions & 0 deletions builtins/core/runtime/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const (
fCachedFilePaths = "--cached-file-paths"
fCacheDump = "--cache"
fCacheTrim = "--trim-cache"
fCacheFlush = "--flush-cache"
fHelp = "--help"
)

Expand Down Expand Up @@ -96,6 +97,7 @@ var flags = map[string]string{
fCachedFilePaths: types.Boolean,
fCacheDump: types.Boolean,
fCacheTrim: types.Boolean,
fCacheFlush: types.Boolean,
fHelp: types.Boolean,
}

Expand Down Expand Up @@ -229,6 +231,12 @@ func cmdRuntime(p *lang.Process) error {
return err
}
ret[fCacheTrim[2:]] = v
case fCacheFlush:
v, err := cache.Flush(p.Context)
if err != nil {
return err
}
ret[fCacheFlush[2:]] = v
case fHelp:
ret[fHelp[2:]] = Help()
default:
Expand Down
4 changes: 2 additions & 2 deletions builtins/optional/select/lib_c.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !no_cgo || !linux
// +build !no_cgo !linux
//go:build !no_cgo && !linux && !windows && !darwin
// +build !no_cgo,!linux,!windows,!darwin

/*
This file uses the C SQLite3 library. To compile it you will need gcc
Expand Down
4 changes: 2 additions & 2 deletions builtins/optional/select/lib_go.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build no_cgo && linux
// +build no_cgo,linux
//go:build no_cgo || linux || windows || darwin
// +build no_cgo linux windows darwin

/*
This file uses a pure Go driver for sqlite. Unlike lib_c.go, this one does
Expand Down
18 changes: 1 addition & 17 deletions builtins/types/jsonconcat/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,10 @@ func indexTable(p *lang.Process, params []string) error {
var v []interface{}
err2 := json.Unmarshal(b, &v)
if err2 != nil {
//close(cRecords)
status <- err2
return
}
cRecords <- iface2Str(v)

/*switch v.(type) {
case []string:
cRecords <- v.([]string)
return
case []interface{}:
cRecords <- iface2Str(v.([]interface{}))
return
default:
//close(cRecords)
status <- fmt.Errorf("I don't know how to turn %T into []string", v)
return
}*/

})
if err1 != nil {
close(cRecords)
Expand All @@ -111,6 +96,5 @@ func indexTable(p *lang.Process, params []string) error {
status <- err4
}()

err0 := <-status
return err0
return <-status
}
Loading

0 comments on commit 96dc071

Please sign in to comment.