From: Dale Weiler Date: Tue, 27 Aug 2013 10:41:03 +0000 (-0400) Subject: Some style fixes for tests X-Git-Tag: 0.3.5~133 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=045bd4dbda0cecf4c0cf722ce9ed929f46cbedd9;p=xonotic%2Fgmqcc.git Some style fixes for tests --- diff --git a/include.mk b/include.mk index 3037289..20ffdd4 100644 --- a/include.mk +++ b/include.mk @@ -95,7 +95,7 @@ SPLINTFLAGS = \ -abstract \ -statictrans \ -castfcnptr - + #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 -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/ *$$//' '{}' ';' diff --git a/tests/calls.qc b/tests/calls.qc index 7b09f11..f5ce732 100644 --- 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"); - + }; diff --git a/tests/ngraphs.qc b/tests/ngraphs.qc index 6e1a957..d2b000f 100644 --- a/tests/ngraphs.qc +++ b/tests/ngraphs.qc @@ -1,4 +1,4 @@ void() main = ??< - print("??=??'??(??)??!????-??/??/%>|"); - print("#^[]|{}~\\%>\n"); + print("??=??'??(??)??!????-??/??/%>|"); + print("#^[]|{}~\\%>\n"); %>; diff --git a/tests/operators.qc b/tests/operators.qc index 46bd6bb..44c3d51 100644 --- a/tests/operators.qc +++ b/tests/operators.qc @@ -1,57 +1,57 @@ .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; - print(ftos(e.mem += 1), " = "); - print(ftos(e.mem), "\n"); + print(ftos(e.mem += 1), " = "); + print(ftos(e.mem), "\n"); // 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 - 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 13bbde7..5225a7c 100644 --- a/tests/pointlife.qc +++ b/tests/pointlife.qc @@ -4,16 +4,16 @@ void funcall() {} 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 }