X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=lexer.h;h=41a135549f5cce35b22aeb20203ab6ecfd4e8a2e;hp=44f6491725c17a5dc458cdf789a0e2b8cf248450;hb=9cc4fe1ed246e3c37af7cbd7245b0b413372f3b9;hpb=0f479f3e885211d633d6fd1e447e7677e56d6ccc diff --git a/lexer.h b/lexer.h index 44f6491..41a1355 100644 --- a/lexer.h +++ b/lexer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 + * Copyright (C) 2012, 2013, 2014 * Wolfgang Bumiller * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -22,6 +22,8 @@ */ #ifndef GMQCC_LEXER_HDR #define GMQCC_LEXER_HDR +#include "gmqcc.h" + typedef struct token_s token; struct token_s { @@ -185,8 +187,7 @@ static const oper_info c_operators[] = { { "++", 1, opid3('+','+','P'), ASSOC_RIGHT, 16, OP_PREFIX, false}, { "--", 1, opid3('-','-','P'), ASSOC_RIGHT, 16, OP_PREFIX, false}, - { "**", 2, opid2('*','*'), ASSOC_RIGHT, 15, 0, true}, - + { "**", 2, opid2('*','*'), ASSOC_RIGHT, 14, 0, true}, { "!", 1, opid2('!','P'), ASSOC_RIGHT, 14, OP_PREFIX, true}, { "~", 1, opid2('~','P'), ASSOC_RIGHT, 14, OP_PREFIX, true}, { "+", 1, opid2('+','P'), ASSOC_RIGHT, 14, OP_PREFIX, false},