From bfd9b6f720b61bb44522181453c276726d5b7ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= Date: Sat, 8 Feb 2025 15:47:08 -0300 Subject: [PATCH] add static function to convert ints to names --- src/common/scripting/interface/vmnatives.cpp | 13 +++++++++++++ src/common/utility/name.h | 2 ++ wadsrc/static/zscript/engine/base.zs | 2 ++ 3 files changed, 17 insertions(+) diff --git a/src/common/scripting/interface/vmnatives.cpp b/src/common/scripting/interface/vmnatives.cpp index a798f1310e..ca967c264b 100644 --- a/src/common/scripting/interface/vmnatives.cpp +++ b/src/common/scripting/interface/vmnatives.cpp @@ -1796,3 +1796,16 @@ DEFINE_FIELD_NAMED_X(ScriptScanner, DScriptScanner, wrapped.Number, Number); DEFINE_FIELD_NAMED_X(ScriptScanner, DScriptScanner, wrapped.End, End); DEFINE_FIELD_NAMED_X(ScriptScanner, DScriptScanner, wrapped.Crossed, Crossed); DEFINE_FIELD_NAMED_X(ScriptScanner, DScriptScanner, wrapped.ParseError, ParseError); + +static int ValidateNameIndex(int index) +{ + return FName::IsValidName(index) ? index : 0; +} + +DEFINE_ACTION_FUNCTION_NATIVE(DObject, ValidateNameIndex, ValidateNameIndex) +{ + PARAM_PROLOGUE; + PARAM_INT(index); + + ACTION_RETURN_INT(ValidateNameIndex(index)); +} diff --git a/src/common/utility/name.h b/src/common/utility/name.h index fe2424f45f..8b4291d695 100644 --- a/src/common/utility/name.h +++ b/src/common/utility/name.h @@ -76,6 +76,8 @@ public: bool IsValidName() const { return (unsigned)Index < (unsigned)NameData.NumNames; } + static bool IsValidName(int index) { return index >= 0 && index < NameData.NumNames; } + // Note that the comparison operators compare the names' indices, not // their text, so they cannot be used to do a lexicographical sort. bool operator == (const FName &other) const { return Index == other.Index; } diff --git a/wadsrc/static/zscript/engine/base.zs b/wadsrc/static/zscript/engine/base.zs index 8abd04ee3c..28d8a56045 100644 --- a/wadsrc/static/zscript/engine/base.zs +++ b/wadsrc/static/zscript/engine/base.zs @@ -766,6 +766,8 @@ class Object native private native static void HandleDeprecatedFlags(Object obj, bool set, int index); private native static bool CheckDeprecatedFlags(Object obj, int index); + native static Name ValidateNameIndex(int index); + native static uint MSTime(); native static double MSTimeF(); native vararg static void ThrowAbortException(String fmt, ...);