Add some CPP tests.

Test/cppComplexExpr.vert

+#define ON1
+#define ON2
+
+float sum = 0.0;
+
+void main()
+{
+#if defined(ON1) && (defined(OFF) || defined(ON2))
+//yes
+    sum += 1.0;
+#endif
+
+#if !defined(ON1) || (defined(OFF) || (!defined(OFF2) && defined(ON2)))
+//yes
+    sum += 20.0;
+#endif
+
+#if defined(ON1) && (defined(OFF) || !defined(ON2))
+//no
+    sum += 0.1;
+#endif
+
+#if !defined(ON1) || (defined(OFF) || !defined(OFF2) && !defined(ON2))
+//no
+    sum += 0.2;
+#endif
+
+#if !defined(ON1) || !defined(OFF) || defined(ON2) && defined(OFF2)
+//yes
+    sum += 300.0;
+#endif
+
+#if (!defined(ON1) || !defined(OFF) || defined(ON2)) && defined(OFF2)
+//no
+    sum += 0.4;
+#endif
+
+// sum should be 321.0
+    gl_Position = vec4(sum);
+}

Test/cppIndent.vert

+#define ON
+
+float sum = 0.0;
+
+void main()
+{
+
+#ifdef ON
+//yes
+sum += 1.0;
+#endif
+
+#ifdef OFF
+    //no
+    sum += 20.0;
+#endif
+
+    #if defined(ON)
+    //yes
+    sum += 300.0;
+    #endif
+
+    #if defined(OFF)
+    //no
+    sum += 4000.0;
+    #endif
+
+		  #if !defined(ON)
+		//no
+		sum += 50000.0;
+		#endif
+
+  	#if !defined(OFF)
+		//yes
+		sum += 600000.0;
+		#endif
+
+    #if defined (ON) && defined               (OFF)         
+//no
+sum += 7000000.0;
+    #endif
+
+#if        defined   (  ON         ) && !        defined(OFF)
+//yes
+sum += 80000000.0;
+#endif
+
+#if defined(OFF) || defined(ON)
+//yes
+sum += 900000000.0;
+#endif
+
+// sum should be 980600301.0
+    gl_Position = vec4(sum);
+}

Test/cppNest.vert

+#define ON
+
+float sum = 0.0;
+
+void main()
+{
+
+#ifdef ON
+//yes
+sum += 1.0;
+
+    #ifdef OFF
+    //no
+    sum += 20.0;
+    #endif
+
+    #if defined(ON)
+    //yes
+    sum += 300.0;
+    #endif
+
+#endif
+
+
+#if defined(OFF)
+//no
+sum += 4000.0;
+
+#if !defined(ON)
+//no
+sum += 50000.0;
+#endif
+
+    //no
+    sum += 0.1;
+    #ifdef ON
+        //no
+        sum += 0.2;
+    #endif
+
+//no
+    sum + 0.3;
+
+#endif
+
+
+#if !defined(OFF)
+//yes
+sum += 600000.0;
+
+    #if defined(ON) && !defined(OFF)
+    //yes
+    sum += 80000000.0;
+
+        #if defined(OFF) || defined(ON)
+        //yes
+        sum += 900000000.0;
+
+            #if defined(ON) && defined(OFF)
+                //no
+                sum += 0.7;
+            #elif !defined(OFF)
+                //yes
+                sum += 7000000.0;
+            #endif
+
+        #endif
+
+    #endif
+
+#endif
+
+// sum should be 987600301.0
+    gl_Position = vec4(sum);
+}

Test/cppSimple.vert

+#define ON
+
+float sum = 0.0;
+
+void main()
+{
+
+#ifdef ON
+//yes
+sum += 1.0;
+#endif
+
+#ifdef OFF
+//no
+sum += 20.0;
+#endif
+
+#if defined(ON)
+//yes
+sum += 300.0;
+#endif
+
+#if defined(OFF)
+//no
+sum += 4000.0;
+#endif
+
+#if !defined(ON)
+//no
+sum += 50000.0;
+#endif
+
+#ifndef(OFF)
+//yes
+sum += 600000.0;
+#else
+//no
+sum += 0.6;
+#endif
+
+#if defined(ON) && defined(OFF)
+//no
+sum += 0.7;
+#elif !defined(OFF)
+//yes
+sum += 7000000.0;
+#endif
+
+#if defined(ON) && !defined(OFF)
+//yes
+sum += 80000000.0;
+#endif
+
+#if defined(OFF) || defined(ON)
+//yes
+sum += 900000000.0;
+#endif
+
+// sum should be 987600301.7
+    gl_Position = vec4(sum);
+}

Test/testlist

@@ -12,4 +12,7 @@ versionsErrors.vert
 precision.frag
 nonSquare.vert
 matrixError.vert
-
+cppSimple.vert
+cppIndent.vert
+cppNest.vert
+cppComplexExpr.vert