mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Code style fixes.
This commit is contained in:
SFENCE
sfence
parent
24e9db07ec
commit
af3f696423
43 changed files with 493 additions and 484 deletions
61
.github/workflows/whitespace_checks.yml
vendored
61
.github/workflows/whitespace_checks.yml
vendored
|
|
@ -34,7 +34,16 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
# Line endings are already ensured by .gitattributes
|
||||
- name: Check trailing whitespaces
|
||||
run: if git ls-files | grep -E '\.txt$|\.md$|\.[ch]$|\.cpp$|\.hpp$|\.sh$|\.cmake$|\.glsl$' | xargs grep -n '\s$'; then echo -e "\033[0;31mFound trailing whitespace"; (exit 1); else (exit 0); fi
|
||||
run: |
|
||||
if git ls-files |\
|
||||
grep -E '\.txt$|\.md$|\.[ch]$|\.cpp$|\.hpp$|\.sh$|\.cmake$|\.glsl$' |\
|
||||
xargs grep -n '\s$';\
|
||||
then\
|
||||
echo -e "\033[0;31mFound trailing whitespace";\
|
||||
(exit 1);\
|
||||
else\
|
||||
(exit 0);\
|
||||
fi
|
||||
|
||||
indent_spaces:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -46,21 +55,51 @@ jobs:
|
|||
# So lines like: "/* */ /*" or "*/ a = 5; /*" will result in error
|
||||
- name: Check for unsupported multiline comments
|
||||
run: |
|
||||
if git ls-files | grep -E '^src/.*\.cpp$|^src/.*\.[ch]$' | xargs grep -n '\*/.*/\*'; then echo -e "\033[0;31mUnsupported combination of multiline comments. New multiline comment should begin on new line."; (exit 1); else (exit 0); fi
|
||||
if git ls-files | grep -E '\.lua$' | xargs grep -n -e '\]\].*--\[\['; then echo -e "\033[0;31mUnsupported combination of multiline comments. New multiline comment should begin on new line."; (exit 1); else (exit 0); fi
|
||||
if git ls-files |\
|
||||
grep -E '^src/.*\.cpp$|^src/.*\.[ch]$' |\
|
||||
xargs grep -n '\*/.*/\*';\
|
||||
then
|
||||
echo -e "\033[0;31mUnsupported combination of multiline comments. New multiline comment should begin on new line.";\
|
||||
(exit 1);\
|
||||
else\
|
||||
(exit 0);\
|
||||
fi
|
||||
if git ls-files |\
|
||||
grep -E '\.lua$' |\
|
||||
xargs grep -n -e '\]\].*--\[\[';\
|
||||
then
|
||||
echo -e "\033[0;31mUnsupported combination of multiline comments. New multiline comment should begin on new line.";\
|
||||
(exit 1);\
|
||||
else\
|
||||
(exit 0);\
|
||||
fi
|
||||
# This prepare files for final check
|
||||
# See python script ./util/ci/indent_tab_preprocess.py for details.
|
||||
- name: Preprocess files
|
||||
run: |
|
||||
git ls-files | grep -E '^src/.*\.cpp$|^src/.*\.[ch]$' | xargs -L 1 -P $(($(nproc) + 1)) python3 ./util/ci/indent_tab_preprocess.py "/*" "*/"
|
||||
git ls-files | grep -E '\.lua$' | xargs -L 1 -P $(($(nproc) + 1)) python3 ./util/ci/indent_tab_preprocess.py "--[[" "]]"
|
||||
git ls-files |\
|
||||
grep -E '^src/.*\.cpp$|^src/.*\.[ch]$' |\
|
||||
xargs -L 1 -P $(($(nproc) + 1)) \
|
||||
python3 ./util/ci/indent_tab_preprocess.py "/*" "*/"
|
||||
git ls-files |\
|
||||
grep -E '\.lua$' |\
|
||||
xargs -L 1 -P $(($(nproc) + 1)) \
|
||||
python3 ./util/ci/indent_tab_preprocess.py "--[[" "]]"
|
||||
# Check for bad indent.
|
||||
# This runs over preprocessed files.
|
||||
# If there is any remaining space on line beginning or after tab,
|
||||
# error is generated
|
||||
- name: Check indent spaces
|
||||
run: |
|
||||
if git ls-files | grep -E '^src/.*\.cpp$|^src/.*\.[ch]$|\.lua' | xargs grep -n -P '^\t*[ ]'; then echo -e "\033[0;31mFound incorrect indent whitespaces"; (exit 1); else (exit 0); fi
|
||||
if git ls-files |\
|
||||
grep -E '^src/.*\.cpp$|^src/.*\.[ch]$|\.lua' |\
|
||||
xargs grep -n -P '^\t*[ ]';\
|
||||
then\
|
||||
echo -e "\033[0;31mFound incorrect indent whitespaces";\
|
||||
(exit 1);\
|
||||
else\
|
||||
(exit 0);\
|
||||
fi
|
||||
|
||||
tabs_lua_api_files:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -68,6 +107,12 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
# Some files should not contain tabs
|
||||
- name: Check tabs in Lua API files
|
||||
run: if grep -n $'\t' doc/lua_api.md doc/client_lua_api.md; then echo -e "\033[0;31mFound tab in markdown file"; (exit 1); else (exit 0); fi
|
||||
|
||||
run: |
|
||||
if grep -n $'\t' doc/lua_api.md doc/client_lua_api.md;\
|
||||
then\
|
||||
echo -e "\033[0;31mFound tab in markdown file";\
|
||||
(exit 1);\
|
||||
else\
|
||||
(exit 0);\
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@ core.register_node("tiled:tiled", {
|
|||
})
|
||||
|
||||
core.register_node("tiled:tiled_rooted", {
|
||||
description = "Tiled 'plantlike_rooted' Node (world-aligned)".."\n"..
|
||||
description =
|
||||
"Tiled 'plantlike_rooted' Node (world-aligned)".."\n"..
|
||||
"Base node texture spans over a space of 8×8 nodes".."\n"..
|
||||
"A plantlike thing grows on top",
|
||||
paramtype = "light",
|
||||
|
|
|
|||
|
|
@ -62,130 +62,98 @@ extern struct EnumString es_TileAnimationType[];
|
|||
|
||||
extern const std::array<const char *, 33> object_property_keys;
|
||||
|
||||
void read_content_features (lua_State *L, ContentFeatures &f,
|
||||
int index);
|
||||
void push_content_features (lua_State *L,
|
||||
const ContentFeatures &c);
|
||||
void read_content_features(lua_State *L, ContentFeatures &f, int index);
|
||||
void push_content_features(lua_State *L, const ContentFeatures &c);
|
||||
|
||||
void push_nodebox (lua_State *L,
|
||||
const NodeBox &box);
|
||||
void push_palette (lua_State *L,
|
||||
const std::vector<video::SColor> *palette);
|
||||
void push_nodebox(lua_State *L, const NodeBox &box);
|
||||
void push_palette(lua_State *L, const std::vector<video::SColor> *palette);
|
||||
|
||||
TileDef read_tiledef (lua_State *L, int index,
|
||||
u8 drawtype, bool special);
|
||||
TileDef read_tiledef(lua_State *L, int index, u8 drawtype, bool special);
|
||||
|
||||
void read_simplesoundspec (lua_State *L, int index,
|
||||
SoundSpec &spec);
|
||||
NodeBox read_nodebox (lua_State *L, int index);
|
||||
void read_simplesoundspec(lua_State *L, int index, SoundSpec &spec);
|
||||
NodeBox read_nodebox(lua_State *L, int index);
|
||||
|
||||
void read_server_sound_params (lua_State *L, int index,
|
||||
void read_server_sound_params(lua_State *L, int index,
|
||||
ServerPlayingSound ¶ms);
|
||||
|
||||
void push_dig_params (lua_State *L,
|
||||
const DigParams ¶ms);
|
||||
void push_hit_params (lua_State *L,
|
||||
const HitParams ¶ms);
|
||||
void push_dig_params(lua_State *L, const DigParams ¶ms);
|
||||
void push_hit_params(lua_State *L, const HitParams ¶ms);
|
||||
|
||||
ItemStack read_item (lua_State *L, int index, IItemDefManager *idef);
|
||||
ItemStack read_item(lua_State *L, int index, IItemDefManager *idef);
|
||||
|
||||
struct TileAnimationParams read_animation_definition(lua_State *L, int index);
|
||||
|
||||
PointabilityType read_pointability_type (lua_State *L, int index);
|
||||
Pointabilities read_pointabilities (lua_State *L, int index);
|
||||
void push_pointability_type (lua_State *L, PointabilityType pointable);
|
||||
void push_pointabilities (lua_State *L, const Pointabilities &pointabilities);
|
||||
PointabilityType read_pointability_type(lua_State *L, int index);
|
||||
Pointabilities read_pointabilities(lua_State *L, int index);
|
||||
void push_pointability_type(lua_State *L, PointabilityType pointable);
|
||||
void push_pointabilities(lua_State *L, const Pointabilities &pointabilities);
|
||||
|
||||
ToolCapabilities read_tool_capabilities (lua_State *L, int table);
|
||||
void push_tool_capabilities (lua_State *L,
|
||||
const ToolCapabilities &prop);
|
||||
WearBarParams read_wear_bar_params (lua_State *L, int table);
|
||||
void push_wear_bar_params (lua_State *L,
|
||||
const WearBarParams &prop);
|
||||
ToolCapabilities read_tool_capabilities(lua_State *L, int table);
|
||||
void push_tool_capabilities(lua_State *L, const ToolCapabilities &prop);
|
||||
WearBarParams read_wear_bar_params(lua_State *L, int table);
|
||||
void push_wear_bar_params(lua_State *L, const WearBarParams &prop);
|
||||
|
||||
void read_item_definition (lua_State *L, int index, const ItemDefinition &default_def,
|
||||
ItemDefinition &def);
|
||||
void push_item_definition (lua_State *L,
|
||||
const ItemDefinition &i);
|
||||
void push_item_definition_full (lua_State *L,
|
||||
const ItemDefinition &i);
|
||||
void read_item_definition(lua_State *L, int index,
|
||||
const ItemDefinition &default_def, ItemDefinition &def);
|
||||
void push_item_definition(lua_State *L, const ItemDefinition &i);
|
||||
void push_item_definition_full(lua_State *L, const ItemDefinition &i);
|
||||
|
||||
void read_object_properties (lua_State *L, int index,
|
||||
void read_object_properties(lua_State *L, int index,
|
||||
ServerActiveObject *sao,
|
||||
ObjectProperties *prop,
|
||||
IItemDefManager *idef);
|
||||
|
||||
void push_object_properties (lua_State *L,
|
||||
const ObjectProperties *prop);
|
||||
void push_object_properties(lua_State *L, const ObjectProperties *prop);
|
||||
|
||||
void push_inventory_list (lua_State *L,
|
||||
const InventoryList &invlist);
|
||||
void push_inventory_lists (lua_State *L,
|
||||
const Inventory &inv);
|
||||
void read_inventory_list (lua_State *L, int tableindex,
|
||||
void push_inventory_list(lua_State *L, const InventoryList &invlist);
|
||||
void push_inventory_lists(lua_State *L, const Inventory &inv);
|
||||
void read_inventory_list(lua_State *L, int tableindex,
|
||||
Inventory *inv, const char *name,
|
||||
IGameDef *gdef, int forcesize=-1);
|
||||
|
||||
MapNode readnode (lua_State *L, int index);
|
||||
void pushnode (lua_State *L, const MapNode &n);
|
||||
MapNode readnode(lua_State *L, int index);
|
||||
void pushnode(lua_State *L, const MapNode &n);
|
||||
|
||||
|
||||
void read_groups (lua_State *L, int index,
|
||||
ItemGroupList &result);
|
||||
void read_groups(lua_State *L, int index, ItemGroupList &result);
|
||||
|
||||
void push_groups (lua_State *L,
|
||||
const ItemGroupList &groups);
|
||||
void push_groups(lua_State *L, const ItemGroupList &groups);
|
||||
|
||||
//TODO rename to "read_enum_field"
|
||||
int getenumfield (lua_State *L, int table,
|
||||
const char *fieldname,
|
||||
const EnumString *spec,
|
||||
int default_);
|
||||
int getenumfield(lua_State *L, int table, const char *fieldname,
|
||||
const EnumString *spec, int default_);
|
||||
|
||||
bool getflagsfield (lua_State *L, int table,
|
||||
const char *fieldname,
|
||||
FlagDesc *flagdesc,
|
||||
bool getflagsfield(lua_State *L, int table, const char *fieldname,
|
||||
FlagDesc *flagdesc, u32 *flags, u32 *flagmask);
|
||||
|
||||
bool read_flags(lua_State *L, int index, FlagDesc *flagdesc,
|
||||
u32 *flags, u32 *flagmask);
|
||||
|
||||
bool read_flags (lua_State *L, int index,
|
||||
FlagDesc *flagdesc,
|
||||
u32 *flags, u32 *flagmask);
|
||||
|
||||
void push_flags_string (lua_State *L, FlagDesc *flagdesc,
|
||||
void push_flags_string(lua_State *L, FlagDesc *flagdesc,
|
||||
u32 flags, u32 flagmask);
|
||||
|
||||
u32 read_flags_table (lua_State *L, int table,
|
||||
u32 read_flags_table(lua_State *L, int table,
|
||||
FlagDesc *flagdesc, u32 *flagmask);
|
||||
|
||||
void push_items (lua_State *L,
|
||||
const std::vector<ItemStack> &items);
|
||||
void push_items(lua_State *L, const std::vector<ItemStack> &items);
|
||||
|
||||
std::vector<ItemStack> read_items (lua_State *L,
|
||||
int index,
|
||||
IGameDef* gdef);
|
||||
std::vector<ItemStack> read_items(lua_State *L, int index, IGameDef* gdef);
|
||||
|
||||
void push_simplesoundspec (lua_State *L,
|
||||
const SoundSpec &spec);
|
||||
void push_simplesoundspec(lua_State *L, const SoundSpec &spec);
|
||||
|
||||
bool string_to_enum (const EnumString *spec,
|
||||
int &result,
|
||||
const std::string &str);
|
||||
bool string_to_enum(const EnumString *spec,
|
||||
int &result, const std::string &str);
|
||||
|
||||
bool read_noiseparams (lua_State *L, int index,
|
||||
NoiseParams *np);
|
||||
void push_noiseparams (lua_State *L, NoiseParams *np);
|
||||
bool read_noiseparams(lua_State *L, int index, NoiseParams *np);
|
||||
void push_noiseparams(lua_State *L, NoiseParams *np);
|
||||
|
||||
bool read_tree_def (lua_State *L, int idx,
|
||||
const NodeDefManager *ndef,
|
||||
treegen::TreeDef &tree_def);
|
||||
bool read_tree_def(lua_State *L, int idx,
|
||||
const NodeDefManager *ndef, treegen::TreeDef &tree_def);
|
||||
|
||||
void luaentity_get (lua_State *L,u16 id);
|
||||
void luaentity_get(lua_State *L,u16 id);
|
||||
|
||||
bool push_json_value (lua_State *L,
|
||||
const Json::Value &value,
|
||||
int nullindex);
|
||||
void read_json_value (lua_State *L, Json::Value &root,
|
||||
int index, u16 max_depth);
|
||||
bool push_json_value(lua_State *L, const Json::Value &value, int nullindex);
|
||||
void read_json_value(lua_State *L, Json::Value &root, int index, u16 max_depth);
|
||||
|
||||
/*!
|
||||
* Pushes a Lua `pointed_thing` to the given Lua stack.
|
||||
|
|
@ -195,13 +163,13 @@ void read_json_value (lua_State *L, Json::Value &root,
|
|||
void push_pointed_thing(lua_State *L, const PointedThing &pointed, bool csm =
|
||||
false, bool hitpoint = false);
|
||||
|
||||
void push_objectRef (lua_State *L, const u16 id);
|
||||
void push_objectRef(lua_State *L, const u16 id);
|
||||
|
||||
void read_hud_element (lua_State *L, HudElement *elem);
|
||||
void read_hud_element(lua_State *L, HudElement *elem);
|
||||
|
||||
void push_hud_element (lua_State *L, HudElement *elem);
|
||||
void push_hud_element(lua_State *L, HudElement *elem);
|
||||
|
||||
bool read_hud_change (lua_State *L, HudElementStat &stat, HudElement *elem, void **value);
|
||||
bool read_hud_change(lua_State *L, HudElementStat &stat, HudElement *elem, void **value);
|
||||
|
||||
void push_collision_move_result(lua_State *L, const collisionMoveResult &res);
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ int getintfield_default(lua_State *L, int table,
|
|||
bool check_field_or_nil(lua_State *L, int index, int type, const char *fieldname);
|
||||
|
||||
template<typename T>
|
||||
bool getintfield(lua_State *L, int table,
|
||||
const char *fieldname, T &result)
|
||||
bool getintfield(lua_State *L, int table, const char *fieldname, T &result)
|
||||
{
|
||||
lua_getfield(L, table, fieldname);
|
||||
bool got = false;
|
||||
|
|
@ -55,8 +54,7 @@ bool getstringfield(lua_State *L, int table,
|
|||
bool getstringfield(lua_State *L, int table,
|
||||
const char *fieldname, std::string_view &result);
|
||||
size_t getstringlistfield(lua_State *L, int table,
|
||||
const char *fieldname,
|
||||
std::vector<std::string> *result);
|
||||
const char *fieldname, std::vector<std::string> *result);
|
||||
bool getboolfield(lua_State *L, int table,
|
||||
const char *fieldname, bool &result);
|
||||
bool getfloatfield(lua_State *L, int table,
|
||||
|
|
@ -71,18 +69,17 @@ void setfloatfield(lua_State *L, int table,
|
|||
void setboolfield(lua_State *L, int table,
|
||||
const char *fieldname, bool value);
|
||||
|
||||
v3f checkFloatPos (lua_State *L, int index);
|
||||
v2f check_v2f (lua_State *L, int index);
|
||||
v3f check_v3f (lua_State *L, int index);
|
||||
v3s16 check_v3s16 (lua_State *L, int index);
|
||||
v3f checkFloatPos(lua_State *L, int index);
|
||||
v2f check_v2f(lua_State *L, int index);
|
||||
v3f check_v3f(lua_State *L, int index);
|
||||
v3s16 check_v3s16(lua_State *L, int index);
|
||||
|
||||
v3f read_v3f (lua_State *L, int index);
|
||||
v2f read_v2f (lua_State *L, int index);
|
||||
v2s16 read_v2s16 (lua_State *L, int index);
|
||||
v2s32 read_v2s32 (lua_State *L, int index);
|
||||
video::SColor read_ARGB8 (lua_State *L, int index);
|
||||
bool read_color (lua_State *L, int index,
|
||||
video::SColor *color);
|
||||
v3f read_v3f(lua_State *L, int index);
|
||||
v2f read_v2f(lua_State *L, int index);
|
||||
v2s16 read_v2s16(lua_State *L, int index);
|
||||
v2s32 read_v2s32(lua_State *L, int index);
|
||||
video::SColor read_ARGB8(lua_State *L, int index);
|
||||
bool read_color(lua_State *L, int index, video::SColor *color);
|
||||
bool is_color_table (lua_State *L, int index);
|
||||
|
||||
/**
|
||||
|
|
@ -96,29 +93,27 @@ bool is_color_table (lua_State *L, int index);
|
|||
*
|
||||
* @return the box corresponding to lua table
|
||||
*/
|
||||
aabb3f read_aabb3f (lua_State *L, int index, f32 scale);
|
||||
aabb3f read_aabb3f(lua_State *L, int index, f32 scale);
|
||||
|
||||
v3s16 read_v3s16 (lua_State *L, int index);
|
||||
v3s16 read_v3s16(lua_State *L, int index);
|
||||
std::vector<aabb3f> read_aabb3f_vector (lua_State *L, int index, f32 scale);
|
||||
size_t read_stringlist (lua_State *L, int index,
|
||||
size_t read_stringlist(lua_State *L, int index,
|
||||
std::vector<std::string> *result);
|
||||
|
||||
void push_v2s16 (lua_State *L, v2s16 p);
|
||||
void push_v2s32 (lua_State *L, v2s32 p);
|
||||
void push_v2u32 (lua_State *L, v2u32 p);
|
||||
void push_v3s16 (lua_State *L, v3s16 p);
|
||||
void push_aabb3f (lua_State *L, aabb3f box, f32 divisor = 1.0f);
|
||||
void push_ARGB8 (lua_State *L, video::SColor color);
|
||||
void pushFloatPos (lua_State *L, v3f p);
|
||||
void push_v3f (lua_State *L, v3f p);
|
||||
void push_v2f (lua_State *L, v2f p);
|
||||
void push_aabb3f_vector (lua_State *L, const std::vector<aabb3f> &boxes,
|
||||
void push_v2s16(lua_State *L, v2s16 p);
|
||||
void push_v2s32(lua_State *L, v2s32 p);
|
||||
void push_v2u32(lua_State *L, v2u32 p);
|
||||
void push_v3s16(lua_State *L, v3s16 p);
|
||||
void push_aabb3f(lua_State *L, aabb3f box, f32 divisor = 1.0f);
|
||||
void push_ARGB8(lua_State *L, video::SColor color);
|
||||
void pushFloatPos(lua_State *L, v3f p);
|
||||
void push_v3f(lua_State *L, v3f p);
|
||||
void push_v2f(lua_State *L, v2f p);
|
||||
void push_aabb3f_vector(lua_State *L, const std::vector<aabb3f> &boxes,
|
||||
f32 divisor = 1.0f);
|
||||
|
||||
void warn_if_field_exists(lua_State *L, int table,
|
||||
const char *fieldname,
|
||||
std::string_view name,
|
||||
std::string_view message);
|
||||
void warn_if_field_exists(lua_State *L, int table, const char *fieldname,
|
||||
std::string_view name, std::string_view message);
|
||||
|
||||
size_t write_array_slice_float(lua_State *L, int table_index, float *data,
|
||||
v3u16 data_size, v3u16 slice_offset, v3u16 slice_size);
|
||||
|
|
|
|||
|
|
@ -753,7 +753,7 @@ inline std::string stringw_to_utf8(const irr::core::stringw &input)
|
|||
return wide_to_utf8(sv);
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Create an irr::core:stringw from a UTF8 std::string.
|
||||
*/
|
||||
inline irr::core::stringw utf8_to_stringw(std::string_view input)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue