From 0044bfde9f23898319ba94677b2e9d193a55ed1d Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 9 Jan 2012 03:13:25 +1000 Subject: Add most of the rest of the tokens, but ignore them. --- LuaSL/src/LuaSL_yaccer.y | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'LuaSL/src/LuaSL_yaccer.y') diff --git a/LuaSL/src/LuaSL_yaccer.y b/LuaSL/src/LuaSL_yaccer.y index 7f873c2..b9721f8 100644 --- a/LuaSL/src/LuaSL_yaccer.y +++ b/LuaSL/src/LuaSL_yaccer.y @@ -13,19 +13,35 @@ %type ignorable %token LSL_SPACE -%type expr -%left LSL_BOOL_AND -%left LSL_BOOL_OR -%left LSL_BIT_AND LSL_BIT_XOR LSL_BIT_OR -%left LSL_EQUAL LSL_NOT_EQUAL -%left LSL_LESS_THAN LSL_GREATER_THAN LSL_LESS_EQUAL LSL_GREATER_EQUAL -%left LSL_LEFT_SHIFT LSL_RIGHT_SHIFT -%left LSL_SUBTRACT LSL_ADD -%left LSL_DIVIDE LSL_MODULO LSL_MULTIPLY +%type expr +%left LSL_BOOL_AND +%left LSL_BOOL_OR +%left LSL_BIT_AND LSL_BIT_XOR LSL_BIT_OR +%left LSL_EQUAL LSL_NOT_EQUAL +%left LSL_LESS_THAN LSL_GREATER_THAN LSL_LESS_EQUAL LSL_GREATER_EQUAL +%left LSL_LEFT_SHIFT LSL_RIGHT_SHIFT +%left LSL_SUBTRACT LSL_ADD +%left LSL_DIVIDE LSL_MODULO LSL_MULTIPLY %right LSL_BIT_NOT LSL_BOOL_NOT LSL_NEGATION +%left LSL_ANGLE_OPEN LSL_ANGLE_CLOSE +%token LSL_BRACKET_OPEN LSL_BRACKET_CLOSE %token LSL_PARENTHESIS_OPEN LSL_PARENTHESIS_CLOSE LSL_EXPRESSION +%right LSL_ASSIGNMENT_ADD LSL_ASSIGNMENT_SUBTRACT LSL_ASSIGNMENT_MULTIPLY LSL_ASSIGNMENT_MODULO LSL_ASSIGNMENT_DIVIDE LSL_ASSIGNMENT_PLAIN +%right LSL_DOT +%right LSL_DECREMENT_PRE LSL_INCREMENT_PRE +%token LSL_COMMA + +%token LSL_FLOAT %token LSL_INTEGER +%nonassoc LSL_TYPE_FLOAT LSL_TYPE_INTEGER LSL_TYPE_KEY LSL_TYPE_LIST LSL_TYPE_ROTATION LSL_TYPE_STRING LSL_TYPE_VECTOR + +%nonassoc LSL_DO LSL_FOR LSL_ELSE LSL_IF LSL_JUMP LSL_RETURN LSL_STATE_CHANGE LSL_WHILE + +%nonassoc LSL_LABEL + +%nonassoc LSL_BLOCK_OPEN LSL_BLOCK_CLOSE + %type statement %nonassoc LSL_STATEMENT -- cgit v1.1