mirror of
https://github.com/krgamestudios/Toy.git
synced 2026-04-15 23:04:08 +10:00
Resolved a name clash with the engine
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
|
|
||||||
char* readFile(char* path, size_t* fileSize);
|
char* readFile(char* path, size_t* fileSize);
|
||||||
void writeFile(char* path, unsigned char* bytes, size_t size);
|
void writeFile(char* path, unsigned char* bytes, size_t size);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
#include "literal.h"
|
#include "literal.h"
|
||||||
#include "opcodes.h"
|
#include "opcodes.h"
|
||||||
#include "token_types.h"
|
#include "token_types.h"
|
||||||
|
|||||||
@@ -891,7 +891,7 @@ int _index(Interpreter* interpreter, LiteralArray* arguments) {
|
|||||||
//else override elements of the array instead
|
//else override elements of the array instead
|
||||||
else {
|
else {
|
||||||
//copy compound to result
|
//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 assignLength = strlen(AS_STRING(assign));
|
||||||
int min = AS_INTEGER(third) > 0 ? AS_INTEGER(first) : AS_INTEGER(second) - 1;
|
int min = AS_INTEGER(third) > 0 ? AS_INTEGER(first) : AS_INTEGER(second) - 1;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
#include "opcodes.h"
|
#include "opcodes.h"
|
||||||
#include "ast_node.h"
|
#include "ast_node.h"
|
||||||
#include "literal_array.h"
|
#include "literal_array.h"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "interpreter.h"
|
#include "interpreter.h"
|
||||||
#include "console_colors.h"
|
#include "console_colors.h"
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "keyword_types.h"
|
#include "keyword_types.h"
|
||||||
#include "opcodes.h"
|
#include "opcodes.h"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
#include "literal.h"
|
#include "literal.h"
|
||||||
#include "literal_array.h"
|
#include "literal_array.h"
|
||||||
#include "literal_dictionary.h"
|
#include "literal_dictionary.h"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#include "keyword_types.h"
|
#include "keyword_types.h"
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
#include "token_types.h"
|
#include "token_types.h"
|
||||||
|
|
||||||
//lexers are bound to a string of code, and return a single token every time scan is called
|
//lexers are bound to a string of code, and return a single token every time scan is called
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
|
|
||||||
#include "literal.h"
|
#include "literal.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
|
|
||||||
#include "literal.h"
|
#include "literal.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
|
|
||||||
#define ALLOCATE(type, count) ((type*)reallocate(NULL, 0, sizeof(type) * (count)))
|
#define ALLOCATE(type, count) ((type*)reallocate(NULL, 0, sizeof(type) * (count)))
|
||||||
#define FREE(type, pointer) reallocate(pointer, sizeof(type), 0)
|
#define FREE(type, pointer) reallocate(pointer, sizeof(type), 0)
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
#include "parser.h"
|
#include "parser.h"
|
||||||
|
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "literal.h"
|
#include "literal.h"
|
||||||
#include "opcodes.h"
|
#include "opcodes.h"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
#include "lexer.h"
|
#include "lexer.h"
|
||||||
#include "ast_node.h"
|
#include "ast_node.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "common.h"
|
#include "toy_common.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
Reference in New Issue
Block a user