From 866fc3e24769ba8268de06ee5e28fc634612449f Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Fri, 30 Jan 2015 00:18:52 -0500 Subject: [PATCH] Constant folding for string comparisons too --- fold.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fold.cpp b/fold.cpp index aee8e24..dab7436 100644 --- a/fold.cpp +++ b/fold.cpp @@ -1335,11 +1335,15 @@ ast_expression *fold::op_cmp(ast_value *a, ast_value *b, bool ne) { float la = immvalue_float(a); float lb = immvalue_float(b); check_inexact_float(a, b); - return (ast_expression*)m_imm_float[!(ne ? la == lb : la != lb)]; - } if (isvector(a) && isvector(b)) { + return (ast_expression*)m_imm_float[ne ? la != lb : la == lb]; + } else if (isvector(a) && isvector(b)) { vec3_t la = immvalue_vector(a); vec3_t lb = immvalue_vector(b); - return (ast_expression*)m_imm_float[!(ne ? vec3_cmp(la, lb) : !vec3_cmp(la, lb))]; + bool compare = vec3_cmp(la, lb); + return (ast_expression*)m_imm_float[ne ? !compare : compare]; + } else if (isstring(a) && isstring(b)) { + bool compare = !strcmp(immvalue_string(a), immvalue_string(b)); + return (ast_expression*)m_imm_float[ne ? !compare : compare]; } } return nullptr; -- 2.39.2