test 10

src/lexer.l

@@ -37,6 +37,8 @@ return                  { return yy::parser::token::TOK_KW_RETURN; }
 for                     { return yy::parser::token::TOK_KW_FOR; }
 in                      { return yy::parser::token::TOK_KW_IN; }
 not                     { return yy::parser::token::TOK_KW_NOT; }
+and                     { return yy::parser::token::TOK_KW_AND; }
+or                      { return yy::parser::token::TOK_KW_OR; }
 
 \=\=                    { return yy::parser::token::TOK_EQ; }
 \!\=                    { return yy::parser::token::TOK_NE; }
@@ -51,6 +53,11 @@ not                     { return yy::parser::token::TOK_KW_NOT; }
 \/                      { return yy::parser::token::TOK_DIVIDE; }
 \%                      { return yy::parser::token::TOK_MODULO; }
 \~                      { return yy::parser::token::TOK_BIT_NOT; }
+\&                      { return yy::parser::token::TOK_BIT_AND; }
+\|                      { return yy::parser::token::TOK_BIT_OR; }
+\^                      { return yy::parser::token::TOK_BIT_XOR; }
+\<\<                    { return yy::parser::token::TOK_LSHIFT; }
+\>\>                    { return yy::parser::token::TOK_RSHIFT; }
 \(                      { return yy::parser::token::TOK_L_PAREN; }
 \)                      { return yy::parser::token::TOK_R_PAREN; }
 \[                      { return yy::parser::token::TOK_L_BRACKET; }

src/parser.y

@@ -27,8 +27,8 @@
 %token <std::string> IDENTIFIER
 %token <std::string> STRING
 %token <int> NUMBER
-%token ASSIGN PLUS MINUS L_PAREN R_PAREN COLON EQ NE LT GT LTE GTE MULTIPLY DIVIDE MODULO L_BRACKET L_BRACE R_BRACKET R_BRACE DOT SEMICOLON COMMA BIT_NOT
-%token KW_DEF KW_IF KW_RETURN KW_FOR KW_IN KW_NOT
+%token ASSIGN PLUS MINUS L_PAREN R_PAREN COLON EQ NE LT GT LTE GTE MULTIPLY DIVIDE MODULO L_BRACKET L_BRACE R_BRACKET R_BRACE DOT SEMICOLON COMMA BIT_NOT BIT_AND BIT_OR BIT_XOR LSHIFT RSHIFT
+%token KW_DEF KW_IF KW_RETURN KW_FOR KW_IN KW_NOT KW_AND KW_OR
 %token EOF NEWLINE INDENT DEDENT
 
 

test/lexer/09.out

@@ -10,4 +10,4 @@ INDENT
 IDENTIFIER pass
 NEWLINE
 DEDENT
-EOF
+EOF

test/lexer/10.out

@@ -10,4 +10,4 @@ IDENTIFIER e
 RSHIFT
 IDENTIFIER f
 NEWLINE
-EOF
+EOF