emh/smallint
1
0
Fork 0
mirror of https://gitlab.com/artofrev/smallint.git synced 2024-12-04 17:11:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

improve some variable names

Browse Source
This commit is contained in:
Solomon Ucko 2022-08-10 20:56:30 -04:00
parent 586a0f427e
commit f890aab454
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/logic.rs
View File

@ -7,7 +7,7 @@ use core::ops::{BitAndAssign, BitOrAssign, BitXorAssign};
macro_rules! logic_op { macro_rules! logic_op {
( (
$imp:ident, $imp_assign:ident, $typ:ident, $typ_inner:ident, $fun:ident, $fun_assign:ident; $imp:ident, $imp_assign:ident, $typ:ident, $typ_inner:ident, $fun:ident, $fun_assign:ident;
$i:ident, $j:ident, $r:ident, $s:ident; $i:ident, $j:ident, $p:ident, $q:ident, $s:ident, $t:ident;
$inline_heap:tt, $heap_heap:tt $inline_heap:tt, $heap_heap:tt
) => { ) => {
impl<'a, 'b> $imp<&'a $typ> for &'b $typ { impl<'a, 'b> $imp<&'a $typ> for &'b $typ {
@ -19,12 +19,12 @@ macro_rules! logic_op {
$typ($typ_inner::Inline($i.$fun($j))) $typ($typ_inner::Inline($i.$fun($j)))
} }
(&$typ_inner::Inline($i), &$typ_inner::Heap(($r, $s))) (&$typ_inner::Inline($i), &$typ_inner::Heap(($p, $s)))
| (&$typ_inner::Heap(($r, $s)), &$typ_inner::Inline($i)) => { | (&$typ_inner::Heap(($p, $s)), &$typ_inner::Inline($i)) => {
$inline_heap $inline_heap
} }
(&$typ_inner::Heap(($r, $s)), &$typ_inner::Heap(($i, $j))) => { (&$typ_inner::Heap(($p, $s)), &$typ_inner::Heap(($q, $t))) => {
$heap_heap $heap_heap
} }
} }
@ -69,20 +69,20 @@ macro_rules! logic_op {
}; };
( (
$imp:ident, $imp_assign:ident, $typ:ident, $typ_inner:ident, $fun:ident, $fun_assign:ident; $imp:ident, $imp_assign:ident, $typ:ident, $typ_inner:ident, $fun:ident, $fun_assign:ident;
$i:ident, $j:ident, $r:ident, $s:ident, $slice:ident, $slice1:ident, $slice2:ident, $min:ident, $res:ident; $i:ident, $j:ident, $p:ident, $q:ident, $s:ident, $t:ident, $slice:ident, $slice1:ident, $slice2:ident, $min:ident, $res:ident;
$inline_heap_inner:tt, $heap_heap_create_res:tt, $heap_heap_return:tt $inline_heap_inner:tt, $heap_heap_create_res:tt, $heap_heap_return:tt
) => { ) => {
logic_op! { logic_op! {
$imp, $imp_assign, $typ, $typ_inner, $fun, $fun_assign; $imp, $imp_assign, $typ, $typ_inner, $fun, $fun_assign;
$i, $j, $r, $s; $i, $j, $p, $q, $s, $t;
{ {
let $slice = unsafe { core::slice::from_raw_parts($r, $s) }; let $slice = unsafe { core::slice::from_raw_parts($p, $s) };
$inline_heap_inner $inline_heap_inner
}, },
{ {
let $slice1 = unsafe { core::slice::from_raw_parts($r, $s) }; let $slice1 = unsafe { core::slice::from_raw_parts($p, $s) };
let $slice2 = unsafe { core::slice::from_raw_parts($i, $j) }; let $slice2 = unsafe { core::slice::from_raw_parts($q, $t) };
let $min = std::cmp::min($slice1.len(), $slice2.len()); let $min = std::cmp::min($slice1.len(), $slice2.len());
@ -180,7 +180,7 @@ macro_rules! heap_heap_return_any {
logic_op! { logic_op! {
BitAnd, BitAndAssign, SmallUint, SmallUintType, bitand, bitand_assign; BitAnd, BitAndAssign, SmallUint, SmallUintType, bitand, bitand_assign;
i, j, r, s, slice, slice1, slice2, min, res; i, j, p, q, s, t, slice, slice1, slice2, min, res;
{ inline_heap_to_inline! { bitand, SmallUint, SmallUintType; i, slice } }, { inline_heap_to_inline! { bitand, SmallUint, SmallUintType; i, slice } },
{ heap_heap_create_res_shortest! { bitand; min, slice1, slice2 } }, { heap_heap_create_res_shortest! { bitand; min, slice1, slice2 } },
{ heap_heap_return_any! { SmallUint, SmallUintType; res } } { heap_heap_return_any! { SmallUint, SmallUintType; res } }
@ -188,7 +188,7 @@ logic_op! {
logic_op! { logic_op! {
BitOr, BitOrAssign, SmallUint, SmallUintType, bitor, bitor_assign; BitOr, BitOrAssign, SmallUint, SmallUintType, bitor, bitor_assign;
i, j, r, s, slice, slice1, slice2, min, res; i, j, p, q, s, t, slice, slice1, slice2, min, res;
{ inline_heap_to_heap! { bitor_assign, SmallUint, SmallUintType; i, slice } }, { inline_heap_to_heap! { bitor_assign, SmallUint, SmallUintType; i, slice } },
{ heap_heap_create_res_longest! { bitor; slice1, slice2, min }}, { heap_heap_create_res_longest! { bitor; slice1, slice2, min }},
{ heap_heap_return_heap! { SmallUint, SmallUintType; res } } { heap_heap_return_heap! { SmallUint, SmallUintType; res } }
@ -196,7 +196,7 @@ logic_op! {
logic_op! { logic_op! {
BitXor, BitXorAssign, SmallUint, SmallUintType, bitxor, bitxor_assign; BitXor, BitXorAssign, SmallUint, SmallUintType, bitxor, bitxor_assign;
i, j, r, s, slice, slice1, slice2, min, res; i, j, p, q, s, t, slice, slice1, slice2, min, res;
{ inline_heap_to_heap! { bitxor_assign, SmallUint, SmallUintType; i, slice } }, { inline_heap_to_heap! { bitxor_assign, SmallUint, SmallUintType; i, slice } },
{ heap_heap_create_res_longest! { bitxor; slice1, slice2, min }}, { heap_heap_create_res_longest! { bitxor; slice1, slice2, min }},
{ heap_heap_return_any! { SmallUint, SmallUintType; res } } { heap_heap_return_any! { SmallUint, SmallUintType; res } }