From a083a37ee58dc48d92cf2b844466a295eb3e643e Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 10 Aug 2022 15:37:19 -0700 Subject: Add `none` literal that is convertible to `Optional`. (#2356) * Add `none` literal that is convertible to `Optional`. * Fix cpu code gen. * Include vk and cpu test for is-as operator test. * Inline comparison operators. Co-authored-by: Yong He --- source/slang/core.meta.slang | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'source/slang/core.meta.slang') diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang index 616511b01..d912fe8ce 100644 --- a/source/slang/core.meta.slang +++ b/source/slang/core.meta.slang @@ -349,6 +349,12 @@ struct NullPtr { }; +__magic_type(NoneType) +__intrinsic_type($(kIROp_VoidType)) +struct __none_t +{ +}; + __generic __magic_type(PtrType) __intrinsic_type($(kIROp_PtrType)) @@ -472,8 +478,36 @@ struct Optional __intrinsic_op($(kIROp_GetOptionalValue)) get; } + + __implicit_conversion($(kConversionCost_ValToOptional)) + __intrinsic_op($(kIROp_MakeOptionalValue)) + __init(T val); }; +__generic +[__unsafeForceInlineEarly] +bool operator==(Optional val, __none_t noneVal) +{ + return !val.hasValue; +} +__generic +[__unsafeForceInlineEarly] +bool operator!=(Optional val, __none_t noneVal) +{ + return val.hasValue; +} +__generic +[__unsafeForceInlineEarly] +bool operator==(__none_t noneVal, Optional val) +{ + return !val.hasValue; +} +__generic +[__unsafeForceInlineEarly] +bool operator!=(__none_t noneVal, Optional val) +{ + return val.hasValue; +} __magic_type(StringType) __intrinsic_type($(kIROp_StringType)) -- cgit v1.2.3