Merge branch 'save_qmark' into win32-compat.

BRING BACK THE Q_MARK!!!! campaign ;) Fix the ?? instead of just blatantly deleting it, and we can decide later whether we really want to remove it.

Conflicts:
	libwccl/parser/grammar.g

libwccl/parser/grammar.g

@@ -520,6 +520,12 @@ condit_sym
 				op.reset(new Wccl::Conditional<Wccl::TSet>(test, p_true));
 			}
 		}
+	| Q_MARK 
+			(p_true = sym_set_operators [tagset, vars])
+		Q_MARK 
+			(test = logical_predicates [tagset, vars]) {
+			op.reset(new Wccl::Conditional<Wccl::TSet>(test, p_true));
+		}
 ;
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
@@ -642,6 +648,12 @@ condit_str
 			op.reset(new Wccl::Conditional<Wccl::StrSet>(test, p_true));
 		}
 	}
+	| Q_MARK 
+			p_true = string_operators [tagset, vars]
+		Q_MARK 
+			test = logical_predicates [tagset, vars] {
+			op.reset(new Wccl::Conditional<Wccl::StrSet>(test, p_true));
+		}
 ;
 
 // ----------------------------------------------------------------------------
@@ -881,6 +893,12 @@ condit_bool
 			op.reset(new Wccl::Conditional<Wccl::Bool>(test, p_true));
 		}
 	}
+	| Q_MARK 
+			p_true = logical_predicates [tagset, vars]
+		Q_MARK 
+			test = logical_predicates [tagset, vars] {
+			op.reset(new Wccl::Conditional<Wccl::Bool>(test, p_true));
+		}
 ;
 
 ///////////////////////////////////////////////////////////////////////////////