mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vfmt: fix raw string support

Browse Source
This commit is contained in:
Ned Palacios 2020-05-27 09:10:47 +08:00 committed by GitHub
parent 3cfdd2a4cd
commit b02ec8cbf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/fmt/fmt.v
View File

@ -660,6 +660,9 @@ pub fn (mut f Fmt) expr(node ast.Expr) {
f.write(')')
}
ast.StringLiteral {
if it.is_raw {
f.write('r')
}
if it.val.contains("'") && !it.val.contains('"') {
f.write('"$it.val"')
} else {

6
vlib/v/util/util.v
View File

@ -94,7 +94,7 @@ pub fn githash(should_get_from_filesystem bool) string {
}
//
fn set_vroot_folder(vroot_path string) {
pub fn set_vroot_folder(vroot_path string) {
// Preparation for the compiler module:
// VEXE env variable is needed so that compiler.vexe_path()
// can return it later to whoever needs it:
@ -205,7 +205,7 @@ pub fn read_file(file_path string) ?string {
}
[inline]
fn imin(a, b int) int {
pub fn imin(a, b int) int {
return if a < b {
a
} else {
@ -214,7 +214,7 @@ fn imin(a, b int) int {
}
[inline]
fn imax(a, b int) int {
pub fn imax(a, b int) int {
return if a > b {
a
} else {