From 8364a0cf2f96ebf7095c83b8fc6d3e136bd00b9a Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 3 Mar 2008 16:24:04 +0000 Subject: [PATCH] Added more missing operators --- include/cpp.h | 5 +++++ src/cpp.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/include/cpp.h b/include/cpp.h index 8d53ed1..1208bcf 100644 --- a/include/cpp.h +++ b/include/cpp.h @@ -65,19 +65,23 @@ typedef enum _CppCode CPP_CODE_OPERATOR_DOTDOTDOT, CPP_CODE_OPERATOR_DPLUS, CPP_CODE_OPERATOR_EQUALS, + CPP_CODE_OPERATOR_GEQUALS, CPP_CODE_OPERATOR_GREATER, CPP_CODE_OPERATOR_HASH, CPP_CODE_OPERATOR_INVERSE, CPP_CODE_OPERATOR_LBRACE, CPP_CODE_OPERATOR_LBRACKET, + CPP_CODE_OPERATOR_LEQUALS, CPP_CODE_OPERATOR_LESS, CPP_CODE_OPERATOR_LPAREN, CPP_CODE_OPERATOR_MASK, CPP_CODE_OPERATOR_MEQUALS, CPP_CODE_OPERATOR_MGREATER, CPP_CODE_OPERATOR_MINUS, + CPP_CODE_OPERATOR_MODEQUALS, CPP_CODE_OPERATOR_MODULO, CPP_CODE_OPERATOR_MORE, + CPP_CODE_OPERATOR_NEQUALS, CPP_CODE_OPERATOR_NOT, CPP_CODE_OPERATOR_OR, CPP_CODE_OPERATOR_PEQUALS, @@ -88,6 +92,7 @@ typedef enum _CppCode CPP_CODE_OPERATOR_RPAREN, CPP_CODE_OPERATOR_SEMICOLON, CPP_CODE_OPERATOR_TEQUALS, + CPP_CODE_OPERATOR_TILDE, CPP_CODE_OPERATOR_TIMES, CPP_CODE_OPERATOR_XEQUALS, CPP_CODE_OPERATOR_XOR, diff --git a/src/cpp.c b/src/cpp.c index 51af479..aba5a34 100644 --- a/src/cpp.c +++ b/src/cpp.c @@ -103,6 +103,7 @@ static const CppOperator _cpp_operators[] = { CPP_CODE_OPERATOR_DEQUALS, "==" }, { CPP_CODE_OPERATOR_EQUALS, "=" }, { CPP_CODE_OPERATOR_DGEQUALS, ">>=" }, + { CPP_CODE_OPERATOR_GEQUALS, ">=" }, { CPP_CODE_OPERATOR_DGREATER, ">>" }, { CPP_CODE_OPERATOR_GREATER, ">" }, { CPP_CODE_OPERATOR_DHASH, "##" }, @@ -114,6 +115,7 @@ static const CppOperator _cpp_operators[] = { CPP_CODE_OPERATOR_DLESS, "<<" }, { CPP_CODE_OPERATOR_LBRACKET, "<:" }, { CPP_CODE_OPERATOR_LBRACE, "<%" }, + { CPP_CODE_OPERATOR_LEQUALS, "<=" }, { CPP_CODE_OPERATOR_LESS, "<" }, { CPP_CODE_OPERATOR_LPAREN, "(" }, { CPP_CODE_OPERATOR_MGREATER, "->" }, @@ -123,7 +125,9 @@ static const CppOperator _cpp_operators[] = { CPP_CODE_OPERATOR_RBRACE, "%>" }, { CPP_CODE_OPERATOR_DHASH, "%:%:" }, { CPP_CODE_OPERATOR_HASH, "%:" }, + { CPP_CODE_OPERATOR_MODEQUALS, "%=" }, { CPP_CODE_OPERATOR_MODULO, "%" }, + { CPP_CODE_OPERATOR_NEQUALS, "!=" }, { CPP_CODE_OPERATOR_NOT, "!" }, { CPP_CODE_OPERATOR_DPLUS, "++" }, { CPP_CODE_OPERATOR_PEQUALS, "+=" }, @@ -134,6 +138,7 @@ static const CppOperator _cpp_operators[] = { CPP_CODE_OPERATOR_RPAREN, ")" }, { CPP_CODE_OPERATOR_SEMICOLON, ";" }, { CPP_CODE_OPERATOR_TEQUALS, "*=" }, + { CPP_CODE_OPERATOR_TILDE, "~" }, { CPP_CODE_OPERATOR_TIMES, "*" }, { CPP_CODE_OPERATOR_XEQUALS, "^=" }, { CPP_CODE_OPERATOR_XOR, "^" }