diff --git a/README.md b/README.md index 1e3bd39f8..c11adb324 100644 --- a/README.md +++ b/README.md @@ -80,13 +80,13 @@ import stack; // Define our new types, the first will implicitly create // a complete copy of the entire Stack module with "Type" set to "int" -def IntStack = Stack(); +alias IntStack = Stack {int}; // The second creates another copy with "Type" set to "double" -def DoubleStack = Stack(); +alias DoubleStack = Stack {double}; -// If we had added "define IntStack2 = Stack()" +// If we had added "alias IntStack2 = Stack {int}" // no additional copy would have been made (since we already -// have an parameterization of Stack()) so it would +// have an parameterization of Stack {int} so it would // be same as declaring IntStack2 an alias of IntStack // Importing an external C function is straightforward diff --git a/lib/std/collections/anylist.c3 b/lib/std/collections/anylist.c3 index 7ca04eb39..6ec2af3ad 100644 --- a/lib/std/collections/anylist.c3 +++ b/lib/std/collections/anylist.c3 @@ -4,8 +4,8 @@ module std::collections::anylist; import std::io,std::math; -def AnyPredicate = fn bool(any value); -def AnyTest = fn bool(any type, any context); +alias AnyPredicate = fn bool(any value); +alias AnyTest = fn bool(any type, any context); struct AnyList (Printable) { diff --git a/lib/std/collections/bitset.c3 b/lib/std/collections/bitset.c3 index c0591c508..3681efed4 100644 --- a/lib/std/collections/bitset.c3 +++ b/lib/std/collections/bitset.c3 @@ -3,7 +3,7 @@ *> module std::collections::bitset{SIZE}; -def Type = uint; +alias Type = uint; const BITS = Type.sizeof * 8; const SZ = (SIZE + BITS - 1) / BITS; @@ -75,7 +75,7 @@ import std::collections::list; const BITS = Type.sizeof * 8; -def GrowableBitSetList = List{Type}; +alias GrowableBitSetList = List{Type}; struct GrowableBitSet { diff --git a/lib/std/collections/elastic_array.c3 b/lib/std/collections/elastic_array.c3 index cac47d30b..cd8f36eb4 100644 --- a/lib/std/collections/elastic_array.c3 +++ b/lib/std/collections/elastic_array.c3 @@ -7,8 +7,8 @@ module std::collections::elastic_array {Type, MAX_SIZE}; import std::io, std::math, std::collections::list_common; -def ElementPredicate = fn bool(Type *type); -def ElementTest = fn bool(Type *type, any context); +alias ElementPredicate = fn bool(Type *type); +alias ElementTest = fn bool(Type *type, any context); const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type); const ELEMENT_IS_POINTER = Type.kindof == POINTER; macro type_is_overaligned() => Type.alignof > mem::DEFAULT_MEM_ALIGNMENT; diff --git a/lib/std/collections/enumset.c3 b/lib/std/collections/enumset.c3 index 8a118afc8..110eafec7 100644 --- a/lib/std/collections/enumset.c3 +++ b/lib/std/collections/enumset.c3 @@ -8,7 +8,7 @@ module std::collections::enumset{Enum}; import std::io; -def EnumSetType = $typefrom(type_for_enum_elements(Enum.elements)) @private; +alias EnumSetType = $typefrom(type_for_enum_elements(Enum.elements)) @private; const IS_CHAR_ARRAY = Enum.elements > 128; distinct EnumSet (Printable) = EnumSetType; diff --git a/lib/std/collections/list.c3 b/lib/std/collections/list.c3 index 4dd97a6a3..585435288 100644 --- a/lib/std/collections/list.c3 +++ b/lib/std/collections/list.c3 @@ -4,8 +4,8 @@ module std::collections::list{Type}; import std::io, std::math, std::collections::list_common; -def ElementPredicate = fn bool(Type *type); -def ElementTest = fn bool(Type *type, any context); +alias ElementPredicate = fn bool(Type *type); +alias ElementTest = fn bool(Type *type, any context); const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type); const ELEMENT_IS_POINTER = Type.kindof == POINTER; diff --git a/lib/std/collections/object.c3 b/lib/std/collections/object.c3 index 812e1f7cc..90a79d625 100644 --- a/lib/std/collections/object.c3 +++ b/lib/std/collections/object.c3 @@ -462,7 +462,7 @@ fn Object* Object.get_or_create_obj(&self, String key) return container; } -def ObjectInternalMap = HashMap{String, Object*} @private; -def ObjectInternalList = List{Object*} @private; -def ObjectInternalMapEntry = Entry{String, Object*} @private; +alias ObjectInternalMap = HashMap{String, Object*} @private; +alias ObjectInternalList = List{Object*} @private; +alias ObjectInternalMapEntry = Entry{String, Object*} @private; diff --git a/lib/std/collections/ringbuffer.c3 b/lib/std/collections/ringbuffer.c3 index 666b4b135..51c9bb5b0 100644 --- a/lib/std/collections/ringbuffer.c3 +++ b/lib/std/collections/ringbuffer.c3 @@ -4,7 +4,7 @@ module std::collections::ringbuffer{Type}; import std::io; -def Element = $typeof((Type){}[0]); +alias Element = $typeof((Type){}[0]); struct RingBuffer (Printable) { diff --git a/lib/std/core/allocators/tracking_allocator.c3 b/lib/std/core/allocators/tracking_allocator.c3 index 7ab889405..2591ec02a 100644 --- a/lib/std/core/allocators/tracking_allocator.c3 +++ b/lib/std/core/allocators/tracking_allocator.c3 @@ -13,7 +13,7 @@ struct Allocation void*[MAX_BACKTRACE] backtrace; } -def AllocMap = HashMap { uptr, Allocation }; +alias AllocMap = HashMap { uptr, Allocation }; // A simple tracking allocator. // It tracks allocations using a hash map but diff --git a/lib/std/core/builtin.c3 b/lib/std/core/builtin.c3 index b550b9bb3..fecc3e938 100644 --- a/lib/std/core/builtin.c3 +++ b/lib/std/core/builtin.c3 @@ -45,7 +45,7 @@ fault NOT_FOUND @builtin; fault TYPE_MISMATCH @builtin; -def VoidFn = fn void(); +alias VoidFn = fn void(); <* Stores a variable on the stack, then restores it at the end of the @@ -155,7 +155,7 @@ fn void default_panic(String message, String file, String function, uint line) @ $$trap(); } -def PanicFn = fn void(String message, String file, String function, uint line); +alias PanicFn = fn void(String message, String file, String function, uint line); PanicFn panic = &default_panic; diff --git a/lib/std/core/cinterop.c3 b/lib/std/core/cinterop.c3 index e4f38b47d..7888115d0 100644 --- a/lib/std/core/cinterop.c3 +++ b/lib/std/core/cinterop.c3 @@ -16,18 +16,18 @@ $assert C_SHORT_SIZE <= C_INT_SIZE; $assert C_INT_SIZE <= C_LONG_SIZE; $assert C_LONG_SIZE <= C_LONG_LONG_SIZE; -def CShort = $typefrom(signed_int_from_bitsize($$C_SHORT_SIZE)); -def CUShort = $typefrom(unsigned_int_from_bitsize($$C_SHORT_SIZE)); -def CInt = $typefrom(signed_int_from_bitsize($$C_INT_SIZE)); -def CUInt = $typefrom(unsigned_int_from_bitsize($$C_INT_SIZE)); -def CLong = $typefrom(signed_int_from_bitsize($$C_LONG_SIZE)); -def CULong = $typefrom(unsigned_int_from_bitsize($$C_LONG_SIZE)); -def CLongLong = $typefrom(signed_int_from_bitsize($$C_LONG_LONG_SIZE)); -def CULongLong = $typefrom(unsigned_int_from_bitsize($$C_LONG_LONG_SIZE)); -def CSChar = ichar; -def CUChar = char; +alias CShort = $typefrom(signed_int_from_bitsize($$C_SHORT_SIZE)); +alias CUShort = $typefrom(unsigned_int_from_bitsize($$C_SHORT_SIZE)); +alias CInt = $typefrom(signed_int_from_bitsize($$C_INT_SIZE)); +alias CUInt = $typefrom(unsigned_int_from_bitsize($$C_INT_SIZE)); +alias CLong = $typefrom(signed_int_from_bitsize($$C_LONG_SIZE)); +alias CULong = $typefrom(unsigned_int_from_bitsize($$C_LONG_SIZE)); +alias CLongLong = $typefrom(signed_int_from_bitsize($$C_LONG_LONG_SIZE)); +alias CULongLong = $typefrom(unsigned_int_from_bitsize($$C_LONG_LONG_SIZE)); +alias CSChar = ichar; +alias CUChar = char; -def CChar = $typefrom($$C_CHAR_IS_SIGNED ? ichar.typeid : char.typeid); +alias CChar = $typefrom($$C_CHAR_IS_SIGNED ? ichar.typeid : char.typeid); enum CBool : char { diff --git a/lib/std/core/mem_allocator.c3 b/lib/std/core/mem_allocator.c3 index 7279e95bd..6f803b2d2 100644 --- a/lib/std/core/mem_allocator.c3 +++ b/lib/std/core/mem_allocator.c3 @@ -41,7 +41,7 @@ interface Allocator fn void release(void* ptr, bool aligned); } -def MemoryAllocFn = fn char[]?(usz); +alias MemoryAllocFn = fn char[]?(usz); @@ -358,7 +358,7 @@ macro void*? @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes // All allocators -def mem = thread_allocator @builtin; +alias mem = thread_allocator @builtin; tlocal Allocator thread_allocator @private = base_allocator(); Allocator temp_base_allocator @private = base_allocator(); diff --git a/lib/std/core/private/macho_runtime.c3 b/lib/std/core/private/macho_runtime.c3 index 7af986b61..c26185da6 100644 --- a/lib/std/core/private/macho_runtime.c3 +++ b/lib/std/core/private/macho_runtime.c3 @@ -104,7 +104,7 @@ macro find_segment_section_body(MachHeader* header, char* segname, char* sectnam return ptr[:section.size / $Type.sizeof]; } -def DyldCallback = fn void (MachHeader* mh, isz vmaddr_slide); +alias DyldCallback = fn void (MachHeader* mh, isz vmaddr_slide); extern fn void _dyld_register_func_for_add_image(DyldCallback); @@ -123,7 +123,7 @@ extern fn void* realloc(void* ptr, usz size); extern fn void* malloc(usz size); extern fn void free(void* ptr); -def CallbackFn = fn void(); +alias CallbackFn = fn void(); struct Callback { uint priority; diff --git a/lib/std/core/runtime_benchmark.c3 b/lib/std/core/runtime_benchmark.c3 index f8f56a7d7..c0f4e582a 100644 --- a/lib/std/core/runtime_benchmark.c3 +++ b/lib/std/core/runtime_benchmark.c3 @@ -1,7 +1,7 @@ module std::core::runtime; import libc, std::time, std::io, std::sort; -def BenchmarkFn = fn void(); +alias BenchmarkFn = fn void(); struct BenchmarkUnit { diff --git a/lib/std/core/runtime_test.c3 b/lib/std/core/runtime_test.c3 index 94b8b8b77..950a87d89 100644 --- a/lib/std/core/runtime_test.c3 +++ b/lib/std/core/runtime_test.c3 @@ -7,7 +7,7 @@ import std::core::mem::allocator @public; import libc, std::time, std::io, std::sort; import std::os::env; -def TestFn = fn void(); +alias TestFn = fn void(); TestContext* test_context @private; diff --git a/lib/std/core/sanitizer/asan.c3 b/lib/std/core/sanitizer/asan.c3 index b06d2bf9c..73c8866e4 100644 --- a/lib/std/core/sanitizer/asan.c3 +++ b/lib/std/core/sanitizer/asan.c3 @@ -12,7 +12,7 @@ module std::core::sanitizer::asan; -def ErrorCallback = fn void (ZString); +alias ErrorCallback = fn void (ZString); <* Marks a memory region ([addr, addr+size)) as unaddressable. diff --git a/lib/std/core/string.c3 b/lib/std/core/string.c3 index 302daaadf..491345f12 100644 --- a/lib/std/core/string.c3 +++ b/lib/std/core/string.c3 @@ -5,8 +5,8 @@ import std::io; distinct String @if(!$defined(String)) = inline char[]; distinct ZString = inline char*; distinct WString = inline Char16*; -def Char32 = uint; -def Char16 = ushort; +alias Char32 = uint; +alias Char16 = ushort; fault INVALID_UTF8, INVALID_UTF16, CONVERSION_FAILED, EMPTY_STRING, NEGATIVE_VALUE, MALFORMED_INTEGER, INTEGER_OVERFLOW, MALFORMED_FLOAT, FLOAT_OUT_OF_RANGE; diff --git a/lib/std/hash/md5.c3 b/lib/std/hash/md5.c3 index df6321798..bcad6f5f8 100644 --- a/lib/std/hash/md5.c3 +++ b/lib/std/hash/md5.c3 @@ -13,9 +13,9 @@ struct Md5 uint[16] block; } -def HmacMd5 = Hmac{Md5, HASH_BYTES, BLOCK_BYTES}; -def hmac = hmac::hash{Md5, HASH_BYTES, BLOCK_BYTES}; -def pbkdf2 = hmac::pbkdf2{Md5, HASH_BYTES, BLOCK_BYTES}; +alias HmacMd5 = Hmac{Md5, HASH_BYTES, BLOCK_BYTES}; +alias hmac = hmac::hash{Md5, HASH_BYTES, BLOCK_BYTES}; +alias pbkdf2 = hmac::pbkdf2{Md5, HASH_BYTES, BLOCK_BYTES}; fn char[HASH_BYTES] hash(char[] data) { diff --git a/lib/std/hash/sha1.c3 b/lib/std/hash/sha1.c3 index 4dad804f1..b4afade06 100644 --- a/lib/std/hash/sha1.c3 +++ b/lib/std/hash/sha1.c3 @@ -18,9 +18,9 @@ struct Sha1 char[BLOCK_BYTES] buffer; } -def HmacSha1 = Hmac{Sha1, HASH_BYTES, BLOCK_BYTES}; -def hmac = hmac::hash{Sha1, HASH_BYTES, BLOCK_BYTES}; -def pbkdf2 = hmac::pbkdf2{Sha1, HASH_BYTES, BLOCK_BYTES}; +alias HmacSha1 = Hmac{Sha1, HASH_BYTES, BLOCK_BYTES}; +alias hmac = hmac::hash{Sha1, HASH_BYTES, BLOCK_BYTES}; +alias pbkdf2 = hmac::pbkdf2{Sha1, HASH_BYTES, BLOCK_BYTES}; fn char[HASH_BYTES] hash(char[] data) { diff --git a/lib/std/hash/sha256.c3 b/lib/std/hash/sha256.c3 index a5e86ff3b..46ea81f94 100644 --- a/lib/std/hash/sha256.c3 +++ b/lib/std/hash/sha256.c3 @@ -34,9 +34,9 @@ struct Sha256 char[BLOCK_SIZE] buffer; } -def HmacSha256 = Hmac{Sha256, HASH_SIZE, BLOCK_SIZE}; -def hmac = hmac::hash{Sha256, HASH_SIZE, BLOCK_SIZE}; -def pbkdf2 = hmac::pbkdf2{Sha256, HASH_SIZE, BLOCK_SIZE}; +alias HmacSha256 = Hmac{Sha256, HASH_SIZE, BLOCK_SIZE}; +alias hmac = hmac::hash{Sha256, HASH_SIZE, BLOCK_SIZE}; +alias pbkdf2 = hmac::pbkdf2{Sha256, HASH_SIZE, BLOCK_SIZE}; fn char[HASH_SIZE] hash(char[] data) { diff --git a/lib/std/io/formatter.c3 b/lib/std/io/formatter.c3 index 876c51b8f..ba1e89ffd 100644 --- a/lib/std/io/formatter.c3 +++ b/lib/std/io/formatter.c3 @@ -13,8 +13,8 @@ interface Printable fault BUFFER_EXCEEDED, INTERNAL_BUFFER_EXCEEDED, INVALID_FORMAT, NOT_ENOUGH_ARGUMENTS, INVALID_ARGUMENT; -def OutputFn = fn void?(void* buffer, char c); -def FloatType = double; +alias OutputFn = fn void?(void* buffer, char c); +alias FloatType = double; macro bool is_struct_with_default_print($Type) diff --git a/lib/std/io/os/file_nolibc.c3 b/lib/std/io/os/file_nolibc.c3 index 1d5d1232f..d9a86a088 100644 --- a/lib/std/io/os/file_nolibc.c3 +++ b/lib/std/io/os/file_nolibc.c3 @@ -1,15 +1,15 @@ module std::io::os @if(env::NO_LIBC); import libc; -def FopenFn = fn void*?(String, String); -def FreopenFn = fn void*?(void*, String, String); -def FcloseFn = fn void?(void*); -def FseekFn = fn void?(void*, isz, Seek); -def FtellFn = fn usz?(void*); -def FwriteFn = fn usz?(void*, char[] buffer); -def FreadFn = fn usz?(void*, char[] buffer); -def RemoveFn = fn void?(String); -def FputcFn = fn void?(int, void*); +alias FopenFn = fn void*?(String, String); +alias FreopenFn = fn void*?(void*, String, String); +alias FcloseFn = fn void?(void*); +alias FseekFn = fn void?(void*, isz, Seek); +alias FtellFn = fn usz?(void*); +alias FwriteFn = fn usz?(void*, char[] buffer); +alias FreadFn = fn usz?(void*, char[] buffer); +alias RemoveFn = fn void?(String); +alias FputcFn = fn void?(int, void*); FopenFn native_fopen_fn @weak @if(!$defined(native_fopen_fn)); FcloseFn native_fclose_fn @weak @if(!$defined(native_fclose_fn)); diff --git a/lib/std/io/path.c3 b/lib/std/io/path.c3 index e5904e82e..2aa71bb0c 100644 --- a/lib/std/io/path.c3 +++ b/lib/std/io/path.c3 @@ -7,11 +7,11 @@ const char PREFERRED_SEPARATOR_WIN32 = '\\'; const char PREFERRED_SEPARATOR_POSIX = '/'; const char PREFERRED_SEPARATOR = env::WIN32 ? PREFERRED_SEPARATOR_WIN32 : PREFERRED_SEPARATOR_POSIX; -def PathList = List { Path }; +alias PathList = List { Path }; fault INVALID_PATH, NO_PARENT; -def Path = PathImp; +alias Path = PathImp; struct PathImp (Printable) { @@ -552,7 +552,7 @@ fn String Path.root_directory(self) return path_str; } -def PathWalker = fn bool? (Path, bool is_dir, void*); +alias PathWalker = fn bool? (Path, bool is_dir, void*); <* Walk the path recursively. PathWalker is run on every file and @@ -578,7 +578,7 @@ fn bool? Path.walk(self, PathWalker w, void* data) return false; } -def TraverseCallback = fn bool? (Path, bool is_dir, any data); +alias TraverseCallback = fn bool? (Path, bool is_dir, any data); <* Walk the path recursively. TraverseCallback is run for every file and diff --git a/lib/std/io/stream.c3 b/lib/std/io/stream.c3 index 2bcc743c0..708302e54 100644 --- a/lib/std/io/stream.c3 +++ b/lib/std/io/stream.c3 @@ -135,7 +135,7 @@ macro char? read_byte_using_read(s) return buffer[0]; } -def ReadByteFn = fn char?(); +alias ReadByteFn = fn char?(); macro usz? write_using_write_byte(s, char[] bytes) diff --git a/lib/std/libc/libc.c3 b/lib/std/libc/libc.c3 index 6c0349070..686f29d99 100644 --- a/lib/std/libc/libc.c3 +++ b/lib/std/libc/libc.c3 @@ -47,12 +47,12 @@ fn void errno_set(Errno e) } distinct Errno = inline CInt; -def TerminateFunction = fn void(); -def CompareFunction = fn int(void*, void*); -def JmpBuf = uptr[$$JMP_BUF_SIZE]; -def Fd = CInt; -def Fpos_t = long @if(env::WIN32); -def SignalFunction = fn void(CInt); +alias TerminateFunction = fn void(); +alias CompareFunction = fn int(void*, void*); +alias JmpBuf = uptr[$$JMP_BUF_SIZE]; +alias Fd = CInt; +alias Fpos_t = long @if(env::WIN32); +alias SignalFunction = fn void(CInt); const CInt SIGHUP = 1; const CInt SIGINT = 2; @@ -76,8 +76,8 @@ const CInt SIGCHLD = BSD_FLAVOR_SIG ? 20 : 17; const bool BSD_FLAVOR_SIG @local = env::DARWIN || env::BSD_FAMILY; -def Time_t = $typefrom(env::WIN32 ? long.typeid : CLong.typeid); -def Off_t = $typefrom(env::WIN32 ? int.typeid : usz.typeid); +alias Time_t = $typefrom(env::WIN32 ? long.typeid : CLong.typeid); +alias Off_t = $typefrom(env::WIN32 ? int.typeid : usz.typeid); module libc @if(env::LIBC); @@ -369,7 +369,7 @@ module libc; // stdio -def CFile = void*; +alias CFile = void*; const HAS_MALLOC_SIZE = env::LINUX || env::WIN32 || env::DARWIN; @@ -403,7 +403,7 @@ const S_IRUSR = 0o000400; // Read permission, owner const S_IWUSR = 0o000200; // Write permission, owner const S_IXUSR = 0o000100; // Execute/search permission, owner -def SeekIndex = CLong; +alias SeekIndex = CLong; // vsprintf vprintf not supported @@ -433,11 +433,11 @@ struct TimeSpec } -def Clock_t = int @if(env::WIN32); -def Clock_t = CLong @if(!env::WIN32); +alias Clock_t = int @if(env::WIN32); +alias Clock_t = CLong @if(!env::WIN32); -def TimeOffset = int @if(env::WASI) ; -def TimeOffset = CLong @if(!env::WASI) ; +alias TimeOffset = int @if(env::WASI) ; +alias TimeOffset = CLong @if(!env::WASI) ; const int TIME_UTC = 1; diff --git a/lib/std/libc/os/android.c3 b/lib/std/libc/os/android.c3 index 54f325c61..8cc2856d8 100644 --- a/lib/std/libc/os/android.c3 +++ b/lib/std/libc/os/android.c3 @@ -2,14 +2,14 @@ module libc @if(env::ANDROID); // Checked for x86_64, this is notoriously incorrect when comparing with Rust code etc -def Blksize_t = $typefrom(env::X86_64 ? long.typeid : CInt.typeid); -def Nlink_t = $typefrom(env::X86_64 ? ulong.typeid : CUInt.typeid); -def Blkcnt_t = long; -def Ino_t = ulong; -def Dev_t = ulong; -def Mode_t = uint; -def Ino64_t = ulong; -def Blkcnt64_t = long; +alias Blksize_t = $typefrom(env::X86_64 ? long.typeid : CInt.typeid); +alias Nlink_t = $typefrom(env::X86_64 ? ulong.typeid : CUInt.typeid); +alias Blkcnt_t = long; +alias Ino_t = ulong; +alias Dev_t = ulong; +alias Mode_t = uint; +alias Ino64_t = ulong; +alias Blkcnt64_t = long; struct Stat @if(env::X86_64) { diff --git a/lib/std/libc/os/darwin.c3 b/lib/std/libc/os/darwin.c3 index ab632aae9..d75ea8313 100644 --- a/lib/std/libc/os/darwin.c3 +++ b/lib/std/libc/os/darwin.c3 @@ -1,11 +1,11 @@ module libc @if(env::DARWIN); -def Dev_t = int; -def Mode_t = ushort; -def Nlink_t = ushort; -def Blkcnt_t = long; -def Blksize_t = int; -def Ino_t = ulong; +alias Dev_t = int; +alias Mode_t = ushort; +alias Nlink_t = ushort; +alias Blkcnt_t = long; +alias Blksize_t = int; +alias Ino_t = ulong; struct Stat { diff --git a/lib/std/libc/os/freebsd.c3 b/lib/std/libc/os/freebsd.c3 index 6782602f8..5884ac10a 100644 --- a/lib/std/libc/os/freebsd.c3 +++ b/lib/std/libc/os/freebsd.c3 @@ -2,13 +2,13 @@ module libc @if(env::FREEBSD); // Checked for x86_64 -def Blksize_t = int; -def Nlink_t = $typefrom(env::X86_64 ? ulong.typeid : CUInt.typeid); -def Dev_t = ulong; -def Ino_t = ulong; -def Mode_t = ushort; -def Blkcnt_t = long; -def Fflags_t = uint; +alias Blksize_t = int; +alias Nlink_t = $typefrom(env::X86_64 ? ulong.typeid : CUInt.typeid); +alias Dev_t = ulong; +alias Ino_t = ulong; +alias Mode_t = ushort; +alias Blkcnt_t = long; +alias Fflags_t = uint; struct Stat @if(env::X86_64) { diff --git a/lib/std/libc/os/linux.c3 b/lib/std/libc/os/linux.c3 index 8564233bc..7de44dc63 100644 --- a/lib/std/libc/os/linux.c3 +++ b/lib/std/libc/os/linux.c3 @@ -2,14 +2,14 @@ module libc @if(env::LINUX); // Checked for x86_64, this is notoriously incorrect when comparing with Rust code etc -def Blksize_t = $typefrom(env::X86_64 ? long.typeid : CInt.typeid); -def Nlink_t = $typefrom(env::X86_64 ? ulong.typeid : CUInt.typeid); -def Blkcnt_t = long; -def Ino_t = ulong; -def Dev_t = ulong; -def Mode_t = uint; -def Ino64_t = ulong; -def Blkcnt64_t = long; +alias Blksize_t = $typefrom(env::X86_64 ? long.typeid : CInt.typeid); +alias Nlink_t = $typefrom(env::X86_64 ? ulong.typeid : CUInt.typeid); +alias Blkcnt_t = long; +alias Ino_t = ulong; +alias Dev_t = ulong; +alias Mode_t = uint; +alias Ino64_t = ulong; +alias Blkcnt64_t = long; struct Stat @if(env::X86_64) { diff --git a/lib/std/libc/os/posix.c3 b/lib/std/libc/os/posix.c3 index 7ca9a89d1..0cac1dc5b 100644 --- a/lib/std/libc/os/posix.c3 +++ b/lib/std/libc/os/posix.c3 @@ -18,18 +18,18 @@ const int RTLD_LOCAL = 0x4; const int RTLD_GLOBAL = 0x8; const int RTLD_NODELETE = 0x1000; -def Pid_t = int; -def Uid_t = uint; -def Gid_t = uint; +alias Pid_t = int; +alias Uid_t = uint; +alias Gid_t = uint; const CUInt SA_ONSTACK = env::LINUX ? 0x08000000 : 0x0001; const CUInt SA_RESTART = env::LINUX ? 0x10000000 : 0x0002; const CUInt SA_RESETHAND = env::LINUX ? 0x80000000 : 0x0004; const CUInt SA_SIGINFO = env::LINUX ? 0x00000004 : 0x0040; -def Sigset_t = uint @if(!env::LINUX); -def Sigset_t = ulong[16] @if(env::LINUX); -def SigActionFunction = fn void(CInt, void*, void*); +alias Sigset_t = uint @if(!env::LINUX); +alias Sigset_t = ulong[16] @if(env::LINUX); +alias SigActionFunction = fn void(CInt, void*, void*); struct Sigaction { diff --git a/lib/std/libc/os/win32.c3 b/lib/std/libc/os/win32.c3 index baaa4659d..f0fb49639 100644 --- a/lib/std/libc/os/win32.c3 +++ b/lib/std/libc/os/win32.c3 @@ -1,19 +1,30 @@ module libc @if(env::WIN32); import std::os::win32; +alias fdopen = _fdopen; +alias close = _close; +alias fileno = _fileno; +alias isatty = _isatty; +alias difftime = _difftime64; +alias fseek = _fseeki64; +alias ftell = _ftelli64; +alias timegm = _mkgmtime64; +alias mktime = _mktime64; + extern fn CFile __acrt_iob_func(CInt c); -extern fn CInt _close(Fd fd); def close = _close; -extern fn double _difftime64(Time_t time1, Time_t time2); def difftime = _difftime64; -extern fn CFile _fdopen(Fd fd, ZString mode); def fdopen = _fdopen; -extern fn CInt _fileno(CFile stream); def fileno = _fileno; -extern fn CInt _fseeki64(CFile, long, int); def fseek = _fseeki64; -extern fn CLong _ftelli64(CFile); def ftell = _ftelli64; +extern fn CInt _close(Fd fd); +extern fn double _difftime64(Time_t time1, Time_t time2); +extern fn CFile _fdopen(Fd fd, ZString mode); +extern fn CInt _fileno(CFile stream); + +extern fn CInt _fseeki64(CFile, long, int); +extern fn CLong _ftelli64(CFile); extern fn Errno _get_timezone(CLong *timezone); extern fn Tm* _gmtime64_s(Tm* buf, Time_t *timer); -extern fn CInt _isatty(Fd fd); def isatty = _isatty; +extern fn CInt _isatty(Fd fd); extern fn Tm* _localtime64_s(Tm* buf, Time_t *timer); -extern fn Time_t _mkgmtime64(Tm* timeptr); def timegm = _mkgmtime64; -extern fn Time_t _mktime64(Tm *timeptr); def mktime = _mktime64; +extern fn Time_t _mkgmtime64(Tm* timeptr); +extern fn Time_t _mktime64(Tm *timeptr); extern fn usz _msize(void* ptr); extern fn CInt _read(Fd fd, void* buffer, CUInt buffer_size); extern fn CInt _setjmp(JmpBuf* buffer, void* frameptr); @@ -31,9 +42,11 @@ extern fn CInt shutdown(Win32_SOCKET s, CInt how); struct SystemInfo { - union { + union + { uint dwOemId; - struct { + struct + { ushort wProcessorArchitecture; ushort wReserved; } diff --git a/lib/std/math/math.c3 b/lib/std/math/math.c3 index 686d98e23..f41563e59 100644 --- a/lib/std/math/math.c3 +++ b/lib/std/math/math.c3 @@ -82,33 +82,33 @@ enum RoundingMode : int fault OVERFLOW, MATRIX_INVERSE_DOESNT_EXIST; -def Complexf = Complex{float}; -def Complex = Complex{double}; -def COMPLEX_IDENTITY = complex::IDENTITY{double} @builtin; -def COMPLEXF_IDENTITY = complex::IDENTITY{float} @builtin; +alias Complexf = Complex{float}; +alias Complex = Complex{double}; +alias COMPLEX_IDENTITY = complex::IDENTITY{double} @builtin; +alias COMPLEXF_IDENTITY = complex::IDENTITY{float} @builtin; -def Quaternionf = Quaternion{float}; -def Quaternion = Quaternion{double}; -def QUATERNION_IDENTITY = quaternion::IDENTITY{double} @builtin; -def QUATERNIONF_IDENTITY = quaternion::IDENTITY{float} @builtin; +alias Quaternionf = Quaternion{float}; +alias Quaternion = Quaternion{double}; +alias QUATERNION_IDENTITY = quaternion::IDENTITY{double} @builtin; +alias QUATERNIONF_IDENTITY = quaternion::IDENTITY{float} @builtin; -def Matrix2f = Matrix2x2{float}; -def Matrix2 = Matrix2x2{double}; -def Matrix3f = Matrix3x3{float}; -def Matrix3 = Matrix3x3{double}; -def Matrix4f = Matrix4x4{float}; -def Matrix4 = Matrix4x4{double}; -def matrix4_ortho = matrix::ortho{double} @builtin; -def matrix4_perspective = matrix::perspective{double} @builtin; -def matrix4f_ortho = matrix::ortho{float} @builtin; -def matrix4f_perspective = matrix::perspective{float} @builtin; +alias Matrix2f = Matrix2x2{float}; +alias Matrix2 = Matrix2x2{double}; +alias Matrix3f = Matrix3x3{float}; +alias Matrix3 = Matrix3x3{double}; +alias Matrix4f = Matrix4x4{float}; +alias Matrix4 = Matrix4x4{double}; +alias matrix4_ortho = matrix::ortho{double} @builtin; +alias matrix4_perspective = matrix::perspective{double} @builtin; +alias matrix4f_ortho = matrix::ortho{float} @builtin; +alias matrix4f_perspective = matrix::perspective{float} @builtin; -def MATRIX2_IDENTITY = matrix::IDENTITY2{double} @builtin; -def MATRIX2F_IDENTITY = matrix::IDENTITY2{float} @builtin; -def MATRIX3_IDENTITY = matrix::IDENTITY3{double} @builtin; -def MATRIX3F_IDENTITY = matrix::IDENTITY3{float} @builtin; -def MATRIX4_IDENTITY = matrix::IDENTITY4{double} @builtin; -def MATRIX4F_IDENTITY = matrix::IDENTITY4{float} @builtin; +alias MATRIX2_IDENTITY = matrix::IDENTITY2{double} @builtin; +alias MATRIX2F_IDENTITY = matrix::IDENTITY2{float} @builtin; +alias MATRIX3_IDENTITY = matrix::IDENTITY3{double} @builtin; +alias MATRIX3F_IDENTITY = matrix::IDENTITY3{float} @builtin; +alias MATRIX4_IDENTITY = matrix::IDENTITY4{double} @builtin; +alias MATRIX4F_IDENTITY = matrix::IDENTITY4{float} @builtin; <* diff --git a/lib/std/math/math_random.c3 b/lib/std/math/math_random.c3 index f231cecc1..55b65dcda 100644 --- a/lib/std/math/math_random.c3 +++ b/lib/std/math/math_random.c3 @@ -60,7 +60,7 @@ macro int next_in_range(random, int min, int max) return next(random, max - min + 1) + min; } -def DefaultRandom = Sfc64Random; +alias DefaultRandom = Sfc64Random; tlocal Sfc64Random default_random @private; tlocal bool default_random_initialized @private = false; diff --git a/lib/std/net/os/common.c3 b/lib/std/net/os/common.c3 index 650304b72..4ede40da9 100644 --- a/lib/std/net/os/common.c3 +++ b/lib/std/net/os/common.c3 @@ -6,8 +6,8 @@ distinct AIProtocol = CInt; distinct AISockType = CInt; distinct AIFlags = CInt; -def Socklen_t = CUInt @if(!env::WIN32); -def Socklen_t = usz @if(env::WIN32); +alias Socklen_t = CUInt @if(!env::WIN32); +alias Socklen_t = usz @if(env::WIN32); distinct SockAddrPtr = void*; diff --git a/lib/std/net/os/posix.c3 b/lib/std/net/os/posix.c3 index 00258aa3c..0f9f05971 100644 --- a/lib/std/net/os/posix.c3 +++ b/lib/std/net/os/posix.c3 @@ -13,7 +13,7 @@ struct Posix_pollfd CUShort revents; } -def Posix_nfds_t = CUInt; +alias Posix_nfds_t = CUInt; extern fn CInt connect(NativeSocket socket, SockAddrPtr address, Socklen_t address_len); extern fn NativeSocket socket(AIFamily af, AISockType type, AIProtocol ip_protocol); diff --git a/lib/std/net/url.c3 b/lib/std/net/url.c3 index 3d8befb14..6549c36fe 100644 --- a/lib/std/net/url.c3 +++ b/lib/std/net/url.c3 @@ -238,7 +238,7 @@ fn String Url.to_string(&self, Allocator allocator) } -def UrlQueryValueList = List{String}; +alias UrlQueryValueList = List{String}; struct UrlQueryValues { diff --git a/lib/std/os/android/log.c3 b/lib/std/os/android/log.c3 index 712f28b4e..1e7b18e0c 100644 --- a/lib/std/os/android/log.c3 +++ b/lib/std/os/android/log.c3 @@ -52,8 +52,8 @@ fn bool log_id_is_valid(LogId id) extern fn CInt log_buf_write(CInt bufID, CInt prio, ZString tag, ZString text) @extern("__android_log_buf_write"); extern fn CInt log_buf_print(CInt bufID, CInt prio, ZString tag, ZString fmt, ...) @extern("__android_log_buf_print"); -def LoggerFunction = fn void(LogMessage* log_message); -def AborterFunction = fn void(ZString abort_message); +alias LoggerFunction = fn void(LogMessage* log_message); +alias AborterFunction = fn void(ZString abort_message); extern fn void log_write_log_message(LogMessage log_message) @extern("__android_log_write_log_message"); extern fn void log_set_logger(LoggerFunction logger) @extern("__android_log_set_logger"); diff --git a/lib/std/os/backtrace.c3 b/lib/std/os/backtrace.c3 index 6ad6f8ece..14f6940b0 100644 --- a/lib/std/os/backtrace.c3 +++ b/lib/std/os/backtrace.c3 @@ -84,11 +84,11 @@ fn void*[] capture_current(void*[] buffer) $endswitch } -def BacktraceList = List{Backtrace}; +alias BacktraceList = List{Backtrace}; -def symbolize_backtrace = linux::symbolize_backtrace @if(env::LINUX); -def symbolize_backtrace = win32::symbolize_backtrace @if(env::WIN32); -def symbolize_backtrace = darwin::symbolize_backtrace @if(env::DARWIN); +alias symbolize_backtrace = linux::symbolize_backtrace @if(env::LINUX); +alias symbolize_backtrace = win32::symbolize_backtrace @if(env::WIN32); +alias symbolize_backtrace = darwin::symbolize_backtrace @if(env::DARWIN); fn BacktraceList? symbolize_backtrace(Allocator allocator, void*[] backtrace) @if(!env::NATIVE_STACKTRACE) { diff --git a/lib/std/os/linux/linux.c3 b/lib/std/os/linux/linux.c3 index 811fdf6b3..1e73461e0 100644 --- a/lib/std/os/linux/linux.c3 +++ b/lib/std/os/linux/linux.c3 @@ -5,10 +5,10 @@ extern fn isz readlink(ZString path, char* buf, usz bufsize); const PT_PHDR = 6; const EI_NIDENT = 16; -def Elf32_Half = ushort; -def Elf32_Word = uint; -def Elf32_Addr = uint; -def Elf32_Off = uint; +alias Elf32_Half = ushort; +alias Elf32_Word = uint; +alias Elf32_Addr = uint; +alias Elf32_Off = uint; struct Elf32_Ehdr { @@ -40,14 +40,14 @@ struct Elf32_Phdr Elf32_Word p_align; } -def Elf64_Addr = ulong; -def Elf64_Half = ushort; -def Elf64_Off = ulong; -def Elf64_Word = uint; -def Elf64_Sword = int; -def Elf64_Sxword = long; -def Elf64_Lword = ulong; -def Elf64_Xword = ulong; +alias Elf64_Addr = ulong; +alias Elf64_Half = ushort; +alias Elf64_Off = ulong; +alias Elf64_Word = uint; +alias Elf64_Sword = int; +alias Elf64_Sxword = long; +alias Elf64_Lword = ulong; +alias Elf64_Xword = ulong; struct Elf64_Ehdr { diff --git a/lib/std/os/macos/cf_allocator.c3 b/lib/std/os/macos/cf_allocator.c3 index 9cb26e194..fd23e9be9 100644 --- a/lib/std/os/macos/cf_allocator.c3 +++ b/lib/std/os/macos/cf_allocator.c3 @@ -2,7 +2,7 @@ module std::os::macos::cf @if(env::DARWIN) @link(env::DARWIN, "CoreFoundation.fr distinct CFAllocatorRef = void*; distinct CFAllocatorContextRef = void*; -def CFOptionFlags = usz; +alias CFOptionFlags = usz; macro CFAllocatorRef default_allocator() => macos_CFAllocatorGetDefault(); macro void CFAllocatorRef.dealloc(CFAllocatorRef allocator, void* ptr) => macos_CFAllocatorDeallocate(allocator, ptr); diff --git a/lib/std/os/macos/core_foundation.c3 b/lib/std/os/macos/core_foundation.c3 index 0e61735fd..fe7a7cc9b 100644 --- a/lib/std/os/macos/core_foundation.c3 +++ b/lib/std/os/macos/core_foundation.c3 @@ -1,7 +1,7 @@ module std::os::macos::cf @if(env::DARWIN) @link(env::DARWIN, "CoreFoundation.framework"); distinct CFTypeRef = void*; -def CFIndex = isz; +alias CFIndex = isz; struct CFRange { CFIndex location; diff --git a/lib/std/os/macos/objc.c3 b/lib/std/os/macos/objc.c3 index e8a5e692f..be26460f2 100644 --- a/lib/std/os/macos/objc.c3 +++ b/lib/std/os/macos/objc.c3 @@ -4,8 +4,8 @@ distinct ObjcClass = void*; distinct ObjcMethod = void*; distinct ObjcIvar = void*; distinct ObjcSelector = void*; -def ObjcId = void*; -def SendVoid = fn void*(void*, ObjcSelector); +alias ObjcId = void*; +alias SendVoid = fn void*(void*, ObjcSelector); fault CLASS_NOT_FOUND, UNKNOWN_EVENT; diff --git a/lib/std/os/posix/files.c3 b/lib/std/os/posix/files.c3 index c809a4cda..e4608c7e8 100644 --- a/lib/std/os/posix/files.c3 +++ b/lib/std/os/posix/files.c3 @@ -1,7 +1,7 @@ module std::os::posix @if(env::POSIX); import libc; -def Mode_t = uint; +alias Mode_t = uint; distinct DIRPtr = void*; struct Posix_dirent diff --git a/lib/std/os/posix/process.c3 b/lib/std/os/posix/process.c3 index 054d295ef..732dfd054 100644 --- a/lib/std/os/posix/process.c3 +++ b/lib/std/os/posix/process.c3 @@ -22,17 +22,17 @@ extern fn CInt posix_spawn_file_actions_adddup2(Posix_spawn_file_actions_t *file extern fn CInt get_nprocs(); extern fn CInt get_nprocs_conf(); -def spawn_file_actions_init = posix_spawn_file_actions_init; -def spawn_file_actions_destroy = posix_spawn_file_actions_destroy; -def spawn_file_actions_addclose = posix_spawn_file_actions_addclose; -def spawn_file_actions_adddup2 = posix_spawn_file_actions_adddup2; +alias spawn_file_actions_init = posix_spawn_file_actions_init; +alias spawn_file_actions_destroy = posix_spawn_file_actions_destroy; +alias spawn_file_actions_addclose = posix_spawn_file_actions_addclose; +alias spawn_file_actions_adddup2 = posix_spawn_file_actions_adddup2; extern fn CInt posix_spawnp(Pid_t* pid, char* file, Posix_spawn_file_actions_t* file_actions, Posix_spawnattr_t* attrp, ZString* argv, ZString* envp); extern fn CInt posix_spawn(Pid_t* pid, char* file, Posix_spawn_file_actions_t* file_actions, Posix_spawnattr_t* attrp, ZString* argv, ZString* envp); -def spawnp = posix_spawnp; -def spawn = posix_spawn; +alias spawnp = posix_spawnp; +alias spawn = posix_spawn; extern fn CInt getpid(); extern fn CInt kill(Pid_t pid, CInt sig); @@ -56,7 +56,7 @@ const CInt WNOHANG = 1; const CInt WUNTRACES = 2; JmpBuf backtrace_jmpbuf @local; -def BacktraceFn = fn CInt(void** buffer, CInt size); +alias BacktraceFn = fn CInt(void** buffer, CInt size); fn CInt backtrace(void** buffer, CInt size) { diff --git a/lib/std/os/posix/threads.c3 b/lib/std/os/posix/threads.c3 index 9e1fd1969..efeda7efe 100644 --- a/lib/std/os/posix/threads.c3 +++ b/lib/std/os/posix/threads.c3 @@ -6,7 +6,7 @@ const PTHREAD_MUTEX_NORMAL = 0; const PTHREAD_MUTEX_ERRORCHECK = env::LINUX ? 2 : 1; const PTHREAD_MUTEX_RECURSIVE = env::LINUX ? 1 : 2; -def PosixThreadFn = fn void*(void*); +alias PosixThreadFn = fn void*(void*); distinct Pthread_t = void*; extern fn CInt pthread_create(Pthread_t*, Pthread_attr_t*, PosixThreadFn, void*); diff --git a/lib/std/os/win32/files.c3 b/lib/std/os/win32/files.c3 index d78789afd..345b9f856 100644 --- a/lib/std/os/win32/files.c3 +++ b/lib/std/os/win32/files.c3 @@ -35,7 +35,7 @@ struct Win32_WIN32_FIND_DATAW Win32_WORD wFinderFlags; // Obsolete. Do not use } -def Win32_LPWIN32_FIND_DATAW = Win32_WIN32_FIND_DATAW*; +alias Win32_LPWIN32_FIND_DATAW = Win32_WIN32_FIND_DATAW*; extern fn Win32_BOOL closeHandle(Win32_HANDLE) @extern("CloseHandle"); extern fn Win32_BOOL createPipe(Win32_PHANDLE hReadPipe, Win32_PHANDLE hWritePipe, Win32_LPSECURITY_ATTRIBUTES lpPipeAttributes, Win32_DWORD nSize) @extern("CreatePipe"); diff --git a/lib/std/os/win32/types.c3 b/lib/std/os/win32/types.c3 index 12b96579b..4b6285319 100644 --- a/lib/std/os/win32/types.c3 +++ b/lib/std/os/win32/types.c3 @@ -1,174 +1,174 @@ module std::os::win32; -def Win32_BOOL = int; -def Win32_BOOLEAN = Win32_BYTE; -def Win32_BYTE = char; -def Win32_CCHAR = cinterop::CChar; -def Win32_CHAR = cinterop::CChar; -def Win32_COLORREF = Win32_DWORD; -def Win32_DWORD = uint; -def Win32_DWORDLONG = ulong; -def Win32_DWORD_PTR = Win32_ULONG_PTR; -def Win32_DWORD32 = uint; -def Win32_DWORD64 = ulong; -def Win32_FLOAT = float; -def Win32_HACCEL = Win32_HANDLE; -def Win32_HALF_PTR = int; -def Win32_HANDLE = Win32_PVOID; -def Win32_HBITMAP = Win32_HANDLE; -def Win32_HBRUSH = Win32_HANDLE; -def Win32_HCOLORSPACE = Win32_HANDLE; -def Win32_HCONV = Win32_HANDLE; -def Win32_HCONVLIST = Win32_HANDLE; -def Win32_HCURSOR = Win32_HICON; -def Win32_HDC = Win32_HANDLE; -def Win32_HDDEDATA = Win32_HANDLE; -def Win32_HDESK = Win32_HANDLE; -def Win32_HDROP = Win32_HANDLE; -def Win32_HDWP = Win32_HANDLE; -def Win32_HFILE = int; -def Win32_HFONT = Win32_HANDLE; -def Win32_HGDIOBJ = Win32_HANDLE; -def Win32_HGLOBAL = Win32_HANDLE; -def Win32_HHOOK = Win32_HANDLE; -def Win32_HICON = Win32_HANDLE; -def Win32_HINSTANCE = Win32_HANDLE; -def Win32_HKEY = Win32_HANDLE; -def Win32_HKL = Win32_HANDLE; -def Win32_HLOCAL = Win32_HANDLE; -def Win32_HMENU = Win32_HANDLE; -def Win32_HMETAFILE = Win32_HANDLE; -def Win32_HMODULE = Win32_HANDLE; -def Win32_HMONITOR = Win32_HANDLE; -def Win32_HPALETTE = Win32_HANDLE; -def Win32_HPEN = Win32_HANDLE; -def Win32_HRESULT = Win32_LONG; -def Win32_HRGN = Win32_HANDLE; -def Win32_HRSRC = Win32_HANDLE; -def Win32_HSZ = Win32_HANDLE; -def Win32_HWINSTA = Win32_HANDLE; -def Win32_HWND = Win32_HANDLE; -def Win32_INT = int; -def Win32_INT_PTR = iptr; -def Win32_INT8 = ichar; -def Win32_INT16 = short; -def Win32_INT32 = int; -def Win32_INT64 = long; -def Win32_LANGID = Win32_WORD; -def Win32_LCID = Win32_DWORD; -def Win32_LCTYPE = Win32_DWORD; -def Win32_LGRPID = Win32_DWORD; -def Win32_LONG = int; -def Win32_LONGLONG = long; -def Win32_LONG_PTR = iptr; -def Win32_LONG32 = int; -def Win32_LONG64 = long; -def Win32_LPARAM = Win32_LONG_PTR; -def Win32_LPBOOL = Win32_BOOL*; -def Win32_LPBYTE = Win32_BYTE*; -def Win32_LPCOLORREF = Win32_DWORD*; -def Win32_LPCSTR = Win32_CCHAR*; -def Win32_LPCTSTR = Win32_LPCWSTR; -def Win32_LPCVOID = void*; -def Win32_LPCWSTR = Win32_WCHAR*; -def Win32_LPDWORD = Win32_DWORD*; -def Win32_LPHANDLE = Win32_HANDLE*; -def Win32_LPINT = int*; -def Win32_LPLONG = int*; -def Win32_LPSTR = Win32_CCHAR*; -def Win32_LPTSTR = Win32_LPWSTR; -def Win32_LPVOID = void*; -def Win32_LPWORD = Win32_WORD*; -def Win32_LPWSTR = Win32_WCHAR*; -def Win32_LRESULT = Win32_LONG_PTR; -def Win32_NTSTATUS = Win32_LONG; -def Win32_PBOOL = Win32_BOOL*; -def Win32_PBOOLEAN = Win32_BOOLEAN*; -def Win32_PBYTE = Win32_BYTE*; -def Win32_PCHAR = Win32_CHAR*; -def Win32_PCSTR = Win32_CHAR*; -def Win32_PCTSTR = Win32_LPCWSTR; -def Win32_PCUNICODE_STRING = Win32_UNICODE_STRING*; -def Win32_PCWSTR = WString; -def Win32_PDWORD = Win32_DWORD*; -def Win32_PDWORDLONG = Win32_DWORDLONG*; -def Win32_PDWORDPTR = Win32_DWORD_PTR*; -def Win32_PDWORD32 = Win32_DWORD32*; -def Win32_PDWORD64 = Win32_DWORD64*; -def Win32_PFLOAT = Win32_FLOAT*; -def Win32_PHALFPTR = Win32_HALF_PTR*; -def Win32_PHANDLE = Win32_HANDLE*; -def Win32_PHKEY = Win32_HKEY*; -def Win32_PINT = int*; -def Win32_PINTPTR = Win32_INT_PTR*; -def Win32_PINT8 = Win32_INT8*; -def Win32_PINT16 = Win32_INT16*; -def Win32_PINT32 = Win32_INT32*; -def Win32_PINT64 = Win32_INT64*; -def Win32_PLCID = Win32_PDWORD; -def Win32_PLONG = Win32_LONG*; -def Win32_PLONGLONG = Win32_LONGLONG*; -def Win32_PLONG_PTR = Win32_LONG_PTR*; -def Win32_PLONG32 = Win32_LONG32*; -def Win32_PLONG64 = Win32_LONG64*; -def Win32_POINTER_32 = uint; -def Win32_POINTER_64 = uptr; -def Win32_POINTER_SIGNED = iptr; -def Win32_POINTER_UNSIGNED = uptr; -def Win32_PSHORT = Win32_SHORT*; -def Win32_PSIZE_T = usz*; -def Win32_PSSIZE_T = isz*; -def Win32_PSTR = Win32_CHAR*; -def Win32_PTBYTE = Win32_TBYTE*; -def Win32_PTCHAR = Win32_TCHAR*; -def Win32_PTSTR = Win32_LPWSTR; -def Win32_PUCHAR = Win32_UCHAR*; -def Win32_PUHALFPTR = Win32_UHALF_PTR*; -def Win32_PUINT = Win32_UINT*; -def Win32_PUINTPTR = Win32_UINT_PTR*; -def Win32_PUINT8 = Win32_UINT8*; -def Win32_PUINT16 = Win32_UINT16*; -def Win32_PUINT32 = Win32_UINT32*; -def Win32_PUINT64 = Win32_UINT64*; -def Win32_PULONG = Win32_ULONG*; -def Win32_PULONGLONG = Win32_ULONGLONG*; -def Win32_PULONG_PTR = Win32_ULONG_PTR*; -def Win32_PULONG32 = Win32_ULONG32*; -def Win32_PULONG64 = Win32_ULONG64*; -def Win32_PUNICODE_STRING = Win32_UNICODE_STRING*; -def Win32_PUSHORT = Win32_USHORT*; -def Win32_PVOID = void*; -def Win32_PWCHAR = Win32_WCHAR*; -def Win32_PWORD = Win32_WORD*; -def Win32_PWSTR = Win32_WCHAR*; -def Win32_QWORD = ulong; -def Win32_SC_HANDLE = Win32_HANDLE; -def Win32_SC_LOCK = Win32_LPVOID; -def Win32_SERVICE_STATUS_HANDLE = Win32_HANDLE; -def Win32_SHORT = short; -def Win32_SIZE_T = usz; -def Win32_SOCKET = Win32_HANDLE; -def Win32_SSIZE_T = isz; -def Win32_TBYTE = Win32_WCHAR; -def Win32_TCHAR = Win32_WCHAR; -def Win32_UCHAR = char; -def Win32_UHALF_PTR = uint; -def Win32_UINT = uint; -def Win32_UINT_PTR = uptr; -def Win32_UINT8 = char; -def Win32_UINT16 = ushort; -def Win32_UINT32 = uint; -def Win32_UINT64 = ulong; -def Win32_ULONG = uint; -def Win32_ULONGLONG = ulong; -def Win32_ULONG_PTR = ulong; -def Win32_ULONG32 = uint; -def Win32_ULONG64 = ulong; -def Win32_USHORT = ushort; -def Win32_USN = Win32_LONGLONG; -def Win32_WCHAR = Char16; -def Win32_WORD = ushort; -def Win32_WPARAM = Win32_UINT_PTR; +alias Win32_BOOL = int; +alias Win32_BOOLEAN = Win32_BYTE; +alias Win32_BYTE = char; +alias Win32_CCHAR = cinterop::CChar; +alias Win32_CHAR = cinterop::CChar; +alias Win32_COLORREF = Win32_DWORD; +alias Win32_DWORD = uint; +alias Win32_DWORDLONG = ulong; +alias Win32_DWORD_PTR = Win32_ULONG_PTR; +alias Win32_DWORD32 = uint; +alias Win32_DWORD64 = ulong; +alias Win32_FLOAT = float; +alias Win32_HACCEL = Win32_HANDLE; +alias Win32_HALF_PTR = int; +alias Win32_HANDLE = Win32_PVOID; +alias Win32_HBITMAP = Win32_HANDLE; +alias Win32_HBRUSH = Win32_HANDLE; +alias Win32_HCOLORSPACE = Win32_HANDLE; +alias Win32_HCONV = Win32_HANDLE; +alias Win32_HCONVLIST = Win32_HANDLE; +alias Win32_HCURSOR = Win32_HICON; +alias Win32_HDC = Win32_HANDLE; +alias Win32_HDDEDATA = Win32_HANDLE; +alias Win32_HDESK = Win32_HANDLE; +alias Win32_HDROP = Win32_HANDLE; +alias Win32_HDWP = Win32_HANDLE; +alias Win32_HFILE = int; +alias Win32_HFONT = Win32_HANDLE; +alias Win32_HGDIOBJ = Win32_HANDLE; +alias Win32_HGLOBAL = Win32_HANDLE; +alias Win32_HHOOK = Win32_HANDLE; +alias Win32_HICON = Win32_HANDLE; +alias Win32_HINSTANCE = Win32_HANDLE; +alias Win32_HKEY = Win32_HANDLE; +alias Win32_HKL = Win32_HANDLE; +alias Win32_HLOCAL = Win32_HANDLE; +alias Win32_HMENU = Win32_HANDLE; +alias Win32_HMETAFILE = Win32_HANDLE; +alias Win32_HMODULE = Win32_HANDLE; +alias Win32_HMONITOR = Win32_HANDLE; +alias Win32_HPALETTE = Win32_HANDLE; +alias Win32_HPEN = Win32_HANDLE; +alias Win32_HRESULT = Win32_LONG; +alias Win32_HRGN = Win32_HANDLE; +alias Win32_HRSRC = Win32_HANDLE; +alias Win32_HSZ = Win32_HANDLE; +alias Win32_HWINSTA = Win32_HANDLE; +alias Win32_HWND = Win32_HANDLE; +alias Win32_INT = int; +alias Win32_INT_PTR = iptr; +alias Win32_INT8 = ichar; +alias Win32_INT16 = short; +alias Win32_INT32 = int; +alias Win32_INT64 = long; +alias Win32_LANGID = Win32_WORD; +alias Win32_LCID = Win32_DWORD; +alias Win32_LCTYPE = Win32_DWORD; +alias Win32_LGRPID = Win32_DWORD; +alias Win32_LONG = int; +alias Win32_LONGLONG = long; +alias Win32_LONG_PTR = iptr; +alias Win32_LONG32 = int; +alias Win32_LONG64 = long; +alias Win32_LPARAM = Win32_LONG_PTR; +alias Win32_LPBOOL = Win32_BOOL*; +alias Win32_LPBYTE = Win32_BYTE*; +alias Win32_LPCOLORREF = Win32_DWORD*; +alias Win32_LPCSTR = Win32_CCHAR*; +alias Win32_LPCTSTR = Win32_LPCWSTR; +alias Win32_LPCVOID = void*; +alias Win32_LPCWSTR = Win32_WCHAR*; +alias Win32_LPDWORD = Win32_DWORD*; +alias Win32_LPHANDLE = Win32_HANDLE*; +alias Win32_LPINT = int*; +alias Win32_LPLONG = int*; +alias Win32_LPSTR = Win32_CCHAR*; +alias Win32_LPTSTR = Win32_LPWSTR; +alias Win32_LPVOID = void*; +alias Win32_LPWORD = Win32_WORD*; +alias Win32_LPWSTR = Win32_WCHAR*; +alias Win32_LRESULT = Win32_LONG_PTR; +alias Win32_NTSTATUS = Win32_LONG; +alias Win32_PBOOL = Win32_BOOL*; +alias Win32_PBOOLEAN = Win32_BOOLEAN*; +alias Win32_PBYTE = Win32_BYTE*; +alias Win32_PCHAR = Win32_CHAR*; +alias Win32_PCSTR = Win32_CHAR*; +alias Win32_PCTSTR = Win32_LPCWSTR; +alias Win32_PCUNICODE_STRING = Win32_UNICODE_STRING*; +alias Win32_PCWSTR = WString; +alias Win32_PDWORD = Win32_DWORD*; +alias Win32_PDWORDLONG = Win32_DWORDLONG*; +alias Win32_PDWORDPTR = Win32_DWORD_PTR*; +alias Win32_PDWORD32 = Win32_DWORD32*; +alias Win32_PDWORD64 = Win32_DWORD64*; +alias Win32_PFLOAT = Win32_FLOAT*; +alias Win32_PHALFPTR = Win32_HALF_PTR*; +alias Win32_PHANDLE = Win32_HANDLE*; +alias Win32_PHKEY = Win32_HKEY*; +alias Win32_PINT = int*; +alias Win32_PINTPTR = Win32_INT_PTR*; +alias Win32_PINT8 = Win32_INT8*; +alias Win32_PINT16 = Win32_INT16*; +alias Win32_PINT32 = Win32_INT32*; +alias Win32_PINT64 = Win32_INT64*; +alias Win32_PLCID = Win32_PDWORD; +alias Win32_PLONG = Win32_LONG*; +alias Win32_PLONGLONG = Win32_LONGLONG*; +alias Win32_PLONG_PTR = Win32_LONG_PTR*; +alias Win32_PLONG32 = Win32_LONG32*; +alias Win32_PLONG64 = Win32_LONG64*; +alias Win32_POINTER_32 = uint; +alias Win32_POINTER_64 = uptr; +alias Win32_POINTER_SIGNED = iptr; +alias Win32_POINTER_UNSIGNED = uptr; +alias Win32_PSHORT = Win32_SHORT*; +alias Win32_PSIZE_T = usz*; +alias Win32_PSSIZE_T = isz*; +alias Win32_PSTR = Win32_CHAR*; +alias Win32_PTBYTE = Win32_TBYTE*; +alias Win32_PTCHAR = Win32_TCHAR*; +alias Win32_PTSTR = Win32_LPWSTR; +alias Win32_PUCHAR = Win32_UCHAR*; +alias Win32_PUHALFPTR = Win32_UHALF_PTR*; +alias Win32_PUINT = Win32_UINT*; +alias Win32_PUINTPTR = Win32_UINT_PTR*; +alias Win32_PUINT8 = Win32_UINT8*; +alias Win32_PUINT16 = Win32_UINT16*; +alias Win32_PUINT32 = Win32_UINT32*; +alias Win32_PUINT64 = Win32_UINT64*; +alias Win32_PULONG = Win32_ULONG*; +alias Win32_PULONGLONG = Win32_ULONGLONG*; +alias Win32_PULONG_PTR = Win32_ULONG_PTR*; +alias Win32_PULONG32 = Win32_ULONG32*; +alias Win32_PULONG64 = Win32_ULONG64*; +alias Win32_PUNICODE_STRING = Win32_UNICODE_STRING*; +alias Win32_PUSHORT = Win32_USHORT*; +alias Win32_PVOID = void*; +alias Win32_PWCHAR = Win32_WCHAR*; +alias Win32_PWORD = Win32_WORD*; +alias Win32_PWSTR = Win32_WCHAR*; +alias Win32_QWORD = ulong; +alias Win32_SC_HANDLE = Win32_HANDLE; +alias Win32_SC_LOCK = Win32_LPVOID; +alias Win32_SERVICE_STATUS_HANDLE = Win32_HANDLE; +alias Win32_SHORT = short; +alias Win32_SIZE_T = usz; +alias Win32_SOCKET = Win32_HANDLE; +alias Win32_SSIZE_T = isz; +alias Win32_TBYTE = Win32_WCHAR; +alias Win32_TCHAR = Win32_WCHAR; +alias Win32_UCHAR = char; +alias Win32_UHALF_PTR = uint; +alias Win32_UINT = uint; +alias Win32_UINT_PTR = uptr; +alias Win32_UINT8 = char; +alias Win32_UINT16 = ushort; +alias Win32_UINT32 = uint; +alias Win32_UINT64 = ulong; +alias Win32_ULONG = uint; +alias Win32_ULONGLONG = ulong; +alias Win32_ULONG_PTR = ulong; +alias Win32_ULONG32 = uint; +alias Win32_ULONG64 = ulong; +alias Win32_USHORT = ushort; +alias Win32_USN = Win32_LONGLONG; +alias Win32_WCHAR = Char16; +alias Win32_WORD = ushort; +alias Win32_WPARAM = Win32_UINT_PTR; const INVALID_HANDLE_VALUE = (Win32_HANDLE)(uptr)-1; @@ -200,8 +200,8 @@ struct Win32_SECURITY_ATTRIBUTES -def Win32_LPSECURITY_ATTRIBUTES = Win32_SECURITY_ATTRIBUTES*; -def Win32_PSECURITY_ATTRIBUTES = Win32_SECURITY_ATTRIBUTES*; +alias Win32_LPSECURITY_ATTRIBUTES = Win32_SECURITY_ATTRIBUTES*; +alias Win32_PSECURITY_ATTRIBUTES = Win32_SECURITY_ATTRIBUTES*; struct Win32_STARTUPINFOW { @@ -239,8 +239,8 @@ struct Win32_OVERLAPPED Win32_HANDLE hEvent; } -def Win32_LPOVERLAPPED = Win32_OVERLAPPED*; -def Win32_LPSTARTUPINFOW = Win32_STARTUPINFOW*; +alias Win32_LPOVERLAPPED = Win32_OVERLAPPED*; +alias Win32_LPSTARTUPINFOW = Win32_STARTUPINFOW*; struct Win32_STARTUPINFOEXW { @@ -248,8 +248,8 @@ struct Win32_STARTUPINFOEXW Win32_LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList; } -def Win32_LPPROC_THREAD_ATTRIBUTE_LIST = void*; -def Win32_LPSTARTUPINFOEXW = Win32_STARTUPINFOEXW*; +alias Win32_LPPROC_THREAD_ATTRIBUTE_LIST = void*; +alias Win32_LPSTARTUPINFOEXW = Win32_STARTUPINFOEXW*; struct Win32_FILETIME { @@ -265,8 +265,8 @@ struct Win32_PROCESS_INFORMATION Win32_DWORD dwThreadId; } -def Win32_PPROCESS_INFORMATION = Win32_PROCESS_INFORMATION*; -def Win32_LPPROCESS_INFORMATION = Win32_PROCESS_INFORMATION*; +alias Win32_PPROCESS_INFORMATION = Win32_PROCESS_INFORMATION*; +alias Win32_LPPROCESS_INFORMATION = Win32_PROCESS_INFORMATION*; struct Win32_SYSTEM_INFO { @@ -290,7 +290,7 @@ struct Win32_SYSTEM_INFO Win32_WORD wProcessorRevision; } -def Win32_LPSYSTEM_INFO = Win32_SYSTEM_INFO*; +alias Win32_LPSYSTEM_INFO = Win32_SYSTEM_INFO*; struct Win32_MODULEINFO { @@ -358,7 +358,7 @@ struct Win32_IMAGEHLP_MODULE64 Win32_DWORD reserved; } -def Win32_PIMAGEHLP_MODULE64 = Win32_IMAGEHLP_MODULE64*; +alias Win32_PIMAGEHLP_MODULE64 = Win32_IMAGEHLP_MODULE64*; struct Win32_ARM64_NT_CONTEXT @align(16) { @@ -527,12 +527,12 @@ const CONTEXT_AMD64_DEBUG_REGISTERS = CONTEXT_AMD64 | 0x0010; const CONTEXT_AMD64_FULL = CONTEXT_AMD64_CONTROL | CONTEXT_AMD64_INTEGER | CONTEXT_AMD64_FLOATING_POINT; const CONTEXT_AMD64_ALL = CONTEXT_AMD64_CONTROL | CONTEXT_AMD64_INTEGER | CONTEXT_AMD64_SEGMENTS | CONTEXT_AMD64_FLOATING_POINT | CONTEXT_AMD64_DEBUG_REGISTERS; -def CONTEXT_CONTROL = CONTEXT_AMD64_CONTROL; -def CONTEXT_FULL = CONTEXT_AMD64_FULL; -def CONTEXT_ALL = CONTEXT_AMD64_ALL; +alias CONTEXT_CONTROL = CONTEXT_AMD64_CONTROL; +alias CONTEXT_FULL = CONTEXT_AMD64_FULL; +alias CONTEXT_ALL = CONTEXT_AMD64_ALL; -def Win32_CONTEXT = Win32_AMD64_CONTEXT; -def Win32_PCONTEXT = Win32_CONTEXT*; +alias Win32_CONTEXT = Win32_AMD64_CONTEXT; +alias Win32_PCONTEXT = Win32_CONTEXT*; struct Win32_M128A @align(16) { @@ -580,7 +580,7 @@ struct Win32_IMAGE_OPTIONAL_HEADER64 Win32_IMAGE_DATA_DIRECTORY[16] dataDirectory; } -def Win32_PIMAGE_OPTIONAL_HEADER64 = Win32_IMAGE_OPTIONAL_HEADER64*; +alias Win32_PIMAGE_OPTIONAL_HEADER64 = Win32_IMAGE_OPTIONAL_HEADER64*; struct Win32_IMAGE_FILE_HEADER { Win32_WORD machine; @@ -592,7 +592,7 @@ struct Win32_IMAGE_FILE_HEADER Win32_WORD characteristics; } -def Win32_PIMAGE_FILE_HEADER = Win32_IMAGE_FILE_HEADER*; +alias Win32_PIMAGE_FILE_HEADER = Win32_IMAGE_FILE_HEADER*; struct Win32_IMAGE_NT_HEADERS { @@ -601,7 +601,7 @@ struct Win32_IMAGE_NT_HEADERS Win32_IMAGE_OPTIONAL_HEADER64 optionalHeader; } -def Win32_PIMAGE_NT_HEADERS = Win32_IMAGE_NT_HEADERS*; +alias Win32_PIMAGE_NT_HEADERS = Win32_IMAGE_NT_HEADERS*; struct Win32_SYMBOL_INFO { @@ -622,7 +622,7 @@ struct Win32_SYMBOL_INFO Win32_CHAR[1] name; } -def Win32_PSYMBOL_INFO = Win32_SYMBOL_INFO*; +alias Win32_PSYMBOL_INFO = Win32_SYMBOL_INFO*; struct Win32_MODLOAD_DATA { @@ -684,14 +684,14 @@ struct Win32_STACKFRAME64 Win32_KDHELP64 kdHelp; } -def Win32_PREAD_PROCESS_MEMORY_ROUTINE64 = fn Win32_BOOL(Win32_HANDLE hProcess, Win32_DWORD64 qwBaseAddress, Win32_PVOID lpBuffer, Win32_DWORD nSize, Win32_LPDWORD lpNumberOfBytesRead); -def Win32_PFUNCTION_TABLE_ACCESS_ROUTINE64 = fn Win32_PVOID(Win32_HANDLE ahProcess, Win32_DWORD64 addrBase); -def Win32_PGET_MODULE_BASE_ROUTINE64 = fn Win32_DWORD64(Win32_HANDLE hProcess, Win32_DWORD64 address); -def Win32_PTRANSLATE_ADDRESS_ROUTINE64 = fn Win32_DWORD64(Win32_HANDLE hProcess, Win32_HANDLE hThread, Win32_LPADDRESS64 lpaddr); -def Win32_PKDHELP64 = Win32_KDHELP64*; -def Win32_LPADDRESS64 = Win32_ADDRESS64*; -def Win32_LPSTACKFRAME64 = Win32_STACKFRAME64*; -def Win32_PMODLOAD_DATA = Win32_MODLOAD_DATA*; -def Win32_PIMAGEHLP_LINE64 = Win32_IMAGEHLP_LINE64*; -def Win32_LPMODULEINFO = Win32_MODULEINFO*; +alias Win32_PREAD_PROCESS_MEMORY_ROUTINE64 = fn Win32_BOOL(Win32_HANDLE hProcess, Win32_DWORD64 qwBaseAddress, Win32_PVOID lpBuffer, Win32_DWORD nSize, Win32_LPDWORD lpNumberOfBytesRead); +alias Win32_PFUNCTION_TABLE_ACCESS_ROUTINE64 = fn Win32_PVOID(Win32_HANDLE ahProcess, Win32_DWORD64 addrBase); +alias Win32_PGET_MODULE_BASE_ROUTINE64 = fn Win32_DWORD64(Win32_HANDLE hProcess, Win32_DWORD64 address); +alias Win32_PTRANSLATE_ADDRESS_ROUTINE64 = fn Win32_DWORD64(Win32_HANDLE hProcess, Win32_HANDLE hThread, Win32_LPADDRESS64 lpaddr); +alias Win32_PKDHELP64 = Win32_KDHELP64*; +alias Win32_LPADDRESS64 = Win32_ADDRESS64*; +alias Win32_LPSTACKFRAME64 = Win32_STACKFRAME64*; +alias Win32_PMODLOAD_DATA = Win32_MODLOAD_DATA*; +alias Win32_PIMAGEHLP_LINE64 = Win32_IMAGEHLP_LINE64*; +alias Win32_LPMODULEINFO = Win32_MODULEINFO*; diff --git a/lib/std/os/win32/wincon.c3 b/lib/std/os/win32/wincon.c3 index 70cb951c0..15f37a69d 100644 --- a/lib/std/os/win32/wincon.c3 +++ b/lib/std/os/win32/wincon.c3 @@ -58,4 +58,4 @@ struct Win32_INPUT_RECORD } } -def Win32_PCOORD = Win32_COORD*; \ No newline at end of file +alias Win32_PCOORD = Win32_COORD*; \ No newline at end of file diff --git a/lib/std/os/win32/windef.c3 b/lib/std/os/win32/windef.c3 index 05fed41f5..2227de891 100644 --- a/lib/std/os/win32/windef.c3 +++ b/lib/std/os/win32/windef.c3 @@ -32,20 +32,20 @@ struct Win32_SOCKADDR Win32_CHAR[14]* sa_data; } -def Win32_PSIZE = Win32_SIZE*; -def Win32_NPSIZE = Win32_SIZE*; -def Win32_LPSIZE = Win32_SIZE*; +alias Win32_PSIZE = Win32_SIZE*; +alias Win32_NPSIZE = Win32_SIZE*; +alias Win32_LPSIZE = Win32_SIZE*; -def Win32_PPOINT = Win32_POINT*; -def Win32_NPOINT = Win32_POINT*; -def Win32_LPOINT = Win32_POINT*; +alias Win32_PPOINT = Win32_POINT*; +alias Win32_NPOINT = Win32_POINT*; +alias Win32_LPOINT = Win32_POINT*; -def Win32_PRECT = Win32_RECT*; -def Win32_NPRECT = Win32_RECT*; -def Win32_LPRECT = Win32_RECT*; +alias Win32_PRECT = Win32_RECT*; +alias Win32_NPRECT = Win32_RECT*; +alias Win32_LPRECT = Win32_RECT*; -def Win32_PWSABUF = Win32_WSABUF*; -def Win32_LPWSABUF = Win32_WSABUF*; +alias Win32_PWSABUF = Win32_WSABUF*; +alias Win32_LPWSABUF = Win32_WSABUF*; -def Win32_PSOCKADDR = Win32_SOCKADDR*; -def Win32_LPSOCKADDR = Win32_SOCKADDR*; \ No newline at end of file +alias Win32_PSOCKADDR = Win32_SOCKADDR*; +alias Win32_LPSOCKADDR = Win32_SOCKADDR*; \ No newline at end of file diff --git a/lib/std/os/win32/winuser.c3 b/lib/std/os/win32/winuser.c3 index 6cd7021ec..5f6e60fff 100644 --- a/lib/std/os/win32/winuser.c3 +++ b/lib/std/os/win32/winuser.c3 @@ -1,6 +1,6 @@ module std::os::win32 @if(env::WIN32); -def Win32_WNDPROC = fn Win32_LRESULT(Win32_HWND, Win32_UINT, Win32_WPARAM, Win32_LPARAM); +alias Win32_WNDPROC = fn Win32_LRESULT(Win32_HWND, Win32_UINT, Win32_WPARAM, Win32_LPARAM); struct Win32_WNDCLASSEXW { @@ -38,19 +38,19 @@ struct Win32_PAINTSTRUCT Win32_BOOL fIncUpdate; Win32_BYTE[32] rgbReserved; } -def Win32_PWNDCLASSEXW = Win32_WNDCLASSEXW*; -def Win32_LPWNDCLASSEXW = Win32_WNDCLASSEXW*; -def Win32_NPWNDCLASSEXW = Win32_WNDCLASSEXW*; +alias Win32_PWNDCLASSEXW = Win32_WNDCLASSEXW*; +alias Win32_LPWNDCLASSEXW = Win32_WNDCLASSEXW*; +alias Win32_NPWNDCLASSEXW = Win32_WNDCLASSEXW*; -def Win32_PPAINTSTRUCT = Win32_PAINTSTRUCT*; -def Win32_LPPAINTSTRUCT = Win32_PAINTSTRUCT*; -def Win32_NPPAINTSTRUCT = Win32_PAINTSTRUCT*; +alias Win32_PPAINTSTRUCT = Win32_PAINTSTRUCT*; +alias Win32_LPPAINTSTRUCT = Win32_PAINTSTRUCT*; +alias Win32_NPPAINTSTRUCT = Win32_PAINTSTRUCT*; -def Win32_PMSG = Win32_MSG*; -def Win32_LPMSG = Win32_MSG*; -def Win32_NPMSG = Win32_MSG*; +alias Win32_PMSG = Win32_MSG*; +alias Win32_LPMSG = Win32_MSG*; +alias Win32_NPMSG = Win32_MSG*; -def Win32_ATOM = ushort; +alias Win32_ATOM = ushort; const Win32_DWORD WS_BORDER = 0x00800000L; const Win32_DWORD WS_CAPTION = 0x00C00000L; diff --git a/lib/std/os/win32/ws2def.c3 b/lib/std/os/win32/ws2def.c3 index 041b62701..fca080b69 100644 --- a/lib/std/os/win32/ws2def.c3 +++ b/lib/std/os/win32/ws2def.c3 @@ -12,9 +12,9 @@ struct Win32_addrinfo Win32_ADDRINFO* ai_next; } -def Win32_ADDRINFO = Win32_addrinfo; -def Win32_ADDRINFOA = Win32_ADDRINFO; -def Win32_PADDRINFOA = Win32_ADDRINFO*; +alias Win32_ADDRINFO = Win32_addrinfo; +alias Win32_ADDRINFOA = Win32_ADDRINFO; +alias Win32_PADDRINFOA = Win32_ADDRINFO*; struct Win32_addrinfoW { Win32_INT ai_flags; @@ -27,5 +27,5 @@ struct Win32_addrinfoW { Win32_addrinfo *ai_next; } -def Win32_ADDRINFOW = Win32_addrinfoW; -def Win32_PADDRINFOW = Win32_addrinfoW*; \ No newline at end of file +alias Win32_ADDRINFOW = Win32_addrinfoW; +alias Win32_PADDRINFOW = Win32_addrinfoW*; \ No newline at end of file diff --git a/lib/std/os/win32/wsa.c3 b/lib/std/os/win32/wsa.c3 index d80b238c7..f5a55ec93 100644 --- a/lib/std/os/win32/wsa.c3 +++ b/lib/std/os/win32/wsa.c3 @@ -10,9 +10,9 @@ struct Win32_pollfd Win32_SHORT events; Win32_SHORT revents; } -def Win32_WSAPOLLFD = Win32_pollfd; -def Win32_PWSAPOLLFD = Win32_WSAPOLLFD*; -def Win32_LPWSAPOLLFD = Win32_WSAPOLLFD*; +alias Win32_WSAPOLLFD = Win32_pollfd; +alias Win32_PWSAPOLLFD = Win32_WSAPOLLFD*; +alias Win32_LPWSAPOLLFD = Win32_WSAPOLLFD*; struct Win32_InAddr { @@ -53,10 +53,10 @@ struct Win32_SOCKADDR_STORAGE Win32_CHAR[_SS_PAD2SIZE]* __ss_pad2; } -def Win32_WSAOVERLAPPED = Win32_OVERLAPPED; -def Win32_LPWSAOVERLAPPED = Win32_WSAOVERLAPPED*; +alias Win32_WSAOVERLAPPED = Win32_OVERLAPPED; +alias Win32_LPWSAOVERLAPPED = Win32_WSAOVERLAPPED*; -def Win32_LPWSAOVERLAPPED_COMPLETION_ROUTINE = fn void ( +alias Win32_LPWSAOVERLAPPED_COMPLETION_ROUTINE = fn void ( Win32_DWORD dwError, Win32_DWORD cbTransferred, Win32_LPWSAOVERLAPPED @@ -64,7 +64,7 @@ def Win32_LPWSAOVERLAPPED_COMPLETION_ROUTINE = fn void ( Win32_DWORD dwFlags ); -def Win32_LPFN_WSARECV = fn CInt( +alias Win32_LPFN_WSARECV = fn CInt( Win32_SOCKET socket, Win32_LPWSABUF buffers, Win32_DWORD buffer_count, @@ -74,7 +74,7 @@ def Win32_LPFN_WSARECV = fn CInt( Win32_LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_routine ); -def Win32_LPFN_WSARECVFROM = fn CInt( +alias Win32_LPFN_WSARECVFROM = fn CInt( Win32_SOCKET socket, Win32_LPWSABUF buffers, Win32_DWORD buffer_count, @@ -86,7 +86,7 @@ def Win32_LPFN_WSARECVFROM = fn CInt( Win32_LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_routine ); -def Win32_LPFn_CONNECTEX = fn bool( +alias Win32_LPFn_CONNECTEX = fn bool( Win32_SOCKET, Win32_SOCKADDR*, Win32_INT, @@ -96,7 +96,7 @@ def Win32_LPFn_CONNECTEX = fn bool( void* ); -def Win32_LPFn_ACCEPTEX = fn bool( +alias Win32_LPFn_ACCEPTEX = fn bool( Win32_SOCKET, Win32_SOCKET, Win32_PVOID, diff --git a/lib/std/sort/countingsort.c3 b/lib/std/sort/countingsort.c3 index c81af01a0..0eed19147 100644 --- a/lib/std/sort/countingsort.c3 +++ b/lib/std/sort/countingsort.c3 @@ -26,21 +26,21 @@ macro quicksort_indexed(list, start, end, cmp = EMPTY_MACRO_SLOT, context = EMPT module std::sort::cs{Type, KeyFn}; -def Counts = usz[256] @private; -def Ranges = usz[257] @private; -def Indexs = char[256] @private; -def ElementType = $typeof((Type){}[0]); +alias Counts = usz[256] @private; +alias Ranges = usz[257] @private; +alias Indexs = char[256] @private; +alias ElementType = $typeof((Type){}[0]); const bool NO_KEY_FN @private = types::is_same(KeyFn, EmptySlot); const bool KEY_BY_VALUE @private = NO_KEY_FN ||| $assignable((Type){}[0], $typefrom(KeyFn.paramsof[0].type)); const bool LIST_HAS_REF @private = $defined(&(Type){}[0]); -def KeyFnReturnType = $typefrom(KeyFn.returns) @if(!NO_KEY_FN); -def KeyFnReturnType = ElementType @if(NO_KEY_FN); -def CmpCallback = fn int(ElementType, ElementType) @if(KEY_BY_VALUE && NO_KEY_FN); -def CmpCallback = fn int(ElementType*, ElementType*) @if(!KEY_BY_VALUE && NO_KEY_FN); -def CmpCallback = fn int(ElementType, ElementType, KeyFn) @if(KEY_BY_VALUE && !NO_KEY_FN); -def CmpCallback = fn int(ElementType*, ElementType*, KeyFn) @if(!KEY_BY_VALUE && !NO_KEY_FN); +alias KeyFnReturnType = $typefrom(KeyFn.returns) @if(!NO_KEY_FN); +alias KeyFnReturnType = ElementType @if(NO_KEY_FN); +alias CmpCallback = fn int(ElementType, ElementType) @if(KEY_BY_VALUE && NO_KEY_FN); +alias CmpCallback = fn int(ElementType*, ElementType*) @if(!KEY_BY_VALUE && NO_KEY_FN); +alias CmpCallback = fn int(ElementType, ElementType, KeyFn) @if(KEY_BY_VALUE && !NO_KEY_FN); +alias CmpCallback = fn int(ElementType*, ElementType*, KeyFn) @if(!KEY_BY_VALUE && !NO_KEY_FN); fn void csort(Type list, usz low, usz high, KeyFn key_fn, uint byte_idx) { diff --git a/lib/std/sort/insertionsort.c3 b/lib/std/sort/insertionsort.c3 index 8515be5a0..dbf4bd94a 100644 --- a/lib/std/sort/insertionsort.c3 +++ b/lib/std/sort/insertionsort.c3 @@ -19,7 +19,7 @@ macro insertionsort(list, cmp = EMPTY_MACRO_SLOT, context = EMPTY_MACRO_SLOT) @b module std::sort::is{Type, CmpFn, Context}; -def ElementType = $typeof(((Type){})[0]); +alias ElementType = $typeof(((Type){})[0]); fn void isort(Type list, usz low, usz high, CmpFn comp, Context context) { diff --git a/lib/std/sort/quicksort.c3 b/lib/std/sort/quicksort.c3 index cec881403..7ae35e113 100644 --- a/lib/std/sort/quicksort.c3 +++ b/lib/std/sort/quicksort.c3 @@ -35,7 +35,7 @@ macro quickselect(list, isz k, cmp = EMPTY_MACRO_SLOT, context = EMPTY_MACRO_SLO module std::sort::qs{Type, CmpFn, Context}; -def ElementType = $typeof(((Type){})[0]); +alias ElementType = $typeof(((Type){})[0]); struct StackElementItem @private { @@ -43,7 +43,7 @@ struct StackElementItem @private isz high; } -def Stack = StackElementItem[64] @private; +alias Stack = StackElementItem[64] @private; // Based on https://alienryderflex.com/quicksort by Darel Rex Finley, Public Domain. diff --git a/lib/std/text/i18n.c3 b/lib/std/text/i18n.c3 index 9d121a6de..f2f9ec42e 100644 --- a/lib/std/text/i18n.c3 +++ b/lib/std/text/i18n.c3 @@ -5,7 +5,7 @@ distinct Language = char[]; const Language EN = "en"; -def TranslationMap = HashMap{String, String}; +alias TranslationMap = HashMap{String, String}; fn uint Language.hash(self) => fnv32a::encode((char[])self); HashMap{Language, TranslationMap*} language_map @private; TranslationMap? current_map; diff --git a/lib/std/threads/fixed_pool.c3 b/lib/std/threads/fixed_pool.c3 index 9a3254e36..c275d3a83 100644 --- a/lib/std/threads/fixed_pool.c3 +++ b/lib/std/threads/fixed_pool.c3 @@ -6,7 +6,7 @@ import std::thread; // Please do not use this one in production. -def ThreadPoolFn = fn void(any[] args); +alias ThreadPoolFn = fn void(any[] args); struct FixedThreadPool { diff --git a/lib/std/threads/os/thread_posix.c3 b/lib/std/threads/os/thread_posix.c3 index a4274935c..59cb8387b 100644 --- a/lib/std/threads/os/thread_posix.c3 +++ b/lib/std/threads/os/thread_posix.c3 @@ -7,7 +7,7 @@ struct NativeMutex bool initialized; } -def NativeConditionVariable = Pthread_cond_t; +alias NativeConditionVariable = Pthread_cond_t; struct NativeThread { @@ -16,7 +16,7 @@ struct NativeThread void* arg; } -def NativeOnceFlag = Pthread_once_t; +alias NativeOnceFlag = Pthread_once_t; <* @require !self.is_initialized() : "Mutex is already initialized" diff --git a/lib/std/threads/thread.c3 b/lib/std/threads/thread.c3 index b5b7447c4..a3ee2804c 100644 --- a/lib/std/threads/thread.c3 +++ b/lib/std/threads/thread.c3 @@ -15,9 +15,9 @@ distinct TimedRecursiveMutex = inline Mutex; distinct ConditionVariable = NativeConditionVariable; distinct Thread = inline NativeThread; distinct OnceFlag = NativeOnceFlag; -def OnceFn = fn void(); +alias OnceFn = fn void(); -def ThreadFn = fn int(void* arg); +alias ThreadFn = fn int(void* arg); fault INIT_FAILED, diff --git a/lib/std/time/os/time_darwin.c3 b/lib/std/time/os/time_darwin.c3 index 049640e43..a359b3eee 100644 --- a/lib/std/time/os/time_darwin.c3 +++ b/lib/std/time/os/time_darwin.c3 @@ -6,8 +6,8 @@ struct Darwin_mach_timebase_info uint denom; } -def Darwin_mach_timebase_info_t = Darwin_mach_timebase_info; -def Darwin_mach_timebase_info_data_t = Darwin_mach_timebase_info; +alias Darwin_mach_timebase_info_t = Darwin_mach_timebase_info; +alias Darwin_mach_timebase_info_data_t = Darwin_mach_timebase_info; extern fn void mach_timebase_info(Darwin_mach_timebase_info_data_t* timebase); extern fn ulong mach_absolute_time(); diff --git a/releasenotes.md b/releasenotes.md index 2314fe714..507a5cce4 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -31,6 +31,7 @@ - Improve error message on `foo ?? io::EOF` with missing '?' #2036 - Make `@public` import recursive. #2018 - Fault nameof prefixes the first last module path, for instance `std::io::EOF` is rendered as `io::EOF`. +- Rename `def` to `alias`. ### Fixes - Fix address sanitizer to work on MachO targets (e.g. MacOS). diff --git a/resources/examples/nolibc-freebsd/hello_world.c3 b/resources/examples/nolibc-freebsd/hello_world.c3 index d2b130a9c..0dce540ef 100644 --- a/resources/examples/nolibc-freebsd/hello_world.c3 +++ b/resources/examples/nolibc-freebsd/hello_world.c3 @@ -13,7 +13,7 @@ fn void _start() @export("_start") module std::core::builtin; -def PanicFn = fn void(String message, String file, String function, uint line); +alias PanicFn = fn void(String message, String file, String function, uint line); PanicFn panic = &default_panic; diff --git a/resources/examples/nolibc/hello_world.c3 b/resources/examples/nolibc/hello_world.c3 index 53ab2ffbc..ccf3bc0f5 100644 --- a/resources/examples/nolibc/hello_world.c3 +++ b/resources/examples/nolibc/hello_world.c3 @@ -13,7 +13,7 @@ fn void _start() @export("_start") module std::core::builtin; -def PanicFn = fn void(String message, String file, String function, uint line); +alias PanicFn = fn void(String message, String file, String function, uint line); PanicFn panic = &default_panic; diff --git a/resources/examples/opengl/src/gl/gl.c3 b/resources/examples/opengl/src/gl/gl.c3 index b21b5aaa3..8a74cc211 100644 --- a/resources/examples/opengl/src/gl/gl.c3 +++ b/resources/examples/opengl/src/gl/gl.c3 @@ -1,6 +1,6 @@ module gl; -def BitField = int; +alias BitField = int; enum BufferBit : int (int value) { diff --git a/resources/examples/timeit.c3 b/resources/examples/timeit.c3 index b3a0e1e94..8ceccf27d 100644 --- a/resources/examples/timeit.c3 +++ b/resources/examples/timeit.c3 @@ -2,9 +2,9 @@ module test; import std::time; import std::io; -def foo = write; +alias foo = write; -def Int = int; +alias Int = int; macro @timeit(#call) { diff --git a/resources/testfragments/diagnostic.c3 b/resources/testfragments/diagnostic.c3 index db0f8ed15..2b814cf9a 100644 --- a/resources/testfragments/diagnostic.c3 +++ b/resources/testfragments/diagnostic.c3 @@ -4,7 +4,7 @@ struct Overalign double[<33>] x; } -def Olist = List{Overalign}; +alias Olist = List{Overalign}; fn void main() { diff --git a/src/compiler/enums.h b/src/compiler/enums.h index 9e3950ea0..a36c13e1e 100644 --- a/src/compiler/enums.h +++ b/src/compiler/enums.h @@ -1130,6 +1130,7 @@ typedef enum TOKEN_TYPEID, // Keywords + TOKEN_ALIAS, TOKEN_ASSERT, TOKEN_ASM, TOKEN_BITSTRUCT, @@ -1138,7 +1139,6 @@ typedef enum TOKEN_CATCH, TOKEN_CONST, TOKEN_CONTINUE, - TOKEN_DEF, TOKEN_DEFAULT, TOKEN_DEFER, TOKEN_DISTINCT, diff --git a/src/compiler/parse_global.c b/src/compiler/parse_global.c index 87400a4f0..8622ca8bc 100644 --- a/src/compiler/parse_global.c +++ b/src/compiler/parse_global.c @@ -47,7 +47,7 @@ void recover_top_level(ParseContext *c) case TOKEN_IMPORT: case TOKEN_EXTERN: case TOKEN_ENUM: - case TOKEN_DEF: + case TOKEN_ALIAS: case TOKEN_FAULT: return; case TOKEN_CONST: @@ -1927,14 +1927,14 @@ static inline void decl_add_type(Decl *decl, TypeKind kind) decl->type = type; } /** - * typedef_declaration ::= DEF TYPE_IDENT '=' typedef_type ';' + * typedef_declaration ::= ALIAS TYPE_IDENT '=' typedef_type ';' * * typedef_type ::= func_typedef | type generic_params? * func_typedef ::= 'fn' optional_type parameter_type_list */ -static inline Decl *parse_def_type(ParseContext *c) +static inline Decl *parse_alias_type(ParseContext *c) { - advance_and_verify(c, TOKEN_DEF); + advance_and_verify(c, TOKEN_ALIAS); Decl *decl = decl_new(DECL_POISONED, symstr(c), c->span); DEBUG_LOG("Parse def %s", decl->name); @@ -2024,10 +2024,10 @@ static inline Decl *parse_def_type(ParseContext *c) * * identifier_alias ::= path? (IDENT | CONST_IDENT | AT_IDENT) */ -static inline Decl *parse_def_ident(ParseContext *c) +static inline Decl *parse_alias_ident(ParseContext *c) { // 1. Store the beginning of the "define". - advance_and_verify(c, TOKEN_DEF); + advance_and_verify(c, TOKEN_ALIAS); // 2. At this point we expect an ident or a const token. // since the Type is handled. @@ -2075,12 +2075,12 @@ static inline Decl *parse_def_ident(ParseContext *c) } /** - * define_attribute ::= 'def' AT_TYPE_IDENT '(' parameter_list ')' opt_attributes '=' '{' attributes? '}' ';' + * define_attribute ::= 'alias' AT_TYPE_IDENT '(' parameter_list ')' opt_attributes '=' '{' attributes? '}' ';' */ -static inline Decl *parse_def_attribute(ParseContext *c) +static inline Decl *parse_alias_attribute(ParseContext *c) { // 1. Store the beginning of the "def". - advance_and_verify(c, TOKEN_DEF); + advance_and_verify(c, TOKEN_ALIAS); Decl *decl = decl_new(DECL_ATTRIBUTE, symstr(c), c->span); @@ -2115,19 +2115,19 @@ static inline Decl *parse_def_attribute(ParseContext *c) } /** - * define_decl ::= DEF define_type_body | + * define_decl ::= ALIAS define_type_body | */ -static inline Decl *parse_def(ParseContext *c) +static inline Decl *parse_alias(ParseContext *c) { switch (peek(c)) { case TOKEN_TYPE_IDENT: - return parse_def_type(c); + return parse_alias_type(c); case TOKEN_AT_TYPE_IDENT: // define @Foo = @inline, @noreturn - return parse_def_attribute(c); + return parse_alias_attribute(c); default: - return parse_def_ident(c); + return parse_alias_ident(c); } } @@ -2932,9 +2932,9 @@ Decl *parse_top_level_statement(ParseContext *c, ParseContext **context_out) case TOKEN_DOCS_START: PRINT_ERROR_HERE("There are more than one doc comment in a row, that is not allowed."); return poisoned_decl; - case TOKEN_DEF: + case TOKEN_ALIAS: if (has_real_contracts) goto CONTRACT_NOT_ALLOWED; - decl = parse_def(c); + decl = parse_alias(c); break; case TOKEN_FN: decl = parse_func_definition(c, contracts, c->unit->is_interface_file ? FUNC_PARSE_C3I : FUNC_PARSE_REGULAR); diff --git a/src/compiler/parse_stmt.c b/src/compiler/parse_stmt.c index e906a449b..14e9435c5 100644 --- a/src/compiler/parse_stmt.c +++ b/src/compiler/parse_stmt.c @@ -1362,74 +1362,74 @@ Ast *parse_stmt(ParseContext *c) case TOKEN_INVALID_TOKEN: advance(c); return poisoned_ast; - case TOKEN_COLON: - case TOKEN_COMMA: - case TOKEN_EQ: - case TOKEN_GREATER: - case TOKEN_DIV: - case TOKEN_DOLLAR: - case TOKEN_DOT: - case TOKEN_HASH: - case TOKEN_LESS: - case TOKEN_LBRACKET: - case TOKEN_MOD: - case TOKEN_QUESTION: + case TOKEN_ALIAS: case TOKEN_AND: case TOKEN_ARROW: + case TOKEN_BANGBANG: + case TOKEN_BITSTRUCT: case TOKEN_BIT_AND_ASSIGN: case TOKEN_BIT_OR_ASSIGN: case TOKEN_BIT_XOR_ASSIGN: + case TOKEN_COLON: + case TOKEN_COMMA: + case TOKEN_CT_CASE: + case TOKEN_CT_DEFAULT: + case TOKEN_CT_ELSE: + case TOKEN_CT_ENDFOR: + case TOKEN_CT_ENDFOREACH: + case TOKEN_CT_ENDIF: + case TOKEN_CT_ENDSWITCH: + case TOKEN_CT_EXEC: + case TOKEN_CT_INCLUDE: + case TOKEN_CT_VASPLAT: + case TOKEN_DISTINCT: + case TOKEN_DIV: case TOKEN_DIV_ASSIGN: + case TOKEN_DOCS_END: + case TOKEN_DOCS_START: + case TOKEN_DOC_COMMENT: + case TOKEN_DOLLAR: + case TOKEN_DOT: case TOKEN_DOTDOT: + case TOKEN_ELLIPSIS: + case TOKEN_ELSE: case TOKEN_ELVIS: + case TOKEN_ENUM: + case TOKEN_EQ: case TOKEN_EQEQ: + case TOKEN_EXTERN: + case TOKEN_FAULT: + case TOKEN_FN: + case TOKEN_GREATER: case TOKEN_GREATER_EQ: + case TOKEN_HASH: + case TOKEN_IMPLIES: + case TOKEN_IMPORT: + case TOKEN_INLINE: + case TOKEN_INTERFACE: + case TOKEN_LBRACKET: + case TOKEN_LESS: case TOKEN_LESS_EQ: + case TOKEN_LVEC: + case TOKEN_MACRO: case TOKEN_MINUS_ASSIGN: + case TOKEN_MOD: + case TOKEN_MODULE: case TOKEN_MOD_ASSIGN: case TOKEN_MULT_ASSIGN: case TOKEN_NOT_EQUAL: case TOKEN_PLUS_ASSIGN: - case TOKEN_ELLIPSIS: - case TOKEN_SCOPE: - case TOKEN_SHR: - case TOKEN_SHL: - case TOKEN_SHR_ASSIGN: - case TOKEN_SHL_ASSIGN: - case TOKEN_ELSE: + case TOKEN_QUESTION: case TOKEN_QUESTQUEST: - case TOKEN_ENUM: - case TOKEN_FN: - case TOKEN_IMPORT: - case TOKEN_MACRO: - case TOKEN_MODULE: - case TOKEN_EXTERN: - case TOKEN_STRUCT: - case TOKEN_FAULT: - case TOKEN_UNION: - case TOKEN_DEF: - case TOKEN_DOCS_START: - case TOKEN_DOCS_END: - case TOKEN_DOC_COMMENT: - case TOKEN_CT_CASE: - case TOKEN_CT_ELSE: - case TOKEN_CT_DEFAULT: - case TOKEN_CT_ENDIF: - case TOKEN_CT_ENDSWITCH: - case TOKEN_BANGBANG: - case TOKEN_UNDERSCORE: - case TOKEN_BITSTRUCT: - case TOKEN_LVEC: case TOKEN_RVEC: - case TOKEN_CT_ENDFOR: - case TOKEN_CT_ENDFOREACH: - case TOKEN_CT_VASPLAT: - case TOKEN_IMPLIES: - case TOKEN_INLINE: - case TOKEN_DISTINCT: - case TOKEN_CT_INCLUDE: - case TOKEN_CT_EXEC: - case TOKEN_INTERFACE: + case TOKEN_SCOPE: + case TOKEN_SHL: + case TOKEN_SHL_ASSIGN: + case TOKEN_SHR: + case TOKEN_SHR_ASSIGN: + case TOKEN_STRUCT: + case TOKEN_UNDERSCORE: + case TOKEN_UNION: PRINT_ERROR_HERE("Unexpected '%s' found when expecting a statement.", token_type_to_string(c->tok)); advance(c); diff --git a/src/compiler/tokens.c b/src/compiler/tokens.c index 1c7a88ba7..2a8128d06 100644 --- a/src/compiler/tokens.c +++ b/src/compiler/tokens.c @@ -185,6 +185,8 @@ const char *token_type_to_string(TokenType type) return "DOC_COMMENT"; // Keywords + case TOKEN_ALIAS: + return "alias"; case TOKEN_ANYFAULT: return "anyfault"; case TOKEN_ASM: @@ -203,8 +205,6 @@ const char *token_type_to_string(TokenType type) return "const"; case TOKEN_CONTINUE: return "continue"; - case TOKEN_DEF: - return "def"; case TOKEN_DEFAULT: return "default"; case TOKEN_DEFER: diff --git a/test/test_suite/abi/aarch64_hfa_args.c3t b/test/test_suite/abi/aarch64_hfa_args.c3t index cc9311c92..72f033206 100644 --- a/test/test_suite/abi/aarch64_hfa_args.c3t +++ b/test/test_suite/abi/aarch64_hfa_args.c3t @@ -1,7 +1,7 @@ // #target: macos-aarch64 module test; -def Int8x16 = ichar[<16>]; -def Float32x3 = float[<3>]; +alias Int8x16 = ichar[<16>]; +alias Float32x3 = float[<3>]; struct HFAv3 { diff --git a/test/test_suite/abi/darwin64_avx.c3t b/test/test_suite/abi/darwin64_avx.c3t index 66f0e7d09..a027c0dee 100644 --- a/test/test_suite/abi/darwin64_avx.c3t +++ b/test/test_suite/abi/darwin64_avx.c3t @@ -2,7 +2,7 @@ // #opt: --x86cpu=avx1 module test; -def Mm256 = float[<8>]; +alias Mm256 = float[<8>]; struct St256 { Mm256 m; @@ -20,7 +20,7 @@ fn void f39() { f38(x38); f37(x37); } // CHECK: declare void @func40(%struct.t128* byval(%struct.t128) align 16) -def Mm128 = float[<4>]; +alias Mm128 = float[<4>]; struct Two128 { Mm128 m; @@ -48,7 +48,7 @@ fn void func43(Sa s) { } -def Vec46 = float[<2>]; +alias Vec46 = float[<2>]; extern fn void f46(Vec46,Vec46,Vec46,Vec46,Vec46,Vec46,Vec46,Vec46,Vec46,Vec46); fn void test46() { Vec46 x = {1,2}; f46(x,x,x,x,x,x,x,x,x,x); } @@ -73,7 +73,7 @@ fn void test54() { test54_helper(x54, x54, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, (Complex) { 0, 1.0 }); } -def Mm512 = float[<16>]; +alias Mm512 = float[<16>]; struct St512 { Mm512 m; } diff --git a/test/test_suite/abi/darwin64_avx512.c3t b/test/test_suite/abi/darwin64_avx512.c3t index 367c4bbd9..9bc158a92 100644 --- a/test/test_suite/abi/darwin64_avx512.c3t +++ b/test/test_suite/abi/darwin64_avx512.c3t @@ -2,8 +2,8 @@ // #opt: --x86cpu=avx512 module test; -def Mm256 = float[<8>]; -def Mm512 = float[<16>]; +alias Mm256 = float[<8>]; +alias Mm512 = float[<16>]; struct St512 { Mm512 m; } diff --git a/test/test_suite/abi/darwin64_sse.c3t b/test/test_suite/abi/darwin64_sse.c3t index 67d9f7b43..68277b69b 100644 --- a/test/test_suite/abi/darwin64_sse.c3t +++ b/test/test_suite/abi/darwin64_sse.c3t @@ -2,7 +2,7 @@ // #opt: --x86cpu=sse4 module test; -def Mm256 = float[<8>]; +alias Mm256 = float[<8>]; struct St256 { Mm256 m; } @@ -19,7 +19,7 @@ fn void f39() { f38(x38); f37(x37); } // CHECK: declare void @func40(%struct.t128* byval(%struct.t128) align 16) -def Mm128 = float[<4>]; +alias Mm128 = float[<4>]; struct Two128 { Mm128 m; Mm128 n; diff --git a/test/test_suite/abi/darwinx64_2.c3t b/test/test_suite/abi/darwinx64_2.c3t index efc2d5f5a..6481fe395 100644 --- a/test/test_suite/abi/darwinx64_2.c3t +++ b/test/test_suite/abi/darwinx64_2.c3t @@ -86,7 +86,7 @@ fn V4f32wrapper f27(V4f32wrapper x) { // PR22563 - We should unwrap simple structs and arrays to pass // and return them in the appropriate vector registers if possible. -def V8f32 = float[<8>]; +alias V8f32 = float[<8>]; struct V8f32wrapper { V8f32 v; } @@ -133,15 +133,15 @@ fn float f31(F31foo x) { return x.c; } -def V1i64 = ulong[<1>]; +alias V1i64 = ulong[<1>]; fn V1i64 f34(V1i64 arg) { return arg; } -def V1i64_2 = uint[<2>]; +alias V1i64_2 = uint[<2>]; fn V1i64_2 f35(V1i64_2 arg) { return arg+arg; } -def V2i32 = float[<2>]; +alias V2i32 = float[<2>]; fn V2i32 f36(V2i32 arg) { return arg; } diff --git a/test/test_suite/abi/riscv64-lp64-abi.c3t b/test/test_suite/abi/riscv64-lp64-abi.c3t index 32afce841..8006de77f 100644 --- a/test/test_suite/abi/riscv64-lp64-abi.c3t +++ b/test/test_suite/abi/riscv64-lp64-abi.c3t @@ -5,7 +5,7 @@ struct Large { long a, b, c, d; } -def V32i8 = char[<32>]; +alias V32i8 = char[<32>]; fn int f_scalar_stack_1(int a, int128 b, float c, float128 d, V32i8 e, char f, char g, char h) { diff --git a/test/test_suite/asm/asm_jump_rv.c3t b/test/test_suite/asm/asm_jump_rv.c3t index ed0539fd5..dafb90ddc 100644 --- a/test/test_suite/asm/asm_jump_rv.c3t +++ b/test/test_suite/asm/asm_jump_rv.c3t @@ -1,7 +1,7 @@ // #target: elf-riscv32 module test; -def Sum = fn int(int a, int b); +alias Sum = fn int(int a, int b); fn int sum(int a, int b) { diff --git a/test/test_suite/attributes/attr_not_imported.c3 b/test/test_suite/attributes/attr_not_imported.c3 index d8aba13d9..afd866b16 100644 --- a/test/test_suite/attributes/attr_not_imported.c3 +++ b/test/test_suite/attributes/attr_not_imported.c3 @@ -1,6 +1,6 @@ module abc; -def @Foo = { @inline }; +alias @Foo = { @inline }; module bar; diff --git a/test/test_suite/attributes/attribute_params.c3 b/test/test_suite/attributes/attribute_params.c3 index dbad2720e..b18e6bab9 100644 --- a/test/test_suite/attributes/attribute_params.c3 +++ b/test/test_suite/attributes/attribute_params.c3 @@ -1,5 +1,5 @@ -def @Foo() = { @inline }; // #error: At least one parameter was expected -def @Bar = { @inline }; +alias @Foo() = { @inline }; // #error: At least one parameter was expected +alias @Bar = { @inline }; fn void test1() @Foo { } fn void test2() @Foo() { } // #error: An expression was diff --git a/test/test_suite/attributes/attribute_visibility.c3t b/test/test_suite/attributes/attribute_visibility.c3t index 14e9ee109..87cd85ca6 100644 --- a/test/test_suite/attributes/attribute_visibility.c3t +++ b/test/test_suite/attributes/attribute_visibility.c3t @@ -1,7 +1,7 @@ // #target: macos-x64 module test; const int FOO @private = 4; -def @Align(x) = { @align(x * FOO) }; +alias @Align(x) = { @align(x * FOO) }; module test2; import test; diff --git a/test/test_suite/attributes/attributes_repeat_param.c3t b/test/test_suite/attributes/attributes_repeat_param.c3t index 9c3ea7915..99bdc2c7b 100644 --- a/test/test_suite/attributes/attributes_repeat_param.c3t +++ b/test/test_suite/attributes/attributes_repeat_param.c3t @@ -1,7 +1,7 @@ // #target: macos-aarch64 module test; -def @Test(x) = { @extern("Foo" +++ x) }; +alias @Test(x) = { @extern("Foo" +++ x) }; fn void hello_world() @Test("Megaman") {} diff --git a/test/test_suite/attributes/recursive_attributes.c3 b/test/test_suite/attributes/recursive_attributes.c3 index bba90fcf1..3c25d73c8 100644 --- a/test/test_suite/attributes/recursive_attributes.c3 +++ b/test/test_suite/attributes/recursive_attributes.c3 @@ -1,8 +1,8 @@ module test; -def @Align(y) = { @Align16(y / 2) }; -def @Align16(x) = { @align(4) @Align(8 * x) }; // #error: Recursive declaration of attribute -def @Test = { @noinline }; +alias @Align(y) = { @Align16(y / 2) }; +alias @Align16(x) = { @align(4) @Align(8 * x) }; // #error: Recursive declaration of attribute +alias @Test = { @noinline }; struct Foo { int z; diff --git a/test/test_suite/attributes/user_defined_attributes.c3t b/test/test_suite/attributes/user_defined_attributes.c3t index 698ad461a..a166773a3 100644 --- a/test/test_suite/attributes/user_defined_attributes.c3t +++ b/test/test_suite/attributes/user_defined_attributes.c3t @@ -2,12 +2,12 @@ module test; -def @Foo = { @noreturn @weak }; +alias @Foo = { @noreturn @weak }; -def @Align(y) = { @align(y) }; -def @Align16(x) = { @Align(8 * x) @align(1024) } @private; -def @Test = { @noinline }; -def @TestZero = { }; +alias @Align(y) = { @align(y) }; +alias @Align16(x) = { @Align(8 * x) @align(1024) } @private; +alias @Test = { @noinline }; +alias @TestZero = { }; struct Foo { int z; diff --git a/test/test_suite/cast/cast_narrow_alias.c3t b/test/test_suite/cast/cast_narrow_alias.c3t index c20d40af7..1c8618cb3 100644 --- a/test/test_suite/cast/cast_narrow_alias.c3t +++ b/test/test_suite/cast/cast_narrow_alias.c3t @@ -1,6 +1,6 @@ // #target: macos-x64 module abc; -def UInt8 = char; +alias UInt8 = char; fn void main() { UInt8 x = 17; diff --git a/test/test_suite/clang/2002-01_02.c3t b/test/test_suite/clang/2002-01_02.c3t index af1fc4528..8231752e4 100644 --- a/test/test_suite/clang/2002-01_02.c3t +++ b/test/test_suite/clang/2002-01_02.c3t @@ -52,7 +52,7 @@ struct Edge_rec int more_data; } -def QuadEdge = Edge_rec*; +alias QuadEdge = Edge_rec*; struct EdgePair { QuadEdge left, right; diff --git a/test/test_suite/clang/2002-07.c3t b/test/test_suite/clang/2002-07.c3t index 44dfa20d5..81fa00d89 100644 --- a/test/test_suite/clang/2002-07.c3t +++ b/test/test_suite/clang/2002-07.c3t @@ -144,7 +144,7 @@ struct Quad { Quad globalQuad = { 4, {1, 2}, null, 3, 156 }; -def FuncPtr = fn int(int); +alias FuncPtr = fn int(int); fn uint ptrFunc(FuncPtr func, int x) { return func(x); diff --git a/test/test_suite/compile_time/comptime_array_folding.c3t b/test/test_suite/compile_time/comptime_array_folding.c3t index 3a87d0cda..34fa10fa2 100644 --- a/test/test_suite/compile_time/comptime_array_folding.c3t +++ b/test/test_suite/compile_time/comptime_array_folding.c3t @@ -2,7 +2,7 @@ module test; import std; -def @TaggedAttr(value) = { +alias @TaggedAttr(value) = { @tag("foo", (ValueHere[*]){ value }) }; diff --git a/test/test_suite/compile_time/ct_switch_type_errors.c3 b/test/test_suite/compile_time/ct_switch_type_errors.c3 index 33c2ddc1f..5d16fc1c3 100644 --- a/test/test_suite/compile_time/ct_switch_type_errors.c3 +++ b/test/test_suite/compile_time/ct_switch_type_errors.c3 @@ -22,8 +22,8 @@ fn void test1() $endswitch } -def Foo = int; -def Bar = double; +alias Foo = int; +alias Bar = double; fn void test2() { $switch int.typeid: diff --git a/test/test_suite/compile_time_introspection/recursive_tag.c3 b/test/test_suite/compile_time_introspection/recursive_tag.c3 index 2189d74d3..baefc9f86 100644 --- a/test/test_suite/compile_time_introspection/recursive_tag.c3 +++ b/test/test_suite/compile_time_introspection/recursive_tag.c3 @@ -1,6 +1,6 @@ enum Test @tag("test", Test.FOO) {FOO} // #error: Recursive definition of 'Test' -def @Test(Foo val) = {}; +alias @Test(Foo val) = {}; enum Foo @tag("test", Foo.BAR) // #error: Recursive definition of 'Foo' { diff --git a/test/test_suite/define/alias_typename.c3 b/test/test_suite/define/alias_typename.c3 index dd659fbbe..3d9629b40 100644 --- a/test/test_suite/define/alias_typename.c3 +++ b/test/test_suite/define/alias_typename.c3 @@ -1,2 +1,2 @@ -def ShouldNotBeUppercase = FOO; // #error: A constant may not have a type name -def ShouldNotBeUppercase2 = abc; // #error: An identifier may not be aliased \ No newline at end of file +alias ShouldNotBeUppercase = FOO; // #error: A constant may not have a type name +alias ShouldNotBeUppercase2 = abc; // #error: An identifier may not be aliased \ No newline at end of file diff --git a/test/test_suite/define/common.c3 b/test/test_suite/define/common.c3 index 08c9fdab8..d93285d56 100644 --- a/test/test_suite/define/common.c3 +++ b/test/test_suite/define/common.c3 @@ -1,15 +1,15 @@ module foo; // def = -def standard_foo = __stdin; -def someFunctionIntBool = someFunction{int, bool}; -def FooInt = Foo{int}; -def A_CONST_INT = A_CONST{int}; +alias standard_foo = __stdin; +alias someFunctionIntBool = someFunction{int, bool}; +alias FooInt = Foo{int}; +alias A_CONST_INT = A_CONST{int}; -def standard_foo{int} = ofke; // #error: Expected '=' -def fn foo = fef; // #error: A type, variable, constant or attribute name was expected here -def feokfe = fn void(int); // #error: This looks like you're declaring a function type alias -def Helo = helo; // #error: An identifier may not be aliased -def Helo = OFKE; // #error: A constant may not have a type name alias -def int = int; // #error: 'int' is a reserved keyword, try another name -def main = foo; // #error: 'main' is reserved and cannot be used as an alias. +alias standard_foo{int} = ofke; // #error: Expected '=' +alias fn foo = fef; // #error: A type, variable, constant or attribute name was expected here +alias feokfe = fn void(int); // #error: This looks like you're declaring a function type alias +alias Helo = helo; // #error: An identifier may not be aliased +alias Helo = OFKE; // #error: A constant may not have a type name alias +alias int = int; // #error: 'int' is a reserved keyword, try another name +alias main = foo; // #error: 'main' is reserved and cannot be used as an alias. diff --git a/test/test_suite/define/common2.c3 b/test/test_suite/define/common2.c3 index 0e130c5ee..a6a74cd67 100644 --- a/test/test_suite/define/common2.c3 +++ b/test/test_suite/define/common2.c3 @@ -3,8 +3,8 @@ const OFKEOK = 2; distinct Helo = int; fn void Helo.test(&self) {} -def hupp = Helo.test; -def AOFKE = ofek; // #error: An uppercase alias is expected -def okfoe = OFKEOK; // #error: An alias starting with a lower -def helo = Helo; // #error: To alias a type -def HELO = Helo; // #error: To alias a type +alias hupp = Helo.test; +alias AOFKE = ofek; // #error: An uppercase alias is expected +alias okfoe = OFKEOK; // #error: An alias starting with a lower +alias helo = Helo; // #error: To alias a type +alias HELO = Helo; // #error: To alias a type diff --git a/test/test_suite/define/define_name_errors.c3 b/test/test_suite/define/define_name_errors.c3 index cd1a3ea00..8a40f8118 100644 --- a/test/test_suite/define/define_name_errors.c3 +++ b/test/test_suite/define/define_name_errors.c3 @@ -1,8 +1,8 @@ -def Foo = int; +alias Foo = int; -def hello1 = int; // #error: To alias a type, the alias -def hello2 = Foo; // #error: To alias a type, the alias +alias hello1 = int; // #error: To alias a type, the alias +alias hello2 = Foo; // #error: To alias a type, the alias -def HELLO1 = int; // #error: To alias a type, the alias -def HELLO2 = Foo; // #error: To alias a type, the alias \ No newline at end of file +alias HELLO1 = int; // #error: To alias a type, the alias +alias HELLO2 = Foo; // #error: To alias a type, the alias \ No newline at end of file diff --git a/test/test_suite/define/forbidden_defines.c3 b/test/test_suite/define/forbidden_defines.c3 index 67607c812..bb94c1252 100644 --- a/test/test_suite/define/forbidden_defines.c3 +++ b/test/test_suite/define/forbidden_defines.c3 @@ -1,3 +1,3 @@ -def Abc = int[*]; // #error: Inferred array types can only -def Bcd = anyfault; -def Efd = any; +alias Abc = int[*]; // #error: Inferred array types can only +alias Bcd = anyfault; +alias Efd = any; diff --git a/test/test_suite/define/runtime_alias.c3 b/test/test_suite/define/runtime_alias.c3 index 4384b6c8f..51b4e815a 100644 --- a/test/test_suite/define/runtime_alias.c3 +++ b/test/test_suite/define/runtime_alias.c3 @@ -1,6 +1,6 @@ module test; -def abc = ggg; +alias abc = ggg; tlocal int ggg = 123; int[2] x = { abc, 1 }; // #error: expression must be a constant diff --git a/test/test_suite/define/test_at.c3 b/test/test_suite/define/test_at.c3 index 30062f8c8..04839f7ad 100644 --- a/test/test_suite/define/test_at.c3 +++ b/test/test_suite/define/test_at.c3 @@ -13,10 +13,10 @@ import foo @public; distinct Int = int; macro Int.@test(self) {} -def intHello = foo::@hello{int}; // #error: An at-macro like -def @intHello = foo::hello{int}; -def @intTest = Int.@test; -def intTest = Int.@test; // #error: An at-macro like +alias intHello = foo::@hello{int}; // #error: An at-macro like +alias @intHello = foo::hello{int}; +alias @intTest = Int.@test; +alias intTest = Int.@test; // #error: An at-macro like fn void main(String[] args) { diff --git a/test/test_suite/define/test_at_alias.c3 b/test/test_suite/define/test_at_alias.c3 index e00a55734..ec3c5c898 100644 --- a/test/test_suite/define/test_at_alias.c3 +++ b/test/test_suite/define/test_at_alias.c3 @@ -9,7 +9,7 @@ module bar; import foo @public; -def @intHello = foo::@hello{int}; +alias @intHello = foo::@hello{int}; fn void main(String[] args) { @intHello(42); diff --git a/test/test_suite/define/weak_alias_fails.c3 b/test/test_suite/define/weak_alias_fails.c3 index c80849511..0a7641058 100644 --- a/test/test_suite/define/weak_alias_fails.c3 +++ b/test/test_suite/define/weak_alias_fails.c3 @@ -1,19 +1,19 @@ module std::math::vector; -def Vec2f = float[<2>]; +alias Vec2f = float[<2>]; module abc; import std::math; -def Vec2f = std::math::vector::Vec2f @weak; +alias Vec2f = std::math::vector::Vec2f @weak; fn Vec2f foo(Vec2f a) { return a * 2; } module gog; import std::math; -def Vec2f = std::math::vector::Vec2f; +alias Vec2f = std::math::vector::Vec2f; module deef; import gog; -def Vec2f = gog::Vec2f @weak; +alias Vec2f = gog::Vec2f @weak; fn Vec2f foo(Vec2f a) { return a * 2; } module test; diff --git a/test/test_suite/define/weak_aliases.c3 b/test/test_suite/define/weak_aliases.c3 index 77171d0a0..53f007bea 100644 --- a/test/test_suite/define/weak_aliases.c3 +++ b/test/test_suite/define/weak_aliases.c3 @@ -1,19 +1,19 @@ module std::math::vector; -def Vec2f = float[<2>]; +alias Vec2f = float[<2>]; module abc; import std::math; -def Vec2f = std::math::vector::Vec2f @weak; +alias Vec2f = std::math::vector::Vec2f @weak; fn Vec2f foo(Vec2f a) { return a * 2; } module gog; import std::math; -def Vec2f = std::math::vector::Vec2f @weak; +alias Vec2f = std::math::vector::Vec2f @weak; module deef; import gog; -def Vec2f = gog::Vec2f @weak; +alias Vec2f = gog::Vec2f @weak; fn Vec2f foo(Vec2f a) { return a * 2; } module test; diff --git a/test/test_suite/distinct/distinct_function.c3t b/test/test_suite/distinct/distinct_function.c3t index f5669fc27..0eb55209a 100644 --- a/test/test_suite/distinct/distinct_function.c3t +++ b/test/test_suite/distinct/distinct_function.c3t @@ -1,6 +1,6 @@ module test; -def FnA = fn void(int*); +alias FnA = fn void(int*); distinct FnB = FnA; distinct FnC = inline FnA; diff --git a/test/test_suite/distinct/distinct_function_call.c3 b/test/test_suite/distinct/distinct_function_call.c3 index 23e5eabc3..06cce91fa 100644 --- a/test/test_suite/distinct/distinct_function_call.c3 +++ b/test/test_suite/distinct/distinct_function_call.c3 @@ -1,4 +1,4 @@ -def Abc = fn void(); +alias Abc = fn void(); distinct Foo = inline Abc; struct Bar { diff --git a/test/test_suite/expressions/addr_of_fails.c3 b/test/test_suite/expressions/addr_of_fails.c3 index b2c24e647..7284fe3e2 100644 --- a/test/test_suite/expressions/addr_of_fails.c3 +++ b/test/test_suite/expressions/addr_of_fails.c3 @@ -48,7 +48,7 @@ struct Foo int y; } -def heh = he; +alias heh = he; fn void test6() { @@ -60,7 +60,7 @@ fn void test6() int[]* e = &arr[1..2]; // #error: To take the address of a temporary value, use '&&' instead of '&' } -def Baz = Foo; +alias Baz = Foo; distinct Bar = int; fault FOO; union Un { int x; } diff --git a/test/test_suite/expressions/assignability.c3 b/test/test_suite/expressions/assignability.c3 index 4f8825393..e9f73244a 100644 --- a/test/test_suite/expressions/assignability.c3 +++ b/test/test_suite/expressions/assignability.c3 @@ -1,4 +1,4 @@ -def Number = int; +alias Number = int; fn void test1() { diff --git a/test/test_suite/expressions/bool_conversions.c3t b/test/test_suite/expressions/bool_conversions.c3t index 30b6fc3ce..17265debb 100644 --- a/test/test_suite/expressions/bool_conversions.c3t +++ b/test/test_suite/expressions/bool_conversions.c3t @@ -4,7 +4,7 @@ fn bool f0_0(void* a0) @private { return (bool)a0; } fn int f0() { return (int)f0_0((void*)0x2); } -def Test = fn void(); +alias Test = fn void(); fn bool f1() { Test x @noinit; return (bool)(x = (Test)0); } diff --git a/test/test_suite/expressions/casts/cast_enum_to_various.c3 b/test/test_suite/expressions/casts/cast_enum_to_various.c3 index 0a75c1eb2..286a36df6 100644 --- a/test/test_suite/expressions/casts/cast_enum_to_various.c3 +++ b/test/test_suite/expressions/casts/cast_enum_to_various.c3 @@ -13,7 +13,7 @@ enum EnumB : char C, D } -def Func = fn void(Enum); +alias Func = fn void(Enum); fn void test1(Enum e) { diff --git a/test/test_suite/expressions/casts/cast_func_to_various.c3 b/test/test_suite/expressions/casts/cast_func_to_various.c3 index 3c3989eb6..63709e1ae 100644 --- a/test/test_suite/expressions/casts/cast_func_to_various.c3 +++ b/test/test_suite/expressions/casts/cast_func_to_various.c3 @@ -8,9 +8,9 @@ enum Enum : uptr A, B } -def Func = fn void(int); -def FuncOther = fn bool(char*); -def FuncSame = fn void(int); +alias Func = fn void(int); +alias FuncOther = fn bool(char*); +alias FuncSame = fn void(int); fn void test1(Func arg) diff --git a/test/test_suite/expressions/casts/cast_unknown.c3 b/test/test_suite/expressions/casts/cast_unknown.c3 index 17ca4995b..86f642fc0 100644 --- a/test/test_suite/expressions/casts/cast_unknown.c3 +++ b/test/test_suite/expressions/casts/cast_unknown.c3 @@ -1,4 +1,4 @@ -def Number = int; +alias Number = int; fn void test1() { diff --git a/test/test_suite/expressions/casts/explicit_cast.c3 b/test/test_suite/expressions/casts/explicit_cast.c3 index 9839e33e6..f77ba8cec 100644 --- a/test/test_suite/expressions/casts/explicit_cast.c3 +++ b/test/test_suite/expressions/casts/explicit_cast.c3 @@ -1,5 +1,5 @@ -def Number8 = char; -def Number32 = int; +alias Number8 = char; +alias Number32 = int; distinct DNumber32 = int; fn void test1() { diff --git a/test/test_suite/expressions/incdec_overload.c3t b/test/test_suite/expressions/incdec_overload.c3t index eee10250b..88f879031 100644 --- a/test/test_suite/expressions/incdec_overload.c3t +++ b/test/test_suite/expressions/incdec_overload.c3t @@ -2,7 +2,7 @@ module test; import std; -def Abc = HashMap{int, int}; +alias Abc = HashMap{int, int}; Abc m; fn void main() { diff --git a/test/test_suite/expressions/take_address.c3t b/test/test_suite/expressions/take_address.c3t index 376fd0e75..710736dbc 100644 --- a/test/test_suite/expressions/take_address.c3t +++ b/test/test_suite/expressions/take_address.c3t @@ -3,7 +3,7 @@ module testing; import blurb; import foo; -def hello_int = foo::hello{int}; +alias hello_int = foo::hello{int}; fn void main() { @@ -16,8 +16,8 @@ fn void hello() {} module blurb; -def Foo = fn void(); -def Bar = fn void(); +alias Foo = fn void(); +alias Bar = fn void(); fn void test(Foo x) {} diff --git a/test/test_suite/from_docs/examples_functionpointer.c3t b/test/test_suite/from_docs/examples_functionpointer.c3t index 83eabb787..b54bb5650 100644 --- a/test/test_suite/from_docs/examples_functionpointer.c3t +++ b/test/test_suite/from_docs/examples_functionpointer.c3t @@ -1,7 +1,7 @@ // #target: macos-x64 module demo; -def Callback = fn int(char* text, int value); +alias Callback = fn int(char* text, int value); fn int my_callback(char* text, int value) { diff --git a/test/test_suite/from_docs/examples_struct.c3 b/test/test_suite/from_docs/examples_struct.c3 index 2e0dee843..57f406a73 100644 --- a/test/test_suite/from_docs/examples_struct.c3 +++ b/test/test_suite/from_docs/examples_struct.c3 @@ -1,4 +1,4 @@ -def Callback = fn int(char c); +alias Callback = fn int(char c); struct Person { int i; } struct Company { int j; } enum Status : int diff --git a/test/test_suite/functions/accidental_method_1448.c3 b/test/test_suite/functions/accidental_method_1448.c3 index e5166dc13..400ea6fa7 100644 --- a/test/test_suite/functions/accidental_method_1448.c3 +++ b/test/test_suite/functions/accidental_method_1448.c3 @@ -1,8 +1,8 @@ // #deprecation: no import std; -def MaybeInt = maybe::Maybe{int}; +alias MaybeInt = maybe::Maybe{int}; -def Func = fn void (args...); +alias Func = fn void (args...); fn int main() { Func t; diff --git a/test/test_suite/functions/call_conv_fntype.c3 b/test/test_suite/functions/call_conv_fntype.c3 index 58f40a3b9..497ecf899 100644 --- a/test/test_suite/functions/call_conv_fntype.c3 +++ b/test/test_suite/functions/call_conv_fntype.c3 @@ -1,4 +1,4 @@ -def Foo = fn int(String x, int z) @callconv("veccall"); +alias Foo = fn int(String x, int z) @callconv("veccall"); fn int v(String x, int z) @callconv("veccall") { diff --git a/test/test_suite/functions/distinct_fn_ptr_and_lambda.c3t b/test/test_suite/functions/distinct_fn_ptr_and_lambda.c3t index c3e58a7da..18fca77af 100644 --- a/test/test_suite/functions/distinct_fn_ptr_and_lambda.c3t +++ b/test/test_suite/functions/distinct_fn_ptr_and_lambda.c3t @@ -1,4 +1,4 @@ -def Foo = fn void(int x); +alias Foo = fn void(int x); distinct Bar = Foo; diff --git a/test/test_suite/functions/func_ptr_conversion_alias.c3t b/test/test_suite/functions/func_ptr_conversion_alias.c3t index ee37d2dd7..7c85f5fec 100644 --- a/test/test_suite/functions/func_ptr_conversion_alias.c3t +++ b/test/test_suite/functions/func_ptr_conversion_alias.c3t @@ -1,10 +1,10 @@ // #target: macos-x64 module test; -def Callback = fn void(); -def Callback2 = fn void(); +alias Callback = fn void(); +alias Callback2 = fn void(); -def GetCallback = fn Callback2**[][123]*(); +alias GetCallback = fn Callback2**[][123]*(); fn Callback**[][123]* tester() { @@ -14,7 +14,7 @@ fn Callback**[][123]* tester() GetCallback x = &tester; -def GetCallbackOpt = fn Callback2?(); +alias GetCallbackOpt = fn Callback2?(); fn Callback2? tester2() => null; diff --git a/test/test_suite/functions/func_ptr_conversions_and_names.c3t b/test/test_suite/functions/func_ptr_conversions_and_names.c3t index a62af5abc..0db1581e6 100644 --- a/test/test_suite/functions/func_ptr_conversions_and_names.c3t +++ b/test/test_suite/functions/func_ptr_conversions_and_names.c3t @@ -1,9 +1,9 @@ // #target: macos-x64 module test; import std::io; -def Func = fn int(int y); -def FuncOther = fn bool(char*); -def FuncSame = fn int(int z = 444); +alias Func = fn int(int y); +alias FuncOther = fn bool(char*); +alias FuncSame = fn int(int z = 444); fn int test(int a) { return a; } fn int test2(int b = 3) { return b; } diff --git a/test/test_suite/functions/func_ptr_null.check.c3t b/test/test_suite/functions/func_ptr_null.check.c3t index 5b30e0e23..453f4b095 100644 --- a/test/test_suite/functions/func_ptr_null.check.c3t +++ b/test/test_suite/functions/func_ptr_null.check.c3t @@ -1,7 +1,7 @@ // #target: macos-aarch64 // #safe: yes module test; -def TestFn = fn void(); +alias TestFn = fn void(); fn int main() { diff --git a/test/test_suite/functions/function_alias_llvm_check.c3t b/test/test_suite/functions/function_alias_llvm_check.c3t index 7d8e1347a..c4d434d80 100644 --- a/test/test_suite/functions/function_alias_llvm_check.c3t +++ b/test/test_suite/functions/function_alias_llvm_check.c3t @@ -3,8 +3,8 @@ module repro; import std::collections::list; -def FnA = fn void(Foo*); -def FnB = fn void(Foo*); +alias FnA = fn void(Foo*); +alias FnB = fn void(Foo*); struct Foo { diff --git a/test/test_suite/functions/recursive_fn.c3 b/test/test_suite/functions/recursive_fn.c3 index a4f1b95b5..3a08ce641 100644 --- a/test/test_suite/functions/recursive_fn.c3 +++ b/test/test_suite/functions/recursive_fn.c3 @@ -1,2 +1,2 @@ -def Foo = fn void(Foo* x); // #error: Recursive definition +alias Foo = fn void(Foo* x); // #error: Recursive definition diff --git a/test/test_suite/functions/recursive_through_generic.c3 b/test/test_suite/functions/recursive_through_generic.c3 index e1d975941..cce3d6594 100644 --- a/test/test_suite/functions/recursive_through_generic.c3 +++ b/test/test_suite/functions/recursive_through_generic.c3 @@ -5,8 +5,8 @@ fn void main() { } -def FooFunc = fn void? (Bar); // #error: Recursive definition -def Foo = HashMap{String, FooFunc}; +alias FooFunc = fn void? (Bar); // #error: Recursive definition +alias Foo = HashMap{String, FooFunc}; struct Bar { diff --git a/test/test_suite/functions/test_regression.c3t b/test/test_suite/functions/test_regression.c3t index 0ac4c7bcd..1fc24c33a 100644 --- a/test/test_suite/functions/test_regression.c3t +++ b/test/test_suite/functions/test_regression.c3t @@ -65,10 +65,10 @@ fn int Foo2.mutate(Foo2 *foo) return ++foo.x; } -def oopsInt = test2::argh{int}; -def oopsDouble = test2::argh{int}; -def Argh = fn int(double, Bobo); -def Argh2 = fn int(double, Bobo); +alias oopsInt = test2::argh{int}; +alias oopsDouble = test2::argh{int}; +alias Argh = fn int(double, Bobo); +alias Argh2 = fn int(double, Bobo); @@ -80,7 +80,7 @@ fn int sum_us(int... x) return sum; } -def Frob = long; +alias Frob = long; fn int sumd(int[] x) { @@ -95,15 +95,15 @@ struct Foo int b; } -def getValueInt = test2::getValue{int}; -def getValueDouble = test2::getValue{double}; -def IntBlob = test2::Blob{int}; -def DoubleBlob = Blob{double}; -def getMultInt = test2::getMult{int}; -def getMultDouble = test2::getMult{double}; +alias getValueInt = test2::getValue{int}; +alias getValueDouble = test2::getValue{double}; +alias IntBlob = test2::Blob{int}; +alias DoubleBlob = Blob{double}; +alias getMultInt = test2::getMult{int}; +alias getMultDouble = test2::getMult{double}; -def IntArray = List{int}; -def IntList = LinkedList{int}; +alias IntArray = List{int}; +alias IntList = LinkedList{int}; enum MyEnum : int { @@ -173,7 +173,7 @@ module hello_world; import foo; extern fn int printf(char *, ...); -def doubleMult = foo::check{double}; +alias doubleMult = foo::check{double}; fn void hello() { @@ -214,9 +214,9 @@ macro Hello wut() return Hello.FOO; } -def Bye = Hello; -def wat = wut; -def byebye = hello; +alias Bye = Hello; +alias wat = wut; +alias byebye = hello; fn int hello() { diff --git a/test/test_suite/functions/test_regression_mingw.c3t b/test/test_suite/functions/test_regression_mingw.c3t index 5dad9057b..1527c3a47 100644 --- a/test/test_suite/functions/test_regression_mingw.c3t +++ b/test/test_suite/functions/test_regression_mingw.c3t @@ -67,10 +67,10 @@ fn int Foo2.mutate(Foo2 *foo) -def oopsInt = test2::argh{int}; -def oopsDouble = test2::argh{int}; -def Argh = fn int(double, Bobo); -def Argh2 = fn int(double, Bobo); +alias oopsInt = test2::argh{int}; +alias oopsDouble = test2::argh{int}; +alias Argh = fn int(double, Bobo); +alias Argh2 = fn int(double, Bobo); @@ -82,7 +82,7 @@ fn int sum_us(int... x) return sum; } -def Frob = long; +alias Frob = long; fn int sumd(int[] x) { @@ -97,15 +97,15 @@ struct Foo int b; } -def getValueInt = test2::getValue{int}; -def getValueDouble = test2::getValue{double}; -def IntBlob = test2::Blob{int}; -def DoubleBlob = Blob{double}; -def getMultInt = test2::getMult{int}; -def getMultDouble = test2::getMult{double}; +alias getValueInt = test2::getValue{int}; +alias getValueDouble = test2::getValue{double}; +alias IntBlob = test2::Blob{int}; +alias DoubleBlob = Blob{double}; +alias getMultInt = test2::getMult{int}; +alias getMultDouble = test2::getMult{double}; -def IntArray = List{int}; -def IntList = LinkedList{int}; +alias IntArray = List{int}; +alias IntList = LinkedList{int}; enum MyEnum : int { @@ -175,7 +175,7 @@ module hello_world; import foo; extern fn int printf(char *, ...); -def doubleMult = foo::check{double}; +alias doubleMult = foo::check{double}; fn void hello() { @@ -216,9 +216,9 @@ macro Hello wut() return Hello.FOO; } -def Bye = Hello; -def wat = wut; -def byebye = hello; +alias Bye = Hello; +alias wat = wut; +alias byebye = hello; fn int hello() { diff --git a/test/test_suite/functions/too_many_params.c3 b/test/test_suite/functions/too_many_params.c3 index 5b7a190ca..03eb9c27e 100644 --- a/test/test_suite/functions/too_many_params.c3 +++ b/test/test_suite/functions/too_many_params.c3 @@ -1,5 +1,5 @@ import std::io; -def Tester = fn int(int x, int y, int z); +alias Tester = fn int(int x, int y, int z); fn int test1( int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, // 20 diff --git a/test/test_suite/generic/enum_set_test.c3t b/test/test_suite/generic/enum_set_test.c3t index 4c5b5b99a..afbe2ba56 100644 --- a/test/test_suite/generic/enum_set_test.c3t +++ b/test/test_suite/generic/enum_set_test.c3t @@ -3,7 +3,7 @@ module test; import std::io; import std::collections::enumset; -def AbcEnumSet = EnumSet{Abc}; +alias AbcEnumSet = EnumSet{Abc}; enum Abc { diff --git a/test/test_suite/generic/generic_copy.c3t b/test/test_suite/generic/generic_copy.c3t index bcca01066..4d6523602 100644 --- a/test/test_suite/generic/generic_copy.c3t +++ b/test/test_suite/generic/generic_copy.c3t @@ -9,4 +9,4 @@ fn void abc() module tester; import foo; -def abc_my = foo::abc{int}; \ No newline at end of file +alias abc_my = foo::abc{int}; \ No newline at end of file diff --git a/test/test_suite/generic/generic_cyclic.c3 b/test/test_suite/generic/generic_cyclic.c3 index fe06dd44c..033300adc 100644 --- a/test/test_suite/generic/generic_cyclic.c3 +++ b/test/test_suite/generic/generic_cyclic.c3 @@ -2,7 +2,7 @@ module test; import bar; -def BazTest = Baz{Test}; // #error: Recursive definition of 'BazTest' +alias BazTest = Baz{Test}; // #error: Recursive definition of 'BazTest' struct Test { diff --git a/test/test_suite/generic/generic_idents.c3t b/test/test_suite/generic/generic_idents.c3t index 2a5c82346..b217a9104 100644 --- a/test/test_suite/generic/generic_idents.c3t +++ b/test/test_suite/generic/generic_idents.c3t @@ -14,8 +14,8 @@ fn Type addMult(Type x, Type a, Type b) module test; import gen; -def intMult = gen::mult{int}; -def doubleAddMult = gen::addMult{double}; +alias intMult = gen::mult{int}; +alias doubleAddMult = gen::addMult{double}; fn int getIt(int i) { diff --git a/test/test_suite/generic/generic_lambda_complex.c3t b/test/test_suite/generic/generic_lambda_complex.c3t index 8dd6726e8..acc92fac0 100644 --- a/test/test_suite/generic/generic_lambda_complex.c3t +++ b/test/test_suite/generic/generic_lambda_complex.c3t @@ -5,7 +5,7 @@ module abc{Type}; import std::io; import std::collections::list; -def TextTagList = List{TextTag}; +alias TextTagList = List{TextTag}; fault UNTERMINATED_TAG, EMPTY_TAG, MISSING_TAG, UNSUPPORTED_TAG; @@ -127,7 +127,7 @@ module text_test; import abc; import std::io; -def Tmpl = TextTemplate{Data}; +alias Tmpl = TextTemplate{Data}; struct Data { @@ -138,8 +138,8 @@ struct Data -def FooTmpl = TextTemplate{Foo}; -def BarTmpl = TextTemplate{Bar}; +alias FooTmpl = TextTemplate{Foo}; +alias BarTmpl = TextTemplate{Bar}; struct Foo { diff --git a/test/test_suite/generic/generic_local.c3 b/test/test_suite/generic/generic_local.c3 index 58b2fc0dc..4595c15e1 100644 --- a/test/test_suite/generic/generic_local.c3 +++ b/test/test_suite/generic/generic_local.c3 @@ -2,7 +2,7 @@ module testing; import std::io; import foo; -def Foo = foo::Foo; +alias Foo = foo::Foo; fn void main() { diff --git a/test/test_suite/generic/generic_num.c3t b/test/test_suite/generic/generic_num.c3t index f936e1813..30fd00a2b 100644 --- a/test/test_suite/generic/generic_num.c3t +++ b/test/test_suite/generic/generic_num.c3t @@ -8,7 +8,7 @@ fn Type x(Type t) module test; import hello; -def xint = hello::x{int, -123}; +alias xint = hello::x{int, -123}; import std::io; diff --git a/test/test_suite/generic/generic_parsing.c3 b/test/test_suite/generic/generic_parsing.c3 index 3cbb6d92f..731693552 100644 --- a/test/test_suite/generic/generic_parsing.c3 +++ b/test/test_suite/generic/generic_parsing.c3 @@ -1,6 +1,6 @@ module test; import std; -def ListStr = List{String}; +alias ListStr = List{String}; fn void test() { List a = List<...>.new_init(); // #error: An expression was expected diff --git a/test/test_suite/generic/generic_recursion.c3t b/test/test_suite/generic/generic_recursion.c3t index c4c37afa9..43b538cf3 100644 --- a/test/test_suite/generic/generic_recursion.c3t +++ b/test/test_suite/generic/generic_recursion.c3t @@ -3,7 +3,7 @@ module test; import std::io; import std::collections::list; -def TreeNodeList = List{TreeNode}; +alias TreeNodeList = List{TreeNode}; struct TreeNode { diff --git a/test/test_suite/generic/generic_resolution_1402.c3t b/test/test_suite/generic/generic_resolution_1402.c3t index b9f86213d..4f1fa8bc3 100644 --- a/test/test_suite/generic/generic_resolution_1402.c3t +++ b/test/test_suite/generic/generic_resolution_1402.c3t @@ -23,7 +23,7 @@ macro void print_it(...) module playground; import playground::bug; -def MyFoo = Foo{int}; +alias MyFoo = Foo{int}; fn void main(String[] args) { diff --git a/test/test_suite/generic/generic_void.c3t b/test/test_suite/generic/generic_void.c3t index a8779351c..d6ea42de8 100644 --- a/test/test_suite/generic/generic_void.c3t +++ b/test/test_suite/generic/generic_void.c3t @@ -1,14 +1,14 @@ // #target: macos-x64 module test{Type}; -def Callback = fn Type(); +alias Callback = fn Type(); module mymain; import std::io; import test; -def VoidCb = test::Callback{void}; +alias VoidCb = test::Callback{void}; fn int main() { diff --git a/test/test_suite/generic/implicit_import_of_generic.c3 b/test/test_suite/generic/implicit_import_of_generic.c3 index 23e07d3f2..18363ec01 100644 --- a/test/test_suite/generic/implicit_import_of_generic.c3 +++ b/test/test_suite/generic/implicit_import_of_generic.c3 @@ -2,8 +2,8 @@ module test; import std::io; import abc; -def Def2 = Def; -def Test = abc::cde::Abc{int}; +alias Def2 = Def; +alias Test = abc::cde::Abc{int}; module abc; diff --git a/test/test_suite/generic/incorrect_argument_type.c3 b/test/test_suite/generic/incorrect_argument_type.c3 index 873fb2a26..355b3950d 100644 --- a/test/test_suite/generic/incorrect_argument_type.c3 +++ b/test/test_suite/generic/incorrect_argument_type.c3 @@ -7,5 +7,5 @@ struct Foo module bar; import foo; -def Bar = Foo{int, int}; // #error: Expected a value, not a type -def Baz = Foo{5, 4}; // #error: Expected a type, not a value +alias Bar = Foo{int, int}; // #error: Expected a value, not a type +alias Baz = Foo{5, 4}; // #error: Expected a type, not a value diff --git a/test/test_suite/generic/nested_typedef.c3t b/test/test_suite/generic/nested_typedef.c3t index 14b60b8ae..718dd864a 100644 --- a/test/test_suite/generic/nested_typedef.c3t +++ b/test/test_suite/generic/nested_typedef.c3t @@ -1,7 +1,7 @@ // #target: macos-x64 module broken{Type}; distinct Bar = Type; -def Bar2 = Type; +alias Bar2 = Type; struct Baz { int a; diff --git a/test/test_suite/lambda/ct_lambda.c3t b/test/test_suite/lambda/ct_lambda.c3t index d8132b6ba..2d98e3cc6 100644 --- a/test/test_suite/lambda/ct_lambda.c3t +++ b/test/test_suite/lambda/ct_lambda.c3t @@ -2,7 +2,7 @@ module test; import std::io; -def FooFn = fn void(Foo* f, int x); +alias FooFn = fn void(Foo* f, int x); struct Foo { diff --git a/test/test_suite/lambda/ct_lambda2.c3t b/test/test_suite/lambda/ct_lambda2.c3t index bd909f9a1..65cab647f 100644 --- a/test/test_suite/lambda/ct_lambda2.c3t +++ b/test/test_suite/lambda/ct_lambda2.c3t @@ -2,7 +2,7 @@ module test; import std::io; -def Call = fn void(); +alias Call = fn void(); fn int main() { diff --git a/test/test_suite/lambda/lambda_checks.c3 b/test/test_suite/lambda/lambda_checks.c3 index a441e944c..09bb67cfe 100644 --- a/test/test_suite/lambda/lambda_checks.c3 +++ b/test/test_suite/lambda/lambda_checks.c3 @@ -1,5 +1,5 @@ module test; -def Func = fn void (bool); +alias Func = fn void (bool); fn bool foo (String) => true; fn void bar(Func func) => func(false); diff --git a/test/test_suite/lambda/lambda_in_macro.c3t b/test/test_suite/lambda/lambda_in_macro.c3t index 7b88e2d01..712fbfb59 100644 --- a/test/test_suite/lambda/lambda_in_macro.c3t +++ b/test/test_suite/lambda/lambda_in_macro.c3t @@ -2,8 +2,8 @@ module test; import std::io; -def Callback1 = fn double(double x); -def Callback2 = fn int(int y); +alias Callback1 = fn double(double x); +alias Callback2 = fn int(int y); macro test2(y) { diff --git a/test/test_suite/lambda/lambda_ref.c3t b/test/test_suite/lambda/lambda_ref.c3t index 8c3bd5459..36223df8e 100644 --- a/test/test_suite/lambda/lambda_ref.c3t +++ b/test/test_suite/lambda/lambda_ref.c3t @@ -1,7 +1,7 @@ // #target: macos-x64 module test; -def FnA = fn void(int*); +alias FnA = fn void(int*); fn void func(int*) { } fn void main() diff --git a/test/test_suite/lambda/nested_lambda_def.c3t b/test/test_suite/lambda/nested_lambda_def.c3t index 7cf23fada..1fd3897ce 100644 --- a/test/test_suite/lambda/nested_lambda_def.c3t +++ b/test/test_suite/lambda/nested_lambda_def.c3t @@ -32,7 +32,7 @@ macro Callback get_callback2() module bar; import foo; -def Callback = fn int(); +alias Callback = fn int(); macro Callback get_callback() { diff --git a/test/test_suite/lambda/simple_lambda.c3t b/test/test_suite/lambda/simple_lambda.c3t index 226bbbd2b..f181775ed 100644 --- a/test/test_suite/lambda/simple_lambda.c3t +++ b/test/test_suite/lambda/simple_lambda.c3t @@ -3,7 +3,7 @@ import std::io; import std::math::vector; import std::math; -def Callback = fn int(); +alias Callback = fn int(); fn int xy(Callback a) => a(); diff --git a/test/test_suite/macros/type_params.c3t b/test/test_suite/macros/type_params.c3t index df1aaad78..a2a1ce5fc 100644 --- a/test/test_suite/macros/type_params.c3t +++ b/test/test_suite/macros/type_params.c3t @@ -5,7 +5,7 @@ macro foo($Foo) return a; } -def Bar = short; +alias Bar = short; fn void test() { int x = foo(int); diff --git a/test/test_suite/macros/vasplat_function_call.c3 b/test/test_suite/macros/vasplat_function_call.c3 index 3af15b33e..3c4c4a243 100644 --- a/test/test_suite/macros/vasplat_function_call.c3 +++ b/test/test_suite/macros/vasplat_function_call.c3 @@ -1,6 +1,6 @@ import std; -def IList = List{int}; +alias IList = List{int}; fn IList IList.newAbc(&self) { IList l; diff --git a/test/test_suite/methods/access.c3 b/test/test_suite/methods/access.c3 index 42cf06d83..e896d20ff 100644 --- a/test/test_suite/methods/access.c3 +++ b/test/test_suite/methods/access.c3 @@ -10,7 +10,7 @@ struct An3 An2 y; } -def AnCall = fn void(); +alias AnCall = fn void(); struct An2 { diff --git a/test/test_suite/methods/access_private_method.c3 b/test/test_suite/methods/access_private_method.c3 index 5e81cb5db..cc5c6f75b 100644 --- a/test/test_suite/methods/access_private_method.c3 +++ b/test/test_suite/methods/access_private_method.c3 @@ -1,4 +1,4 @@ -def NodeNotifyHandler = fn void(TreeView* this, TreeNode* node, String prop, void* data); +alias NodeNotifyHandler = fn void(TreeView* this, TreeNode* node, String prop, void* data); fn void TreeView.nodeNotifyHandler(TreeView* this, TreeNode* node, String prop, void* data) @private {} struct TreeNode { int abc; NodeNotifyHandler notifyHandler; } diff --git a/test/test_suite/methods/extension_method_check.c3 b/test/test_suite/methods/extension_method_check.c3 index a8a60aaaa..40a163de8 100644 --- a/test/test_suite/methods/extension_method_check.c3 +++ b/test/test_suite/methods/extension_method_check.c3 @@ -1,6 +1,6 @@ module test; -def Bob = Test{any}; +alias Bob = Test{any}; fn void Bob.crash(&self) {} fn int main() diff --git a/test/test_suite/methods/extension_method_generic.c3 b/test/test_suite/methods/extension_method_generic.c3 index 388ba1a9b..b31c66edd 100644 --- a/test/test_suite/methods/extension_method_generic.c3 +++ b/test/test_suite/methods/extension_method_generic.c3 @@ -1,7 +1,7 @@ module compiler_c3; import std::collections::list; -def IntArray = List{int}; +alias IntArray = List{int}; extern fn void printf(char*, ...); diff --git a/test/test_suite/methods/method_from_var.c3 b/test/test_suite/methods/method_from_var.c3 index ce5bba181..4874c5d48 100644 --- a/test/test_suite/methods/method_from_var.c3 +++ b/test/test_suite/methods/method_from_var.c3 @@ -1,4 +1,4 @@ -def NodeNotifyHandler = fn void(TreeView* this, TreeNode* node, String prop, void* data); +alias NodeNotifyHandler = fn void(TreeView* this, TreeNode* node, String prop, void* data); fn void TreeView.nodeNotifyHandler(TreeView* this, TreeNode* node, String prop, void* data) @private {} struct TreeNode { int abc; NodeNotifyHandler notifyHandler; } diff --git a/test/test_suite/methods/method_ref_for_extension_method.c3 b/test/test_suite/methods/method_ref_for_extension_method.c3 index 22d27abdb..c34762747 100644 --- a/test/test_suite/methods/method_ref_for_extension_method.c3 +++ b/test/test_suite/methods/method_ref_for_extension_method.c3 @@ -9,7 +9,7 @@ fn bool Foo[].is_empty(Foo[] array) { return array.len == 0; } -def foo_arr_is_empty = Foo[].is_empty; +alias foo_arr_is_empty = Foo[].is_empty; fn void main() { Foo[] foos = { (Foo) { .i = 0 } }; diff --git a/test/test_suite/overloading/set_overload.c3t b/test/test_suite/overloading/set_overload.c3t index b74a9d975..6ec9e2237 100644 --- a/test/test_suite/overloading/set_overload.c3t +++ b/test/test_suite/overloading/set_overload.c3t @@ -3,7 +3,7 @@ module test; import std::collections::map; -def IntMap = HashMap{char[], int}; +alias IntMap = HashMap{char[], int}; fn void main() { diff --git a/test/test_suite/statements/default_args.c3 b/test/test_suite/statements/default_args.c3 index b90fd6caa..43dd80489 100644 --- a/test/test_suite/statements/default_args.c3 +++ b/test/test_suite/statements/default_args.c3 @@ -1,4 +1,4 @@ -def Foo = fn void(int a = 10); +alias Foo = fn void(int a = 10); fn int abc() { return 1; } -def Foo2 = fn void(int a = abc()); +alias Foo2 = fn void(int a = abc()); diff --git a/test/test_suite/stdlib/map_linux.c3t b/test/test_suite/stdlib/map_linux.c3t index 5c5c3b3d4..f9d7c0b89 100644 --- a/test/test_suite/stdlib/map_linux.c3t +++ b/test/test_suite/stdlib/map_linux.c3t @@ -6,8 +6,8 @@ import std::collections::map; struct Foo (Printable) { int x; void* bar; } -def IntFooMap = HashMap { int, Foo }; -def IntDoubleMap = HashMap { int, double }; +alias IntFooMap = HashMap { int, Foo }; +alias IntDoubleMap = HashMap { int, double }; fn String Foo.to_new_string(Foo* foo, Allocator allocator = allocator::heap()) @dynamic { diff --git a/test/test_suite/stdlib/map_macos.c3t b/test/test_suite/stdlib/map_macos.c3t index 667393588..dd37a39f0 100644 --- a/test/test_suite/stdlib/map_macos.c3t +++ b/test/test_suite/stdlib/map_macos.c3t @@ -6,8 +6,8 @@ import std::collections::map; struct Foo (Printable) { int x; void* bar; } -def IntFooMap = HashMap { int, Foo }; -def IntDoubleMap = HashMap { int, double }; +alias IntFooMap = HashMap { int, Foo }; +alias IntDoubleMap = HashMap { int, double }; fn String Foo.to_new_string(Foo* foo, Allocator allocator = allocator::heap()) @dynamic { diff --git a/test/test_suite/stdlib/priorityqueue.c3t b/test/test_suite/stdlib/priorityqueue.c3t index 676dc2454..ba18f1f3d 100644 --- a/test/test_suite/stdlib/priorityqueue.c3t +++ b/test/test_suite/stdlib/priorityqueue.c3t @@ -4,7 +4,7 @@ import std::io; import std::math; import std::collections::priorityqueue; -def FooPriorityQueue = PriorityQueueMax{Foo}; +alias FooPriorityQueue = PriorityQueueMax{Foo}; fn void main() { diff --git a/test/test_suite/struct/const_zero_init_1360.c3t b/test/test_suite/struct/const_zero_init_1360.c3t index c296f3b9a..a127ee84a 100644 --- a/test/test_suite/struct/const_zero_init_1360.c3t +++ b/test/test_suite/struct/const_zero_init_1360.c3t @@ -2,7 +2,7 @@ module test; import std::collections::map; -def Foo = HashMap{String, HashMap{String, String}}; +alias Foo = HashMap{String, HashMap{String, String}}; macro test() { HashMap{String, String} map0; diff --git a/test/test_suite/struct/member_expr.c3 b/test/test_suite/struct/member_expr.c3 index 2e5d18c70..fc0cbbb8d 100644 --- a/test/test_suite/struct/member_expr.c3 +++ b/test/test_suite/struct/member_expr.c3 @@ -1,7 +1,7 @@ -def Func = fn int(int); +alias Func = fn int(int); -def Func2 = fn int(Foo*, int); +alias Func2 = fn int(Foo*, int); struct Foo { diff --git a/test/test_suite/struct/struct_bad_member.c3 b/test/test_suite/struct/struct_bad_member.c3 index 49486d7ed..762832436 100644 --- a/test/test_suite/struct/struct_bad_member.c3 +++ b/test/test_suite/struct/struct_bad_member.c3 @@ -2,7 +2,7 @@ struct Foo { void bar; // #error: Members cannot be of } -def Void = void; +alias Void = void; struct Foo2 { Void bar; // #error: Members cannot be of } diff --git a/test/test_suite/struct/zero_member.c3 b/test/test_suite/struct/zero_member.c3 index fab779baa..33ace28dc 100644 --- a/test/test_suite/struct/zero_member.c3 +++ b/test/test_suite/struct/zero_member.c3 @@ -1,4 +1,4 @@ -def Foo = int[0]; // #error: An array may not have zero +alias Foo = int[0]; // #error: An array may not have zero struct Bar { diff --git a/test/test_suite/switch/switch_in_defer_macro.c3t b/test/test_suite/switch/switch_in_defer_macro.c3t index 8ac5232b0..b8605f315 100644 --- a/test/test_suite/switch/switch_in_defer_macro.c3t +++ b/test/test_suite/switch/switch_in_defer_macro.c3t @@ -21,9 +21,9 @@ enum Kind : char fault UNTERMINATED_STRING, UNTERMINATED_RUNE, UNTERMINATED_COMMENT; -def TokenTrie = Trie{Token, ushort}; +alias TokenTrie = Trie{Token, ushort}; -def Ident = fn bool (usz index, char c); +alias Ident = fn bool (usz index, char c); struct Lexer { @@ -400,8 +400,8 @@ module lexer_test; import lexer; import std::io; -def Lexer = Lexer{Token, Comment}; -def Kind = Kind{Token, Comment}; +alias Lexer = Lexer{Token, Comment}; +alias Kind = Kind{Token, Comment}; enum Token : char (String token) { @@ -456,8 +456,8 @@ module trie{Value, Index}; import std::collections::list; import trie::bitmap; -def TrieNodeList = List{TrieNode}; -def TriePath = List{Index} @private; +alias TrieNodeList = List{TrieNode}; +alias TriePath = List{Index} @private; fault TRIE_FULL; @@ -634,7 +634,7 @@ fn bool Bitmap.is_empty(&self) module trie_test; import trie; -def Trie = Trie{String, char}; +alias Trie = Trie{String, char}; fn void test() { diff --git a/test/test_suite/symbols/shadow_struct.c3 b/test/test_suite/symbols/shadow_struct.c3 index a9cb4b10b..95129bf2b 100644 --- a/test/test_suite/symbols/shadow_struct.c3 +++ b/test/test_suite/symbols/shadow_struct.c3 @@ -4,7 +4,7 @@ struct Foo int y; } -def Foo = float; // #error: shadow a previous declaration +alias Foo = float; // #error: shadow a previous declaration enum Bar { @@ -12,4 +12,4 @@ enum Bar TEST2 } -def Bar = float; // #error: shadow a previous declaration \ No newline at end of file +alias Bar = float; // #error: shadow a previous declaration \ No newline at end of file diff --git a/test/test_suite/symbols/various.c3 b/test/test_suite/symbols/various.c3 index 1218be130..a426171fa 100644 --- a/test/test_suite/symbols/various.c3 +++ b/test/test_suite/symbols/various.c3 @@ -49,7 +49,7 @@ fn void test7() int v = array[1]; } -def Number = int; +alias Number = int; fn void test8() { diff --git a/test/test_suite/types/enum_inference.c3 b/test/test_suite/types/enum_inference.c3 index 880e1b90d..9c7f54325 100644 --- a/test/test_suite/types/enum_inference.c3 +++ b/test/test_suite/types/enum_inference.c3 @@ -13,7 +13,7 @@ enum Inf2 : char C, } -def BooInf = Inf; +alias BooInf = Inf; fn void enumInferenceTest() diff --git a/test/test_suite/types/enum_ok.c3 b/test/test_suite/types/enum_ok.c3 index c75c8c005..fafbba0e5 100644 --- a/test/test_suite/types/enum_ok.c3 +++ b/test/test_suite/types/enum_ok.c3 @@ -4,7 +4,7 @@ enum EnumTest : long VALUE2 } -def Frob = long; +alias Frob = long; enum EnumTestAlias : Frob { diff --git a/test/test_suite/types/non_rec_fn.c3 b/test/test_suite/types/non_rec_fn.c3 index 8e65c8a12..fe6529b47 100644 --- a/test/test_suite/types/non_rec_fn.c3 +++ b/test/test_suite/types/non_rec_fn.c3 @@ -1,6 +1,6 @@ -def BlahFn = fn int(Foo f); -def FooFn = fn int(Foo f, int j); +alias BlahFn = fn int(Foo f); +alias FooFn = fn int(Foo f, int j); struct Foo { BlahFn x; diff --git a/test/test_suite/types/recursive_fn.c3 b/test/test_suite/types/recursive_fn.c3 index 9e2bb1b17..cc78bba68 100644 --- a/test/test_suite/types/recursive_fn.c3 +++ b/test/test_suite/types/recursive_fn.c3 @@ -1 +1 @@ -def BlahFn = fn int(BlahFn f); // #error: Recursive definition of 'BlahFn' \ No newline at end of file +alias BlahFn = fn int(BlahFn f); // #error: Recursive definition of 'BlahFn' \ No newline at end of file diff --git a/test/test_suite/types/recursive_typedef.c3 b/test/test_suite/types/recursive_typedef.c3 index 07ee1ab76..570adaf96 100644 --- a/test/test_suite/types/recursive_typedef.c3 +++ b/test/test_suite/types/recursive_typedef.c3 @@ -1,9 +1,9 @@ -def Number2 = Number1; // #error: Recursive definition of 'Number2' -def Number1 = Number2; +alias Number2 = Number1; // #error: Recursive definition of 'Number2' +alias Number1 = Number2; -def Number = Number; // #error: Recursive definition of 'Number' +alias Number = Number; // #error: Recursive definition of 'Number' -def Loop2 = Loop; // #error: Recursive definition of 'Loop2' -def Loop3 = Loop2; -def Loop = Loop3; +alias Loop2 = Loop; // #error: Recursive definition of 'Loop2' +alias Loop3 = Loop2; +alias Loop = Loop3; diff --git a/test/test_suite/types/redefinition.c3 b/test/test_suite/types/redefinition.c3 index b17fe2247..d66b27c34 100644 --- a/test/test_suite/types/redefinition.c3 +++ b/test/test_suite/types/redefinition.c3 @@ -1,2 +1,2 @@ -def Number = int; -def Number = uint; // #error: 'Number' would shadow a previous declaration. \ No newline at end of file +alias Number = int; +alias Number = uint; // #error: 'Number' would shadow a previous declaration. \ No newline at end of file diff --git a/test/test_suite/types/typedefs.c3 b/test/test_suite/types/typedefs.c3 index 8e293f9bb..736c6cbc1 100644 --- a/test/test_suite/types/typedefs.c3 +++ b/test/test_suite/types/typedefs.c3 @@ -1,4 +1,4 @@ -def Arr = int[4]; +alias Arr = int[4]; Arr a = { 3, 4, 5, 6 }; diff --git a/test/unit/regression/any.c3 b/test/unit/regression/any.c3 index 60904e09f..6050070f9 100644 --- a/test/unit/regression/any.c3 +++ b/test/unit/regression/any.c3 @@ -9,7 +9,7 @@ fn void any_compare() assert(a == a); } -def AnyAlias = any; +alias AnyAlias = any; fn void test_aliasing() { diff --git a/test/unit/regression/lvalue_handling.c3 b/test/unit/regression/lvalue_handling.c3 index eb60cfade..accd3856b 100644 --- a/test/unit/regression/lvalue_handling.c3 +++ b/test/unit/regression/lvalue_handling.c3 @@ -4,7 +4,7 @@ struct Foo { int a; } -def IntList = List{Foo}; +alias IntList = List{Foo}; fn void subscript_overload() @test { IntList x; diff --git a/test/unit/stdlib/atomic_types.c3 b/test/unit/stdlib/atomic_types.c3 index 207bbe1de..ea3a43359 100644 --- a/test/unit/stdlib/atomic_types.c3 +++ b/test/unit/stdlib/atomic_types.c3 @@ -2,8 +2,8 @@ import std::thread; import std::io; import std::atomic::types; -def AtomicUint = Atomic{uint}; -def AtomicFloat = Atomic{float}; +alias AtomicUint = Atomic{uint}; +alias AtomicFloat = Atomic{float}; AtomicUint a; AtomicFloat fa; diff --git a/test/unit/stdlib/collections/bitset.c3 b/test/unit/stdlib/collections/bitset.c3 index 21d8adfea..25e06e7d5 100644 --- a/test/unit/stdlib/collections/bitset.c3 +++ b/test/unit/stdlib/collections/bitset.c3 @@ -4,9 +4,9 @@ import std::collections::growablebitset; import std::collections::list; import std::io; -def List = List{usz}; +alias List = List{usz}; -def BitSet = BitSet{2048}; +alias BitSet = BitSet{2048}; fn void set_get() { @@ -45,7 +45,7 @@ fn void set_get() assert(bs.cardinality() == 0); } -def GrowableBitSet = GrowableBitSet{char}; +alias GrowableBitSet = GrowableBitSet{char}; fn void growable_set_get() { GrowableBitSet bs; diff --git a/test/unit/stdlib/collections/copy_map.c3 b/test/unit/stdlib/collections/copy_map.c3 index a85a77f60..983261991 100644 --- a/test/unit/stdlib/collections/copy_map.c3 +++ b/test/unit/stdlib/collections/copy_map.c3 @@ -2,7 +2,7 @@ module test; import std::io; import std::collections::map; -def IntMap = HashMap{String, int}; +alias IntMap = HashMap{String, int}; fn void copy_map() @test { TrackingAllocator alloc; diff --git a/test/unit/stdlib/collections/elastic_array.c3 b/test/unit/stdlib/collections/elastic_array.c3 index 4fa4bdeab..8e22ae982 100644 --- a/test/unit/stdlib/collections/elastic_array.c3 +++ b/test/unit/stdlib/collections/elastic_array.c3 @@ -1,8 +1,8 @@ module elastic_array_test @test; import std::collections::elastic_array; -def IntList = ElasticArray{int, 10}; -def PtrList = ElasticArray{void*, 10}; +alias IntList = ElasticArray{int, 10}; +alias PtrList = ElasticArray{void*, 10}; fn void delete_contains_index() { diff --git a/test/unit/stdlib/collections/enummap.c3 b/test/unit/stdlib/collections/enummap.c3 index ae45d161e..cef1eca85 100644 --- a/test/unit/stdlib/collections/enummap.c3 +++ b/test/unit/stdlib/collections/enummap.c3 @@ -8,7 +8,7 @@ enum FooEnum THREE, } -def FooEnumMap = EnumMap{FooEnum, uint}; +alias FooEnumMap = EnumMap{FooEnum, uint}; fn void enums() { diff --git a/test/unit/stdlib/collections/linkedlist.c3 b/test/unit/stdlib/collections/linkedlist.c3 index 8f28b9271..910fa6d6e 100644 --- a/test/unit/stdlib/collections/linkedlist.c3 +++ b/test/unit/stdlib/collections/linkedlist.c3 @@ -1,7 +1,7 @@ module linkedlist_test @test; import std::collections::linkedlist; -def IntList = LinkedList{int}; +alias IntList = LinkedList{int}; fn void test_is_initialized() { diff --git a/test/unit/stdlib/collections/list.c3 b/test/unit/stdlib/collections/list.c3 index 5d85f59e9..000f38757 100644 --- a/test/unit/stdlib/collections/list.c3 +++ b/test/unit/stdlib/collections/list.c3 @@ -1,15 +1,15 @@ module list_test @test; import std::collections::list; -def IntList = List{int}; -def PtrList = List{void*}; +alias IntList = List{int}; +alias PtrList = List{void*}; struct Overalign { float[<4>] x @align(128); } -def OveralignList = List{Overalign}; +alias OveralignList = List{Overalign}; fn void overaligned_type() { OveralignList l; diff --git a/test/unit/stdlib/collections/map.c3 b/test/unit/stdlib/collections/map.c3 index 54f9f1f3e..1f6eb76c0 100644 --- a/test/unit/stdlib/collections/map.c3 +++ b/test/unit/stdlib/collections/map.c3 @@ -4,14 +4,14 @@ import std::collections::map; import std::sort; import std::io; -def TestHashMap = HashMap{String, usz}; +alias TestHashMap = HashMap{String, usz}; struct MapTest { String key; usz value; } -def List = List{MapTest}; +alias List = List{MapTest}; fn void map() { @@ -55,7 +55,7 @@ fn void map() } } -def FooMap = HashMap{char, Foobar}; +alias FooMap = HashMap{char, Foobar}; enum Foobar : inline char { FOO, diff --git a/test/unit/stdlib/collections/priorityqueue.c3 b/test/unit/stdlib/collections/priorityqueue.c3 index 671c93a2d..4bd8690b2 100644 --- a/test/unit/stdlib/collections/priorityqueue.c3 +++ b/test/unit/stdlib/collections/priorityqueue.c3 @@ -2,7 +2,7 @@ module priorityqueue_test @test; import std::collections; import std::collections::priorityqueue; -def Queue = PriorityQueue{int}; +alias Queue = PriorityQueue{int}; fn void priorityqueue() { @@ -32,7 +32,7 @@ fn void priorityqueue() assert(x == 3, "got %d; want %d", x, 3); } -def QueueMax = PriorityQueueMax{int}; +alias QueueMax = PriorityQueueMax{int}; fn void priorityqueue_max() { diff --git a/test/unit/stdlib/collections/range.c3 b/test/unit/stdlib/collections/range.c3 index 2b791889e..2b575cd51 100644 --- a/test/unit/stdlib/collections/range.c3 +++ b/test/unit/stdlib/collections/range.c3 @@ -1,8 +1,8 @@ module range_test @test; import std::collections::range; -def IntRange = Range{int}; -def IntExRange = ExclusiveRange{int}; +alias IntRange = Range{int}; +alias IntExRange = ExclusiveRange{int}; fn void test_range() { diff --git a/test/unit/stdlib/collections/ringbuffer.c3 b/test/unit/stdlib/collections/ringbuffer.c3 index dc5a8ae9c..f6e87871e 100644 --- a/test/unit/stdlib/collections/ringbuffer.c3 +++ b/test/unit/stdlib/collections/ringbuffer.c3 @@ -2,7 +2,7 @@ module ringbuffer_test @test; import std::collections::ringbuffer; import std::io; -def Buffer = RingBuffer{char[4]}; +alias Buffer = RingBuffer{char[4]}; fn void push_get() { diff --git a/test/unit/stdlib/core/test_test.c3 b/test/unit/stdlib/core/test_test.c3 index b0ce71052..fd837d214 100644 --- a/test/unit/stdlib/core/test_test.c3 +++ b/test/unit/stdlib/core/test_test.c3 @@ -270,8 +270,8 @@ fn void test_check_fails_no_info() test::@check(2 == 1); } -def TestIntFn = fn int? (int a, int b); -def TestFailFn = fn void? (bool to_fail); +alias TestIntFn = fn int? (int a, int b); +alias TestFailFn = fn void? (bool to_fail); fault FOO; diff --git a/test/unit/stdlib/io/scanner.c3 b/test/unit/stdlib/io/scanner.c3 index 040113649..2476d1427 100644 --- a/test/unit/stdlib/io/scanner.c3 +++ b/test/unit/stdlib/io/scanner.c3 @@ -1,7 +1,7 @@ module std::io @test; import std::collections::list; -def Results = List{String}; +alias Results = List{String}; struct ScanTest { diff --git a/test/unit/stdlib/math/math_complex.c3 b/test/unit/stdlib/math/math_complex.c3 index 0ad88bffa..e8031b094 100644 --- a/test/unit/stdlib/math/math_complex.c3 +++ b/test/unit/stdlib/math/math_complex.c3 @@ -1,13 +1,13 @@ module math_tests @test; import math_tests::complex; -def ComplexDouble = ComplexType{double} @local; -def ComplexInt = ComplexType{int} @local; +alias ComplexDouble = ComplexType{double} @local; +alias ComplexInt = ComplexType{int} @local; module math_tests::complex{ElementType} @test; import std::math; -def ComplexType = Complex{ElementType}; +alias ComplexType = Complex{ElementType}; fn void complex_mul_imaginary() { diff --git a/test/unit/stdlib/sort/countingsort.c3 b/test/unit/stdlib/sort/countingsort.c3 index 8c1ae88cb..2e9e21a41 100644 --- a/test/unit/stdlib/sort/countingsort.c3 +++ b/test/unit/stdlib/sort/countingsort.c3 @@ -73,7 +73,7 @@ fn void countingsort_with_lambda() } } -def CountingSortTestList = List{int}; +alias CountingSortTestList = List{int}; fn void countingsort_list() { diff --git a/test/unit/stdlib/sort/insertionsort.c3 b/test/unit/stdlib/sort/insertionsort.c3 index 09b840160..7de3b7156 100644 --- a/test/unit/stdlib/sort/insertionsort.c3 +++ b/test/unit/stdlib/sort/insertionsort.c3 @@ -78,7 +78,7 @@ fn void insertionsort_with_lambda() } } -def InsertionSortTestList = List{int}; +alias InsertionSortTestList = List{int}; fn void insertionsort_list() { diff --git a/test/unit/stdlib/sort/quicksort.c3 b/test/unit/stdlib/sort/quicksort.c3 index a9135c7f6..8cdc7e004 100644 --- a/test/unit/stdlib/sort/quicksort.c3 +++ b/test/unit/stdlib/sort/quicksort.c3 @@ -78,7 +78,7 @@ fn void quicksort_with_lambda() } } -def List = List{int}; +alias List = List{int}; fn void quicksort_list() { diff --git a/test/unit/stdlib/threads/pool.c3 b/test/unit/stdlib/threads/pool.c3 index f07140a62..82e67f7e8 100644 --- a/test/unit/stdlib/threads/pool.c3 +++ b/test/unit/stdlib/threads/pool.c3 @@ -1,7 +1,7 @@ module thread_pool_test; import std::io, std::thread, std::time; -def Pool = ThreadPool{4}; +alias Pool = ThreadPool{4}; fn void init_destroy() @test { diff --git a/test/unit/stdlib/time/format.c3 b/test/unit/stdlib/time/format.c3 index 236b94a4f..cba2891b0 100644 --- a/test/unit/stdlib/time/format.c3 +++ b/test/unit/stdlib/time/format.c3 @@ -2,8 +2,8 @@ module timeformat_test @test; import std::time::datetime, std::collections::list, std::collections::triple; -def FormatTzTestSpec = Triple{TzDateTime, DateTimeFormat, String}; -def FormatTestSpec = Triple{DateTime, DateTimeFormat, String}; +alias FormatTzTestSpec = Triple{TzDateTime, DateTimeFormat, String}; +alias FormatTestSpec = Triple{DateTime, DateTimeFormat, String}; fn void test_with_tz() {