darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-07 23:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Work in progress ~ operator implemented as -1-x.

Browse source
This commit is contained in:
Dale Weiler 2013-02-01 12:56:01 +00:00
parent bf6eb9432e
commit 03b933bc7a
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lexer.c
View file

@ -1290,8 +1290,9 @@ int lex_do(lex_file *lex)
if (ch == '+' || ch == '-' || /* ++, --, +=, -= and -> as well! */ if (ch == '+' || ch == '-' || /* ++, --, +=, -= and -> as well! */
ch == '>' || ch == '<' || /* <<, >>, <=, >= */ ch == '>' || ch == '<' || /* <<, >>, <=, >= */
ch == '=' || ch == '!' || /* ==, != */ ch == '=' || ch == '!' || /* ==, != */
ch == '&' || ch == '|') /* &&, ||, &=, |= */ ch == '&' || ch == '|' || /* &&, ||, &=, |= */
{ ch == '~' /* ~=, ~ */
) {
lex_tokench(lex, ch); lex_tokench(lex, ch);
nextch = lex_getch(lex); nextch = lex_getch(lex);
@ -1484,6 +1485,6 @@ int lex_do(lex_file *lex)
return (lex->tok.ttype = ch); return (lex->tok.ttype = ch);
} }
lexerror(lex, "unknown token"); lexerror(lex, "unknown token: %c", lex->tok);
return (lex->tok.ttype = TOKEN_ERROR); return (lex->tok.ttype = TOKEN_ERROR);
} }

16
parser.c
View file

@ -951,6 +951,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
return false; return false;
case opid1('|'): case opid1('|'):
case opid1('&'): case opid1('&'):
case opid1('~'):
if (NotSameType(TYPE_FLOAT)) { if (NotSameType(TYPE_FLOAT)) {
compile_error(ctx, "invalid types used in expression: cannot perform bit operations between types %s and %s", compile_error(ctx, "invalid types used in expression: cannot perform bit operations between types %s and %s",
type_name[exprs[0]->expression.vtype], type_name[exprs[0]->expression.vtype],
@ -1346,6 +1347,21 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
asbinstore->keep_dest = true; asbinstore->keep_dest = true;
out = (ast_expression*)asbinstore; out = (ast_expression*)asbinstore;
break; break;
case opid2('~', 'P'):
if (exprs[0]->expression.vtype != TYPE_FLOAT) {
ast_type_to_string(exprs[0], ty1, sizeof(ty1));
compile_error(ast_ctx(exprs[0]), "invalid type for bit not: %s", ty1);
return false;
}
if (ast_istype(exprs[0], ast_value) && asvalue[0]->cvq == CV_CONST) {
compile_error(ast_ctx(exprs[0]), "assignment to constant `%s`", asvalue[0]->name);
}
out = (ast_expression*)ast_binary_new(ctx, INSTR_SUB_F, (ast_expression*)parser_const_float(parser, -1), exprs[0]);
break;
} }
#undef NotSameType #undef NotSameType