From 847222685bed086f77823e955a7125b515ed71d5 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Tue, 15 Nov 2016 21:41:46 +0200 Subject: [PATCH] Implement the pure typename meta-methods in AES type using the standard method. --- source/Library/Crypt/AES.cpp | 13 ++++--------- source/Library/Crypt/AES.hpp | 5 ----- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/source/Library/Crypt/AES.cpp b/source/Library/Crypt/AES.cpp index f8c0b210..becc0898 100644 --- a/source/Library/Crypt/AES.cpp +++ b/source/Library/Crypt/AES.cpp @@ -10,12 +10,7 @@ namespace SqMod { // ------------------------------------------------------------------------------------------------ -SQInteger AES256::Typename(HSQUIRRELVM vm) -{ - static const SQChar name[] = _SC("SqAES256"); - sq_pushstring(vm, name, sizeof(name)); - return 1; -} +SQMODE_DECL_TYPENAME(Typename, _SC("SqAES256")) // ------------------------------------------------------------------------------------------------ AES256::AES256() @@ -138,13 +133,13 @@ String AES256::Decrypt(CSStr data) // ================================================================================================ void Register_AES(HSQUIRRELVM vm) { - RootTable(vm).Bind("SqAES256", Class< AES256 >(vm, "SqAES256") + RootTable(vm).Bind(Typename::Str, Class< AES256 >(vm, Typename::Str) // Constructors .Ctor() .Ctor< CSStr >() // Meta-methods - .Func(_SC("_cmp"), &AES256::Cmp) - .SquirrelFunc(_SC("_typename"), &AES256::Typename) + .SquirrelFunc(_SC("_typename"), &Typename::Fn) + .Func(_SC("cmp"), &AES256::Cmp) .Func(_SC("_tostring"), &AES256::ToString) /* Properties */ .Prop(_SC("Key"), &AES256::GetKey) diff --git a/source/Library/Crypt/AES.hpp b/source/Library/Crypt/AES.hpp index 0922d808..5b683e60 100644 --- a/source/Library/Crypt/AES.hpp +++ b/source/Library/Crypt/AES.hpp @@ -62,11 +62,6 @@ public: */ CSStr ToString() const; - /* -------------------------------------------------------------------------------------------- - * Used by the script engine to retrieve the name from instances of this type. - */ - static SQInteger Typename(HSQUIRRELVM vm); - /* -------------------------------------------------------------------------------------------- * Retrieve the associated key. */