From: Wolfgang (Blub) Bumiller Date: Wed, 21 Nov 2012 19:16:28 +0000 (+0100) Subject: Inserting ternary in the qcc-operator-list at the place fteqcc would have it X-Git-Tag: 0.1.9~373 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8517221b1b84a0b5a343c7d8f186938a109ba2ce;p=xonotic%2Fgmqcc.git Inserting ternary in the qcc-operator-list at the place fteqcc would have it --- diff --git a/lexer.h b/lexer.h index 561148c..137bfe9 100644 --- a/lexer.h +++ b/lexer.h @@ -262,7 +262,9 @@ static const oper_info qcc_operators[] = { { "&&", 2, opid2('&','&'), ASSOC_LEFT, 5, 0 }, { "||", 2, opid2('|','|'), ASSOC_LEFT, 5, 0 }, - { ",", 2, opid1(','), ASSOC_LEFT, 1, 0 } + { ",", 2, opid1(','), ASSOC_LEFT, 2, 0 } + + { "?", 3, opid2('?',':'), ASSOC_RIGHT, 1, 0 }, }; static const size_t qcc_operator_count = (sizeof(qcc_operators) / sizeof(qcc_operators[0]));