Skip to content

Commit 2332eef

Browse files
committed
Standardize pointer formatting and fix inconsistent brace styles
Refactored code to enforce consistent formatting for pointer declarations (`Type*` style) and brace placement across the project. Adjusted loop and condition formatting for better readability.
1 parent a46818f commit 2332eef

22 files changed

+337
-258
lines changed

.clang-format

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: LLVM
4+
AccessModifierOffset: -4
5+
AlignConsecutiveAssignments: false
6+
AlignConsecutiveDeclarations: false
7+
AlignOperands: true
8+
AlignTrailingComments: true
9+
AllowShortCaseLabelsOnASingleLine: true
10+
AllowShortIfStatementsOnASingleLine: true
11+
AllowShortLoopsOnASingleLine: true
12+
AlwaysBreakAfterDefinitionReturnType: false
13+
AlwaysBreakTemplateDeclarations: Yes
14+
BraceWrapping:
15+
AfterCaseLabel: false
16+
AfterClass: false
17+
AfterControlStatement: false
18+
AfterEnum: false
19+
AfterFunction: false
20+
AfterNamespace: false
21+
AfterStruct: false
22+
AfterUnion: false
23+
AfterExternBlock: false
24+
BeforeCatch: false
25+
BeforeElse: false
26+
BeforeLambdaBody: false
27+
BeforeWhile: false
28+
SplitEmptyFunction: false
29+
SplitEmptyRecord: false
30+
SplitEmptyNamespace: false
31+
BreakBeforeBraces: Custom
32+
BreakConstructorInitializers: AfterColon
33+
BreakConstructorInitializersBeforeComma: false
34+
ColumnLimit: 150
35+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
36+
ContinuationIndentWidth: 8
37+
Cpp11BracedListStyle: false
38+
IncludeCategories:
39+
- Regex: '^<.*'
40+
Priority: 1
41+
- Regex: '^".*'
42+
Priority: 2
43+
- Regex: '.*'
44+
Priority: 3
45+
IncludeIsMainRegex: '([-_](test|unittest))?$'
46+
IndentCaseLabels: true
47+
IndentGotoLabels: false
48+
IndentWidth: 4
49+
IndentWrappedFunctionNames: true
50+
InsertNewlineAtEOF: true
51+
MacroBlockBegin: ''
52+
MacroBlockEnd: ''
53+
NamespaceIndentation: Inner
54+
PointerAlignment: Left
55+
SpaceAfterCStyleCast: true
56+
SpaceInEmptyParentheses: false
57+
SpacesInAngles: false
58+
SpacesInConditionalStatement: false
59+
SpacesInCStyleCastParentheses: false
60+
SpacesInParentheses: false
61+
TabWidth: 4
62+
...

include/aresbc/attribute_info.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ union AttributeType {
1414
uint16_t handler_pc;
1515
uint16_t catch_type;
1616
};
17+
1718
struct Code {
1819
uint16_t max_stack;
1920
uint16_t max_locals;
2021
uint32_t code_length;
21-
std::vector <uint8_t> code;
22+
std::vector<uint8_t> code;
2223
uint16_t exception_table_length;
23-
std::vector <ExceptionEntry> exception_table;
24+
std::vector<ExceptionEntry> exception_table;
2425
uint16_t attributes_count;
25-
std::vector <AttributeInfo> attributes;
26+
std::vector<AttributeInfo> attributes;
2627
};
2728
};
2829

@@ -33,7 +34,7 @@ struct AttributeInfo {
3334
public:
3435
uint16_t attribute_name_index{};
3536
uint32_t attribute_length{};
36-
uint8_t *info{};
37+
uint8_t* info{};
3738
};
3839

3940
} // namespace ares
@@ -68,4 +69,4 @@ struct AttributeInfo {
6869
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6970
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7071
//
71-
//==============================================================================
72+
//==============================================================================

include/aresbc/class_file.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ class ClassFile {
6161
uint16_t major_version{};
6262
ClassVersion class_version{};
6363
uint16_t constant_pool_count{};
64-
std::vector <ConstantPoolInfo> constant_pool{};
64+
std::vector<ConstantPoolInfo> constant_pool{};
6565
uint16_t access_flags{};
6666
uint16_t this_class{};
6767
uint16_t super_class{};
6868
uint16_t interfaces_count{};
69-
std::vector <uint16_t> interfaces{};
69+
std::vector<uint16_t> interfaces{};
7070
uint16_t fields_count{};
71-
std::vector <FieldInfo> fields{};
71+
std::vector<FieldInfo> fields{};
7272
uint16_t method_count{};
73-
std::vector <MethodInfo> methods{};
73+
std::vector<MethodInfo> methods{};
7474
uint16_t attributes_count{};
75-
std::vector <AttributeInfo> attributes{};
75+
std::vector<AttributeInfo> attributes{};
7676
};
7777

7878
} // namespace ares
@@ -107,4 +107,4 @@ class ClassFile {
107107
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
108108
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
109109
//
110-
//==============================================================================
110+
//==============================================================================

include/aresbc/class_reader.h

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,79 +14,79 @@ class ClassReader final : Visitor {
1414
explicit ClassReader(unsigned int offset = 0u);
1515

1616
public:
17-
void visit_class(ClassFile &class_info) override;
17+
void visit_class(ClassFile& class_info) override;
1818

1919
[[nodiscard]] auto offset() const -> unsigned int;
2020

2121
private:
22-
void read_class_attributes(ClassFile &class_info);
22+
void read_class_attributes(ClassFile& class_info);
2323

24-
void visit_class_attribute(ClassFile &class_info, AttributeInfo &attribute_info) override;
24+
void visit_class_attribute(ClassFile& class_info, AttributeInfo& attribute_info) override;
2525

26-
void read_magic_number(ClassFile &class_info);
26+
void read_magic_number(ClassFile& class_info);
2727

28-
void read_class_version(ClassFile &class_info);
28+
void read_class_version(ClassFile& class_info);
2929

30-
void read_constant_pool(ClassFile &class_info);
30+
void read_constant_pool(ClassFile& class_info);
3131

32-
void visit_classpool_info(ClassFile &class_info, ConstantPoolInfo &info) override;
32+
void visit_classpool_info(ClassFile& class_info, ConstantPoolInfo& info) override;
3333

34-
void read_class_info(ClassFile &class_info, ConstantInfo::ClassInfo &info);
34+
void read_class_info(ClassFile& class_info, ConstantInfo::ClassInfo& info);
3535

36-
void read_utf8_info(ClassFile &class_info, ConstantInfo::UTF8Info &info);
36+
void read_utf8_info(ClassFile& class_info, ConstantInfo::UTF8Info& info);
3737

38-
void read_field_method_info(ClassFile &class_info, ConstantInfo::FieldMethodInfo &info);
38+
void read_field_method_info(ClassFile& class_info, ConstantInfo::FieldMethodInfo& info);
3939

40-
void read_name_and_type(ClassFile &class_info, ConstantInfo::NameAndTypeInfo &info);
40+
void read_name_and_type(ClassFile& class_info, ConstantInfo::NameAndTypeInfo& info);
4141

42-
void read_string_info(ClassFile &class_info, ConstantInfo::StringInfo &info);
42+
void read_string_info(ClassFile& class_info, ConstantInfo::StringInfo& info);
4343

44-
void read_double_long(ClassFile &class_info, ConstantInfo::DoubleLongInfo &info);
44+
void read_double_long(ClassFile& class_info, ConstantInfo::DoubleLongInfo& info);
4545

46-
void read_float_integer(ClassFile &class_info, ConstantInfo::FloatIntegerInfo &info);
46+
void read_float_integer(ClassFile& class_info, ConstantInfo::FloatIntegerInfo& info);
4747

48-
void read_method_type(ClassFile &class_info, ConstantInfo::MethodTypeInfo &info);
48+
void read_method_type(ClassFile& class_info, ConstantInfo::MethodTypeInfo& info);
4949

50-
void read_method_handle(ClassFile &class_info, ConstantInfo::MethodHandleInfo &info);
50+
void read_method_handle(ClassFile& class_info, ConstantInfo::MethodHandleInfo& info);
5151

52-
void read_dynamic(ClassFile &class_info, ConstantInfo::DynamicInfo &info);
52+
void read_dynamic(ClassFile& class_info, ConstantInfo::DynamicInfo& info);
5353

54-
void read_module_package(ClassFile &class_info, ConstantInfo::ModulePackageInfo &info);
54+
void read_module_package(ClassFile& class_info, ConstantInfo::ModulePackageInfo& info);
5555

56-
void read_access_flags(ClassFile &class_info);
56+
void read_access_flags(ClassFile& class_info);
5757

58-
void read_this_class(ClassFile &class_info);
58+
void read_this_class(ClassFile& class_info);
5959

60-
void read_super_class(ClassFile &class_info);
60+
void read_super_class(ClassFile& class_info);
6161

62-
void read_interfaces(ClassFile &class_info);
62+
void read_interfaces(ClassFile& class_info);
6363

64-
void visit_class_interface(ClassFile &class_info, uint16_t interface) override;
64+
void visit_class_interface(ClassFile& class_info, uint16_t interface) override;
6565

66-
void read_fields(ClassFile &class_info);
66+
void read_fields(ClassFile& class_info);
6767

68-
void visit_class_field(ClassFile &class_info, FieldInfo &field_info) override;
68+
void visit_class_field(ClassFile& class_info, FieldInfo& field_info) override;
6969

70-
void read_field_attributes(ClassFile &class_info, FieldInfo &field_info);
70+
void read_field_attributes(ClassFile& class_info, FieldInfo& field_info);
7171

72-
void visit_field_attribute(ClassFile &class_info, FieldInfo &field_info, AttributeInfo &attribute_info) override;
72+
void visit_field_attribute(ClassFile& class_info, FieldInfo& field_info, AttributeInfo& attribute_info) override;
7373

74-
void read_methods(ClassFile &class_info);
74+
void read_methods(ClassFile& class_info);
7575

76-
void visit_class_method(ClassFile &class_info, MethodInfo &method_info) override;
76+
void visit_class_method(ClassFile& class_info, MethodInfo& method_info) override;
7777

78-
void read_method_attributes(ClassFile &class_info, MethodInfo &method_info);
78+
void read_method_attributes(ClassFile& class_info, MethodInfo& method_info);
7979

80-
void visit_method_attribute(ClassFile &class_info, MethodInfo &method_info, AttributeInfo &attribute_info) override;
80+
void visit_method_attribute(ClassFile& class_info, MethodInfo& method_info, AttributeInfo& attribute_info) override;
8181

8282
private:
83-
auto read_u8(uint8_t &data, ClassFile &class_info) -> bool;
83+
auto read_u8(uint8_t& data, ClassFile& class_info) -> bool;
8484

85-
auto read_u16(uint16_t &data, ClassFile &class_info) -> bool;
85+
auto read_u16(uint16_t& data, ClassFile& class_info) -> bool;
8686

87-
auto read_u32(uint32_t &data, ClassFile &class_info) -> bool;
87+
auto read_u32(uint32_t& data, ClassFile& class_info) -> bool;
8888

89-
auto read_u8_array(uint8_t *data, unsigned int length, ClassFile &class_info) -> bool;
89+
auto read_u8_array(uint8_t* data, unsigned int length, ClassFile& class_info) -> bool;
9090

9191
private:
9292
unsigned int _offset{};
@@ -124,4 +124,4 @@ class ClassReader final : Visitor {
124124
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
125125
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
126126
//
127-
//==============================================================================
127+
//==============================================================================

include/aresbc/class_writer.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@ class ClassWriter final : Visitor {
99
explicit ClassWriter(unsigned int offset = 0);
1010

1111
public:
12-
void visit_class(ClassFile &class_info) override;
12+
void visit_class(ClassFile& class_info) override;
1313

14-
[[nodiscard]] auto byte_code() const -> const std::vector<uint8_t > &;
14+
[[nodiscard]] auto byte_code() const -> const std::vector<uint8_t>&;
1515

1616
private:
17-
void visit_classpool_info(ClassFile &class_info, ConstantPoolInfo &info) override;
17+
void visit_classpool_info(ClassFile& class_info, ConstantPoolInfo& info) override;
1818

19-
void visit_class_interface(ClassFile &class_info, uint16_t interface) override;
19+
void visit_class_interface(ClassFile& class_info, uint16_t interface) override;
2020

21-
void visit_class_field(ClassFile &class_info, FieldInfo &field_info) override;
21+
void visit_class_field(ClassFile& class_info, FieldInfo& field_info) override;
2222

23-
void visit_class_method(ClassFile &class_info, MethodInfo &method_info) override;
23+
void visit_class_method(ClassFile& class_info, MethodInfo& method_info) override;
2424

25-
void visit_class_attribute(ClassFile &class_info, AttributeInfo &attribute_info) override;
25+
void visit_class_attribute(ClassFile& class_info, AttributeInfo& attribute_info) override;
2626

27-
void visit_field_attribute(ClassFile &class_info, FieldInfo &field_info, AttributeInfo &attribute_info) override;
27+
void visit_field_attribute(ClassFile& class_info, FieldInfo& field_info, AttributeInfo& attribute_info) override;
2828

29-
void visit_method_attribute(ClassFile &class_info, MethodInfo &method_info, AttributeInfo &attribute_info) override;
29+
void visit_method_attribute(ClassFile& class_info, MethodInfo& method_info, AttributeInfo& attribute_info) override;
3030

3131
private:
32-
auto write_u8(uint8_t & data, ClassFile &class_file) -> bool;
32+
auto write_u8(uint8_t& data, ClassFile& class_file) -> bool;
3333

34-
auto write_u32(uint32_t & data, ClassFile &class_file) -> bool;
34+
auto write_u32(uint32_t& data, ClassFile& class_file) -> bool;
3535

36-
auto write_u16(uint16_t & data, ClassFile &class_file) -> bool;
36+
auto write_u16(uint16_t& data, ClassFile& class_file) -> bool;
3737

38-
auto write_u8_array(uint8_t *data, unsigned int data_size, ClassFile &class_file) -> bool;
38+
auto write_u8_array(uint8_t* data, unsigned int data_size, ClassFile& class_file) -> bool;
3939

4040
private:
4141
unsigned int _offset{}, _size{};
@@ -74,4 +74,4 @@ class ClassWriter final : Visitor {
7474
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
7575
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7676
//
77-
//==============================================================================
77+
//==============================================================================

include/aresbc/constant_info.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ union ConstantInfo {
4646

4747
struct UTF8Info {
4848
uint16_t length;
49-
uint8_t *bytes;
49+
uint8_t* bytes;
5050
} utf8_info;
5151

5252
struct MethodHandleInfo {
@@ -95,7 +95,7 @@ class ConstantPoolInfo {
9595
[[nodiscard]] auto size() const -> unsigned int;
9696

9797
public:
98-
ConstantTag tag{UNDEFINED};
98+
ConstantTag tag{ UNDEFINED };
9999
ConstantInfo info{};
100100
};
101101

@@ -131,4 +131,4 @@ class ConstantPoolInfo {
131131
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
132132
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
133133
//
134-
//==============================================================================
134+
//==============================================================================

include/aresbc/field_info.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class FieldInfo {
3333
uint16_t name_index{};
3434
uint16_t descriptor_index{};
3535
uint16_t attributes_count{};
36-
std::vector <AttributeInfo> attributes{};
36+
std::vector<AttributeInfo> attributes{};
3737
};
3838

3939
} // namespace ares
@@ -68,4 +68,4 @@ class FieldInfo {
6868
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6969
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7070
//
71-
//==============================================================================
71+
//==============================================================================

include/aresbc/method_info.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MethodInfo {
3434
uint16_t name_index{};
3535
uint16_t descriptor_index{};
3636
uint16_t attributes_count{};
37-
std::vector <AttributeInfo> attributes{};
37+
std::vector<AttributeInfo> attributes{};
3838
};
3939

4040
} // namespace ares
@@ -69,4 +69,4 @@ class MethodInfo {
6969
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
7070
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7171
//
72-
//==============================================================================
72+
//==============================================================================

0 commit comments

Comments
 (0)