Merge branch 'generics-wip' of https://github.com/nanoframework/nf-interpreter into update-gc-api

Author: josesimoes

src/CLR/CorLib/corlib_native_System_Exception.cpp

@@ -12,10 +12,7 @@ struct ExceptionLookup
 };
 
 static const ExceptionLookup c_ExceptionLookup[] = {
-#define EL(hr, fld)                                                                                                    \
-    {                                                                                                                  \
-        hr, &g_CLR_RT_WellKnownTypes.fld                                                                               \
-    }
+#define EL(hr, fld) {hr, &g_CLR_RT_WellKnownTypes.fld}
     EL(CLR_E_APPDOMAIN_EXITED, AppDomainUnloadedException),
     EL(CLR_E_INVALID_PARAMETER, ArgumentException),
     EL(CLR_E_ARGUMENT_NULL, ArgumentNullException),
@@ -208,10 +205,8 @@ HRESULT Library_corlib_native_System_Exception::SetStackTrace(CLR_RT_HeapBlock &
             (void)array;
 
             // create an empty array for the stack trace
-            NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(
-                obj[FIELD___stackTrace],
-                depth,
-                g_CLR_RT_WellKnownTypes.UInt8));
+            NANOCLR_CHECK_HRESULT(
+                CLR_RT_HeapBlock_Array::CreateInstance(obj[FIELD___stackTrace], depth, g_CLR_RT_WellKnownTypes.UInt8));
         }
         else
         {

src/CLR/CorLib/corlib_native_System_Guid.cpp

@@ -11,24 +11,23 @@
 //  Based on the version 4 GUID (random)
 //  http://guid.one/guid/make
 
-
-HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1( CLR_RT_StackFrame& stack )
+HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1(CLR_RT_StackFrame &stack)
 {
     NANOCLR_HEADER();
 
-    CLR_RT_Random       rand;
-    CLR_UINT8*          buf;
-    CLR_RT_HeapBlock&   top = stack.PushValueAndClear();
- 
+    CLR_RT_Random rand;
+    CLR_UINT8 *buf;
+    CLR_RT_HeapBlock &top = stack.PushValueAndClear();
+
     // Create a array of 16 bytes on top of stack to return
-    NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance( top, 16, g_CLR_RT_WellKnownTypes.UInt8 ));
+    NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, 16, g_CLR_RT_WellKnownTypes.UInt8));
     buf = top.DereferenceArray()->GetFirstElement();
 
     rand.Initialize();
-    rand.NextBytes(buf, 16);           // fill with random numbers
+    rand.NextBytes(buf, 16); // fill with random numbers
+
+    buf[7] = (buf[7] & 0x0f) | 0x40; // Set verion
+    buf[9] = (buf[7] & 0x3f) | 0x80; // Set variant
 
-    buf[7] =  (buf[7] & 0x0f) | 0x40;  // Set verion
-    buf[9] =  (buf[7] & 0x3f) | 0x80;  // Set variant
-    
     NANOCLR_NOCLEANUP();
 }

src/CLR/CorLib/corlib_native_System_Runtime_CompilerServices_RuntimeHelpers.cpp

@@ -25,8 +25,7 @@ HRESULT Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::
         NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
     }
 
-    if ((inst.target->flags & CLR_RECORD_FIELDDEF::FD_HasFieldRVA) == 0 ||
-        inst.target->defaultValue == CLR_EmptyIndex)
+    if ((inst.target->flags & CLR_RECORD_FIELDDEF::FD_HasFieldRVA) == 0 || inst.target->defaultValue == CLR_EmptyIndex)
     {
         NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
     }

src/CLR/Core/TypeSystem.cpp

@@ -4,6 +4,7 @@
 // See LICENSE file in the project root for full license information.
 //
 #include "stdafx.h"
+#include <string>
 
 #include "Core.h"
 #include "corhdr_private.h"
@@ -4341,7 +4342,6 @@ bool CLR_RT_Assembly::FindTypeDef(const char *typeName, const char *nameSpace, C
             // check if this is a nested type
             if (target->HasValidEnclosingType())
             {
-                const char *szNameSpace = GetString(target->nameSpace);
                 const char *szName = GetString(target->name);
 
                 // for nested types, there is no namespace encoded in the type