Skip to content

Commit e9a193c

Browse files
UplinkCoderUplinkCoder
committed
Some Refactoring
1 parent 193edc1 commit e9a193c

File tree

7 files changed

+64
-60
lines changed

7 files changed

+64
-60
lines changed

‎codegen/metac_codegen.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
#include "metac_codegen.h"
2828

2929
#include <stdarg.h>
30-
30+
/*
3131
#ifdef METAC_COMPILER_INTERFACE
3232
#include "../compiler_intrinsics/metac_compiler_interface.c"
3333
#endif
34-
34+
*/
3535
uint32_t MetaCCodegen_GetTypeABISize(metac_bytecode_ctx_t* ctx,
3636
metac_type_index_t type)
3737
{

‎os/metac_file.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,6 @@ metac_file_ptr_t MetaCFileStorage_LoadFile(metac_file_storage_t* self, const cha
221221
filePathPtr = GetOrAddIdentifier(&self->Paths, filePathKey, path);
222222
}
223223

224-
printf("fileNamePtr: %u\n", fileNamePtr.v);
225-
printf("filePathPtr: %u\n", filePathPtr.v);
226-
227224
assert(fileNamePtr.v < UINT16_MAX);
228225
assert(filePathPtr.v < UINT16_MAX);
229226

‎os/metac_task.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ void FiberDoTask(void)
119119
U32(task->TaskFlags) |= Task_Running;
120120
task->TaskFunction(task);
121121
U32(task->TaskFlags) |= Task_Complete;
122+
U32(task->TaskFlags) &= ~Task_Running;
122123

123124
fiber->arg = 0;
124125

‎repl/repl.c‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "../codegen/metac_codegen.c"
1818
#include "../semantic/metac_type_table.h"
1919
#include "../repl/completion_trie.c"
20-
#include "repl.h"
20+
#include "../repl/repl.h"
2121

2222
#include <stdio.h>
2323

@@ -79,7 +79,6 @@ static inline int TranslateIdentifiers(metac_node_t node, void* ctx)
7979

8080
const metac_identifier_table_t* SrcTable = context->SrcTable;
8181
metac_identifier_table_t* DstTable = context->DstTable;
82-
xprintf("Node seen %s\n", MetaCNodeKind_toChars(node->Kind));
8382

8483
switch(node->Kind)
8584
{
@@ -125,7 +124,17 @@ static inline int TranslateIdentifiers(metac_node_t node, void* ctx)
125124
TranslateIdentifier(DstTable, SrcTable, &enum_->Identifier);
126125
}
127126
} break;
128-
case decl_enum_member:
127+
/*
128+
case decl_type_functiontype:
129+
{
130+
decl_type_functiontype_t* funcionType = (decl_type_functiontype_t*) node;
131+
if (funcionType->Identifier.v != empty_identifier.v)
132+
{
133+
TranslateIdentifier(DstTable, SrcTable, &enum_->Identifier);
134+
}
135+
} break;
136+
*/
137+
case decl_enum_member:
129138
{
130139
decl_enum_member_t* enumMember = (decl_enum_member_t*) node;
131140
if (enumMember->Name.v != empty_identifier.v)
@@ -154,7 +163,12 @@ static inline int TranslateIdentifiers(metac_node_t node, void* ctx)
154163
} break;
155164

156165

157-
default : {xprintf("No Identifier got Translated for '%s'\n", MetaCNodeKind_toChars(node->Kind));} break;
166+
default:
167+
{
168+
#if 1
169+
xprintf("No Identifier got Translated for '%s'\n", MetaCNodeKind_toChars(node->Kind));
170+
#endif
171+
} break;
158172
}
159173

160174
if ((node->Kind > expr_invalid) & (node->Kind < expr_max))

‎semantic/metac_expr_semantic.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ metac_sema_expr_t* MetaCSemantic_doExprSemantic_(metac_sema_state_t* self,
861861
{
862862
metac_type_aggregate_field_t* field =
863863
cast(metac_type_aggregate_field_t*)node;
864-
result->AggMemberIndex = field->Index;
864+
865865
metac_expr_t* fieldExp = AllocNewExpr(expr_field);
866866
fieldExp->LocationIdx = expr->E2->LocationIdx;
867867
dotExp->DotE2 = AllocNewSemaExpr(self, fieldExp);
@@ -1237,7 +1237,7 @@ metac_sema_expr_t* MetaCSemantic_doExprSemantic_(metac_sema_state_t* self,
12371237
} break;
12381238
case expr_sizeof:
12391239
{
1240-
uint32_t size = -1;
1240+
int32_t size = -1;
12411241
hash = sizeof_key;
12421242
metac_sema_expr_t* e1 =
12431243
MetaCSemantic_doExprSemantic(self, expr->E1, 0);

‎semantic/metac_sematree.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ typedef struct metac_storage_location_t
5656
#define STORAGE_KIND(STORAGE) \
5757
((metac_storage_kind_t) ((STORAGE).v >> 28) & 0xF)
5858

59-
typedef struct sema_exp_argument_list_t
59+
typedef struct sema_expr_argument_list_t
6060
{
6161
struct metac_sema_expr_t** Arguments;
6262
uint32_t ArgumentCount;
63-
} sema_exp_argument_list_t;
63+
} sema_expr_argument_list_t;
6464

6565
typedef struct metac_sema_expr_header_t
6666
{
6767
SEMA_EXPR_HEADER
6868
} metac_sema_expr_header_t;
6969

7070
#pragma pack(push, 1)
71-
typedef struct sema_exp_call_t
71+
typedef struct sema_expr_call_t
7272
{
7373
struct metac_sema_expr_t* Function;
7474
struct metac_sema_expr_t** Arguments;
7575
uint32_t ArgumentCount;
76-
} sema_exp_call_t;
76+
} sema_expr_call_t;
7777

7878

7979
typedef struct metac_sema_expr_t
@@ -107,7 +107,7 @@ typedef struct metac_sema_expr_t
107107
// case expr_dot, expr_arrow:
108108
struct {
109109
struct metac_sema_expr_t* AggExp;
110-
uint32_t AggMemberIndex;
110+
// uint32_t AggMemberIndex;
111111
struct metac_sema_expr_t* DotE2;
112112
};
113113
// case expr_type
@@ -118,11 +118,11 @@ typedef struct metac_sema_expr_t
118118
uint32_t TupleExprCount;
119119
};
120120
// case expr_argument:
121-
sema_exp_argument_list_t* ArgumentList;
121+
sema_expr_argument_list_t* ArgumentList;
122122
// case expr_function:
123123
struct sema_decl_function_t* Function;
124124
// case expr_call:
125-
struct sema_exp_call_t Call;
125+
struct sema_expr_call_t Call;
126126

127127
// case unknown_value_exp:
128128
metac_expr_t* Expr;

‎semantic/metac_type_semantic.c‎

Lines changed: 34 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,6 @@ void MetaCSemantic_ComputeEnumValues(metac_sema_state_t* self,
706706
decl_type_enum_t* enum_,
707707
metac_type_enum_t* semaEnum)
708708
{
709-
uint32_t lastUnresolvedMembers = 0;
710-
uint32_t unresolvedMembers = 0;
711709
decl_enum_member_t* member = enum_->Members;
712710
int64_t nextValue = 0;
713711
const uint32_t memberCount = enum_->MemberCount;
@@ -770,10 +768,13 @@ void MetaCSemantic_ComputeEnumValues(metac_sema_state_t* self,
770768
// Since we are inserting members
771769
self->CurrentScope->ScopeTable.AllowOverride = true;
772770
{
771+
uint32_t lastUnresolvedMembers = 0;
772+
uint32_t unresolvedMembers = 0;
773+
773774
const char* eName = IdentifierPtrToCharPtr(self->ParserIdentifierTable, enum_->Identifier);
774-
MetaCSemantic_PushOnResolveFail(self, OnResolveFail_ReturnNull);
775775
do
776776
{
777+
MetaCSemantic_PushOnResolveFail(self, OnResolveFail_ReturnNull);
777778
lastUnresolvedMembers = unresolvedMembers;
778779

779780
member = enum_->Members;
@@ -803,16 +804,12 @@ void MetaCSemantic_ComputeEnumValues(metac_sema_state_t* self,
803804
}
804805
}
805806
assert(METAC_NODE(member) == emptyNode);
807+
MetaCSemantic_PopOnResolveFail(self);
806808

807-
if (!unresolvedMembers)
808-
{
809-
MetaCSemantic_PopOnResolveFail(self);
810-
}
811-
else if (unresolvedMembers == lastUnresolvedMembers)
809+
if (unresolvedMembers == lastUnresolvedMembers)
812810
{
813811
// we have a the same number of unresolved members as last round
814812
// which indicates a lack of local progress.
815-
MetaCSemantic_PopOnResolveFail(self);
816813
YIELD("Yielding because we are waiting for more enum members to become resolvable");
817814
}
818815
} while (unresolvedMembers);
@@ -1155,53 +1152,46 @@ metac_type_index_t MetaCSemantic_TypeSemantic(metac_sema_state_t* self,
11551152
tmpSemaAgg->FieldCount = agg->FieldCount;
11561153

11571154
PopulateTemporaryAggregateScope(self, tmpSemaAgg, agg);
1155+
MetaCSemantic_MountScope(self, tmpSemaAgg->Scope);
11581156

1159-
switch(typeKind)
1157+
if (agg->ParameterCount != 0)
11601158
{
1161-
case type_struct:
1159+
uint32_t parameterCount = agg->ParameterCount;
1160+
decl_parameter_t* param = agg->Parameters;
1161+
U32(tmpTemplateScope.ScopeFlags) |= scope_flag_temporary;
1162+
MetaCSemantic_PushTemporaryScope(self, &tmpTemplateScope);
1163+
1164+
for(uint32_t paramIdx = 0; paramIdx < parameterCount; paramIdx++)
11621165
{
1163-
uint32_t hash = 0;
1164-
MetaCSemantic_MountScope(self, tmpSemaAgg->Scope);
1166+
metac_identifier_ptr_t paramIdent = param->Parameter->VarIdentifier;
1167+
metac_location_ptr_t locIdx = param->Parameter->LocationIdx;
1168+
metac_expr_t placeholderExpr;
1169+
metac_sema_expr_t* placeholder = AllocNewSemaExpr(self, &placeholderExpr);
11651170

1166-
if (agg->ParameterCount != 0)
1167-
{
1168-
uint32_t parameterCount = agg->ParameterCount;
1169-
decl_parameter_t* param = agg->Parameters;
1170-
U32(tmpTemplateScope.ScopeFlags) |= scope_flag_temporary;
1171-
MetaCSemantic_PushTemporaryScope(self, &tmpTemplateScope);
1172-
xprintf("We have a template\n");
1173-
1174-
for(uint32_t paramIdx = 0; paramIdx < parameterCount; paramIdx++)
1175-
{
1176-
metac_identifier_ptr_t paramIdent = param->Parameter->VarIdentifier;
1177-
metac_location_ptr_t locIdx = param->Parameter->LocationIdx;
1178-
metac_expr_t placeholderExpr;
1179-
metac_sema_expr_t* placeholder = AllocNewSemaExpr(self, &placeholderExpr);
1171+
placeholder->Kind = expr_unknown_value;
1172+
placeholder->TypeIndex = MetaCSemantic_TypeSemantic(self, param->Parameter->VarType);
1173+
METAC_NODE(placeholder->Expr) = emptyNode;
1174+
placeholder->LocationIdx = locIdx;
11801175

1181-
placeholder->Kind = expr_unknown_value;
1182-
placeholder->TypeIndex = MetaCSemantic_TypeSemantic(self, param->Parameter->VarType);
1183-
METAC_NODE(placeholder->Expr) = emptyNode;
1184-
placeholder->LocationIdx = locIdx;
11851176

1177+
MetaCSemantic_RegisterInScope(self, paramIdent, METAC_NODE(placeholder));
11861178

1187-
MetaCSemantic_RegisterInScope(self, paramIdent, METAC_NODE(placeholder));
1188-
1189-
param = param->Next;
1190-
}
1191-
}
1179+
param = param->Next;
1180+
}
1181+
}
11921182

1183+
switch(typeKind)
1184+
{
1185+
case type_struct:
1186+
{
1187+
uint32_t hash;
11931188
MetaCSemantic_ComputeStructLayout(self, agg, tmpSemaAgg);
11941189

11951190
if (agg->ParameterCount != 0)
11961191
{
11971192
MetaCSemantic_PopTemporaryScope(self);
11981193
}
1199-
1200-
MetaCSemantic_UnmountScope(self);
1201-
1202-
hash = AggregateHash(tmpSemaAgg);
1203-
1204-
tmpSemaAgg->Header.Hash = hash;
1194+
tmpSemaAgg->Header.Hash = AggregateHash(tmpSemaAgg);
12051195

12061196
result =
12071197
MetaCTypeTable_GetOrEmptyStructType(&self->StructTypeTable, tmpSemaAgg);
@@ -1230,6 +1220,8 @@ metac_type_index_t MetaCSemantic_TypeSemantic(metac_sema_state_t* self,
12301220
default: assert(0);
12311221

12321222
}
1223+
1224+
MetaCSemantic_UnmountScope(self);
12331225
}
12341226
else if (IsPointerType(type->Kind))
12351227
{

0 commit comments

Comments
 (0)