texlive[58429] Build/source/texk/web2c/mfluadir: mflua: code clean up
commits+lscarso at tug.org
commits+lscarso at tug.org
Tue Mar 16 22:19:26 CET 2021
Revision: 58429
http://tug.org/svn/texlive?view=revision&revision=58429
Author: lscarso
Date: 2021-03-16 22:19:25 +0100 (Tue, 16 Mar 2021)
Log Message:
-----------
mflua: code clean up (thanks to A. Kakuto)
Modified Paths:
--------------
trunk/Build/source/texk/web2c/mfluadir/ChangeLog
trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h
trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h
trunk/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h
trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h
trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h
trunk/Build/source/texk/web2c/mfluadir/otfcc/src/luafunc.c
trunk/Build/source/texk/web2c/mfluadir/otfcc/src/otfccdll.c
Modified: trunk/Build/source/texk/web2c/mfluadir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/ChangeLog 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/ChangeLog 2021-03-16 21:19:25 UTC (rev 58429)
@@ -1,3 +1,7 @@
+2021-03-15 Luigi Scarso <luigi.scarso at gmail.com>
+
+ * Code clean up (thanks to A. Kakuto)
+
2021-02-07 Luigi Scarso <luigi.scarso at gmail.com>
* DEK tuneup2021
Modified: trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h 2021-03-16 21:19:25 UTC (rev 58429)
@@ -15,16 +15,16 @@
void (*move)(MODIFY T *, T *); \
void (*dispose)(MOVE T *); \
void (*replace)(MODIFY T *, MOVE const T); \
- void (*copyReplace)(MODIFY T *, const T);
+ void (*copyReplace)(MODIFY T *, const T)
#define caryll_VT(T) \
caryll_T(T); \
T (*empty)(); \
- T (*dup)(const T);
+ T (*dup)(const T)
#define caryll_RT(T) \
caryll_T(T); \
T *(*create)(); \
- void (*free)(MOVE T *);
+ void (*free)(MOVE T *)
#define caryll_ElementInterfaceOf(T) const struct __caryll_elementinterface_##T
#define caryll_ElementInterface(T) \
@@ -42,26 +42,26 @@
/// Individual traits
-#define caryll_Show(T) void (*show)(const T);
-#define caryll_Eq(T) bool (*equal)(const T, const T);
+#define caryll_Show(T) void (*show)(const T)
+#define caryll_Eq(T) bool (*equal)(const T, const T)
#define caryll_Ord(T) \
caryll_Eq(T); \
int (*compare)(const T a, const T b); \
- int (*compareRef)(const T *a, const T *b);
+ int (*compareRef)(const T *a, const T *b)
#define caryll_Monoid(T) \
T (*neutral)(); \
T (*plus)(const T a, const T b); \
- void (*inplacePlus)(MODIFY T * a, const T b);
+ void (*inplacePlus)(MODIFY T * a, const T b)
#define caryll_Group(T) \
caryll_Monoid(T); \
void (*inplaceNegate)(MODIFY T * a); \
T (*negate)(const T); \
void (*inplaceMinus)(MODIFY T *, const T); \
- T (*minus)(const T, const T);
+ T (*minus)(const T, const T)
#define caryll_Module(T, TScale) \
caryll_Group(T); \
void (*inplaceScale)(MODIFY T * a, TScale b); \
void (*inplacePlusScale)(MODIFY T * a, TScale b, const T c); \
- T (*scale)(const T a, TScale b);
+ T (*scale)(const T a, TScale b)
#endif
Modified: trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h 2021-03-16 21:19:25 UTC (rev 58429)
@@ -28,7 +28,7 @@
__T (*pop)(MODIFY __TV * arr); \
void (*disposeItem)(MODIFY __TV * arr, size_t n); \
void (*filterEnv)(MODIFY __TV * arr, bool (*fn)(const __T *x, void *env), void *env); \
- void (*sort)(MODIFY __TV * arr, int (*fn)(const __T *a, const __T *b));
+ void (*sort)(MODIFY __TV * arr, int (*fn)(const __T *a, const __T *b))
#define caryll_VectorInterface(__TV, __T) \
caryll_VectorInterfaceTypeName(__TV) { \
Modified: trunk/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h 2021-03-16 21:19:25 UTC (rev 58429)
@@ -42,6 +42,10 @@
/* Note: sdshdr5 is never used, we just access the flags byte directly.
* However is here to document the layout of type 5 SDS strings. */
+#ifdef _MSC_VER
+#define __attribute__(x)
+#pragma pack(push,1)
+#endif
struct __attribute__((__packed__)) sdshdr5 {
unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
char buf[];
@@ -70,7 +74,9 @@
unsigned char flags; /* 3 lsb of type, 5 unused bits */
char buf[];
};
-
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
#define SDS_TYPE_5 0
#define SDS_TYPE_8 1
#define SDS_TYPE_16 2
Modified: trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/element-impl.h 2021-03-16 21:19:25 UTC (rev 58429)
@@ -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); \
}
Modified: trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/otfcc/lib/support/vector-impl.h 2021-03-16 21:19:25 UTC (rev 58429)
@@ -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) \
Modified: trunk/Build/source/texk/web2c/mfluadir/otfcc/src/luafunc.c
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/otfcc/src/luafunc.c 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/otfcc/src/luafunc.c 2021-03-16 21:19:25 UTC (rev 58429)
@@ -6,7 +6,9 @@
#include "platform.h"
//#include "stopwatch.h"
+#ifndef _MSC_VER
#include <unistd.h>
+#endif /* _MSC_VER */
/* to reset the getopt_long */
extern int optind;
Modified: trunk/Build/source/texk/web2c/mfluadir/otfcc/src/otfccdll.c
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/otfcc/src/otfccdll.c 2021-03-16 21:03:22 UTC (rev 58428)
+++ trunk/Build/source/texk/web2c/mfluadir/otfcc/src/otfccdll.c 2021-03-16 21:19:25 UTC (rev 58429)
@@ -3,7 +3,11 @@
#include "otfcc/sfnt-builder.h"
#ifdef _WIN32
+ #ifndef _MSC_VER /* static link --ak */
#define OTFCC_DLL_EXPORT __declspec(dllexport)
+ #else
+#define OTFCC_DLL_EXPORT
+ #endif
#else
#define OTFCC_DLL_EXPORT
#endif
More information about the tex-live-commits
mailing list.