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

I think var declarations are working correctly; no type checking yet

Browse Source
This commit is contained in:
Kayne Ruse
2022-08-13 15:57:30 +01:00
parent 55aa6eb273
commit afad0d99cb
12 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/parser.c
View File

@@ -760,26 +760,24 @@ static Literal readTypeToLiteral(Parser* parser) {
if (match(parser, TOKEN_COMMA)) {
Literal r = readTypeToLiteral(parser);
//dictionary
Literal* dict = TYPE_PUSH_SUBTYPE(&literal, MASK_DICTIONARY);
AS_TYPE(literal).subtypes = ALLOCATE(Literal, 2);
AS_TYPE(literal).capacity = 2;
AS_TYPE(literal).count = 2;
AS_TYPE(*dict).subtypes = ALLOCATE(Literal, 2);
AS_TYPE(*dict).capacity = 2;
AS_TYPE(*dict).count = 2;
((Literal*)(AS_TYPE(literal).subtypes))[0] = l;
((Literal*)(AS_TYPE(literal).subtypes))[1] = r;
((Literal*)(AS_TYPE(*dict).subtypes))[0] = l;
((Literal*)(AS_TYPE(*dict).subtypes))[1] = r;
AS_TYPE(literal).mask |= MASK_DICTIONARY;
}
else {
//array
Literal* arr = TYPE_PUSH_SUBTYPE(&literal, MASK_ARRAY);
AS_TYPE(*arr).subtypes = ALLOCATE(Literal, 1);
AS_TYPE(*arr).capacity = 1;
AS_TYPE(*arr).count = 1;
AS_TYPE(literal).subtypes = ALLOCATE(Literal, 1);
AS_TYPE(literal).capacity = 1;
AS_TYPE(literal).count = 1;
//append the "l" literal
((Literal*)(AS_TYPE(*arr).subtypes))[0] = l;
((Literal*)(AS_TYPE(literal).subtypes))[0] = l;
AS_TYPE(literal).mask |= MASK_ARRAY;
}
consume(parser, TOKEN_BRACKET_RIGHT, "Expected ']' at end of type definition");
@@ -806,14 +804,17 @@ static void varDecl(Parser* parser, Node** nodeHandle) {
consume(parser, TOKEN_IDENTIFIER, "Expected identifier after var keyword");
Token identifierToken = parser->previous;
Literal identifier = TO_IDENTIFIER_LITERAL(identifierToken.lexeme);
identifier.as.identifier.length = identifierToken.length; //BUGFIX
char* cpy = copyString(identifierToken.lexeme, identifierToken.length);
Literal identifier = _toIdentifierLiteral(cpy, strlen(cpy)); //BUGFIX: use this instead of the macro
//read the type, if present
Literal typeLiteral;
if (match(parser, TOKEN_COLON)) {
typeLiteral = readTypeToLiteral(parser);
}
else {
typeLiteral = TO_TYPE_LITERAL(MASK_ANY);
}
//variable definition is an expression
Node* expressionNode = NULL;