Skip to content

Commit 7c3ca4e

Browse files
committed
update vendored gomacro to fix #172
1 parent 42dbcfe commit 7c3ca4e

File tree

575 files changed

+79454
-7998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

575 files changed

+79454
-7998
lines changed

complete.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
interp "github.com/cosmos72/gomacro/fast"
5-
"github.com/cosmos72/gomacro/base"
65
)
76

87
type Completion struct {
@@ -37,7 +36,7 @@ func handleCompleteRequest(ir *interp.Interp, receipt msgReceipt) error {
3736
content["traceback"] = nil
3837
content["status"] = "error"
3938
} else {
40-
partialWord := base.TailIdentifier(prefix)
39+
partialWord := interp.TailIdentifier(prefix)
4140
content["cursor_start"] = float64(len(prefix) - len(partialWord))
4241
content["cursor_end"] = float64(cursorPos)
4342
content["matches"] = matches

display.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import (
1111
"reflect"
1212
"strings"
1313

14-
"github.com/cosmos72/gomacro/base"
15-
14+
basereflect "github.com/cosmos72/gomacro/base/reflect"
1615
"github.com/cosmos72/gomacro/xreflect"
1716
)
1817

@@ -277,7 +276,7 @@ func (kernel *Kernel) autoRender(mimeType string, arg interface{}, typ xreflect.
277276
conv := kernel.ir.Comp.Converter(typ, xtyp)
278277
x := arg
279278
if conv != nil {
280-
x = base.ValueInterface(conv(reflect.ValueOf(x)))
279+
x = basereflect.Interface(conv(reflect.ValueOf(x)))
281280
if x == nil {
282281
continue
283282
}

kernel.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
"github.com/cosmos72/gomacro/ast2"
1818
"github.com/cosmos72/gomacro/base"
19+
basereflect "github.com/cosmos72/gomacro/base/reflect"
1920
interp "github.com/cosmos72/gomacro/fast"
2021
"github.com/cosmos72/gomacro/xreflect"
2122
zmq "github.com/pebbe/zmq4"
@@ -511,7 +512,7 @@ func doEval(ir *interp.Interp, code string) (val []interface{}, typ []xreflect.T
511512
nonNilCount := 0
512513
values := make([]interface{}, len(results))
513514
for i, result := range results {
514-
val := base.ValueInterface(result)
515+
val := basereflect.Interface(result)
515516
if val != nil {
516517
nonNilCount++
517518
}

vendor/github.com/cosmos72/gomacro/README.md

Lines changed: 108 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cosmos72/gomacro/_example/arith.gomacro

100644100755
File mode changed.

vendor/github.com/cosmos72/gomacro/_example/channel.gomacro

100644100755
File mode changed.

vendor/github.com/cosmos72/gomacro/_example/collatz.gomacro

100644100755
File mode changed.

vendor/github.com/cosmos72/gomacro/_example/embedded_field.gomacro

100644100755
File mode changed.

vendor/github.com/cosmos72/gomacro/_example/fibonacci.gomacro

100644100755
File mode changed.

vendor/github.com/cosmos72/gomacro/_example/for_range.gomacro

100644100755
File mode changed.

0 commit comments

Comments
 (0)