DeforaOS/CPP
DeforaOS/CPP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supporting more operators

Browse Source
This commit is contained in:
Pierre Pronchery 2008-02-26 23:49:39 +00:00
parent 9725bf001b
commit 1a4b51f3ac
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/cpp.h
View File

@ -31,11 +31,13 @@ typedef enum _CppFilter { CPP_FILTER_TRIGRAPH = 1 } CppFilter;
typedef enum _CppCode
{
CPP_CODE_DQUOTE = 0,
CPP_CODE_OPERATOR_AEQUALS,
CPP_CODE_OPERATOR_AMPERSAND,
CPP_CODE_OPERATOR_BAR,
CPP_CODE_OPERATOR_DBAR,
CPP_CODE_OPERATOR_BEQUALS,
CPP_CODE_OPERATOR_COLON,
CPP_CODE_OPERATOR_DAMPERSAND,
CPP_CODE_OPERATOR_DBAR,
CPP_CODE_OPERATOR_DEQUALS,
CPP_CODE_OPERATOR_DGREATER,
CPP_CODE_OPERATOR_DIVIDE,
@ -51,12 +53,15 @@ typedef enum _CppCode
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_MODULO,
CPP_CODE_OPERATOR_MORE,
CPP_CODE_OPERATOR_MULTIPLY,
CPP_CODE_OPERATOR_NOT,
CPP_CODE_OPERATOR_OR,
CPP_CODE_OPERATOR_PEQUALS,
CPP_CODE_OPERATOR_PLUS,
CPP_CODE_OPERATOR_RBRACE,
CPP_CODE_OPERATOR_RBRACKET,

11
src/cpp.c
View File

@ -47,10 +47,11 @@ typedef struct _CppParser
/* variables */
static const CppOperator _cpp_operators[] =
{
/* FIXME "&=" */
{ CPP_CODE_OPERATOR_AEQUALS, "&=" },
{ CPP_CODE_OPERATOR_DAMPERSAND, "&&" },
{ CPP_CODE_OPERATOR_AMPERSAND, "&" },
{ CPP_CODE_OPERATOR_COLON, ":" },
{ CPP_CODE_OPERATOR_BEQUALS, "|=" },
{ CPP_CODE_OPERATOR_DBAR, "||" },
{ CPP_CODE_OPERATOR_BAR, "|" },
{ CPP_CODE_OPERATOR_DIVIDE, "/" },
@ -65,16 +66,15 @@ static const CppOperator _cpp_operators[] =
{ CPP_CODE_OPERATOR_DLESS, "<<" },
{ CPP_CODE_OPERATOR_LESS, "<" },
{ CPP_CODE_OPERATOR_LPAREN, "(" },
/* FIXME "|=" */
/* FIXME "->" */
/* FIXME "-=" */
{ CPP_CODE_OPERATOR_MGREATER, "->" },
{ CPP_CODE_OPERATOR_DMINUS, "--" },
{ CPP_CODE_OPERATOR_MEQUALS, "-=" },
{ CPP_CODE_OPERATOR_MINUS, "-" },
{ CPP_CODE_OPERATOR_MODULO, "%" },
{ CPP_CODE_OPERATOR_MULTIPLY, "*" },
{ CPP_CODE_OPERATOR_NOT, "!" },
/* FIXME "+=" */
{ CPP_CODE_OPERATOR_DPLUS, "++" },
{ CPP_CODE_OPERATOR_PEQUALS, "+=" },
{ CPP_CODE_OPERATOR_PLUS, "+" },
{ CPP_CODE_OPERATOR_RBRACE, "}" },
{ CPP_CODE_OPERATOR_RBRACKET, "]" },
@ -320,7 +320,6 @@ static int _cpp_callback_whitespace(Parser * parser, Token * token, int c,
/* cpp_callback_comment */
static int _cpp_callback_comment(Parser * parser, Token * token, int c,
void * data)
/* FIXME implement properly (and fallback on division) */
{
if(c != '/')
return 1;