Merge branch 'master' into 64bit

Conflicts:
	makefile

Author: JesseKPhillips

juno/base/collections.d

@@ -4,6 +4,7 @@
  * License: See $(LINK2 ..\..\licence.txt, licence.txt) for use and distribution terms.
  */
 module juno.base.collections;
+ deprecated:
 
 import juno.base.core,
   juno.locale.core,

juno/base/core.d

@@ -17,12 +17,18 @@ struct Struct(T...) {
 
 }
 
+/**
+ * $(MSDN system.idisposable, MSDN System.IDisposable)
+ */
 interface IDisposable {
 
   void dispose();
 
 }
 
+/**
+ * Calls dispose on obj on block() completion.
+ */
 void using(IDisposable obj, void delegate() block) {
   try {
     block();

juno/base/environment.d

@@ -202,7 +202,7 @@ final class Version {
     return 0;
   }
 
-  override typeof(super.opEquals(Object)) opEquals(Object other) {
+  override bool opEquals(Object other) {
     auto v = cast(Version)other;
     if (v is null)
       return false;

juno/base/text.d

@@ -38,33 +38,33 @@ struct MIMECPINFO {
   uint dwFlags;
   uint uiCodePage;
   uint uiFamilyCodePage;
-  wchar[64] wszDescription;
-  wchar[50] wszWebCharset;
-  wchar[50] wszHeaderCharset;
-  wchar[50] wszBodyCharset;
-  wchar[32] wszFixedWidthFont;
-  wchar[32] wszProportionalFont;
+  wchar wszDescription[64];
+  wchar wszWebCharset[50];
+  wchar wszHeaderCharset[50];
+  wchar wszBodyCharset[50];
+  wchar wszFixedWidthFont[32];
+  wchar wszProportionalFont[32];
   ubyte bGDICharset;
 }
 
 struct MIMECSETINFO {
   uint uiCodePage;
   uint uiInternetEncoding;
-  wchar[50] wszCharset;
+  wchar wszCharset[50];
 }
 
 struct RFC1766INFO {
   uint lcid;
-  wchar[6] wszRfc1766;
-  wchar[32] wszLocaleName;
+  wchar wszRfc1766[6];
+  wchar wszLocaleName[32];
 }
 
 struct SCRIPTINFO {
   ubyte ScriptId;
   uint uiCodePage;
-  wchar[64] wszDescription;
-  wchar[32] wszFixedWidthFont;
-  wchar[32] wszProportionalFont;
+  wchar wszDescription[64];
+  wchar wszFixedWidthFont[32];
+  wchar wszProportionalFont[32];
 }
 
 struct DetectEncodingInfo {
@@ -290,28 +290,28 @@ private uint getCodePageFromName(string name) {
  */
 abstract class Encoding {
 
-  private const uint CP_DEFAULT = 0;
-  private const uint CP_ASCII = 20127;
-  private const uint CP_UTF16 = 1200;
-  private const uint CP_UTF16BE = 1201;
-  private const uint CP_UTF32 = 12000;
-  private const uint CP_UTF32BE = 12001;
-  private const uint CP_WINDOWS_1252 = 1252;
-  private const uint ISO_8859_1 = 28591;
-
-  private const uint ISO_SIMPLIFIED_CN = 50227;
-  private const uint GB18030 = 54936;
-  private const uint ISO_8859_8I = 38598;
-  private const uint ISCII_DEVANAGARI = 57002;
-  private const uint ISCII_BENGALI = 57003;
-  private const uint ISCII_TAMIL = 57004;
-  private const uint ISCII_TELUGU = 57005;
-  private const uint ISCII_ASSEMESE = 57006;
-  private const uint ISCII_ORIYA = 57007;
-  private const uint ISCII_KANNADA = 57008;
-  private const uint ISCII_MALAYALAM = 57009;
-  private const uint ISCII_GUJARATHI = 57010;
-  private const uint ISCII_PUNJABI = 507011;
+  private static const uint CP_DEFAULT = 0;
+  private static const uint CP_ASCII = 20127;
+  private static const uint CP_UTF16 = 1200;
+  private static const uint CP_UTF16BE = 1201;
+  private static const uint CP_UTF32 = 12000;
+  private static const uint CP_UTF32BE = 12001;
+  private static const uint CP_WINDOWS_1252 = 1252;
+  private static const uint ISO_8859_1 = 28591;
+
+  private static const uint ISO_SIMPLIFIED_CN = 50227;
+  private static const uint GB18030 = 54936;
+  private static const uint ISO_8859_8I = 38598;
+  private static const uint ISCII_DEVANAGARI = 57002;
+  private static const uint ISCII_BENGALI = 57003;
+  private static const uint ISCII_TAMIL = 57004;
+  private static const uint ISCII_TELUGU = 57005;
+  private static const uint ISCII_ASSEMESE = 57006;
+  private static const uint ISCII_ORIYA = 57007;
+  private static const uint ISCII_KANNADA = 57008;
+  private static const uint ISCII_MALAYALAM = 57009;
+  private static const uint ISCII_GUJARATHI = 57010;
+  private static const uint ISCII_PUNJABI = 507011;
 
   private static Encoding[uint] encodings_;
   private static Encoding defaultEncoding_;

juno/com/core.d

@@ -3753,7 +3753,7 @@ R invokeMethod(R = VARIANT)(IDispatch target, string name, ...) {
  *
  *   // Invoke the Documents property
  *   //   wordApp.Document
- *   IDispatch documents = getProperty!(IDispatch)(target, "Documents");
+ *   IDispatch documents = getProperty!(IDispatch)(wordApp, "Documents");
  *
  *   // Invoke the Count property on the Documents object
  *   //   documents.Count

juno/locale/time.d

@@ -1001,12 +1001,12 @@ enum DateTimeKind {
  */
 struct DateTime {
 
-  private const ulong KindUnspecified = 0x0000000000000000;
-  private const ulong KindUtc         = 0x4000000000000000;
-  private const ulong KindLocal       = 0x8000000000000000;
-  private const ulong KindMask        = 0xC000000000000000;
-  private const ulong TicksMask       = 0x3FFFFFFFFFFFFFFF;
-  private const int KindShift         = 0x3E;
+  private static const ulong KindUnspecified = 0x0000000000000000;
+  private static const ulong KindUtc         = 0x4000000000000000;
+  private static const ulong KindLocal       = 0x8000000000000000;
+  private static const ulong KindMask        = 0xC000000000000000;
+  private static const ulong TicksMask       = 0x3FFFFFFFFFFFFFFF;
+  private static const int KindShift         = 0x3E;
 
   /// Represents the smallest possible DateTime value.
   static DateTime min = { 0 };

juno/macro.ddoc

@@ -0,0 +1,3 @@
+Macros:
+ MSDN = $(LINK2 http://msdn.microsoft.com/en-us/library/$1.aspx, $+)
+

juno/media/core.d

@@ -1,7 +1,7 @@
 /**
  * Provides access to basic GDI+ graphics functionality.
  *
- * For detailed information, refer to MSDN's documentation for the $(LINK2 http://msdn2.microsoft.com/en-us/library/system.drawing.aspx, System.Drawing) namespace.
+ * For detailed information, refer to MSDN's documentation for the $(MSDN system.drawing, System.Drawing) namespace.
  *
  * Copyright: (c) 2009 John Chapman
  *

juno/net/core.d

@@ -94,13 +94,13 @@ class Uri {
     int defaultPort;
   }
 
-  const string uriSchemeHttp = "http";      /// Specifies that the URI is accessed through HTTP.
-  const string uriSchemeHttps = "https";    /// Specifies that the URI is accessed through HTTPS.
-  const string uriSchemeFtp = "ftp";        /// Specifies that the URI is accessed through FTP.
-  const string uriSchemeFile = "file";      /// Specifies that the URI is a pointer to a file.
-  const string uriSchemeNews = "news";      /// Specifies that the URI is a news groups and is accessed through NNTP.
-  const string uriSchemeMailTo = "mailto";  /// Specifies that the URI is an e-mail address and is accessed through SMTP.
-  const string schemeDelimiter = "://";
+  const static string uriSchemeHttp = "http";      /// Specifies that the URI is accessed through HTTP.
+  const static string uriSchemeHttps = "https";    /// Specifies that the URI is accessed through HTTPS.
+  const static string uriSchemeFtp = "ftp";        /// Specifies that the URI is accessed through FTP.
+  const static string uriSchemeFile = "file";      /// Specifies that the URI is a pointer to a file.
+  const static string uriSchemeNews = "news";      /// Specifies that the URI is a news groups and is accessed through NNTP.
+  const static string uriSchemeMailTo = "mailto";  /// Specifies that the URI is an e-mail address and is accessed through SMTP.
+  const static string schemeDelimiter = "://";
 
   private const UriScheme httpScheme = { uriSchemeHttp, 80 };
   private const UriScheme httpsScheme = { uriSchemeHttps, 443 };
@@ -152,8 +152,8 @@ class Uri {
   }
 
   /// ditto
-  override typeof(super.opEquals(Object)) opEquals(Object obj) {
-    return cast(typeof(super.opEquals(Object)))equals(obj);
+  override bool opEquals(Object obj) {
+    return equals(obj);
   }
 
   /**
@@ -593,7 +593,7 @@ private class CredentialKey {
     return std.string.icmp(uriPrefix.absolutePath, uri.absolutePath) == 0;
   }
 
-  override typeof(super.opEquals(Object)) opEquals(Object obj) {
+  override bool opEquals(Object obj) {
     if (auto other = cast(CredentialKey)obj)
       return (std.string.icmp(authType, other.authType) == 0 && uriPrefix.equals(other.uriPrefix));
     return false;
@@ -627,7 +627,7 @@ private class CredentialHostKey {
     return true;
   }
 
-  override typeof(super.opEquals(Object)) opEquals(Object obj) {
+  override bool opEquals(Object obj) {
     if (auto other = cast(CredentialHostKey)obj)
       return (std.string.icmp(host, other.host) == 0 && std.string.icmp(authType, other.authType) == 0 && port == other.port);
     return false;
@@ -1292,7 +1292,7 @@ class IPAddress {
     return false;
   }
 
-  override typeof(super.opEquals(Object)) opEquals(Object obj) {
+  override bool opEquals(Object obj) {
     return this.equals(obj);
   }
 
@@ -1558,8 +1558,8 @@ class PingReply {
  */
 class Ping : IDisposable {
 
-  private const uint DEFAULT_TIMEOUT = 5000;
-  private const uint DEFAULT_BUFFER_SIZE = 32;
+  private static const uint DEFAULT_TIMEOUT = 5000;
+  private static const uint DEFAULT_BUFFER_SIZE = 32;
 
   private Handle pingHandleV4_;
   private Handle pingHandleV6_;