X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens_punctuator.inc;h=e3b9366f03fa84d50c3765822547acd88794f5dd;hb=e3de7eaecb549e58c466d70b8f24d1f53aa9fc8a;hp=4894426a28a46a2acd3ccf1a769e8c531b5387df;hpb=1c622ff40fc61cbef1202888d3184215d88de680;p=cparser

diff --git a/tokens_punctuator.inc b/tokens_punctuator.inc
index 4894426..e3b9366 100644
--- a/tokens_punctuator.inc
+++ b/tokens_punctuator.inc
@@ -1,29 +1,31 @@
-/*PUNCTUATOR(LESSCOLON,                "<:",   = '[')
-PUNCTUATOR(COLONGREATER,             ":>",   = ']')
-PUNCTUATOR(LESSPERCENT,              "<%",   = '{')
-PUNCTUATOR(PERCENTGREATER,           "%>",   = '}')
-PUNCTUATOR(PERCENTCOLON,             "%:",   = '#')
-PUNCTUATOR(PERCENTCOLONPERCENTCOLON, "%:%:", = T_HASHHASH)*/
-
-PUNCTUATOR(RBRACK,          "[", = '[')
-PUNCTUATOR(LBRACK,          "]", = ']')
-PUNCTUATOR(LBRACE,          "(", = '(')
-PUNCTUATOR(RBRACE,          ")", = ')')
-PUNCTUATOR(RCURLY,          "{", = '{')
-PUNCTUATOR(LCURLY,          "}", = '}')
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
+ */
+PUNCTUATOR(LBRACK,          "[", = '[')
+PUNCTUATOR(RBRACK,          "]", = ']')
+PUNCTUATOR(LPAREN,          "(", = '(')
+PUNCTUATOR(RPAREN,          ")", = ')')
+PUNCTUATOR(LCURLY,          "{", = '{')
+PUNCTUATOR(RCURLY,          "}", = '}')
 PUNCTUATOR(DOT,             ".", = '.')
 PUNCTUATOR(AND,             "&", = '&')
+ALTERNATE(bitand,                = '&')
 PUNCTUATOR(ASTERISK,        "*", = '*')
 PUNCTUATOR(PLUS,            "+", = '+')
 PUNCTUATOR(MINUS,           "-", = '-')
 PUNCTUATOR(TILDE,           "~", = '~')
+ALTERNATE(compl,                 = '~')
 PUNCTUATOR(EXCLAMATIONMARK, "!", = '!')
+ALTERNATE(not,                   = '!')
 PUNCTUATOR(SLASH,           "/", = '/')
 PUNCTUATOR(PERCENT,         "%", = '%')
 PUNCTUATOR(LESS,            "<", = '<')
 PUNCTUATOR(GREATER,         ">", = '>')
 PUNCTUATOR(CARET,           "^", = '^')
+ALTERNATE(xor,                   = '^')
 PUNCTUATOR(PIPE,            "|", = '|')
+ALTERNATE(bitor,                 = '|')
 PUNCTUATOR(QUESTIONMARK,    "?", = '?')
 PUNCTUATOR(COLON,           ":", = ':')
 PUNCTUATOR(SEMICOLON,       ";", = ';')
@@ -31,7 +33,8 @@ PUNCTUATOR(EQUAL,           "=", = '=')
 PUNCTUATOR(COMMA,           ",", = ',')
 PUNCTUATOR(HASH,            "#", = '#')
 
-PUNCTUATOR(MINUSGREATER,             "->", = 265)
+/* Start after extended ASCII. */
+PUNCTUATOR(MINUSGREATER,             "->", = 256)
 PUNCTUATOR(PLUSPLUS,                 "++",)
 PUNCTUATOR(MINUSMINUS,               "--",)
 PUNCTUATOR(LESSLESS,                 "<<",)
@@ -40,8 +43,11 @@ PUNCTUATOR(LESSEQUAL,                "<=",)
 PUNCTUATOR(GREATEREQUAL,             ">=",)
 PUNCTUATOR(EQUALEQUAL,               "==",)
 PUNCTUATOR(EXCLAMATIONMARKEQUAL,     "!=",)
+ALTERNATE(not_eq,                          = T_EXCLAMATIONMARKEQUAL)
 PUNCTUATOR(ANDAND,                   "&&",)
+ALTERNATE(and,                             = T_ANDAND)
 PUNCTUATOR(PIPEPIPE,                 "||",)
+ALTERNATE(or,                              = T_PIPEPIPE)
 PUNCTUATOR(DOTDOTDOT,                "...",)
 PUNCTUATOR(ASTERISKEQUAL,            "*=",)
 PUNCTUATOR(SLASHEQUAL,               "/=",)
@@ -51,6 +57,10 @@ PUNCTUATOR(MINUSEQUAL,               "-=",)
 PUNCTUATOR(LESSLESSEQUAL,            "<<=",)
 PUNCTUATOR(GREATERGREATEREQUAL,      ">>=",)
 PUNCTUATOR(ANDEQUAL,                 "&=",)
+ALTERNATE(and_eq,                          = T_ANDEQUAL)
 PUNCTUATOR(CARETEQUAL,               "^=",)
+ALTERNATE(xor_eq,                          = T_CARETEQUAL)
 PUNCTUATOR(PIPEEQUAL,                "|=",)
+ALTERNATE(or_eq,                           = T_PIPEEQUAL)
+PUNCTUATOR(COLONCOLON,               "::",)
 PUNCTUATOR(HASHHASH,                 "##",)