using errdefer and defer for freeing stuff at the end; removed kfreeb…

…sd from os stdlib
bauripalash · Jul 29, 2024 · f540d4b · f540d4b
1 parent bb9355f
commit f540d4b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/a.pank b/a.pank
@@ -8,3 +8,6 @@ show(a,"\n")
 show(b, "\n")
 show(a[2], "\n")
 show(b[3], "\n")
+show("\x61","\n")
+show("\xe0\xa6\xaa\xe0\xa6\xb2\xe0\xa6\xbe\xe0\xa6\xb6", "\n")
+show("\U000009aa\U000009b2\U000009be\U000009b6", "\n")
diff --git a/src/compiler.zig b/src/compiler.zig
@@ -780,6 +780,16 @@ pub const Compiler = struct {
             return Allocator.Error.OutOfMemory;
         };
 
+        errdefer {
+            _string.clearAndFree(al);
+            _string.deinit(al);
+        }
+
+        // errdefer {
+        //     _string.clearAndFree(al);
+        //     _string.deinit(al);
+        // }
+
         const view = std.unicode.Utf8View.initUnchecked(lexeme);
         var ite = view.iterator();
 
@@ -808,12 +818,34 @@ pub const Compiler = struct {
                     'r' => raw = &[_]u8{'\x0D'}, // Carriage Return
                     't' => raw = &[_]u8{'\t'}, // Horizontal Tab
                     'v' => raw = &[_]u8{'\x0B'}, // Vertical Tab
+                    'x' => {
+                        const uLen = 2;
+                        const hexChars = ite.peek(uLen);
+
+                        if (hexChars.len < uLen) {
+                            self.parser.err("hex escape requires 2 chars");
+                            return Allocator.Error.OutOfMemory;
+                        }
+
+                        var hex = [4]u8{ 0, 0, 0, 0 };
+                        if (self.readUnicodeCodePoint(hexChars, &hex)) |hlen| {
+                            raw = hex[0..hlen];
+
+                            for (0..uLen) |_| {
+                                _ = ite.nextCodepoint() orelse {
+                                    self.parser.err("Invalid string hex escape codepoint");
+                                    return Allocator.Error.OutOfMemory;
+                                };
+                            }
+                        } else {
+                            self.parser.err("Invalid string hex escape codepoint");
+                            return Allocator.Error.OutOfMemory;
+                        }
+                    },
                     'u' => {
                         const uLen = 4;
                         const hexChars = ite.peek(uLen);
                         if (hexChars.len < uLen) {
-                            _string.clearAndFree(al);
-                            _string.deinit(al);
                             self.parser.err(compErrors.STRING_U4_NOT_4);
                             return Allocator.Error.OutOfMemory;
                         }
@@ -823,15 +855,11 @@ pub const Compiler = struct {
                             raw = hex[0..hlen];
                             for (0..uLen) |_| {
                                 _ = ite.nextCodepoint() orelse {
-                                    _string.clearAndFree(al);
-                                    _string.deinit(al);
                                     self.parser.err(compErrors.STRING_INVALID_CP);
                                     return Allocator.Error.OutOfMemory;
                                 };
                             }
                         } else {
-                            _string.clearAndFree(al);
-                            _string.deinit(al);
                             self.parser.err(compErrors.STRING_INVALID_CP);
                             return Allocator.Error.OutOfMemory;
                         }
@@ -840,8 +868,6 @@ pub const Compiler = struct {
                         const uLen = 8;
                         const hexChars = ite.peek(uLen);
                         if (hexChars.len < uLen) {
-                            _string.clearAndFree(al);
-                            _string.deinit(al);
                             self.parser.err(compErrors.STRING_U4_NOT_4);
                             return Allocator.Error.OutOfMemory;
                         }
@@ -851,22 +877,16 @@ pub const Compiler = struct {
 
                             for (0..uLen) |_| {
                                 _ = ite.nextCodepoint() orelse {
-                                    _string.clearAndFree(al);
-                                    _string.deinit(al);
                                     self.parser.err(compErrors.STRING_INVALID_CP);
                                     return Allocator.Error.OutOfMemory;
                                 };
                             }
                         } else {
-                            _string.clearAndFree(al);
-                            _string.deinit(al);
                             self.parser.err(compErrors.STRING_INVALID_CP);
                             return Allocator.Error.OutOfMemory;
                         }
                     },
                     else => {
-                        _string.clearAndFree(al);
-                        _string.deinit(al);
                         self.parser.err("Invalid escape characters in string");
                         return Allocator.Error.OutOfMemory;
                     },
@@ -875,8 +895,6 @@ pub const Compiler = struct {
 
             //std.debug.print("\nraw->'{s}'<-\n", .{raw});
             _string.appendSlice(al, raw) catch {
-                _string.clearAndFree(al);
-                _string.deinit(al);
                 self.parser.err(compErrors.STRING_TEMP_APPEND);
                 return Allocator.Error.OutOfMemory;
                 //

diff --git a/src/stdlib/os.zig b/src/stdlib/os.zig
@@ -35,7 +35,7 @@ pub fn os_Name(vm: *Vm, argc: u8, values: []PValue) PValue {
         .linux => "লিনাক্স", //should be unix detection instead of linux
         .ios => "আইওএস",
         .macos => "ম্যাকওএস",
-        .kfreebsd, .freebsd, .openbsd, .netbsd, .dragonfly => "বিএসডি",
+        .freebsd, .openbsd, .netbsd, .dragonfly => "বিএসডি",
         .plan9 => "প্ল্যান9",
         else => if (builtin.target.abi == .android)
             "আন্ড্রয়েড"