Skip to content

Commit d57c9c6

Browse files
UplinkCoderUplinkCoder
committed
Update type names
1 parent 09ad869 commit d57c9c6

8 files changed

Lines changed: 31 additions & 45 deletions

File tree

‎compiler_intrinsics/metac_compiler_interface.c‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
11
#include "../os/os.h"
22
#include "metac_compiler_interface.h"
33
#include "../semantic/metac_type.h"
4-
extern metac_compiler_t compiler;
5-
6-
/*
7-
* void* semanticState;
8-
9-
uint32_t StartTimeStamp;
10-
uint32_t (*CurrentTimeStamp) ();
11-
uint32_t (*BuiltinCount) ();
12-
13-
const char* (*PrintType) (type T);
14-
15-
const char** (*FieldNames) (type T);
16-
17-
const char* (*BuiltinName) (uint32_t builtinNumber);
18-
const char* (*help) ();
4+
#include "metac_type_kind.c"
195

20-
void (*message) (const char* str);
21-
void (*error) (const char* str);
22-
23-
void (*RegisterLogCallback) (void (*LogCb)(const char* msg, void* context), void* context);
24-
*/
6+
extern metac_compiler_t compiler;
257

268
uint32_t compiler_CurrentTimeStamp ()
279
{
@@ -38,19 +20,19 @@ void compiler_Message(struct metac_compiler_t* compilerP,
3820
void compiler_Error(struct metac_compiler_t* compilerP,
3921
const char* str)
4022
{
41-
23+
4224
}
4325

44-
type_kind_t compiler_GetTypeKind (uint32_t T)
26+
metac_type_kind_t compiler_GetTypeKind (uint32_t T)
4527
{
4628
metac_type_index_t typeIdx;
4729
typeIdx.v = T;
48-
return TYPE_INDEX_KIND(typeIdx);
30+
return (metac_type_kind_t)TYPE_INDEX_KIND(typeIdx);
4931
}
5032

51-
const char* compiler_TypeKindString(type_kind_t T)
33+
const char* compiler_TypeKindString(metac_type_kind_t T)
5234
{
53-
35+
return MetaCTypeKind_toChars(T);
5436
}
5537

5638
const char* compiler_Help ()
@@ -69,7 +51,7 @@ void compiler_PrintInt(int32_t value)
6951
}
7052
metac_enum_members_t* compiler_GetEnumMembers (struct metac_compiler_t* compilerP, uint32_t T)
7153
{
72-
54+
7355
}
7456

7557
metac_node_t compiler_ResolveNode(struct metac_compiler_t* compilerP, const char* name)
@@ -94,9 +76,9 @@ metac_compiler_t compiler = {
9476
compiler_PrintInt,
9577

9678
compiler_GetEnumMembers,
97-
79+
9880
compiler_ResolveNode,
99-
81+
10082
"v0.1",
10183
20260205,
10284
};

‎compiler_intrinsics/metac_compiler_interface.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ typedef struct metac_compiler_t
2121
void* semanticState;
2222

2323
uint32_t (*CurrentTimeStamp) ();
24-
24+
2525
const char* (*Help) ();
2626

2727
void (*Message) (struct metac_compiler_t* compilerP,
@@ -30,15 +30,15 @@ typedef struct metac_compiler_t
3030
void (*Error) (struct metac_compiler_t* compilerP,
3131
const char* str);
3232

33-
type_kind_t (*GetTypeKind) (uint32_t T);
34-
const char* (*TypeKindString)(type_kind_t Kind);
33+
metac_type_kind_t (*GetTypeKind) (uint32_t T);
34+
const char* (*TypeKindString)(metac_type_kind_t Kind);
3535

3636
void (*PrintInt) (int32_t value);
3737

3838
metac_enum_members_t* (*GetEnumMembers) (struct metac_compiler_t* compilerP, uint32_t T);
3939

4040
metac_node_t (*ResolveNode)(struct metac_compiler_t* compilerP, const char* name);
41-
41+
4242
const char* Version;
4343
uint32_t IntVersion;
4444
} metac_compiler_t;

‎parser/metac_parser.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ decl_type_t* MetaCParser_ParseTypeDecl(metac_parser_t* self, metac_decl_t* paren
11161116
{
11171117
MetaCParser_Match(self, tokenType);
11181118

1119-
type->TypeKind = cast(metac_type_kind_t)(type_auto + (tokenType - tok_kw_auto));
1119+
type->TypeKind = cast(metac_parser_type_kind_t)(type_auto + (tokenType - tok_kw_auto));
11201120
U32(type->TypeModifiers) |= typeModifiers;
11211121
if (tokenType == tok_kw_long)
11221122
{
@@ -2560,10 +2560,14 @@ metac_stmt_t* MetaCParser_ParseStmt(metac_parser_t* self,
25602560
*self = savedParser;
25612561
goto LparseAsExpr;
25622562
}
2563-
else
2563+
else if (afterDecl)
25642564
{
25652565
MetaCParser_Match(self, afterDecl->TokenType);
25662566
}
2567+
else
2568+
{
2569+
// no token after declaration ... that may be fine in the repl
2570+
}
25672571
}
25682572
}
25692573

‎parser/metac_parsetree.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ typedef enum metac_storageclasses_t
405405
storageclass_scope = (1 << 8),
406406
} metac_storageclasses_t;
407407

408-
typedef enum metac_type_kind_t
408+
typedef enum metac_parser_type_kind_t
409409
{
410410
type_invalid,
411411

@@ -458,11 +458,11 @@ typedef enum metac_type_kind_t
458458
type_code,
459459

460460
type_max
461-
} metac_type_kind_t;
461+
} metac_parser_type_kind_t;
462462

463463

464464
#define TYPE_HEADER \
465-
metac_type_kind_t TypeKind; \
465+
metac_parser_type_kind_t TypeKind; \
466466
metac_type_modifiers TypeModifiers;
467467

468468

‎printer/metac_printer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,8 +1728,8 @@ static inline void PrintSemaType(metac_printer_t* self,
17281728
{
17291729
decl_type_t basicType = {(metac_decl_kind_t)0};
17301730
basicType.Kind = decl_type;
1731-
metac_type_kind_t Kind =
1732-
cast(metac_type_kind_t) TYPE_INDEX_INDEX(typeIndex);
1731+
metac_parser_type_kind_t Kind =
1732+
cast(metac_parser_type_kind_t) TYPE_INDEX_INDEX(typeIndex);
17331733
basicType.TypeKind = Kind;
17341734
PrintType(self, &basicType);
17351735
} break;

‎semantic/metac_expr_semantic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ metac_sema_expr_t* MetaCSemantic_doExprSemantic_(metac_sema_state_t* self,
992992
case expr_signed_integer :
993993
{
994994
decl_type_t typeInfo = {(metac_decl_kind_t)0};
995-
metac_type_kind_t baseType = type_int;
995+
metac_parser_type_kind_t baseType = type_int;
996996

997997
hash = CRC32C_VALUE(expr_signed_integer, expr->ValueU64);
998998
if (expr->NumberFlags & number_flag_unsigned)

‎semantic/metac_type_semantic.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ metac_type_index_t MetaCSemantic_GetPtrTypeOf(metac_sema_state_t* self,
4848
return result;
4949
}
5050

51-
static inline bool isBasicType(metac_type_kind_t typeKind)
51+
static inline bool isBasicType(metac_parser_type_kind_t typeKind)
5252
{
5353
if ((typeKind >= type_void) & (typeKind <= type_unsigned_long_long))
5454
{
@@ -84,7 +84,7 @@ sema_decl_type_t* MetaCSemantic_GetTypeNode(metac_sema_state_t* self,
8484
}
8585

8686
metac_type_index_t MetaCSemantic_GetTypeIndex(metac_sema_state_t* state,
87-
metac_type_kind_t typeKind,
87+
metac_parser_type_kind_t typeKind,
8888
decl_type_t* type)
8989
{
9090
metac_type_index_t result = {0};
@@ -142,7 +142,7 @@ static inline bool IsPointerType(metac_decl_kind_t declKind)
142142
static inline const char* BasicTypeToChars(metac_type_index_t typeIndex)
143143
{
144144
assert(TYPE_INDEX_KIND(typeIndex) == type_index_basic);
145-
switch((metac_type_kind_t) TYPE_INDEX_INDEX(typeIndex))
145+
switch((metac_parser_type_kind_t) TYPE_INDEX_INDEX(typeIndex))
146146
{
147147
case type_invalid :
148148
assert(0);
@@ -1095,7 +1095,7 @@ metac_type_index_t MetaCSemantic_TypeSemantic(metac_sema_state_t* self,
10951095
{
10961096
metac_type_index_t result = {0};
10971097

1098-
metac_type_kind_t typeKind = type->TypeKind;
1098+
metac_parser_type_kind_t typeKind = type->TypeKind;
10991099

11001100
if (type->Kind == decl_type && isBasicType(typeKind))
11011101
{

‎semantic/metac_type_semantic.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sema_decl_type_t* MetaCSemantic_GetTypeNode(metac_sema_state_t* self,
3333
metac_type_index_t typeIndex);
3434

3535
metac_type_index_t MetaCSemantic_GetTypeIndex(metac_sema_state_t* state,
36-
metac_type_kind_t typeKind,
36+
metac_parser_type_kind_t typeKind,
3737
decl_type_t* type);
3838

3939
metac_type_index_t MetaCSemantic_CommonSubtype(metac_sema_state_t* state,

0 commit comments

Comments
 (0)