Skip to content

Commit bec0038

Browse files
authored
Code style fixes for nanoframework/nf-interpreter PR#3137 (#3139)
1 parent d43de1d commit bec0038

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

src/CLR/CorLib/corlib_native_System_Exception.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ struct ExceptionLookup
1212
};
1313

1414
static const ExceptionLookup c_ExceptionLookup[] = {
15-
#define EL(hr, fld) \
16-
{ \
17-
hr, &g_CLR_RT_WellKnownTypes.fld \
18-
}
15+
#define EL(hr, fld) {hr, &g_CLR_RT_WellKnownTypes.fld}
1916
EL(CLR_E_APPDOMAIN_EXITED, AppDomainUnloadedException),
2017
EL(CLR_E_INVALID_PARAMETER, ArgumentException),
2118
EL(CLR_E_ARGUMENT_NULL, ArgumentNullException),
@@ -208,10 +205,8 @@ HRESULT Library_corlib_native_System_Exception::SetStackTrace(CLR_RT_HeapBlock &
208205
(void)array;
209206

210207
// create an empty array for the stack trace
211-
NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(
212-
obj[FIELD___stackTrace],
213-
depth,
214-
g_CLR_RT_WellKnownTypes.UInt8));
208+
NANOCLR_CHECK_HRESULT(
209+
CLR_RT_HeapBlock_Array::CreateInstance(obj[FIELD___stackTrace], depth, g_CLR_RT_WellKnownTypes.UInt8));
215210
}
216211
else
217212
{

src/CLR/CorLib/corlib_native_System_Guid.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@
1111
// Based on the version 4 GUID (random)
1212
// http://guid.one/guid/make
1313

14-
15-
HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1( CLR_RT_StackFrame& stack )
14+
HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1(CLR_RT_StackFrame &stack)
1615
{
1716
NANOCLR_HEADER();
1817

19-
CLR_RT_Random rand;
20-
CLR_UINT8* buf;
21-
CLR_RT_HeapBlock& top = stack.PushValueAndClear();
22-
18+
CLR_RT_Random rand;
19+
CLR_UINT8 *buf;
20+
CLR_RT_HeapBlock &top = stack.PushValueAndClear();
21+
2322
// Create a array of 16 bytes on top of stack to return
24-
NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance( top, 16, g_CLR_RT_WellKnownTypes.UInt8 ));
23+
NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, 16, g_CLR_RT_WellKnownTypes.UInt8));
2524
buf = top.DereferenceArray()->GetFirstElement();
2625

2726
rand.Initialize();
28-
rand.NextBytes(buf, 16); // fill with random numbers
27+
rand.NextBytes(buf, 16); // fill with random numbers
28+
29+
buf[7] = (buf[7] & 0x0f) | 0x40; // Set verion
30+
buf[9] = (buf[7] & 0x3f) | 0x80; // Set variant
2931

30-
buf[7] = (buf[7] & 0x0f) | 0x40; // Set verion
31-
buf[9] = (buf[7] & 0x3f) | 0x80; // Set variant
32-
3332
NANOCLR_NOCLEANUP();
3433
}

src/CLR/CorLib/corlib_native_System_Runtime_CompilerServices_RuntimeHelpers.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ HRESULT Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::
2525
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
2626
}
2727

28-
if ((inst.target->flags & CLR_RECORD_FIELDDEF::FD_HasFieldRVA) == 0 ||
29-
inst.target->defaultValue == CLR_EmptyIndex)
28+
if ((inst.target->flags & CLR_RECORD_FIELDDEF::FD_HasFieldRVA) == 0 || inst.target->defaultValue == CLR_EmptyIndex)
3029
{
3130
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
3231
}

0 commit comments

Comments
 (0)