Fixes macro stringification to work correctly
This commit is contained in:
parent
58d8f6b874
commit
e2abc4b19c
11
gui.go
11
gui.go
|
@ -1138,6 +1138,17 @@ func String(v expression, rawString bool) string {
|
|||
}
|
||||
b.WriteString(body)
|
||||
return b.String()
|
||||
case macro:
|
||||
var b strings.Builder
|
||||
b.WriteString("(macro ")
|
||||
b.WriteString(String(v.params, true))
|
||||
b.WriteRune(' ')
|
||||
body := String(v.body, true)
|
||||
if strings.HasPrefix(body, "(begin ") {
|
||||
body = body[7:]
|
||||
}
|
||||
b.WriteString(body)
|
||||
return b.String()
|
||||
case func(...expression) expression:
|
||||
return fmt.Sprint("Built-in: ", &v)
|
||||
case *IOHandle:
|
||||
|
|
2
main.go
2
main.go
|
@ -18,7 +18,7 @@ import (
|
|||
ln "github.com/peterh/liner"
|
||||
)
|
||||
|
||||
const version = "1.0.4"
|
||||
const version = "1.0.5"
|
||||
|
||||
const globalLibPath = "/usr/local/lib/slope/modules/"
|
||||
|
||||
|
|
11
nogui.go
11
nogui.go
|
@ -43,6 +43,17 @@ func String(v expression, rawString bool) string {
|
|||
}
|
||||
b.WriteString(body)
|
||||
return b.String()
|
||||
case macro:
|
||||
var b strings.Builder
|
||||
b.WriteString("(macro ")
|
||||
b.WriteString(String(v.params, true))
|
||||
b.WriteRune(' ')
|
||||
body := String(v.body, true)
|
||||
if strings.HasPrefix(body, "(begin ") {
|
||||
body = body[7:]
|
||||
}
|
||||
b.WriteString(body)
|
||||
return b.String()
|
||||
case func(...expression) expression:
|
||||
return fmt.Sprint("Built-in: ", &v)
|
||||
case *IOHandle:
|
||||
|
|
Loading…
Reference in New Issue
Block a user