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

cgen: fix windows escape errors for comptime @ pseudo vars (#6977)

Browse Source
This commit is contained in:
yuyi 2020-11-27 17:16:57 +08:00 committed by GitHub
parent ee2a5727fb
commit 636efb3c20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/v/gen/comptime.v
View File

@ -112,10 +112,11 @@ fn cgen_attrs(attrs []table.Attr) []string {
fn (mut g Gen) comp_at(node ast.AtExpr) {
if node.kind == .vmod_file {
val := cnewlines(node.val.replace('\r', ''))
val := cnewlines(node.val.replace('\r', '')).replace('\\', '\\\\')
g.write('tos_lit("$val")')
} else {
g.write('tos_lit("$node.val")')
val := node.val.replace('\\', '\\\\')
g.write('tos_lit("$val")')
}
}

19
vlib/v/scanner/scanner_at_literals_test.v → vlib/v/tests/comptime_at_test.v
View File

@ -1,6 +1,5 @@
module scanner
import os
import v.pref
struct TestStruct {
test string
@ -67,15 +66,7 @@ fn fn_name_mod_level_high_order(cb fn (int)) {
fn test_at_file() {
// Test @FILE
f := os.file_name(@FILE)
$if windows {
// TODO all after Drive letter
// no_drive := f.all_after(':')
// TODO assert the variable name on Windows???
// assert no_drive == 'scanner_at_literals_test.v'
assert true
} $else {
assert f == 'scanner_at_literals_test.v'
}
assert f == 'comptime_at_test.v'
}
fn test_at_fn() {
@ -96,7 +87,7 @@ fn test_at_fn() {
fn test_at_mod() {
// Test @MOD
assert @MOD == 'scanner'
assert @MOD == 'main'
}
fn test_at_struct() {
@ -123,3 +114,7 @@ fn test_vmod_file() {
assert content.contains('version:')
assert content.contains('description:')
}
fn test_comptime_at() {
assert @VEXE == pref.vexe_path()
}