[qfcc] Make short-circuit boolean logic language dependent

And disable it for GLSL. I might need to make it target-dependent
instead as I don't know if I'll be able to implement it in SPIR-V, and
when I get to the C back-end, it will be superfluous.

tools/qfcc/include/rua-lang.h

@@ -200,6 +200,7 @@ const char *rua_keyword_get_key (const void *dir, void *unused) __attribute__((p
 typedef struct language_s {
 	bool        initialized;
 	bool        always_overload;
+	bool        short_circuit;
 	void      (*init) (rua_ctx_t *ctx);
 	int       (*parse) (FILE *in, rua_ctx_t *ctx);
 	int       (*finish) (const char *file, rua_ctx_t *ctx);

tools/qfcc/source/expr_binary.c

@@ -563,6 +563,12 @@ static expr_type_t bit_ops[] = {
 	{}
 };
 
+static expr_type_t bool_ops[] = {
+	{   .match_a = is_boolean, .match_b = is_boolean, },
+
+	{}
+};
+
 #define countof(x) (sizeof(x)/sizeof(x[0]))
 
 static expr_type_t *expr_types[] = {
@@ -582,6 +588,9 @@ static expr_type_t *expr_types[] = {
 	['|'] = bit_ops,
 	['^'] = bit_ops,
 	['%'] = mod_ops,
+	[QC_AND] = bool_ops,
+	[QC_OR] = bool_ops,
+	[QC_XOR] = bool_ops,
 	[QC_MOD] = mod_ops,
 	[QC_GEOMETRIC] = nullptr,	// handled by algebra_binary_expr
 	[QC_HADAMARD] = mul_ops,

tools/qfcc/source/expr_process.c

@@ -39,6 +39,7 @@
 #include "tools/qfcc/include/diagnostic.h"
 #include "tools/qfcc/include/expr.h"
 #include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
 #include "tools/qfcc/include/qfcc.h"
 #include "tools/qfcc/include/rua-lang.h"
 #include "tools/qfcc/include/shared.h"
@@ -81,9 +82,12 @@ proc_expr (const expr_t *expr, rua_ctx_t *ctx)
 		return e2;
 	}
 
-	if (expr->expr.op == QC_AND || expr->expr.op == QC_OR) {
-		auto label = new_label_expr ();
-		return bool_expr (expr->expr.op, label, e1, e2);
+	if (options.code.short_circuit
+		&& ctx->language->short_circuit) {
+		if (expr->expr.op == QC_AND || expr->expr.op == QC_OR) {
+			auto label = new_label_expr ();
+			return bool_expr (expr->expr.op, label, e1, e2);
+		}
 	}
 
 	auto e = binary_expr (expr->expr.op, e1, e2);

tools/qfcc/source/glsl-parse.y

@@ -554,7 +554,7 @@ logical_and_expression
 	: inclusive_or_expression
 	| logical_and_expression AND inclusive_or_expression
 		{
-			$$ = bool_expr (QC_AND, nullptr, $1, $3);
+			$$ = new_binary_expr (QC_AND, $1, $3);
 		}
 	;
 
@@ -562,7 +562,7 @@ logical_xor_expression
 	: logical_and_expression
 	| logical_xor_expression XOR logical_and_expression
 		{
-			$$ = bool_expr (QC_XOR, nullptr, $1, $3);
+			$$ = new_binary_expr (QC_XOR, $1, $3);
 		}
 	;
 
@@ -570,7 +570,7 @@ logical_or_expression
 	: logical_xor_expression
 	| logical_or_expression OR logical_xor_expression
 		{
-			$$ = bool_expr (QC_OR, nullptr, $1, $3);
+			$$ = new_binary_expr (QC_OR, $1, $3);
 		}
 	;
 
@@ -1935,6 +1935,7 @@ glsl_version (int version, const char *profile, rua_ctx_t *ctx)
 
 language_t lang_glsl_comp = {
 	.always_overload = true,
+	.short_circuit = false,
 	.init = glsl_init_comp,
 	.parse = glsl_yyparse,
 	.extension = glsl_extension,
@@ -1946,6 +1947,7 @@ language_t lang_glsl_comp = {
 
 language_t lang_glsl_vert = {
 	.always_overload = true,
+	.short_circuit = false,
 	.init = glsl_init_vert,
 	.parse = glsl_yyparse,
 	.extension = glsl_extension,
@@ -1957,6 +1959,7 @@ language_t lang_glsl_vert = {
 
 language_t lang_glsl_tesc = {
 	.always_overload = true,
+	.short_circuit = false,
 	.init = glsl_init_tesc,
 	.parse = glsl_yyparse,
 	.extension = glsl_extension,
@@ -1968,6 +1971,7 @@ language_t lang_glsl_tesc = {
 
 language_t lang_glsl_tese = {
 	.always_overload = true,
+	.short_circuit = false,
 	.init = glsl_init_tese,
 	.parse = glsl_yyparse,
 	.extension = glsl_extension,
@@ -1979,6 +1983,7 @@ language_t lang_glsl_tese = {
 
 language_t lang_glsl_geom = {
 	.always_overload = true,
+	.short_circuit = false,
 	.init = glsl_init_geom,
 	.parse = glsl_yyparse,
 	.extension = glsl_extension,
@@ -1990,6 +1995,7 @@ language_t lang_glsl_geom = {
 
 language_t lang_glsl_frag = {
 	.always_overload = true,
+	.short_circuit = false,
 	.init = glsl_init_frag,
 	.parse = glsl_yyparse,
 	.extension = glsl_extension,

tools/qfcc/source/qc-parse.y

@@ -3256,6 +3256,7 @@ rua_init (rua_ctx_t *ctx)
 }
 
 language_t lang_ruamoko = {
+	.short_circuit = true,
 	.init = rua_init,
 	.parse = qc_yyparse,
 	.finish = qc_finish,

tools/qfcc/source/qp-lex.l

@@ -330,6 +330,7 @@ qp_yyparse (FILE *in, rua_ctx_t *ctx)
 }
 
 language_t lang_pascal = {
+	.short_circuit = true,
 	.parse = qp_yyparse,
 };
 

tools/qfcc/source/statements.c

@@ -1880,13 +1880,31 @@ expr_alias (sblock_t *sblock, const expr_t *e, operand_t **op)
 	return sblock;
 }
 
+static int
+convert_boolean_op (int op)
+{
+	// short-circuit logic has been disabled so the operators get here, but
+	// there are no such instructions, so convert to bit ops (and hope the
+	// midle layers have done proper boolean conversions)
+	if (op == QC_AND) {
+		return '&';
+	}
+	if (op == QC_OR) {
+		return '|';
+	}
+	if (op == QC_XOR) {
+		return '^';
+	}
+	return op;
+}
+
 static sblock_t *
 expr_expr (sblock_t *sblock, const expr_t *e, operand_t **op)
 {
 	const char *opcode;
 	statement_t *s;
 
-	opcode = convert_op (e->expr.op);
+	opcode = convert_op (convert_boolean_op (e->expr.op));
 	if (!opcode)
 		internal_error (e, "ice ice baby");
 	if (strcmp (opcode, "ne") == 0 && is_string (get_type (e->expr.e1))) {

tools/qfcc/source/target_spirv.c

@@ -1116,6 +1116,12 @@ spirv_uexpr (const expr_t *e, spirvctx_t *ctx)
 	return id;
 }
 
+static unsigned
+spirv_bool (const expr_t *e, spirvctx_t *ctx)
+{
+	internal_error (e, "oops");
+}
+
 static unsigned
 spirv_label (const expr_t *e, spirvctx_t *ctx)
 {
@@ -1804,6 +1810,7 @@ static unsigned
 spirv_emit_expr (const expr_t *e, spirvctx_t *ctx)
 {
 	static spirv_expr_f funcs[ex_count] = {
+		[ex_bool] = spirv_bool,
 		[ex_label] = spirv_label,
 		[ex_block] = spirv_block,
 		[ex_expr] = spirv_expr,