Merge remote-tracking branch 'upstream/master' into stable

.gitignore

@@ -9,17 +9,15 @@ src/elxxx.c
 src/fltables.c
 src/id.c
 src/id.h
+src/id.d
 src/idgen
-src/impcnvgen
-src/impcnvtab.c
 src/optab.c
 src/optabgen
 src/tytab.c
 test/test_results
 *.obj
 src/idgen.exe
 src/dmd.exe
-src/impcnvgen.exe
 src/optabgen.exe
 src/verstr.h
 *.map
@@ -52,80 +50,4 @@ src/*.lib
 tags
 
 # OSX
-src/impcnvgen.dSYM/
 src/optabgen.dSYM/
-
-# Generated D source
-src/access.d
-src/aggregate.d
-src/aliasthis.d
-src/apply.d
-src/argtypes.d
-src/arrayop.d
-src/arraytypes.d
-src/attrib.d
-src/builtin.d
-src/canthrow.d
-src/dcast.d
-src/dclass.d
-src/clone.d
-src/cond.d
-src/constfold.d
-src/cppmangle.d
-src/ctfeexpr.d
-src/declaration.d
-src/delegatize.d
-src/doc.d
-src/dsymbol.d
-src/denum.d
-src/errors.d
-src/expression.d
-src/func.d
-src/hdrgen.d
-src/id.d
-src/identifier.d
-src/imphint.d
-src/dimport.d
-src/dinifile.d
-src/inline.d
-src/init.d
-src/dinterpret.d
-src/json.d
-src/lexer.d
-src/link.d
-src/dmacro.d
-src/dmangle.d
-src/mars.d
-src/dmodule.d
-src/mtype.d
-src/nspace.d
-src/opover.d
-src/optimize.d
-src/parse.d
-src/sapply.d
-src/dscope.d
-src/sideeffect.d
-src/statement.d
-src/staticassert.d
-src/dstruct.d
-src/target.d
-src/dtemplate.d
-src/tokens.d
-src/traits.d
-src/dunittest.d
-src/utf.d
-src/dversion.d
-src/visitor.d
-src/lib.d
-src/nogc.d
-src/nspace.d
-src/color.d
-src/globals.d
-src/root/aav.d
-src/root/file.d
-src/root/filename.d
-src/root/speller.d
-src/root/man.d
-src/root/outbuffer.d
-src/root/response.d
-src/root/stringtable.d

.travis.yml

@@ -1,3 +1,21 @@
-branches:
-  only:
-    - dmd-1.x
+language: d
+d:
+  - dmd
+  - gdc
+  - ldc
+
+script: ./travis.sh
+
+sudo: false
+addons:
+  apt:
+    packages:
+    - gdb
+
+matrix:
+  allow_failures:
+    - d: ldc
+
+env:
+  - SELF_COMPILE=0
+  - SELF_COMPILE=2

VERSION

@@ -1 +1 @@
-2.068
+2.069

changelog.dd

@@ -1,13 +1,41 @@
 Ddoc
 
-$(COMMENT Pending changelog for 2.068.2.
+$(COMMENT Pending changelog for 2.069. This will get copied to dlang.org and
+    cleared when master gets merged into stable prior to 2.069.
 )
 
 $(BUGSTITLE Compiler Changes,
-$(LI The fix for $(BUGZILLA 14708) was reverted: destructor for temporary not called during stack unwinding, see $(DMDPR 5110).)
+$(LI $(RELATIVE_LINK2 objective-c-support, Basic support for Objective-C.))
+$(LI $(RELATIVE_LINK2 property-switch-deprecated, The $(TT -property) switch has
+    been deprecated.))
 )
 
 $(BUGSTITLE Compiler Changes,
+
+$(LI $(LNAME2 objective-c-support, Basic support for Objective-C.)
+
+    $(P Basic support for Objective-C classes, interfaces and instance methods.
+        This is implemented by adding a new linkage attribute, Objective-C, and
+        a compiler recognized UDA, @selector. The linkage attribute is to be
+        used on a class or interface. The UDA is attached to a method.
+    )
+)
+
+$(LI $(LNAME2 property-switch-deprecated, The $(TT -property) switch has
+    been deprecated.)
+
+    $(P The $(TT -property) switch used to disallow calling non-properties
+        without parentheses. The switch has not been used to build Phobos for
+        some time now. So naturally, code that's incompatible with
+        $(TT -property) has found its way in. This means, the switch has
+        effectively not been supported by D at large.
+    )
+
+    $(P Since the behaviour of the $(TT -property) switch was not well-liked,
+        it's been deprecated and made to have no effect when used.
+    )
+)
+
 )
 
 Macros:
@@ -18,6 +46,10 @@ Macros:
     RELATIVE_LINK2=<a href="#$1">$+</a>
     LNAME2=<a class="anchor" title="Permalink to this section" id="$1" href="#$1">$+</a>
 
+    STDMODREF = <a href="phobos/std_$1.html">$2</a>
+    XREF = <a href="phobos/std_$1.html#$2">$2</a>
+    CXREF = <a href="phobos/core_$1.html#$2">$2</a>
+
     BUGZILLA = <a href="https://issues.dlang.org/show_bug.cgi?id=$0">Bugzilla $0</a>
     PULL_REQUEST = $(LINK2 https://github.com/D-Programming-Language/$1/pull/$2, $1#$2)
     DMDPR = $(PULL_REQUEST dmd,$1)

ini/windows/bin/sc.ini

@@ -46,14 +46,18 @@ LINKCMD=%VCINSTALLDIR%\bin\link.exe
 ; Windows installer replaces the following lines with the actual paths
 ;VCINSTALLDIR=
 ;WindowsSdkDir=
+;UniversalCRTSdkDir=
+;UCRTVersion=
 
 ; Windows installer uncomments the version detected
+;VC2015 LINKCMD=%VCINSTALLDIR%\bin\x86_amd64\link.exe
 ;VC2013 LINKCMD=%VCINSTALLDIR%\bin\x86_amd64\link.exe
 ;VC2012 LINKCMD=%VCINSTALLDIR%\bin\x86_amd64\link.exe
 ;VC2010 LINKCMD=%VCINSTALLDIR%\bin\amd64\link.exe
 ;VC2008 LINKCMD=%VCINSTALLDIR%\bin\amd64\link.exe
 
 ; needed with /DEBUG to find mspdb*.dll (only for VS2012 or VS2013)
+;VC2015 PATH=%PATH%;%VCINSTALLDIR%\bin\x86_amd64;%VCINSTALLDIR%\bin
 ;VC2013 PATH=%PATH%;%VCINSTALLDIR%\bin\x86_amd64;%VCINSTALLDIR%\..\Common7\IDE;%VCINSTALLDIR%\bin
 ;VC2012 PATH=%PATH%;%VCINSTALLDIR%\bin\x86_amd64;%VCINSTALLDIR%\..\Common7\IDE
 
@@ -66,6 +70,10 @@ LINKCMD=%VCINSTALLDIR%\bin\link.exe
 ; C Runtime libraries
 LIB=%LIB%;"%VCINSTALLDIR%\lib\amd64"
 
+; Platform/UCRT libraries (Windows SDK 10.0)
+LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\um\x64"
+LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\ucrt\x64"
+
 ; Platform libraries (Windows SDK 8.1)
 LIB=%LIB%;"%WindowsSdkDir%\Lib\winv6.3\um\x64"
 
@@ -91,10 +99,13 @@ DFLAGS=%DFLAGS% -L/OPT:NOICF
 ; Windows installer replaces the following lines with the actual paths
 ;VCINSTALLDIR=
 ;WindowsSdkDir=
+;UniversalCRTSdkDir=
+;UCRTVersion=
 
 LINKCMD=%VCINSTALLDIR%\bin\link.exe
 
 ; needed with /DEBUG to find mspdb*.dll (only for VS2012 or VS2013)
+;VC2015 PATH=%PATH%;%VCINSTALLDIR%\bin
 ;VC2013 PATH=%PATH%;%VCINSTALLDIR%\..\Common7\IDE;%VCINSTALLDIR%\bin
 ;VC2012 PATH=%PATH%;%VCINSTALLDIR%\..\Common7\IDE
 
@@ -105,6 +116,10 @@ LINKCMD=%VCINSTALLDIR%\bin\link.exe
 ; C Runtime libraries
 LIB=%LIB%;"%VCINSTALLDIR%\lib"
 
+; Platform/UCRT libraries (Windows SDK 10.0)
+LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\um\x86"
+LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\ucrt\x86"
+
 ; Platform libraries (Windows SDK 8.1)
 LIB=%LIB%;"%WindowsSdkDir%\Lib\winv6.3\um\x86"
 

posix.mak

@@ -1,14 +1,14 @@
 INSTALL_DIR=$(PWD)/../install
-ECTAGS_LANGS = Make,C,C++,Sh
-ECTAGS_FILES = src/*.[ch] src/backend/*.[ch] src/root/*.[ch] src/tk/*.[ch]
+ECTAGS_LANGS = Make,C,C++,D,Sh
+ECTAGS_FILES = src/*.[chd] src/backend/*.[chd] src/root/*.[chd] src/tk/*.[chd]
 
 .PHONY: all clean test install auto-tester-build auto-tester-test
 
 all:
 	$(QUIET)$(MAKE) -C src -f posix.mak
 
 auto-tester-build:
-	$(QUIET)$(MAKE) -C src -f posix.mak $<
+	$(QUIET)$(MAKE) -C src -f posix.mak auto-tester-build
 
 auto-tester-test: test
 

samples/listener.d

@@ -81,14 +81,15 @@ void main(string[] args)
 
         if (socketSet.isSet(listener))        // connection request
         {
-            Socket sn = listener.accept();
+            Socket sn = null;
             scope (failure)
             {
                 writefln("Error accepting");
 
                 if (sn)
                     sn.close();
             }
+            sn = listener.accept();
             assert(sn.isAlive);
             assert(listener.isAlive);