Index: libcfa/src/vec/vec3.hfa
===================================================================
--- libcfa/src/vec/vec3.hfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
+++ libcfa/src/vec/vec3.hfa	(revision c62013ecf0b07694154ca3cbdff83310eedb1dd9)
@@ -19,5 +19,5 @@
 #include "vec.hfa"
 
-forall (T) {
+forall( T ) {
     struct vec3 {
         T x, y, z;
@@ -25,29 +25,28 @@
 }
 
-forall (T) {
-    static inline {
-
-    void ?{}(vec3(T)& v, T x, T y, T z) {
+static inline forall( T ) {
+    void ?{}( vec3( T )& v, T x, T y, T z ) {
         v.[x, y, z] = [x, y, z];
     }
 
-    forall(| zero_assign(T))
-    void ?{}(vec3(T)& vec, zero_t) with (vec) {
+    forall( | zero_assign( T ) )
+    void ?{}( vec3( T )& vec, zero_t ) with ( vec ) {
         x = y = z = 0;
     }
 
-    void ?{}(vec3(T)& vec, T val) with (vec) {
+    void ?{}( vec3( T )& vec, T val ) with ( vec ) {
         x = y = z = val;
     }
 
-    void ?{}(vec3(T)& vec, vec3(T) other) with (vec) {
+    void ?{}( vec3( T )& vec, vec3( T ) other ) with ( vec ) {
         [x,y,z] = other.[x,y,z];
     }
 
-    void ?=?(vec3(T)& vec, vec3(T) other) with (vec) {
+    void ?=?( vec3( T )& vec, vec3( T ) other ) with ( vec ) {
         [x,y,z] = other.[x,y,z];
     }
-    forall(| zero_assign(T))
-    void ?=?(vec3(T)& vec, zero_t) with (vec) {
+
+    forall( | zero_assign( T ) )
+    void ?=?( vec3( T )& vec, zero_t ) with ( vec ) {
         x = y = z = 0;
     }
@@ -56,240 +55,240 @@
 
     // -
-    forall(| subtract(T)) {
-    vec3(T) ?-?(vec3(T) u, vec3(T) v) {
-        return [u.x - v.x, u.y - v.y, u.z - v.z];
-    }
-    vec3(T)& ?-=?(vec3(T)& u, vec3(T) v) {
-        u = u - v;
-        return u;
-    }
-    }
-    forall(| negate(T)) {
-    vec3(T) -?(vec3(T) v) with (v) {
-        return [-x, -y, -z];
-    }
-    }
-    forall(| { T --?(T&); }) {
-    vec3(T)& --?(vec3(T)& v) {
-        --v.x;
-        --v.y;
-        --v.z;
-        return v;
-    }
-    vec3(T) ?--(vec3(T)& v) {
-        vec3(T) copy = v;
-        --v;
-        return copy;
-    }
+    forall( | subtract( T ) ) {
+		vec3( T ) ?-?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x - v.x, u.y - v.y, u.z - v.z];
+		}
+		vec3( T )& ?-=?( vec3( T )& u, vec3( T ) v ) {
+			u = u - v;
+			return u;
+		}
+    }
+
+    forall( | negate( T ) ) {
+		vec3( T ) -?( vec3( T ) v ) with ( v ) {
+			return [-x, -y, -z];
+		}
+    }
+
+    forall( | { T --?( T&); }) {
+		vec3( T )& --?( vec3( T )& v ) {
+			--v.x;
+			--v.y;
+			--v.z;
+			return v;
+		}
+		vec3( T ) ?--( vec3( T )& v ) {
+			vec3( T ) copy = v;
+			--v;
+			return copy;
+		}
     }
 
     // +
-    forall(| add(T)) {
-    vec3(T) ?+?(vec3(T) u, vec3(T) v) {
-        return [u.x + v.x, u.y + v.y, u.z + v.z];
-    }
-    vec3(T)& ?+=?(vec3(T)& u, vec3(T) v) {
-        u = u + v;
-        return u;
-    }
-    }
-
-    forall(| { T ++?(T&); }) {
-    vec3(T)& ++?(vec3(T)& v) {
-        ++v.x;
-        ++v.y;
-        ++v.z;
-        return v;
-    }
-    vec3(T) ?++(vec3(T)& v) {
-        vec3(T) copy = v;
-        ++v;
-        return copy;
-    }
+    forall( | add( T ) ) {
+		vec3( T ) ?+?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x + v.x, u.y + v.y, u.z + v.z];
+		}
+		vec3( T )& ?+=?( vec3( T )& u, vec3( T ) v ) {
+			u = u + v;
+			return u;
+		}
+    }
+
+    forall( | { T ++?( T&); }) {
+		vec3( T )& ++?( vec3( T )& v ) {
+			++v.x;
+			++v.y;
+			++v.z;
+			return v;
+		}
+		vec3( T ) ?++( vec3( T )& v ) {
+			vec3( T ) copy = v;
+			++v;
+			return copy;
+		}
     }
 
     // *
-    forall(| multiply(T)) {
-    vec3(T) ?*?(vec3(T) v, T scalar) with (v) {
-        return [x * scalar, y * scalar, z * scalar];
-    }
-    vec3(T) ?*?(T scalar, vec3(T) v) {
-        return v * scalar;
-    }
-    vec3(T) ?*?(vec3(T) u, vec3(T) v) {
-        return [u.x * v.x, u.y * v.y, u.z * v.z];
-    }
-    vec3(T)& ?*=?(vec3(T)& v, T scalar) {
-        v = v * scalar;
-        return v;
-    }
-    vec3(T)& ?*=?(vec3(T)& u, vec3(T) v) {
-        u = u * v;
-        return u;
-    }
+    forall( | multiply( T ) ) {
+		vec3( T ) ?*?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x * scalar, y * scalar, z * scalar];
+		}
+		vec3( T ) ?*?( T scalar, vec3( T ) v ) {
+			return v * scalar;
+		}
+		vec3( T ) ?*?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x * v.x, u.y * v.y, u.z * v.z];
+		}
+		vec3( T )& ?*=?( vec3( T )& v, T scalar ) {
+			v = v * scalar;
+			return v;
+		}
+		vec3( T )& ?*=?( vec3( T )& u, vec3( T ) v ) {
+			u = u * v;
+			return u;
+		}
     }
 
     // /
-    forall(| divide(T)) {
-    vec3(T) ?/?(vec3(T) v, T scalar) with (v) {
-        return [x / scalar, y / scalar, z / scalar];
-    }
-    vec3(T) ?/?(vec3(T) u, vec3(T) v) {
-        return [u.x / v.x, u.y / v.y, u.z / v.z];
-    }
-    vec3(T)& ?/=?(vec3(T)& v, T scalar) {
-        v = v / scalar;
-        return v;
-    }
-    vec3(T)& ?/=?(vec3(T)& u, vec3(T) v) {
-        u = u / v;
-        return u;
-    }
-    }
-
+    forall( | divide( T ) ) {
+		vec3( T ) ?/?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x / scalar, y / scalar, z / scalar];
+		}
+		vec3( T ) ?/?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x / v.x, u.y / v.y, u.z / v.z];
+		}
+		vec3( T )& ?/=?( vec3( T )& v, T scalar ) {
+			v = v / scalar;
+			return v;
+		}
+		vec3( T )& ?/=?( vec3( T )& u, vec3( T ) v ) {
+			u = u / v;
+			return u;
+		}
+    }
+	
     // %
-    forall(| { T ?%?(T,T); }) {
-    vec3(T) ?%?(vec3(T) v, T scalar) with (v) {
-        return [x % scalar, y % scalar, z % scalar];
-    }
-    vec3(T)& ?%=?(vec3(T)& u, T scalar) {
-        u = u % scalar;
-        return u;
-    }
-    vec3(T) ?%?(vec3(T) u, vec3(T) v) {
-        return [u.x % v.x, u.y % v.y, u.z % v.z];
-    }
-    vec3(T)& ?%=?(vec3(T)& u, vec3(T) v) {
-        u = u % v;
-        return u;
-    }
+    forall( | { T ?%?( T,T ); }) {
+		vec3( T ) ?%?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x % scalar, y % scalar, z % scalar];
+		}
+		vec3( T )& ?%=?( vec3( T )& u, T scalar ) {
+			u = u % scalar;
+			return u;
+		}
+		vec3( T ) ?%?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x % v.x, u.y % v.y, u.z % v.z];
+		}
+		vec3( T )& ?%=?( vec3( T )& u, vec3( T ) v ) {
+			u = u % v;
+			return u;
+		}
     }
 
     // &
-    forall(| { T ?&?(T,T); }) {
-    vec3(T) ?&?(vec3(T) v, T scalar) with (v) {
-        return [x & scalar, y & scalar, z & scalar];
-    }
-    vec3(T)& ?&=?(vec3(T)& u, T scalar) {
-        u = u & scalar;
-        return u;
-    }
-    vec3(T) ?&?(vec3(T) u, vec3(T) v) {
-        return [u.x & v.x, u.y & v.y, u.z & v.z];
-    }
-    vec3(T)& ?&=?(vec3(T)& u, vec3(T) v) {
-        u = u & v;
-        return u;
-    }
+    forall( | { T ?&?( T,T ); }) {
+		vec3( T ) ?&?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x & scalar, y & scalar, z & scalar];
+		}
+		vec3( T )& ?&=?( vec3( T )& u, T scalar ) {
+			u = u & scalar;
+			return u;
+		}
+		vec3( T ) ?&?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x & v.x, u.y & v.y, u.z & v.z];
+		}
+		vec3( T )& ?&=?( vec3( T )& u, vec3( T ) v ) {
+			u = u & v;
+			return u;
+		}
     }
 
     // |
-    forall(| { T ?|?(T,T); }) {
-    vec3(T) ?|?(vec3(T) v, T scalar) with (v) {
-        return [x | scalar, y | scalar, z | scalar];
-    }
-    vec3(T)& ?|=?(vec3(T)& u, T scalar) {
-        u = u | scalar;
-        return u;
-    }
-    vec3(T) ?|?(vec3(T) u, vec3(T) v) {
-        return [u.x | v.x, u.y | v.y, u.z | v.z];
-    }
-    vec3(T)& ?|=?(vec3(T)& u, vec3(T) v) {
-        u = u | v;
-        return u;
-    }
+    forall( | { T ?|?( T,T ); }) {
+		vec3( T ) ?|?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x | scalar, y | scalar, z | scalar];
+		}
+		vec3( T )& ?|=?( vec3( T )& u, T scalar ) {
+			u = u | scalar;
+			return u;
+		}
+		vec3( T ) ?|?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x | v.x, u.y | v.y, u.z | v.z];
+		}
+		vec3( T )& ?|=?( vec3( T )& u, vec3( T ) v ) {
+			u = u | v;
+			return u;
+		}
     }
 
     // ^
-    forall(| { T ?^?(T,T); }) {
-    vec3(T) ?^?(vec3(T) v, T scalar) with (v) {
-        return [x ^ scalar, y ^ scalar, z ^ scalar];
-    }
-    vec3(T)& ?^=?(vec3(T)& u, T scalar) {
-        u = u ^ scalar;
-        return u;
-    }
-    vec3(T) ?^?(vec3(T) u, vec3(T) v) {
-        return [u.x ^ v.x, u.y ^ v.y, u.z ^ v.z];
-    }
-    vec3(T)& ?^=?(vec3(T)& u, vec3(T) v) {
-        u = u ^ v;
-        return u;
-    }
+    forall( | { T ?^?( T,T ); }) {
+		vec3( T ) ?^?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x ^ scalar, y ^ scalar, z ^ scalar];
+		}
+		vec3( T )& ?^=?( vec3( T )& u, T scalar ) {
+			u = u ^ scalar;
+			return u;
+		}
+		vec3( T ) ?^?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x ^ v.x, u.y ^ v.y, u.z ^ v.z];
+		}
+		vec3( T )& ?^=?( vec3( T )& u, vec3( T ) v ) {
+			u = u ^ v;
+			return u;
+		}
     }
 
     // <<
-    forall(| { T ?<<?(T,T); }) {
-    vec3(T) ?<<?(vec3(T) v, T scalar) with (v) {
-        return [x << scalar, y << scalar, z << scalar];
-    }
-    vec3(T)& ?<<=?(vec3(T)& u, T scalar) {
-        u = u << scalar;
-        return u;
-    }
-    vec3(T) ?<<?(vec3(T) u, vec3(T) v) {
-        return [u.x << v.x, u.y << v.y, u.z << v.z];
-    }
-    vec3(T)& ?<<=?(vec3(T)& u, vec3(T) v) {
-        u = u << v;
-        return u;
-    }
+    forall( | { T ?<<?( T,T ); }) {
+		vec3( T ) ?<<?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x << scalar, y << scalar, z << scalar];
+		}
+		vec3( T )& ?<<=?( vec3( T )& u, T scalar ) {
+			u = u << scalar;
+			return u;
+		}
+		vec3( T ) ?<<?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x << v.x, u.y << v.y, u.z << v.z];
+		}
+		vec3( T )& ?<<=?( vec3( T )& u, vec3( T ) v ) {
+			u = u << v;
+			return u;
+		}
     }
 
     // >>
-    forall(| { T ?>>?(T,T); }) {
-    vec3(T) ?>>?(vec3(T) v, T scalar) with (v) {
-        return [x >> scalar, y >> scalar, z >> scalar];
-    }
-    vec3(T)& ?>>=?(vec3(T)& u, T scalar) {
-        u = u >> scalar;
-        return u;
-    }
-    vec3(T) ?>>?(vec3(T) u, vec3(T) v) {
-        return [u.x >> v.x, u.y >> v.y, u.z >> v.z];
-    }
-    vec3(T)& ?>>=?(vec3(T)& u, vec3(T) v) {
-        u = u >> v;
-        return u;
-    }
+    forall( | { T ?>>?( T,T ); }) {
+		vec3( T ) ?>>?( vec3( T ) v, T scalar ) with ( v ) {
+			return [x >> scalar, y >> scalar, z >> scalar];
+		}
+		vec3( T )& ?>>=?( vec3( T )& u, T scalar ) {
+			u = u >> scalar;
+			return u;
+		}
+		vec3( T ) ?>>?( vec3( T ) u, vec3( T ) v ) {
+			return [u.x >> v.x, u.y >> v.y, u.z >> v.z];
+		}
+		vec3( T )& ?>>=?( vec3( T )& u, vec3( T ) v ) {
+			u = u >> v;
+			return u;
+		}
     }
 
     // ~
-    forall(| { T ~?(T); })
-    vec3(T) ~?(vec3(T) v) with (v) {
+    forall( | { T ~?( T ); })
+		vec3( T ) ~?( vec3( T ) v ) with ( v ) {
         return [~v.x, ~v.y, ~v.z];
     }
 
     // relational
-    forall(| equality(T)) {
-    bool ?==?(vec3(T) u, vec3(T) v) with (u) {
-        return x == v.x && y == v.y && z == v.z;
-    }
-    bool ?!=?(vec3(T) u, vec3(T) v) {
-        return !(u == v);
-    }
+    forall( | equality( T ) ) {
+		bool ?==?( vec3( T ) u, vec3( T ) v ) with ( u ) {
+			return x == v.x && y == v.y && z == v.z;
+		}
+		bool ?!=?( vec3( T ) u, vec3( T ) v ) {
+			return !( u == v );
+		}
     }
 
     // Geometric functions
-    forall(| add(T) | multiply(T))
-    T dot(vec3(T) u, vec3(T) v) {
+    forall( | add( T ) | multiply( T ) )
+		T dot( vec3( T ) u, vec3( T ) v ) {
         return u.x * v.x + u.y * v.y + u.z * v.z;
     }
 
-    forall(| subtract(T) | multiply(T))
-    vec3(T) cross(vec3(T) u, vec3(T) v) {
-        return (vec3(T)){ u.y * v.z - v.y * u.z,
-                          u.z * v.x - v.z * u.x,
-                          u.x * v.y - v.x * u.y };
-    }
-
-    } // static inline
+    forall( | subtract( T ) | multiply( T ) )
+		vec3( T ) cross( vec3( T ) u, vec3( T ) v ) {
+        return ( vec3( T ) ){ u.y * v.z - v.y * u.z,
+			u.z * v.x - v.z * u.x,
+			u.x * v.y - v.x * u.y };
+    }
 }
 
-forall(ostype &, T | writeable(T, ostype)) {
-    ostype & ?|?(ostype & os, vec3(T) v) with (v) {
+forall( ostype &, T | writeable( T, ostype ) ) {
+    ostype & ?|?( ostype & os, vec3( T ) v ) with ( v ) {
         return os | '<' | x | ',' | y | ',' | z | '>';
     }
-	OSTYPE_VOID_IMPL( os, vec3(T) )
+	OSTYPE_VOID_IMPL( os, vec3( T ) )
 }