From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 6B03A9E9E02; Tue, 6 Feb 2024 17:07:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6B03A9E9E02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1707228477; bh=RFmV7M/UYd+nNoqxgHTzPjYeFoR6Ol0VL8LNiTnWZW4=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=D0BMmuFY9YV7NcDipvoVVg/FcvhmNchj71bvS+U70YNOil8C0V+WIG1K1tat2EKWj ymNIKc9aG3uF6lpnJbOBrWNyaUQVSmJy4no64gZjgckv+vhm4+YH/atBo41nc0j5xT Ker/22XWw3k7PaG4IlRZyTiM5QdU13nUsV/j1HMk= Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [95.163.41.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 92D1C9E9E02 for ; Tue, 6 Feb 2024 17:07:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 92D1C9E9E02 Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1rXM79-00000007ZkG-00WJ; Tue, 06 Feb 2024 17:07:55 +0300 Date: Tue, 6 Feb 2024 17:03:57 +0300 To: Maxim Kokryashkin , tarantool-patches@dev.tarantool.org Message-ID: References: <4d80dfc5a12d8e7d0ca668432543a9241dd58017.1706520765.git.skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD94C460F083DF69F515295F69A3DCCED9A65A8B27103DC31E2182A05F5380850409308B036ED2FB65B91417EB218679B823E7895178C1F77E3CBD7E2EA66A30C9388EE2A1A7F2CFE66 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E4182CE4FE3052C2EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063732D85235FAECD72A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D887327E60254FD4636A27D0BB6B427450FF0B0CF36DD4F23ECC7F00164DA146DAFE8445B8C89999728AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8062BEEFFB5F8EA3EF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE33AC447995A7AD182BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735B17145F0B7815491C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A57EBF2F0C5776ECA55002B1117B3ED6962EB28732B89E56F672305013E4AE841E823CB91A9FED034534781492E4B8EEADA367EA73E0D98AADBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFA2FFB5EA76596F89479F654E56C7B382500C96690AE17B4EC34A753C1CE5644435D9E4C97941E9B1807D692F32DC703250B21C215BDE5793A7B1DADB5A06F03AC5DD12D318B02E97111DC66A97D0BFE2913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojh/iSjD2txnPh4WFzF+MZmw== X-DA7885C5: 06846698B335BD45F255D290C0D534F9F66BE1E221EF2DA20DC3C0BDCE26B779E91D129C2DB5E2525B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE33E04B969606CAE472D0161767384A22424D0B68B3DFDF738EE49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 09/26] test: enable in LuaJIT-tests X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sorry, some fixups:). On 06.02.24, Sergey Kaplun via Tarantool-patches wrote: > > > -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); =================================================================== -- Best regards, Sergey Kaplun