mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-14 12:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: re-enable util.parseArgs with memory fixes (#7460)

Browse Source 
* Fix parseArgs issues and reenable it

* Minor changes to parseArgs

* Another minor change to parseArgs

* Add exception handling to JSValue putMayBeIndex
This commit is contained in:
Otger Rogla
2023-12-09 02:43:40 +01:00
committed by GitHub
parent 59f9d2fe70
commit ce63023553
9 changed files with 508 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/string.zig
View File

@@ -653,12 +653,25 @@ pub const String = extern struct {
return self.tag == .Empty;
}
pub fn substring(self: String, start_index: usize) String {
return String.init(self.toZigString().substring(start_index));
pub fn substring(this: String, start_index: usize) String {
var len = this.length();
return this.substringWithLen(@min(len, start_index), len);
}
pub fn substringWithLen(self: String, start_index: usize, end_index: usize) String {
return String.init(self.toZigString().substringWithLen(start_index, end_index));
pub fn substringWithLen(this: String, start_index: usize, end_index: usize) String {
switch (this.tag) {
.ZigString, .StaticZigString => {
return String.init(this.value.ZigString.substringWithLen(start_index, end_index));
},
.WTFStringImpl => {
if (this.value.WTFStringImpl.is8Bit()) {
return String.init(ZigString.init(this.value.WTFStringImpl.latin1Slice()[start_index..end_index]));
} else {
return String.init(ZigString.init16(this.value.WTFStringImpl.utf16Slice()[start_index..end_index]));
}
},
else => return this,
}
}
pub fn toUTF8(this: String, allocator: std.mem.Allocator) ZigString.Slice {
@@ -757,28 +770,12 @@ pub const String = extern struct {
};
}
pub fn indexOfChar(this: String, chr: u16) ?usize {
switch (this.tag) {
.WTFStringImpl => {
if (this.value.WTFStringImpl.is8Bit()) {
return std.mem.indexOfScalar(u8, this.value.WTFStringImpl.utf8Slice(), @truncate(chr));
} else {
return std.mem.indexOfScalar(u16, this.value.WTFStringImpl.utf16Slice(), chr);
}
},
.ZigString, .StaticZigString => {
if (!this.value.ZigString.is16Bit()) {
return std.mem.indexOfScalar(u8, this.value.ZigString.slice(), @truncate(chr));
} else {
return std.mem.indexOfScalar(u16, this.value.ZigString.utf16SliceAligned(), chr);
}
},
else => return null,
}
}
pub fn indexOfCharU8(this: String, chr: u8) ?usize {
return indexOfChar(this, @intCast(chr));
pub fn indexOfAsciiChar(this: String, chr: u8) ?usize {
std.debug.assert(chr < 128);
return switch (this.isUTF16()) {
true => std.mem.indexOfScalar(u16, this.utf16(), @intCast(chr)),
false => bun.strings.indexOfCharUsize(this.byteSlice(), chr),
};
}
pub fn indexOfComptimeWithCheckLen(this: String, comptime values: []const []const u8, comptime check_len: usize) ?usize {