code.ivysaur.me/php2go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

node: use multiline quoting logic consistently in all places

Browse Source
This commit is contained in:
mappu 2020-04-12 14:39:38 +12:00
parent 4ed8bfd72d
commit 5ba0185bcb
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
node.go
View File

@ -159,7 +159,7 @@ func (this *conversionState) convertNoFreeFloating(n_ node.Node) (string, error)
if len(this.importPackages) > 0 { if len(this.importPackages) > 0 {
ret += "import (\n" ret += "import (\n"
for packageName, _ := range this.importPackages { for packageName, _ := range this.importPackages {
ret += "\t" + strconv.Quote(packageName) + "\n" ret += "\t" + quoteGoString(packageName) + "\n"
} }
ret += ")\n" ret += ")\n"
} }
@ -689,18 +689,8 @@ func (this *conversionState) convertNoFreeFloating(n_ node.Node) (string, error)
case *stmt.InlineHtml: case *stmt.InlineHtml:
// Convert into fmt.Print // Convert into fmt.Print
var quoted string
if !strings.Contains(n.Value, "`") && strings.Count(n.Value, "\n") >= 3 { // TODO make the heuristic configurable
// Use backtick-delimited multiline string
quoted = "`" + n.Value + "`"
} else {
// Can't trivially represent it with backticks, or it's not multiline "enough" to bother - use full Go quoting
quoted = strconv.Quote(n.Value)
}
this.importPackages["fmt"] = struct{}{} this.importPackages["fmt"] = struct{}{}
return "fmt.Print(" + quoteGoString(n.Value) + ")\n", nil // newline - standalone statement
return "fmt.Print(" + quoted + ")\n", nil // newline - standalone statement
case *stmt.ConstList: case *stmt.ConstList:
consts := make([]string, 0, len(n.Consts)) consts := make([]string, 0, len(n.Consts))
@ -1160,10 +1150,10 @@ func (this *conversionState) convertNoFreeFloating(n_ node.Node) (string, error)
// isn't generally known non-statically // isn't generally known non-statically
if _, ok := n.Class.(*name.Name); ok { if _, ok := n.Class.(*name.Name); ok {
// Static // Static
return strconv.Quote(className), nil return quoteGoString(className), nil
} else if className == `self` { } else if className == `self` {
return strconv.Quote(this.currentClassName), nil return quoteGoString(this.currentClassName), nil
} else { } else {
// Dynamic // Dynamic
@ -1473,7 +1463,7 @@ func (this *conversionState) convertNoFreeFloating(n_ node.Node) (string, error)
return "", parseErr{n, err} return "", parseErr{n, err}
} }
return strconv.Quote(rawValue), nil // Go source code quoting format return quoteGoString(rawValue), nil // Go source code quoting format
case *scalar.MagicConstant: case *scalar.MagicConstant:
// magic constants are case-insensitive // magic constants are case-insensitive
@ -1609,6 +1599,18 @@ func removeParens(expr string) string {
return expr return expr
} }
func quoteGoString(s string) string {
if !strings.Contains(s, "`") && strings.Count(s, "\n") >= 3 { // TODO make the heuristic configurable
// Use backtick-delimited multiline string
return "`" + s + "`"
} else {
// Can't trivially represent it with backticks, or it's not multiline "enough" to bother - use full Go quoting
return strconv.Quote(s)
}
}
func (this *conversionState) convertEncapsedString(parts []node.Node) (string, error) {
// resolveName turns a `*name.Name` node into a Go string. // resolveName turns a `*name.Name` node into a Go string.
func (this *conversionState) resolveName(n node.Node) (string, error) { func (this *conversionState) resolveName(n node.Node) (string, error) {
// TODO support namespace lookups // TODO support namespace lookups

3
quote.go
View File

@ -13,6 +13,9 @@ func phpUnquote(s string) (string, error) {
if s[0] == '"' { if s[0] == '"' {
// Quote system is similar enough to Go's that strconv will probably just work // Quote system is similar enough to Go's that strconv will probably just work
// PHP has some lax parsing for unknown escape sequences
// e.g. regex("foo\.") will be silently parsed as regex("foo.")
return strconv.Unquote(s) return strconv.Unquote(s)
} }