Some style fixes for tests

diff --git a/include.mk b/include.mk
index 30372896beaae36558e9daa169d22f7f7b36e2fe..20ffdd48aad6b4eafb5569fcf50e56a8fc0110f4 100644 (file)
--- a/include.mk
+++ b/include.mk
@@ -95,7 +95,7 @@ SPLINTFLAGS =                 \
     -abstract                 \
     -statictrans              \
     -castfcnptr
     -abstract                 \
     -statictrans              \
     -castfcnptr

-    
+

 #always the right rule
 default: all
 
 #always the right rule
 default: all
 


@@ -108,7 +108,7 @@ uninstall:
        rm -f $(DESTDIR)$(MANDIR)/man1/doc/qcvm.1
        rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqpak.1
 
        rm -f $(DESTDIR)$(MANDIR)/man1/doc/qcvm.1
        rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqpak.1
 

-STYLE_MATCH = \( -name '*.[ch]' -or -name '*.def' \)
+STYLE_MATCH = \( -name '*.[ch]' -or -name '*.def' -or -name '*.qc' \)

 
 whitespace:
        find . -type f $(STYLE_MATCH) -exec sed -i 's/ *$$//' '{}' ';'
 
 whitespace:
        find . -type f $(STYLE_MATCH) -exec sed -i 's/ *$$//' '{}' ';'

diff --git a/tests/calls.qc b/tests/calls.qc
index 7b09f11e0737abcc288403d8e530f3e909f63243..f5ce732110e24a2280a406b34eccca4950a65c9f 100644 (file)
--- a/tests/calls.qc
+++ b/tests/calls.qc
@@ -8,5 +8,5 @@ void(float a, float b, float c) main = {
             sum(sum(sum(a, b, c), b, sum(a, b, c)), b, sum(a, b, sum(a, b, c))),
             sum(sum(a, b, c), b, c));
     print(ftos(f), "\n");
             sum(sum(sum(a, b, c), b, sum(a, b, c)), b, sum(a, b, sum(a, b, c))),
             sum(sum(a, b, c), b, c));
     print(ftos(f), "\n");

-    
+

 };
 };

diff --git a/tests/ngraphs.qc b/tests/ngraphs.qc
index 6e1a9570f9c239ab99bd851ff4bc2a3c64498ea0..d2b000f85ef55aec4005d55d20e1dcf2e6834afb 100644 (file)
--- a/tests/ngraphs.qc
+++ b/tests/ngraphs.qc
@@ -1,4 +1,4 @@
 void() main = ??<
 void() main = ??<

-       print("??=??'??(??)??!??<??>??-??/??/%>|");
-       print("#^[]|{}~\\%>\n");
+    print("??=??'??(??)??!??<??>??-??/??/%>|");
+    print("#^[]|{}~\\%>\n");

 %>;
 %>;

diff --git a/tests/operators.qc b/tests/operators.qc
index 46bd6bbeb81c2268edb8de30f86f74e18fad9b32..44c3d5103c71799a855f29128acf2da5e8c50bac 100644 (file)
--- a/tests/operators.qc
+++ b/tests/operators.qc
@@ -1,57 +1,57 @@
 .float mem;
 
 void main() {
 .float mem;
 
 void main() {

-       float a;
+    float a;

 
 

-       // regular binary+store
-       a = 5;
-       print(ftos(a += 1), " = ");
-       print(ftos(a), "\n");
+    // regular binary+store
+    a = 5;
+    print(ftos(a += 1), " = ");
+    print(ftos(a), "\n");

 
 

-       entity e = spawn();
+    entity e = spawn();

     e.mem = 10;
     e.mem = 10;

-       print(ftos(e.mem += 1), " = ");
-       print(ftos(e.mem), "\n");
+    print(ftos(e.mem += 1), " = ");
+    print(ftos(e.mem), "\n");

 
     // prefix
 
     // prefix

-       print(ftos(++a), " = ");
-       print(ftos(a), "\n");
-       print(ftos(--a), " = ");
-       print(ftos(a), "\n");
-       print(ftos(++e.mem), " = ");
-       print(ftos(e.mem), "\n");
-
-       // suffix
-       print(ftos(a++), " = ");
-       print(ftos(a-1), "\n");
-       // the CLANG way:
-       a = 3;
-       print(ftos((a++ + a) + a), " = 11\n");
-
-       // check if minus translates
-       print(ftos(a--), "\n");
-       print(ftos(--a), "\n");
-
-       // postfix on members
-       print(ftos(e.mem--), " = ");
-       print(ftos(e.mem+1), "\n");
-
-       // compounds in general
-       a = 3;
-       print(ftos(a *= 2), " = 6\n");
-       print(ftos(a /= 2), " = 3\n");
+    print(ftos(++a), " = ");
+    print(ftos(a), "\n");
+    print(ftos(--a), " = ");
+    print(ftos(a), "\n");
+    print(ftos(++e.mem), " = ");
+    print(ftos(e.mem), "\n");
+
+    // suffix
+    print(ftos(a++), " = ");
+    print(ftos(a-1), "\n");
+    // the CLANG way:
+    a = 3;
+    print(ftos((a++ + a) + a), " = 11\n");
+
+    // check if minus translates
+    print(ftos(a--), "\n");
+    print(ftos(--a), "\n");
+
+    // postfix on members
+    print(ftos(e.mem--), " = ");
+    print(ftos(e.mem+1), "\n");
+
+    // compounds in general
+    a = 3;
+    print(ftos(a *= 2), " = 6\n");
+    print(ftos(a /= 2), " = 3\n");

 
     // compounds on vectors
 
     // compounds on vectors

-       vector v;
-       v = '3 4 5';
-       print(vtos(v *= 2), " = '6 8 10'\n");
-       print(vtos(v /= 2), " = '3 4 5'\n");
-
-       // bit compounds
-       a = 1;
-       print(ftos(a |= 2), " = 3\n");
-       print(ftos(a &= 6), " = 2\n");
-       a = 7;
-
-       print(ftos(a &~= 3), " = 4\n");
+    vector v;
+    v = '3 4 5';
+    print(vtos(v *= 2), " = '6 8 10'\n");
+    print(vtos(v /= 2), " = '3 4 5'\n");
+
+    // bit compounds
+    a = 1;
+    print(ftos(a |= 2), " = 3\n");
+    print(ftos(a &= 6), " = 2\n");
+    a = 7;
+
+    print(ftos(a &~= 3), " = 4\n");

 }
 }

diff --git a/tests/pointlife.qc b/tests/pointlife.qc
index 13bbde71eab0b53623504b8a4ab6d1a4fb42ab56..5225a7c6ae2c11c0d88582363beac197d9dacc7f 100644 (file)
--- a/tests/pointlife.qc
+++ b/tests/pointlife.qc
@@ -4,16 +4,16 @@ void funcall() {}
 void bar(string) {}
 
 void main(string str) {
 void bar(string) {}
 
 void main(string str) {

-       string pl;
+    string pl;

 
 

-       if (foo)
-               return; // this is a block wher 'str' doesn't live
-                       // so the point-life will not overlap with str
-       pl = "Got overwritten!\n"; // pl point-life
+    if (foo)
+        return; // this is a block wher 'str' doesn't live
+                // so the point-life will not overlap with str
+    pl = "Got overwritten!\n"; // pl point-life

 
 

-       print(str);
+    print(str);

 
 

-       pl = "Kill the lifrange here"; // pl life stops
-       funcall(); // Now lock pl in case we have -Oglobal-temps
-       bar(pl); // pl life starts here now
+    pl = "Kill the lifrange here"; // pl life stops
+    funcall(); // Now lock pl in case we have -Oglobal-temps
+    bar(pl); // pl life starts here now

 }
 }