Index: src/tests/.expect/ShortCircuit.txt
===================================================================
--- src/tests/.expect/ShortCircuit.txt	(revision d5410577d0c8b539b34bc0b9543bc7f9eff75534)
+++ src/tests/.expect/ShortCircuit.txt	(revision d5410577d0c8b539b34bc0b9543bc7f9eff75534)
@@ -0,0 +1,4 @@
+1 0 
+1 
+0 
+0 1 
Index: src/tests/ShortCircuit.c
===================================================================
--- src/tests/ShortCircuit.c	(revision e7aed494e999910bcc15611de0e9f4156e6dbb73)
+++ src/tests/ShortCircuit.c	(revision d5410577d0c8b539b34bc0b9543bc7f9eff75534)
@@ -10,6 +10,46 @@
 }
 
+void g() {
+    int a;
+    struct { int b; } a;
+    if ( a ) {
+		while ( a ) {
+			int *b;
+			for ( b; a; b ) {
+			}
+		}
+    }
+}
+
+#include <fstream>
+
+struct test_t {
+	int x;
+};
+
+int ?!=?( test_t lhs, int rhs ) {
+	sout | lhs.x | " ";
+	return lhs.x != 0;
+}
+
+
 int main(int argc, char const *argv[])
 {
+	test_t true_val, false_val;
+	true_val.x = 1;
+	false_val.x = 0;
+
+	true_val && false_val;
+	sout | endl;
+
+	true_val || false_val;
+	sout | endl;
+
+	false_val && true_val;
+	sout | endl;
+
+	false_val || true_val;
+	sout | endl;
+
 	return 0;
 }
Index: c/tests/Statement.c
===================================================================
--- src/tests/Statement.c	(revision e7aed494e999910bcc15611de0e9f4156e6dbb73)
+++ 	(revision )
@@ -1,19 +1,0 @@
-int ?=?( int *, int );
-int ?!=?( int, int );
-int 0;
-
-void f() {
-    int a;
-    struct { int b; } a;
-    if ( a ) {
-		while ( a ) {
-			int *b;
-			for ( b; a; b ) {
-			}
-		}
-    }
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// End: //