From 14bb4f470580f309c25fb4f9af3d23984e999892 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 10 Apr 2018 21:23:03 -0400 Subject: [PATCH] add more tokens --- src/parser/parser.l | 19 +++++++++++++++++++ src/parser/parser.y | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/parser/parser.l b/src/parser/parser.l index f1698c5..c5c719f 100644 --- a/src/parser/parser.l +++ b/src/parser/parser.l @@ -33,12 +33,31 @@ static String * build_string = NULL; && return TOK_AND; \|\| return TOK_OR; ! return TOK_NOT; +& return TOK_BITAND; +\| return TOK_BITOR; +~ return TOK_BITNOT; +\+\+ return TOK_INCREMENT; +-- return TOK_DECREMENT; +\<\< return TOK_LSHIFT; +\>\> return TOK_RSHIFT; +\+= return TOK_PLUSEQUALS; +-= return TOK_MINUSEQUALS; +\*= return TOK_TIMESEQUALS; +\/= return TOK_DIVIDEEQUALS; +%= return TOK_MODEQUALS; +\^= return TOK_XOREQUALS; +\<\<= return TOK_LSHIFTEQUALS; +\>\>= return TOK_RSHIFTEQUALS; +&= return TOK_BITANDEQUALS; +\|= return TOK_BITOREQUALS; ; return TOK_SEMICOLON; : return TOK_COLON; \? return TOK_QUESTION; \. return TOK_DOT; +-\> return TOK_ARROW; , return TOK_COMMA; +\.\.\. return TOK_ELLIPSES; \{ return TOK_LCURLY; \} return TOK_RCURLY; diff --git a/src/parser/parser.y b/src/parser/parser.y index 8e19272..a0c801e 100644 --- a/src/parser/parser.y +++ b/src/parser/parser.y @@ -32,12 +32,31 @@ static void handle_error(const char * str, const YYLTYPE * yylloc); %token TOK_AND; %token TOK_OR; %token TOK_NOT; +%token TOK_BITAND; +%token TOK_BITOR; +%token TOK_BITNOT; +%token TOK_INCREMENT +%token TOK_DECREMENT +%token TOK_LSHIFT +%token TOK_RSHIFT +%token TOK_PLUSEQUALS; +%token TOK_MINUSEQUALS; +%token TOK_TIMESEQUALS; +%token TOK_DIVIDEEQUALS; +%token TOK_MODEQUALS; +%token TOK_XOREQUALS; +%token TOK_LSHIFTEQUALS; +%token TOK_RSHIFTEQUALS; +%token TOK_BITANDEQUALS; +%token TOK_BITOREQUALS; %token TOK_SEMICOLON; %token TOK_COLON; %token TOK_QUESTION; %token TOK_DOT; +%token TOK_ARROW; %token TOK_COMMA; +%token TOK_ELLIPSES; %token TOK_LCURLY; %token TOK_RCURLY;