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

switched typeof for oftype, switched typeas for astype

Browse Source
This commit is contained in:
Kayne Ruse
2022-09-07 14:47:57 +01:00
parent 6c71a16e3e
commit 4137b7f057
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/keyword_types.c
View File

@@ -33,8 +33,8 @@ KeywordType keywordTypes[] = {
{TOKEN_PRINT, "print"},
{TOKEN_RETURN, "return"},
{TOKEN_TYPE, "type"},
{TOKEN_TYPEAS, "typeas"},
{TOKEN_TYPEOF, "typeof"},
{TOKEN_ASTYPE, "astype"},
{TOKEN_OFTYPE, "oftype"},
{TOKEN_VAR, "var"},
{TOKEN_WHILE, "while"},

10
source/parser.c
View File

@@ -120,11 +120,11 @@ static void parsePrecedence(Parser* parser, Node** nodeHandle, PrecedenceRule ru
static Literal readTypeToLiteral(Parser* parser);
//the expression rules
static Opcode typeAs(Parser* parser, Node** nodeHandle) {
static Opcode asType(Parser* parser, Node** nodeHandle) {
Literal literal = readTypeToLiteral(parser);
if (!IS_TYPE(literal)) {
error(parser, parser->previous, "Expected type after 'typeas' keyword");
error(parser, parser->previous, "Expected type after 'astype' keyword");
freeLiteral(literal);
return OP_EOF;
}
@@ -136,7 +136,7 @@ static Opcode typeAs(Parser* parser, Node** nodeHandle) {
return OP_EOF;
}
static Opcode typeOf(Parser* parser, Node** nodeHandle) {
static Opcode ofType(Parser* parser, Node** nodeHandle) {
Node* rhs = NULL;
parsePrecedence(parser, &rhs, PREC_TERNARY);
emitNodeUnary(nodeHandle, OP_TYPE_OF, rhs);
@@ -820,8 +820,8 @@ ParseRule parseRules[] = { //must match the token types
{NULL, NULL, PREC_NONE},// TOKEN_PRINT,
{NULL, NULL, PREC_NONE},// TOKEN_RETURN,
{atomic, NULL, PREC_NONE},// TOKEN_TYPE,
{typeAs, NULL, PREC_PRIMARY},// TOKEN_TYPEAS,
{typeOf, NULL, PREC_CALL},// TOKEN_TYPEOF,
{asType, NULL, PREC_PRIMARY},// TOKEN_ASTYPE,
{ofType, NULL, PREC_CALL},// TOKEN_OFTYPE,
{NULL, NULL, PREC_NONE},// TOKEN_VAR,
{NULL, NULL, PREC_NONE},// TOKEN_WHILE,

4
source/token_types.h
View File

@@ -31,8 +31,8 @@ typedef enum TokenType {
TOKEN_PRINT,
TOKEN_RETURN,
TOKEN_TYPE,
TOKEN_TYPEAS,
TOKEN_TYPEOF,
TOKEN_ASTYPE,
TOKEN_OFTYPE,
TOKEN_VAR,
TOKEN_WHILE,