Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit b16f356

Browse files
ibuclawibuclaw
committed
posix.mak: Enforce no whitespace after opening parenthesis for version conditions
1 parent decc539 commit b16f356

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1055
-1052
lines changed

‎posix.mak

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,9 @@ style_lint:
374374
@echo "Enforce whitespace before opening parenthesis"
375375
$(GREP) -nrE "\<(for|foreach|foreach_reverse|if|while|switch|catch|version)\(" $$(find src -name '*.d') ; test $$? -eq 1
376376

377+
@echo "Enforce no whitespace after opening parenthesis"
378+
$(GREP) -nrE "\<(version) \( " $$(find src -name '*.d') ; test $$? -eq 1
379+
377380
.PHONY : auto-tester-build
378381
auto-tester-build: target checkwhitespace
379382

‎src/core/atomic.d

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
module core.atomic;
1212

13-
version ( D_InlineAsm_X86 )
13+
version (D_InlineAsm_X86)
1414
{
1515
version = AsmX86;
1616
version = AsmX86_32;
1717
enum has64BitCAS = true;
1818
enum has128BitCAS = false;
1919
}
20-
else version ( D_InlineAsm_X86_64 )
20+
else version (D_InlineAsm_X86_64)
2121
{
2222
version = AsmX86;
2323
version = AsmX86_64;
@@ -147,7 +147,7 @@ private
147147
}
148148

149149

150-
version ( AsmX86 )
150+
version (AsmX86)
151151
{
152152
// NOTE: Strictly speaking, the x86 supports atomic operations on
153153
// unaligned values. However, this is far slower than the
@@ -169,7 +169,7 @@ version ( AsmX86 )
169169
}
170170

171171

172-
version ( CoreDdoc )
172+
version (CoreDdoc)
173173
{
174174
/**
175175
* Performs the binary operation 'op' on val using 'mod' as the modifier.
@@ -268,7 +268,7 @@ version ( CoreDdoc )
268268
*/
269269
void atomicFence() nothrow @nogc;
270270
}
271-
else version ( AsmX86_32 )
271+
else version (AsmX86_32)
272272
{
273273
// Uses specialized asm for fast fetch and add operations
274274
private TailShared!(T) atomicFetchAdd(T)( ref shared T val, size_t mod ) pure nothrow @nogc @safe
@@ -756,7 +756,7 @@ else version ( AsmX86_32 )
756756
}
757757
}
758758
}
759-
else version ( AsmX86_64 )
759+
else version (AsmX86_64)
760760
{
761761
// Uses specialized asm for fast fetch and add operations
762762
private TailShared!(T) atomicFetchAdd(T)( ref shared T val, size_t mod ) pure nothrow @nogc @trusted
@@ -1414,7 +1414,7 @@ if (__traits(isFloating, T))
14141414
////////////////////////////////////////////////////////////////////////////////
14151415

14161416

1417-
version ( unittest )
1417+
version (unittest)
14181418
{
14191419
void testCAS(T)( T val ) pure nothrow @nogc @trusted
14201420
in
@@ -1622,7 +1622,7 @@ version ( unittest )
16221622
assert(atomicOp!"+="(i8, 8) == 13);
16231623
assert(atomicOp!"+="(i16, 8) == 14);
16241624
assert(atomicOp!"+="(i32, 8) == 15);
1625-
version ( AsmX86_64 )
1625+
version (AsmX86_64)
16261626
{
16271627
shared ulong u64 = 4;
16281628
shared long i64 = 8;
@@ -1646,7 +1646,7 @@ version ( unittest )
16461646
assert(atomicOp!"-="(i8, 1) == 4);
16471647
assert(atomicOp!"-="(i16, 1) == 5);
16481648
assert(atomicOp!"-="(i32, 1) == 6);
1649-
version ( AsmX86_64 )
1649+
version (AsmX86_64)
16501650
{
16511651
shared ulong u64 = 4;
16521652
shared long i64 = 8;

‎src/core/bitop.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ nothrow:
1313
@safe:
1414
@nogc:
1515

16-
version ( D_InlineAsm_X86_64 )
16+
version (D_InlineAsm_X86_64)
1717
version = AsmX86;
18-
else version ( D_InlineAsm_X86 )
18+
else version (D_InlineAsm_X86)
1919
version = AsmX86;
2020

2121
version (X86_64)

‎src/core/runtime.d

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -580,21 +580,21 @@ extern (C) void profilegc_setlogfilename(string name);
580580
extern (C) UnitTestResult runModuleUnitTests()
581581
{
582582
// backtrace
583-
version ( CRuntime_Glibc )
583+
version (CRuntime_Glibc)
584584
import core.sys.linux.execinfo;
585-
else version ( Darwin )
585+
else version (Darwin)
586586
import core.sys.darwin.execinfo;
587-
else version ( FreeBSD )
587+
else version (FreeBSD)
588588
import core.sys.freebsd.execinfo;
589-
else version ( NetBSD )
589+
else version (NetBSD)
590590
import core.sys.netbsd.execinfo;
591-
else version ( DragonFlyBSD )
591+
else version (DragonFlyBSD)
592592
import core.sys.dragonflybsd.execinfo;
593-
else version ( Windows )
593+
else version (Windows)
594594
import core.sys.windows.stacktrace;
595-
else version ( Solaris )
595+
else version (Solaris)
596596
import core.sys.solaris.execinfo;
597-
else version ( CRuntime_UClibc )
597+
else version (CRuntime_UClibc)
598598
import core.sys.linux.execinfo;
599599

600600
static if ( __traits( compiles, backtrace ) )
@@ -698,21 +698,21 @@ extern (C) UnitTestResult runModuleUnitTests()
698698
Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
699699
{
700700
// backtrace
701-
version ( CRuntime_Glibc )
701+
version (CRuntime_Glibc)
702702
import core.sys.linux.execinfo;
703-
else version ( Darwin )
703+
else version (Darwin)
704704
import core.sys.darwin.execinfo;
705-
else version ( FreeBSD )
705+
else version (FreeBSD)
706706
import core.sys.freebsd.execinfo;
707-
else version ( NetBSD )
707+
else version (NetBSD)
708708
import core.sys.netbsd.execinfo;
709-
else version ( DragonFlyBSD )
709+
else version (DragonFlyBSD)
710710
import core.sys.dragonflybsd.execinfo;
711-
else version ( Windows )
711+
else version (Windows)
712712
import core.sys.windows.stacktrace;
713-
else version ( Solaris )
713+
else version (Solaris)
714714
import core.sys.solaris.execinfo;
715-
else version ( CRuntime_UClibc )
715+
else version (CRuntime_UClibc)
716716
import core.sys.linux.execinfo;
717717

718718
// avoid recursive GC calls in finalizer, trace handlers should be made @nogc instead
@@ -736,10 +736,10 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
736736
{
737737
static void** getBasePtr()
738738
{
739-
version ( D_InlineAsm_X86 )
739+
version (D_InlineAsm_X86)
740740
asm { naked; mov EAX, EBP; ret; }
741741
else
742-
version ( D_InlineAsm_X86_64 )
742+
version (D_InlineAsm_X86_64)
743743
asm { naked; mov RAX, RBP; ret; }
744744
else
745745
return null;
@@ -859,7 +859,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
859859
const(char)[] fixline( const(char)[] buf, return ref char[4096] fixbuf ) const
860860
{
861861
size_t symBeg, symEnd;
862-
version ( Darwin )
862+
version (Darwin)
863863
{
864864
// format is:
865865
// 1 module 0x00000000 D6module4funcAFZv + 0
@@ -880,7 +880,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
880880
}
881881
}
882882
}
883-
else version ( CRuntime_Glibc )
883+
else version (CRuntime_Glibc)
884884
{
885885
// format is: module(_D6module4funcAFZv) [0x00000000]
886886
// or: module(_D6module4funcAFZv+0x78) [0x00000000]
@@ -897,7 +897,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
897897
symEnd = eptr - buf.ptr;
898898
}
899899
}
900-
else version ( FreeBSD )
900+
else version (FreeBSD)
901901
{
902902
// format is: 0x00000000 <_D6module4funcAFZv+0x78> at module
903903
auto bptr = cast(char*) memchr( buf.ptr, '<', buf.length );
@@ -909,7 +909,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
909909
symEnd = eptr - buf.ptr;
910910
}
911911
}
912-
else version ( NetBSD )
912+
else version (NetBSD)
913913
{
914914
// format is: 0x00000000 <_D6module4funcAFZv+0x78> at module
915915
auto bptr = cast(char*) memchr( buf.ptr, '<', buf.length );
@@ -921,7 +921,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
921921
symEnd = eptr - buf.ptr;
922922
}
923923
}
924-
else version ( DragonFlyBSD )
924+
else version (DragonFlyBSD)
925925
{
926926
// format is: 0x00000000 <_D6module4funcAFZv+0x78> at module
927927
auto bptr = cast(char*) memchr( buf.ptr, '<', buf.length );
@@ -933,7 +933,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
933933
symEnd = eptr - buf.ptr;
934934
}
935935
}
936-
else version ( Solaris )
936+
else version (Solaris)
937937
{
938938
// format is object'symbol+offset [pc]
939939
auto bptr = cast(char*) memchr( buf.ptr, '\'', buf.length );

‎src/core/simd.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static if (is(Vector!(uint[8]))) alias Vector!(uint[8]) uint8; ///
6262
static if (is(Vector!(long[4]))) alias Vector!(long[4]) long4; ///
6363
static if (is(Vector!(ulong[4]))) alias Vector!(ulong[4]) ulong4; ///
6464

65-
version ( D_SIMD )
65+
version (D_SIMD)
6666
{
6767
/** XMM opcodes that conform to the following:
6868
*

‎src/core/stdc/config.d

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ else version (TVOS)
9999
else version (WatchOS)
100100
version = Darwin;
101101

102-
version ( Windows )
102+
version (Windows)
103103
{
104104
enum __c_long : int;
105105
enum __c_ulong : uint;
@@ -113,7 +113,7 @@ version ( Windows )
113113
alias long cpp_longlong;
114114
alias ulong cpp_ulonglong;
115115
}
116-
else version ( Posix )
116+
else version (Posix)
117117
{
118118
static if ( (void*).sizeof > int.sizeof )
119119
{
@@ -145,7 +145,7 @@ else version ( Posix )
145145
}
146146
}
147147

148-
version ( CRuntime_Microsoft )
148+
version (CRuntime_Microsoft)
149149
{
150150
/* long double is 64 bits, not 80 bits, but is mangled differently
151151
* than double. To distinguish double from long double, create a wrapper to represent
@@ -157,39 +157,39 @@ version ( CRuntime_Microsoft )
157157

158158
alias __c_long_double c_long_double;
159159
}
160-
else version ( DigitalMars )
160+
else version (DigitalMars)
161161
{
162-
version ( X86 )
162+
version (X86)
163163
{
164164
alias real c_long_double;
165165
}
166-
else version ( X86_64 )
166+
else version (X86_64)
167167
{
168-
version ( linux )
168+
version (linux)
169169
alias real c_long_double;
170-
else version ( FreeBSD )
170+
else version (FreeBSD)
171171
alias real c_long_double;
172-
else version ( OpenBSD )
172+
else version (OpenBSD)
173173
alias real c_long_double;
174-
else version ( NetBSD )
174+
else version (NetBSD)
175175
alias real c_long_double;
176-
else version ( DragonFlyBSD )
176+
else version (DragonFlyBSD)
177177
alias real c_long_double;
178-
else version ( Solaris )
178+
else version (Solaris)
179179
alias real c_long_double;
180-
else version ( Darwin )
180+
else version (Darwin)
181181
alias real c_long_double;
182182
}
183183
}
184-
else version ( GNU )
184+
else version (GNU)
185185
alias real c_long_double;
186-
else version ( LDC )
186+
else version (LDC)
187187
alias real c_long_double;
188-
else version ( SDC )
188+
else version (SDC)
189189
{
190-
version ( X86 )
190+
version (X86)
191191
alias real c_long_double;
192-
else version ( X86_64 )
192+
else version (X86_64)
193193
alias real c_long_double;
194194
}
195195

‎src/core/stdc/errno.d

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ else
121121
extern (C):
122122

123123

124-
version ( Windows )
124+
version (Windows)
125125
{
126126
enum EPERM = 1; /// Operation not permitted
127127
enum ENOENT = 2; /// No such file or directory
@@ -163,7 +163,7 @@ version ( Windows )
163163
enum EILSEQ = 42; /// Illegal byte sequence
164164
enum EDEADLOCK = EDEADLK; /// Resource deadlock would occur
165165
}
166-
else version ( linux )
166+
else version (linux)
167167
{
168168
enum EPERM = 1; ///
169169
enum ENOENT = 2; ///
@@ -1445,7 +1445,7 @@ else version ( linux )
14451445
static assert(false, "Architecture not supported.");
14461446
}
14471447
}
1448-
else version ( Darwin )
1448+
else version (Darwin)
14491449
{
14501450
enum EPERM = 1; /// Operation not permitted
14511451
enum ENOENT = 2; /// No such file or directory
@@ -1528,7 +1528,7 @@ else version ( Darwin )
15281528
enum ETIME = 101; /// STREAM ioctl timeout
15291529
enum ELAST = 101; /// Must be equal largest errno
15301530
}
1531-
else version ( FreeBSD )
1531+
else version (FreeBSD)
15321532
{
15331533
enum EPERM = 1; /// Operation not permitted
15341534
enum ENOENT = 2; /// No such file or directory
@@ -1755,7 +1755,7 @@ else version (NetBSD)
17551755
enum ENOLINK = 95;
17561756
enum EPROTO = 96;
17571757
}
1758-
else version ( OpenBSD )
1758+
else version (OpenBSD)
17591759
{
17601760
enum EPERM = 1; /// Operation not permitted
17611761
enum ENOENT = 2; /// No such file or directory
@@ -1851,7 +1851,7 @@ else version ( OpenBSD )
18511851
enum ENOTSUP = 91; /// Not supported
18521852
enum ELAST = 91; /// Must be equal largest errno
18531853
}
1854-
else version ( DragonFlyBSD )
1854+
else version (DragonFlyBSD)
18551855
{
18561856
enum EPERM = 1;
18571857
enum ENOENT = 2;

0 commit comments

Comments
 (0)