Merge branch 'main' of https://github.com/nanoframework/nf-interpreter into develop-generics-wip

josesimoes · josesimoes · commit 2c2f055e379c · 2025-03-31T23:58:48.000+01:00
diff --git a/src/CLR/CorLib/corlib_native_System_Convert.cpp b/src/CLR/CorLib/corlib_native_System_Convert.cpp
@@ -551,7 +551,7 @@ HRESULT Library_corlib_native_System_Convert::
         conversionResult = Nano_strptime(str, "%Y-%m-%dT%H:%M:%S", &ticks);
     }
 
-    if (conversionResult == NULL)
+    if (conversionResult == nullptr)
     {
         // try 'r/R' RFC 1123 date (ddd, dd MMM yyyy HH:mm:ss)
         conversionResult = Nano_strptime(str, "%a, %d %b %Y %H:%M:%S", &ticks);
diff --git a/src/CLR/Core/CLR_RT_ObjectToEvent_Destination.cpp b/src/CLR/Core/CLR_RT_ObjectToEvent_Destination.cpp
@@ -16,7 +16,7 @@ void CLR_RT_ObjectToEvent_Destination::Initialize()
 void CLR_RT_ObjectToEvent_Destination::CheckAll()
 {
     NATIVE_PROFILE_CLR_CORE();
-    NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source,ref,m_references)
+    NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source, ref, m_references)
     {
         ref->EnsureObjectIsAlive();
     }
@@ -26,11 +26,11 @@ void CLR_RT_ObjectToEvent_Destination::CheckAll()
 void CLR_RT_ObjectToEvent_Destination::SignalAll()
 {
     NATIVE_PROFILE_CLR_CORE();
-    NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source,ref,m_references)
+    NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source, ref, m_references)
     {
-        if(ref->m_objectPtr)
+        if (ref->m_objectPtr)
         {
-            CLR_RT_HeapBlock_WaitForObject::SignalObject( *ref->m_objectPtr );
+            CLR_RT_HeapBlock_WaitForObject::SignalObject(*ref->m_objectPtr);
         }
     }
     NANOCLR_FOREACH_NODE_END();
@@ -39,9 +39,11 @@ void CLR_RT_ObjectToEvent_Destination::SignalAll()
 void CLR_RT_ObjectToEvent_Destination::DetachAll()
 {
     NATIVE_PROFILE_CLR_CORE();
-    while(true)
+    while (true)
     {
-        CLR_RT_ObjectToEvent_Source* ref = (CLR_RT_ObjectToEvent_Source*)m_references.ExtractFirstNode(); if(!ref) break;
+        CLR_RT_ObjectToEvent_Source *ref = (CLR_RT_ObjectToEvent_Source *)m_references.ExtractFirstNode();
+        if (!ref)
+            break;
 
         ref->Detach();
     }
@@ -50,9 +52,9 @@ void CLR_RT_ObjectToEvent_Destination::DetachAll()
 bool CLR_RT_ObjectToEvent_Destination::IsReadyForRelease()
 {
     NATIVE_PROFILE_CLR_CORE();
-    if(m_references.IsEmpty())
+    if (m_references.IsEmpty())
     {
-        if(IsForcedAlive() == false)
+        if (IsForcedAlive() == false)
         {
             return true;
         }
@@ -66,8 +68,8 @@ bool CLR_RT_ObjectToEvent_Destination::ReleaseWhenDead()
     NATIVE_PROFILE_CLR_CORE();
     bool res = IsReadyForRelease();
 
-    if(res) g_CLR_RT_EventCache.Append_Node( this );
+    if (res)
+        g_CLR_RT_EventCache.Append_Node(this);
 
     return res;
 }
-
diff --git a/src/CLR/Core/corhdr_private.h b/src/CLR/Core/corhdr_private.h
@@ -20,21 +20,21 @@
 
 typedef enum CorElementType
 {
-    ELEMENT_TYPE_END            = 0x0,
-    ELEMENT_TYPE_VOID           = 0x1,
-    ELEMENT_TYPE_BOOLEAN        = 0x2,
-    ELEMENT_TYPE_CHAR           = 0x3,
-    ELEMENT_TYPE_I1             = 0x4,
-    ELEMENT_TYPE_U1             = 0x5,
-    ELEMENT_TYPE_I2             = 0x6,
-    ELEMENT_TYPE_U2             = 0x7,
-    ELEMENT_TYPE_I4             = 0x8,
-    ELEMENT_TYPE_U4             = 0x9,
-    ELEMENT_TYPE_I8             = 0xa,
-    ELEMENT_TYPE_U8             = 0xb,
-    ELEMENT_TYPE_R4             = 0xc,
-    ELEMENT_TYPE_R8             = 0xd,
-    ELEMENT_TYPE_STRING         = 0xe,
+    ELEMENT_TYPE_END = 0x0,
+    ELEMENT_TYPE_VOID = 0x1,
+    ELEMENT_TYPE_BOOLEAN = 0x2,
+    ELEMENT_TYPE_CHAR = 0x3,
+    ELEMENT_TYPE_I1 = 0x4,
+    ELEMENT_TYPE_U1 = 0x5,
+    ELEMENT_TYPE_I2 = 0x6,
+    ELEMENT_TYPE_U2 = 0x7,
+    ELEMENT_TYPE_I4 = 0x8,
+    ELEMENT_TYPE_U4 = 0x9,
+    ELEMENT_TYPE_I8 = 0xa,
+    ELEMENT_TYPE_U8 = 0xb,
+    ELEMENT_TYPE_R4 = 0xc,
+    ELEMENT_TYPE_R8 = 0xd,
+    ELEMENT_TYPE_STRING = 0xe,
 
     // every type above PTR will be simple type
     // PTR <type>
@@ -120,29 +120,28 @@ typedef enum CorElementType
 
 typedef enum CorSerializationType
 {
-    SERIALIZATION_TYPE_UNDEFINED    = 0,
-    SERIALIZATION_TYPE_BOOLEAN      = ELEMENT_TYPE_BOOLEAN,
-    SERIALIZATION_TYPE_CHAR         = ELEMENT_TYPE_CHAR,
-    SERIALIZATION_TYPE_I1           = ELEMENT_TYPE_I1,
-    SERIALIZATION_TYPE_U1           = ELEMENT_TYPE_U1,
-    SERIALIZATION_TYPE_I2           = ELEMENT_TYPE_I2,
-    SERIALIZATION_TYPE_U2           = ELEMENT_TYPE_U2,
-    SERIALIZATION_TYPE_I4           = ELEMENT_TYPE_I4,
-    SERIALIZATION_TYPE_U4           = ELEMENT_TYPE_U4,
-    SERIALIZATION_TYPE_I8           = ELEMENT_TYPE_I8,
-    SERIALIZATION_TYPE_U8           = ELEMENT_TYPE_U8,
-    SERIALIZATION_TYPE_R4           = ELEMENT_TYPE_R4,
-    SERIALIZATION_TYPE_R8           = ELEMENT_TYPE_R8,
-    SERIALIZATION_TYPE_STRING       = ELEMENT_TYPE_STRING,
-    SERIALIZATION_TYPE_SZARRAY      = ELEMENT_TYPE_SZARRAY, // Shortcut for single dimension zero lower bound array
-    SERIALIZATION_TYPE_TYPE         = 0x50,
-    SERIALIZATION_TYPE_TAGGED_OBJECT= 0x51,
-    SERIALIZATION_TYPE_FIELD        = 0x53,
-    SERIALIZATION_TYPE_PROPERTY     = 0x54,
-    SERIALIZATION_TYPE_ENUM         = 0x55
+    SERIALIZATION_TYPE_UNDEFINED = 0,
+    SERIALIZATION_TYPE_BOOLEAN = ELEMENT_TYPE_BOOLEAN,
+    SERIALIZATION_TYPE_CHAR = ELEMENT_TYPE_CHAR,
+    SERIALIZATION_TYPE_I1 = ELEMENT_TYPE_I1,
+    SERIALIZATION_TYPE_U1 = ELEMENT_TYPE_U1,
+    SERIALIZATION_TYPE_I2 = ELEMENT_TYPE_I2,
+    SERIALIZATION_TYPE_U2 = ELEMENT_TYPE_U2,
+    SERIALIZATION_TYPE_I4 = ELEMENT_TYPE_I4,
+    SERIALIZATION_TYPE_U4 = ELEMENT_TYPE_U4,
+    SERIALIZATION_TYPE_I8 = ELEMENT_TYPE_I8,
+    SERIALIZATION_TYPE_U8 = ELEMENT_TYPE_U8,
+    SERIALIZATION_TYPE_R4 = ELEMENT_TYPE_R4,
+    SERIALIZATION_TYPE_R8 = ELEMENT_TYPE_R8,
+    SERIALIZATION_TYPE_STRING = ELEMENT_TYPE_STRING,
+    SERIALIZATION_TYPE_SZARRAY = ELEMENT_TYPE_SZARRAY, // Shortcut for single dimension zero lower bound array
+    SERIALIZATION_TYPE_TYPE = 0x50,
+    SERIALIZATION_TYPE_TAGGED_OBJECT = 0x51,
+    SERIALIZATION_TYPE_FIELD = 0x53,
+    SERIALIZATION_TYPE_PROPERTY = 0x54,
+    SERIALIZATION_TYPE_ENUM = 0x55
 } CorSerializationType;
 
 /////////////////////////////////////////////////////////////////////////////
 
 #endif // NANOCLR_CORHDR_H
-

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ HRESULT Library_corlib_native_System_Convert::`
`551`	`551`	`conversionResult = Nano_strptime(str, "%Y-%m-%dT%H:%M:%S", &ticks);`
`552`	`552`	`}`
`553`	`553`
`554`		`- if (conversionResult == NULL)`
	`554`	`+ if (conversionResult == nullptr)`
`555`	`555`	`{`
`556`	`556`	`// try 'r/R' RFC 1123 date (ddd, dd MMM yyyy HH:mm:ss)`
`557`	`557`	`conversionResult = Nano_strptime(str, "%a, %d %b %Y %H:%M:%S", &ticks);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ void CLR_RT_ObjectToEvent_Destination::Initialize()`
`16`	`16`	`void CLR_RT_ObjectToEvent_Destination::CheckAll()`
`17`	`17`	`{`
`18`	`18`	`NATIVE_PROFILE_CLR_CORE();`
`19`		`- NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source,ref,m_references)`
	`19`	`+ NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source, ref, m_references)`
`20`	`20`	`{`
`21`	`21`	`ref->EnsureObjectIsAlive();`
`22`	`22`	`}`
`@@ -26,11 +26,11 @@ void CLR_RT_ObjectToEvent_Destination::CheckAll()`
`26`	`26`	`void CLR_RT_ObjectToEvent_Destination::SignalAll()`
`27`	`27`	`{`
`28`	`28`	`NATIVE_PROFILE_CLR_CORE();`
`29`		`- NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source,ref,m_references)`
	`29`	`+ NANOCLR_FOREACH_NODE(CLR_RT_ObjectToEvent_Source, ref, m_references)`
`30`	`30`	`{`
`31`		`- if(ref->m_objectPtr)`
	`31`	`+ if (ref->m_objectPtr)`
`32`	`32`	`{`
`33`		`- CLR_RT_HeapBlock_WaitForObject::SignalObject( *ref->m_objectPtr );`
	`33`	`+ CLR_RT_HeapBlock_WaitForObject::SignalObject(*ref->m_objectPtr);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`NANOCLR_FOREACH_NODE_END();`
`@@ -39,9 +39,11 @@ void CLR_RT_ObjectToEvent_Destination::SignalAll()`
`39`	`39`	`void CLR_RT_ObjectToEvent_Destination::DetachAll()`
`40`	`40`	`{`
`41`	`41`	`NATIVE_PROFILE_CLR_CORE();`
`42`		`- while(true)`
	`42`	`+ while (true)`
`43`	`43`	`{`
`44`		`- CLR_RT_ObjectToEvent_Source* ref = (CLR_RT_ObjectToEvent_Source*)m_references.ExtractFirstNode(); if(!ref) break;`
	`44`	`+ CLR_RT_ObjectToEvent_Source ref = (CLR_RT_ObjectToEvent_Source )m_references.ExtractFirstNode();`
	`45`	`+ if (!ref)`
	`46`	`+ break;`
`45`	`47`
`46`	`48`	`ref->Detach();`
`47`	`49`	`}`
`@@ -50,9 +52,9 @@ void CLR_RT_ObjectToEvent_Destination::DetachAll()`
`50`	`52`	`bool CLR_RT_ObjectToEvent_Destination::IsReadyForRelease()`
`51`	`53`	`{`
`52`	`54`	`NATIVE_PROFILE_CLR_CORE();`
`53`		`- if(m_references.IsEmpty())`
	`55`	`+ if (m_references.IsEmpty())`
`54`	`56`	`{`
`55`		`- if(IsForcedAlive() == false)`
	`57`	`+ if (IsForcedAlive() == false)`
`56`	`58`	`{`
`57`	`59`	`return true;`
`58`	`60`	`}`
`@@ -66,8 +68,8 @@ bool CLR_RT_ObjectToEvent_Destination::ReleaseWhenDead()`
`66`	`68`	`NATIVE_PROFILE_CLR_CORE();`
`67`	`69`	`bool res = IsReadyForRelease();`
`68`	`70`
`69`		`- if(res) g_CLR_RT_EventCache.Append_Node( this );`
	`71`	`+ if (res)`
	`72`	`+ g_CLR_RT_EventCache.Append_Node(this);`
`70`	`73`
`71`	`74`	`return res;`
`72`	`75`	`}`
`73`		`-`