Use new MID$ function from baslib.

udhos · Jun 13, 2020 · 581fad4 · 581fad4
1 parent 5e200d0
commit 581fad4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/basgo/basgo.go b/basgo/basgo.go
@@ -20,7 +20,7 @@ const Version = "0.9.0"
 const (
  //DefaultBaslibModule = "github.com/udhos/baslib/baslib@master"
  //DefaultBaslibModule = "github.com/udhos/baslib/baslib"
- DefaultBaslibModule = "github.com/udhos/baslib@v0.10.0"
+ DefaultBaslibModule = "github.com/udhos/baslib@v0.11.0"
  DefaultBaslibImport = "github.com/udhos/baslib/baslib"
 )
 

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
  github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
  github.com/mattn/go-runewidth v0.0.9 // indirect
  github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 // indirect
- github.com/udhos/baslib v0.10.0
+ github.com/udhos/baslib v0.11.0
  github.com/udhos/inkey v0.0.0-20190226220941-63d5361f87da
  golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
  golang.org/x/text v0.3.2 // indirect

diff --git a/go.sum b/go.sum
@@ -33,6 +33,10 @@ github.com/udhos/baslib v0.9.0 h1:i6rwxATQS9Z9M1jsjAqvt0TDYX7CK+CwmBpwSgzVXNI=
 github.com/udhos/baslib v0.9.0/go.mod h1:i2dBz+v4Rtmmyz/0gilfqEiT9SuEfch17ogNnvqI3Fk=
 github.com/udhos/baslib v0.10.0 h1:YXKgEsfCtnD+D3vOaFI1Q7VpKIvyp/6/fXUKl7ohWwE=
 github.com/udhos/baslib v0.10.0/go.mod h1:i2dBz+v4Rtmmyz/0gilfqEiT9SuEfch17ogNnvqI3Fk=
+github.com/udhos/baslib v0.10.1-0.20200611032225-bb974ce5bd36 h1:9R2L52kArV1udB+UwEJSyQOus9jQDkfQNq5Q8L7JtvY=
+github.com/udhos/baslib v0.10.1-0.20200611032225-bb974ce5bd36/go.mod h1:i2dBz+v4Rtmmyz/0gilfqEiT9SuEfch17ogNnvqI3Fk=
+github.com/udhos/baslib v0.11.0 h1:b0akIkuInYnglqHla76I/WhEBiFtGwBoX2mWQoTxnfc=
+github.com/udhos/baslib v0.11.0/go.mod h1:i2dBz+v4Rtmmyz/0gilfqEiT9SuEfch17ogNnvqI3Fk=
 github.com/udhos/baslib/baslib v0.0.0-20200530194440-ad318913150a h1:TXfQskgtwVK+op8YtY5PUSXtNNJNBxL5DSsXqZSqQ2k=
 github.com/udhos/baslib/baslib v0.0.0-20200530194440-ad318913150a/go.mod h1:gsE6owqdjSKHaRnmhDnYjZtmMZZMYUwdnak+JuJJfBc=
 github.com/udhos/baslib/baslib v0.7.0 h1:9rfQf8rT2Urp5QszOGnwy7RATWUoR7wiiwMkVMo9pJ4=

diff --git a/node/node.go b/node/node.go
@@ -2787,14 +2787,14 @@ func (n *NodeMid) Build(options *BuildOptions, outputf FuncPrintf) {
 
  begin := forceInt(options, n.Begin)
 
- size := fmt.Sprintf("(len(%s)-(%s)+1)", variable, begin)
+ value := n.Value.Exp(options)
+
  if n.Size != NodeExp(nil) {
- size = forceInt(options, n.Size)
+ outputf("%s = baslib.MidNewSize(%s,%s,%s,%s)\n", variable, variable, begin, n.Size.Exp(options), value)
+ return
  }
 
- value := n.Value.Exp(options)
-
- outputf("%s = baslib.MidNew(%s,%s,%s,%s)\n", variable, variable, begin, size, value)
+ outputf("%s = baslib.MidNew(%s,%s,%s)\n", variable, variable, begin, value)
 }
 
 // FindUsedVars finds used vars