krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 23:04:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Reworked the type system, types now have a single value

Browse Source
This commit is contained in:
Kayne Ruse
2022-08-17 17:39:29 +01:00
parent bde07f6c12
commit 574a864dd0
9 changed files with 201 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/parser.c
View File

@@ -798,23 +798,23 @@ static void statement(Parser* parser, Node** nodeHandle) {
static Literal readTypeToLiteral(Parser* parser) {
advance(parser);
Literal literal = TO_TYPE_LITERAL(MASK_ANY);
Literal literal = TO_NULL_LITERAL;
switch(parser->previous.type) {
case TOKEN_BOOLEAN:
AS_TYPE(literal).mask |= MASK_BOOLEAN;
AS_TYPE(literal).typeOf = LITERAL_BOOLEAN;
break;
case TOKEN_INTEGER:
AS_TYPE(literal).mask |= MASK_INTEGER;
AS_TYPE(literal).typeOf = LITERAL_INTEGER;
break;
case TOKEN_FLOAT:
AS_TYPE(literal).mask |= MASK_FLOAT;
AS_TYPE(literal).typeOf = LITERAL_FLOAT;
break;
case TOKEN_STRING:
AS_TYPE(literal).mask |= MASK_STRING;
AS_TYPE(literal).typeOf = LITERAL_STRING;
break;
//array, dictionary - read the sub-types
@@ -824,24 +824,15 @@ static Literal readTypeToLiteral(Parser* parser) {
if (match(parser, TOKEN_COMMA)) {
Literal r = readTypeToLiteral(parser);
AS_TYPE(literal).subtypes = ALLOCATE(Literal, 2);
AS_TYPE(literal).capacity = 2;
AS_TYPE(literal).count = 2;
TYPE_PUSH_SUBTYPE(&literal, l);
TYPE_PUSH_SUBTYPE(&literal, r);
((Literal*)(AS_TYPE(literal).subtypes))[0] = l;
((Literal*)(AS_TYPE(literal).subtypes))[1] = r;
AS_TYPE(literal).mask |= MASK_DICTIONARY;
AS_TYPE(literal).typeOf = LITERAL_DICTIONARY;
}
else {
AS_TYPE(literal).subtypes = ALLOCATE(Literal, 1);
AS_TYPE(literal).capacity = 1;
AS_TYPE(literal).count = 1;
TYPE_PUSH_SUBTYPE(&literal, l);
//append the "l" literal
((Literal*)(AS_TYPE(literal).subtypes))[0] = l;
AS_TYPE(literal).mask |= MASK_ARRAY;
AS_TYPE(literal).typeOf = LITERAL_ARRAY;
}
consume(parser, TOKEN_BRACKET_RIGHT, "Expected ']' at end of type definition");
@@ -850,6 +841,10 @@ static Literal readTypeToLiteral(Parser* parser) {
//TODO: function
case TOKEN_ANY:
AS_TYPE(literal).typeOf = LITERAL_ANY;
break;
default:
error(parser, parser->previous, "Bad type signature");
return TO_NULL_LITERAL;
@@ -857,7 +852,7 @@ static Literal readTypeToLiteral(Parser* parser) {
//const follows the type
if (match(parser, TOKEN_CONST)) {
AS_TYPE(literal).mask |= MASK_CONST;
AS_TYPE(literal).constant = true;
}
return literal;
@@ -877,7 +872,8 @@ static void varDecl(Parser* parser, Node** nodeHandle) {
typeLiteral = readTypeToLiteral(parser);
}
else {
typeLiteral = TO_TYPE_LITERAL(MASK_ANY);
//default any
typeLiteral = TO_TYPE_LITERAL(LITERAL_ANY, false);
}
//variable definition is an expression