diff --git a/preprocessor b/preprocessor index 5c081db76..8dc70602c 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 5c081db76f480a508d856d06f9703d69ec857107 +Subproject commit 8dc70602c8122622406a146bf28e486f553768bc diff --git a/tests/example1_macro.mod b/tests/example1_macro.mod index be5da189c..fb6316945 100644 --- a/tests/example1_macro.mod +++ b/tests/example1_macro.mod @@ -218,5 +218,9 @@ stoch_simul; @#error "Error in cast of string to bool" @#endif +@#if !(true || "A") || (0 && "A") + @#error "problem with short circuit || or && operator" +@#endif + @#echomacrovars(save) @#echomacrovars