Re: [Tarantool-patches] [PATCH v2 luajit 09/26] test: enable <ffi_convert.lua> in LuaJIT-tests

[Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

Sorry, some fixups:).

On 06.02.24, Sergey Kaplun via Tarantool-patches wrote:

<snipped>

> > > -typedef enum uenum_t {
> > > +typedef enum uenum_convert_t {
> > >    UE0, UE71 = 71, UE72
> > > -} uenum_t;
> > > +} uenum_convert_t;
> > `convert` acts as a namespace here, and those are usually used as a
> > prefix. Here and below.
> 
> Renamed. See the iterative patch below.
> 
> ===================================================================
> diff --git a/test/LuaJIT-tests/lib/ffi/ffi_convert.lua b/test/LuaJIT-tests/lib/ffi/ffi_convert.lua
> index 284f2b53..3d1b0064 100644
> --- a/test/LuaJIT-tests/lib/ffi/ffi_convert.lua
> +++ b/test/LuaJIT-tests/lib/ffi/ffi_convert.lua
> @@ -31,15 +31,15 @@ typedef struct arrinc_t {
>    int a[];
>  } arrinc_t;
>  
> -typedef enum uenum_convert_t {
> +typedef enum convert_uenum_t {
>    UE0, UE71 = 71, UE72
> -} uenum_convert_t;
> +} convert_uenum_t;
>  
>  typedef enum ienum_convert_t {
>    IE0, IEM12 = -12, IEM11
>  } ienum_convert_t;
>  
> -typedef struct foo_convert_t {
> +typedef struct convert_foo_t {
>    bool b;
>    int8_t i8;
>    uint8_t u8;
> @@ -78,9 +78,9 @@ typedef struct foo_convert_t {
>    int si_guard;
>    nest_t sn;
>    uni_t ui;
> -  uenum_convert_t ue;
> +  convert_uenum_t ue;
>    ienum_convert_t ie;
> -} foo_convert_t;
> +} convert_foo_t;
>  
>  char *strcpy(char *dest, const char *src);
>  typedef struct FILE FILE;
> @@ -89,10 +89,10 @@ int _fileno(FILE *stream);
>  ]]
>  
>  do --- misc
> -  local foo_convert_t = ffi.typeof("foo_convert_t")
> -  local sz = ffi.sizeof(foo_convert_t)
> -  local x = foo_convert_t()
> -  local y = foo_convert_t()
> +  local convert_foo_t = ffi.typeof("convert_foo_t")
> +  local sz = ffi.sizeof(convert_foo_t)
> +  local x = convert_foo_t()
> +  local y = convert_foo_t()
>    ffi.fill(x, sz, 0xff)
>    ffi.fill(y, sz, 0xee)
>  
> ===================================================================

`ienum_convert_t` is renamed too.

===================================================================
diff --git a/test/LuaJIT-tests/lib/ffi/ffi_convert.lua b/test/LuaJIT-tests/lib/ffi/ffi_convert.lua
index 2d530f90..e577001e 100644
--- a/test/LuaJIT-tests/lib/ffi/ffi_convert.lua
+++ b/test/LuaJIT-tests/lib/ffi/ffi_convert.lua
@@ -35,9 +35,9 @@ typedef enum convert_uenum_t {
   UE0, UE71 = 71, UE72
 } convert_uenum_t;
 
-typedef enum ienum_convert_t {
+typedef enum convert_ienum_t {
   IE0, IEM12 = -12, IEM11
-} ienum_convert_t;
+} convert_ienum_t;
 
 typedef struct convert_foo_t {
   bool b;
@@ -79,7 +79,7 @@ typedef struct convert_foo_t {
   nest_t sn;
   uni_t ui;
   convert_uenum_t ue;
-  ienum_convert_t ie;
+  convert_ienum_t ie;
 } convert_foo_t;
 
 char *strcpy(char *dest, const char *src);
===================================================================

<snipped>

-- 
Best regards,
Sergey Kaplun