reorganized files

src/main.c

@@ -14,6 +14,8 @@
  * $ noja -f <file> -o <file>
  */
 
+Object *Object_NewBuiltinsMap(Runtime *runtime, Heap *heap, Error *err);
+
 typedef enum { RUN, HELP, PARSE, VERSION, DISASSEMBLY } Action;
 
 typedef struct {

src/o_builtins.c

@@ -2,8 +2,8 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "runtime.h"
-#include "../utils/defs.h"
+#include "runtime/runtime.h"
+#include "utils/defs.h"
 
 static Object *select_(Object *self, Object *key, Heap *heap, Error *err);
 static int      count(Object *self);

src/objects/o_closure.c

@@ -1,8 +1,5 @@
-// NOTE: This data structure doesn't strictly depend on
-//       the runtime, so it could be moved to src/objects.
-
 #include "../utils/defs.h"
-#include "../objects/objects.h"
+#include "objects.h"
 
 typedef struct ClosureObject ClosureObject;
 

src/objects/objects.h

@@ -86,6 +86,7 @@ Object*		 Object_Prev  (Object *iter, Heap *heap, Error *err);
 Object*		 Object_NewMap(int num, Heap *heap, Error *error);
 Object*		 Object_NewList(int capacity, Heap *heap, Error *error);
 Object*		 Object_NewNone(Heap *heap, Error *error);
+Object*		 Object_NewClosure(Object *parent, Object *new_map, Heap *heap, Error *error);
 
 Object*		 Object_FromInt   (long long int val, Heap *heap, Error *error);
 Object*		 Object_FromBool  (_Bool		 val, Heap *heap, Error *error);

src/runtime/runtime.h

@@ -25,8 +25,6 @@ void 	  Snapshot_Print(Snapshot *snapshot, FILE *fp);
 
 Object *run(Runtime *runtime, Error *error, Executable *exe, int index, Object *closure, Object **argv, int argc);
 
-Object *Object_NewClosure(Object *parent, Object *new_map, Heap *heap, Error *error);
-Object *Object_NewBuiltinsMap(Runtime *runtime, Heap *heap, Error *err);
 Object*	Object_FromNativeFunction(Runtime *runtime, Object *(*callback)(Runtime*, Object**, unsigned int, Error*), int argc, Heap *heap, Error *error);
 Object *Object_FromNojaFunction(Runtime *runtime, Executable *exe, int index, int argc, Object *closure, Heap *heap, Error *error);
 #endif