Index: src/Tests/ResolvExpr/Abstype.c
===================================================================
--- src/Tests/ResolvExpr/Abstype.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Abstype.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -3,19 +3,17 @@
 type T | { T x( T ); };
 
-T y( T t )
-{
+T y( T t ) {
 	T t_instance;
 	return x( t );
 }
 
-forall(type T) lvalue T			*?(                T* );
-int		?++( int *);
-int ?=?( int*, int );
-forall(dtype DT) DT* 		   	?=?(                DT *          *,          DT* );
+forall( type T ) lvalue T *?( T * );
+int ?++( int *);
+int ?=?( int *, int );
+forall( dtype DT ) DT * ?=?( DT **, DT * );
 
-type U = int*;
+type U = int *;
 
-U x( U u )
-{
+U x( U u ) {
 	U u_instance = u;
 	(*u)++;
@@ -23,6 +21,9 @@
 }
 
-int *break_abstraction( U u )
-{
+int *break_abstraction( U u ) {
 	return u;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Attributes.c
===================================================================
--- src/Tests/ResolvExpr/Attributes.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Attributes.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,4 +1,2 @@
-// "cfa-cpp -ne simple.c"
-
 int @voon;
 double @voon;
@@ -9,11 +7,13 @@
 void g( int );
 
-void
-f()
-{
-  float x;
-  double x;
-  @bort(x);
-  @bort(int);
-  g( @voon );
+void f() {
+	float x;
+	double x;
+	@bort(x);
+	@bort(int);
+	g( @voon );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Cast.c
===================================================================
--- src/Tests/ResolvExpr/Cast.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Cast.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,11 +1,15 @@
 char f;
-void f()
-{
-  char f;
-  double f;
-  (int)f;
-  short f;
-  (int)f;
-  (void(*)())f;
-  ([long, long double, *[]()])([f, f, f]);
+
+void f() {
+	char f;
+	double f;
+	(int)f;
+	short f;
+	(int)f;
+	(void(*)())f;
+	([long, long double, *[]()])([f, f, f]);
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/CastError.c
===================================================================
--- src/Tests/ResolvExpr/CastError.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/CastError.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,8 +1,12 @@
 int f;
-void f()
-{
-  int f;
-  double f;
-  (char)f;
-  (int(*)())f;
+
+void f() {
+	int f;
+	double f;
+	(char)f;
+	(int(*)())f;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Forall.c
===================================================================
--- src/Tests/ResolvExpr/Forall.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Forall.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -6,34 +6,36 @@
 void (* ?=?( void (**)(void), void (*)(void) ))(void);
 
-void g1()
-{
-  forall( type T ) T f( T );
-  void f( int );
-  void h( void (*p)(void) );
+void g1() {
+	forall( type T ) T f( T );
+	void f( int );
+	void h( void (*p)(void) );
   
-  int x;
-  void (*y)(void);
-  char z;
-  float w;
+	int x;
+	void (*y)(void);
+	char z;
+	float w;
   
-  f( x );
-  f( y );
-  f( z );
-  f( w );
-  h( f( y ) );
+	f( x );
+	f( y );
+	f( z );
+	f( w );
+	h( f( y ) );
 }
 
-void g2()
-{
-  forall( type T ) void f( T, T );
-  forall( type T, type U ) void f( T, U );
+void g2() {
+	forall( type T ) void f( T, T );
+	forall( type T, type U ) void f( T, U );
   
-  int x;
-  float y;
-  int *z;
-  float *w;
+	int x;
+	float y;
+	int *z;
+	float *w;
   
-  f( x, y );
-  f( z, w );
-  f( x, z );
+	f( x, y );
+	f( z, w );
+	f( x, z );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Function.c
===================================================================
--- src/Tests/ResolvExpr/Function.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Function.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -4,10 +4,8 @@
 float f( float );
 
-void g()
-{
-  // selects the same f and a each time
-  // but without a cast would be ambiguous
-  f( (int)a );
-  (int)f( a );
+void g() {
+	// selects the same f each time but without a cast would be ambiguous
+	f( (int)a );
+	(int)f( a );
 }
 
@@ -24,8 +22,11 @@
 [ int, int ] r( int, int, int, int );
 
-void s()
-{
-  r( p, q );
-  r( [ q, p ] );
-  r( r( p, q ), r( q, q ) );
+void s() {
+	r( p, q );
+	r( [ q, p ] );
+	r( r( p, q ), r( q, q ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/InferParam.c
===================================================================
--- src/Tests/ResolvExpr/InferParam.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/InferParam.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -8,14 +8,12 @@
 void i( float );
 
-void h()
-{
-  int a;
-  i( g( a ) );
+void h() {
+	int a;
+	i( g( a ) );
 }
 
-context has_f_and_j( type T, type U )
-{
-  U f( T );
-  U j( T, U );
+context has_f_and_j( type T, type U ) {
+	U f( T );
+	U j( T, U );
 };
 
@@ -23,7 +21,10 @@
 forall( type T, type U | has_f_and_j( T, U ) ) U k( T );
 
-void l()
-{
-  int b;
-  i( k( b ) );
+void l() {
+	int b;
+	i( k( b ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Members.c
===================================================================
--- src/Tests/ResolvExpr/Members.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Members.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,4 +1,2 @@
-// "../../cfa-cpp -nc Members.c"
-
 char ?=?( char*, char );
 int ?=?( int*, int );
@@ -13,53 +11,47 @@
 void d( float* );
 
-struct a_struct
-{
-  int a;
-  char a;
-  float a;
+struct a_struct {
+	int a;
+	char a;
+	float a;
 };
 
-union b_struct
-{
-  int *a;
-  char *a;
-  float *a;
+union b_struct {
+	int *a;
+	char *a;
+	float *a;
 };
 
-void f()
-{
-  struct a_struct the_struct;
-  union b_struct the_struct;
+void f() {
+	struct a_struct the_struct;
+	union b_struct the_struct;
   
-  a( the_struct.a );
-  b( the_struct.a );
-  c( the_struct.a );
-  d( the_struct.a );
+	a( the_struct.a );
+	b( the_struct.a );
+	c( the_struct.a );
+	d( the_struct.a );
 }
 
-struct c_struct
-{
-  int;
-  char;
-  float;
+struct c_struct {
+	int;
+	char;
+	float;
 };
 
-union d_struct
-{
-  int*;
-  char*;
-  float*;
+union d_struct {
+	int*;
+	char*;
+	float*;
 };
 
-void g()
-{
-  unsigned short x;
-  struct c_struct x;
-  union d_struct x;
+void g() {
+	unsigned short x;
+	struct c_struct x;
+	union d_struct x;
   
-  a( x );	// the 'a' and 'b' calls resolve to the ushort
-  b( x );	// it's debatable whether this is good
-  c( x );
-  d( x );
+	a( x );	// the 'a' and 'b' calls resolve to the ushort
+	b( x );	// it's debatable whether this is good
+	c( x );
+	d( x );
 }
 
@@ -72,6 +64,9 @@
 struct forward { int y; };
 
-void h()
-{
+void h() {
 	q->y;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Misc.c
===================================================================
--- src/Tests/ResolvExpr/Misc.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Misc.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -6,10 +6,12 @@
 void g( unsigned );
 
-void
-f( void )
-{
-  g( (a, b) );
-  g( (a, a, b) );
-  g( sizeof a );
-  g( sizeof( int ) );
+void f( void ) {
+	g( (a, b) );
+	g( (a, a, b) );
+	g( sizeof a );
+	g( sizeof( int ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/MiscError.c
===================================================================
--- src/Tests/ResolvExpr/MiscError.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/MiscError.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -5,10 +5,12 @@
 void g( int );
 
-void
-f( void )
-{
-  g( (b, a) );
-  g( (b, a, b) );
-  g( (a, b, b) );
-  sizeof b;
+void f( void ) {
+	g( (b, a) );
+	g( (b, a, b) );
+	g( (a, b, b) );
+	sizeof b;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/OccursError.c
===================================================================
--- src/Tests/ResolvExpr/OccursError.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/OccursError.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,11 +1,10 @@
-// "./cfa-cpp -c simple.c"
-// "./cfa -v simple.c"
-// "./cfa -CFA simple.c > simple_out.c"
-
 forall( type T ) void f( void (*)( T, T* ) );
 forall( type U ) void g( U*, U );
 
-void test()
-{
-  f( g );
+void test() {
+    f( g );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Operators.c
===================================================================
--- src/Tests/ResolvExpr/Operators.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Operators.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,28 +1,27 @@
 int ?*?( int, int );
 
-int
-?()( int number1, int number2 )
-{
-  return number1 * number2;
+int ?()( int number1, int number2 ) {
+	return number1 * number2;
 }
 
 int ?+?( int, int );
 
-int ?=?( int*, int );
-struct accumulator
-{
-  int total;
+int ?=?( int *, int );
+struct accumulator {
+	int total;
 };
 
 char ?()( struct accumulator a, char number1, char number2 );
 
-void
-f( void )
-{
-  char a, b;
-  ?()( a, b );
-  a(b);
-  a + b;
-  struct accumulator ?+?;	// why not, eh?
-  a + b;
+void f( void ) {
+	char a, b;
+	?()( a, b );
+	a(b);
+	a + b;
+	struct accumulator ?+?;	// why not, eh?
+	a + b;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Quad.c
===================================================================
--- src/Tests/ResolvExpr/Quad.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Quad.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,19 +1,20 @@
-int ?=?( int*, int );
+int ?=?( int *, int );
 int ?*?( int, int );
 
 forall( type T | { T ?*?( T, T ); } )
-T square( T t )
-{
-  return t * t;
+T square( T t ) {
+	return t * t;
 }
 
 forall( type U | { U square( U ); } )
-U quad( U u )
-{
-  return square( square( u ) );
+U quad( U u ) {
+	return square( square( u ) );
 }
 
-void f()
-{
-  quad( 7 );
+void f() {
+	quad( 7 );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Rank2.c
===================================================================
--- src/Tests/ResolvExpr/Rank2.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Rank2.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,18 +1,20 @@
-int ?=?( int*, int );
-forall(dtype DT) DT* 	   	?=?( DT *          *,            DT* );
+int ?=?( int *, int );
+forall(dtype DT) DT * ?=?( DT **, DT * );
 
-void a()
-{
-  forall( type T ) void f( T );
-  void g( forall( type U ) void p( U ) );
-  g( f );
+void a() {
+	forall( type T ) void f( T );
+	void g( forall( type U ) void p( U ) );
+	g( f );
 }
 
-void g()
-{
-  void h( int *null );
-  forall( type T ) T id( T );
-  forall( dtype T ) T *0;
-  int 0;
-  h( id( id( id( 0 ) ) ) );
+void g() {
+	void h( int *null );
+	forall( type T ) T id( T );
+	forall( dtype T ) T *0;
+	int 0;
+	h( id( id( id( 0 ) ) ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/ShortCircuit.c
===================================================================
--- src/Tests/ResolvExpr/ShortCircuit.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/ShortCircuit.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -6,10 +6,13 @@
 void g( int );
 
-void f( int a )
-{
-  int b;
-  float c;
-  g( a ? b : c );
-  g( a && c );
-  g( a || b );
+void f( int a ) {
+	int b;
+	float c;
+	g( a ? b : c );
+	g( a && c );
+	g( a || b );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Statement.c
===================================================================
--- src/Tests/ResolvExpr/Statement.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/ResolvExpr/Statement.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,16 +1,19 @@
-int ?=?( int*, int );
+int ?=?( int *, int );
 int ?!=?( int, int );
 int 0;
 
-void f()
-{
+void f() {
     int a;
     struct { int b; } a;
     if ( a ) {
-      while ( a ) {
-        int *b;
-        for ( b; a; b ) {
-        }
-      }
+		while ( a ) {
+			int *b;
+			for ( b; a; b ) {
+			}
+		}
     }
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Array.c
===================================================================
--- src/Tests/SynTree/Array.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Array.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -10,15 +10,15 @@
 
 int fred() {
-    int a1[];
-    int a2[*];
-    int a4[3];
-    int T[3];
+	int a1[];
+	int a2[*];
+	int a4[3];
+	int T[3];
 }
 
 int mary( int T[3],
-	  int p1[const 3],
-	  int p2[static 3],
-	  int p3[static const 3]
-    ) {
+		  int p1[const 3],
+		  int p2[static 3],
+		  int p3[static const 3]
+	) {
 }
 
@@ -27,7 +27,11 @@
 
 int (*(jane)())( int T[3],
-		 int p1[const 3],
-		 int p2[static 3],
-		 int p3[static const 3]
-    ) {
+				 int p1[const 3],
+				 int p2[static 3],
+				 int p3[static const 3]
+	) {
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Context.c
===================================================================
--- src/Tests/SynTree/Context.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Context.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,16 +1,15 @@
-context has_q( type T )
-{
-  T q( T );
+context has_q( type T ) {
+	T q( T );
 };
 
-forall( type z | has_q( z ) )
-void f()
-{
-  context has_r( type T, type U )
-  {
-    T r( T, T (T,U) );
-  };
+forall( type z | has_q( z ) ) void f() {
+	context has_r( type T, type U ) {
+		T r( T, T (T,U) );
+	};
   
-  extern type x, y | has_r( x, y );
-  
+	extern type x, y | has_r( x, y );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/DeclarationErrors.c
===================================================================
--- src/Tests/SynTree/DeclarationErrors.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/DeclarationErrors.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -4,2 +4,6 @@
 typedef int Int;
 static Int volatile static const x28;			// duplicate static
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/DeclarationSpecifier.c
===================================================================
--- src/Tests/SynTree/DeclarationSpecifier.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/DeclarationSpecifier.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -85,2 +85,5 @@
 static const Int inline volatile f48();
 
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Enum.c
===================================================================
--- src/Tests/SynTree/Enum.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Enum.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,20 +1,22 @@
 enum Colors {
-  Red,
-  Yellow,
-  Pink,
-  Blue,
-  Purple,
-  Orange,
-  Green
+	Red,
+	Yellow,
+	Pink,
+	Blue,
+	Purple,
+	Orange,
+	Green
 };
 
+void f( void ) {
+	enum Fruits {
+		Apple,
+		Banana,
+		Pear,
+		Mango
+	} fruit = Mango;
+}
 
-void f( void )
-{
-  enum Fruits {
-    Apple,
-    Banana,
-    Pear,
-    Mango
-  } fruit = Mango;
-}
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Forall.c
===================================================================
--- src/Tests/SynTree/Forall.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Forall.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -2,9 +2,9 @@
 
 forall( type T )
-    void swap( T left, T right ) {
+void swap( T left, T right ) {
 	T temp = left;
 	left = right;
 	right = temp;
-    }
+}
 
 context sumable( type T ) {
@@ -16,6 +16,6 @@
 
 type T1 | { const T1 0; T1 ?+?(T1, T1); T1 ?++(T1); [T1] ?+=?(T1,T1); },
-     T2(type P1, type P2 ),
-     T3 | sumable(T3);
+	T2(type P1, type P2 ),
+	T3 | sumable(T3);
 
 type T2(type P1, type P2) | sumable(T2(P1,P2)) = struct { P1 i; P2 j; };
@@ -28,5 +28,5 @@
 
 forall( type T | sumable( T ) )
-    T sum( int n, T a[] ) {
+T sum( int n, T a[] ) {
 	T total = 0;
 	int i;
@@ -34,10 +34,10 @@
 	    total = total + a[i];
 	return total;
-    }
+}
 
 forall( type T | { const T 0; T ?+?(T, T); T ?++(T); [T] ?+=?(T,T); } )
-    T twice( T t ) {
+T twice( T t ) {
 	return t + t;
-    }
+}
 
 int main() {
@@ -50,2 +50,6 @@
     sum( 10, a );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Functions.c
===================================================================
--- src/Tests/SynTree/Functions.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Functions.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -4,13 +4,13 @@
 
 int f (
-    int (void),
-    int (int),
-    int ((void)),
-    int ((int)),
-    void g(void)
-  ) {
-    (*g)();
-    g();
-    g = h;
+	int (void),
+	int (int),
+	int ((void)),
+	int ((int)),
+	void g(void)
+	) {
+	(*g)();
+	g();
+	g = h;
 }
 
@@ -93,8 +93,8 @@
 	int ( int, int p ),
 	[int](int)
-    ) {
-    int (*(*p)[][10])[][3];
-    * [][10] * [][3] int p;
-    * [] * [int](int) p;
+	) {
+	int (*(*p)[][10])[][3];
+	* [][10] * [][3] int p;
+	* [] * [int](int) p;
 }
 
@@ -108,44 +108,44 @@
 
 int f(
-    int (),
+	int (),
 
-    int *(),
-    int **(),
-    int * const *(),
-    int * const * const (),
+	int *(),
+	int **(),
+	int * const *(),
+	int * const * const (),
 
-    int ([]),
-    int ([10]),
+	int ([]),
+	int ([10]),
 
-    int *([]),
-    int *([10]),
-    int **([]),
-    int **([10]),
-    int * const *([]),
-    int * const *([10]),
-    int * const * const ([]),
-    int * const * const ([10])
-    );
+	int *([]),
+	int *([10]),
+	int **([]),
+	int **([10]),
+	int * const *([]),
+	int * const *([10]),
+	int * const * const ([]),
+	int * const * const ([10])
+	);
 
 int f(
-    int (),
+	int (),
 
-    int *(),
-    int **(),
-    int * const *(),
-    int * const * const (),
+	int *(),
+	int **(),
+	int * const *(),
+	int * const * const (),
 
-    int ([]),
-    int ([10]),
+	int ([]),
+	int ([10]),
 
-    int *([]),
-    int *([10]),
-    int **([]),
-    int **([10]),
-    int * const *([]),
-    int * const *([10]),
-    int * const * const ([]),
-    int * const * const ([10])
-    ) {
+	int *([]),
+	int *([10]),
+	int **([]),
+	int **([10]),
+	int * const *([]),
+	int * const *([10]),
+	int * const * const ([]),
+	int * const * const ([10])
+	) {
 }
 
@@ -153,5 +153,5 @@
 
 int f( T (T), T T ) {
-    T (T);
+	T (T);
 }
 
@@ -162,2 +162,6 @@
 //int f[]() {}
 //int ((*f15())())[] {}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/IdentFuncDeclarator.c
===================================================================
--- src/Tests/SynTree/IdentFuncDeclarator.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/IdentFuncDeclarator.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,105 +1,109 @@
 int main() {
-    //int f0[]();
-    //int (f0[])();
-    //int f0()[];
-    //int f0()();
-    //int (*f0)()();
-    //int ((*f0())())[];
-    
-    int f1;
-    int (f2);
+	//int f0[]();
+	//int (f0[])();
+	//int f0()[];
+	//int f0()();
+	//int (*f0)()();
+	//int ((*f0())())[];
+	
+	int f1;
+	int (f2);
 
-    int *f3;
-    int **f4;
-    int * const *f5;
-    int * const * const f6;
+	int *f3;
+	int **f4;
+	int * const *f5;
+	int * const * const f6;
 
-    int *(f7);
-    int **(f8);
-    int * const *(f9);
-    int * const * const (f10);
+	int *(f7);
+	int **(f8);
+	int * const *(f9);
+	int * const * const (f10);
 
-    int (*f11);
-    int (**f12);
-    int (* const *f13);
-    int (* const * const f14);
+	int (*f11);
+	int (**f12);
+	int (* const *f13);
+	int (* const * const f14);
 
-    int f15[];
-    int f16[10];
-    int (f17[]);
-    int (f18[10]);
+	int f15[];
+	int f16[10];
+	int (f17[]);
+	int (f18[10]);
 
-    int *f19[];
-    int *f20[10];
-    int **f21[];
-    int **f22[10];
-    int * const *f23[];
-    int * const *f24[10];
-    int * const * const f25[];
-    int * const * const f26[10];
+	int *f19[];
+	int *f20[10];
+	int **f21[];
+	int **f22[10];
+	int * const *f23[];
+	int * const *f24[10];
+	int * const * const f25[];
+	int * const * const f26[10];
 
-    int *(f27[]);
-    int *(f28[10]);
-    int **(f29[]);
-    int **(f30[10]);
-    int * const *(f31[]);
-    int * const *(f32[10]);
-    int * const * const (f33[]);
-    int * const * const (f34[10]);
+	int *(f27[]);
+	int *(f28[10]);
+	int **(f29[]);
+	int **(f30[10]);
+	int * const *(f31[]);
+	int * const *(f32[10]);
+	int * const * const (f33[]);
+	int * const * const (f34[10]);
 
-    int (*f35[]);
-    int (*f36[10]);
-    int (**f37[]);
-    int (**f38[10]);
-    int (* const *f39[]);
-    int (* const *f40[10]);
-    int (* const * const f41[]);
-    int (* const * const f42[10]);
+	int (*f35[]);
+	int (*f36[10]);
+	int (**f37[]);
+	int (**f38[10]);
+	int (* const *f39[]);
+	int (* const *f40[10]);
+	int (* const * const f41[]);
+	int (* const * const f42[10]);
 
-    int f43[][3];
-    int f44[3][3];
-    int (f45[])[3];
-    int (f46[3])[3];
-    int ((f47[]))[3];
-    int ((f48[3]))[3];
+	int f43[][3];
+	int f44[3][3];
+	int (f45[])[3];
+	int (f46[3])[3];
+	int ((f47[]))[3];
+	int ((f48[3]))[3];
 
-    int *f49[][3];
-    int *f50[3][3];
-    int **f51[][3];
-    int **f52[3][3];
-    int * const *f53[][3];
-    int * const *f54[3][3];
-    int * const * const f55[][3];
-    int * const * const f56[3][3];
+	int *f49[][3];
+	int *f50[3][3];
+	int **f51[][3];
+	int **f52[3][3];
+	int * const *f53[][3];
+	int * const *f54[3][3];
+	int * const * const f55[][3];
+	int * const * const f56[3][3];
 
-    int (*f57[][3]);
-    int (*f58[3][3]);
-    int (**f59[][3]);
-    int (**f60[3][3]);
-    int (* const *f61[][3]);
-    int (* const *f62[3][3]);
-    int (* const * const f63[][3]);
-    int (* const * const f64[3][3]);
+	int (*f57[][3]);
+	int (*f58[3][3]);
+	int (**f59[][3]);
+	int (**f60[3][3]);
+	int (* const *f61[][3]);
+	int (* const *f62[3][3]);
+	int (* const * const f63[][3]);
+	int (* const * const f64[3][3]);
 
-    int f65(int);
-    int (f66)(int);
+	int f65(int);
+	int (f66)(int);
 
-    int *f67(int);
-    int **f68(int);
-    int * const *f69(int);
-    int * const * const f70(int);
+	int *f67(int);
+	int **f68(int);
+	int * const *f69(int);
+	int * const * const f70(int);
 
-    int *(f71)(int);
-    int **(f72)(int);
-    int * const *(f73)(int);
-    int * const * const (f74)(int);
+	int *(f71)(int);
+	int **(f72)(int);
+	int * const *(f73)(int);
+	int * const * const (f74)(int);
 
-    int (*f75)(int);
-    int (**f76)(int);
-    int (* const *f77)(int);
-    int (* const * const f78)(int);
+	int (*f75)(int);
+	int (**f76)(int);
+	int (* const *f77)(int);
+	int (* const * const f78)(int);
 
-    int (*(*f79)(int))();
-    int (*(* const f80)(int))();
-    int (* const(* const f81)(int))();
+	int (*(*f79)(int))();
+	int (*(* const f80)(int))();
+	int (* const(* const f81)(int))();
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/IdentFuncParamDeclarator.c
===================================================================
--- src/Tests/SynTree/IdentFuncParamDeclarator.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/IdentFuncParamDeclarator.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,150 +1,154 @@
 int fred(
-    //int f0[](),
-    //int (f0[])(),
-    //int f0()[],
-    //int f0()(),
-    //int (*f0)()(),
-    //int ((*f0())())[],
-    
-    int f1,
-    int (f2),
+	//int f0[](),
+	//int (f0[])(),
+	//int f0()[],
+	//int f0()(),
+	//int (*f0)()(),
+	//int ((*f0())())[],
+	
+	int f1,
+	int (f2),
 
-    int *f3,
-    int **f4,
-    int * const *f5,
-    int * const * const f6,
+	int *f3,
+	int **f4,
+	int * const *f5,
+	int * const * const f6,
 
-    int *(f7),
-    int **(f8),
-    int * const *(f9),
-    int * const * const (f10),
+	int *(f7),
+	int **(f8),
+	int * const *(f9),
+	int * const * const (f10),
 
-    int (*f11),
-    int (**f12),
-    int (* const *f13),
-    int (* const * const f14),
+	int (*f11),
+	int (**f12),
+	int (* const *f13),
+	int (* const * const f14),
 
-    int f15[],
-    int f16[10],
-    int (f17[]),
-    int (f18[10]),
+	int f15[],
+	int f16[10],
+	int (f17[]),
+	int (f18[10]),
 
-    int *f19[],
-    int *f20[10],
-    int **f21[],
-    int **f22[10],
-    int * const *f23[],
-    int * const *f24[10],
-    int * const * const f25[],
-    int * const * const f26[10],
+	int *f19[],
+	int *f20[10],
+	int **f21[],
+	int **f22[10],
+	int * const *f23[],
+	int * const *f24[10],
+	int * const * const f25[],
+	int * const * const f26[10],
 
-    int *(f27[]),
-    int *(f28[10]),
-    int **(f29[]),
-    int **(f30[10]),
-    int * const *(f31[]),
-    int * const *(f32[10]),
-    int * const * const (f33[]),
-    int * const * const (f34[10]),
+	int *(f27[]),
+	int *(f28[10]),
+	int **(f29[]),
+	int **(f30[10]),
+	int * const *(f31[]),
+	int * const *(f32[10]),
+	int * const * const (f33[]),
+	int * const * const (f34[10]),
 
-    int (*f35[]),
-    int (*f36[10]),
-    int (**f37[]),
-    int (**f38[10]),
-    int (* const *f39[]),
-    int (* const *f40[10]),
-    int (* const * const f41[]),
-    int (* const * const f42[10]),
+	int (*f35[]),
+	int (*f36[10]),
+	int (**f37[]),
+	int (**f38[10]),
+	int (* const *f39[]),
+	int (* const *f40[10]),
+	int (* const * const f41[]),
+	int (* const * const f42[10]),
 
-    int f43[][3],
-    int f44[3][3],
-    int (f45[])[3],
-    int (f46[3])[3],
-    int ((f47[]))[3],
-    int ((f48[3]))[3],
+	int f43[][3],
+	int f44[3][3],
+	int (f45[])[3],
+	int (f46[3])[3],
+	int ((f47[]))[3],
+	int ((f48[3]))[3],
 
-    int *f49[][3],
-    int *f50[3][3],
-    int **f51[][3],
-    int **f52[3][3],
-    int * const *f53[][3],
-    int * const *f54[3][3],
-    int * const * const f55[][3],
-    int * const * const f56[3][3],
+	int *f49[][3],
+	int *f50[3][3],
+	int **f51[][3],
+	int **f52[3][3],
+	int * const *f53[][3],
+	int * const *f54[3][3],
+	int * const * const f55[][3],
+	int * const * const f56[3][3],
 
-    int (*f57[][3]),
-    int (*f58[3][3]),
-    int (**f59[][3]),
-    int (**f60[3][3]),
-    int (* const *f61[][3]),
-    int (* const *f62[3][3]),
-    int (* const * const f63[][3]),
-    int (* const * const f64[3][3]),
+	int (*f57[][3]),
+	int (*f58[3][3]),
+	int (**f59[][3]),
+	int (**f60[3][3]),
+	int (* const *f61[][3]),
+	int (* const *f62[3][3]),
+	int (* const * const f63[][3]),
+	int (* const * const f64[3][3]),
 
-    int f65(int),
-    int (f66)(int),
+	int f65(int),
+	int (f66)(int),
 
-    int *f67(int),
-    int **f68(int),
-    int * const *f69(int),
-    int * const * const f70(int),
+	int *f67(int),
+	int **f68(int),
+	int * const *f69(int),
+	int * const * const f70(int),
 
-    int *(f71)(int),
-    int **(f72)(int),
-    int * const *(f73)(int),
-    int * const * const (f74)(int),
+	int *(f71)(int),
+	int **(f72)(int),
+	int * const *(f73)(int),
+	int * const * const (f74)(int),
 
-    int (*f75)(int),
-    int (**f76)(int),
-    int (* const *f77)(int),
-    int (* const * const f78)(int),
+	int (*f75)(int),
+	int (**f76)(int),
+	int (* const *f77)(int),
+	int (* const * const f78)(int),
 
-    int (*(*f79)(int))(),
-    int (*(* const f80)(int))(),
-    int (* const(* const f81)(int))(),
+	int (*(*f79)(int))(),
+	int (*(* const f80)(int))(),
+	int (* const(* const f81)(int))(),
 
-    int f82[const *],
-    int f83[const 3],
-    int f84[static 3],
-    int f85[static const 3],
+	int f82[const *],
+	int f83[const 3],
+	int f84[static 3],
+	int f85[static const 3],
 
-    int (f86[const *]),
-    int (f87[const 3]),
-    int (f88[static 3]),
-    int (f89[static const 3]),
+	int (f86[const *]),
+	int (f87[const 3]),
+	int (f88[static 3]),
+	int (f89[static const 3]),
 
-    int *f90[const *],
-    int *f91[const 3],
-    int **f92[static 3],
-    int * const *f93[static const 3],
-    int * const * const f94[static const 3],
+	int *f90[const *],
+	int *f91[const 3],
+	int **f92[static 3],
+	int * const *f93[static const 3],
+	int * const * const f94[static const 3],
 
-    int *(f95[const *]),
-    int *(f96[const 3]),
-    int **(f97[static 3]),
-    int * const *(f98[static const 3]),
-    int * const * const (f99[static const 3]),
+	int *(f95[const *]),
+	int *(f96[const 3]),
+	int **(f97[static 3]),
+	int * const *(f98[static const 3]),
+	int * const * const (f99[static const 3]),
 
-    int f100[const *][3],
-    int f101[const 3][3],
-    int f102[static 3][3],
-    int f103[static const 3][3],
+	int f100[const *][3],
+	int f101[const 3][3],
+	int f102[static 3][3],
+	int f103[static const 3][3],
 
-    int (f104[const *][3]),
-    int (f105[const 3][3]),
-    int (f106[static 3][3]),
-    int (f107[static const 3][3]),
+	int (f104[const *][3]),
+	int (f105[const 3][3]),
+	int (f106[static 3][3]),
+	int (f107[static const 3][3]),
 
-    int *f108[const *][3],
-    int *f109[const 3][3],
-    int **f110[static 3][3],
-    int * const *f111[static const 3][3],
-    int * const * const f112[static const 3][3],
+	int *f108[const *][3],
+	int *f109[const 3][3],
+	int **f110[static 3][3],
+	int * const *f111[static const 3][3],
+	int * const * const f112[static const 3][3],
 
-    int *(f113[const *][3]),
-    int *(f114[const 3][3]),
-    int **(f115[static 3][3]),
-    int * const *(f116[static const 3][3]),
-    int * const * const (f117[static const 3][3])
-    ) {
+	int *(f113[const *][3]),
+	int *(f114[const 3][3]),
+	int **(f115[static 3][3]),
+	int * const *(f116[static const 3][3]),
+	int * const * const (f117[static const 3][3])
+	) {
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Initialization.c
===================================================================
--- src/Tests/SynTree/Initialization.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Initialization.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -9,5 +9,5 @@
 
 struct {
-    [int] w;
+	[int] w;
 } a = { .w : [2] };
 
@@ -15,13 +15,17 @@
 
 struct {
-    int f1, f2, f3;
-    struct { int g1, g2, g3; } f4[4];
+	int f1, f2, f3;
+	struct { int g1, g2, g3; } f4[4];
 } v7 = {
-    .f1 : 4,
-    f2 : 3,
-    .f4[2] : {
-	.g1 : 3,
-	g3 : 0,
-    },
-    .f4[3].g3 : 7,
+  .f1 : 4,
+  f2 : 3,
+  .f4[2] : {
+	  .g1 : 3,
+	  g3 : 0,
+	},
+  .f4[3].g3 : 7,
 };
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Scope.c
===================================================================
--- src/Tests/SynTree/Scope.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Scope.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -8,7 +8,7 @@
 
 y w(y y, u v) {
-  type x | { x t(u); };
-  u u = y;
-  x z = t(u);
+	type x | { x t(u); };
+	u u = y;
+	x z = t(u);
 }
 
@@ -17,5 +17,5 @@
 context has_u( type z )
 {
-  z u(z);
+	z u(z);
 };
 
@@ -23,47 +23,50 @@
 y q( t the_t )
 {
-  t y = u( the_t );
+	t y = u( the_t );
 }
 
 t f( y p ) {
-  int y;
-  typedef char x;
+	int y;
+	typedef char x;
 
-  {
-    x y;
-    typedef x z;
+	{
+		x y;
+		typedef x z;
 
-    {
-      z x;
-      typedef z y;
-      y z = x;
-    }
+		{
+			z x;
+			typedef z y;
+			y z = x;
+		}
 
-    z x = y;
-  }
+		z x = y;
+	}
 
-  x q = y;
+	x q = y;
 }
 
 t g( void ) {
-  typedef char x;
-  try {
-    some_func();
-  } catch ( x x ) {
-    t y = x;
-  }
-  x z;
+	typedef char x;
+	try {
+		some_func();
+	} catch ( x x ) {
+		t y = x;
+	}
+	x z;
 }
 
-y q(i)
+y q( i )
     int i;
 {
-  switch (i) {
-    y q = i;
-  case 0:
-    return q;
-  default:
-    return i;
-  }
+	switch ( i ) {
+		y q = i;
+	  case 0:
+		return q;
+	  default:
+		return i;
+	}
 }
 
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/ScopeErrors.c
===================================================================
--- src/Tests/SynTree/ScopeErrors.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/ScopeErrors.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -5,11 +5,9 @@
 float thisIsNotAnError;
 
-int thisIsAlsoNotAnError()
-{
+int thisIsAlsoNotAnError() {
   int thisIsNotAnError;
 }
 
-int thisIsAlsoNotAnError( double x )
-{
+int thisIsAlsoNotAnError( double x ) {
 }
 
@@ -17,10 +15,11 @@
 double thisIsStillNotAnError( double );
 
-double butThisIsAnError( double )
-{
+double butThisIsAnError( double ) {
 }
 
-double butThisIsAnError( double )
-{
+double butThisIsAnError( double ) {
 }
 
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/StructMember.c
===================================================================
--- src/Tests/SynTree/StructMember.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/StructMember.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -2,27 +2,27 @@
 
 struct S {
-    int m1:3, m2:4;
-    int :2;
-    int :3, :4;
-    int m3;
-    int m4, m5, m6;
-    int *m7, *m8, *m9;
-    int (*m10)();
-    int *(*m11)(int);
-    T T;
-    T (T);
+	int m1:3, m2:4;
+	int :2;
+	int :3, :4;
+	int m3;
+	int m4, m5, m6;
+	int *m7, *m8, *m9;
+	int (*m10)();
+	int *(*m11)(int);
+	T T;
+	T (T);
 
 // Cforall extensions
 
-    * int m12, m13;
-    * [ * int ] (int) m14;
-    int ;
-    int , , ;
-    int * , , ;
-    int *, *, *;
-    * int , , ;
-    int (*)();
-    int (**)( int );
-    T ;
+	* int m12, m13;
+	* [ * int ] (int) m14;
+	int ;
+	int , , ;
+	int * , , ;
+	int *, *, *;
+	* int , , ;
+	int (*)();
+	int (**)( int );
+	T ;
 
 // errors
@@ -34,7 +34,11 @@
 
 union U {
-    [5] int m1;
-    int m2[5];
-    * int m3;
-    int *m4;
+	[5] int m1;
+	int m2[5];
+	* int m3;
+	int *m4;
 } u;
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Tuple.c
===================================================================
--- src/Tests/SynTree/Tuple.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Tuple.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -4,11 +4,11 @@
 
 struct inner {
-    int f2, f3;
+	int f2, f3;
 };
 
 struct outer {
-    int f1;
-    struct inner i;
-    double f4;
+	int f1;
+	struct inner i;
+	double f4;
 } s, *sp;
 
@@ -21,42 +21,46 @@
 
 [ short x, unsigned y ] f1( int w ) {
-    [ y, x ] = [ x, y ] = [ w, 23 ];
+	[ y, x ] = [ x, y ] = [ w, 23 ];
 }
 
 [ [ int, char, long, int ] r ] g1() {
-    short x, p;
-    unsigned int y;
-    [ int, int ] z;
+	short x, p;
+	unsigned int y;
+	[ int, int ] z;
 
-    [ x, y, z ] = [ p, f( 17 ), 3 ];
-    r = [ x, y, z ];
+	[ x, y, z ] = [ p, f( 17 ), 3 ];
+	r = [ x, y, z ];
 }
 
 [ int rc ] main( int argc, ** char argv ) {
-    int a, b, c, d;
-    struct outer t = { .[ f1,f4 ] : [ 1,7.0 ] };
-    f( [ 3,5 ] );
-    g( [ 3,5 ], 3 );
-    f( t1 );
-    g( t1, 3 );
-    [ 3,5 ];
-    [ a,b ] = 3;
-    [ a,b ] = [ 4.6 ];
-    [ a,b ] = [ c,d ] = [ 3,5 ];
-    [ a,b,[ c ] ] = [ 2,[ a,b ] ];
-    [ a,b ] = 3 > 4 ? [ b,6 ] : [ 7,8 ];
+	int a, b, c, d;
+	struct outer t = { .[ f1,f4 ] : [ 1,7.0 ] };
+	f( [ 3,5 ] );
+	g( [ 3,5 ], 3 );
+	f( t1 );
+	g( t1, 3 );
+	[ 3,5 ];
+	[ a,b ] = 3;
+	[ a,b ] = [ 4.6 ];
+	[ a,b ] = [ c,d ] = [ 3,5 ];
+	[ a,b,[ c ] ] = [ 2,[ a,b ] ];
+	[ a,b ] = 3 > 4 ? [ b,6 ] : [ 7,8 ];
 
-    t1 = [ a,b ];
-    t1 = t2 = [ a,b ];
-    [ a,b ] = [ c,d ] = d += c += 1;
-    [ a,b ] = [ c,d ] = t1;
-    [ a,b ] = t1 = [ c,d ];
-    [ a,b ] = t1 = t2 = [ c,d ];
-    t1 = [ 3,4 ] = [ 3,4 ] = t1 = [ 3,4 ];
+	t1 = [ a,b ];
+	t1 = t2 = [ a,b ];
+	[ a,b ] = [ c,d ] = d += c += 1;
+	[ a,b ] = [ c,d ] = t1;
+	[ a,b ] = t1 = [ c,d ];
+	[ a,b ] = t1 = t2 = [ c,d ];
+	t1 = [ 3,4 ] = [ 3,4 ] = t1 = [ 3,4 ];
 
-    s.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ];
-    s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, 0, "abc" );
-    sp->[ f4,f1 ] = sp->[ f1,f4 ];
-    printf( "expecting 3, 17, 23, 4; got %d, %d, %d, %d\n", s.[ f4, i.[ f3,f2 ], f1 ] );
-    rc = 0;
+	s.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ];
+	s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, 0, "abc" );
+	sp->[ f4,f1 ] = sp->[ f1,f4 ];
+	printf( "expecting 3, 17, 23, 4; got %d, %d, %d, %d\n", s.[ f4, i.[ f3,f2 ], f1 ] );
+	rc = 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/TypeGenerator.c
===================================================================
--- src/Tests/SynTree/TypeGenerator.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/TypeGenerator.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,4 +1,4 @@
 context addable(type T) {
-   T ?+?(T,T);
+	T ?+?(T,T);
 };
 
@@ -16,4 +16,8 @@
 
 int main() {
-    (struct(int) node)my_list;
+	(struct(int) node)my_list;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/Typedef.c
===================================================================
--- src/Tests/SynTree/Typedef.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/Typedef.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -2,10 +2,10 @@
 
 void f( void ) {
-    int T( T );
-    T( 3 );
+	int T( T );
+	T( 3 );
 }
 
 struct {
-    T (T);
+	T (T);
 } fred = { 3 };
 
@@ -14,5 +14,5 @@
 
 int g(void) {
-    double a;
+	double a;
 }
 a c;
@@ -27,5 +27,5 @@
 }
 
-/* new-style function definitions */
+// new-style function definitions
 
 typedef [10] * int arrayOf10Pointers;
@@ -40,2 +40,6 @@
 typedef [ * [static 10] int ] t;
 typedef [ * [static 10] int x ] f();
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/TypedefDeclarator.c
===================================================================
--- src/Tests/SynTree/TypedefDeclarator.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/TypedefDeclarator.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,116 +1,120 @@
 typedef int
-     f0,  f1,  f2,  f3,  f4,  f5,  f6,  f7,  f8,  f9,
-    f10, f11, f12, f13, f14, f15, f16, f17, f18, f19,
-    f20, f21, f22, f23, f24, f25, f26, f27, f28, f29,
-    f30, f31, f32, f33, f34, f35, f36, f37, f38, f39,
-    f40, f41, f42, f43, f44, f45, f46, f47, f48, f49,
-    f50, f51, f52, f53, f54, f55, f56, f57, f58, f59,
-    f60, f61, f62, f63, f64, f65, f66, f67, f68, f69,
-    f70, f71, f72, f73, f74, f75, f76, f77, f78, f79,
-    f80, f81, f82, f83, f84, f85, f86, f87, f88, f89;
+	 f0,  f1,  f2,  f3,  f4,  f5,  f6,  f7,  f8,  f9,
+	f10, f11, f12, f13, f14, f15, f16, f17, f18, f19,
+	f20, f21, f22, f23, f24, f25, f26, f27, f28, f29,
+	f30, f31, f32, f33, f34, f35, f36, f37, f38, f39,
+	f40, f41, f42, f43, f44, f45, f46, f47, f48, f49,
+	f50, f51, f52, f53, f54, f55, f56, f57, f58, f59,
+	f60, f61, f62, f63, f64, f65, f66, f67, f68, f69,
+	f70, f71, f72, f73, f74, f75, f76, f77, f78, f79,
+	f80, f81, f82, f83, f84, f85, f86, f87, f88, f89;
 
 int main() {
-    //int f0[]();
-    //int (f0[])();
-    //int f0()[];
-    //int f0()();
-    //int (*f0)()();
-    //int ((*f0())())[];
-    
-    int f1;
-    int (f2);
+	//int f0[]();
+	//int (f0[])();
+	//int f0()[];
+	//int f0()();
+	//int (*f0)()();
+	//int ((*f0())())[];
+	
+	int f1;
+	int (f2);
 
-    int *f3;
-    int **f4;
-    int * const *f5;
-    int * const * const f6;
+	int *f3;
+	int **f4;
+	int * const *f5;
+	int * const * const f6;
 
-    int *(f7);
-    int **(f8);
-    int * const *(f9);
-    int * const * const (f10);
+	int *(f7);
+	int **(f8);
+	int * const *(f9);
+	int * const * const (f10);
 
-    int (*f11);
-    int (**f12);
-    int (* const *f13);
-    int (* const * const f14);
+	int (*f11);
+	int (**f12);
+	int (* const *f13);
+	int (* const * const f14);
 
-    int f15[];
-    int f16[10];
-    int (f17[]);
-    int (f18[10]);
+	int f15[];
+	int f16[10];
+	int (f17[]);
+	int (f18[10]);
 
-    int *f19[];
-    int *f20[10];
-    int **f21[];
-    int **f22[10];
-    int * const *f23[];
-    int * const *f24[10];
-    int * const * const f25[];
-    int * const * const f26[10];
+	int *f19[];
+	int *f20[10];
+	int **f21[];
+	int **f22[10];
+	int * const *f23[];
+	int * const *f24[10];
+	int * const * const f25[];
+	int * const * const f26[10];
 
-    int *(f27[]);
-    int *(f28[10]);
-    int **(f29[]);
-    int **(f30[10]);
-    int * const *(f31[]);
-    int * const *(f32[10]);
-    int * const * const (f33[]);
-    int * const * const (f34[10]);
+	int *(f27[]);
+	int *(f28[10]);
+	int **(f29[]);
+	int **(f30[10]);
+	int * const *(f31[]);
+	int * const *(f32[10]);
+	int * const * const (f33[]);
+	int * const * const (f34[10]);
 
-    int (*f35[]);
-    int (*f36[10]);
-    int (**f37[]);
-    int (**f38[10]);
-    int (* const *f39[]);
-    int (* const *f40[10]);
-    int (* const * const f41[]);
-    int (* const * const f42[10]);
+	int (*f35[]);
+	int (*f36[10]);
+	int (**f37[]);
+	int (**f38[10]);
+	int (* const *f39[]);
+	int (* const *f40[10]);
+	int (* const * const f41[]);
+	int (* const * const f42[10]);
 
-    int f43[][3];
-    int f44[3][3];
-    int (f45[])[3];
-    int (f46[3])[3];
-    int ((f47[]))[3];
-    int ((f48[3]))[3];
+	int f43[][3];
+	int f44[3][3];
+	int (f45[])[3];
+	int (f46[3])[3];
+	int ((f47[]))[3];
+	int ((f48[3]))[3];
 
-    int *f49[][3];
-    int *f50[3][3];
-    int **f51[][3];
-    int **f52[3][3];
-    int * const *f53[][3];
-    int * const *f54[3][3];
-    int * const * const f55[][3];
-    int * const * const f56[3][3];
+	int *f49[][3];
+	int *f50[3][3];
+	int **f51[][3];
+	int **f52[3][3];
+	int * const *f53[][3];
+	int * const *f54[3][3];
+	int * const * const f55[][3];
+	int * const * const f56[3][3];
 
-    int (*f57[][3]);
-    int (*f58[3][3]);
-    int (**f59[][3]);
-    int (**f60[3][3]);
-    int (* const *f61[][3]);
-    int (* const *f62[3][3]);
-    int (* const * const f63[][3]);
-    int (* const * const f64[3][3]);
+	int (*f57[][3]);
+	int (*f58[3][3]);
+	int (**f59[][3]);
+	int (**f60[3][3]);
+	int (* const *f61[][3]);
+	int (* const *f62[3][3]);
+	int (* const * const f63[][3]);
+	int (* const * const f64[3][3]);
 
-    int f65(int);
-    int (f66)(int);
+	int f65(int);
+	int (f66)(int);
 
-    int *f67(int);
-    int **f68(int);
-    int * const *f69(int);
-    int * const * const f70(int);
+	int *f67(int);
+	int **f68(int);
+	int * const *f69(int);
+	int * const * const f70(int);
 
-    int *(f71)(int);
-    int **(f72)(int);
-    int * const *(f73)(int);
-    int * const * const (f74)(int);
+	int *(f71)(int);
+	int **(f72)(int);
+	int * const *(f73)(int);
+	int * const * const (f74)(int);
 
-    int (*f75)(int);
-    int (**f76)(int);
-    int (* const *f77)(int);
-    int (* const * const f78)(int);
+	int (*f75)(int);
+	int (**f76)(int);
+	int (* const *f77)(int);
+	int (* const * const f78)(int);
 
-    int (*(*f79)(int))();
-    int (*(* const f80)(int))();
-    int (* const(* const f81)(int))();
+	int (*(*f79)(int))();
+	int (*(* const f80)(int))();
+	int (* const(* const f81)(int))();
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/TypedefParamDeclarator.c
===================================================================
--- src/Tests/SynTree/TypedefParamDeclarator.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/TypedefParamDeclarator.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,150 +1,154 @@
 typedef int
-     f0,   f1,   f2,   f3,   f4,   f5,   f6,   f7,   f8,   f9,
-    f10,  f11,  f12,  f13,  f14,  f15,  f16,  f17,  f18,  f19,
-    f20,  f21,  f22,  f23,  f24,  f25,  f26,  f27,  f28,  f29,
-    f30,  f31,  f32,  f33,  f34,  f35,  f36,  f37,  f38,  f39,
-    f40,  f41,  f42,  f43,  f44,  f45,  f46,  f47,  f48,  f49,
-    f50,  f51,  f52,  f53,  f54,  f55,  f56,  f57,  f58,  f59,
-    f60,  f61,  f62,  f63,  f64,  f65,  f66,  f67,  f68,  f69,
-    f70,  f71,  f72,  f73,  f74,  f75,  f76,  f77,  f78,  f79,
-    f80,  f81,  f82,  f83,  f84,  f85,  f86,  f87,  f88,  f89,
-    f90,  f91,  f92,  f93,  f94,  f95,  f96,  f97,  f98,  f99,
-    f100, f101, f102, f103, f104, f105, f106, f107, f108, f109,
-    f110, f111, f112, f113, f114, f115, f116, f117, f118, f119;
+	 f0,   f1,   f2,   f3,   f4,   f5,   f6,   f7,   f8,   f9,
+	f10,  f11,  f12,  f13,  f14,  f15,  f16,  f17,  f18,  f19,
+	f20,  f21,  f22,  f23,  f24,  f25,  f26,  f27,  f28,  f29,
+	f30,  f31,  f32,  f33,  f34,  f35,  f36,  f37,  f38,  f39,
+	f40,  f41,  f42,  f43,  f44,  f45,  f46,  f47,  f48,  f49,
+	f50,  f51,  f52,  f53,  f54,  f55,  f56,  f57,  f58,  f59,
+	f60,  f61,  f62,  f63,  f64,  f65,  f66,  f67,  f68,  f69,
+	f70,  f71,  f72,  f73,  f74,  f75,  f76,  f77,  f78,  f79,
+	f80,  f81,  f82,  f83,  f84,  f85,  f86,  f87,  f88,  f89,
+	f90,  f91,  f92,  f93,  f94,  f95,  f96,  f97,  f98,  f99,
+	f100, f101, f102, f103, f104, f105, f106, f107, f108, f109,
+	f110, f111, f112, f113, f114, f115, f116, f117, f118, f119;
 
 int fred(
 /*
-    //int f0[](),
-    //int (f0[])(),
-    //int f0()[],
-    //int f0()(),
-    //int (*f0)()(),
-    //int ((*f0())())[],
+	//int f0[](),
+	//int (f0[])(),
+	//int f0()[],
+	//int f0()(),
+	//int (*f0)()(),
+	//int ((*f0())())[],
 */
-    int f1,
+	int f1,
 
-    int *f3,
-    int **f4,
-    int * const *f5,
-    int * const * const f6,
+	int *f3,
+	int **f4,
+	int * const *f5,
+	int * const * const f6,
 
-    int (*f11),
-    int (**f12),
-    int (* const *f13),
-    int (* const * const f14),
+	int (*f11),
+	int (**f12),
+	int (* const *f13),
+	int (* const * const f14),
 
-    int f15[],
-    int f16[10],
+	int f15[],
+	int f16[10],
 
-    int *f19[],
-    int *f20[10],
-    int **f21[],
-    int **f22[10],
-    int * const *f23[],
-    int * const *f24[10],
-    int * const * const f25[],
-    int * const * const f26[10],
+	int *f19[],
+	int *f20[10],
+	int **f21[],
+	int **f22[10],
+	int * const *f23[],
+	int * const *f24[10],
+	int * const * const f25[],
+	int * const * const f26[10],
 
-    int (*f35[]),
-    int (*f36[10]),
-    int (**f37[]),
-    int (**f38[10]),
-    int (* const *f39[]),
-    int (* const *f40[10]),
-    int (* const * const f41[]),
-    int (* const * const f42[10]),
+	int (*f35[]),
+	int (*f36[10]),
+	int (**f37[]),
+	int (**f38[10]),
+	int (* const *f39[]),
+	int (* const *f40[10]),
+	int (* const * const f41[]),
+	int (* const * const f42[10]),
 
-    int f43[][3],
-    int f44[3][3],
+	int f43[][3],
+	int f44[3][3],
 /*
-    int (f45[])[3],
-    int (f46[3])[3],
-    int ((f47[]))[3],
-    int ((f48[3]))[3],
+	int (f45[])[3],
+	int (f46[3])[3],
+	int ((f47[]))[3],
+	int ((f48[3]))[3],
 */
-    int *f49[][3],
-    int *f50[3][3],
-    int **f51[][3],
-    int **f52[3][3],
-    int * const *f53[][3],
-    int * const *f54[3][3],
-    int * const * const f55[][3],
-    int * const * const f56[3][3],
+	int *f49[][3],
+	int *f50[3][3],
+	int **f51[][3],
+	int **f52[3][3],
+	int * const *f53[][3],
+	int * const *f54[3][3],
+	int * const * const f55[][3],
+	int * const * const f56[3][3],
 
-    int (*f57[][3]),
-    int (*f58[3][3]),
-    int (**f59[][3]),
-    int (**f60[3][3]),
-    int (* const *f61[][3]),
-    int (* const *f62[3][3]),
-    int (* const * const f63[][3]),
-    int (* const * const f64[3][3]),
+	int (*f57[][3]),
+	int (*f58[3][3]),
+	int (**f59[][3]),
+	int (**f60[3][3]),
+	int (* const *f61[][3]),
+	int (* const *f62[3][3]),
+	int (* const * const f63[][3]),
+	int (* const * const f64[3][3]),
 
-    int f65(int),
+	int f65(int),
 /*
-    int (f66)(int),
+	int (f66)(int),
 */
-    int *f67(int),
-    int **f68(int),
-    int * const *f69(int),
-    int * const * const f70(int),
+	int *f67(int),
+	int **f68(int),
+	int * const *f69(int),
+	int * const * const f70(int),
 /*
-    int *(f71)(int),
-    int **(f72)(int),
-    int * const *(f73)(int),
-    int * const * const (f74)(int),
+	int *(f71)(int),
+	int **(f72)(int),
+	int * const *(f73)(int),
+	int * const * const (f74)(int),
 */
-    int (*f75)(int),
-    int (**f76)(int),
-    int (* const *f77)(int),
-    int (* const * const f78)(int),
+	int (*f75)(int),
+	int (**f76)(int),
+	int (* const *f77)(int),
+	int (* const * const f78)(int),
 
-    int (*(*f79)(int))(),
-    int (*(* const f80)(int))(),
-    int (* const(* const f81)(int))(),
+	int (*(*f79)(int))(),
+	int (*(* const f80)(int))(),
+	int (* const(* const f81)(int))(),
 
-    int f82[const *],
-    int f83[const 3],
-    int f84[static 3],
-    int f85[static const 3],
+	int f82[const *],
+	int f83[const 3],
+	int f84[static 3],
+	int f85[static const 3],
 
-    int (f86[const *]),
-    int (f87[const 3]),
-    int (f88[static 3]),
-    int (f89[static const 3]),
+	int (f86[const *]),
+	int (f87[const 3]),
+	int (f88[static 3]),
+	int (f89[static const 3]),
 
-    int *f90[const *],
-    int *f91[const 3],
-    int **f92[static 3],
-    int * const *f93[static const 3],
-    int * const * const f94[static const 3],
+	int *f90[const *],
+	int *f91[const 3],
+	int **f92[static 3],
+	int * const *f93[static const 3],
+	int * const * const f94[static const 3],
 
-    int *(f95[const *]),
-    int *(f96[const 3]),
-    int **(f97[static 3]),
-    int * const *(f98[static const 3]),
-    int * const * const (f99[static const 3]),
+	int *(f95[const *]),
+	int *(f96[const 3]),
+	int **(f97[static 3]),
+	int * const *(f98[static const 3]),
+	int * const * const (f99[static const 3]),
 
-    int f100[const *][3],
-    int f101[const 3][3],
-    int f102[static 3][3],
-    int f103[static const 3][3],
+	int f100[const *][3],
+	int f101[const 3][3],
+	int f102[static 3][3],
+	int f103[static const 3][3],
 
-    int (f104[const *][3]),
-    int (f105[const 3][3]),
-    int (f106[static 3][3]),
-    int (f107[static const 3][3]),
+	int (f104[const *][3]),
+	int (f105[const 3][3]),
+	int (f106[static 3][3]),
+	int (f107[static const 3][3]),
 
-    int *f108[const *][3],
-    int *f109[const 3][3],
-    int **f110[static 3][3],
-    int * const *f111[static const 3][3],
-    int * const * const f112[static const 3][3],
+	int *f108[const *][3],
+	int *f109[const 3][3],
+	int **f110[static 3][3],
+	int * const *f111[static const 3][3],
+	int * const * const f112[static const 3][3],
 
-    int *(f113[const *][3]),
-    int *(f114[const 3][3]),
-    int **(f115[static 3][3]),
-    int * const *(f116[static const 3][3]),
-    int * const * const (f117[static const 3][3])
-    ) {
+	int *(f113[const *][3]),
+	int *(f114[const 3][3]),
+	int **(f115[static 3][3]),
+	int * const *(f116[static const 3][3]),
+	int * const * const (f117[static const 3][3])
+	) {
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/SynTree/VariableDeclarator.c
===================================================================
--- src/Tests/SynTree/VariableDeclarator.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/SynTree/VariableDeclarator.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -114,2 +114,6 @@
 
 *[]*[]* [ *[]*[] int ]( *[]*[] int, *[]*[] int ) v3;
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/gcc/900407-1.c
===================================================================
--- src/Tests/gcc/900407-1.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/900407-1.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,9 +1,12 @@
-foo (int a, int b, int *p)
-{
-  int c;
-  p[2] = a + 0x1000;
-  c = b + 0xffff0000;
-  if ((b + 0xffff0000) == 2)
-    c++;
-  p[2] = c;
+foo ( int a, int b, int *p ) {
+	int c;
+	p[2] = a + 0x1000;
+	c = b + 0xffff0000;
+	if ( (b + 0xffff0000) == 2 )
+		c++;
+	p[2] = c;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/gcc/900516-1.c
===================================================================
--- src/Tests/gcc/900516-1.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/900516-1.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,2 +1,1 @@
-/* added 'int' to argument */
-f(int c) { return!(c?2.0:1.0); }
+f( int c ) { return ! ( c ? 2.0 : 1.0 ); }
Index: src/Tests/gcc/920301-1.c
===================================================================
--- src/Tests/gcc/920301-1.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/920301-1.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,2 +1,2 @@
-f() {static void*t[];/*={&&x};*/ x:y:;}
-g() {static unsigned p[5];}
+f() { static void*t[]; /*={&&x};*/ x:y: ; }
+g() { static unsigned p[5]; }
Index: src/Tests/gcc/920409-1.c
===================================================================
--- src/Tests/gcc/920409-1.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/920409-1.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,1 +1,1 @@
-x() {int y;y>0.0?y:y-1;}
+x() { int y; y > 0.0 ? y : y - 1; }
Index: src/Tests/gcc/920409-2.c
===================================================================
--- src/Tests/gcc/920409-2.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/920409-2.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,2 +1,12 @@
-double x() {int x1,x2;double v;
-if (((long)(x1-x2))<1)return -1.0;v=t(v);v=y(1,v>0.0?(int)v:((int)v-1));}
+double x() {
+	int x1, x2;
+	double v;
+	if ( ( (long)(x1-x2) ) < 1 )
+		return -1.0;
+	v = t( v );
+	v = y( 1, v > 0.0 ? (int)v : ( (int)v - 1 ) );
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/gcc/920410-2.c
===================================================================
--- src/Tests/gcc/920410-2.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/920410-2.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,12 +1,12 @@
-joe()
-  {
-    int j;
+joe() {
+	int j;
 
-    while ( 1 )
-      {
-	for ( j = 0; j < 4; j++ )
-	  ;
-	for ( j = 0; j < 4; j++ )
-	  ;
-      }
-  }
+	while ( 1 ) {
+		for ( j = 0; j < 4; j++ );
+		for ( j = 0; j < 4; j++ );
+	}
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/gcc/920501-1.c
===================================================================
--- src/Tests/gcc/920501-1.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/920501-1.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,1 +1,1 @@
-a() {int**b[]={&&c};c:;}
+a() { int **b[] = { &&c }; c: ; }
Index: src/Tests/gcc/920501-11.c
===================================================================
--- src/Tests/gcc/920501-11.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/920501-11.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,1 +1,8 @@
-typedef struct{int s;}S;foo() {int i=(int)&(S) {(void*)((int)&(S) {1})};}
+typedef struct{ int s; } S;
+foo() {
+	int i = (int)&(S){ (void*)((int)&(S) {1}) };
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/gcc/920501-19.c
===================================================================
--- src/Tests/gcc/920501-19.c	(revision 44b5ca043a6e8e4574929a092ba5d3004b59264d)
+++ src/Tests/gcc/920501-19.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -1,1 +1,1 @@
-long long x=0;y() {x=0;}
+long long x = 0; y() { x = 0; }