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

Fixed some incorrect precedence rules

Browse Source
This commit is contained in:
Kayne Ruse
2024-12-26 14:46:12 +11:00
parent 24cfe7f539
commit 153ab54be6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/toy_parser.c
View File

@@ -91,6 +91,7 @@ typedef enum ParsingPrecedence {
PREC_ASSIGNMENT, PREC_ASSIGNMENT,
PREC_GROUP, PREC_GROUP,
PREC_TERNARY, PREC_TERNARY,
PREC_NEGATE,
PREC_OR, PREC_OR,
PREC_AND, PREC_AND,
PREC_COMPARISON, PREC_COMPARISON,
@@ -124,7 +125,7 @@ static ParsingTuple parsingRulesetTable[] = {
{PREC_PRIMARY,literal,NULL},// TOY_TOKEN_NULL, {PREC_PRIMARY,literal,NULL},// TOY_TOKEN_NULL,
//variable names (initially handled as a string) //variable names (initially handled as a string)
{PREC_NONE,nameString,NULL},// TOY_TOKEN_NAME, {PREC_PRIMARY,nameString,NULL},// TOY_TOKEN_NAME,
//types //types
{PREC_NONE,NULL,NULL},// TOY_TOKEN_TYPE_BOOLEAN, {PREC_NONE,NULL,NULL},// TOY_TOKEN_TYPE_BOOLEAN,
@@ -194,7 +195,7 @@ static ParsingTuple parsingRulesetTable[] = {
{PREC_COMPARISON,NULL,binary},// TOY_TOKEN_OPERATOR_COMPARE_GREATER_EQUAL, {PREC_COMPARISON,NULL,binary},// TOY_TOKEN_OPERATOR_COMPARE_GREATER_EQUAL,
//structural operators //structural operators
{PREC_NONE,group,NULL},// TOY_TOKEN_OPERATOR_PAREN_LEFT, {PREC_GROUP,group,NULL},// TOY_TOKEN_OPERATOR_PAREN_LEFT,
{PREC_NONE,NULL,NULL},// TOY_TOKEN_OPERATOR_PAREN_RIGHT, {PREC_NONE,NULL,NULL},// TOY_TOKEN_OPERATOR_PAREN_RIGHT,
{PREC_GROUP,compound,aggregate},// TOY_TOKEN_OPERATOR_BRACKET_LEFT, {PREC_GROUP,compound,aggregate},// TOY_TOKEN_OPERATOR_BRACKET_LEFT,
{PREC_NONE,compound,aggregate},// TOY_TOKEN_OPERATOR_BRACKET_RIGHT, {PREC_NONE,compound,aggregate},// TOY_TOKEN_OPERATOR_BRACKET_RIGHT,
@@ -204,7 +205,7 @@ static ParsingTuple parsingRulesetTable[] = {
//other operators //other operators
{PREC_AND,NULL,binary},// TOY_TOKEN_OPERATOR_AND, {PREC_AND,NULL,binary},// TOY_TOKEN_OPERATOR_AND,
{PREC_OR,NULL,binary},// TOY_TOKEN_OPERATOR_OR, {PREC_OR,NULL,binary},// TOY_TOKEN_OPERATOR_OR,
{PREC_NONE,unary,NULL},// TOY_TOKEN_OPERATOR_NEGATE, {PREC_NEGATE,unary,NULL},// TOY_TOKEN_OPERATOR_NEGATE,
{PREC_NONE,NULL,NULL},// TOY_TOKEN_OPERATOR_QUESTION, {PREC_NONE,NULL,NULL},// TOY_TOKEN_OPERATOR_QUESTION,
{PREC_GROUP,compound,aggregate},// TOY_TOKEN_OPERATOR_COLON, {PREC_GROUP,compound,aggregate},// TOY_TOKEN_OPERATOR_COLON,