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

Fixed negation issue, moved some scripts to test/

Browse Source
This commit is contained in:
Kayne Ruse
2022-08-20 07:20:29 +01:00
parent 2bf721867b
commit 8309535bbe
12 changed files with 109 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/parser.c
View File

@@ -361,7 +361,7 @@ static Opcode unary(Parser* parser, Node** nodeHandle) {
parsePrecedence(parser, &tmpNode, PREC_TERNARY); //can be a literal
//check for negative literals (optimisation)
if (tmpNode->type == NODE_LITERAL) {
if (tmpNode->type == NODE_LITERAL && (IS_INTEGER(tmpNode->atomic.literal) || IS_FLOAT(tmpNode->atomic.literal))) {
//negate directly, if int or float
Literal lit = tmpNode->atomic.literal;
@@ -378,26 +378,44 @@ static Opcode unary(Parser* parser, Node** nodeHandle) {
return OP_EOF;
}
//check for negated boolean errors
if (tmpNode->type == NODE_LITERAL && IS_BOOLEAN(tmpNode->atomic.literal)) {
error(parser, parser->previous, "Negative booleans are not allowed");
return OP_EOF;
}
//actually emit the negation
emitNodeUnary(nodeHandle, OP_NEGATE);
(*nodeHandle)->unary.child = tmpNode; //set negate's child to the literal
}
else if (parser->previous.type == TOKEN_NOT) {
//temp handle to potentially negate values
parsePrecedence(parser, &tmpNode, PREC_TERNARY); //can be a literal
//check for negative literals (optimisation)
if (tmpNode->type == NODE_LITERAL && !IS_IDENTIFIER(tmpNode->atomic.literal)) {
//check for inverted booleans
if (tmpNode->type == NODE_LITERAL && IS_BOOLEAN(tmpNode->atomic.literal)) {
//negate directly, if int or float
Literal lit = tmpNode->atomic.literal;
if (IS_BOOLEAN(lit)) {
lit = TO_BOOLEAN_LITERAL(!AS_BOOLEAN(lit));
}
lit = TO_BOOLEAN_LITERAL(!AS_BOOLEAN(lit));
tmpNode->atomic.literal = lit;
*nodeHandle = tmpNode;
return OP_EOF;
}
//check for inverted number errors
if (tmpNode->type == NODE_LITERAL && (IS_INTEGER(tmpNode->atomic.literal) || IS_FLOAT(tmpNode->atomic.literal))) {
error(parser, parser->previous, "Inverted numbers are not allowed");
return OP_EOF;
}
//actually emit the negation
emitNodeUnary(nodeHandle, OP_INVERT);
(*nodeHandle)->unary.child = tmpNode; //set negate's child to the literal
}
else {
@@ -405,11 +423,6 @@ static Opcode unary(Parser* parser, Node** nodeHandle) {
return OP_EOF;
}
//actually emit the negation
emitNodeUnary(nodeHandle, OP_NEGATE);
(*nodeHandle)->unary.child = tmpNode; //set negate's child to the literal
return OP_EOF;
}