Skip to content

Commit bcba573

Browse files
muitmuit
committed
Updated Pipe
1 parent 15efa02 commit bcba573

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+538
-389
lines changed

‎Extern/Pipe

Submodule Pipe updated 77 files

‎Libs/AST/Include/AST/Components/CFileRef.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <AST/Tree.h>
55
#include <Pipe/Files/Paths.h>
6-
#include <Pipe/Reflect/Struct.h>
6+
#include <PipeReflect.h>
77

88

99
namespace rift::ast
@@ -13,9 +13,9 @@ namespace rift::ast
1313
* Some examples are Class, p::Struct and Function Library declarations pointing to their
1414
* files
1515
*/
16-
struct CFileRef : public p::Struct
16+
struct CFileRef
1717
{
18-
P_STRUCT(CFileRef, p::Struct, p::Struct_NotSerialized)
18+
P_STRUCT(CFileRef, p::TF_NotSerialized)
1919

2020
P_PROP(path)
2121
p::String path;

‎Libs/AST/Include/AST/Components/CModule.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#pragma once
33

44
#include <Pipe/Files/Paths.h>
5-
#include <Pipe/Reflect/Struct.h>
5+
#include <PipeReflect.h>
6+
67

78
namespace rift::ast
89
{
@@ -13,16 +14,16 @@ namespace rift::ast
1314
Static
1415
};
1516
} // namespace rift::ast
16-
ENUM(rift::ast::RiftModuleTarget)
17+
P_ENUM(rift::ast::RiftModuleTarget)
1718

1819

1920
namespace rift::ast
2021
{
2122
static constexpr p::StringView moduleFilename = "__module__.rf";
2223

23-
struct CModule : public p::Struct
24+
struct CModule
2425
{
25-
P_STRUCT(CModule, p::Struct)
26+
P_STRUCT(CModule)
2627

2728
P_PROP(target)
2829
RiftModuleTarget target = RiftModuleTarget::Executable;

‎Libs/AST/Include/AST/Components/CNamespace.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
#pragma once
33

44
#include <Pipe/Core/Tag.h>
5-
#include <Pipe/Reflect/Struct.h>
5+
#include <PipeReflect.h>
66

77

88
namespace rift::ast
99
{
10-
struct CNamespace : public p::Struct
10+
struct CNamespace
1111
{
12-
P_STRUCT(CNamespace, p::Struct)
12+
P_STRUCT(CNamespace)
1313

1414
P_PROP(name);
1515
p::Tag name;
@@ -38,9 +38,9 @@ namespace rift::ast
3838
}
3939

4040

41-
struct Namespace : public p::Struct
41+
struct Namespace
4242
{
43-
P_STRUCT(Namespace, p::Struct)
43+
P_STRUCT(Namespace)
4444

4545
static constexpr p::i32 scopeCount = 8;
4646
p::Tag scopes[scopeCount]; // TODO: Implement Inline arrays

‎Libs/AST/Include/AST/Components/CProject.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// Copyright 2015-2024 Piperift - All rights reserved
22
#pragma once
33

4-
#include <Pipe/Reflect/Struct.h>
5-
4+
#include <PipeReflect.h>
65

76
namespace rift::ast
87
{
9-
struct CProject : public p::Struct
8+
struct CProject
109
{
11-
P_STRUCT(CProject, p::Struct)
10+
P_STRUCT(CProject)
1211
};
1312
} // namespace rift::ast

‎Libs/AST/Include/AST/Components/Declarations.h

+19-15
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,42 @@
11
// Copyright 2015-2024 Piperift - All rights reserved
22
#pragma once
33

4-
#include <Pipe/Reflect/Struct.h>
4+
55
#include <PipeECS.h>
6+
#include <PipeReflect.h>
67

78

89
namespace rift::ast
910
{
10-
struct CDeclStatic : public p::Struct
11+
struct CDeclStatic
1112
{
12-
P_STRUCT(CDeclStatic, p::Struct)
13+
P_STRUCT(CDeclStatic)
1314
};
1415

1516

16-
struct CDeclRecord : public p::Struct
17+
struct CDeclRecord
1718
{
18-
P_STRUCT(CDeclRecord, p::Struct)
19+
P_STRUCT(CDeclRecord)
1920
};
2021

2122

2223
struct CDeclStruct : public CDeclRecord
2324
{
24-
P_STRUCT(CDeclStruct, CDeclRecord, )
25+
using Super = CDeclRecord;
26+
P_STRUCT(CDeclStruct)
2527
};
2628

2729

2830
struct CDeclClass : public CDeclRecord
2931
{
30-
P_STRUCT(CDeclClass, CDeclRecord)
32+
using Super = CDeclRecord;
33+
P_STRUCT(CDeclClass)
3134
};
3235

3336

34-
struct CDeclType : public p::Struct
37+
struct CDeclType
3538
{
36-
P_STRUCT(CDeclType, p::Struct)
39+
P_STRUCT(CDeclType)
3740

3841
P_PROP(typeId)
3942
p::Tag typeId;
@@ -42,21 +45,22 @@ namespace rift::ast
4245

4346
struct CDeclNative : public CDeclRecord
4447
{
45-
P_STRUCT(CDeclNative, CDeclRecord)
48+
using Super = CDeclRecord;
49+
P_STRUCT(CDeclNative)
4650
};
4751

4852

49-
struct CDeclFunction : public p::Struct
53+
struct CDeclFunction
5054
{
51-
P_STRUCT(CDeclFunction, p::Struct)
55+
P_STRUCT(CDeclFunction)
5256
};
5357

5458

55-
struct CDeclVariable : public p::Struct
59+
struct CDeclVariable
5660
{
57-
P_STRUCT(CDeclVariable, p::Struct)
61+
P_STRUCT(CDeclVariable)
5862

59-
P_PROP(typeId, p::Prop_NotSerialized)
63+
P_PROP(typeId, p::PF_NotSerialized)
6064
p::Id typeId = p::NoId;
6165
};
6266
} // namespace rift::ast

‎Libs/AST/Include/AST/Components/Expressions.h

+31-25
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "AST/Components/CNamespace.h"
55

6-
#include <Pipe/Reflect/Struct.h>
76
#include <PipeECS.h>
7+
#include <PipeReflect.h>
88

99

1010
namespace rift::ast
@@ -50,22 +50,23 @@ namespace rift::ast
5050
PointerToPointer
5151
};
5252
} // namespace rift::ast
53-
ENUM(rift::ast::UnaryOperatorType)
54-
ENUM(rift::ast::BinaryOperatorType)
55-
ENUM(rift::ast::TypeMode)
53+
P_ENUM(rift::ast::UnaryOperatorType)
54+
P_ENUM(rift::ast::BinaryOperatorType)
55+
P_ENUM(rift::ast::TypeMode)
5656

5757

5858
namespace rift::ast
5959
{
60-
struct CExpression : public p::Struct
60+
struct CExpression
6161
{
62-
P_STRUCT(CExpression, p::Struct)
62+
P_STRUCT(CExpression)
6363
};
6464

6565

6666
struct CExprCall : public CExpression
6767
{
68-
P_STRUCT(CExprCall, CExpression)
68+
using Super = CExpression;
69+
P_STRUCT(CExprCall)
6970

7071
P_PROP(function)
7172
Namespace function;
@@ -75,7 +76,8 @@ namespace rift::ast
7576
// Data pointing to the id of the function from CExprCall's type and function names
7677
struct CExprCallId : public CExpression
7778
{
78-
P_STRUCT(CExprCallId, CExpression, p::Struct_NotSerialized)
79+
using Super = CExpression;
80+
P_STRUCT(CExprCallId, p::TF_NotSerialized)
7981

8082
// Id pointing to the function declaration
8183
P_PROP(functionId)
@@ -88,7 +90,8 @@ namespace rift::ast
8890

8991
struct CExprUnaryOperator : public CExpression
9092
{
91-
P_STRUCT(CExprUnaryOperator, CExpression)
93+
using Super = CExpression;
94+
P_STRUCT(CExprUnaryOperator)
9295

9396
P_PROP(type)
9497
UnaryOperatorType type = UnaryOperatorType::Not;
@@ -101,7 +104,8 @@ namespace rift::ast
101104

102105
struct CExprBinaryOperator : public CExpression
103106
{
104-
P_STRUCT(CExprBinaryOperator, CExpression)
107+
using Super = CExpression;
108+
P_STRUCT(CExprBinaryOperator)
105109

106110
P_PROP(type)
107111
BinaryOperatorType type = BinaryOperatorType::Add;
@@ -114,7 +118,8 @@ namespace rift::ast
114118

115119
struct CExprDeclRef : public CExpression
116120
{
117-
P_STRUCT(CExprDeclRef, CExpression)
121+
using Super = CExpression;
122+
P_STRUCT(CExprDeclRef)
118123

119124
P_PROP(ownerName)
120125
p::Tag ownerName;
@@ -126,16 +131,17 @@ namespace rift::ast
126131

127132
struct CExprDeclRefId : public CExpression
128133
{
129-
P_STRUCT(CExprDeclRefId, CExpression)
134+
using Super = CExpression;
135+
P_STRUCT(CExprDeclRefId)
130136

131137
P_PROP(declarationId)
132138
p::Id declarationId = p::NoId;
133139
};
134140

135141

136-
struct ExprInput : public p::Struct
142+
struct ExprInput
137143
{
138-
P_STRUCT(ExprInput, p::Struct)
144+
P_STRUCT(ExprInput)
139145

140146
P_PROP(nodeId)
141147
p::Id nodeId = p::NoId;
@@ -153,9 +159,9 @@ namespace rift::ast
153159
};
154160

155161

156-
struct ExprOutput : public p::Struct
162+
struct ExprOutput
157163
{
158-
P_STRUCT(ExprOutput, p::Struct)
164+
P_STRUCT(ExprOutput)
159165

160166
P_PROP(nodeId)
161167
p::Id nodeId = p::NoId;
@@ -173,9 +179,9 @@ namespace rift::ast
173179
};
174180

175181

176-
struct CExprInputs : public p::Struct
182+
struct CExprInputs
177183
{
178-
P_STRUCT(CExprInputs, p::Struct)
184+
P_STRUCT(CExprInputs)
179185

180186
P_PROP(linkedOutputs)
181187
p::TArray<ExprOutput> linkedOutputs;
@@ -213,9 +219,9 @@ namespace rift::ast
213219
};
214220

215221

216-
struct CExprOutputs : public p::Struct
222+
struct CExprOutputs
217223
{
218-
P_STRUCT(CExprOutputs, p::Struct)
224+
P_STRUCT(CExprOutputs)
219225

220226
P_PROP(pinIds)
221227
p::TArray<p::Id> pinIds;
@@ -247,9 +253,9 @@ namespace rift::ast
247253
};
248254

249255

250-
struct CExprType : public p::Struct
256+
struct CExprType
251257
{
252-
P_STRUCT(CExprType, p::Struct)
258+
P_STRUCT(CExprType)
253259

254260
P_PROP(type)
255261
Namespace type;
@@ -259,11 +265,11 @@ namespace rift::ast
259265
};
260266

261267

262-
struct CExprTypeId : public p::Struct
268+
struct CExprTypeId
263269
{
264-
P_STRUCT(CExprTypeId, p::Struct)
270+
P_STRUCT(CExprTypeId)
265271

266-
P_PROP(id, p::Prop_NotSerialized)
272+
P_PROP(id, p::PF_NotSerialized)
267273
p::Id id = p::NoId;
268274

269275
P_PROP(mode)

0 commit comments

Comments
 (0)