diff options
author | Luigi Scarso <luigi.scarso@gmail.com> | 2021-03-16 21:19:25 +0000 |
---|---|---|
committer | Luigi Scarso <luigi.scarso@gmail.com> | 2021-03-16 21:19:25 +0000 |
commit | 3256351fa7d547a6394acc36a610572f137a8362 (patch) | |
tree | 16ec21bb567b378f45a441fd6b79f4703f43ef4e /Build/source/texk/web2c/mfluadir/otfcc/lib/support | |
parent | 8546aba79031b8428abbbf0148ebe6819fcb87ae (diff) |
mflua: code clean up (thanks to A. Kakuto)
git-svn-id: svn://tug.org/texlive/trunk@58429 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mfluadir/otfcc/lib/support')
-rw-r--r-- | Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h | 76 | ||||
-rw-r--r-- | Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h | 4 |
2 files changed, 40 insertions, 40 deletions
diff --git a/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h b/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h index b65a403fe5d..06febf14444 100644 --- a/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h +++ b/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h @@ -98,35 +98,35 @@ } #define caryll_standardTypeFn1(T) \ - caryll_trivialInit(T); \ - caryll_trivialCopy(T); \ - caryll_trivialDispose(T); \ - caryll_trivialMove(T); \ - caryll_trivialReplace(T); + caryll_trivialInit(T) \ + caryll_trivialCopy(T) \ + caryll_trivialDispose(T) \ + caryll_trivialMove(T) \ + caryll_trivialReplace(T) #define caryll_standardTypeFn2(T, __fn_dispose) \ - caryll_trivialInit(T); \ - caryll_trivialCopy(T); \ - caryll_nonTrivialDispose(T, __fn_dispose); \ - caryll_trivialMove(T); \ - caryll_trivialReplace(T); + caryll_trivialInit(T) \ + caryll_trivialCopy(T) \ + caryll_nonTrivialDispose(T, __fn_dispose) \ + caryll_trivialMove(T) \ + caryll_trivialReplace(T) #define caryll_standardTypeFn3(T, __fn_init, __fn_dispose) \ - caryll_nonTrivialInit(T, __fn_init); \ - caryll_trivialCopy(T); \ - caryll_nonTrivialDispose(T, __fn_dispose); \ - caryll_trivialMove(T); \ - caryll_trivialReplace(T); + caryll_nonTrivialInit(T, __fn_init) \ + caryll_trivialCopy(T) \ + caryll_nonTrivialDispose(T, __fn_dispose) \ + caryll_trivialMove(T) \ + caryll_trivialReplace(T) #define caryll_standardTypeFn4(T, __fn_init, __fn_copy, __fn_dispose) \ - caryll_nonTrivialInit(T, __fn_init); \ - caryll_nonTrivialCopy(T, __fn_copy); \ - caryll_nonTrivialDispose(T, __fn_dispose); \ - caryll_trivialMove(T); \ - caryll_trivialReplace(T); + caryll_nonTrivialInit(T, __fn_init) \ + caryll_nonTrivialCopy(T, __fn_copy) \ + caryll_nonTrivialDispose(T, __fn_dispose) \ + caryll_trivialMove(T) \ + caryll_trivialReplace(T) #define caryll_standardTypeFn5(T, __fn_init, __fn_copy, __fn_dispose, __fn_move) \ - caryll_nonTrivialInit(T, __fn_init); \ - caryll_nonTrivialCopy(T, __fn_copy); \ - caryll_nonTrivialDispose(T, __fn_dispose); \ - caryll_nonTrivialMove(T, __fn_move); \ - caryll_trivialReplace(T); + caryll_nonTrivialInit(T, __fn_init) \ + caryll_nonTrivialCopy(T, __fn_copy) \ + caryll_nonTrivialDispose(T, __fn_dispose) \ + caryll_nonTrivialMove(T, __fn_move) \ + caryll_trivialReplace(T) #define caryll_standardTypeMethods(T) \ .init = T##_init, .copy = T##_copy, .dispose = T##_dispose, .move = T##_move, \ @@ -165,23 +165,23 @@ #else #define caryll_standardRefTypeFn(T, ...) \ - caryll_standardTypeFn(T, __VA_ARGS__); \ - caryll_trivialCreate(T); \ - caryll_trivialFree(T); + caryll_standardTypeFn(T, __VA_ARGS__) \ + caryll_trivialCreate(T) \ + caryll_trivialFree(T) #define caryll_standardValTypeFn(T, ...) \ - caryll_standardTypeFn(T, __VA_ARGS__); \ - caryll_trivialEmpty(T); \ - caryll_trivialDup(T); + caryll_standardTypeFn(T, __VA_ARGS__) \ + caryll_trivialEmpty(T) \ + caryll_trivialDup(T) #define caryll_standardType(T, __name, ...) \ - caryll_standardTypeFn(T, __VA_ARGS__); \ - caryll_ElementInterfaceOf(T) __name = {caryll_standardTypeMethods(T)}; + caryll_standardTypeFn(T, __VA_ARGS__) \ + caryll_ElementInterfaceOf(T) __name = {caryll_standardTypeMethods(T)} #define caryll_standardRefType(T, __name, ...) \ - caryll_standardRefTypeFn(T, __VA_ARGS__); \ - caryll_ElementInterfaceOf(T) __name = {caryll_standardRefTypeMethods(T)}; + caryll_standardRefTypeFn(T, __VA_ARGS__) \ + caryll_ElementInterfaceOf(T) __name = {caryll_standardRefTypeMethods(T)} #define caryll_standardValType(T, __name, ...) \ - caryll_standardValTypeFn(T, __VA_ARGS__); \ - caryll_ElementInterfaceOf(T) __name = {caryll_standardValTypeMethods(T)}; + caryll_standardValTypeFn(T, __VA_ARGS__) \ + caryll_ElementInterfaceOf(T) __name = {caryll_standardValTypeMethods(T)} #endif @@ -203,7 +203,7 @@ return (_fnCompare)(*a, *b); \ } #define caryll_OrdEqFns(T, _fnCompare) \ - caryll_OrdFns(T, _fnCompare); \ + caryll_OrdFns(T, _fnCompare) \ static __CARYLL_INLINE__ bool T##_equal(const T a, const T b) { \ return !(_fnCompare)(a, b); \ } diff --git a/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h b/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h index f38153d68ec..e41c197a104 100644 --- a/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h +++ b/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h @@ -54,8 +54,8 @@ arr->capacity = 0; \ arr->items = NULL; \ } \ - caryll_trivialCreate(__TV); \ - caryll_trivialFree(__TV); \ + caryll_trivialCreate(__TV) \ + caryll_trivialFree(__TV) \ static __CARYLL_INLINE__ void __TV##_growTo(MODIFY __TV *arr, size_t target) { \ if (target <= arr->capacity) return; \ if (arr->capacity < __CARYLL_VECTOR_INITIAL_SIZE) \ |