This commit is contained in:
2024-02-24 02:41:28 -06:00
parent 579d671a77
commit f6bf09a3eb
14 changed files with 521 additions and 524 deletions

View File

@@ -1,88 +0,0 @@
AccessModifierOffset: -2
AlignAfterOpenBracket: BlockIndent # New in v14. For earlier clang-format versions, use AlwaysBreak instead.
AlignConsecutiveMacros: false
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: DontAlign
AlignOperands: false
AlignTrailingComments: false
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BreakAfterAttributes: Always
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
BreakStringLiterals: false
ColumnLimit: 98
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
FixNamespaceComments: true
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<ext/.*\.h>'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^<.*\.h>'
Priority: 1
SortPriority: 0
CaseSensitive: false
- Regex: '^<.*'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 3
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 3
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1
NamespaceIndentation: Inner
PointerAlignment: Left
ReferenceAlignment: Left # New in v13. int &name ==> int& name
ReflowComments: false
SeparateDefinitionBlocks: Always # New in v14.
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 4
UseTab: Never

View File

@@ -8,7 +8,7 @@
#include "luacompat.h"
#if defined(__GNUC__) && !defined(LKIWI_NO_BUILTIN)
#if defined(__GNUC__) && !defined(LJKIWI_NO_BUILTIN)
#define lk_likely(x) (__builtin_expect(((x) != 0), 1))
#define lk_unlikely(x) (__builtin_expect(((x) != 0), 0))
#else
@@ -58,7 +58,7 @@ constexpr int array_count(T (&)[N]) {
return static_cast<int>(N);
}
void newlib(lua_State* L, const luaL_Reg* l) {
inline void newlib(lua_State* L, const luaL_Reg* l) {
lua_newtable(L);
setfuncs(L, l, 0);
}

View File

@@ -1,3 +1,4 @@
#include "ljkiwi.hpp"
#include <math.h>
#include <stdlib.h>
#include <string.h>
@@ -955,7 +956,7 @@ int lkiwi_constraint_expression(lua_State* L) {
auto* c = get_constraint(L, 1);
const auto& expr = c->expression();
const auto& terms = expr.terms();
const int term_count = terms.size();
const auto term_count = static_cast<int>(terms.size());
auto* ne = expr_new(L, term_count);
ne->owner = kiwi_constraint_retain(c);
@@ -1562,7 +1563,7 @@ void register_type_n(
const luaL_Reg* m,
size_t mcnt
) {
lua_createtable(L, 0, mcnt + 2);
lua_createtable(L, 0, static_cast<int>(mcnt + 2));
lua_pushvalue(L, -2); // no_member_mt
lua_setmetatable(L, -2);
lua_pushstring(L, name);
@@ -1605,7 +1606,11 @@ void compat_init(lua_State*, int) {}
} // namespace
extern "C" int luaopen_ckiwi(lua_State* L) {
#if defined __GNUC__ && (!defined _WIN32 || defined __CYGWIN__)
#define LJKIWI_EXPORT __attribute__((__visibility__("default")))
#endif
extern "C" LJKIWI_EXPORT int luaopen_ljkiwi(lua_State* L) {
luaL_checkversion(L);
/* context table */