barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't indirect map values

Browse source 
We already have reference behaviour, so this is not necessary.

This change highlighted fairly baroque architecture in mql that deserves
some attention; the use of channels is somewhat confusing.

Also rename LastResult to Result.
This commit is contained in:
kortschak 2014-07-02 12:08:49 +09:30
parent b89d4f392c
commit a1453da84e
15 changed files with 59 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graph/sexp/session.go
View file

@ -82,7 +82,7 @@ func (s *Session) ExecInput(input string, out chan interface{}, limit int) {
break
}
tags := make(map[string]graph.TSVal)
it.TagResults(&tags)
it.TagResults(tags)
out <- &tags
nResults++
if nResults > limit && limit != -1 {
@ -90,7 +90,7 @@ func (s *Session) ExecInput(input string, out chan interface{}, limit int) {
}
for it.NextResult() == true {
tags := make(map[string]graph.TSVal)
it.TagResults(&tags)
it.TagResults(tags)
out <- &tags
nResults++
if nResults > limit && limit != -1 {
@ -103,10 +103,10 @@ func (s *Session) ExecInput(input string, out chan interface{}, limit int) {
func (s *Session) ToText(result interface{}) string {
out := fmt.Sprintln("****")
tags := result.(*map[string]graph.TSVal)
tagKeys := make([]string, len(*tags))
tags := result.(map[string]graph.TSVal)
tagKeys := make([]string, len(tags))
i := 0
for k, _ := range *tags {
for k := range tags {
tagKeys[i] = k
i++
}
@ -115,7 +115,7 @@ func (s *Session) ToText(result interface{}) string {
if k == "$_" {
continue
}
out += fmt.Sprintf("%s : %s\n", k, s.ts.NameOf((*tags)[k]))
out += fmt.Sprintf("%s : %s\n", k, s.ts.NameOf(tags[k]))
}
return out
}