Skip to content

Fix UTF8 filenames not being matched by gcc -e output parsing (round 2) #195

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 2 commits into from
Nov 23, 2016
Merged

Fix UTF8 filenames not being matched by gcc -e output parsing (round 2) #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaab313
Add tests to handle utf8 paths
facchinm Aug 29, 2016
4641067
Treat cpp string as UTF8
cmaglie Nov 23, 2016
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
10 changes: 10 additions & 0 deletions src/arduino.cc/builder/test/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,14 @@ func TestParseCppString(t *testing.T) {
require.Equal(t, true, ok)
require.Equal(t, ` !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmnopqrstuvwxyz{|}~`, str)
require.Equal(t, ``, rest)

str, rest, ok = utils.ParseCppString(`"/home/ççç/"`)
require.Equal(t, true, ok)
require.Equal(t, `/home/ççç/`, str)
require.Equal(t, ``, rest)

str, rest, ok = utils.ParseCppString(`"/home/ççç/ /$sdsdd\\"`)
require.Equal(t, true, ok)
require.Equal(t, `/home/ççç/ /$sdsdd\`, str)
require.Equal(t, ``, rest)
}
13 changes: 8 additions & 5 deletions src/arduino.cc/builder/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
"path/filepath"
"runtime"
"strings"
"unicode/utf8"

"arduino.cc/builder/constants"
"arduino.cc/builder/gohasissues"
Expand Down Expand Up @@ -443,23 +444,25 @@ func ParseCppString(line string) (string, string, bool) {
return "", line, false
}

switch line[i] {
c, width := utf8.DecodeRuneInString(line[i:])

switch c {
// Backslash, next character is used unmodified
case '\\':
i++
i += width
if i >= len(line) {
return "", line, false
}
res += string(line[i])
break
// Quote, end of string
case '"':
return res, line[i+1:], true
return res, line[i+width:], true
default:
res += string(line[i])
res += string(c)
break
}

i++
i += width
}
}