コミット: 342e19e6ceaaa91a71fe623b54896027301784b9 - sapphire_lisp (git)

Baremetal Lisp interpreter and compiler for low-resource devices

コミットメタ情報

• リビジョン: 342e19e6ceaaa91a71fe623b54896027301784b9 (tree)
• 日時: 2020-09-13 06:58:55
• 作者: AlaskanEmily <emily@alas...>
• コミッター: AlaskanEmily

ログメッセージ

Move builtins to a separate file

変更サマリ

• modified: sl.mk
• modified: sl_i.c
• add: sl_i_builtin.c
• add: sl_i_builtin.h

差分

--- a/sl.mk
+++ b/sl.mk
@@ -42,7 +42,7 @@ relink:
 	$(AR) $(ARFLAGS) $(AROUT)libsl_s.a $(OBJECTS)
 	if test ! -z '$(RANLIB)' ; then $(RANLIB) $(RANLIBFLAGS) libsl_s.a ; fi
 
-IOBJECTS=sl_i.o sl_x.o sl_i_main.o
+IOBJECTS=sl_i.o sl_i_builtin.o sl_x.o sl_i_main.o
 
 sl_x.o: sl_x.c sl_x.h sl_s.h
 	$(CC) $(CFLAGS) $(COMPILEFLAG) sl_x.c $(COUT)sl_x.o
@@ -50,6 +50,9 @@ sl_x.o: sl_x.c sl_x.h sl_s.h
 sl_i.o: sl_i.c sl_i.h sl_x.h sl_s.h
 	$(CC) $(CFLAGS) $(COMPILEFLAG) sl_i.c $(COUT)sl_i.o
 
+sl_i_builtin.o: sl_i_builtin.c sl_i_builtin.h sl_i.h sl_s.h
+	$(CC) $(CFLAGS) $(COMPILEFLAG) sl_i_builtin.c $(COUT)sl_i_builtin.o
+
 sl_i_main.o: sl_i_main.c sl_i.h sl_s.h sl_s_parse.h sl_x.h sl_x_io.h
 	$(CC) $(CFLAGS) $(COMPILEFLAG) sl_i_main.c $(COUT)sl_i_main.o
 

--- a/sl_i.c
+++ b/sl_i.c
@@ -18,6 +18,8 @@
  */
 
 #include "sl_i.h"
+
+#include "sl_i_builtin.h"
 #include "sl_x.h"
 
 #define SL_I_BIND_CAP_GROWTH 64
@@ -35,35 +37,6 @@
 
 /*****************************************************************************/
 
-SL_S_FUNC(void) *sl_i_print(struct SL_I_Runtime *rt,
-    const struct SL_S_List *args){
-    
-    struct SL_S_Atom *atom;
-    struct SL_S_List *list;
-    if(SL_S_IS_NIL(args->head)){
-        rt->io.write(rt->io.x_stdout, "nil", 3);
-    }
-    if(SL_S_IS_LIST(args->head)){
-        rt->io.write(rt->io.x_stdout, "( ", 2);
-        for(list = SL_S_PTR_FROM_TAG(args->head);
-            list != SL_S_NIL;
-            list = list->tail){
-            
-            sl_i_print(rt, list);
-            rt->io.write(rt->io.x_stdout, " ", 1);
-        }
-        rt->io.write(rt->io.x_stdout, ")", 1);
-    }
-    else{
-        atom = SL_S_PTR_FROM_TAG(args->head);
-        rt->io.write(rt->io.x_stdout, atom->text, atom->len);
-    }
-    return SL_S_NIL;
-}
-const struct SL_S_Atom sl_i_print_name = SL_S_STATIC_ATOM("print");
-
-/*****************************************************************************/
-
 SL_S_FUNC(void) SL_I_InitRuntime(struct SL_I_Runtime *rt){
     SL_S_MemSet(rt, 0, sizeof(struct SL_I_Runtime));
     rt->frames = &(rt->global);
@@ -74,7 +47,7 @@ SL_S_FUNC(void) SL_I_InitRuntime(struct SL_I_Runtime *rt){
 
     rt->binds[0].name = &sl_i_print_name;
     rt->binds[0].is_native = 1;
-    rt->binds[0].bind.native = sl_i_print;
+    rt->binds[0].bind.native = SL_I_Print;
     rt->binds[0].args = SL_S_NIL;
     rt->binds[0].arity = 1;
 }

--- /dev/null
+++ b/sl_i_builtin.c
@@ -0,0 +1,57 @@
+/* Copyright (c) 2020 AlaskanEmily
+ *
+ * This software is provided 'as-is', without any express or implied warranty.
+ * In no event will the authors be held liable for any damages arising from
+ * the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *   claim that you wrote the original software. If you use this software in a
+ *   product, an acknowledgment in the product documentation would be
+ *   appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *   misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "sl_i_builtin.h"
+
+#include "sl_i.h"
+#include "sl_x.h"
+
+/*****************************************************************************/
+
+const struct SL_S_Atom sl_i_print_name = SL_S_STATIC_ATOM("print");
+
+/*****************************************************************************/
+
+SL_S_FUNC(void) *SL_I_Print(struct SL_I_Runtime *rt,
+    const struct SL_S_List *args){
+    
+    struct SL_S_Atom *atom;
+    struct SL_S_List *list;
+    if(SL_S_IS_NIL(args->head)){
+        rt->io.write(rt->io.x_stdout, "nil", 3);
+    }
+    if(SL_S_IS_LIST(args->head)){
+        rt->io.write(rt->io.x_stdout, "( ", 2);
+        for(list = SL_S_PTR_FROM_TAG(args->head);
+            list != SL_S_NIL;
+            list = list->tail){
+            
+            SL_I_Print(rt, list);
+            rt->io.write(rt->io.x_stdout, " ", 1);
+        }
+        rt->io.write(rt->io.x_stdout, ")", 1);
+    }
+    else{
+        atom = SL_S_PTR_FROM_TAG(args->head);
+        rt->io.write(rt->io.x_stdout, atom->text, atom->len);
+    }
+    return SL_S_NIL;
+}
+
+/*****************************************************************************/

--- /dev/null
+++ b/sl_i_builtin.h
@@ -0,0 +1,55 @@
+#ifndef SAPPHIRE_LISP_INTERPRETER_BUILTIN_H
+#define SAPPHIRE_LISP_INTERPRETER_BUILTIN_H
+
+/* Copyright (c) 2020 AlaskanEmily
+ *
+ * This software is provided 'as-is', without any express or implied warranty.
+ * In no event will the authors be held liable for any damages arising from
+ * the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *   claim that you wrote the original software. If you use this software in a
+ *   product, an acknowledgment in the product documentation would be
+ *   appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *   misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "sl_i_builtin.h"
+
+#include "sl_s.h"
+
+/*****************************************************************************/
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+/*****************************************************************************/
+
+struct SL_I_Runtime;
+
+/*****************************************************************************/
+
+const extern struct SL_S_Atom sl_i_print_name;
+
+/*****************************************************************************/
+
+SL_S_FUNC(void) *SL_I_Print(struct SL_I_Runtime *rt,
+    const struct SL_S_List *args);
+
+/*****************************************************************************/
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+/*****************************************************************************/
+
+#endif /* SAPPHIRE_LISP_INTERPRETER_BUILTIN_H */
+