faster conditional order

CISC · web-flow · commit 9371988711b6 · 2025-03-01T09:05:28.000+01:00
diff --git a/examples/main/main.cpp b/examples/main/main.cpp
@@ -797,7 +797,7 @@ int main(int argc, char ** argv) {
                 assistant_ss << common_token_to_piece(ctx, id, false);
             }
 
-            if ((waiting_for_first_input || n_past > 0) && is_interacting) {
+            if ((n_past > 0 || waiting_for_first_input) && is_interacting) {
                 LOG_DBG("waiting for user input\n");
 
                 if (params.conversation_mode) {
@@ -887,7 +887,7 @@ int main(int argc, char ** argv) {
                 input_echo = false; // do not echo this again
             }
 
-            if (waiting_for_first_input || n_past > 0) {
+            if (n_past > 0 || waiting_for_first_input) {
                 if (is_interacting) {
                     common_sampler_reset(smpl);
                 }

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ int main(int argc, char ** argv) {`
`797`	`797`	`assistant_ss << common_token_to_piece(ctx, id, false);`
`798`	`798`	`}`
`799`	`799`
`800`		`- if ((waiting_for_first_input \|\| n_past > 0) && is_interacting) {`
	`800`	`+ if ((n_past > 0 \|\| waiting_for_first_input) && is_interacting) {`
`801`	`801`	`LOG_DBG("waiting for user input\n");`
`802`	`802`
`803`	`803`	`if (params.conversation_mode) {`
`@@ -887,7 +887,7 @@ int main(int argc, char ** argv) {`
`887`	`887`	`input_echo = false; // do not echo this again`
`888`	`888`	`}`
`889`	`889`
`890`		`- if (waiting_for_first_input \|\| n_past > 0) {`
	`890`	`+ if (n_past > 0 \|\| waiting_for_first_input) {`
`891`	`891`	`if (is_interacting) {`
`892`	`892`	`common_sampler_reset(smpl);`
`893`	`893`	`}`