mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 01:41:17 -10:00
Compare commits
28
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51469e6f71 | ||
|
|
585aa54a23 | ||
|
|
3f61b88aa7 | ||
|
|
182ec00c81 | ||
|
|
5202b48e9e | ||
|
|
828e996894 | ||
|
|
28145e01f4 | ||
|
|
9761a75934 | ||
|
|
824c987fe8 | ||
|
|
b41145223b | ||
|
|
a91d39e482 | ||
|
|
0081c27e0d | ||
|
|
6272eafb17 | ||
|
|
c68c72144d | ||
|
|
75c5d4a6c5 | ||
|
|
9c99885c9b | ||
|
|
b0dfc28659 | ||
|
|
d4511ef6b5 | ||
|
|
d6cc1326bc | ||
|
|
61fec75147 | ||
|
|
704ca7886e | ||
|
|
77d00e19fc | ||
|
|
5ec989143f | ||
|
|
69419b4be2 | ||
|
|
2bd6fef770 | ||
|
|
ad325d4b1c | ||
|
|
64f1d09b65 | ||
|
|
94bc52a101 |
No files matched your search
+2
-2
@@ -3,10 +3,10 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
|
||||
|
||||
if CROSS_COMPILING
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
|
||||
# Keep in sync with SUBDIRS
|
||||
## 'tools' is not normally built
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
|
||||
else
|
||||
if ONLY_MONOTOUCH
|
||||
SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
|
||||
|
||||
+4
-5
@@ -386,7 +386,7 @@ static void GC_mark_togglerefs ()
|
||||
if (!GC_toggleref_array)
|
||||
return;
|
||||
|
||||
GC_set_mark_bit (GC_toggleref_array);
|
||||
GC_set_mark_bit ((GC_PTR)GC_toggleref_array);
|
||||
for (i = 0; i < GC_toggleref_array_size; ++i) {
|
||||
if (GC_toggleref_array [i].strong_ref) {
|
||||
GC_PTR object = GC_toggleref_array [i].strong_ref;
|
||||
@@ -424,7 +424,7 @@ ensure_toggleref_capacity (int capacity)
|
||||
{
|
||||
if (!GC_toggleref_array) {
|
||||
GC_toggleref_array_capacity = 32;
|
||||
GC_toggleref_array = (GCToggleRef *) GC_INTERNAL_MALLOC (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
GC_toggleref_array = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
}
|
||||
if (GC_toggleref_array_size + capacity >= GC_toggleref_array_capacity) {
|
||||
GCToggleRef *tmp;
|
||||
@@ -432,10 +432,9 @@ ensure_toggleref_capacity (int capacity)
|
||||
while (GC_toggleref_array_capacity < GC_toggleref_array_size + capacity)
|
||||
GC_toggleref_array_capacity *= 2;
|
||||
|
||||
tmp = (GCToggleRef *) GC_INTERNAL_MALLOC (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
tmp = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
memcpy (tmp, GC_toggleref_array, GC_toggleref_array_size * sizeof (GCToggleRef));
|
||||
|
||||
GC_free((GC_PTR)GC_toggleref_array);
|
||||
GC_INTERNAL_FREE (GC_toggleref_array);
|
||||
GC_toggleref_array = tmp;
|
||||
}
|
||||
}
|
||||
|
||||
+5
-1
@@ -168,7 +168,11 @@ xammac_dirs := \
|
||||
System.Net.Http
|
||||
|
||||
monotouch_runtime_dirs := \
|
||||
corlib
|
||||
corlib \
|
||||
System \
|
||||
System.Core \
|
||||
System.XML \
|
||||
Mono.CSharp
|
||||
|
||||
monotouch_dirs := \
|
||||
Mono.CSharp \
|
||||
|
||||
@@ -21,7 +21,7 @@ ifeq (xammac, $(PROFILE))
|
||||
LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT
|
||||
endif
|
||||
|
||||
ifeq (monotouch, $(PROFILE))
|
||||
ifeq (monotouch, $(subst _runtime,,$(PROFILE)))
|
||||
LIBRARY_USE_INTERMEDIATE_FILE = yes
|
||||
|
||||
CYCLIC_DEPS := $(INTERPRETER_DEP)
|
||||
@@ -37,6 +37,10 @@ endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq (monotouch_runtime, $(PROFILE))
|
||||
LIB_MCS_FLAGS += -d:FULL_AOT_RUNTIME
|
||||
endif
|
||||
|
||||
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
|
||||
LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT,FEATURE_PDBEMIT
|
||||
endif
|
||||
|
||||
@@ -56,7 +56,6 @@ namespace MonoTests.System.Linq.Expressions
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
[Category ("NotWorkingInterpreter")]
|
||||
public void CompiledQuote ()
|
||||
{
|
||||
var quote42 = Expression.Lambda<Func<Expression<Func<int>>>> (
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Core.dll.sources
|
||||
@@ -11,7 +11,7 @@
|
||||
<Interfaces />
|
||||
<Docs>
|
||||
<summary>An Http Message Handler for HttpClient that is powered by iOS/MacOS CFNetwork stack.</summary>
|
||||
<remarks>
|
||||
<remarks preserve-mono="true">
|
||||
<para>
|
||||
This handler allows the HttpClient API to use Apple's
|
||||
CFNetwork as the HTTP transport as opposed to the default
|
||||
@@ -54,7 +54,7 @@ var client = new HttpClient (new CFNetworkHandler ());
|
||||
</AssemblyInfo>
|
||||
<Parameters />
|
||||
<Docs>
|
||||
<summary>Creates an instance of the CFNetwork-based http handler..</summary>
|
||||
<summary preserve-mono="true">Creates an instance of the CFNetwork-based http handler..</summary>
|
||||
<remarks></remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
@@ -69,7 +69,7 @@ var client = new HttpClient (new CFNetworkHandler ());
|
||||
<ReturnType>System.Boolean</ReturnType>
|
||||
</ReturnValue>
|
||||
<Docs>
|
||||
<summary>Determines whether the request handler should follow redirects sent by the server.</summary>
|
||||
<summary preserve-mono="true">Determines whether the request handler should follow redirects sent by the server.</summary>
|
||||
<value></value>
|
||||
<remarks></remarks>
|
||||
</Docs>
|
||||
@@ -88,7 +88,7 @@ var client = new HttpClient (new CFNetworkHandler ());
|
||||
<Parameter Name="disposing" Type="System.Boolean" />
|
||||
</Parameters>
|
||||
<Docs>
|
||||
<param name="disposing">True if this is being called from Dispose(), false if it is being invoked by the finalizer.</param>
|
||||
<param name="disposing" preserve-mono="true">True if this is being called from Dispose(), false if it is being invoked by the finalizer.</param>
|
||||
<summary>Disposes this CFNetworkHandler.</summary>
|
||||
<remarks></remarks>
|
||||
</Docs>
|
||||
@@ -116,11 +116,11 @@ var client = new HttpClient (new CFNetworkHandler ());
|
||||
<Parameter Name="cancellationToken" Type="System.Threading.CancellationToken" />
|
||||
</Parameters>
|
||||
<Docs>
|
||||
<param name="request">The request to send.</param>
|
||||
<param name="cancellationToken">Cancelation token to cancel the operation.</param>
|
||||
<summary>Sends the Http message asynchronously.</summary>
|
||||
<param name="request" preserve-mono="true">The request to send.</param>
|
||||
<param name="cancellationToken" preserve-mono="true">Cancelation token to cancel the operation.</param>
|
||||
<summary preserve-mono="true">Sends the Http message asynchronously.</summary>
|
||||
<returns>Task representing the asynchronous operation.</returns>
|
||||
<remarks>
|
||||
<remarks preserve-mono="true">
|
||||
This method is invoked by the HttpClient, it is non-blocking.
|
||||
</remarks>
|
||||
</Docs>
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
#include mobile_System.Xml.dll.sources
|
||||
@@ -16,10 +16,13 @@
|
||||
<ReturnType>System.Collections.Generic.IEnumerable<System.String></ReturnType>
|
||||
</ReturnValue>
|
||||
<Docs>
|
||||
<param name="protocol">To be added.</param>
|
||||
<param name="allCiphers">To be added.</param>
|
||||
<summary>To be added.</summary>
|
||||
<returns>To be added.</returns>
|
||||
<remarks>To be added.</remarks>
|
||||
<param name="protocol" preserve-mono="true">The SSL/TLS protocol version used for the connection.</param>
|
||||
<param name="allCiphers" preserve-mono="true">The ordered list of all supported cipher suites.</param>
|
||||
<summary preserve-mono="true">You can provide your own code to filter/re-order the cipher suites to be used for client and/or server side SSL/TLS support.</summary>
|
||||
<returns preserve-mono="true">The ordered list of all cipher suites you wish to support.</returns>
|
||||
<remarks preserve-mono="true">
|
||||
<para>This type is only available in Mono and Xamarin products.</para>
|
||||
<para>See the <see cref="P:System.Net.ServicePointManager.ClientCipherSuitesCallback"/> property for examples of how this is used.</para>
|
||||
</remarks>
|
||||
</Docs>
|
||||
</Type>
|
||||
@@ -92,9 +92,40 @@ instance. </para>
|
||||
<ReturnType>System.Net.CipherSuitesCallback</ReturnType>
|
||||
</ReturnValue>
|
||||
<Docs>
|
||||
<summary>To be added.</summary>
|
||||
<value>To be added.</value>
|
||||
<remarks>To be added.</remarks>
|
||||
<summary preserve-mono="true">You can filter and/or re-order the ciphers suites that will be sent to the SSL/TLS server by providing your own callback.</summary>
|
||||
<value>Your custom delegate or null for the default behaviour.</value>
|
||||
<remarks preserve-mono="true">
|
||||
<para>
|
||||
This mechanism cannot be used to add new ciphers. Undefined ciphers will be ignored.
|
||||
</para>
|
||||
<para>
|
||||
This API is only available in Mono and Xamarin products.
|
||||
</para>
|
||||
<para>
|
||||
You can filter and/or re-order the ciphers suites that the SSL/TLS server
|
||||
will accept from a client. The first match for a supported client cipher suite
|
||||
will be used (so the order is important).
|
||||
</para>
|
||||
<example>
|
||||
<para>The following example removes weak (export) ciphers from the list that will be offered to the server.</para>
|
||||
<code lang="C#">
|
||||
ServicePointManager.ClientCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
|
||||
return from cipher in allCiphers where !cipher.Contains ("EXPORT")
|
||||
select cipher;
|
||||
};
|
||||
</code>
|
||||
</example>
|
||||
<example>
|
||||
<para>Example: Use AES128 (preference) or AES256 (allowed) but no other ciphers.</para>
|
||||
|
||||
<code lang="C#">
|
||||
ServicePointManager.ClientCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
|
||||
string prefix = p == SecurityProtocolType.Tls ? "TLS_" : "SSL_";
|
||||
return new List<string> { prefix + "RSA_WITH_AES_128_CBC_SHA", prefix + "RSA_WITH_AES_256_CBC_SHA" };
|
||||
};
|
||||
</code>
|
||||
</example>
|
||||
</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="DefaultConnectionLimit">
|
||||
|
||||
@@ -35,7 +35,7 @@ ifeq (moonlight_raw, $(PROFILE))
|
||||
LIB_MCS_FLAGS += -d:SECURITY_DEP
|
||||
endif
|
||||
endif
|
||||
ifeq (monotouch, $(PROFILE))
|
||||
ifeq (monotouch, $(subst _runtime,,$(PROFILE)))
|
||||
LIB_MCS_FLAGS += -d:SECURITY_DEP
|
||||
endif
|
||||
|
||||
|
||||
@@ -56,6 +56,7 @@ namespace System.Net
|
||||
bool allowBuffering = true;
|
||||
X509CertificateCollection certificates;
|
||||
string connectionGroup;
|
||||
bool haveContentLength;
|
||||
long contentLength = -1;
|
||||
HttpContinueDelegate continueDelegate;
|
||||
CookieContainer cookieContainer;
|
||||
@@ -277,6 +278,7 @@ namespace System.Net
|
||||
throw new ArgumentOutOfRangeException ("value", "Content-Length must be >= 0");
|
||||
|
||||
contentLength = value;
|
||||
haveContentLength = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -593,10 +595,11 @@ namespace System.Net
|
||||
get { return servicePoint; }
|
||||
}
|
||||
#if NET_4_0
|
||||
[MonoTODO ("for portable library support")]
|
||||
public virtual bool SupportsCookieContainer {
|
||||
get {
|
||||
throw new NotImplementedException ();
|
||||
// The managed implementation supports the cookie container
|
||||
// it is only Silverlight that returns false here
|
||||
return true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -1108,8 +1111,15 @@ namespace System.Net
|
||||
if (continueDelegate != null)
|
||||
continueDelegate (statusCode, headers);
|
||||
}
|
||||
|
||||
void RewriteRedirectToGet ()
|
||||
{
|
||||
method = "GET";
|
||||
webHeaders.RemoveInternal ("Transfer-Encoding");
|
||||
sendChunked = false;
|
||||
}
|
||||
|
||||
bool Redirect (WebAsyncResult result, HttpStatusCode code)
|
||||
bool Redirect (WebAsyncResult result, HttpStatusCode code, WebResponse response)
|
||||
{
|
||||
redirects++;
|
||||
Exception e = null;
|
||||
@@ -1121,12 +1131,12 @@ namespace System.Net
|
||||
case HttpStatusCode.MovedPermanently: // 301
|
||||
case HttpStatusCode.Redirect: // 302
|
||||
if (method == "POST")
|
||||
method = "GET";
|
||||
RewriteRedirectToGet ();
|
||||
break;
|
||||
case HttpStatusCode.TemporaryRedirect: // 307
|
||||
break;
|
||||
case HttpStatusCode.SeeOther: //303
|
||||
method = "GET";
|
||||
RewriteRedirectToGet ();
|
||||
break;
|
||||
case HttpStatusCode.NotModified: // 304
|
||||
return false;
|
||||
@@ -1139,12 +1149,13 @@ namespace System.Net
|
||||
break;
|
||||
}
|
||||
|
||||
if (method != "GET" && !InternalAllowBuffering)
|
||||
e = new WebException ("The request requires buffering data to succeed.", null, WebExceptionStatus.ProtocolError, webResponse);
|
||||
|
||||
if (e != null)
|
||||
throw e;
|
||||
|
||||
contentLength = -1;
|
||||
//bodyBufferLength = 0;
|
||||
//bodyBuffer = null;
|
||||
uriString = webResponse.Headers ["Location"];
|
||||
|
||||
if (uriString == null)
|
||||
@@ -1174,12 +1185,15 @@ namespace System.Net
|
||||
} else if (contentLength != -1) {
|
||||
if (auth_state.NtlmAuthState == NtlmAuthState.Challenge || proxy_auth_state.NtlmAuthState == NtlmAuthState.Challenge) {
|
||||
// We don't send any body with the NTLM Challenge request.
|
||||
webHeaders.SetInternal ("Content-Length", "0");
|
||||
if (haveContentLength || gotRequestStream || contentLength > 0)
|
||||
webHeaders.SetInternal ("Content-Length", "0");
|
||||
else
|
||||
webHeaders.RemoveInternal ("Content-Length");
|
||||
} else {
|
||||
if (contentLength > 0)
|
||||
continue100 = true;
|
||||
|
||||
if (gotRequestStream || contentLength > 0)
|
||||
if (haveContentLength || gotRequestStream || contentLength > 0)
|
||||
webHeaders.SetInternal ("Content-Length", contentLength.ToString ());
|
||||
}
|
||||
webHeaders.RemoveInternal ("Transfer-Encoding");
|
||||
@@ -1517,6 +1531,11 @@ namespace System.Net
|
||||
r.SetCompleted (false, webResponse);
|
||||
r.DoCallback ();
|
||||
} else {
|
||||
if (sendChunked) {
|
||||
sendChunked = false;
|
||||
webHeaders.RemoveInternal ("Transfer-Encoding");
|
||||
}
|
||||
|
||||
if (webResponse != null) {
|
||||
if (HandleNtlmAuth (r))
|
||||
return;
|
||||
@@ -1651,11 +1670,7 @@ namespace System.Net
|
||||
if (!usedPreAuth && CheckAuthorization (webResponse, code)) {
|
||||
// Keep the written body, so it can be rewritten in the retry
|
||||
if (InternalAllowBuffering) {
|
||||
// NTLM: This is to avoid sending data in the 'challenge' request
|
||||
// We save it in the first request (first 401), don't send anything
|
||||
// in the challenge request and send it in the response request along
|
||||
// with the buffers kept form the first request.
|
||||
if (auth_state.NtlmAuthState == NtlmAuthState.Challenge || proxy_auth_state.NtlmAuthState == NtlmAuthState.Challenge) {
|
||||
if (writeStream.WriteBufferLength > 0) {
|
||||
bodyBuffer = writeStream.WriteBuffer;
|
||||
bodyBufferLength = writeStream.WriteBufferLength;
|
||||
}
|
||||
@@ -1702,7 +1717,7 @@ namespace System.Net
|
||||
bool b = false;
|
||||
int c = (int) code;
|
||||
if (allowAutoRedirect && c >= 300) {
|
||||
b = Redirect (result, code);
|
||||
b = Redirect (result, code, webResponse);
|
||||
if (InternalAllowBuffering && writeStream.WriteBufferLength > 0) {
|
||||
bodyBuffer = writeStream.WriteBuffer;
|
||||
bodyBufferLength = writeStream.WriteBufferLength;
|
||||
|
||||
@@ -514,6 +514,13 @@ namespace System.Net
|
||||
Buffer.BlockCopy (buffer, offset, newBuffer, head.Length, size);
|
||||
Buffer.BlockCopy (crlf, 0, newBuffer, head.Length + size, crlf.Length);
|
||||
|
||||
if (allowBuffering) {
|
||||
if (writeBuffer == null)
|
||||
writeBuffer = new MemoryStream ();
|
||||
writeBuffer.Write (buffer, offset, size);
|
||||
totalWritten += size;
|
||||
}
|
||||
|
||||
buffer = newBuffer;
|
||||
offset = 0;
|
||||
size = chunkSize;
|
||||
|
||||
@@ -287,16 +287,26 @@ namespace System.Net
|
||||
return GetCreator (requestUri.Scheme).Create (requestUri);
|
||||
}
|
||||
#if NET_4_0
|
||||
[MonoTODO ("for portable library support")]
|
||||
static HttpWebRequest SharedCreateHttp (Uri uri)
|
||||
{
|
||||
if (uri.Scheme != "http" && uri.Scheme != "https")
|
||||
throw new NotSupportedException ("The uri should start with http or https");
|
||||
|
||||
return new HttpWebRequest (uri);
|
||||
}
|
||||
|
||||
public static HttpWebRequest CreateHttp (string requestUriString)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
if (requestUriString == null)
|
||||
throw new ArgumentNullException ("requestUriString");
|
||||
return SharedCreateHttp (new Uri (requestUriString));
|
||||
}
|
||||
|
||||
[MonoTODO ("for portable library support")]
|
||||
public static HttpWebRequest CreateHttp (Uri requestUri)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
if (requestUri == null)
|
||||
throw new ArgumentNullException ("requestUri");
|
||||
return SharedCreateHttp (requestUri);
|
||||
}
|
||||
#endif
|
||||
public virtual Stream EndGetRequestStream (IAsyncResult asyncResult)
|
||||
|
||||
@@ -86,9 +86,13 @@ namespace System.Net
|
||||
get { throw new NotSupportedException (); }
|
||||
}
|
||||
#if NET_4_0
|
||||
[MonoTODO ("for portable library support")]
|
||||
|
||||
public virtual bool SupportsHeaders {
|
||||
get { throw new NotImplementedException (); }
|
||||
get {
|
||||
// The managed stack always returns this as true, it is only
|
||||
// the Silverlight stack that does not support this.
|
||||
return true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
// Methods
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_System.dll.sources
|
||||
@@ -28,7 +28,7 @@
|
||||
</Attribute>
|
||||
</Attributes>
|
||||
<Docs>
|
||||
<summary>
|
||||
<summary preserve-mono="true">
|
||||
<para>Represents locale information used by all culture dependendent types and methods.</para>
|
||||
</summary>
|
||||
<remarks>
|
||||
@@ -244,7 +244,7 @@
|
||||
<summary>CultureInfo that represents the culture used by the current thread.</summary>
|
||||
<value>
|
||||
</value>
|
||||
<remarks>Initial value for each thread is determined using following rules. When <see cref="P:System.Globalization.CultureInfo.DefaultThreadCurrentCulture" /> is set its value is used otherwise the framework uses <see cref="M:System.Globalization.CultureInfo.CreateSpecificCulture" /> method to map system locate to framework culture name. This operation may fail in rare cases when system locale is set to invalid value or to value which cannot be translated to framework culture name. In such case <see cref="P:System.Globalization.CultureInfo.InvariantCulture" /> values is used.</remarks>
|
||||
<remarks preserve-mono="true">Initial value for each thread is determined using following rules. When <see cref="P:System.Globalization.CultureInfo.DefaultThreadCurrentCulture" /> is set its value is used otherwise the framework uses <see cref="M:System.Globalization.CultureInfo.CreateSpecificCulture" /> method to map system locate to framework culture name. This operation may fail in rare cases when system locale is set to invalid value or to value which cannot be translated to framework culture name. In such case <see cref="P:System.Globalization.CultureInfo.InvariantCulture" /> values is used.</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="CurrentUICulture">
|
||||
|
||||
@@ -342,7 +342,7 @@
|
||||
<MemberValue>Favorites</MemberValue>
|
||||
<Docs>
|
||||
<summary>The Favorites directory. </summary>
|
||||
<remarks>On Windows, the system favorite directory. On MacOS X this is ~/Library/Favorites, and is empty for other operating systems.</remarks>
|
||||
<remarks preserve-mono="true">On Windows, the system favorite directory. On MacOS X this is ~/Library/Favorites, and is empty for other operating systems.</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="Fonts">
|
||||
@@ -356,7 +356,7 @@
|
||||
<ReturnType>System.Environment+SpecialFolder</ReturnType>
|
||||
</ReturnValue>
|
||||
<Docs>
|
||||
<summary>The fonts directory, on MacOS X this is ~/Library/Fonts, on other Unix operating systems it is ~/.fonts/</summary>
|
||||
<summary preserve-mono="true">The fonts directory, on MacOS X this is ~/Library/Fonts, on other Unix operating systems it is ~/.fonts/</summary>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="History">
|
||||
@@ -392,7 +392,7 @@
|
||||
<MemberValue>InternetCache</MemberValue>
|
||||
<Docs>
|
||||
<summary>The Internet cache directory.</summary>
|
||||
<remarks>The Internet cache directory on Windows. On MacOS X this is the ~/Library/Caches directory, and not available on other operating systems.</remarks>
|
||||
<remarks preserve-mono="true">The Internet cache directory on Windows. On MacOS X this is the ~/Library/Caches directory, and not available on other operating systems.</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="LocalApplicationData">
|
||||
@@ -475,7 +475,7 @@
|
||||
</ReturnValue>
|
||||
<MemberValue>MyMusic</MemberValue>
|
||||
<Docs>
|
||||
<summary>The music directory. On MacOS X this is ~/Music. On other Unix operating systems, this is either XDG_MUSIC_DIR from the environment, XDG_MUSIC_DIR as read from the "user-dirs.dirs" within the SpecialFolder.ApplicationData directory, or as a last resort, the directory named "Music" within the SpecialFolder.Personal directory (usually the home directory).</summary>
|
||||
<summary preserve-mono="true">The music directory. On MacOS X this is ~/Music. On other Unix operating systems, this is either XDG_MUSIC_DIR from the environment, XDG_MUSIC_DIR as read from the "user-dirs.dirs" within the SpecialFolder.ApplicationData directory, or as a last resort, the directory named "Music" within the SpecialFolder.Personal directory (usually the home directory).</summary>
|
||||
<remarks>To be added.</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
@@ -493,7 +493,7 @@
|
||||
</ReturnValue>
|
||||
<MemberValue>MyPictures</MemberValue>
|
||||
<Docs>
|
||||
<summary>The pictures directory. On MacOS X this is ~/Pictures. On other Unix operating systems, this is either XDG_PICTURES_DIR from the environment, XDG_PICTURES_DIR as read from the "user-dirs.dirs" within the SpecialFolder.ApplicationData directory, or as a last resort, the directory named "Pictures" within the SpecialFolder.Personal directory (usually the home directory).</summary>
|
||||
<summary preserve-mono="true">The pictures directory. On MacOS X this is ~/Pictures. On other Unix operating systems, this is either XDG_PICTURES_DIR from the environment, XDG_PICTURES_DIR as read from the "user-dirs.dirs" within the SpecialFolder.ApplicationData directory, or as a last resort, the directory named "Pictures" within the SpecialFolder.Personal directory (usually the home directory).</summary>
|
||||
<remarks>To be added.</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
@@ -572,7 +572,7 @@
|
||||
<MemberValue>ProgramFiles</MemberValue>
|
||||
<Docs>
|
||||
<summary>Where program files are located. </summary>
|
||||
<remarks>The ProgramFiles directory on Windows, /Application on MacOS X and the empty string for other operating systems.</remarks>
|
||||
<remarks preserve-mono="true">The ProgramFiles directory on Windows, /Application on MacOS X and the empty string for other operating systems.</remarks>
|
||||
</Docs>
|
||||
</Member>
|
||||
<Member MemberName="ProgramFilesX86">
|
||||
|
||||
@@ -775,6 +775,7 @@ namespace System
|
||||
[ThreadStatic]
|
||||
static NumberFormatter threadNumberFormatter;
|
||||
|
||||
[ThreadStatic]
|
||||
static NumberFormatter userFormatProvider;
|
||||
|
||||
private static NumberFormatter GetInstance (IFormatProvider fp)
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.Threading;
|
||||
using System.Text;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
@@ -4377,5 +4378,31 @@ namespace MonoTests.System
|
||||
Assert.AreEqual ("n 0001.13'", (-1.1345343).ToString (formatString, CultureInfo.InvariantCulture), "#2");
|
||||
Assert.AreEqual ("0'", 0.0.ToString (formatString, CultureInfo.InvariantCulture), "#3");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestInvariantThreading ()
|
||||
{
|
||||
Thread[] th = new Thread[4];
|
||||
bool failed = false;
|
||||
|
||||
for (int i = 0; i < th.Length; i++) {
|
||||
th [i] = new Thread (() => {
|
||||
for (int ii = 0; ii < 100; ++ii) {
|
||||
var headers = new StringBuilder ();
|
||||
headers.AppendFormat (CultureInfo.InvariantCulture, "{0} {1}", 100, "ok");
|
||||
if (headers.ToString () != "100 ok") {
|
||||
failed = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
th [i].Start ();
|
||||
}
|
||||
|
||||
foreach (Thread t in th) {
|
||||
t.Join ();
|
||||
}
|
||||
|
||||
Assert.IsFalse (failed);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -55,6 +55,9 @@ namespace Microsoft.Scripting.Interpreter {
|
||||
return GetArrayAccessor(info, argumentCount);
|
||||
}
|
||||
|
||||
#if FULL_AOT_RUNTIME
|
||||
return new MethodInfoCallInstruction(info, argumentCount);
|
||||
#else
|
||||
if (ReflectionUtils.IsDynamicMethod(info) || !info.IsStatic && info.DeclaringType.IsValueType()) {
|
||||
return new MethodInfoCallInstruction(info, argumentCount);
|
||||
}
|
||||
@@ -109,7 +112,8 @@ namespace Microsoft.Scripting.Interpreter {
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
return res;
|
||||
#endif
|
||||
}
|
||||
|
||||
private static CallInstruction GetArrayAccessor(MethodInfo info, int argumentCount) {
|
||||
|
||||
+3
-6
@@ -35,16 +35,13 @@ using Microsoft.Scripting.Runtime;
|
||||
using Microsoft.Scripting.Utils;
|
||||
|
||||
namespace Microsoft.Scripting.Interpreter {
|
||||
abstract class ConstantInstruction : Instruction {
|
||||
sealed class PushValueInstruction : Instruction {
|
||||
object value;
|
||||
|
||||
public override int ConsumedStack { get { return 0; } }
|
||||
public override int ProducedStack { get { return 1; } }
|
||||
}
|
||||
|
||||
sealed class PushIntegerValueInstruction : ConstantInstruction {
|
||||
int value;
|
||||
|
||||
public PushIntegerValueInstruction (int value)
|
||||
public PushValueInstruction (object value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -365,6 +365,10 @@ namespace Microsoft.Scripting.Interpreter {
|
||||
Emit(PopInstruction.Instance);
|
||||
}
|
||||
|
||||
public void EmitStore(object value) {
|
||||
Emit (new PushValueInstruction (value));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Locals
|
||||
@@ -665,7 +669,7 @@ namespace Microsoft.Scripting.Interpreter {
|
||||
#endregion
|
||||
|
||||
public void EmitIncrement (Type type) {
|
||||
Emit (new PushIntegerValueInstruction (1));
|
||||
Emit (new PushValueInstruction (1));
|
||||
EmitAdd (type, false);
|
||||
}
|
||||
|
||||
|
||||
@@ -1478,6 +1478,10 @@ namespace Microsoft.Scripting.Interpreter {
|
||||
_instructions.EmitCreateDelegate(creator);
|
||||
}
|
||||
|
||||
private void CompileQuotedLambdaExpression(Expression expr) {
|
||||
_instructions.EmitStore (expr);
|
||||
}
|
||||
|
||||
private void CompileCoalesceBinaryExpression(Expression expr) {
|
||||
var node = (BinaryExpression)expr;
|
||||
|
||||
@@ -1531,9 +1535,9 @@ namespace Microsoft.Scripting.Interpreter {
|
||||
throw new System.NotImplementedException();
|
||||
}
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "expr")]
|
||||
private void CompileQuoteUnaryExpression(Expression expr) {
|
||||
throw new System.NotImplementedException();
|
||||
private void CompileQuoteUnaryExpression(Expression expr) {
|
||||
var qe = (UnaryExpression)expr;
|
||||
CompileQuotedLambdaExpression (qe.Operand);
|
||||
}
|
||||
|
||||
private void CompileUnboxUnaryExpression(Expression expr) {
|
||||
|
||||
@@ -65,6 +65,7 @@ RESOURCE_FILES = \
|
||||
Resources/home.html \
|
||||
Resources/Lminus.gif \
|
||||
Resources/Lplus.gif \
|
||||
Resources/creativecommons.png \
|
||||
Resources/mdoc-html-format.xsl \
|
||||
Resources/mdoc-html-utils.xsl \
|
||||
Resources/mdoc-sections-css.xsl \
|
||||
@@ -99,6 +100,7 @@ LIB_MCS_FLAGS = \
|
||||
/resource:Resources/home.html,home.html \
|
||||
/resource:Resources/Lminus.gif,Lminus.gif \
|
||||
/resource:Resources/Lplus.gif,Lplus.gif \
|
||||
/resource:Resources/creativecommons.png,creativecommons.png \
|
||||
/resource:Resources/mdoc-html-format.xsl,mdoc-html-format.xsl \
|
||||
/resource:Resources/mdoc-html-utils.xsl,mdoc-html-utils.xsl \
|
||||
/resource:Resources/mdoc-sections-css.xsl,mdoc-sections-css.xsl \
|
||||
|
||||
@@ -34,3 +34,12 @@ div.title {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.attributionlogo {
|
||||
display:none;
|
||||
float:right;
|
||||
}
|
||||
|
||||
div:hover > .attributionlogo,p:hover > .attributionlogo,td:hover > .attributionlogo {
|
||||
display:inline;
|
||||
float:right;
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
@@ -1468,6 +1468,18 @@
|
||||
</p>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="attribution">
|
||||
<a href="http://creativecommons.org/licenses/by/4.0/" class="attributionlogo">
|
||||
<xsl:attribute name="title">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@modified='false'"><xsl:value-of select="concat('This content is licensed Creative Commons By ', @from)" /></xsl:when>
|
||||
<xsl:otherwise><xsl:value-of select="concat('This content has been modified under a Creative Commons license from ', @from)" /></xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:attribute>
|
||||
<img src="mdocimages/creativecommons.png" />
|
||||
</a>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="paramref">
|
||||
<i><xsl:value-of select="@name"/>
|
||||
<xsl:apply-templates/>
|
||||
|
||||
@@ -516,7 +516,8 @@
|
||||
<Compile Include="Monodoc\storage\UncompiledDocStorage.cs" />
|
||||
<Compile Include="Monodoc\storage\ZipStorage.cs" />
|
||||
<Compile Include="Monodoc\Tree.cs" />
|
||||
<Compile Include="Monodoc\TypeUtils.cs" />
</ItemGroup>
|
||||
<Compile Include="Monodoc\TypeUtils.cs" />
|
||||
</ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
@@ -587,6 +588,9 @@
|
||||
<EmbeddedResource Include="Resources/home.html">
|
||||
<LogicalName>home.html</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Resources/creativecommons.png">
|
||||
<LogicalName>creativecommons.png</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Resources/Lminus.gif">
|
||||
<LogicalName>Lminus.gif</LogicalName>
|
||||
</EmbeddedResource>
|
||||
|
||||
@@ -516,7 +516,8 @@
|
||||
<Compile Include="Monodoc\storage\UncompiledDocStorage.cs" />
|
||||
<Compile Include="Monodoc\storage\ZipStorage.cs" />
|
||||
<Compile Include="Monodoc\Tree.cs" />
|
||||
<Compile Include="Monodoc\TypeUtils.cs" />
</ItemGroup>
|
||||
<Compile Include="Monodoc\TypeUtils.cs" />
|
||||
</ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
@@ -587,6 +588,9 @@
|
||||
<EmbeddedResource Include="Resources/home.html">
|
||||
<LogicalName>home.html</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Resources/creativecommons.png">
|
||||
<LogicalName>creativecommons.png</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Resources/Lminus.gif">
|
||||
<LogicalName>Lminus.gif</LogicalName>
|
||||
</EmbeddedResource>
|
||||
@@ -744,4 +748,4 @@
|
||||
<LogicalName>treebg.png</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -1267,7 +1267,7 @@ namespace Mono.CSharp {
|
||||
throw new InternalErrorException (e, loc);
|
||||
}
|
||||
|
||||
if (!ec.IsInProbingMode) {
|
||||
if (!ec.IsInProbingMode && !etree_conversion) {
|
||||
compatibles.Add (type, am ?? EmptyExpression.Null);
|
||||
}
|
||||
|
||||
@@ -1599,6 +1599,7 @@ namespace Mono.CSharp {
|
||||
var da_ontrue = fc.DefiniteAssignmentOnTrue;
|
||||
var da_onfalse = fc.DefiniteAssignmentOnFalse;
|
||||
|
||||
fc.DefiniteAssignmentOnTrue = fc.DefiniteAssignmentOnFalse = null;
|
||||
block.FlowAnalysis (fc);
|
||||
|
||||
fc.ParametersBlock = prev_pb;
|
||||
|
||||
+8
-2
@@ -334,7 +334,7 @@ namespace Mono.CSharp {
|
||||
|
||||
if (source == null) {
|
||||
ok = false;
|
||||
source = EmptyExpression.Null;
|
||||
source = ErrorExpression.Instance;
|
||||
}
|
||||
|
||||
target = target.ResolveLValue (ec, source);
|
||||
@@ -589,6 +589,12 @@ namespace Mono.CSharp {
|
||||
|
||||
public int AssignmentOffset { get; private set; }
|
||||
|
||||
public FieldBase Field {
|
||||
get {
|
||||
return mc;
|
||||
}
|
||||
}
|
||||
|
||||
public override Location StartLocation {
|
||||
get {
|
||||
return loc;
|
||||
@@ -601,8 +607,8 @@ namespace Mono.CSharp {
|
||||
if (source == null)
|
||||
return null;
|
||||
|
||||
var bc = (BlockContext) rc;
|
||||
if (resolved == null) {
|
||||
var bc = (BlockContext) rc;
|
||||
var ctx = new FieldInitializerContext (mc, bc);
|
||||
resolved = base.DoResolve (ctx) as ExpressionStatement;
|
||||
AssignmentOffset = ctx.AssignmentInfoOffset - bc.AssignmentInfoOffset;
|
||||
|
||||
+13
-1
@@ -1010,9 +1010,20 @@ namespace Mono.CSharp
|
||||
|
||||
for (int i = 0; i < initialized_fields.Count; ++i) {
|
||||
FieldInitializer fi = initialized_fields [i];
|
||||
|
||||
//
|
||||
// Clone before resolving otherwise when field initializer is needed
|
||||
// in more than 1 constructor any resolve after the initial one would
|
||||
// only took the resolved expression which is problem for expressions
|
||||
// that generate extra expressions or code during Resolve phase
|
||||
//
|
||||
var cloned = fi.Clone (new CloneContext ());
|
||||
|
||||
ExpressionStatement s = fi.ResolveStatement (ec);
|
||||
if (s == null)
|
||||
if (s == null) {
|
||||
initialized_fields [i] = new FieldInitializer (fi.Field, ErrorExpression.Instance, Location.Null);
|
||||
continue;
|
||||
}
|
||||
|
||||
//
|
||||
// Field is re-initialized to its default value => removed
|
||||
@@ -1022,6 +1033,7 @@ namespace Mono.CSharp
|
||||
|
||||
ec.AssignmentInfoOffset += fi.AssignmentOffset;
|
||||
ec.CurrentBlock.AddScopeStatement (new StatementExpression (s));
|
||||
initialized_fields [i] = (FieldInitializer) cloned;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1467,6 +1467,7 @@ namespace Mono.CSharp {
|
||||
return e;
|
||||
|
||||
source.Error_ValueCannotBeConverted (ec, target_type, false);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -5792,6 +5792,14 @@ namespace Mono.CSharp {
|
||||
}
|
||||
}
|
||||
|
||||
protected override void CloneTo (CloneContext clonectx, Expression target)
|
||||
{
|
||||
var t = (FieldExpr) target;
|
||||
|
||||
if (InstanceExpression != null)
|
||||
t.InstanceExpression = InstanceExpression.Clone (clonectx);
|
||||
}
|
||||
|
||||
public override Expression CreateExpressionTree (ResolveContext ec)
|
||||
{
|
||||
return CreateExpressionTree (ec, true);
|
||||
|
||||
@@ -9999,6 +9999,10 @@ namespace Mono.CSharp
|
||||
loc = Location.Null;
|
||||
}
|
||||
|
||||
protected override void CloneTo (CloneContext clonectx, Expression target)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool ContainsEmitWithAwait ()
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using System.Linq.Expressions;
|
||||
|
||||
public sealed class C
|
||||
{
|
||||
public C ()
|
||||
{
|
||||
}
|
||||
|
||||
public C (Action<object, object> tappedCallback)
|
||||
{
|
||||
}
|
||||
|
||||
public readonly string TappedCallbackProperty = Create<C, Action<object, object>> (o => o.TappedCallback);
|
||||
|
||||
public Action<object, object> TappedCallback {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public static string Create<T1, T2> (Expression<Func<T1, T2>> getter)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void Main ()
|
||||
{
|
||||
new C (null);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
class Program
|
||||
{
|
||||
static void Main ()
|
||||
{
|
||||
SomeMethod ();
|
||||
}
|
||||
|
||||
private static bool SomeMethod ()
|
||||
{
|
||||
int m;
|
||||
int n = 2;
|
||||
bool b_const = true;
|
||||
|
||||
bool b = F (() => F1 (n, out m) && Ferror (m)) && b_const;
|
||||
return b;
|
||||
}
|
||||
|
||||
protected static bool F (Func<bool> rule)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
private static bool F1 (int j, out int m)
|
||||
{
|
||||
m = 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static bool Ferror (int i)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
private static bool Fouter ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,10 @@ add masterdoc support?
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||
|
||||
<!-- define attributes -->
|
||||
<xs:attribute name="preserve-mono" type="xs:string" />
|
||||
<xs:attribute name="license" type="xs:string" />
|
||||
<xs:attribute name="from" type="xs:string" />
|
||||
<xs:attribute name="modified" type="xs:boolean" />
|
||||
<xs:attribute name="argnames" type="xs:string" />
|
||||
<xs:attribute name="cref" type="xs:string" />
|
||||
<xs:attribute name="Deprecated" type="xs:boolean" />
|
||||
@@ -564,7 +568,9 @@ add masterdoc support?
|
||||
<xs:element ref="SPAN" />
|
||||
<xs:element ref="typeparamref" />
|
||||
<xs:element ref="whitespace" />
|
||||
<xs:element ref="attribution" />
|
||||
</xs:choice>
|
||||
<xs:attribute ref="preserve-mono" />
|
||||
<xs:attribute ref="name" use="required" />
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
@@ -633,7 +639,17 @@ add masterdoc support?
|
||||
<xs:element ref="list" />
|
||||
<xs:element ref="SPAN" />
|
||||
<xs:element ref="typeparamref" />
|
||||
<xs:element ref="attribution" />
|
||||
</xs:choice>
|
||||
<xs:attribute ref="preserve-mono" />
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
<xs:element name="attribution">
|
||||
<xs:complexType mixed="true">
|
||||
<xs:attribute ref="license" />
|
||||
<xs:attribute ref="from" />
|
||||
<xs:attribute ref="modified" />
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
@@ -653,7 +669,9 @@ add masterdoc support?
|
||||
<xs:element ref="typeparamref" />
|
||||
<xs:element ref="ul" />
|
||||
<xs:element ref="whitespace" />
|
||||
<xs:element ref="attribution" />
|
||||
</xs:choice>
|
||||
<xs:attribute ref="preserve-mono" />
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
@@ -738,7 +756,9 @@ add masterdoc support?
|
||||
<xs:element ref="typeparamref" />
|
||||
<xs:element ref="ul" />
|
||||
<xs:element ref="list" />
|
||||
<xs:element ref="attribution" />
|
||||
</xs:choice>
|
||||
<xs:attribute ref="preserve-mono" />
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
|
||||
@@ -93,6 +93,7 @@ EXTRA_DISTFILES = \
|
||||
frameworks/net_4.5.xml \
|
||||
targets/Microsoft.Portable.CSharp_4.0.targets \
|
||||
targets/Microsoft.Portable.CSharp_4.5.targets \
|
||||
targets/Microsoft.Portable.Common.targets \
|
||||
targets/Microsoft.Portable.Core.targets \
|
||||
targets/Microsoft.Portable.Core.props \
|
||||
targets/Microsoft.WebApplication.targets \
|
||||
|
||||
+1070
-1072
File diff suppressed because it is too large.
Load diff
@@ -47,6 +47,7 @@ static void free_generic_class (MonoGenericClass *ginst);
|
||||
static void free_inflated_method (MonoMethodInflated *method);
|
||||
static void free_inflated_signature (MonoInflatedMethodSignature *sig);
|
||||
static void mono_metadata_field_info_full (MonoImage *meta, guint32 index, guint32 *offset, guint32 *rva, MonoMarshalSpec **marshal_spec, gboolean alloc_from_image);
|
||||
static guint mono_metadata_generic_param_hash (MonoGenericParam *p);
|
||||
|
||||
/*
|
||||
* This enumeration is used to describe the data types in the metadata
|
||||
@@ -4587,10 +4588,27 @@ mono_metadata_type_hash (MonoType *t1)
|
||||
return ((hash << 5) - hash) ^ mono_metadata_type_hash (&t1->data.array->eklass->byval_arg);
|
||||
case MONO_TYPE_GENERICINST:
|
||||
return ((hash << 5) - hash) ^ mono_generic_class_hash (t1->data.generic_class);
|
||||
case MONO_TYPE_VAR:
|
||||
case MONO_TYPE_MVAR:
|
||||
return ((hash << 5) - hash) ^ mono_metadata_generic_param_hash (t1->data.generic_param);
|
||||
}
|
||||
return hash;
|
||||
}
|
||||
|
||||
static guint
|
||||
mono_metadata_generic_param_hash (MonoGenericParam *p)
|
||||
{
|
||||
guint hash;
|
||||
MonoGenericParamInfo *info;
|
||||
|
||||
hash = (mono_generic_param_num (p) << 2) | p->serial;
|
||||
info = mono_generic_param_info (p);
|
||||
/* Can't hash on the owner klass/method, since those might not be set when this is called */
|
||||
if (info)
|
||||
hash = ((hash << 5) - hash) ^ info->token;
|
||||
return hash;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
mono_metadata_generic_param_equal (MonoGenericParam *p1, MonoGenericParam *p2, gboolean signature_only)
|
||||
{
|
||||
|
||||
@@ -219,7 +219,7 @@ output_char (FILE *f, char c) {
|
||||
if (isalnum (c))
|
||||
fprintf (f, "%c", c);
|
||||
else
|
||||
fprintf (f, "\\x%x\" \"", c);
|
||||
fprintf (f, "\\x%x\" \"", (guint8)c);
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@@ -9520,10 +9520,12 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
|
||||
addr = emit_get_rgctx_gsharedvt_call (cfg, context_used, fsig, cmethod, MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE);
|
||||
mono_emit_calli (cfg, fsig, sp, addr, NULL, vtable_arg);
|
||||
} else if (context_used &&
|
||||
(!mono_method_is_generic_sharable (cmethod, TRUE) ||
|
||||
!mono_class_generic_sharing_enabled (cmethod->klass))) {
|
||||
((!mono_method_is_generic_sharable (cmethod, TRUE) ||
|
||||
!mono_class_generic_sharing_enabled (cmethod->klass)) || cfg->gsharedvt)) {
|
||||
MonoInst *cmethod_addr;
|
||||
|
||||
/* Generic calls made out of gsharedvt methods cannot be patched, so use an indirect call */
|
||||
|
||||
cmethod_addr = emit_get_rgctx_method (cfg, context_used,
|
||||
cmethod, MONO_RGCTX_INFO_GENERIC_METHOD_CODE);
|
||||
|
||||
|
||||
+1
-1
@@ -5912,7 +5912,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
|
||||
else
|
||||
mono_lookup_pinvoke_call (method, NULL, NULL);
|
||||
}
|
||||
nm = mono_marshal_get_native_wrapper (method, check_for_pending_exc, FALSE);
|
||||
nm = mono_marshal_get_native_wrapper (method, check_for_pending_exc, mono_aot_only);
|
||||
code = mono_get_addr_from_ftnptr (mono_compile_method (nm));
|
||||
jinfo = mono_jit_info_table_find (target_domain, code);
|
||||
if (!jinfo)
|
||||
|
||||
@@ -64,9 +64,13 @@ mono_dead_letter_dealloc (id self, SEL _cmd)
|
||||
void
|
||||
mono_threads_install_dead_letter (void)
|
||||
{
|
||||
id cur = objc_msgSend ((id)nsthread, currentThread);
|
||||
id dict = objc_msgSend (cur, threadDictionary);
|
||||
if (objc_msgSend (dict, objectForKey, mono_dead_letter_key) == nil) {
|
||||
id cur, dict;
|
||||
|
||||
cur = objc_msgSend ((id)nsthread, currentThread);
|
||||
if (!cur)
|
||||
return;
|
||||
dict = objc_msgSend (cur, threadDictionary);
|
||||
if (dict && objc_msgSend (dict, objectForKey, mono_dead_letter_key) == nil) {
|
||||
id value = objc_msgSend (objc_msgSend ((id)mono_dead_letter_class, alloc), init);
|
||||
objc_msgSend (dict, setObjectForKey, value, mono_dead_letter_key);
|
||||
objc_msgSend (value, release);
|
||||
|
||||
@@ -1117,9 +1117,12 @@ namespace Mono.Tools.LocaleBuilder
|
||||
if (el != null) {
|
||||
// CLDR uses unicode negative sign for some culture (e.g sv, is, lt, don't kwnow why) but .net always
|
||||
// uses simple - sign
|
||||
if (el.InnerText == "\u2212")
|
||||
if (el.InnerText == "\u2212") {
|
||||
ni.NegativeSign = "-";
|
||||
else
|
||||
} else if (el.InnerText == "\u200F\u002D") {
|
||||
// Remove any right-to-left mark characters
|
||||
ni.NegativeSign = "-";
|
||||
} else
|
||||
ni.NegativeSign = el.InnerText;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user