mirror of
https://github.com/c3lang/c3c.git
synced 2026-02-27 12:01:16 +00:00
- Create optional with ~ instead of ?. return io::EOF?; becomes return io::EOF~.
- Deprecated use of `?` to create optional.
This commit is contained in:
@@ -87,7 +87,7 @@ fn String? executable_path()
|
||||
{
|
||||
char[4096] buf;
|
||||
uint temp_len = buf.len;
|
||||
if (darwin_NSGetExecutablePath(&buf, &temp_len) < 0) return NOT_FOUND?;
|
||||
if (darwin_NSGetExecutablePath(&buf, &temp_len) < 0) return NOT_FOUND~;
|
||||
len = (int)((ZString)&buf).len();
|
||||
path[:len] = buf[:len];
|
||||
}
|
||||
@@ -97,8 +97,8 @@ fn String? executable_path()
|
||||
fn uptr? load_address() @local
|
||||
{
|
||||
Darwin_segment_command_64* cmd = darwin::getsegbyname("__TEXT");
|
||||
if (!cmd) return backtrace::SEGMENT_NOT_FOUND?;
|
||||
String path = env::executable_path() ?? backtrace::EXECUTABLE_PATH_NOT_FOUND?!;
|
||||
if (!cmd) return backtrace::SEGMENT_NOT_FOUND~;
|
||||
String path = env::executable_path() ?? backtrace::EXECUTABLE_PATH_NOT_FOUND~!;
|
||||
uint dyld_count = darwin::_dyld_image_count();
|
||||
for (uint i = 0; i < dyld_count; i++)
|
||||
{
|
||||
@@ -107,7 +107,7 @@ fn uptr? load_address() @local
|
||||
if (image_name.str_view() != path) continue;
|
||||
return cmd.vmaddr + darwin::_dyld_get_image_vmaddr_slide(i);
|
||||
}
|
||||
return backtrace::IMAGE_NOT_FOUND?;
|
||||
return backtrace::IMAGE_NOT_FOUND~;
|
||||
}
|
||||
|
||||
fn Backtrace? backtrace_load_element(Allocator allocator, String execpath, void* buffer, void* load_address) @local
|
||||
|
||||
@@ -51,10 +51,10 @@ fn String? find_first_directory_temp(NSSearchPathDirectory directory, NSSearchPa
|
||||
objc::@autoreleasepool()
|
||||
{
|
||||
CFArrayRef arr = nsSearchPathForDirectoriesInDomains(directory, domainMask, true);
|
||||
if (!arr.getCount()) return io::PATH_COULD_NOT_BE_FOUND?;
|
||||
if (!arr.getCount()) return io::PATH_COULD_NOT_BE_FOUND~;
|
||||
CFStringRef str = (CFStringRef)arr.getValueAtIndex(0);
|
||||
char* buffer = tmalloc(2048);
|
||||
if (!str.getCString(buffer, 2048, UTF8)) return io::PATH_COULD_NOT_BE_FOUND?;
|
||||
if (!str.getCString(buffer, 2048, UTF8)) return io::PATH_COULD_NOT_BE_FOUND~;
|
||||
return ((ZString)buffer).str_view();
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ alias NSInteger = $typefrom(env::ARCH_64_BIT ??? long : int);
|
||||
macro ObjcClass? class_by_name(ZString c)
|
||||
{
|
||||
ObjcClass cls = objc::lookUpClass(c);
|
||||
return cls ?: CLASS_NOT_FOUND?;
|
||||
return cls ?: CLASS_NOT_FOUND~;
|
||||
}
|
||||
|
||||
macro ObjcClass[] class_get_list(Allocator allocator)
|
||||
@@ -240,7 +240,7 @@ fn EventType? event_type_from(int val) @deprecated("Use NSEventType directly.")
|
||||
case EventType.PRESSURE.val: return PRESSURE;
|
||||
case EventType.DIRECT_TOUCH.val: return DIRECT_TOUCH;
|
||||
case EventType.CHANGE_MODE.val: return CHANGE_MODE;
|
||||
default: return objc::UNKNOWN_EVENT?;
|
||||
default: return objc::UNKNOWN_EVENT~;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user