builtin: add .vstring_literal and .vstring_literal_with_len for converting read only strings like os.args

pull/9447/head
Delyan Angelov 2021-03-23 22:10:11 +02:00
parent 026f8424c2
commit b7c01db1f9
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 63 additions and 4 deletions

View File

@ -145,6 +145,8 @@ pub fn tos_lit(s charptr) string {
} }
// vstring converts a C style string to a V string. NB: the string data is reused, NOT copied. // vstring converts a C style string to a V string. NB: the string data is reused, NOT copied.
// strings returned from this function will be normal V strings beside that (i.e. they would be
// freed by V's -autofree mechanism, when they are no longer used).
[unsafe] [unsafe]
pub fn (bp byteptr) vstring() string { pub fn (bp byteptr) vstring() string {
return string{ return string{
@ -153,30 +155,87 @@ pub fn (bp byteptr) vstring() string {
} }
} }
// vstring_with_len converts a C style string to a V string. NB: the string data is reused, NOT copied. // vstring_with_len converts a C style string to a V string.
// NB: the string data is reused, NOT copied.
[unsafe] [unsafe]
pub fn (bp byteptr) vstring_with_len(len int) string { pub fn (bp byteptr) vstring_with_len(len int) string {
return string{ return string{
str: bp str: bp
len: len len: len
is_lit: 0
} }
} }
// vstring converts C char* to V string. NB: the string data is reused, NOT copied. // vstring converts C char* to V string.
// NB: the string data is reused, NOT copied.
[unsafe] [unsafe]
pub fn (cp charptr) vstring() string { pub fn (cp charptr) vstring() string {
return string{ return string{
str: byteptr(cp) str: byteptr(cp)
len: unsafe { C.strlen(cp) } len: unsafe { C.strlen(cp) }
is_lit: 0
} }
} }
// vstring_with_len converts C char* to V string. NB: the string data is reused, NOT copied. // vstring_with_len converts C char* to V string.
// NB: the string data is reused, NOT copied.
[unsafe] [unsafe]
pub fn (cp charptr) vstring_with_len(len int) string { pub fn (cp charptr) vstring_with_len(len int) string {
return string{ return string{
str: byteptr(cp) str: byteptr(cp)
len: len len: len
is_lit: 0
}
}
// vstring_literal converts a C style string to a V string.
// NB: the string data is reused, NOT copied.
// NB2: unlike vstring, vstring_literal will mark the string
// as a literal, so it will not be freed by autofree.
// This is suitable for readonly strings, C string literals etc,
// that can be read by the V program, but that should not be
// managed by it, for example `os.args` is implemented using it.
[unsafe]
pub fn (bp byteptr) vstring_literal() string {
return string{
str: bp
len: unsafe { C.strlen(charptr(bp)) }
is_lit: 1
}
}
// vstring_with_len converts a C style string to a V string.
// NB: the string data is reused, NOT copied.
[unsafe]
pub fn (bp byteptr) vstring_literal_with_len(len int) string {
return string{
str: bp
len: len
is_lit: 1
}
}
// vstring_literal converts C char* to V string.
// See also vstring_literal defined on byteptr for more details.
// NB: the string data is reused, NOT copied.
[unsafe]
pub fn (cp charptr) vstring_literal() string {
return string{
str: byteptr(cp)
len: unsafe { C.strlen(cp) }
is_lit: 1
}
}
// vstring_literal_with_len converts C char* to V string.
// See also vstring_literal_with_len defined on byteptr.
// NB: the string data is reused, NOT copied.
[unsafe]
pub fn (cp charptr) vstring_literal_with_len(len int) string {
return string{
str: byteptr(cp)
len: len
is_lit: 1
} }
} }

View File

@ -75,7 +75,7 @@ fn init_os_args(argc int, argv &&byte) []string {
// mut args := []string{len:argc} // mut args := []string{len:argc}
for i in 0 .. argc { for i in 0 .. argc {
// args [i] = argv[i].vstring() // args [i] = argv[i].vstring()
unsafe { args_ << byteptr(argv[i]).vstring() } unsafe { args_ << byteptr(argv[i]).vstring_literal() }
} }
return args_ return args_
} }