mirrors/go-jsonnet
1
0
Fork 0
mirror of https://github.com/google/go-jsonnet.git synced 2025-08-07 14:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix compilation error of valueToString in debugger.go (#754)

Browse Source
This commit is contained in:
itchyny 2024-06-10 19:07:28 +09:00 committed by GitHub
parent dec1aa2be3
commit 02bcb686b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
debugger.go
View File

@ -180,7 +180,10 @@ func (d *Debugger) preHook(i *interpreter, n ast.Node) {
if l.File == nil { if l.File == nil {
return return
} }
vs := valueToString(d.lastEvaluation) vs, err := valueToString(d.interpreter, d.lastEvaluation)
if err != nil {
return
}
if d.singleStep { if d.singleStep {
d.singleStep = false d.singleStep = false
d.events <- &DebugEventStop{ d.events <- &DebugEventStop{
@ -208,61 +211,6 @@ func (d *Debugger) preHook(i *interpreter, n ast.Node) {
return return
} }
func valueToString(v value) string {
switch i := v.(type) {
case *valueFlatString:
return "\"" + i.getGoString() + "\""
case *valueObject:
if i == nil {
return "{}"
}
var sb strings.Builder
sb.WriteString("{")
firstLine := true
for k, v := range i.cache {
if k.depth != 0 {
continue
}
if !firstLine {
sb.WriteString(", ")
firstLine = true
}
sb.WriteString(k.field)
sb.WriteString(": ")
sb.WriteString(valueToString(v))
}
sb.WriteString("}")
return sb.String()
case *valueArray:
var sb strings.Builder
sb.WriteString("[")
for i, e := range i.elements {
if i > 0 {
sb.WriteString(", ")
}
sb.WriteString(valueToString(e.content))
}
sb.WriteString("]")
return sb.String()
case *valueNumber:
return fmt.Sprintf("%f", i.value)
case *valueBoolean:
return fmt.Sprintf("%t", i.value)
case *valueFunction:
var sb strings.Builder
sb.WriteString("function(")
for i, p := range i.parameters() {
if i > 0 {
sb.WriteString(", ")
}
sb.WriteString(string(p.name))
}
sb.WriteString(")")
return sb.String()
}
return fmt.Sprintf("%T%+v", v, v)
}
func (d *Debugger) ActiveBreakpoints() []string { func (d *Debugger) ActiveBreakpoints() []string {
bps := []string{} bps := []string{}
for k := range d.breakpoints { for k := range d.breakpoints {
@ -334,9 +282,9 @@ func (d *Debugger) ClearBreakpoints(file string) {
func (d *Debugger) LookupValue(val string) (string, error) { func (d *Debugger) LookupValue(val string) (string, error) {
switch val { switch val {
case "self": case "self":
return valueToString(d.interpreter.stack.getSelfBinding().self), nil return valueToString(d.interpreter, d.interpreter.stack.getSelfBinding().self)
case "super": case "super":
return valueToString(d.interpreter.stack.getSelfBinding().super().self), nil return valueToString(d.interpreter, d.interpreter.stack.getSelfBinding().super().self)
default: default:
v := d.interpreter.stack.lookUpVar(ast.Identifier(val)) v := d.interpreter.stack.lookUpVar(ast.Identifier(val))
if v != nil { if v != nil {
@ -357,7 +305,7 @@ func (d *Debugger) LookupValue(val string) (string, error) {
} }
v.content = e v.content = e
} }
return valueToString(v.content), nil return valueToString(d.interpreter, v.content)
} }
} }
return "", fmt.Errorf("invalid identifier %s", val) return "", fmt.Errorf("invalid identifier %s", val)