Minor compile fixes: comma and new-line at end of files (#550)

* Fix missing comma in type definition Signed-off-by: Damien George <damien@micropython.org> * Make sure all files have a new-line at the end Some very old compilers don't like files without a new-line at the end. Signed-off-by: Damien George <damien@micropython.org> * Use math.isclose for universal_functions expm1 test Signed-off-by: Damien George <damien@micropython.org> Signed-off-by: Damien George <damien@micropython.org>
v923z · Sep 30, 2022 · 41fcf1d · 41fcf1d
1 parent 5ccfa5c
commit 41fcf1d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/code/numpy/io/io.h b/code/numpy/io/io.h
@@ -16,4 +16,4 @@ MP_DECLARE_CONST_FUN_OBJ_KW(io_loadtxt_obj);
 MP_DECLARE_CONST_FUN_OBJ_2(io_save_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(io_savetxt_obj);
 
-#endif
+#endif
diff --git a/code/numpy/ndarray/ndarray_iter.h b/code/numpy/ndarray/ndarray_iter.h
@@ -33,4 +33,4 @@ mp_obj_t ndarray_get_flatiterator(mp_obj_t , mp_obj_iter_buf_t *);
 mp_obj_t ndarray_flatiter_make_new(mp_obj_t );
 mp_obj_t ndarray_flatiter_next(mp_obj_t );
 
-#endif
+#endif
diff --git a/code/ulab.c b/code/ulab.c
@@ -147,8 +147,9 @@ const mp_obj_type_t ulab_ndarray_type = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_EXTENDED
     #if defined(MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE) && defined(MP_TYPE_FLAG_EQ_HAS_NEQ_TEST)
-        | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST,
+        | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST
     #endif
+        ,
     .name = MP_QSTR_ndarray,
     .print = ndarray_print,
     .make_new = ndarray_make_new,

diff --git a/code/ulab_tools.c b/code/ulab_tools.c
@@ -273,4 +273,4 @@ bool ulab_tools_mp_obj_is_scalar(mp_obj_t obj) {
         return false;
     }
     #endif
-}
+}
diff --git a/tests/1d/numpy/universal_functions.py b/tests/1d/numpy/universal_functions.py
@@ -58,7 +58,7 @@
 print(np.log2(2**1))
 
 print(np.log10(10**1))
-print(np.exp(1) - np.expm1(1))
+print(math.isclose(np.exp(1) - np.expm1(1), 1))
 
 x = np.array([-1, +1, +1, -1])
 y = np.array([-1, -1, +1, +1])

diff --git a/tests/1d/numpy/universal_functions.py.exp b/tests/1d/numpy/universal_functions.py.exp
@@ -18,7 +18,7 @@ True
 1.0
 1.0
 1.0
-1.0
+True
 [True, True, True, True]
 [True, True, True, True, True]
 [True, True, True, True, True]