Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 7 additions & 59 deletions debugger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,10 @@ func (d *Debugger) preHook(i *interpreter, n ast.Node) {
if l.File == nil {
return
}
vs := valueToString(d.lastEvaluation)
vs, err := valueToString(d.interpreter, d.lastEvaluation)
if err != nil {
return
}
if d.singleStep {
d.singleStep = false
d.events <- &DebugEventStop{
Expand Down Expand Up @@ -208,61 +211,6 @@ func (d *Debugger) preHook(i *interpreter, n ast.Node) {
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 {
bps := []string{}
for k := range d.breakpoints {
Expand Down Expand Up @@ -334,9 +282,9 @@ func (d *Debugger) ClearBreakpoints(file string) {
func (d *Debugger) LookupValue(val string) (string, error) {
switch val {
case "self":
return valueToString(d.interpreter.stack.getSelfBinding().self), nil
return valueToString(d.interpreter, d.interpreter.stack.getSelfBinding().self)
case "super":
return valueToString(d.interpreter.stack.getSelfBinding().super().self), nil
return valueToString(d.interpreter, d.interpreter.stack.getSelfBinding().super().self)
default:
v := d.interpreter.stack.lookUpVar(ast.Identifier(val))
if v != nil {
Expand All @@ -357,7 +305,7 @@ func (d *Debugger) LookupValue(val string) (string, error) {
}
v.content = e
}
return valueToString(v.content), nil
return valueToString(d.interpreter, v.content)
}
}
return "", fmt.Errorf("invalid identifier %s", val)
Expand Down
Loading