Added lexer rules for operators.

src/compiler/preprocessor/new/Token.h

@@ -21,14 +21,27 @@ struct Token
         CONST_INT,
         CONST_FLOAT,
 
-        OP_LEFT_SHIFT,
-        OP_RIGHT_SHIFT,
-        OP_LESS_EQUAL,
-        OP_GREATER_EQUAL,
-        OP_EQUAL,
-        OP_NOT_EQUAL,
-        OP_AND_AND,
-        OP_OR_OR
+        OP_INC,
+        OP_DEC,
+        OP_LEFT,
+        OP_RIGHT,
+        OP_LE,
+        OP_GE,
+        OP_EQ,
+        OP_NE,
+        OP_AND,
+        OP_XOR,
+        OP_OR,
+        OP_ADD_ASSIGN,
+        OP_SUB_ASSIGN,
+        OP_MUL_ASSIGN,
+        OP_DIV_ASSIGN,
+        OP_MOD_ASSIGN,
+        OP_LEFT_ASSIGN,
+        OP_RIGHT_ASSIGN,
+        OP_AND_ASSIGN,
+        OP_XOR_ASSIGN,
+        OP_OR_ASSIGN
     };
     struct Location
     {

src/compiler/preprocessor/new/pp.l

@@ -77,6 +77,28 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
     return pp::Token::CONST_FLOAT;
 }
 
+"++"  { return pp::Token::OP_INC; }
+"--"  { return pp::Token::OP_DEC; }
+"<<"  { return pp::Token::OP_LEFT; }
+">>"  { return pp::Token::OP_RIGHT; }
+"<="  { return pp::Token::OP_LE; }
+">="  { return pp::Token::OP_GE; }
+"=="  { return pp::Token::OP_EQ; }
+"!="  { return pp::Token::OP_NE; }
+"&&"  { return pp::Token::OP_AND; }
+"^^"  { return pp::Token::OP_XOR; }
+"||"  { return pp::Token::OP_OR; }
+"+="  {  return pp::Token::OP_ADD_ASSIGN; }
+"-="  {  return pp::Token::OP_SUB_ASSIGN; }
+"*="  {  return pp::Token::OP_MUL_ASSIGN; }
+"/="  {  return pp::Token::OP_DIV_ASSIGN; }
+"%="  {  return pp::Token::OP_MOD_ASSIGN; }
+"<<=" {  return pp::Token::OP_LEFT_ASSIGN; }
+">>=" {  return pp::Token::OP_RIGHT_ASSIGN; }
+"&="  {  return pp::Token::OP_AND_ASSIGN; }
+"^="  {  return pp::Token::OP_XOR_ASSIGN; }
+"|="  {  return pp::Token::OP_OR_ASSIGN; }
+
 {PUNCTUATOR} { return yytext[0]; }
 
 [ \t\v\f]+ { /* Ignore whitespace */ }

src/compiler/preprocessor/new/pp_tab.h

-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.4.2.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+      Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
+   Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +27,11 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -60,45 +59,25 @@
      IDENTIFIER = 276
    };
 #endif
-/* Tokens.  */
-#define HASH 258
-#define HASH_UNDEF 259
-#define HASH_IF 260
-#define HASH_IFDEF 261
-#define HASH_IFNDEF 262
-#define HASH_ELSE 263
-#define HASH_ELIF 264
-#define HASH_ENDIF 265
-#define DEFINED 266
-#define HASH_ERROR 267
-#define HASH_PRAGMA 268
-#define HASH_EXTENSION 269
-#define HASH_VERSION 270
-#define HASH_LINE 271
-#define HASH_DEFINE_OBJ 272
-#define HASH_DEFINE_FUNC 273
-#define INT_CONSTANT 274
-#define FLOAT_CONSTANT 275
-#define IDENTIFIER 276
-
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-
 {
+
+
     int ival;
     std::string* sval;
     pp::Token* tval;
     pp::TokenVector* tlist;
-}
-/* Line 1489 of yacc.c.  */
 
-	YYSTYPE;
+
+
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
@@ -117,3 +96,4 @@ typedef struct YYLTYPE
 #endif
 
 
+