Merge remote-tracking branch 'refs/remotes/origin/main'

repl/repl_tools.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 
 char* readFile(char* path, size_t* fileSize);
 void writeFile(char* path, unsigned char* bytes, size_t size);

source/ast_node.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 #include "literal.h"
 #include "opcodes.h"
 #include "token_types.h"

source/builtin.c

@@ -891,7 +891,7 @@ int _index(Interpreter* interpreter, LiteralArray* arguments) {
 			//else override elements of the array instead
 			else {
 				//copy compound to result
-				snprintf(result, MAX_STRING_LENGTH, AS_STRING(compound));
+				snprintf(result, MAX_STRING_LENGTH, "%s", AS_STRING(compound));
 
 				int assignLength = strlen(AS_STRING(assign));
 				int min = AS_INTEGER(third) > 0 ? AS_INTEGER(first) : AS_INTEGER(second) - 1;

source/compiler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 #include "opcodes.h"
 #include "ast_node.h"
 #include "literal_array.h"

source/interpreter.c

@@ -1,7 +1,7 @@
 #include "interpreter.h"
 #include "console_colors.h"
 
-#include "common.h"
+#include "toy_common.h"
 #include "memory.h"
 #include "keyword_types.h"
 #include "opcodes.h"

source/interpreter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 #include "literal.h"
 #include "literal_array.h"
 #include "literal_dictionary.h"

source/keyword_types.c

@@ -1,6 +1,6 @@
 #include "keyword_types.h"
 
-#include "common.h"
+#include "toy_common.h"
 
 #include <string.h>
 

source/lexer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 #include "token_types.h"
 
 //lexers are bound to a string of code, and return a single token every time scan is called

source/literal.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 
 #include <string.h>
 

source/literal_array.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 
 #include "literal.h"
 

source/literal_dictionary.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 
 #include "literal.h"
 

source/memory.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 
 #define ALLOCATE(type, count) ((type*)reallocate(NULL, 0, sizeof(type) * (count)))
 #define FREE(type, pointer) reallocate(pointer, sizeof(type), 0)

source/parser.c

@@ -1,7 +1,5 @@
 #include "parser.h"
 
-#include "common.h"
-
 #include "memory.h"
 #include "literal.h"
 #include "opcodes.h"

source/parser.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "toy_common.h"
 #include "lexer.h"
 #include "ast_node.h"
 

source/toy_common.c

@@ -1,4 +1,4 @@
-#include "common.h"
+#include "toy_common.h"
 
 #include <stdio.h>
 #include <string.h>