Commit: 83084ed69c65cd33548af86594b3555f5f33c774 - sapphire_lisp (git)

Baremetal Lisp interpreter and compiler for low-resource devices

Commit MetaInfo

• Revision: 83084ed69c65cd33548af86594b3555f5f33c774 (tree)
• Time: 2020-09-13 08:24:04
• Author: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Log Message

Fix a silly mistake with type hints

Change Summary

• modified: sl_i.c

Incremental Difference

--- a/sl_i.c
+++ b/sl_i.c
@@ -115,8 +115,11 @@ static void sl_i_defun(struct SL_I_Runtime *rt,
     while(iter != SL_S_NIL){
         arg_pair = SL_S_PTR_FROM_TAG(iter->head);
         atom = SL_S_PTR_FROM_TAG(arg_pair->head);
-        if(SL_I_LIKELY(SL_S_COMPARE_ATOMS(atom, &sl_x_nil)))
+        if(SL_I_LIKELY(SL_S_IS_NIL(atom) ||
+            SL_S_COMPARE_ATOMS(atom, &sl_x_nil))){
+            
             goto type_hint_ok;
+        }
         /* Validate that we know what this type hint is. */
 #define SL_I_TYPE_HINT_CHECK(X) \
     if(SL_S_COMPARE_ATOMS(atom, &sl_x_ ## X ## _hint)) \
@@ -972,7 +975,7 @@ SL_S_FUNC(void) *SL_I_Call(struct SL_I_Runtime *rt,
             frame.defs[i].name = bind->args[i].name;
             value = SL_I_Execute(rt, args->head);
             hint = bind->args[i].hint;
-            if(!SL_S_COMPARE_ATOMS(hint, &sl_x_nil)){
+            if(!(SL_S_IS_NIL(hint) || SL_S_COMPARE_ATOMS(hint, &sl_x_nil))){
                 /* Validate the type. */
 #define SL_I_TYPE_ERROR "Invalid argument type for func "
 #define SL_I_SET_TYPE_ERROR do{ \