Compare commits
25 Commits
prerelease
...
prerelease
| Author | SHA1 | Date | |
|---|---|---|---|
| fe7eaa8de3 | |||
| 66b44e8f3a | |||
| 0cb55fc563 | |||
| c4731597f3 | |||
| e234ea074b | |||
| 9e5e932d39 | |||
| fba074a5a4 | |||
| 72cc87f5b6 | |||
| 5c0ced5e45 | |||
| 886599c9c5 | |||
| cbebe4812b | |||
| 8b2eedf589 | |||
| 48647f3734 | |||
| 47379a2621 | |||
| 246e20014f | |||
| c31f16d68d | |||
| 49ae0223cb | |||
| d868de4ab9 | |||
| 3adecb4eba | |||
| 31f38d8ba4 | |||
| aa65393e2c | |||
| 358127a145 | |||
| 6828cc5f1a | |||
| a9d0ba0318 | |||
| a275a0a0ad |
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -12,6 +12,8 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
- name: Setup Python (needed for Conan)
|
- name: Setup Python (needed for Conan)
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
|
|||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -60,4 +60,4 @@ build
|
|||||||
*.yy.c
|
*.yy.c
|
||||||
*.yy.h
|
*.yy.h
|
||||||
|
|
||||||
out.arbin
|
__arcache__
|
||||||
9
.gitmodules
vendored
Normal file
9
.gitmodules
vendored
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
[submodule "external/xxhash"]
|
||||||
|
path = external/xxhash
|
||||||
|
url = https://github.com/Cyan4973/xxHash.git
|
||||||
|
[submodule "external/cwalk"]
|
||||||
|
path = external/cwalk
|
||||||
|
url = https://github.com/likle/cwalk.git
|
||||||
|
[submodule "external/libdye"]
|
||||||
|
path = external/libdye
|
||||||
|
url = https://github.com/Ugric/libdye.git
|
||||||
@@ -30,7 +30,10 @@ add_custom_command(
|
|||||||
add_custom_target(GenerateLexer DEPENDS ${LEXER_C} ${LEXER_H})
|
add_custom_target(GenerateLexer DEPENDS ${LEXER_C} ${LEXER_H})
|
||||||
|
|
||||||
# Step 3: Add executable
|
# Step 3: Add executable
|
||||||
add_executable(argon ${CFILES} ${LEXER_C})
|
add_executable(argon external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c ${CFILES} ${LEXER_C})
|
||||||
|
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||||
|
target_include_directories(argon PRIVATE ${CMAKE_SOURCE_DIR}/external/cwalk/include)
|
||||||
|
target_include_directories(argon PRIVATE ${CMAKE_SOURCE_DIR}/external/libdye/include)
|
||||||
|
|
||||||
# Step 4: Build order
|
# Step 4: Build order
|
||||||
add_dependencies(argon GenerateLexer)
|
add_dependencies(argon GenerateLexer)
|
||||||
@@ -56,3 +59,5 @@ target_link_libraries(argon PRIVATE
|
|||||||
target_include_directories(argon PRIVATE
|
target_include_directories(argon PRIVATE
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/src/lexer
|
${CMAKE_CURRENT_SOURCE_DIR}/src/lexer
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_custom_command(TARGET argon POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE:argon>)
|
||||||
4
LICENSE
4
LICENSE
@@ -1,3 +1,7 @@
|
|||||||
|
This project is licensed under the GNU General Public License version 3 (GPLv3), except for
|
||||||
|
some files (e.g., in the `src/hash_data/siphash/` directory) which are licensed under CC0 1.0 Universal.
|
||||||
|
See the LICENSE-CC0 file in the respective directories for details.
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
Version 3, 29 June 2007
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
|||||||
10
Makefile
10
Makefile
@@ -2,8 +2,8 @@ LEXER_SRC = src/lexer/lex.l
|
|||||||
LEXER_C = src/lexer/lex.yy.c
|
LEXER_C = src/lexer/lex.yy.c
|
||||||
LEXER_H = src/lexer/lex.yy.h
|
LEXER_H = src/lexer/lex.yy.h
|
||||||
|
|
||||||
CFILES = $(shell find src -name '*.c')
|
CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
|
||||||
CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function
|
CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function -Iexternal/cwalk/include -Iexternal/libdye/include
|
||||||
BINARY = bin/argon
|
BINARY = bin/argon
|
||||||
|
|
||||||
all: $(BINARY)
|
all: $(BINARY)
|
||||||
@@ -15,6 +15,10 @@ $(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
|
|||||||
mkdir -p bin
|
mkdir -p bin
|
||||||
gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
|
gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
|
||||||
|
|
||||||
|
native: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||||
|
mkdir -p bin
|
||||||
|
gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||||
|
|
||||||
debug: $(CFILES) $(LEXER_C) $(LEXER_H)
|
debug: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||||
mkdir -p bin
|
mkdir -p bin
|
||||||
gcc -g -O0 -o $(BINARY) $(CFILES) $(CFLAGS)
|
gcc -g -O0 -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||||
@@ -26,7 +30,7 @@ full-debug: $(CFILES) $(LEXER_C) $(LEXER_H)
|
|||||||
optimised: $(CFILES) $(LEXER_C) $(LEXER_H)
|
optimised: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||||
mkdir -p bin
|
mkdir -p bin
|
||||||
gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS)
|
gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||||
${BINARY} test.ar
|
${BINARY} rand_test.ar
|
||||||
gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS)
|
gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
1
external/cwalk
vendored
Submodule
1
external/cwalk
vendored
Submodule
Submodule external/cwalk added at e98d23f688
1
external/libdye
vendored
Submodule
1
external/libdye
vendored
Submodule
Submodule external/libdye added at c3fa048e65
1
external/xxhash
vendored
Submodule
1
external/xxhash
vendored
Submodule
Submodule external/xxhash added at 38d555879f
7
gentest.py
Normal file
7
gentest.py
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import random
|
||||||
|
import sys
|
||||||
|
|
||||||
|
for i in range(100000000):
|
||||||
|
sys.stdout.write("\"")
|
||||||
|
sys.stdout.write(str(random.random()))
|
||||||
|
sys.stdout.write("\"\n")
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
null
|
|
||||||
"hello\u0000world"
|
|
||||||
52
src/arobject.h
Normal file
52
src/arobject.h
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
#ifndef AROBJECT_H
|
||||||
|
#define AROBJECT_H
|
||||||
|
|
||||||
|
#include <gmp.h>
|
||||||
|
#include "runtime/internals/dynamic_array_armem/darray_armem.h"
|
||||||
|
|
||||||
|
typedef struct ArgonObject ArgonObject; // forward declaration
|
||||||
|
|
||||||
|
typedef enum ArgonType {
|
||||||
|
TYPE_NULL,
|
||||||
|
TYPE_BOOL,
|
||||||
|
TYPE_NUMBER,
|
||||||
|
TYPE_STRING,
|
||||||
|
TYPE_FUNCTION,
|
||||||
|
TYPE_NATIVE_FUNCTION,
|
||||||
|
TYPE_OBJECT,
|
||||||
|
} ArgonType;
|
||||||
|
|
||||||
|
struct string_struct {
|
||||||
|
char *data;
|
||||||
|
size_t length;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct Stack {
|
||||||
|
ArgonObject *scope;
|
||||||
|
struct Stack *prev;
|
||||||
|
} Stack;
|
||||||
|
|
||||||
|
struct argon_function_struct {
|
||||||
|
darray_armem bytecode;
|
||||||
|
Stack stack;
|
||||||
|
size_t number_of_parameters;
|
||||||
|
char **parameters;
|
||||||
|
};
|
||||||
|
|
||||||
|
// full definition of ArgonObject (no typedef again!)
|
||||||
|
struct ArgonObject {
|
||||||
|
ArgonType type;
|
||||||
|
char *name;
|
||||||
|
ArgonObject *self;
|
||||||
|
ArgonObject *baseObject;
|
||||||
|
struct hashmap_GC *fields;
|
||||||
|
union {
|
||||||
|
mpq_t as_number;
|
||||||
|
bool as_bool;
|
||||||
|
struct string_struct as_str;
|
||||||
|
void *native_fn;
|
||||||
|
struct argon_function_struct argon_fn;
|
||||||
|
} value;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // AROBJECT_H
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h> // for size_t
|
#include <stddef.h> // for size_t
|
||||||
|
|
||||||
#define CHUNK_SIZE 1024
|
#define CHUNK_SIZE 1048576
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
void *data;
|
void *data;
|
||||||
|
|||||||
134
src/err.c
Normal file
134
src/err.c
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
#include "err.h"
|
||||||
|
#include "../external/libdye/include/dye.h"
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
const ArErr no_err = (ArErr){false};
|
||||||
|
|
||||||
|
ArErr create_err(int64_t line, int64_t column, int length, char *path,
|
||||||
|
const char *type, const char *fmt, ...) {
|
||||||
|
ArErr err;
|
||||||
|
err.exists = true;
|
||||||
|
err.path = path;
|
||||||
|
err.line = line;
|
||||||
|
err.column = column;
|
||||||
|
err.length = length;
|
||||||
|
|
||||||
|
// Copy error type safely
|
||||||
|
strncpy(err.type, type, sizeof(err.type) - 1);
|
||||||
|
err.type[sizeof(err.type) - 1] = '\0';
|
||||||
|
|
||||||
|
// Format error message
|
||||||
|
va_list args;
|
||||||
|
va_start(args, fmt);
|
||||||
|
vsnprintf(err.message, sizeof(err.message), fmt, args);
|
||||||
|
va_end(args);
|
||||||
|
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
void output_err(ArErr err) {
|
||||||
|
if (!err.exists)
|
||||||
|
return;
|
||||||
|
dye(stderr, DYE_WHITE, DYE_RED);
|
||||||
|
fprintf(stderr, "ERROR!");
|
||||||
|
dye(stderr, DYE_RESET, DYE_RESET);
|
||||||
|
fprintf(stderr, " ");
|
||||||
|
dyefg(stderr, DYE_RED);
|
||||||
|
dye_style(stderr, DYE_STYLE_BOLD);
|
||||||
|
fprintf(stderr, "%s", err.type);
|
||||||
|
dye_style(stderr, DYE_STYLE_RESET);
|
||||||
|
dyefg(stderr, DYE_RESET);
|
||||||
|
fprintf(stderr, ": ");
|
||||||
|
dyefg(stderr, DYE_RED);
|
||||||
|
fprintf(stderr, "%s", err.message);
|
||||||
|
dye_style(stderr, DYE_STYLE_RESET);
|
||||||
|
dyefg(stderr, DYE_RESET);
|
||||||
|
fprintf(stderr, "\n");
|
||||||
|
|
||||||
|
if (err.path && err.line) {
|
||||||
|
dyefg(stderr, DYE_GRAY);
|
||||||
|
fprintf(stderr, " --> ");
|
||||||
|
dyefg(stderr, DYE_CYAN);
|
||||||
|
fprintf(stderr, "%s", err.path);
|
||||||
|
dyefg(stderr, DYE_GRAY);
|
||||||
|
fprintf(stderr, ":");
|
||||||
|
dyefg(stderr, DYE_YELLOW);
|
||||||
|
fprintf(stderr, "%zu", err.line);
|
||||||
|
dyefg(stderr, DYE_GRAY);
|
||||||
|
fprintf(stderr, ":");
|
||||||
|
dyefg(stderr, DYE_YELLOW);
|
||||||
|
fprintf(stderr, "%zu", err.column);
|
||||||
|
dye_style(stderr, DYE_STYLE_RESET);
|
||||||
|
dyefg(stderr, DYE_RESET);
|
||||||
|
fprintf(stderr, "\n");
|
||||||
|
FILE *file = fopen(err.path, "r");
|
||||||
|
if (file) {
|
||||||
|
dye_style(stderr, DYE_STYLE_RESET);
|
||||||
|
dyefg(stderr, DYE_RESET);
|
||||||
|
int line_number_width = snprintf(NULL, 0, "%zu", err.line);
|
||||||
|
char *buffer = NULL;
|
||||||
|
size_t size = 0;
|
||||||
|
int current_line = 1;
|
||||||
|
ssize_t len;
|
||||||
|
|
||||||
|
while ((len = getline(&buffer, &size, file)) != -1) {
|
||||||
|
if (current_line == err.line) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
current_line++;
|
||||||
|
}
|
||||||
|
fprintf(stderr, " ");
|
||||||
|
for (int i = 0; i < line_number_width; i++) {
|
||||||
|
fprintf(stderr, " ");
|
||||||
|
}
|
||||||
|
fprintf(stderr, "|\n");
|
||||||
|
getline(&buffer, &size, file);
|
||||||
|
|
||||||
|
char *line_starts = buffer;
|
||||||
|
while (*line_starts && isspace((unsigned char)*line_starts) && line_starts-buffer < err.column-1) {
|
||||||
|
line_starts++;
|
||||||
|
err.column--;
|
||||||
|
}
|
||||||
|
fprintf(stderr, " %zu | ", err.line);
|
||||||
|
if (err.length) {
|
||||||
|
fprintf(stderr, "%.*s", (int)err.column-1, line_starts);
|
||||||
|
dyefg(stderr, DYE_RED);
|
||||||
|
dye_style(stderr, DYE_STYLE_BOLD);
|
||||||
|
fprintf(stderr, "%.*s", err.length, line_starts + err.column - 1);
|
||||||
|
dye_style(stderr, DYE_STYLE_RESET);
|
||||||
|
dyefg(stderr, DYE_RESET);
|
||||||
|
fprintf(stderr, "%s", line_starts + (int)err.column + err.length - 1);
|
||||||
|
for (int64_t i = 0; i < err.column - 1; i++) {
|
||||||
|
fprintf(stderr, " ");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "%s", line_starts);
|
||||||
|
}
|
||||||
|
free(buffer);
|
||||||
|
fprintf(stderr, "\n ");
|
||||||
|
for (int i = 0; i < line_number_width; i++) {
|
||||||
|
fprintf(stderr, " ");
|
||||||
|
}
|
||||||
|
fprintf(stderr, "| ");
|
||||||
|
|
||||||
|
for (int i = 1; i < err.column; i++) {
|
||||||
|
fprintf(stderr, " ");
|
||||||
|
}
|
||||||
|
dyefg(stderr, DYE_RED);
|
||||||
|
dye_style(stderr, DYE_STYLE_BOLD);
|
||||||
|
for (int i = 0; i < err.length; i++) {
|
||||||
|
fprintf(stderr, "^");
|
||||||
|
}
|
||||||
|
dye_style(stderr, DYE_STYLE_RESET);
|
||||||
|
dyefg(stderr, DYE_RESET);
|
||||||
|
fprintf(stderr, "\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
7
src/err.h
Normal file
7
src/err.h
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
#include "returnTypes.h"
|
||||||
|
|
||||||
|
extern const ArErr no_err;
|
||||||
|
|
||||||
|
ArErr create_err(int64_t line, int64_t column, int length, char *path, const char *type,
|
||||||
|
const char *fmt, ...);
|
||||||
|
void output_err(ArErr err);
|
||||||
28
src/hash_data/hash_data.c
Normal file
28
src/hash_data/hash_data.c
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#include <fcntl.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include "siphash/siphash.h"
|
||||||
|
#include "hash_data.h"
|
||||||
|
|
||||||
|
uint8_t siphash_key[16];
|
||||||
|
uint8_t empty_siphash_key[16];
|
||||||
|
|
||||||
|
void generate_siphash_key(uint8_t hash_key[16]) {
|
||||||
|
int fd = open("/dev/urandom", O_RDONLY);
|
||||||
|
if (fd < 0 || read(fd, hash_key, 16) != 16) {
|
||||||
|
// Fallback or abort
|
||||||
|
}
|
||||||
|
close(fd);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t siphash64_bytes(const void *data, size_t len,uint8_t hash_key[16]) {
|
||||||
|
uint8_t out[8];
|
||||||
|
if (siphash(data, len, hash_key, out, sizeof(out)) != 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
uint64_t hash = 0;
|
||||||
|
for (int i = 0; i < 8; ++i)
|
||||||
|
hash |= ((uint64_t)out[i]) << (8 * i);
|
||||||
|
|
||||||
|
return hash;
|
||||||
|
}
|
||||||
11
src/hash_data/hash_data.h
Normal file
11
src/hash_data/hash_data.h
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
#ifndef HASH_DATA_H
|
||||||
|
#define HASH_DATA_H
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
extern uint8_t siphash_key[16];
|
||||||
|
extern uint8_t empty_siphash_key[16];
|
||||||
|
|
||||||
|
void generate_siphash_key(uint8_t siphash_key[16]);
|
||||||
|
uint64_t siphash64_bytes(const void *data, size_t len,uint8_t siphash_key[16]);
|
||||||
|
#endif //HASH_DATA_H
|
||||||
122
src/hash_data/siphash/LICENSE_CC0
Normal file
122
src/hash_data/siphash/LICENSE_CC0
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
This license applies **only** to the files that explicitly state at the top of the file that they are under CC0 1.0 Universal.
|
||||||
|
|
||||||
|
All other files in this project are licensed under the GNU General Public License version 3 (GPLv3) unless otherwise stated.
|
||||||
|
|
||||||
|
Please refer to the LICENSE file in the root directory for the main project license.
|
||||||
|
|
||||||
|
CC0 1.0 Universal
|
||||||
|
|
||||||
|
Statement of Purpose
|
||||||
|
|
||||||
|
The laws of most jurisdictions throughout the world automatically confer
|
||||||
|
exclusive Copyright and Related Rights (defined below) upon the creator and
|
||||||
|
subsequent owner(s) (each and all, an "owner") of an original work of
|
||||||
|
authorship and/or a database (each, a "Work").
|
||||||
|
|
||||||
|
Certain owners wish to permanently relinquish those rights to a Work for the
|
||||||
|
purpose of contributing to a commons of creative, cultural and scientific
|
||||||
|
works ("Commons") that the public can reliably and without fear of later
|
||||||
|
claims of infringement build upon, modify, incorporate in other works, reuse
|
||||||
|
and redistribute as freely as possible in any form whatsoever and for any
|
||||||
|
purposes, including without limitation commercial purposes. These owners may
|
||||||
|
contribute to the Commons to promote the ideal of a free culture and the
|
||||||
|
further production of creative, cultural and scientific works, or to gain
|
||||||
|
reputation or greater distribution for their Work in part through the use and
|
||||||
|
efforts of others.
|
||||||
|
|
||||||
|
For these and/or other purposes and motivations, and without any expectation
|
||||||
|
of additional consideration or compensation, the person associating CC0 with a
|
||||||
|
Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
|
||||||
|
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
|
||||||
|
and publicly distribute the Work under its terms, with knowledge of his or her
|
||||||
|
Copyright and Related Rights in the Work and the meaning and intended legal
|
||||||
|
effect of CC0 on those rights.
|
||||||
|
|
||||||
|
1. Copyright and Related Rights. A Work made available under CC0 may be
|
||||||
|
protected by copyright and related or neighboring rights ("Copyright and
|
||||||
|
Related Rights"). Copyright and Related Rights include, but are not limited
|
||||||
|
to, the following:
|
||||||
|
|
||||||
|
i. the right to reproduce, adapt, distribute, perform, display, communicate,
|
||||||
|
and translate a Work;
|
||||||
|
|
||||||
|
ii. moral rights retained by the original author(s) and/or performer(s);
|
||||||
|
|
||||||
|
iii. publicity and privacy rights pertaining to a person's image or likeness
|
||||||
|
depicted in a Work;
|
||||||
|
|
||||||
|
iv. rights protecting against unfair competition in regards to a Work,
|
||||||
|
subject to the limitations in paragraph 4(a), below;
|
||||||
|
|
||||||
|
v. rights protecting the extraction, dissemination, use and reuse of data in
|
||||||
|
a Work;
|
||||||
|
|
||||||
|
vi. database rights (such as those arising under Directive 96/9/EC of the
|
||||||
|
European Parliament and of the Council of 11 March 1996 on the legal
|
||||||
|
protection of databases, and under any national implementation thereof,
|
||||||
|
including any amended or successor version of such directive); and
|
||||||
|
|
||||||
|
vii. other similar, equivalent or corresponding rights throughout the world
|
||||||
|
based on applicable law or treaty, and any national implementations thereof.
|
||||||
|
|
||||||
|
2. Waiver. To the greatest extent permitted by, but not in contravention of,
|
||||||
|
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
|
||||||
|
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
|
||||||
|
and Related Rights and associated claims and causes of action, whether now
|
||||||
|
known or unknown (including existing as well as future claims and causes of
|
||||||
|
action), in the Work (i) in all territories worldwide, (ii) for the maximum
|
||||||
|
duration provided by applicable law or treaty (including future time
|
||||||
|
extensions), (iii) in any current or future medium and for any number of
|
||||||
|
copies, and (iv) for any purpose whatsoever, including without limitation
|
||||||
|
commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
|
||||||
|
the Waiver for the benefit of each member of the public at large and to the
|
||||||
|
detriment of Affirmer's heirs and successors, fully intending that such Waiver
|
||||||
|
shall not be subject to revocation, rescission, cancellation, termination, or
|
||||||
|
any other legal or equitable action to disrupt the quiet enjoyment of the Work
|
||||||
|
by the public as contemplated by Affirmer's express Statement of Purpose.
|
||||||
|
|
||||||
|
3. Public License Fallback. Should any part of the Waiver for any reason be
|
||||||
|
judged legally invalid or ineffective under applicable law, then the Waiver
|
||||||
|
shall be preserved to the maximum extent permitted taking into account
|
||||||
|
Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
|
||||||
|
is so judged Affirmer hereby grants to each affected person a royalty-free,
|
||||||
|
non transferable, non sublicensable, non exclusive, irrevocable and
|
||||||
|
unconditional license to exercise Affirmer's Copyright and Related Rights in
|
||||||
|
the Work (i) in all territories worldwide, (ii) for the maximum duration
|
||||||
|
provided by applicable law or treaty (including future time extensions), (iii)
|
||||||
|
in any current or future medium and for any number of copies, and (iv) for any
|
||||||
|
purpose whatsoever, including without limitation commercial, advertising or
|
||||||
|
promotional purposes (the "License"). The License shall be deemed effective as
|
||||||
|
of the date CC0 was applied by Affirmer to the Work. Should any part of the
|
||||||
|
License for any reason be judged legally invalid or ineffective under
|
||||||
|
applicable law, such partial invalidity or ineffectiveness shall not
|
||||||
|
invalidate the remainder of the License, and in such case Affirmer hereby
|
||||||
|
affirms that he or she will not (i) exercise any of his or her remaining
|
||||||
|
Copyright and Related Rights in the Work or (ii) assert any associated claims
|
||||||
|
and causes of action with respect to the Work, in either case contrary to
|
||||||
|
Affirmer's express Statement of Purpose.
|
||||||
|
|
||||||
|
4. Limitations and Disclaimers.
|
||||||
|
|
||||||
|
a. No trademark or patent rights held by Affirmer are waived, abandoned,
|
||||||
|
surrendered, licensed or otherwise affected by this document.
|
||||||
|
|
||||||
|
b. Affirmer offers the Work as-is and makes no representations or warranties
|
||||||
|
of any kind concerning the Work, express, implied, statutory or otherwise,
|
||||||
|
including without limitation warranties of title, merchantability, fitness
|
||||||
|
for a particular purpose, non infringement, or the absence of latent or
|
||||||
|
other defects, accuracy, or the present or absence of errors, whether or not
|
||||||
|
discoverable, all to the greatest extent permissible under applicable law.
|
||||||
|
|
||||||
|
c. Affirmer disclaims responsibility for clearing rights of other persons
|
||||||
|
that may apply to the Work or any use thereof, including without limitation
|
||||||
|
any person's Copyright and Related Rights in the Work. Further, Affirmer
|
||||||
|
disclaims responsibility for obtaining any necessary consents, permissions
|
||||||
|
or other rights required for any use of the Work.
|
||||||
|
|
||||||
|
d. Affirmer understands and acknowledges that Creative Commons is not a
|
||||||
|
party to this document and has no duty or obligation with respect to this
|
||||||
|
CC0 or use of the Work.
|
||||||
|
|
||||||
|
For more information, please see
|
||||||
|
<http://creativecommons.org/publicdomain/zero/1.0/>
|
||||||
@@ -1,18 +1,22 @@
|
|||||||
/*
|
/*
|
||||||
SipHash reference C implementation
|
* This file is dedicated to the public domain under CC0 1.0 Universal.
|
||||||
|
* See the LICENSE-CC0 file in this directory for details.
|
||||||
Copyright (c) 2012-2022 Jean-Philippe Aumasson
|
*
|
||||||
<jeanphilippe.aumasson@gmail.com>
|
* SipHash reference C implementation
|
||||||
Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
|
*
|
||||||
|
* Copyright (c) 2012-2022 Jean-Philippe Aumasson
|
||||||
To the extent possible under law, the author(s) have dedicated all copyright
|
* <jeanphilippe.aumasson@gmail.com>
|
||||||
and related and neighboring rights to this software to the public domain
|
* Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
|
||||||
worldwide. This software is distributed without any warranty.
|
*
|
||||||
|
* To the extent possible under law, the author(s) have dedicated all copyright
|
||||||
You should have received a copy of the CC0 Public Domain Dedication along
|
* and related and neighboring rights to this software to the public domain
|
||||||
with
|
* worldwide. This software is distributed without any warranty.
|
||||||
this software. If not, see
|
*
|
||||||
<http://creativecommons.org/publicdomain/zero/1.0/>.
|
* You should have received a copy of the CC0 Public Domain Dedication along
|
||||||
|
* with this software. If not, see
|
||||||
|
* <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: CC0-1.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "siphash.h"
|
#include "siphash.h"
|
||||||
26
src/hash_data/siphash/siphash.h
Normal file
26
src/hash_data/siphash/siphash.h
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
* This file is dedicated to the public domain under CC0 1.0 Universal.
|
||||||
|
* See the LICENSE-CC0 file in this directory for details.
|
||||||
|
*
|
||||||
|
* SipHash reference C implementation
|
||||||
|
*
|
||||||
|
* Copyright (c) 2012-2022 Jean-Philippe Aumasson
|
||||||
|
* <jeanphilippe.aumasson@gmail.com>
|
||||||
|
* Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
|
||||||
|
*
|
||||||
|
* To the extent possible under law, the author(s) have dedicated all copyright
|
||||||
|
* and related and neighboring rights to this software to the public domain
|
||||||
|
* worldwide. This software is distributed without any warranty.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the CC0 Public Domain Dedication along
|
||||||
|
* with this software. If not, see
|
||||||
|
* <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: CC0-1.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
int siphash(const void *in, const size_t inlen, const void *k, uint8_t *out,
|
||||||
|
const size_t outlen);
|
||||||
134
src/hashmap/hashmap.c
Normal file
134
src/hashmap/hashmap.c
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
#include "hashmap.h"
|
||||||
|
#include "../memory.h"
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
struct hashmap *createHashmap() {
|
||||||
|
size_t size = 8;
|
||||||
|
struct hashmap *t = (struct hashmap *)checked_malloc(sizeof(struct hashmap));
|
||||||
|
t->size = size;
|
||||||
|
t->order = 1;
|
||||||
|
t->list = (struct node **)checked_malloc(sizeof(struct node *) * size);
|
||||||
|
memset(t->list, 0, sizeof(struct node *) * size);
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
|
void hashmap_free(struct hashmap *t, free_val_func free_val) {
|
||||||
|
if (!t)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (size_t i = 0; i < t->size; i++) {
|
||||||
|
struct node *current = t->list[i];
|
||||||
|
while (current) {
|
||||||
|
struct node *next = current->next;
|
||||||
|
if (free_val && current->val) {
|
||||||
|
free_val(current->val);
|
||||||
|
}
|
||||||
|
free(current);
|
||||||
|
current = next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(t->list);
|
||||||
|
free(t);
|
||||||
|
}
|
||||||
|
|
||||||
|
void resize_hashmap(struct hashmap *t) {
|
||||||
|
int old_size = t->size;
|
||||||
|
int new_size = old_size * 2;
|
||||||
|
|
||||||
|
struct node **old_list = t->list;
|
||||||
|
|
||||||
|
// Create new list
|
||||||
|
t->list = (struct node **)checked_malloc(sizeof(struct node *) * new_size);
|
||||||
|
memset(t->list, 0, sizeof(struct node *) * new_size);
|
||||||
|
|
||||||
|
t->size = new_size;
|
||||||
|
t->count = 0;
|
||||||
|
|
||||||
|
// Rehash old entries into new list
|
||||||
|
for (int i = 0; i < old_size; i++) {
|
||||||
|
struct node *temp = old_list[i];
|
||||||
|
while (temp) {
|
||||||
|
hashmap_insert(t, temp->hash, temp->key, temp->val,
|
||||||
|
temp->order); // Will increment count
|
||||||
|
struct node *temp_temp = temp;
|
||||||
|
temp = temp->next;
|
||||||
|
free(temp_temp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(old_list);
|
||||||
|
}
|
||||||
|
|
||||||
|
int hashCode(struct hashmap *t, uint64_t hash) { return hash & (t->size - 1); }
|
||||||
|
|
||||||
|
int hashmap_remove(struct hashmap *t, uint64_t hash) {
|
||||||
|
int pos = hashCode(t, hash);
|
||||||
|
struct node *list = t->list[pos];
|
||||||
|
struct node *temp = list;
|
||||||
|
struct node *prev = NULL;
|
||||||
|
while (temp) {
|
||||||
|
if (temp->hash == hash) {
|
||||||
|
if (prev)
|
||||||
|
prev->next = temp->next;
|
||||||
|
else
|
||||||
|
t->list[pos] = temp->next;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
prev = temp;
|
||||||
|
temp = temp->next;
|
||||||
|
}
|
||||||
|
list = NULL;
|
||||||
|
prev = NULL;
|
||||||
|
temp = NULL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void hashmap_insert(struct hashmap *t, uint64_t hash, void *key, void *val,
|
||||||
|
size_t order) {
|
||||||
|
if (!order) {
|
||||||
|
order = t->order++;
|
||||||
|
}
|
||||||
|
if ((t->count + 1) > t->size * 0.75) {
|
||||||
|
resize_hashmap(t);
|
||||||
|
}
|
||||||
|
|
||||||
|
int pos = hashCode(t, hash);
|
||||||
|
struct node *list = t->list[pos];
|
||||||
|
struct node *temp = list;
|
||||||
|
|
||||||
|
// Check if key exists → overwrite
|
||||||
|
while (temp) {
|
||||||
|
if (temp->hash == hash) {
|
||||||
|
temp->val = val;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
temp = temp->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insert new node
|
||||||
|
struct node *newNode = (struct node *)checked_malloc(sizeof(struct node));
|
||||||
|
newNode->hash = hash;
|
||||||
|
newNode->key = key;
|
||||||
|
newNode->val = val;
|
||||||
|
newNode->order = order;
|
||||||
|
newNode->next = list;
|
||||||
|
t->list[pos] = newNode;
|
||||||
|
t->count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *hashmap_lookup(struct hashmap *t, uint64_t hash) {
|
||||||
|
int pos = hashCode(t, hash);
|
||||||
|
struct node *list = t->list[pos];
|
||||||
|
struct node *temp = list;
|
||||||
|
while (temp) {
|
||||||
|
if (temp->hash == hash) {
|
||||||
|
return temp->val;
|
||||||
|
}
|
||||||
|
temp = temp->next;
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
35
src/hashmap/hashmap.h
Normal file
35
src/hashmap/hashmap.h
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
#ifndef HASHMAP_H
|
||||||
|
#define HASHMAP_H
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
typedef void (*free_val_func)(void *val);
|
||||||
|
|
||||||
|
struct node {
|
||||||
|
uint64_t hash;
|
||||||
|
void *key;
|
||||||
|
void *val;
|
||||||
|
size_t order;
|
||||||
|
struct node *next;
|
||||||
|
};
|
||||||
|
struct hashmap {
|
||||||
|
size_t size;
|
||||||
|
size_t count;
|
||||||
|
size_t order;
|
||||||
|
struct node **list;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct hashmap *createHashmap();
|
||||||
|
|
||||||
|
void hashmap_free(struct hashmap *t, free_val_func free_val);
|
||||||
|
|
||||||
|
int hashCode(struct hashmap *t, uint64_t hash);
|
||||||
|
|
||||||
|
int hashmap_remove(struct hashmap *t, uint64_t hash);
|
||||||
|
|
||||||
|
void hashmap_insert(struct hashmap *t, uint64_t hash, void *key,
|
||||||
|
void *val, size_t order);
|
||||||
|
|
||||||
|
void *hashmap_lookup(struct hashmap *t, uint64_t hash);
|
||||||
|
|
||||||
|
#endif // HASHMAP_H
|
||||||
@@ -108,8 +108,6 @@ int yywrap(void * unused_param) {
|
|||||||
#[^\n]* { /* skip comment */ }
|
#[^\n]* { /* skip comment */ }
|
||||||
|
|
||||||
. {
|
. {
|
||||||
GET_STATE
|
return TOKEN_INVALID;
|
||||||
fprintf(stderr, "%s:%zu:%zu error: unexpected character '%s'\n", state->path, state->current_line+1, COLUMN_NO+1, yytext);
|
|
||||||
exit(1);
|
|
||||||
}
|
}
|
||||||
%%
|
%%
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
#include "lexer.h"
|
#include "lexer.h"
|
||||||
#include "lex.yy.h"
|
|
||||||
#include "../string/string.h"
|
#include "../string/string.h"
|
||||||
|
#include "lex.yy.h"
|
||||||
|
|
||||||
void lexer(LexerState state) {
|
ArErr lexer(LexerState state) {
|
||||||
size_t line = 1;
|
size_t line = 1;
|
||||||
size_t column = 1;
|
size_t column = 1;
|
||||||
int ch;
|
int ch;
|
||||||
@@ -32,13 +32,16 @@ void lexer(LexerState state) {
|
|||||||
|
|
||||||
int token;
|
int token;
|
||||||
while ((token = yylex(scanner)) != 0) {
|
while ((token = yylex(scanner)) != 0) {
|
||||||
Token token_struct = (Token){
|
if (token == TOKEN_INVALID) {
|
||||||
token,
|
ArErr err = create_err(state.current_line + 1, state.current_column + 1,
|
||||||
state.current_line+1,
|
yyget_leng(scanner), state.path, "Syntax Error",
|
||||||
state.current_column+1,
|
"Invalid Token '%s'", yyget_text(scanner));
|
||||||
yyget_leng(scanner),
|
yylex_destroy(scanner);
|
||||||
cloneString(yyget_text(scanner))
|
return err;
|
||||||
};
|
}
|
||||||
|
Token token_struct =
|
||||||
|
(Token){token, state.current_line + 1, state.current_column + 1,
|
||||||
|
yyget_leng(scanner), cloneString(yyget_text(scanner))};
|
||||||
darray_push(state.tokens, &token_struct);
|
darray_push(state.tokens, &token_struct);
|
||||||
if (token == TOKEN_NEW_LINE) {
|
if (token == TOKEN_NEW_LINE) {
|
||||||
state.current_line += 1;
|
state.current_line += 1;
|
||||||
@@ -48,4 +51,5 @@ void lexer(LexerState state) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
yylex_destroy(scanner);
|
yylex_destroy(scanner);
|
||||||
|
return no_err;
|
||||||
}
|
}
|
||||||
@@ -4,9 +4,10 @@
|
|||||||
#include "../dynamic_array/darray.h"
|
#include "../dynamic_array/darray.h"
|
||||||
#include "token.h"
|
#include "token.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include "../err.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const char *path;
|
char *path;
|
||||||
FILE *file;
|
FILE *file;
|
||||||
size_t current_line;
|
size_t current_line;
|
||||||
size_t current_column;
|
size_t current_column;
|
||||||
@@ -14,6 +15,6 @@ typedef struct {
|
|||||||
// add more fields as needed
|
// add more fields as needed
|
||||||
} LexerState;
|
} LexerState;
|
||||||
|
|
||||||
void lexer(LexerState state);
|
ArErr lexer(LexerState state);
|
||||||
|
|
||||||
#endif // LEXER_H
|
#endif // LEXER_H
|
||||||
@@ -72,6 +72,7 @@ typedef enum {
|
|||||||
TOKEN_COMMA,
|
TOKEN_COMMA,
|
||||||
TOKEN_COLON,
|
TOKEN_COLON,
|
||||||
TOKEN_EXCLAMATION,
|
TOKEN_EXCLAMATION,
|
||||||
|
TOKEN_INVALID,
|
||||||
} TokenType;
|
} TokenType;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|||||||
328
src/main.c
328
src/main.c
@@ -3,83 +3,321 @@
|
|||||||
#include "lexer/token.h"
|
#include "lexer/token.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "parser/parser.h"
|
#include "parser/parser.h"
|
||||||
#include "translator/translator.h"
|
|
||||||
#include "runtime/runtime.h"
|
#include "runtime/runtime.h"
|
||||||
|
#include "translator/translator.h"
|
||||||
|
|
||||||
|
#include "../external/xxhash/xxhash.h"
|
||||||
|
#include "hash_data/hash_data.h"
|
||||||
|
#include <arpa/inet.h>
|
||||||
#include <endian.h>
|
#include <endian.h>
|
||||||
#include <string.h>
|
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <direct.h>
|
||||||
|
#define mkdir(path, mode) _mkdir(path)
|
||||||
|
#else
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#endif
|
||||||
|
#include "../external/cwalk/include/cwalk.h"
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
const char FILE_IDENTIFIER[] = "ARBI";
|
#ifdef _WIN32
|
||||||
const uint64_t version_number = 0;
|
#include <windows.h>
|
||||||
|
#else
|
||||||
|
#include <limits.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
#include "err.h"
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
char *get_current_directory() {
|
||||||
setlocale(LC_ALL, "");
|
char *buffer = NULL;
|
||||||
if (argc <= 1)
|
|
||||||
return -1;
|
|
||||||
ar_memory_init();
|
|
||||||
char *path = argv[1];
|
|
||||||
DArray tokens;
|
|
||||||
|
|
||||||
darray_init(&tokens, sizeof(Token));
|
#ifdef _WIN32
|
||||||
|
DWORD size = GetCurrentDirectoryA(0, NULL);
|
||||||
|
buffer = malloc(size);
|
||||||
|
if (buffer == NULL)
|
||||||
|
return NULL;
|
||||||
|
if (GetCurrentDirectoryA(size, buffer) == 0) {
|
||||||
|
free(buffer);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
long size = pathconf(".", _PC_PATH_MAX);
|
||||||
|
if (size == -1)
|
||||||
|
size = 4096; // fallback
|
||||||
|
buffer = malloc(size);
|
||||||
|
if (buffer == NULL)
|
||||||
|
return NULL;
|
||||||
|
if (getcwd(buffer, size) == NULL) {
|
||||||
|
free(buffer);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
FILE *file = fopen(path, "r");
|
return buffer;
|
||||||
|
}
|
||||||
|
|
||||||
if (!file) {
|
int ensure_dir_exists(const char *path) {
|
||||||
return -1;
|
struct stat st = {0};
|
||||||
|
|
||||||
|
if (stat(path, &st) == -1) {
|
||||||
|
// Directory does not exist, create it
|
||||||
|
if (mkdir(path, 0755) != 0) {
|
||||||
|
perror("mkdir failed");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char CACHE_FOLDER[] = "__arcache__";
|
||||||
|
const char FILE_IDENTIFIER[5] = "ARBI";
|
||||||
|
const char BYTECODE_EXTENTION[] = "arbin";
|
||||||
|
const uint32_t version_number = 0;
|
||||||
|
|
||||||
|
int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash) {
|
||||||
|
FILE *bytecode_file = fopen(joined_paths, "rb");
|
||||||
|
if (!bytecode_file)
|
||||||
|
return 1;
|
||||||
|
char file_identifier_from_cache[sizeof(FILE_IDENTIFIER)] = {0};
|
||||||
|
if (fread(&file_identifier_from_cache, 1,
|
||||||
|
sizeof(file_identifier_from_cache) - 1,
|
||||||
|
bytecode_file) != sizeof(file_identifier_from_cache) - 1 ||
|
||||||
|
memcmp(file_identifier_from_cache, FILE_IDENTIFIER,
|
||||||
|
sizeof(file_identifier_from_cache)) != 0) {
|
||||||
|
goto FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
LexerState state = {path, file, 0, 0, &tokens};
|
uint32_t read_version;
|
||||||
lexer(state);
|
if (fread(&read_version, 1, sizeof(read_version), bytecode_file) !=
|
||||||
fclose(state.file);
|
sizeof(read_version)) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
read_version = le32toh(read_version);
|
||||||
|
|
||||||
DArray ast;
|
if (read_version != version_number) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
darray_init(&ast, sizeof(ParsedValue));
|
uint64_t read_hash;
|
||||||
|
if (fread(&read_hash, 1, sizeof(read_hash), bytecode_file) !=
|
||||||
|
sizeof(read_hash)) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
read_hash = le64toh(read_hash);
|
||||||
|
|
||||||
parser(path, &ast, &tokens, false);
|
if (read_hash != hash) {
|
||||||
darray_free(&tokens, free_token);
|
goto FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t register_count;
|
||||||
|
if (fread(®ister_count, 1, sizeof(register_count), bytecode_file) !=
|
||||||
|
sizeof(register_count)) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t constantsSize;
|
||||||
|
if (fread(&constantsSize, 1, sizeof(constantsSize), bytecode_file) !=
|
||||||
|
sizeof(constantsSize)) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
constantsSize = le64toh(constantsSize);
|
||||||
|
|
||||||
|
uint64_t bytecodeSize;
|
||||||
|
if (fread(&bytecodeSize, 1, sizeof(bytecodeSize), bytecode_file) !=
|
||||||
|
sizeof(bytecodeSize)) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
bytecodeSize = le64toh(bytecodeSize);
|
||||||
|
|
||||||
|
arena_resize(&translated_dest->constants, constantsSize);
|
||||||
|
|
||||||
|
if (fread(translated_dest->constants.data, 1, constantsSize, bytecode_file) !=
|
||||||
|
constantsSize) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
darray_resize(&translated_dest->bytecode, bytecodeSize);
|
||||||
|
|
||||||
|
if (fread(translated_dest->bytecode.data, 1, bytecodeSize, bytecode_file) !=
|
||||||
|
bytecodeSize) {
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
translated_dest->registerCount = register_count;
|
||||||
|
|
||||||
|
fclose(bytecode_file);
|
||||||
|
return 0;
|
||||||
|
FAILED:
|
||||||
|
fclose(bytecode_file);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
Execution execute(char *absolute_path) {
|
||||||
|
clock_t start, end;
|
||||||
|
double time_spent, total_time_spent = 0;
|
||||||
|
|
||||||
|
const char *basename_ptr;
|
||||||
|
size_t basename_length;
|
||||||
|
cwk_path_get_basename(absolute_path, &basename_ptr, &basename_length);
|
||||||
|
|
||||||
|
if (!basename_ptr)
|
||||||
|
return (Execution){create_err(0, 0, 0, NULL, "Path Error",
|
||||||
|
"path has no basename '%s'", absolute_path),
|
||||||
|
(Stack){NULL, NULL}};
|
||||||
|
|
||||||
|
char basename[FILENAME_MAX];
|
||||||
|
memcpy(basename, basename_ptr, basename_length);
|
||||||
|
|
||||||
|
size_t parent_directory_length;
|
||||||
|
cwk_path_get_dirname(absolute_path, &parent_directory_length);
|
||||||
|
|
||||||
|
char parent_directory[FILENAME_MAX];
|
||||||
|
memcpy(parent_directory, absolute_path, parent_directory_length);
|
||||||
|
parent_directory[parent_directory_length] = '\0';
|
||||||
|
|
||||||
|
char cache_folder_path[FILENAME_MAX];
|
||||||
|
cwk_path_join(parent_directory, CACHE_FOLDER, cache_folder_path,
|
||||||
|
sizeof(cache_folder_path));
|
||||||
|
|
||||||
|
char cache_file_path[FILENAME_MAX];
|
||||||
|
cwk_path_join(cache_folder_path, basename, cache_file_path,
|
||||||
|
sizeof(cache_file_path));
|
||||||
|
cwk_path_change_extension(cache_file_path, BYTECODE_EXTENTION,
|
||||||
|
cache_file_path, sizeof(cache_file_path));
|
||||||
|
|
||||||
|
FILE *file = fopen(absolute_path, "r");
|
||||||
|
if (!file) {
|
||||||
|
return (Execution){create_err(0, 0, 0, NULL, "File Error",
|
||||||
|
"Unable to open file '%s'", absolute_path),
|
||||||
|
(Stack){NULL, NULL}};
|
||||||
|
}
|
||||||
|
|
||||||
|
XXH3_state_t *hash_state = XXH3_createState();
|
||||||
|
XXH3_64bits_reset(hash_state);
|
||||||
|
|
||||||
|
char buffer[8192];
|
||||||
|
size_t bytes;
|
||||||
|
while ((bytes = fread(buffer, 1, sizeof(buffer), file)) > 0) {
|
||||||
|
XXH3_64bits_update(hash_state, buffer, bytes);
|
||||||
|
}
|
||||||
|
rewind(file);
|
||||||
|
uint64_t hash = XXH3_64bits_digest(hash_state);
|
||||||
|
XXH3_freeState(hash_state);
|
||||||
|
|
||||||
Translated translated = init_translator();
|
Translated translated = init_translator();
|
||||||
|
|
||||||
translate(&translated, &ast);
|
if (load_cache(&translated, cache_file_path, hash) != 0) {
|
||||||
|
free_translator(&translated);
|
||||||
|
translated = init_translator();
|
||||||
|
|
||||||
darray_free(&ast, free_parsed);
|
DArray tokens;
|
||||||
|
darray_init(&tokens, sizeof(Token));
|
||||||
|
|
||||||
file = fopen("out.arbin", "wb");
|
LexerState state = {absolute_path, file, 0, 0, &tokens};
|
||||||
|
start = clock();
|
||||||
|
ArErr err = lexer(state);
|
||||||
|
if (err.exists) {
|
||||||
|
free_translator(&translated);
|
||||||
|
darray_free(&tokens, free_token);
|
||||||
|
return (Execution){err, (Stack){NULL, NULL}};
|
||||||
|
}
|
||||||
|
end = clock();
|
||||||
|
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||||
|
total_time_spent += time_spent;
|
||||||
|
printf("Lexer time taken: %f seconds\n", time_spent);
|
||||||
|
fclose(state.file);
|
||||||
|
|
||||||
uint64_t regCount = (uint64_t)translated.registerCount;
|
DArray ast;
|
||||||
uint64_t constantsSize = (uint64_t)translated.constants.size;
|
|
||||||
uint64_t bytecodeSize = (uint64_t)translated.bytecode.size;
|
|
||||||
|
|
||||||
uint64_t version_number_htole64ed = htole64(version_number);
|
darray_init(&ast, sizeof(ParsedValue));
|
||||||
regCount = htole64(regCount);
|
|
||||||
regCount = htole64(regCount);
|
|
||||||
constantsSize = htole64(constantsSize);
|
|
||||||
bytecodeSize = htole64(bytecodeSize);
|
|
||||||
|
|
||||||
fwrite(&FILE_IDENTIFIER, sizeof(char), strlen(FILE_IDENTIFIER), file);
|
start = clock();
|
||||||
fwrite(&version_number_htole64ed, sizeof(uint64_t), 1, file);
|
err = parser(absolute_path, &ast, &tokens, false);
|
||||||
fwrite(®Count, sizeof(uint64_t), 1, file);
|
if (err.exists) {
|
||||||
fwrite(&constantsSize, sizeof(uint64_t), 1, file);
|
free_translator(&translated);
|
||||||
fwrite(&bytecodeSize, sizeof(uint64_t), 1, file);
|
darray_free(&tokens, free_token);
|
||||||
fwrite(translated.constants.data, 1, translated.constants.size, file);
|
darray_free(&ast, free_parsed);
|
||||||
fwrite(translated.bytecode.data, translated.bytecode.element_size,
|
return (Execution){err, (Stack){NULL, NULL}};
|
||||||
translated.bytecode.size, file);
|
}
|
||||||
|
end = clock();
|
||||||
|
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||||
|
total_time_spent += time_spent;
|
||||||
|
printf("Parser time taken: %f seconds\n", time_spent);
|
||||||
|
darray_free(&tokens, free_token);
|
||||||
|
|
||||||
fclose(file);
|
start = clock();
|
||||||
|
translate(&translated, &ast);
|
||||||
|
end = clock();
|
||||||
|
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||||
|
total_time_spent += time_spent;
|
||||||
|
printf("Translation time taken: %f seconds\n", time_spent);
|
||||||
|
|
||||||
generate_siphash_key();
|
darray_free(&ast, free_parsed);
|
||||||
|
ensure_dir_exists(cache_folder_path);
|
||||||
|
|
||||||
init_types();
|
file = fopen(cache_file_path, "wb");
|
||||||
|
|
||||||
runtime(translated);
|
uint64_t constantsSize = (uint64_t)translated.constants.size;
|
||||||
|
uint64_t bytecodeSize = (uint64_t)translated.bytecode.size;
|
||||||
|
|
||||||
|
uint32_t version_number_htole32ed = htole32(version_number);
|
||||||
|
uint64_t net_hash = htole64(hash);
|
||||||
|
constantsSize = htole64(constantsSize);
|
||||||
|
bytecodeSize = htole64(bytecodeSize);
|
||||||
|
|
||||||
|
fwrite(&FILE_IDENTIFIER, sizeof(char), strlen(FILE_IDENTIFIER), file);
|
||||||
|
fwrite(&version_number_htole32ed, sizeof(uint32_t), 1, file);
|
||||||
|
fwrite(&net_hash, sizeof(net_hash), 1, file);
|
||||||
|
fwrite(&translated.registerCount, sizeof(uint8_t), 1, file);
|
||||||
|
fwrite(&constantsSize, sizeof(uint64_t), 1, file);
|
||||||
|
fwrite(&bytecodeSize, sizeof(uint64_t), 1, file);
|
||||||
|
fwrite(translated.constants.data, 1, translated.constants.size, file);
|
||||||
|
fwrite(translated.bytecode.data, translated.bytecode.element_size,
|
||||||
|
translated.bytecode.size, file);
|
||||||
|
|
||||||
|
fclose(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
start = clock();
|
||||||
|
RuntimeState state = init_runtime_state(translated);
|
||||||
|
Stack main_scope = create_scope(NULL);
|
||||||
|
ArErr err = runtime(translated, state, main_scope);
|
||||||
|
free(state.registers);
|
||||||
|
end = clock();
|
||||||
|
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||||
|
total_time_spent += time_spent;
|
||||||
|
printf("Execution time taken: %f seconds\n", time_spent);
|
||||||
|
printf("total time taken: %f seconds\n", total_time_spent);
|
||||||
|
|
||||||
free_translator(&translated);
|
free_translator(&translated);
|
||||||
|
return (Execution){err, main_scope};
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
setlocale(LC_ALL, "");
|
||||||
|
ar_memory_init();
|
||||||
|
generate_siphash_key(siphash_key);
|
||||||
|
init_types();
|
||||||
|
char *CWD = get_current_directory();
|
||||||
|
if (argc <= 1)
|
||||||
|
return -1;
|
||||||
|
char *path_non_absolute = argv[1];
|
||||||
|
char path[FILENAME_MAX];
|
||||||
|
cwk_path_get_absolute(CWD, path_non_absolute, path, sizeof(path));
|
||||||
|
free(CWD);
|
||||||
|
Execution resp = execute(path);
|
||||||
|
if (resp.err.exists) {
|
||||||
|
output_err(resp.err);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
23
src/memory.c
23
src/memory.c
@@ -1,13 +1,9 @@
|
|||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include <gc.h>
|
|
||||||
#include <gc/gc.h>
|
#include <gc/gc.h>
|
||||||
#include <gmp.h>
|
#include <gmp.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h> // for malloc/free (temp arena fallback)
|
#include <stdlib.h> // for malloc/free (temp arena fallback)
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
// runtime
|
|
||||||
#include "runtime/objects/type/type.h"
|
|
||||||
|
|
||||||
void *checked_malloc(size_t size) {
|
void *checked_malloc(size_t size) {
|
||||||
void *ptr = malloc(size);
|
void *ptr = malloc(size);
|
||||||
@@ -19,15 +15,14 @@ void *checked_malloc(size_t size) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void *gmp_gc_realloc(void *ptr, size_t old_size, size_t new_size) {
|
void *gmp_gc_realloc(void *ptr, size_t old_size, size_t new_size) {
|
||||||
(void)old_size; // Ignore old_size, Boehm doesn't need it
|
(void)old_size; // Ignore old_size, Boehm doesn't need it
|
||||||
return GC_realloc(ptr, new_size);
|
return GC_realloc(ptr, new_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void gmp_gc_free(void *ptr, size_t size) {
|
void gmp_gc_free(void *ptr, size_t size) {
|
||||||
(void)size; // Boehm GC manages this itself
|
(void)size; // Boehm GC manages this itself
|
||||||
// No-op — memory will be collected automatically
|
// No-op — memory will be collected automatically
|
||||||
GC_FREE(ptr);
|
GC_FREE(ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ar_memory_init() {
|
void ar_memory_init() {
|
||||||
@@ -35,9 +30,13 @@ void ar_memory_init() {
|
|||||||
mp_set_memory_functions(GC_malloc, gmp_gc_realloc, gmp_gc_free);
|
mp_set_memory_functions(GC_malloc, gmp_gc_realloc, gmp_gc_free);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *ar_alloc(size_t size) { return GC_MALLOC(size); }
|
void *ar_alloc(size_t size) { return GC_MALLOC(size); }
|
||||||
|
|
||||||
|
void ar_finalizer(void *obj, GC_finalization_proc fn, void *client_data,
|
||||||
|
GC_finalization_proc *old_fn, void **old_client_data) {
|
||||||
|
return GC_register_finalizer_no_order(obj, fn, client_data, old_fn, old_client_data);
|
||||||
|
}
|
||||||
|
|
||||||
void *ar_alloc_atomic(size_t size) { return GC_MALLOC_ATOMIC(size); }
|
void *ar_alloc_atomic(size_t size) { return GC_MALLOC_ATOMIC(size); }
|
||||||
|
|
||||||
char *ar_strdup(const char *str) {
|
char *ar_strdup(const char *str) {
|
||||||
|
|||||||
@@ -2,8 +2,12 @@
|
|||||||
#define ARGON_MEMORY_H
|
#define ARGON_MEMORY_H
|
||||||
|
|
||||||
#include <stddef.h> // for size_t
|
#include <stddef.h> // for size_t
|
||||||
|
#include <gc/gc.h>
|
||||||
|
|
||||||
// GC-managed allocations
|
// GC-managed allocations
|
||||||
|
|
||||||
|
void ar_finalizer(void *obj, GC_finalization_proc fn, void *client_data,
|
||||||
|
GC_finalization_proc *old_fn, void **old_client_data);
|
||||||
void *ar_alloc(size_t size);
|
void *ar_alloc(size_t size);
|
||||||
void *ar_alloc_atomic(size_t size);
|
void *ar_alloc_atomic(size_t size);
|
||||||
char *ar_strdup(const char *str);
|
char *ar_strdup(const char *str);
|
||||||
|
|||||||
@@ -1,51 +1,72 @@
|
|||||||
#include "access.h"
|
#include "access.h"
|
||||||
#include "../../../lexer/token.h"
|
#include "../../../lexer/token.h"
|
||||||
#include "../../../memory.h"
|
#include "../../../memory.h"
|
||||||
#include "../../string/string.h"
|
|
||||||
#include "../../parser.h"
|
#include "../../parser.h"
|
||||||
|
#include "../../string/string.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
ParsedValue *parse_access(char *file, DArray *tokens, size_t *index,
|
ParsedValueReturn parse_access(char *file, DArray *tokens, size_t *index,
|
||||||
ParsedValue *to_access) {
|
ParsedValue *to_access) {
|
||||||
Token *first_token = darray_get(tokens, *index);
|
Token *first_token = darray_get(tokens, *index);
|
||||||
(*index)++;
|
(*index)++;
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
ParsedAccess *parsedAccess = checked_malloc(sizeof(ParsedAccess));
|
ParsedAccess *parsedAccess = checked_malloc(sizeof(ParsedAccess));
|
||||||
parsedAccess->to_access = *to_access;
|
parsedAccess->to_access = *to_access;
|
||||||
|
parsedValue->type = AST_ACCESS;
|
||||||
|
parsedValue->data = parsedAccess;
|
||||||
free(to_access);
|
free(to_access);
|
||||||
darray_init(&parsedAccess->access, sizeof(ParsedValue));
|
darray_init(&parsedAccess->access, sizeof(ParsedValue));
|
||||||
if (first_token->type == TOKEN_DOT) {
|
if (first_token->type == TOKEN_DOT) {
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
Token *token = darray_get(tokens, *index);
|
Token *token = darray_get(tokens, *index);
|
||||||
ParsedValue *parsedString = parse_string(token, false);
|
ParsedValueReturn parsedString = parse_string(token, false);
|
||||||
darray_push(&parsedAccess->access, parsedString);
|
if (parsedString.err.exists) {
|
||||||
free(parsedString);
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return parsedString;
|
||||||
|
}
|
||||||
|
darray_push(&parsedAccess->access, parsedString.value);
|
||||||
|
free(parsedString.value);
|
||||||
|
parsedAccess->access_fields = true;
|
||||||
} else {
|
} else {
|
||||||
|
parsedAccess->access_fields = false;
|
||||||
|
Token *token = first_token;
|
||||||
while (true) {
|
while (true) {
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
ParsedValue *parsedValue = parse_token(file, tokens, index, true);
|
ParsedValueReturn parsedAccessValue =
|
||||||
|
parse_token(file, tokens, index, true);
|
||||||
|
if (parsedAccessValue.err.exists) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return parsedAccessValue;
|
||||||
|
} else if (!parsedAccessValue.value) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "expected value"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
darray_push(&parsedAccess->access, parsedValue);
|
darray_push(&parsedAccess->access, parsedValue);
|
||||||
free(parsedValue);
|
free(parsedValue);
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
Token *token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
if (token->type == TOKEN_RBRACKET) {
|
if (token->type == TOKEN_RBRACKET) {
|
||||||
break;
|
break;
|
||||||
} else if (token->type != TOKEN_COLON) {
|
} else if (token->type != TOKEN_COLON) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: syntax error\n", file,
|
fprintf(stderr, "%s:%zu:%zu error: syntax error\n", file, token->line,
|
||||||
token->line, token->column);
|
token->column);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
(*index)++;
|
(*index)++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
parsedValue->type = AST_ACCESS;
|
|
||||||
parsedValue->data = parsedAccess;
|
|
||||||
(*index)++;
|
(*index)++;
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_parse_access(void *ptr) {
|
void free_parse_access(void *ptr) {
|
||||||
|
|||||||
@@ -5,11 +5,13 @@
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ParsedValue to_access;
|
ParsedValue to_access;
|
||||||
|
bool access_fields;
|
||||||
DArray access;
|
DArray access;
|
||||||
} ParsedAccess;
|
} ParsedAccess;
|
||||||
|
|
||||||
// Function declaration for parsing an identifier
|
// Function declaration for parsing an identifier
|
||||||
ParsedValue *parse_access(char*file,DArray *tokens, size_t * index, ParsedValue * to_access);
|
ParsedValueReturn parse_access(char *file, DArray *tokens, size_t *index,
|
||||||
|
ParsedValue *to_access);
|
||||||
|
|
||||||
void free_parse_access(void *ptr);
|
void free_parse_access(void *ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,8 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
ParsedValue *parse_assign(char *file, DArray *tokens, ParsedValue *assign_to,
|
ParsedValueReturn parse_assign(char *file, DArray *tokens,
|
||||||
size_t *index) {
|
ParsedValue *assign_to, size_t *index) {
|
||||||
Token *token = darray_get(tokens, *index);
|
Token *token = darray_get(tokens, *index);
|
||||||
switch (assign_to->type) {
|
switch (assign_to->type) {
|
||||||
case AST_IDENTIFIER:
|
case AST_IDENTIFIER:
|
||||||
@@ -18,36 +18,53 @@ ParsedValue *parse_assign(char *file, DArray *tokens, ParsedValue *assign_to,
|
|||||||
ParsedCall *call = assign_to->data;
|
ParsedCall *call = assign_to->data;
|
||||||
for (size_t i = 0; i < call->args.size; i++) {
|
for (size_t i = 0; i < call->args.size; i++) {
|
||||||
if (((ParsedValue *)darray_get(&call->args, i))->type != AST_IDENTIFIER) {
|
if (((ParsedValue *)darray_get(&call->args, i))->type != AST_IDENTIFIER) {
|
||||||
fprintf(stderr,
|
free_parsed(assign_to);
|
||||||
"%s:%zu:%zu error: parameter names need to start with a letter "
|
free(assign_to);
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(
|
||||||
|
token->line, token->column, token->length, file, "Syntax Error",
|
||||||
|
"parameter names need to start with a letter "
|
||||||
"or _, "
|
"or _, "
|
||||||
"only use letters, digits, or _, and can't be keywords.\n",
|
"only use letters, digits, or _, and can't be keywords."),
|
||||||
file, token->line, token->column);
|
NULL};
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:;
|
||||||
fprintf(stderr, "%s:%zu:%zu error: can't assign to %s\n", file, token->line,
|
ArErr err = create_err(token->line, token->column,
|
||||||
token->column, ValueTypeNames[assign_to->type]);
|
token->length, file, "Syntax Error",
|
||||||
exit(EXIT_FAILURE);
|
"can't assign to %s",
|
||||||
|
ValueTypeNames[assign_to->type]);
|
||||||
|
free_parsed(assign_to);
|
||||||
|
free(assign_to);
|
||||||
|
return (ParsedValueReturn){err,
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
ParsedAssign *assign = checked_malloc(sizeof(ParsedAssign));
|
ParsedAssign *assign = checked_malloc(sizeof(ParsedAssign));
|
||||||
assign->to = assign_to;
|
assign->to = assign_to;
|
||||||
assign->type = token->type;
|
assign->type = token->type;
|
||||||
(*index)++;
|
|
||||||
error_if_finished(file, tokens, index);
|
|
||||||
token = darray_get(tokens, *index);
|
|
||||||
assign->from = parse_token(file, tokens, index, true);
|
|
||||||
if (!assign->from) {
|
|
||||||
fprintf(stderr, "%s:%zu:%zu error: syntax error\n", file, token->line,
|
|
||||||
token->column);
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
parsedValue->type = AST_ASSIGN;
|
parsedValue->type = AST_ASSIGN;
|
||||||
parsedValue->data = assign;
|
parsedValue->data = assign;
|
||||||
return parsedValue;
|
(*index)++;
|
||||||
|
error_if_finished(file, tokens, index);
|
||||||
|
token = darray_get(tokens, *index);
|
||||||
|
ParsedValueReturn from = parse_token(file, tokens, index, true);
|
||||||
|
if (from.err.exists) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return from;
|
||||||
|
}
|
||||||
|
assign->from = from.value;
|
||||||
|
if (!assign->from) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||||
|
token->length, file, "Syntax Error",
|
||||||
|
"expected body"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_parse_assign(void *ptr) {
|
void free_parse_assign(void *ptr) {
|
||||||
@@ -55,7 +72,9 @@ void free_parse_assign(void *ptr) {
|
|||||||
ParsedAssign *parsedAssign = parsedValue->data;
|
ParsedAssign *parsedAssign = parsedValue->data;
|
||||||
free_parsed(parsedAssign->to);
|
free_parsed(parsedAssign->to);
|
||||||
free(parsedAssign->to);
|
free(parsedAssign->to);
|
||||||
free_parsed(parsedAssign->from);
|
if (parsedAssign->from) {
|
||||||
free(parsedAssign->from);
|
free_parsed(parsedAssign->from);
|
||||||
|
free(parsedAssign->from);
|
||||||
|
}
|
||||||
free(parsedAssign);
|
free(parsedAssign);
|
||||||
}
|
}
|
||||||
@@ -9,8 +9,8 @@ typedef struct {
|
|||||||
ParsedValue * from;
|
ParsedValue * from;
|
||||||
} ParsedAssign;
|
} ParsedAssign;
|
||||||
|
|
||||||
ParsedValue *parse_assign(char*file, DArray *tokens,
|
ParsedValueReturn parse_assign(char *file, DArray *tokens, ParsedValue *assign_to,
|
||||||
ParsedValue *assign_to, size_t *index);
|
size_t *index);
|
||||||
|
|
||||||
void free_parse_assign(void*ptr);
|
void free_parse_assign(void*ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
ParsedValue *parse_call(char *file, DArray *tokens, size_t *index,
|
ParsedValueReturn parse_call(char *file, DArray *tokens, size_t *index,
|
||||||
ParsedValue *to_call) {
|
ParsedValue *to_call) {
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
ParsedCall *call = checked_malloc(sizeof(ParsedCall));
|
ParsedCall *call = checked_malloc(sizeof(ParsedCall));
|
||||||
call->to_call = to_call;
|
call->to_call = to_call;
|
||||||
@@ -21,9 +21,26 @@ ParsedValue *parse_call(char *file, DArray *tokens, size_t *index,
|
|||||||
while ((*index) < tokens->size) {
|
while ((*index) < tokens->size) {
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
ParsedValue *parsedArg = parse_token(file, tokens, index, true);
|
ParsedValueReturn parsedArg = parse_token(file, tokens, index, true);
|
||||||
darray_push(&call->args, parsedArg);
|
if (parsedArg.err.exists) {
|
||||||
free(parsedArg);
|
free_parsed(to_call);
|
||||||
|
free(to_call);
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return parsedArg;
|
||||||
|
} else if (!parsedArg.value) {
|
||||||
|
free_parsed(to_call);
|
||||||
|
free(to_call);
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "expected argument"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
|
darray_push(&call->args, parsedArg.value);
|
||||||
|
free(parsedArg.value);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
@@ -40,7 +57,7 @@ ParsedValue *parse_call(char *file, DArray *tokens, size_t *index,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
(*index)++;
|
(*index)++;
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_parse_call(void *ptr) {
|
void free_parse_call(void *ptr) {
|
||||||
@@ -49,5 +66,6 @@ void free_parse_call(void *ptr) {
|
|||||||
|
|
||||||
darray_free(&parsedCall->args, free_parsed);
|
darray_free(&parsedCall->args, free_parsed);
|
||||||
free_parsed(parsedCall->to_call);
|
free_parsed(parsedCall->to_call);
|
||||||
|
free(parsedCall->to_call);
|
||||||
free(parsedCall);
|
free(parsedCall);
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,7 @@ typedef struct {
|
|||||||
} ParsedCall;
|
} ParsedCall;
|
||||||
|
|
||||||
// Function declaration for parsing an identifier
|
// Function declaration for parsing an identifier
|
||||||
ParsedValue *parse_call(char *file, DArray *tokens, size_t *index,
|
ParsedValueReturn parse_call(char *file, DArray *tokens, size_t *index,
|
||||||
ParsedValue *to_call);
|
ParsedValue *to_call);
|
||||||
void free_parse_call(void *ptr);
|
void free_parse_call(void *ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "../../../memory.h"
|
#include "../../../memory.h"
|
||||||
|
|
||||||
ParsedValue *parse_identifier(Token *token) {
|
ParsedValueReturn parse_identifier(Token *token) {
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
parsedValue->type = AST_IDENTIFIER;
|
parsedValue->type = AST_IDENTIFIER;
|
||||||
parsedValue->data = strcpy(checked_malloc(strlen(token->value) + 1), token->value);
|
parsedValue->data = strcpy(checked_malloc(strlen(token->value) + 1), token->value);
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,6 @@
|
|||||||
#include "../../../lexer/token.h" // for Token
|
#include "../../../lexer/token.h" // for Token
|
||||||
|
|
||||||
// Function declaration for parsing an identifier
|
// Function declaration for parsing an identifier
|
||||||
ParsedValue * parse_identifier(Token * token);
|
ParsedValueReturn parse_identifier(Token *token);
|
||||||
|
|
||||||
#endif // IDENTIFIER_H
|
#endif // IDENTIFIER_H
|
||||||
@@ -1,13 +1,16 @@
|
|||||||
#include "declaration.h"
|
#include "declaration.h"
|
||||||
|
#include "../../hash_data/hash_data.h"
|
||||||
|
#include "../../hashmap/hashmap.h"
|
||||||
#include "../../lexer/token.h"
|
#include "../../lexer/token.h"
|
||||||
#include "../../memory.h"
|
#include "../../memory.h"
|
||||||
|
#include "../function/function.h"
|
||||||
#include "../literals/literals.h"
|
#include "../literals/literals.h"
|
||||||
#include "../parser.h"
|
#include "../parser.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
|
ParsedValueReturn parse_declaration(char *file, DArray *tokens, size_t *index) {
|
||||||
(*index)++;
|
(*index)++;
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
Token *token = darray_get(tokens, *index);
|
Token *token = darray_get(tokens, *index);
|
||||||
@@ -22,31 +25,36 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
|
|||||||
darray_push(declarations, &_declaration);
|
darray_push(declarations, &_declaration);
|
||||||
ParsedSingleDeclaration *declaration =
|
ParsedSingleDeclaration *declaration =
|
||||||
darray_get(declarations, declarations->size - 1);
|
darray_get(declarations, declarations->size - 1);
|
||||||
declaration->is_function = false;
|
bool isFunction = false;
|
||||||
|
DArray parameters;
|
||||||
declaration->from = parse_null();
|
declaration->from = parse_null();
|
||||||
|
|
||||||
if (token->type != TOKEN_IDENTIFIER) {
|
if (token->type != TOKEN_IDENTIFIER) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: declaration requires an identifier\n",
|
free_parsed(parsedValue);
|
||||||
file, token->line, token->column);
|
free(parsedValue);
|
||||||
exit(EXIT_FAILURE);
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "declaration requires an identifier"),
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
declaration->name =
|
declaration->name =
|
||||||
strcpy(checked_malloc(strlen(token->value) + 1), token->value);
|
strcpy(checked_malloc(strlen(token->value) + 1), token->value);
|
||||||
|
|
||||||
(*index)++;
|
(*index)++;
|
||||||
if ((*index) >= tokens->size)
|
if ((*index) >= tokens->size)
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
if (token->type == TOKEN_LPAREN) {
|
if (token->type == TOKEN_LPAREN) {
|
||||||
declaration->is_function = true;
|
isFunction = true;
|
||||||
darray_init(&declaration->parameters, sizeof(char *));
|
struct hashmap *parameters_hashmap = createHashmap();
|
||||||
|
darray_init(¶meters, sizeof(char *));
|
||||||
(*index)++;
|
(*index)++;
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
if (token->type == TOKEN_RPAREN) {
|
if (token->type == TOKEN_RPAREN) {
|
||||||
(*index)++;
|
(*index)++;
|
||||||
if ((*index) >= tokens->size)
|
if ((*index) >= tokens->size)
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
} else {
|
} else {
|
||||||
while ((*index) < tokens->size) {
|
while ((*index) < tokens->size) {
|
||||||
@@ -54,16 +62,33 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
|
|||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
if (token->type != TOKEN_IDENTIFIER) {
|
if (token->type != TOKEN_IDENTIFIER) {
|
||||||
fprintf(stderr,
|
free_parsed(parsedValue);
|
||||||
"%s:%zu:%zu error: parameter names need to start with a "
|
free(parsedValue);
|
||||||
"letter or _, only use letters, digits, or _, and can't be "
|
return (ParsedValueReturn){
|
||||||
"keywords.\n",
|
create_err(
|
||||||
file, token->line, token->column);
|
token->line, token->column, token->length, file,
|
||||||
exit(EXIT_FAILURE);
|
"Syntax Error",
|
||||||
|
"parameter names need to start with a letter or _, only "
|
||||||
|
"use letters, digits, or _, and can't be keywords."),
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
char *parameter_name =
|
uint64_t hash =
|
||||||
strcpy(checked_malloc(strlen(token->value) + 1), token->value);
|
siphash64_bytes(token->value, token->length, siphash_key);
|
||||||
darray_push(&declaration->parameters, ¶meter_name);
|
if (hashmap_lookup(parameters_hashmap, hash) != NULL) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error",
|
||||||
|
"duplicate argument in function "
|
||||||
|
"definition"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
|
char *parameter_name = checked_malloc(token->length + 1);
|
||||||
|
strcpy(parameter_name, token->value);
|
||||||
|
hashmap_insert(parameters_hashmap, hash, parameter_name, (void *)1,
|
||||||
|
0);
|
||||||
|
darray_push(¶meters, ¶meter_name);
|
||||||
(*index)++;
|
(*index)++;
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
@@ -72,18 +97,22 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
|
|||||||
if (token->type == TOKEN_RPAREN) {
|
if (token->type == TOKEN_RPAREN) {
|
||||||
(*index)++;
|
(*index)++;
|
||||||
if ((*index) >= tokens->size)
|
if ((*index) >= tokens->size)
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
break;
|
break;
|
||||||
} else if (token->type != TOKEN_COMMA) {
|
} else if (token->type != TOKEN_COMMA) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: expected comma\n", file,
|
free_parsed(parsedValue);
|
||||||
token->line, token->column);
|
free(parsedValue);
|
||||||
exit(EXIT_FAILURE);
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "expected comma"),
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
(*index)++;
|
(*index)++;
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
hashmap_free(parameters_hashmap, NULL);
|
||||||
}
|
}
|
||||||
if (token->type == TOKEN_ASSIGN) {
|
if (token->type == TOKEN_ASSIGN) {
|
||||||
(*index)++;
|
(*index)++;
|
||||||
@@ -91,16 +120,30 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
|
|||||||
|
|
||||||
free(declaration->from);
|
free(declaration->from);
|
||||||
|
|
||||||
declaration->from = parse_token(file, tokens, index, true);
|
ParsedValueReturn from = parse_token(file, tokens, index, true);
|
||||||
if (!declaration->from) {
|
if (from.err.exists) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: syntax error\n", file, token->line,
|
free_parsed(parsedValue);
|
||||||
token->column);
|
free(parsedValue);
|
||||||
exit(EXIT_FAILURE);
|
return from;
|
||||||
|
}
|
||||||
|
declaration->from = from.value;
|
||||||
|
if (!declaration->from) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||||
|
token->length, file,
|
||||||
|
"Syntax Error", "expected body"),
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
if ((*index) >= tokens->size)
|
|
||||||
break;
|
|
||||||
token = darray_get(tokens, *index);
|
|
||||||
}
|
}
|
||||||
|
if (isFunction) {
|
||||||
|
declaration->from = create_parsed_function(declaration->name, parameters,
|
||||||
|
declaration->from);
|
||||||
|
}
|
||||||
|
if ((*index) >= tokens->size)
|
||||||
|
break;
|
||||||
|
token = darray_get(tokens, *index);
|
||||||
|
|
||||||
size_t count = skip_newlines_and_indents(tokens, index);
|
size_t count = skip_newlines_and_indents(tokens, index);
|
||||||
if ((*index) >= tokens->size)
|
if ((*index) >= tokens->size)
|
||||||
break;
|
break;
|
||||||
@@ -115,7 +158,7 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
|
|||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
}
|
}
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_string(void *ptr) {
|
void free_string(void *ptr) {
|
||||||
@@ -126,11 +169,12 @@ void free_string(void *ptr) {
|
|||||||
|
|
||||||
void free_single_declaration(void *ptr) {
|
void free_single_declaration(void *ptr) {
|
||||||
ParsedSingleDeclaration *declaration = ptr;
|
ParsedSingleDeclaration *declaration = ptr;
|
||||||
free(declaration->name);
|
if (declaration->name)
|
||||||
if (declaration->is_function)
|
free(declaration->name);
|
||||||
darray_free(&declaration->parameters, free_string);
|
if (declaration->from) {
|
||||||
free_parsed(declaration->from);
|
free_parsed(declaration->from);
|
||||||
free(declaration->from);
|
free(declaration->from);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_declaration(void *ptr) {
|
void free_declaration(void *ptr) {
|
||||||
|
|||||||
@@ -5,14 +5,11 @@
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char * name;
|
char * name;
|
||||||
bool is_function;
|
|
||||||
DArray parameters; // string[]
|
|
||||||
ParsedValue * from;
|
ParsedValue * from;
|
||||||
} ParsedSingleDeclaration;
|
} ParsedSingleDeclaration;
|
||||||
|
|
||||||
// Function declaration for parsing an identifier
|
// Function declaration for parsing an identifier
|
||||||
ParsedValue *parse_declaration(char *file, DArray *tokens,
|
ParsedValueReturn parse_declaration(char *file, DArray *tokens, size_t *index);
|
||||||
size_t *index);
|
|
||||||
|
|
||||||
void free_declaration(void *ptr);
|
void free_declaration(void *ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
ParsedValue *parse_dictionary(char *file, DArray *tokens, size_t *index) {
|
ParsedValueReturn parse_dictionary(char *file, DArray *tokens, size_t *index) {
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
parsedValue->type = AST_DICTIONARY;
|
parsedValue->type = AST_DICTIONARY;
|
||||||
DArray *dictionary = checked_malloc(sizeof(DArray));
|
DArray *dictionary = checked_malloc(sizeof(DArray));
|
||||||
@@ -23,17 +23,29 @@ ParsedValue *parse_dictionary(char *file, DArray *tokens, size_t *index) {
|
|||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
size_t keyIndex = *index;
|
size_t keyIndex = *index;
|
||||||
Token *keyToken = darray_get(tokens, *index);
|
Token *keyToken = darray_get(tokens, *index);
|
||||||
ParsedValue *key;
|
ParsedValueReturn key;
|
||||||
if (keyToken->type == TOKEN_IDENTIFIER) {
|
if (keyToken->type == TOKEN_IDENTIFIER) {
|
||||||
(*index)++;
|
(*index)++;
|
||||||
key = parse_string(keyToken, false);
|
key = parse_string(keyToken, false);
|
||||||
} else {
|
} else {
|
||||||
key = parse_token(file, tokens, index, true);
|
key = parse_token(file, tokens, index, true);
|
||||||
}
|
}
|
||||||
|
if (key.err.exists) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return key;
|
||||||
|
} else if (!key.value) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||||
|
token->length, file,
|
||||||
|
"Syntax Error", "expected key"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
ParsedValue *value;
|
ParsedValueReturn value;
|
||||||
bool tobreak = false;
|
bool tobreak = false;
|
||||||
switch (token->type) {
|
switch (token->type) {
|
||||||
case TOKEN_COLON:
|
case TOKEN_COLON:
|
||||||
@@ -41,6 +53,22 @@ ParsedValue *parse_dictionary(char *file, DArray *tokens, size_t *index) {
|
|||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
value = parse_token(file, tokens, index, true);
|
value = parse_token(file, tokens, index, true);
|
||||||
|
if (value.err.exists) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
free_parsed(key.value);
|
||||||
|
free(key.value);
|
||||||
|
return value;
|
||||||
|
} else if (!value.value) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
free_parsed(key.value);
|
||||||
|
free(key.value);
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "expected value"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
@@ -63,7 +91,7 @@ ParsedValue *parse_dictionary(char *file, DArray *tokens, size_t *index) {
|
|||||||
token->column);
|
token->column);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
ParsedDictionaryEntry entry = {key, value};
|
ParsedDictionaryEntry entry = {key.value, value.value};
|
||||||
darray_push(dictionary, &entry);
|
darray_push(dictionary, &entry);
|
||||||
if (tobreak) {
|
if (tobreak) {
|
||||||
break;
|
break;
|
||||||
@@ -73,7 +101,7 @@ ParsedValue *parse_dictionary(char *file, DArray *tokens, size_t *index) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
(*index)++;
|
(*index)++;
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_dictionary_entry(void *ptr) {
|
void free_dictionary_entry(void *ptr) {
|
||||||
@@ -88,5 +116,5 @@ void free_parsed_dictionary(void *ptr) {
|
|||||||
ParsedValue *parsedValue = ptr;
|
ParsedValue *parsedValue = ptr;
|
||||||
DArray *parsed_dictionary = parsedValue->data;
|
DArray *parsed_dictionary = parsedValue->data;
|
||||||
darray_free(parsed_dictionary, free_dictionary_entry);
|
darray_free(parsed_dictionary, free_dictionary_entry);
|
||||||
free(parsedValue->data);
|
free(parsed_dictionary);
|
||||||
}
|
}
|
||||||
@@ -8,8 +8,7 @@ typedef struct {
|
|||||||
ParsedValue * value;
|
ParsedValue * value;
|
||||||
} ParsedDictionaryEntry;
|
} ParsedDictionaryEntry;
|
||||||
|
|
||||||
ParsedValue *parse_dictionary(char *file, DArray *tokens,
|
ParsedValueReturn parse_dictionary(char *file, DArray *tokens, size_t *index);
|
||||||
size_t *index);
|
|
||||||
|
|
||||||
void free_parsed_dictionary(void *ptr);
|
void free_parsed_dictionary(void *ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ void free_string_dowrap(void *ptr) {
|
|||||||
free(str);
|
free(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
ParsedValue *parse_dowrap(char *file, DArray *tokens, size_t *index) {
|
ParsedValueReturn parse_dowrap(char *file, DArray *tokens, size_t *index) {
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
parsedValue->type = AST_DOWRAP;
|
parsedValue->type = AST_DOWRAP;
|
||||||
DArray *dowrap_parsed = checked_malloc(sizeof(DArray));
|
DArray *dowrap_parsed = checked_malloc(sizeof(DArray));
|
||||||
@@ -32,9 +32,13 @@ ParsedValue *parse_dowrap(char *file, DArray *tokens, size_t *index) {
|
|||||||
parsedValue->data = dowrap_parsed;
|
parsedValue->data = dowrap_parsed;
|
||||||
(*index)++;
|
(*index)++;
|
||||||
if ((*index) >= tokens->size)
|
if ((*index) >= tokens->size)
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
Token *token = darray_get(tokens, *index);
|
Token *token = darray_get(tokens, *index);
|
||||||
if (token->type != TOKEN_NEW_LINE) {
|
if (token->type != TOKEN_NEW_LINE) {
|
||||||
|
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||||
|
token->length, file, "Syntax Error",
|
||||||
|
"expected body"),
|
||||||
|
NULL};
|
||||||
fprintf(stderr, "%s:%zu:%zu error: syntax error\n", file, token->line,
|
fprintf(stderr, "%s:%zu:%zu error: syntax error\n", file, token->line,
|
||||||
token->column);
|
token->column);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
@@ -74,7 +78,7 @@ ParsedValue *parse_dowrap(char *file, DArray *tokens, size_t *index) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (temp_indent_depth > indent_depth) {
|
if (temp_indent_depth > indent_depth) {
|
||||||
size_t indent_amount = temp_indent_depth-indent_depth;
|
size_t indent_amount = temp_indent_depth - indent_depth;
|
||||||
Token indent_token;
|
Token indent_token;
|
||||||
indent_token.line = token->line;
|
indent_token.line = token->line;
|
||||||
indent_token.column = token->column;
|
indent_token.column = token->column;
|
||||||
@@ -85,21 +89,27 @@ ParsedValue *parse_dowrap(char *file, DArray *tokens, size_t *index) {
|
|||||||
}
|
}
|
||||||
temp_indent_depth_toggle = false;
|
temp_indent_depth_toggle = false;
|
||||||
temp_indent_depth = 0;
|
temp_indent_depth = 0;
|
||||||
temp_index_count=0;
|
temp_index_count = 0;
|
||||||
darray_push(&dowrap_tokens, token);
|
darray_push(&dowrap_tokens, token);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(*index)-=temp_index_count;
|
(*index) -= temp_index_count;
|
||||||
for (size_t i = 0; i<temp_index_count;i++) {
|
for (size_t i = 0; i < temp_index_count; i++) {
|
||||||
darray_pop(&dowrap_tokens, NULL);
|
darray_pop(&dowrap_tokens, NULL);
|
||||||
}
|
}
|
||||||
parser(file, dowrap_parsed, &dowrap_tokens, false);
|
ArErr err = parser(file, dowrap_parsed, &dowrap_tokens, false);
|
||||||
|
|
||||||
darray_free(&dowrap_tokens, NULL);
|
darray_free(&dowrap_tokens, NULL);
|
||||||
|
|
||||||
darray_free(&to_free, free_string_dowrap);
|
darray_free(&to_free, free_string_dowrap);
|
||||||
|
|
||||||
return parsedValue;
|
if (err.exists) {
|
||||||
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return (ParsedValueReturn){err, NULL};
|
||||||
|
}
|
||||||
|
|
||||||
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_dowrap(void *ptr) {
|
void free_dowrap(void *ptr) {
|
||||||
|
|||||||
@@ -4,8 +4,7 @@
|
|||||||
#include "../../lexer/token.h" // for Token
|
#include "../../lexer/token.h" // for Token
|
||||||
|
|
||||||
// Function declaration for parsing an identifier
|
// Function declaration for parsing an identifier
|
||||||
ParsedValue *parse_dowrap(char *file, DArray *tokens,
|
ParsedValueReturn parse_dowrap(char *file, DArray *tokens, size_t *index);
|
||||||
size_t *index);
|
|
||||||
|
|
||||||
void free_dowrap(void *ptr);
|
void free_dowrap(void *ptr);
|
||||||
|
|
||||||
|
|||||||
31
src/parser/function/function.c
Normal file
31
src/parser/function/function.c
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
#include "function.h"
|
||||||
|
#include "../../memory.h"
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
ParsedValue *create_parsed_function(char *name, DArray parameters,
|
||||||
|
ParsedValue *body) {
|
||||||
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
|
parsedValue->type=AST_FUNCTION;
|
||||||
|
ParsedFunction *parsedFunction = checked_malloc(sizeof(ParsedFunction));
|
||||||
|
parsedValue->data=parsedFunction;
|
||||||
|
parsedFunction->name=strcpy(checked_malloc(strlen(name) + 1), name);
|
||||||
|
parsedFunction->body = body;
|
||||||
|
parsedFunction->parameters=parameters;
|
||||||
|
return parsedValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
void free_parameter(void *ptr) {
|
||||||
|
char** data = ptr;
|
||||||
|
free(*data);
|
||||||
|
}
|
||||||
|
|
||||||
|
void free_function(void *ptr) {
|
||||||
|
ParsedValue *parsedValue = ptr;
|
||||||
|
ParsedFunction *parsed = parsedValue->data;
|
||||||
|
free_parsed(parsed->body);
|
||||||
|
free(parsed->body);
|
||||||
|
free(parsed->name);
|
||||||
|
darray_free(&parsed->parameters, free_parameter);
|
||||||
|
free(parsed);
|
||||||
|
}
|
||||||
17
src/parser/function/function.h
Normal file
17
src/parser/function/function.h
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
#ifndef FUNCTION_H
|
||||||
|
#define FUNCTION_H
|
||||||
|
#include "../../lexer/token.h" // for Token
|
||||||
|
#include "../parser.h"
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
char * name;
|
||||||
|
DArray parameters;
|
||||||
|
ParsedValue *body;
|
||||||
|
} ParsedFunction;
|
||||||
|
|
||||||
|
ParsedValue *create_parsed_function(char *name, DArray parameters,
|
||||||
|
ParsedValue *body);
|
||||||
|
|
||||||
|
void free_function(void *ptr);
|
||||||
|
|
||||||
|
#endif // FUNCTION_H
|
||||||
@@ -6,7 +6,17 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
ParsedValue *parse_if(char *file, DArray *tokens, size_t *index) {
|
void free_conditional(void *ptr) {
|
||||||
|
ParsedConditional *conditional = ptr;
|
||||||
|
if (conditional->condition) {
|
||||||
|
free_parsed(conditional->condition);
|
||||||
|
free(conditional->condition);
|
||||||
|
}
|
||||||
|
free_parsed(conditional->content);
|
||||||
|
free(conditional->content);
|
||||||
|
}
|
||||||
|
|
||||||
|
ParsedValueReturn parse_if(char *file, DArray *tokens, size_t *index) {
|
||||||
(*index)++;
|
(*index)++;
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
|
|
||||||
@@ -35,28 +45,50 @@ ParsedValue *parse_if(char *file, DArray *tokens, size_t *index) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ParsedValue *condition = NULL;
|
ParsedValueReturn condition = {no_err, NULL};
|
||||||
|
|
||||||
if (token->type != TOKEN_ELSE) {
|
if (token->type != TOKEN_ELSE) {
|
||||||
// Parse ( condition )
|
// Parse ( condition )
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
if (token->type != TOKEN_LPAREN) {
|
if (token->type != TOKEN_LPAREN) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: expected '(' after if\n", file,
|
darray_free(parsed_if, free_conditional);
|
||||||
token->line, token->column);
|
free(parsed_if);
|
||||||
exit(EXIT_FAILURE);
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "expected '(' after if"),
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
|
|
||||||
(*index)++;
|
(*index)++;
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
condition = parse_token(file, tokens, index, true);
|
condition = parse_token(file, tokens, index, true);
|
||||||
|
if (condition.err.exists) {
|
||||||
|
darray_free(parsed_if, free_conditional);
|
||||||
|
free(parsed_if);
|
||||||
|
return condition;
|
||||||
|
} else if (!condition.value) {
|
||||||
|
darray_free(parsed_if, free_conditional);
|
||||||
|
free(parsed_if);
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "expected condition"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
|
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
if (token->type != TOKEN_RPAREN) {
|
if (token->type != TOKEN_RPAREN) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: missing closing ')' in condition\n",
|
if (condition.value) {
|
||||||
file, token->line, token->column);
|
free_parsed(condition.value);
|
||||||
exit(EXIT_FAILURE);
|
free(condition.value);
|
||||||
|
}
|
||||||
|
darray_free(parsed_if, free_conditional);
|
||||||
|
free(parsed_if);
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "missing closing ')' in condition"),
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
|
|
||||||
(*index)++;
|
(*index)++;
|
||||||
@@ -64,15 +96,32 @@ ParsedValue *parse_if(char *file, DArray *tokens, size_t *index) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Parse the body
|
// Parse the body
|
||||||
ParsedValue *parsed_content = parse_token(file, tokens, index, false);
|
ParsedValueReturn parsed_content = parse_token(file, tokens, index, false);
|
||||||
|
|
||||||
if (!parsed_content) {
|
if (parsed_content.err.exists) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: expected body after condition\n", file,
|
if (condition.value) {
|
||||||
token->line, token->column);
|
free_parsed(condition.value);
|
||||||
exit(EXIT_FAILURE);
|
free(condition.value);
|
||||||
|
}
|
||||||
|
darray_free(parsed_if, free_conditional);
|
||||||
|
free(parsed_if);
|
||||||
|
return parsed_content;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParsedConditional conditional = {condition, parsed_content};
|
if (!parsed_content.value) {
|
||||||
|
if (condition.value) {
|
||||||
|
free_parsed(condition.value);
|
||||||
|
free(condition.value);
|
||||||
|
}
|
||||||
|
darray_free(parsed_if, free_conditional);
|
||||||
|
free(parsed_if);
|
||||||
|
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||||
|
token->length, file, "Syntax Error",
|
||||||
|
"expected body"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
|
|
||||||
|
ParsedConditional conditional = {condition.value, parsed_content.value};
|
||||||
darray_push(parsed_if, &conditional);
|
darray_push(parsed_if, &conditional);
|
||||||
|
|
||||||
expect_conditional =
|
expect_conditional =
|
||||||
@@ -98,22 +147,12 @@ ParsedValue *parse_if(char *file, DArray *tokens, size_t *index) {
|
|||||||
// printf(" - content value type: %d\n", cond->content->type);
|
// printf(" - content value type: %d\n", cond->content->type);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
|
||||||
|
|
||||||
void free_conditional(void *ptr) {
|
|
||||||
ParsedConditional *conditional = ptr;
|
|
||||||
if (conditional->condition) {
|
|
||||||
free_parsed(conditional->condition);
|
|
||||||
free(conditional->condition);
|
|
||||||
}
|
|
||||||
free_parsed(conditional->content);
|
|
||||||
free(conditional->content);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_parsed_if(void *ptr) {
|
void free_parsed_if(void *ptr) {
|
||||||
ParsedValue *parsedValue = ptr;
|
ParsedValue *parsedValue = ptr;
|
||||||
DArray *parsed_if = parsedValue->data;
|
DArray *parsed_if = parsedValue->data;
|
||||||
darray_free(parsed_if, free_conditional);
|
darray_free(parsed_if, free_conditional);
|
||||||
free(parsedValue->data);
|
free(parsed_if);
|
||||||
}
|
}
|
||||||
@@ -8,8 +8,7 @@ typedef struct {
|
|||||||
ParsedValue *content;
|
ParsedValue *content;
|
||||||
} ParsedConditional;
|
} ParsedConditional;
|
||||||
|
|
||||||
ParsedValue *parse_if(char *file, DArray *tokens,
|
ParsedValueReturn parse_if(char *file, DArray *tokens, size_t *index);
|
||||||
size_t *index);
|
|
||||||
|
|
||||||
void free_parsed_if(void *ptr);
|
void free_parsed_if(void *ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
ParsedValue *parse_list(char *file, DArray *tokens, size_t *index) {
|
ParsedValueReturn parse_list(char *file, DArray *tokens, size_t *index) {
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
parsedValue->type = AST_LIST;
|
parsedValue->type = AST_LIST;
|
||||||
DArray *list = checked_malloc(sizeof(DArray));
|
DArray *list = checked_malloc(sizeof(DArray));
|
||||||
@@ -19,9 +19,14 @@ ParsedValue *parse_list(char *file, DArray *tokens, size_t *index) {
|
|||||||
if (token->type != TOKEN_RBRACKET) {
|
if (token->type != TOKEN_RBRACKET) {
|
||||||
while (true) {
|
while (true) {
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
ParsedValue *parsedValue = parse_token(file, tokens, index, true);
|
ParsedValueReturn parsedItem = parse_token(file, tokens, index, true);
|
||||||
darray_push(list, parsedValue);
|
if (parsedItem.err.exists) {
|
||||||
free(parsedValue);
|
free_parsed(parsedValue);
|
||||||
|
free(parsedValue);
|
||||||
|
return parsedItem;
|
||||||
|
}
|
||||||
|
darray_push(list, parsedItem.value);
|
||||||
|
free(parsedItem.value);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
skip_newlines_and_indents(tokens, index);
|
skip_newlines_and_indents(tokens, index);
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
@@ -38,12 +43,12 @@ ParsedValue *parse_list(char *file, DArray *tokens, size_t *index) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
(*index)++;
|
(*index)++;
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_parsed_list(void *ptr) {
|
void free_parsed_list(void *ptr) {
|
||||||
ParsedValue *parsedValue = ptr;
|
ParsedValue *parsedValue = ptr;
|
||||||
DArray *parsed_list = parsedValue->data;
|
DArray *parsed_list = parsedValue->data;
|
||||||
darray_free(parsed_list, free_parsed);
|
darray_free(parsed_list, free_parsed);
|
||||||
free(parsedValue->data);
|
free(parsed_list);
|
||||||
}
|
}
|
||||||
@@ -3,8 +3,7 @@
|
|||||||
#include "../../lexer/token.h" // for Token
|
#include "../../lexer/token.h" // for Token
|
||||||
#include "../parser.h"
|
#include "../parser.h"
|
||||||
|
|
||||||
ParsedValue *parse_list(char *file, DArray *tokens,
|
ParsedValueReturn parse_list(char *file, DArray *tokens, size_t *index);
|
||||||
size_t *index);
|
|
||||||
|
|
||||||
void free_parsed_list(void *ptr);
|
void free_parsed_list(void *ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -150,9 +150,9 @@
|
|||||||
// return 0;
|
// return 0;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
ParsedValue *parse_number(Token *token) {
|
ParsedValueReturn parse_number(Token *token) {
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
parsedValue->type = AST_NUMBER;
|
parsedValue->type = AST_NUMBER;
|
||||||
parsedValue->data = strdup(token->value);
|
parsedValue->data = strdup(token->value);
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err, parsedValue};
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,6 @@
|
|||||||
#include "../../lexer/token.h" // for Token
|
#include "../../lexer/token.h" // for Token
|
||||||
|
|
||||||
// Function declaration for parsing an identifier
|
// Function declaration for parsing an identifier
|
||||||
ParsedValue * parse_number(Token * token);
|
ParsedValueReturn parse_number(Token *token);
|
||||||
|
|
||||||
#endif // NUMBER_H
|
#endif // NUMBER_H
|
||||||
@@ -6,9 +6,9 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
ParsedValue *convert_to_operation(DArray *to_operate_on, DArray *operations) {
|
ParsedValue convert_to_operation(DArray *to_operate_on, DArray *operations) {
|
||||||
if (to_operate_on->size == 1) {
|
if (to_operate_on->size == 1) {
|
||||||
return darray_get(to_operate_on, 0);
|
return *((ParsedValue *)darray_get(to_operate_on, 0));
|
||||||
}
|
}
|
||||||
TokenType operation = 0;
|
TokenType operation = 0;
|
||||||
DArray positions;
|
DArray positions;
|
||||||
@@ -23,10 +23,10 @@ ParsedValue *convert_to_operation(DArray *to_operate_on, DArray *operations) {
|
|||||||
}
|
}
|
||||||
darray_push(&positions, &i);
|
darray_push(&positions, &i);
|
||||||
}
|
}
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue parsedValue;
|
||||||
parsedValue->type = AST_OPERATION;
|
parsedValue.type = AST_OPERATION;
|
||||||
ParsedOperation *operationStruct = checked_malloc(sizeof(ParsedOperation));
|
ParsedOperation *operationStruct = checked_malloc(sizeof(ParsedOperation));
|
||||||
parsedValue->data = operationStruct;
|
parsedValue.data = operationStruct;
|
||||||
operationStruct->operation = operation;
|
operationStruct->operation = operation;
|
||||||
darray_init(&operationStruct->to_operate_on, sizeof(ParsedValue));
|
darray_init(&operationStruct->to_operate_on, sizeof(ParsedValue));
|
||||||
size_t last_position = 0;
|
size_t last_position = 0;
|
||||||
@@ -37,21 +37,24 @@ ParsedValue *convert_to_operation(DArray *to_operate_on, DArray *operations) {
|
|||||||
to_operate_on, to_operate_on_last_position, (*position) + 1);
|
to_operate_on, to_operate_on_last_position, (*position) + 1);
|
||||||
DArray operations_slice =
|
DArray operations_slice =
|
||||||
darray_slice(operations, last_position, *position);
|
darray_slice(operations, last_position, *position);
|
||||||
darray_push(&operationStruct->to_operate_on,
|
ParsedValue result =
|
||||||
convert_to_operation(&to_operate_on_slice, &operations_slice));
|
convert_to_operation(&to_operate_on_slice, &operations_slice);
|
||||||
|
darray_push(&operationStruct->to_operate_on, &result);
|
||||||
last_position = (*position);
|
last_position = (*position);
|
||||||
to_operate_on_last_position = (*position) + 1;
|
to_operate_on_last_position = (*position) + 1;
|
||||||
}
|
}
|
||||||
DArray to_operate_on_slice =
|
DArray to_operate_on_slice = darray_slice(
|
||||||
darray_slice(to_operate_on, to_operate_on_last_position, to_operate_on->size);
|
to_operate_on, to_operate_on_last_position, to_operate_on->size);
|
||||||
DArray operations_slice = darray_slice(operations, last_position, operations->size);
|
DArray operations_slice =
|
||||||
darray_push(&operationStruct->to_operate_on,
|
darray_slice(operations, last_position, operations->size);
|
||||||
convert_to_operation(&to_operate_on_slice, &operations_slice));
|
ParsedValue result =
|
||||||
|
convert_to_operation(&to_operate_on_slice, &operations_slice);
|
||||||
|
darray_push(&operationStruct->to_operate_on, &result);
|
||||||
darray_free(&positions, NULL);
|
darray_free(&positions, NULL);
|
||||||
return parsedValue;
|
return parsedValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParsedValue *parse_operations(char *file, DArray *tokens, size_t *index,
|
ParsedValueReturn parse_operations(char *file, DArray *tokens, size_t *index,
|
||||||
ParsedValue *first_parsed_value) {
|
ParsedValue *first_parsed_value) {
|
||||||
DArray to_operate_on;
|
DArray to_operate_on;
|
||||||
darray_init(&to_operate_on, sizeof(ParsedValue));
|
darray_init(&to_operate_on, sizeof(ParsedValue));
|
||||||
@@ -75,15 +78,29 @@ ParsedValue *parse_operations(char *file, DArray *tokens, size_t *index,
|
|||||||
darray_push(&operations, &token->type);
|
darray_push(&operations, &token->type);
|
||||||
(*index)++;
|
(*index)++;
|
||||||
error_if_finished(file, tokens, index);
|
error_if_finished(file, tokens, index);
|
||||||
ParsedValue *parsedValue =
|
ParsedValueReturn parsedValue =
|
||||||
parse_token_full(file, tokens, index, true, false);
|
parse_token_full(file, tokens, index, true, false);
|
||||||
darray_push(&to_operate_on, parsedValue);
|
if (parsedValue.err.exists) {
|
||||||
free(parsedValue);
|
darray_free(&to_operate_on, free_parsed);
|
||||||
|
darray_free(&operations, NULL);
|
||||||
|
return parsedValue;
|
||||||
|
} else if (!parsedValue.value) {
|
||||||
|
darray_free(&to_operate_on, free_parsed);
|
||||||
|
darray_free(&operations, NULL);
|
||||||
|
return (ParsedValueReturn){
|
||||||
|
create_err(token->line, token->column, token->length, file,
|
||||||
|
"Syntax Error", "expected value"),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
|
darray_push(&to_operate_on, parsedValue.value);
|
||||||
|
free(parsedValue.value);
|
||||||
}
|
}
|
||||||
ParsedValue *output = convert_to_operation(&to_operate_on, &operations);
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
|
ParsedValue output = convert_to_operation(&to_operate_on, &operations);
|
||||||
|
memcpy(parsedValue, &output, sizeof(ParsedValue));
|
||||||
darray_free(&to_operate_on, NULL);
|
darray_free(&to_operate_on, NULL);
|
||||||
darray_free(&operations, NULL);
|
darray_free(&operations, NULL);
|
||||||
return output;
|
return (ParsedValueReturn){no_err,parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_operation(void *ptr) {
|
void free_operation(void *ptr) {
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ typedef struct {
|
|||||||
DArray to_operate_on; // ParsedValue[]
|
DArray to_operate_on; // ParsedValue[]
|
||||||
} ParsedOperation;
|
} ParsedOperation;
|
||||||
|
|
||||||
ParsedValue *parse_operations(char*file,DArray *tokens, size_t * index, ParsedValue * first_parsed_value);
|
ParsedValueReturn parse_operations(char *file, DArray *tokens, size_t *index,
|
||||||
|
ParsedValue *first_parsed_value);
|
||||||
|
|
||||||
void free_operation(void *ptr);
|
void free_operation(void *ptr);
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include "declaration/declaration.h"
|
#include "declaration/declaration.h"
|
||||||
#include "dictionary/dictionary.h"
|
#include "dictionary/dictionary.h"
|
||||||
#include "dowrap/dowrap.h"
|
#include "dowrap/dowrap.h"
|
||||||
|
#include "function/function.h"
|
||||||
#include "if/if.h"
|
#include "if/if.h"
|
||||||
#include "list/list.h"
|
#include "list/list.h"
|
||||||
#include "literals/literals.h"
|
#include "literals/literals.h"
|
||||||
@@ -22,9 +23,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
const char *ValueTypeNames[] = {
|
const char *ValueTypeNames[] = {
|
||||||
"string", "assign", "identifier", "number", "if statement",
|
"string", "assign", "identifier", "number", "if statement",
|
||||||
"access", "call", "declaration", "null", "boolean",
|
"access", "call", "declaration", "null", "boolean",
|
||||||
"do wrap", "operations", "list", "dictionary"};
|
"do wrap", "operations", "list", "dictionary", "function"};
|
||||||
|
|
||||||
void error_if_finished(char *file, DArray *tokens, size_t *index) {
|
void error_if_finished(char *file, DArray *tokens, size_t *index) {
|
||||||
if ((*index) >= tokens->size) {
|
if ((*index) >= tokens->size) {
|
||||||
@@ -53,11 +54,11 @@ size_t skip_newlines_and_indents(DArray *tokens, size_t *index) {
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
|
ParsedValueReturn parse_token_full(char *file, DArray *tokens, size_t *index,
|
||||||
bool inline_flag, bool process_operations) {
|
bool inline_flag, bool process_operations) {
|
||||||
Token *token = darray_get(tokens, *index);
|
Token *token = darray_get(tokens, *index);
|
||||||
|
|
||||||
ParsedValue *output = NULL;
|
ParsedValueReturn output;
|
||||||
|
|
||||||
if (!inline_flag) {
|
if (!inline_flag) {
|
||||||
switch (token->type) {
|
switch (token->type) {
|
||||||
@@ -70,15 +71,15 @@ ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
|
|||||||
switch (token->type) {
|
switch (token->type) {
|
||||||
case TOKEN_TRUE:
|
case TOKEN_TRUE:
|
||||||
(*index)++;
|
(*index)++;
|
||||||
output = parse_true();
|
output = (ParsedValueReturn){no_err, parse_true()};
|
||||||
break;
|
break;
|
||||||
case TOKEN_FALSE:
|
case TOKEN_FALSE:
|
||||||
(*index)++;
|
(*index)++;
|
||||||
output = parse_false();
|
output = (ParsedValueReturn){no_err, parse_false()};
|
||||||
break;
|
break;
|
||||||
case TOKEN_NULL:
|
case TOKEN_NULL:
|
||||||
(*index)++;
|
(*index)++;
|
||||||
output = parse_null();
|
output = (ParsedValueReturn){no_err, parse_null()};
|
||||||
break;
|
break;
|
||||||
case TOKEN_STRING:
|
case TOKEN_STRING:
|
||||||
(*index)++;
|
(*index)++;
|
||||||
@@ -86,18 +87,20 @@ ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
|
|||||||
break;
|
break;
|
||||||
case TOKEN_NEW_LINE:
|
case TOKEN_NEW_LINE:
|
||||||
(*index)++;
|
(*index)++;
|
||||||
return NULL;
|
return (ParsedValueReturn){no_err, NULL};
|
||||||
case TOKEN_INDENT:
|
case TOKEN_INDENT:;
|
||||||
|
Token *token_indent = token;
|
||||||
if (strlen(token->value) > 0 && (*index + 1) < tokens->size) {
|
if (strlen(token->value) > 0 && (*index + 1) < tokens->size) {
|
||||||
token = darray_get(tokens, (*index) + 1);
|
token = darray_get(tokens, (*index) + 1);
|
||||||
if (token->type != TOKEN_NEW_LINE) {
|
if (token->type != TOKEN_NEW_LINE) {
|
||||||
fprintf(stderr, "%s:%zu:%zu error: invalid indentation\n", file,
|
return (ParsedValueReturn){
|
||||||
token->line, token->column);
|
create_err(token_indent->line, token_indent->column, token_indent->length, file,
|
||||||
exit(EXIT_FAILURE);
|
"Syntax Error", "unexpected indent"),
|
||||||
|
NULL};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(*index)++;
|
(*index)++;
|
||||||
return NULL;
|
return (ParsedValueReturn){no_err, NULL};
|
||||||
case TOKEN_IDENTIFIER:
|
case TOKEN_IDENTIFIER:
|
||||||
(*index)++;
|
(*index)++;
|
||||||
output = parse_identifier(token);
|
output = parse_identifier(token);
|
||||||
@@ -127,6 +130,9 @@ ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
|
|||||||
// LHS required
|
// LHS required
|
||||||
bool passed = false;
|
bool passed = false;
|
||||||
while (!passed && (*index) < tokens->size) {
|
while (!passed && (*index) < tokens->size) {
|
||||||
|
if (output.err.exists) {
|
||||||
|
return output;
|
||||||
|
}
|
||||||
token = darray_get(tokens, *index);
|
token = darray_get(tokens, *index);
|
||||||
switch (token->type) {
|
switch (token->type) {
|
||||||
case TOKEN_ASSIGN:
|
case TOKEN_ASSIGN:
|
||||||
@@ -137,18 +143,18 @@ ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
|
|||||||
case TOKEN_ASSIGN_PLUS:
|
case TOKEN_ASSIGN_PLUS:
|
||||||
case TOKEN_ASSIGN_SLASH:
|
case TOKEN_ASSIGN_SLASH:
|
||||||
case TOKEN_ASSIGN_STAR:
|
case TOKEN_ASSIGN_STAR:
|
||||||
output = parse_assign(file, tokens, output, index);
|
output = parse_assign(file, tokens, output.value, index);
|
||||||
break;
|
break;
|
||||||
case TOKEN_LPAREN:
|
case TOKEN_LPAREN:
|
||||||
output = parse_call(file, tokens, index, output);
|
output = parse_call(file, tokens, index, output.value);
|
||||||
break;
|
break;
|
||||||
case TOKEN_DOT:
|
case TOKEN_DOT:
|
||||||
case TOKEN_LBRACKET:
|
case TOKEN_LBRACKET:
|
||||||
output = parse_access(file, tokens, index, output);
|
output = parse_access(file, tokens, index, output.value);
|
||||||
break;
|
break;
|
||||||
SWITCH_OPERATIONS
|
SWITCH_OPERATIONS
|
||||||
if (process_operations) {
|
if (process_operations) {
|
||||||
output = parse_operations(file, tokens, index, output);
|
output = parse_operations(file, tokens, index, output.value);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* fall through */
|
/* fall through */
|
||||||
@@ -160,18 +166,21 @@ ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
|
|||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParsedValue *parse_token(char *file, DArray *tokens, size_t *index,
|
ParsedValueReturn parse_token(char *file, DArray *tokens, size_t *index,
|
||||||
bool inline_flag) {
|
bool inline_flag) {
|
||||||
return parse_token_full(file, tokens, index, inline_flag, true);
|
return parse_token_full(file, tokens, index, inline_flag, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void parser(char *file, DArray *parsed, DArray *tokens, bool inline_flag) {
|
ArErr parser(char *file, DArray *parsed, DArray *tokens, bool inline_flag) {
|
||||||
size_t index = 0;
|
size_t index = 0;
|
||||||
bool expecting_new_line = false;
|
bool expecting_new_line = false;
|
||||||
while (index < tokens->size) {
|
while (index < tokens->size) {
|
||||||
size_t old_index = index;
|
size_t old_index = index;
|
||||||
ParsedValue *parsed_code = parse_token(file, tokens, &index, inline_flag);
|
ParsedValueReturn parsed_code =
|
||||||
if (parsed_code) {
|
parse_token(file, tokens, &index, inline_flag);
|
||||||
|
if (parsed_code.err.exists) {
|
||||||
|
return parsed_code.err;
|
||||||
|
} else if (parsed_code.value) {
|
||||||
if (expecting_new_line) {
|
if (expecting_new_line) {
|
||||||
Token *token = darray_get(tokens, old_index);
|
Token *token = darray_get(tokens, old_index);
|
||||||
fprintf(stderr, "%s:%zu:%zu error: expected a new line\n", file,
|
fprintf(stderr, "%s:%zu:%zu error: expected a new line\n", file,
|
||||||
@@ -179,8 +188,8 @@ void parser(char *file, DArray *parsed, DArray *tokens, bool inline_flag) {
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
expecting_new_line = true;
|
expecting_new_line = true;
|
||||||
darray_push(parsed, parsed_code);
|
darray_push(parsed, parsed_code.value);
|
||||||
free(parsed_code);
|
free(parsed_code.value);
|
||||||
} else {
|
} else {
|
||||||
expecting_new_line = false;
|
expecting_new_line = false;
|
||||||
}
|
}
|
||||||
@@ -232,5 +241,7 @@ void free_parsed(void *ptr) {
|
|||||||
case AST_DICTIONARY:
|
case AST_DICTIONARY:
|
||||||
free_parsed_dictionary(parsed);
|
free_parsed_dictionary(parsed);
|
||||||
break;
|
break;
|
||||||
|
case AST_FUNCTION:
|
||||||
|
free_function(parsed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,26 +2,28 @@
|
|||||||
#define PARSER_H
|
#define PARSER_H
|
||||||
|
|
||||||
#include "../dynamic_array/darray.h"
|
#include "../dynamic_array/darray.h"
|
||||||
|
#include "../err.h"
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#define SWITCH_OPERATIONS case TOKEN_AND:\
|
#define SWITCH_OPERATIONS \
|
||||||
case TOKEN_OR:\
|
case TOKEN_AND: \
|
||||||
case TOKEN_NOT_IN:\
|
case TOKEN_OR: \
|
||||||
case TOKEN_IN:\
|
case TOKEN_NOT_IN: \
|
||||||
case TOKEN_LE:\
|
case TOKEN_IN: \
|
||||||
case TOKEN_GE:\
|
case TOKEN_LE: \
|
||||||
case TOKEN_LT:\
|
case TOKEN_GE: \
|
||||||
case TOKEN_GT:\
|
case TOKEN_LT: \
|
||||||
case TOKEN_NE:\
|
case TOKEN_GT: \
|
||||||
case TOKEN_EQ:\
|
case TOKEN_NE: \
|
||||||
case TOKEN_PLUS:\
|
case TOKEN_EQ: \
|
||||||
case TOKEN_MINUS:\
|
case TOKEN_PLUS: \
|
||||||
case TOKEN_MODULO:\
|
case TOKEN_MINUS: \
|
||||||
case TOKEN_STAR:\
|
case TOKEN_MODULO: \
|
||||||
case TOKEN_FLOORDIV:\
|
case TOKEN_STAR: \
|
||||||
case TOKEN_SLASH:\
|
case TOKEN_FLOORDIV: \
|
||||||
case TOKEN_CARET:
|
case TOKEN_SLASH: \
|
||||||
|
case TOKEN_CARET:
|
||||||
|
|
||||||
typedef struct LinkedList LinkedList;
|
typedef struct LinkedList LinkedList;
|
||||||
|
|
||||||
@@ -39,27 +41,33 @@ typedef enum {
|
|||||||
AST_DOWRAP,
|
AST_DOWRAP,
|
||||||
AST_OPERATION,
|
AST_OPERATION,
|
||||||
AST_LIST,
|
AST_LIST,
|
||||||
AST_DICTIONARY
|
AST_DICTIONARY,
|
||||||
|
AST_FUNCTION
|
||||||
} ValueType;
|
} ValueType;
|
||||||
|
|
||||||
extern const char* ValueTypeNames[];
|
extern const char *ValueTypeNames[];
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ValueType type;
|
ValueType type;
|
||||||
void *data;
|
void *data;
|
||||||
} ParsedValue;
|
} ParsedValue;
|
||||||
|
|
||||||
void parser(char *file, DArray *parsed, DArray *tokens, bool inline_flag);
|
typedef struct {
|
||||||
|
ArErr err;
|
||||||
|
ParsedValue *value;
|
||||||
|
} ParsedValueReturn;
|
||||||
|
|
||||||
ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
|
ArErr parser(char *file, DArray *parsed, DArray *tokens, bool inline_flag);
|
||||||
bool inline_flag, bool process_operations);
|
|
||||||
|
|
||||||
ParsedValue *parse_token(char *file, DArray *tokens, size_t *index,
|
ParsedValueReturn parse_token_full(char *file, DArray *tokens, size_t *index,
|
||||||
|
bool inline_flag, bool process_operations);
|
||||||
|
|
||||||
|
ParsedValueReturn parse_token(char *file, DArray *tokens, size_t *index,
|
||||||
bool inline_flag);
|
bool inline_flag);
|
||||||
|
|
||||||
void free_parsed(void *ptr);
|
void free_parsed(void *ptr);
|
||||||
|
|
||||||
void error_if_finished(char *file,DArray *tokens, size_t *index);
|
void error_if_finished(char *file, DArray *tokens, size_t *index);
|
||||||
|
|
||||||
size_t skip_newlines_and_indents(DArray *tokens, size_t *index);
|
size_t skip_newlines_and_indents(DArray *tokens, size_t *index);
|
||||||
|
|
||||||
|
|||||||
@@ -245,7 +245,7 @@ char *unquote(char *str, size_t *decoded_len) {
|
|||||||
return unescaped;
|
return unescaped;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParsedValue *parse_string(Token* token, bool to_unquote) {
|
ParsedValueReturn parse_string(Token* token, bool to_unquote) {
|
||||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||||
parsedValue->type = AST_STRING;
|
parsedValue->type = AST_STRING;
|
||||||
ParsedString *parsedString = checked_malloc(sizeof(ParsedString));
|
ParsedString *parsedString = checked_malloc(sizeof(ParsedString));
|
||||||
@@ -253,11 +253,19 @@ ParsedValue *parse_string(Token* token, bool to_unquote) {
|
|||||||
if (to_unquote) {
|
if (to_unquote) {
|
||||||
parsedString->length = 0;
|
parsedString->length = 0;
|
||||||
parsedString->string = unquote(token->value, &parsedString->length);
|
parsedString->string = unquote(token->value, &parsedString->length);
|
||||||
|
if (!parsedString->string) {
|
||||||
|
free(parsedValue);
|
||||||
|
free(parsedString);
|
||||||
|
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||||
|
token->length, NULL, "String Error",
|
||||||
|
"failed to unquote string %s", token->value),
|
||||||
|
NULL};
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
parsedString->string = strdup(token->value);
|
parsedString->string = strdup(token->value);
|
||||||
parsedString->length = token->length;
|
parsedString->length = token->length;
|
||||||
}
|
}
|
||||||
return parsedValue;
|
return (ParsedValueReturn){no_err,parsedValue};
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_parsed_string(void *ptr) {
|
void free_parsed_string(void *ptr) {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ char *swap_quotes(char *input, char quote);
|
|||||||
|
|
||||||
char *unquote(char *str, size_t *decoded_len);
|
char *unquote(char *str, size_t *decoded_len);
|
||||||
|
|
||||||
ParsedValue *parse_string(Token* token, bool to_unquote);
|
ParsedValueReturn parse_string(Token* token, bool to_unquote);
|
||||||
|
|
||||||
void free_parsed_string(void *ptr);
|
void free_parsed_string(void *ptr);
|
||||||
|
|
||||||
|
|||||||
22
src/returnTypes.h
Normal file
22
src/returnTypes.h
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
#ifndef RETURN_TYPES_H
|
||||||
|
#define RETURN_TYPES_H
|
||||||
|
#include <stdint.h>
|
||||||
|
#include "arobject.h"
|
||||||
|
|
||||||
|
#define ERR_MSG_MAX_LEN 256
|
||||||
|
|
||||||
|
typedef struct ArErr {
|
||||||
|
bool exists;
|
||||||
|
char *path;
|
||||||
|
int64_t line;
|
||||||
|
int64_t column;
|
||||||
|
int length;
|
||||||
|
char type[32];
|
||||||
|
char message[ERR_MSG_MAX_LEN];
|
||||||
|
} ArErr;
|
||||||
|
|
||||||
|
typedef struct Execution {
|
||||||
|
ArErr err;
|
||||||
|
Stack stack;
|
||||||
|
} Execution;
|
||||||
|
#endif // RETURN_TYPES_
|
||||||
113
src/runtime/internals/dynamic_array_armem/darray_armem.c
Normal file
113
src/runtime/internals/dynamic_array_armem/darray_armem.c
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
#include "darray_armem.h"
|
||||||
|
#include "../../../memory.h"
|
||||||
|
#include <gc/gc.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
void darray_armem_init(darray_armem *arr, size_t element_size) {
|
||||||
|
arr->element_size = element_size;
|
||||||
|
arr->size = 0;
|
||||||
|
arr->capacity = CHUNK_SIZE;
|
||||||
|
arr->data = ar_alloc(CHUNK_SIZE * element_size);
|
||||||
|
arr->resizable = true;
|
||||||
|
if (!arr->data) {
|
||||||
|
fprintf(stderr, "darray_armem_init: allocation failed\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void darray_armem_resize(darray_armem *arr, size_t new_size) {
|
||||||
|
if (!arr->resizable) {
|
||||||
|
fprintf(stderr, "darray_armem_resize: unresizable darray_armem\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
size_t new_capacity = ((new_size + CHUNK_SIZE) / CHUNK_SIZE) * CHUNK_SIZE;
|
||||||
|
if (new_capacity != arr->capacity) {
|
||||||
|
void *new_data = ar_alloc(new_capacity * arr->element_size);
|
||||||
|
memccpy(new_data,arr->data, arr->element_size, arr->capacity);
|
||||||
|
if (!new_data) {
|
||||||
|
fprintf(stderr, "darray_armem_resize: reallocation failed\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
arr->data = new_data;
|
||||||
|
arr->capacity = new_capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
arr->size = new_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
void darray_armem_push(darray_armem *arr, void *element) {
|
||||||
|
if (!arr->resizable) {
|
||||||
|
fprintf(stderr, "darray_armem_resize: unresizable darray_armem\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
if (arr->size >= arr->capacity) {
|
||||||
|
darray_armem_resize(arr, arr->size + 1);
|
||||||
|
} else {
|
||||||
|
arr->size++;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *target = (char *)arr->data + (arr->size - 1) * arr->element_size;
|
||||||
|
memcpy(target, element, arr->element_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void darray_armem_pop(darray_armem *arr, void (*free_data)(void *)) {
|
||||||
|
if (!arr->resizable) {
|
||||||
|
fprintf(stderr, "darray_armem_resize: unresizable darray_armem\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
if (arr->size == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (free_data) {
|
||||||
|
void *target = (char *)arr->data + (arr->size-1) * arr->element_size;
|
||||||
|
free_data(target);
|
||||||
|
}
|
||||||
|
|
||||||
|
darray_armem_resize(arr, arr->size-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *darray_armem_get(darray_armem *arr, size_t index) {
|
||||||
|
if (index >= arr->size) {
|
||||||
|
fprintf(stderr, "darray_armem_get: index out of bounds\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
return (char *)arr->data + index * arr->element_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
darray_armem darray_armem_slice(darray_armem *arr, size_t start, size_t end) {
|
||||||
|
if (start > end || end > arr->size) {
|
||||||
|
fprintf(stderr, "darray_armem_slice: invalid slice range\n");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
darray_armem slice;
|
||||||
|
|
||||||
|
slice.data = (char *)arr->data + start * arr->element_size;
|
||||||
|
slice.size = (end - start);
|
||||||
|
slice.element_size = arr->element_size;
|
||||||
|
slice.capacity = ((slice.size + CHUNK_SIZE) / CHUNK_SIZE) * CHUNK_SIZE;
|
||||||
|
slice.resizable = false;
|
||||||
|
|
||||||
|
return slice;
|
||||||
|
}
|
||||||
|
|
||||||
|
void darray_armem_free(darray_armem *arr, void (*free_data)(void *)) {
|
||||||
|
if (!arr->resizable) {
|
||||||
|
// It's a view/slice — don't free
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (free_data) {
|
||||||
|
for (size_t i = 0; i < arr->size; ++i) {
|
||||||
|
void *element = (char *)arr->data + i * arr->element_size;
|
||||||
|
free_data(element);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(arr->data);
|
||||||
|
arr->data = NULL;
|
||||||
|
arr->size = 0;
|
||||||
|
arr->capacity = 0;
|
||||||
|
arr->element_size = 0;
|
||||||
|
arr->resizable = false;
|
||||||
|
}
|
||||||
37
src/runtime/internals/dynamic_array_armem/darray_armem.h
Normal file
37
src/runtime/internals/dynamic_array_armem/darray_armem.h
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
#ifndef darray_armem_H
|
||||||
|
#define darray_armem_H
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stddef.h> // for size_t
|
||||||
|
|
||||||
|
#define CHUNK_SIZE 1048576
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
void *data;
|
||||||
|
size_t element_size;
|
||||||
|
size_t size;
|
||||||
|
size_t capacity;
|
||||||
|
bool resizable;
|
||||||
|
} darray_armem;
|
||||||
|
|
||||||
|
// Initializes the dynamic_array
|
||||||
|
void darray_armem_init(darray_armem *arr, size_t element_size);
|
||||||
|
|
||||||
|
// Pushes an element onto the array
|
||||||
|
void darray_armem_push(darray_armem *arr, void *element);
|
||||||
|
|
||||||
|
// Pops the last element, calling `free_data` if provided
|
||||||
|
void darray_armem_pop(darray_armem *arr, void (*free_data)(void *));
|
||||||
|
|
||||||
|
// Gets a pointer to an element at index
|
||||||
|
void *darray_armem_get(darray_armem *arr, size_t index);
|
||||||
|
|
||||||
|
// Frees the entire array and optionally each element
|
||||||
|
void darray_armem_free(darray_armem *arr, void (*free_data)(void *));
|
||||||
|
|
||||||
|
// Resizes the array to a new size (internal use, but exposed)
|
||||||
|
void darray_armem_resize(darray_armem *arr, size_t new_size);
|
||||||
|
|
||||||
|
darray_armem darray_armem_slice(darray_armem *arr, size_t start, size_t end);
|
||||||
|
|
||||||
|
#endif // darray_armem_H
|
||||||
@@ -7,47 +7,47 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
struct hashmap *createHashmap() {
|
struct hashmap_GC *createHashmap_GC() {
|
||||||
size_t size = 8;
|
size_t size = 8;
|
||||||
struct hashmap *t = (struct hashmap *)ar_alloc(sizeof(struct hashmap));
|
struct hashmap_GC *t = (struct hashmap_GC *)ar_alloc(sizeof(struct hashmap_GC));
|
||||||
t->size = size;
|
t->size = size;
|
||||||
t->order = 1;
|
t->order = 1;
|
||||||
t->list = (struct node **)ar_alloc(sizeof(struct node *) * size);
|
t->list = (struct node_GC **)ar_alloc(sizeof(struct node_GC *) * size);
|
||||||
memset(t->list, 0, sizeof(struct node *) * size);
|
memset(t->list, 0, sizeof(struct node_GC *) * size);
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
void resize_hashmap(struct hashmap *t) {
|
void resize_hashmap_GC(struct hashmap_GC *t) {
|
||||||
int old_size = t->size;
|
int old_size = t->size;
|
||||||
int new_size = old_size * 2;
|
int new_size = old_size * 2;
|
||||||
|
|
||||||
struct node **old_list = t->list;
|
struct node_GC **old_list = t->list;
|
||||||
|
|
||||||
// Create new list
|
// Create new list
|
||||||
t->list = (struct node **)ar_alloc(sizeof(struct node *) * new_size);
|
t->list = (struct node_GC **)ar_alloc(sizeof(struct node_GC *) * new_size);
|
||||||
memset(t->list, 0, sizeof(struct node *) * new_size);
|
memset(t->list, 0, sizeof(struct node_GC *) * new_size);
|
||||||
|
|
||||||
t->size = new_size;
|
t->size = new_size;
|
||||||
t->count = 0;
|
t->count = 0;
|
||||||
|
|
||||||
// Rehash old entries into new list
|
// Rehash old entries into new list
|
||||||
for (int i = 0; i < old_size; i++) {
|
for (int i = 0; i < old_size; i++) {
|
||||||
struct node *temp = old_list[i];
|
struct node_GC *temp = old_list[i];
|
||||||
while (temp) {
|
while (temp) {
|
||||||
hashmap_insert(t, temp->hash, temp->key, temp->val,
|
hashmap_insert_GC(t, temp->hash, temp->key, temp->val,
|
||||||
temp->order); // Will increment count
|
temp->order); // Will increment count
|
||||||
temp = temp->next;
|
temp = temp->next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int hashCode(struct hashmap *t, uint64_t hash) { return hash % t->size; }
|
int hashCode_GC(struct hashmap_GC *t, uint64_t hash) { return hash & (t->size - 1); }
|
||||||
|
|
||||||
int hashmap_remove(struct hashmap *t, uint64_t hash) {
|
int hashmap_remove_GC(struct hashmap_GC *t, uint64_t hash) {
|
||||||
int pos = hashCode(t, hash);
|
int pos = hashCode_GC(t, hash);
|
||||||
struct node *list = t->list[pos];
|
struct node_GC *list = t->list[pos];
|
||||||
struct node *temp = list;
|
struct node_GC *temp = list;
|
||||||
struct node *prev = NULL;
|
struct node_GC *prev = NULL;
|
||||||
while (temp) {
|
while (temp) {
|
||||||
if (temp->hash == hash) {
|
if (temp->hash == hash) {
|
||||||
if (prev)
|
if (prev)
|
||||||
@@ -65,18 +65,18 @@ int hashmap_remove(struct hashmap *t, uint64_t hash) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void hashmap_insert(struct hashmap *t, uint64_t hash, void *key,
|
void hashmap_insert_GC(struct hashmap_GC *t, uint64_t hash, void *key,
|
||||||
void *val, size_t order) {
|
void *val, size_t order) {
|
||||||
if (!order) {
|
if (!order) {
|
||||||
order = t->order++;
|
order = t->order++;
|
||||||
}
|
}
|
||||||
if ((t->count + 1) > t->size * 0.75) {
|
if ((t->count + 1) > t->size * 0.75) {
|
||||||
resize_hashmap(t);
|
resize_hashmap_GC(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
int pos = hashCode(t, hash);
|
int pos = hashCode_GC(t, hash);
|
||||||
struct node *list = t->list[pos];
|
struct node_GC *list = t->list[pos];
|
||||||
struct node *temp = list;
|
struct node_GC *temp = list;
|
||||||
|
|
||||||
// Check if key exists → overwrite
|
// Check if key exists → overwrite
|
||||||
while (temp) {
|
while (temp) {
|
||||||
@@ -88,7 +88,7 @@ void hashmap_insert(struct hashmap *t, uint64_t hash, void *key,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Insert new node
|
// Insert new node
|
||||||
struct node *newNode = (struct node *)ar_alloc(sizeof(struct node));
|
struct node_GC *newNode = (struct node_GC *)ar_alloc(sizeof(struct node_GC));
|
||||||
newNode->hash = hash;
|
newNode->hash = hash;
|
||||||
newNode->key = key;
|
newNode->key = key;
|
||||||
newNode->val = val;
|
newNode->val = val;
|
||||||
@@ -98,10 +98,10 @@ void hashmap_insert(struct hashmap *t, uint64_t hash, void *key,
|
|||||||
t->count++;
|
t->count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
void *hashmap_lookup(struct hashmap *t, uint64_t hash) {
|
void *hashmap_lookup_GC(struct hashmap_GC *t, uint64_t hash) {
|
||||||
int pos = hashCode(t, hash);
|
int pos = hashCode_GC(t, hash);
|
||||||
struct node *list = t->list[pos];
|
struct node_GC *list = t->list[pos];
|
||||||
struct node *temp = list;
|
struct node_GC *temp = list;
|
||||||
while (temp) {
|
while (temp) {
|
||||||
if (temp->hash == hash) {
|
if (temp->hash == hash) {
|
||||||
return temp->val;
|
return temp->val;
|
||||||
|
|||||||
@@ -1,33 +1,31 @@
|
|||||||
#ifndef HASHMAP_H
|
#ifndef HASHMAP_GC_H
|
||||||
#define HASHMAP_H
|
#define HASHMAP_GC_H
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
typedef struct ArgonObject ArgonObject;
|
struct node_GC {
|
||||||
|
|
||||||
struct node {
|
|
||||||
uint64_t hash;
|
uint64_t hash;
|
||||||
void *key;
|
void *key;
|
||||||
void *val;
|
void *val;
|
||||||
size_t order;
|
size_t order;
|
||||||
struct node *next;
|
struct node_GC *next;
|
||||||
};
|
};
|
||||||
struct hashmap {
|
struct hashmap_GC {
|
||||||
size_t size;
|
size_t size;
|
||||||
size_t count;
|
size_t count;
|
||||||
size_t order;
|
size_t order;
|
||||||
struct node **list;
|
struct node_GC **list;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct hashmap *createHashmap();
|
struct hashmap_GC *createHashmap_GC();
|
||||||
|
|
||||||
int hashCode(struct hashmap *t, uint64_t hash);
|
int hashCode_GC(struct hashmap_GC *t, uint64_t hash);
|
||||||
|
|
||||||
int hashmap_remove(struct hashmap *t, uint64_t hash);
|
int hashmap_remove_GC(struct hashmap_GC *t, uint64_t hash);
|
||||||
|
|
||||||
void hashmap_insert(struct hashmap *t, uint64_t hash, void *key,
|
void hashmap_insert_GC(struct hashmap_GC *t, uint64_t hash, void *key,
|
||||||
void *val, size_t order);
|
void *val, size_t order);
|
||||||
|
|
||||||
void *hashmap_lookup(struct hashmap *t, uint64_t hash);
|
void *hashmap_lookup_GC(struct hashmap_GC *t, uint64_t hash);
|
||||||
|
|
||||||
#endif // HASHMAP_H
|
#endif // HASHMAP_GC_H
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
/*
|
|
||||||
SipHash reference C implementation
|
|
||||||
|
|
||||||
Copyright (c) 2012-2021 Jean-Philippe Aumasson
|
|
||||||
<jeanphilippe.aumasson@gmail.com>
|
|
||||||
Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
|
|
||||||
|
|
||||||
To the extent possible under law, the author(s) have dedicated all copyright
|
|
||||||
and related and neighboring rights to this software to the public domain
|
|
||||||
worldwide. This software is distributed without any warranty.
|
|
||||||
|
|
||||||
You should have received a copy of the CC0 Public Domain Dedication along
|
|
||||||
with
|
|
||||||
this software. If not, see
|
|
||||||
<http://creativecommons.org/publicdomain/zero/1.0/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <inttypes.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
int siphash(const void *in, const size_t inlen, const void *k, uint8_t *out,
|
|
||||||
const size_t outlen);
|
|
||||||
40
src/runtime/objects/functions/functions.c
Normal file
40
src/runtime/objects/functions/functions.c
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
#include "../../runtime.h"
|
||||||
|
#include "../object.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
ArgonObject *ARGON_FUNCTION_TYPE = NULL;
|
||||||
|
|
||||||
|
void init_function_type() {
|
||||||
|
ARGON_FUNCTION_TYPE = init_argon_class("Function");
|
||||||
|
}
|
||||||
|
|
||||||
|
void load_argon_function(Translated *translated, RuntimeState *state,
|
||||||
|
struct Stack stack) {
|
||||||
|
ArgonObject *object = init_child_argon_object(ARGON_FUNCTION_TYPE);
|
||||||
|
object->type = TYPE_FUNCTION;
|
||||||
|
uint64_t offset = pop_bytecode(translated, state);
|
||||||
|
uint64_t length = pop_bytecode(translated, state);
|
||||||
|
object->name = ar_alloc_atomic(length + 1);
|
||||||
|
memcpy(object->name, arena_get(&translated->constants, offset), length);
|
||||||
|
object->name[length] = '\0';
|
||||||
|
object->value.argon_fn.number_of_parameters = pop_bytecode(translated, state);
|
||||||
|
object->value.argon_fn.parameters =
|
||||||
|
ar_alloc(object->value.argon_fn.number_of_parameters * sizeof(char *));
|
||||||
|
for (size_t i = 0; i < object->value.argon_fn.number_of_parameters; i++) {
|
||||||
|
offset = pop_bytecode(translated, state);
|
||||||
|
length = pop_bytecode(translated, state);
|
||||||
|
object->value.argon_fn.parameters[i] = ar_alloc_atomic(length + 1);
|
||||||
|
memcpy(object->value.argon_fn.parameters[i], arena_get(&translated->constants, offset), length);
|
||||||
|
object->value.argon_fn.parameters[i][length] = '\0';
|
||||||
|
}
|
||||||
|
offset = pop_bytecode(translated, state);
|
||||||
|
length = pop_bytecode(translated, state);
|
||||||
|
darray_armem_init(&object->value.argon_fn.bytecode, sizeof(uint64_t));
|
||||||
|
darray_armem_resize(&object->value.argon_fn.bytecode, length/object->value.argon_fn.bytecode.element_size);
|
||||||
|
memcpy(object->value.argon_fn.bytecode.data, arena_get(&translated->constants, offset), length);
|
||||||
|
object->value.argon_fn.stack = stack;
|
||||||
|
state->registers[0]=object;
|
||||||
|
}
|
||||||
9
src/runtime/objects/functions/functions.h
Normal file
9
src/runtime/objects/functions/functions.h
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#ifndef FUNCTION_H
|
||||||
|
#define FUNCTION_H
|
||||||
|
#include "../object.h"
|
||||||
|
|
||||||
|
void init_function_type();
|
||||||
|
|
||||||
|
ArgonObject *load_argon_function(Translated *translated, RuntimeState *state, struct Stack stack);
|
||||||
|
|
||||||
|
#endif // FUNCTION_H
|
||||||
@@ -3,8 +3,12 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "null.h"
|
#include "null.h"
|
||||||
|
|
||||||
|
ArgonObject *ARGON_NULL_TYPE = NULL;
|
||||||
ArgonObject *ARGON_NULL = NULL;
|
ArgonObject *ARGON_NULL = NULL;
|
||||||
|
|
||||||
void init_null() {
|
void init_null() {
|
||||||
ARGON_NULL = init_argon_object();
|
ARGON_NULL_TYPE = init_argon_class("NULL_TYPE");
|
||||||
|
|
||||||
|
ARGON_NULL = init_child_argon_object(ARGON_NULL_TYPE);
|
||||||
|
ARGON_NULL->type=TYPE_NULL;
|
||||||
}
|
}
|
||||||
@@ -1,24 +1,37 @@
|
|||||||
#include "object.h"
|
#include "object.h"
|
||||||
|
#include "../../hash_data/hash_data.h"
|
||||||
#include "../../memory.h"
|
#include "../../memory.h"
|
||||||
#include "../runtime.h"
|
#include "type/type.h"
|
||||||
|
#include <stdbool.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
ArgonObject *BASE_OBJECT = NULL;
|
ArgonObject *BASE_CLASS = NULL;
|
||||||
|
|
||||||
void init_base_field() {
|
void init_base_field() {
|
||||||
add_field(BASE_OBJECT, "test", BASE_OBJECT);
|
// add_field(BASE_CLASS, "test", BASE_CLASS);
|
||||||
}
|
}
|
||||||
|
|
||||||
ArgonObject* init_argon_object() {
|
ArgonObject *init_child_argon_object(ArgonObject *cls) {
|
||||||
ArgonObject *object = ar_alloc(sizeof(ArgonObject));
|
ArgonObject *object = init_argon_class(NULL);
|
||||||
object->type = TYPE_OBJECT;
|
object->self = object;
|
||||||
object->typeObject = NULL;
|
object->baseObject = cls;
|
||||||
object->baseObject = BASE_OBJECT;
|
add_field(object, "__call__", NULL);
|
||||||
object->fields = createHashmap();
|
return object;
|
||||||
memset(&object->value, 0, sizeof(object->value));
|
|
||||||
return object;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void add_field(ArgonObject*target, char* name, ArgonObject *object) {
|
ArgonObject *init_argon_class(char *name) {
|
||||||
hashmap_insert(target->fields, siphash64_bytes(name, strlen(name)),name, object, 0);
|
ArgonObject *object = ar_alloc(sizeof(ArgonObject));
|
||||||
|
object->name = name;
|
||||||
|
object->type = TYPE_OBJECT;
|
||||||
|
object->self = NULL;
|
||||||
|
object->baseObject = ARGON_TYPE;
|
||||||
|
object->fields = createHashmap_GC();
|
||||||
|
memset(&object->value, 0, sizeof(object->value));
|
||||||
|
return object;
|
||||||
|
}
|
||||||
|
|
||||||
|
void add_field(ArgonObject *target, char *name, ArgonObject *object) {
|
||||||
|
hashmap_insert_GC(target->fields,
|
||||||
|
siphash64_bytes(name, strlen(name), siphash_key), name,
|
||||||
|
object, 0);
|
||||||
}
|
}
|
||||||
@@ -1,43 +1,15 @@
|
|||||||
#ifndef OBJECT_H
|
#ifndef OBJECT_H
|
||||||
#define OBJECT_H
|
#define OBJECT_H
|
||||||
#include "../internals/hashmap/hashmap.h"
|
#include "../internals/hashmap/hashmap.h"
|
||||||
#include <gmp.h>
|
#include "../runtime.h"
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
extern ArgonObject *BASE_OBJECT;
|
extern ArgonObject *BASE_CLASS;
|
||||||
|
|
||||||
struct string_struct {
|
|
||||||
char *data;
|
|
||||||
size_t length;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
TYPE_NULL,
|
|
||||||
TYPE_BOOL,
|
|
||||||
TYPE_NUMBER,
|
|
||||||
TYPE_STRING,
|
|
||||||
TYPE_FUNCTION,
|
|
||||||
TYPE_NATIVE_FUNCTION,
|
|
||||||
TYPE_OBJECT, // generic user object
|
|
||||||
} ArgonType;
|
|
||||||
|
|
||||||
struct ArgonObject {
|
|
||||||
ArgonType type;
|
|
||||||
ArgonObject *baseObject;
|
|
||||||
ArgonObject *typeObject;
|
|
||||||
struct hashmap *fields; // dynamic fields/methods
|
|
||||||
union {
|
|
||||||
mpq_t as_number;
|
|
||||||
bool as_bool;
|
|
||||||
struct string_struct as_str;
|
|
||||||
void *native_fn;
|
|
||||||
// others as needed
|
|
||||||
} value;
|
|
||||||
};
|
|
||||||
typedef struct ArgonObject ArgonObject;
|
typedef struct ArgonObject ArgonObject;
|
||||||
void init_base_field();
|
void init_base_field();
|
||||||
|
ArgonObject *init_child_argon_object(ArgonObject *cls);
|
||||||
|
ArgonObject *init_argon_class(char *name);
|
||||||
|
|
||||||
ArgonObject *init_argon_object();
|
void add_field(ArgonObject *target, char *name, ArgonObject *object);
|
||||||
|
|
||||||
void add_field(ArgonObject*target, char* name, ArgonObject *object);
|
|
||||||
#endif // OBJECT_H
|
#endif // OBJECT_H
|
||||||
@@ -2,23 +2,18 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include "string.h"
|
||||||
|
|
||||||
ArgonObject *ARGON_STRING_TYPE = NULL;
|
ArgonObject *ARGON_STRING_TYPE = NULL;
|
||||||
ArgonObject *ARGON_STRING_BASE = NULL;
|
|
||||||
|
|
||||||
void init_string_type() {
|
void init_string_type() {
|
||||||
ARGON_STRING_TYPE = init_argon_object();
|
ARGON_STRING_TYPE = init_argon_class("String");
|
||||||
|
|
||||||
ARGON_STRING_BASE = init_argon_object();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ArgonObject *init_string_object(char*data, size_t length) {
|
ArgonObject *init_string_object(char*data, size_t length) {
|
||||||
fwrite(data, 1, length, stdout);
|
ArgonObject * object = init_child_argon_object(ARGON_STRING_TYPE);
|
||||||
printf("\n");
|
object->type = TYPE_STRING;
|
||||||
ArgonObject * object = init_argon_object();
|
|
||||||
object->typeObject = ARGON_STRING_TYPE;
|
|
||||||
object->baseObject = ARGON_STRING_BASE;
|
|
||||||
object->value.as_str.data = data;
|
object->value.as_str.data = data;
|
||||||
object->value.as_str.length = length;
|
object->value.as_str.length = length;
|
||||||
return object;
|
return object;
|
||||||
|
|||||||
@@ -6,5 +6,6 @@
|
|||||||
ArgonObject *ARGON_TYPE = NULL;
|
ArgonObject *ARGON_TYPE = NULL;
|
||||||
|
|
||||||
void init_type() {
|
void init_type() {
|
||||||
ARGON_TYPE = init_argon_object();
|
ARGON_TYPE = init_argon_class("type");
|
||||||
|
ARGON_TYPE->baseObject = BASE_CLASS;
|
||||||
}
|
}
|
||||||
@@ -1,88 +1,102 @@
|
|||||||
#include "runtime.h"
|
#include "runtime.h"
|
||||||
|
#include "../err.h"
|
||||||
#include "../translator/translator.h"
|
#include "../translator/translator.h"
|
||||||
#include "internals/siphash/siphash.h"
|
#include "objects/functions/functions.h"
|
||||||
#include "objects/null/null.h"
|
#include "objects/null/null.h"
|
||||||
#include "objects/object.h"
|
#include "objects/object.h"
|
||||||
#include "objects/string/string.h"
|
#include "objects/string/string.h"
|
||||||
#include "objects/type/type.h"
|
#include "objects/type/type.h"
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <gc/gc.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
uint64_t bytes_to_uint64(const uint8_t bytes[8]) {
|
||||||
|
uint64_t value = 0;
|
||||||
|
for (int i = 0; i < 8; i++) {
|
||||||
|
value |= ((uint64_t)bytes[i]) << (i * 8);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
void init_types() {
|
void init_types() {
|
||||||
BASE_OBJECT = init_argon_object();
|
BASE_CLASS = init_argon_class("BASE_CLASS");
|
||||||
|
|
||||||
init_type();
|
init_type();
|
||||||
|
init_function_type();
|
||||||
init_null();
|
init_null();
|
||||||
init_string_type();
|
init_string_type();
|
||||||
|
|
||||||
init_base_field();
|
init_base_field();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint8_t pop_byte(Translated *translated, RuntimeState *state) {
|
||||||
|
return *((uint8_t *)darray_get(&translated->bytecode, state->head++));
|
||||||
|
}
|
||||||
|
|
||||||
uint64_t pop_bytecode(Translated *translated, RuntimeState *state) {
|
uint64_t pop_bytecode(Translated *translated, RuntimeState *state) {
|
||||||
uint64_t *instruction = darray_get(&translated->bytecode, state->head++);
|
uint8_t bytes[8];
|
||||||
return *instruction;
|
for (size_t i = 0; i < sizeof(bytes); i++) {
|
||||||
|
bytes[i] = *((uint8_t *)darray_get(&translated->bytecode, state->head++));
|
||||||
|
}
|
||||||
|
return bytes_to_uint64(bytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
void load_const(Translated *translated, RuntimeState *state) {
|
void load_const(Translated *translated, RuntimeState *state) {
|
||||||
uint64_t to_register = pop_bytecode(translated, state);
|
uint64_t to_register = pop_byte(translated, state);
|
||||||
types type = pop_bytecode(translated, state);
|
types type = pop_byte(translated, state);
|
||||||
size_t length = pop_bytecode(translated, state);
|
size_t length = pop_bytecode(translated, state);
|
||||||
uint64_t offset = pop_bytecode(translated, state);
|
uint64_t offset = pop_bytecode(translated, state);
|
||||||
|
|
||||||
void*data = ar_alloc(length);
|
void *data = ar_alloc_atomic(length);
|
||||||
memcpy(data, arena_get(&translated->constants,offset), length);
|
memcpy(data, arena_get(&translated->constants, offset), length);
|
||||||
ArgonObject *object = ARGON_NULL;
|
ArgonObject *object = ARGON_NULL;
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case TYPE_OP_STRING:
|
case TYPE_OP_STRING:
|
||||||
object = init_string_object(data, length);
|
object = init_string_object(data, length);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
state->registers[to_register] = object;
|
state->registers[to_register] = object;
|
||||||
}
|
}
|
||||||
|
|
||||||
void run_instruction(Translated *translated, RuntimeState *state) {
|
ArErr run_instruction(Translated *translated, RuntimeState *state,
|
||||||
OperationType opcode = pop_bytecode(translated, state);
|
struct Stack stack) {
|
||||||
|
OperationType opcode = pop_byte(translated, state);
|
||||||
switch (opcode) {
|
switch (opcode) {
|
||||||
case OP_LOAD_NULL:
|
case OP_LOAD_NULL:
|
||||||
state->registers[pop_bytecode(translated, state)] = ARGON_NULL;
|
state->registers[pop_byte(translated, state)] = ARGON_NULL;
|
||||||
break;
|
break;
|
||||||
case OP_LOAD_CONST:
|
case OP_LOAD_CONST:
|
||||||
load_const(translated,state);
|
load_const(translated, state);
|
||||||
break;
|
break;
|
||||||
|
case OP_LOAD_FUNCTION:
|
||||||
|
load_argon_function(translated, state, stack);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return create_err(0, 0, 0, NULL, "Runtime Error", "Invalid Opcode %#x", opcode);
|
||||||
}
|
}
|
||||||
|
return no_err;
|
||||||
}
|
}
|
||||||
|
|
||||||
void runtime(Translated translated) {
|
RuntimeState init_runtime_state(Translated translated) {
|
||||||
RuntimeState state = {
|
return (RuntimeState){
|
||||||
checked_malloc(translated.registerCount * sizeof(ArgonObject *)), 0};
|
checked_malloc(translated.registerCount * sizeof(ArgonObject *)), 0};
|
||||||
|
|
||||||
while (state.head < translated.bytecode.size)
|
|
||||||
run_instruction(&translated, &state);
|
|
||||||
free(state.registers);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t siphash_key[16];
|
Stack create_scope(Stack *prev) { return (Stack){NULL, prev}; }
|
||||||
|
|
||||||
void generate_siphash_key() {
|
ArErr runtime(Translated translated, RuntimeState state, Stack stack) {
|
||||||
int fd = open("/dev/urandom", O_RDONLY);
|
state.head = 0;
|
||||||
if (fd < 0 || read(fd, siphash_key, 16) != 16) {
|
while (state.head < translated.bytecode.size) {
|
||||||
// Fallback or abort
|
ArErr err = run_instruction(&translated, &state, stack);
|
||||||
|
if (err.exists) {
|
||||||
|
return err;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
close(fd);
|
free(state.registers);
|
||||||
}
|
return no_err;
|
||||||
|
|
||||||
uint64_t siphash64_bytes(const void *data, size_t len) {
|
|
||||||
uint8_t out[8];
|
|
||||||
if (siphash(data, len, siphash_key, out, sizeof(out)) != 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
uint64_t hash = 0;
|
|
||||||
for (int i = 0; i < 8; ++i)
|
|
||||||
hash |= ((uint64_t)out[i]) << (8 * i);
|
|
||||||
|
|
||||||
return hash;
|
|
||||||
}
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
#define RUNTIME_H
|
#define RUNTIME_H
|
||||||
#include "../translator/translator.h"
|
#include "../translator/translator.h"
|
||||||
#include "internals/hashmap/hashmap.h"
|
#include "internals/hashmap/hashmap.h"
|
||||||
|
#include "../returnTypes.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ArgonObject **registers;
|
ArgonObject **registers;
|
||||||
@@ -10,12 +11,15 @@ typedef struct {
|
|||||||
|
|
||||||
void init_types();
|
void init_types();
|
||||||
|
|
||||||
void run_instruction(Translated *translated, RuntimeState *state);
|
uint64_t pop_bytecode(Translated *translated, RuntimeState *state);
|
||||||
|
|
||||||
void runtime(Translated translated);
|
ArErr run_instruction(Translated *translated, RuntimeState *state,
|
||||||
|
struct Stack stack);
|
||||||
|
|
||||||
uint64_t siphash64_bytes(const void *data, size_t len);
|
RuntimeState init_runtime_state(Translated translated);
|
||||||
|
|
||||||
void generate_siphash_key();
|
Stack create_scope(Stack *prev);
|
||||||
|
|
||||||
|
ArErr runtime(Translated translated, RuntimeState state, Stack stack);
|
||||||
|
|
||||||
#endif // RUNTIME_H
|
#endif // RUNTIME_H
|
||||||
@@ -1,13 +1,15 @@
|
|||||||
# Bytecode Specification
|
# Bytecode Specification
|
||||||
|
|
||||||
|
all opcodes are uint8_t, and all operands are uint64_t unless marked with an asterisk (*), where it is marked as uint8_t
|
||||||
|
|
||||||
## OP_LOAD_CONST
|
## OP_LOAD_CONST
|
||||||
|
|
||||||
loads and initialises a value from the constant buffer into the provided register.
|
loads and initialises a value from the constant buffer into the provided register.
|
||||||
|
|
||||||
this operation 4 operands.
|
this operation 4 operands.
|
||||||
|
|
||||||
1. the register to write to.
|
1. the register to write to. (*)
|
||||||
2. the type of data from the constant buffer.
|
2. the type of data from the constant buffer. (*)
|
||||||
3. the length of the data in the constant buffer.
|
3. the length of the data in the constant buffer.
|
||||||
4. the offset in the constant buffer.
|
4. the offset in the constant buffer.
|
||||||
|
|
||||||
@@ -19,7 +21,7 @@ this operation takes 3 operands.
|
|||||||
|
|
||||||
1. the length of the variable name.
|
1. the length of the variable name.
|
||||||
2. the offset in the constant buffer of the variable name.
|
2. the offset in the constant buffer of the variable name.
|
||||||
3. the register of the given value
|
3. the register of the given value (*)
|
||||||
|
|
||||||
## OP_LOAD_NULL
|
## OP_LOAD_NULL
|
||||||
|
|
||||||
@@ -27,4 +29,17 @@ sets a given register to null.
|
|||||||
|
|
||||||
this operation takes 1 operand.
|
this operation takes 1 operand.
|
||||||
|
|
||||||
1. the register to set to null.
|
1. the register to set to null. (*)
|
||||||
|
|
||||||
|
## OP_LOAD_FUNCTION
|
||||||
|
|
||||||
|
initilises a function to a given register.
|
||||||
|
|
||||||
|
1. the offset of the name of the function.
|
||||||
|
2. the length of the name of the function.
|
||||||
|
3. the number of arguments.
|
||||||
|
4. the offset of the name of the argument.
|
||||||
|
5. the length of the name of the argument.
|
||||||
|
6. instruction 4 and 5 loop for each argument.
|
||||||
|
7. the offset of the bytecode of the function.
|
||||||
|
8. the length of the bytecode of the function.
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ size_t translate_parsed_declaration(Translated *translated,
|
|||||||
set_registers(translated, 1);
|
set_registers(translated, 1);
|
||||||
size_t first = 0;
|
size_t first = 0;
|
||||||
for (size_t i = 0; i < delcarations.size; i++) {
|
for (size_t i = 0; i < delcarations.size; i++) {
|
||||||
// TODO: add function delclaration
|
|
||||||
ParsedSingleDeclaration *singleDeclaration = darray_get(&delcarations, i);
|
ParsedSingleDeclaration *singleDeclaration = darray_get(&delcarations, i);
|
||||||
size_t temp = translate_parsed(translated, singleDeclaration->from);
|
size_t temp = translate_parsed(translated, singleDeclaration->from);
|
||||||
if (i == 0)
|
if (i == 0)
|
||||||
@@ -18,14 +17,14 @@ size_t translate_parsed_declaration(Translated *translated,
|
|||||||
size_t offset =
|
size_t offset =
|
||||||
arena_push(&translated->constants, singleDeclaration->name, length);
|
arena_push(&translated->constants, singleDeclaration->name, length);
|
||||||
|
|
||||||
push_instruction_code(translated, OP_DECLARE);
|
push_instruction_byte(translated, OP_DECLARE);
|
||||||
push_instruction_code(translated, length);
|
push_instruction_code(translated, length);
|
||||||
push_instruction_code(translated, offset);
|
push_instruction_code(translated, offset);
|
||||||
push_instruction_code(translated, 0);
|
push_instruction_byte(translated, 0);
|
||||||
}
|
}
|
||||||
if (delcarations.size != 1) {
|
if (delcarations.size != 1) {
|
||||||
push_instruction_code(translated, OP_LOAD_NULL);
|
push_instruction_byte(translated, OP_LOAD_NULL);
|
||||||
push_instruction_code(translated, 0);
|
push_instruction_byte(translated, 0);
|
||||||
}
|
}
|
||||||
return first;
|
return first;
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,37 @@
|
|||||||
#include "function.h"
|
#include "function.h"
|
||||||
#include "../translator.h"
|
#include "../translator.h"
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
size_t translate_parsed_function(Translated *translated,
|
size_t translate_parsed_function(Translated *translated,
|
||||||
ParsedValue *parsedValue) {
|
ParsedFunction *parsedFunction) {
|
||||||
return 0;
|
DArray main_bytecode = translated->bytecode;
|
||||||
|
DArray _temp_bytecode;
|
||||||
|
darray_init(&_temp_bytecode, sizeof(uint8_t));
|
||||||
|
translated->bytecode = _temp_bytecode;
|
||||||
|
translate_parsed(translated, parsedFunction->body);
|
||||||
|
size_t function_bytecode_offset =
|
||||||
|
arena_push(&translated->constants, translated->bytecode.data,
|
||||||
|
translated->bytecode.size*translated->bytecode.element_size);
|
||||||
|
size_t function_bytecode_length = translated->bytecode.size;
|
||||||
|
darray_free(&translated->bytecode, NULL);
|
||||||
|
translated->bytecode = main_bytecode;
|
||||||
|
size_t start = push_instruction_byte(translated, OP_LOAD_FUNCTION);
|
||||||
|
size_t offset = arena_push(&translated->constants, parsedFunction->name,
|
||||||
|
strlen(parsedFunction->name));
|
||||||
|
push_instruction_code(translated, offset);
|
||||||
|
push_instruction_code(translated, strlen(parsedFunction->name));
|
||||||
|
push_instruction_code(translated, parsedFunction->parameters.size);
|
||||||
|
for (size_t i = 0; i < parsedFunction->parameters.size; i++) {
|
||||||
|
char **parameter_name = darray_get(&parsedFunction->parameters, i);
|
||||||
|
offset = arena_push(&translated->constants, *parameter_name,
|
||||||
|
strlen(*parameter_name));
|
||||||
|
push_instruction_code(translated, offset);
|
||||||
|
push_instruction_code(translated, strlen(*parameter_name));
|
||||||
|
}
|
||||||
|
push_instruction_code(translated, function_bytecode_offset);
|
||||||
|
push_instruction_code(translated, function_bytecode_length*translated->bytecode.element_size);
|
||||||
|
return start;
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
#ifndef BYTECODE_FUNCTION_H
|
#ifndef BYTECODE_FUNCTION_H
|
||||||
#define BYTECODE_FUNCTION_H
|
#define BYTECODE_FUNCTION_H
|
||||||
#include "../translator.h"
|
#include "../translator.h"
|
||||||
|
#include "../../parser/function/function.h"
|
||||||
|
|
||||||
size_t translate_parsed_function(Translated *translated,
|
size_t translate_parsed_function(Translated *translated,
|
||||||
ParsedValue *parsedValue);
|
ParsedFunction *parsedFunction);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
15
src/translator/identifier/identifier.c
Normal file
15
src/translator/identifier/identifier.c
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
#include "../translator.h"
|
||||||
|
#include "identifier.h"
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
size_t translate_parsed_identifier(Translated *translated, char* identifier) {
|
||||||
|
size_t length = strlen(identifier);
|
||||||
|
size_t identifier_pos = arena_push(&translated->constants, identifier, length);
|
||||||
|
set_registers(translated, 1);
|
||||||
|
size_t start = push_instruction_byte(translated, OP_IDENTIFIER);
|
||||||
|
push_instruction_code(translated,length);
|
||||||
|
push_instruction_code(translated, identifier_pos);
|
||||||
|
return start;
|
||||||
|
}
|
||||||
8
src/translator/identifier/identifier.h
Normal file
8
src/translator/identifier/identifier.h
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#ifndef BYTECODE_IDENTIFIER_H
|
||||||
|
#define BYTECODE_IDENTIFIER_H
|
||||||
|
#include "../translator.h"
|
||||||
|
#include "../../parser/assignable/identifier/identifier.h"
|
||||||
|
|
||||||
|
size_t translate_parsed_identifier(Translated *translated, char* identifier);
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -10,10 +10,10 @@ size_t translate_parsed_number(Translated *translated, char *number_str, size_t
|
|||||||
size_t number_pos = arena_push(&translated->constants, number_str, length);
|
size_t number_pos = arena_push(&translated->constants, number_str, length);
|
||||||
set_registers(translated, to_register+1);
|
set_registers(translated, to_register+1);
|
||||||
|
|
||||||
size_t start = push_instruction_code(translated, OP_LOAD_CONST);
|
size_t start = push_instruction_byte(translated, OP_LOAD_CONST);
|
||||||
push_instruction_code(translated, to_register);
|
push_instruction_byte(translated, to_register);
|
||||||
|
|
||||||
push_instruction_code(translated, TYPE_OP_NUMBER);
|
push_instruction_byte(translated, TYPE_OP_NUMBER);
|
||||||
push_instruction_code(translated,length);
|
push_instruction_code(translated,length);
|
||||||
push_instruction_code(translated, number_pos);
|
push_instruction_code(translated, number_pos);
|
||||||
return start;
|
return start;
|
||||||
|
|||||||
@@ -7,9 +7,9 @@
|
|||||||
size_t translate_parsed_string(Translated *translated, ParsedString parsedString) {
|
size_t translate_parsed_string(Translated *translated, ParsedString parsedString) {
|
||||||
size_t string_pos = arena_push(&translated->constants, parsedString.string, parsedString.length);
|
size_t string_pos = arena_push(&translated->constants, parsedString.string, parsedString.length);
|
||||||
set_registers(translated, 1);
|
set_registers(translated, 1);
|
||||||
size_t start = push_instruction_code(translated, OP_LOAD_CONST);
|
size_t start = push_instruction_byte(translated, OP_LOAD_CONST);
|
||||||
push_instruction_code(translated, 0);
|
push_instruction_byte(translated, 0);
|
||||||
push_instruction_code(translated, TYPE_OP_STRING);
|
push_instruction_byte(translated, TYPE_OP_STRING);
|
||||||
push_instruction_code(translated,parsedString.length);
|
push_instruction_code(translated,parsedString.length);
|
||||||
push_instruction_code(translated, string_pos);
|
push_instruction_code(translated, string_pos);
|
||||||
return start;
|
return start;
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
#include "translator.h"
|
#include "translator.h"
|
||||||
|
#include "../hash_data/hash_data.h"
|
||||||
|
#include "../hashmap/hashmap.h"
|
||||||
#include "declaration/declaration.h"
|
#include "declaration/declaration.h"
|
||||||
|
#include "function/function.h"
|
||||||
|
#include "identifier/identifier.h"
|
||||||
#include "number/number.h"
|
#include "number/number.h"
|
||||||
#include "string/string.h"
|
#include "string/string.h"
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
@@ -8,10 +12,17 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
void uint64_to_bytes(uint64_t value, uint8_t bytes[8]) {
|
||||||
|
for (int i = 0; i < 8; i++) {
|
||||||
|
bytes[i] = (value >> (i * 8)) & 0xFF;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void arena_init(ConstantArena *arena) {
|
void arena_init(ConstantArena *arena) {
|
||||||
arena->data = checked_malloc(CHUNK_SIZE);
|
arena->data = checked_malloc(CHUNK_SIZE);
|
||||||
arena->capacity = CHUNK_SIZE;
|
arena->capacity = CHUNK_SIZE;
|
||||||
arena->size = 0;
|
arena->size = 0;
|
||||||
|
arena->hashmap = createHashmap();
|
||||||
}
|
}
|
||||||
|
|
||||||
void arena_resize(ConstantArena *arena, size_t new_size) {
|
void arena_resize(ConstantArena *arena, size_t new_size) {
|
||||||
@@ -31,6 +42,7 @@ void arena_free(ConstantArena *arena) {
|
|||||||
free(arena->data);
|
free(arena->data);
|
||||||
arena->capacity = 0;
|
arena->capacity = 0;
|
||||||
arena->size = 0;
|
arena->size = 0;
|
||||||
|
hashmap_free(arena->hashmap, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void *arena_get(ConstantArena *arena, size_t offset) {
|
void *arena_get(ConstantArena *arena, size_t offset) {
|
||||||
@@ -38,42 +50,57 @@ void *arena_get(ConstantArena *arena, size_t offset) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t arena_push(ConstantArena *arena, const void *data, size_t length) {
|
size_t arena_push(ConstantArena *arena, const void *data, size_t length) {
|
||||||
if (arena->size >= length) {
|
uint64_t hash = siphash64_bytes(data, length, siphash_key);
|
||||||
for (size_t i = 0; i <= (arena->size - length); i++) {
|
|
||||||
if (memcmp(data, arena->data + i, length) == 0) {
|
// Look up offset in hashmap
|
||||||
return i;
|
void *val = hashmap_lookup(arena->hashmap, hash);
|
||||||
}
|
if (val != NULL) {
|
||||||
|
size_t offset =
|
||||||
|
(size_t)(uintptr_t)val - 1; // stored as pointer but really offset
|
||||||
|
// Verify to avoid collision false positive
|
||||||
|
if (memcmp(arena->data + offset, data, length) == 0) {
|
||||||
|
return offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Not found: append data
|
||||||
arena_resize(arena, arena->size + length);
|
arena_resize(arena, arena->size + length);
|
||||||
size_t offset = arena->size;
|
size_t offset = arena->size;
|
||||||
memcpy(arena->data + arena->size, data, length);
|
memcpy(arena->data + arena->size, data, length);
|
||||||
arena->size += length;
|
arena->size += length;
|
||||||
|
|
||||||
|
// Insert into hashmap: store offset as pointer-sized integer
|
||||||
|
hashmap_insert(arena->hashmap, hash, (void *)data,
|
||||||
|
(void *)(uintptr_t)offset + 1, 0);
|
||||||
|
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
Translated init_translator() {
|
Translated init_translator() {
|
||||||
Translated translated;
|
Translated translated;
|
||||||
translated.registerCount = 0;
|
translated.registerCount = 0;
|
||||||
darray_init(&translated.bytecode, sizeof(uint64_t));
|
darray_init(&translated.bytecode, sizeof(uint8_t));
|
||||||
arena_init(&translated.constants);
|
arena_init(&translated.constants);
|
||||||
return translated;
|
return translated;
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_instruction_code(Translated *translator, size_t offset,
|
size_t push_instruction_byte(Translated *translator, uint8_t byte) {
|
||||||
uint64_t code) {
|
|
||||||
size_t *ptr = (translator->bytecode.data + offset);
|
|
||||||
*ptr = code;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t push_instruction_code(Translated *translator, uint64_t code) {
|
|
||||||
code = htole64(code);
|
|
||||||
size_t offset = translator->bytecode.size;
|
size_t offset = translator->bytecode.size;
|
||||||
darray_push(&translator->bytecode, &code);
|
darray_push(&translator->bytecode, &byte);
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_registers(Translated *translator, size_t count) {
|
size_t push_instruction_code(Translated *translator, uint64_t code) {
|
||||||
|
size_t offset = translator->bytecode.size;
|
||||||
|
uint8_t bytes[8];
|
||||||
|
uint64_to_bytes(code, bytes);
|
||||||
|
for (size_t i = 0; i < sizeof(bytes); i++) {
|
||||||
|
darray_push(&translator->bytecode, &(bytes[i]));
|
||||||
|
}
|
||||||
|
return offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
void set_registers(Translated *translator, uint8_t count) {
|
||||||
if (count > translator->registerCount)
|
if (count > translator->registerCount)
|
||||||
translator->registerCount = count;
|
translator->registerCount = count;
|
||||||
}
|
}
|
||||||
@@ -81,16 +108,23 @@ void set_registers(Translated *translator, size_t count) {
|
|||||||
size_t translate_parsed(Translated *translated, ParsedValue *parsedValue) {
|
size_t translate_parsed(Translated *translated, ParsedValue *parsedValue) {
|
||||||
switch (parsedValue->type) {
|
switch (parsedValue->type) {
|
||||||
case AST_STRING:
|
case AST_STRING:
|
||||||
return translate_parsed_string(translated, *((ParsedString*)parsedValue->data));
|
return translate_parsed_string(translated,
|
||||||
|
*((ParsedString *)parsedValue->data));
|
||||||
case AST_DECLARATION:
|
case AST_DECLARATION:
|
||||||
return translate_parsed_declaration(translated, *((DArray*)parsedValue->data));
|
return translate_parsed_declaration(translated,
|
||||||
|
*((DArray *)parsedValue->data));
|
||||||
case AST_NUMBER:
|
case AST_NUMBER:
|
||||||
return translate_parsed_number(translated, (char*)parsedValue->data, 0);
|
return translate_parsed_number(translated, (char *)parsedValue->data, 0);
|
||||||
case AST_NULL:
|
case AST_NULL:
|
||||||
set_registers(translated, 1);
|
set_registers(translated, 1);
|
||||||
size_t output = push_instruction_code(translated, OP_LOAD_NULL);
|
size_t output = push_instruction_byte(translated, OP_LOAD_NULL);
|
||||||
push_instruction_code(translated, 0);
|
push_instruction_byte(translated, 0);
|
||||||
return output;
|
return output;
|
||||||
|
case AST_FUNCTION:
|
||||||
|
return translate_parsed_function(translated,
|
||||||
|
(ParsedFunction *)parsedValue->data);
|
||||||
|
case AST_IDENTIFIER:
|
||||||
|
return translate_parsed_identifier(translated, (char *)parsedValue->data);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,33 +4,37 @@
|
|||||||
#include "../dynamic_array/darray.h"
|
#include "../dynamic_array/darray.h"
|
||||||
#include "../memory.h"
|
#include "../memory.h"
|
||||||
#include "../parser/parser.h"
|
#include "../parser/parser.h"
|
||||||
|
#include "../hashmap/hashmap.h"
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
typedef enum { OP_LOAD_CONST = 255, OP_DECLARE, OP_LOAD_NULL } OperationType;
|
typedef enum { OP_LOAD_CONST, OP_DECLARE, OP_LOAD_NULL, OP_LOAD_FUNCTION, OP_IDENTIFIER } OperationType;
|
||||||
typedef enum { TYPE_OP_STRING = 255, TYPE_OP_NUMBER } types;
|
typedef enum { TYPE_OP_STRING, TYPE_OP_NUMBER } types;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
void *data;
|
void *data;
|
||||||
size_t capacity;
|
size_t capacity;
|
||||||
size_t size;
|
size_t size;
|
||||||
|
struct hashmap * hashmap;
|
||||||
} ConstantArena;
|
} ConstantArena;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
size_t registerCount;
|
uint8_t registerCount;
|
||||||
DArray bytecode;
|
DArray bytecode;
|
||||||
ConstantArena constants;
|
ConstantArena constants;
|
||||||
} Translated;
|
} Translated;
|
||||||
|
|
||||||
|
void arena_resize(ConstantArena *arena, size_t new_size);
|
||||||
|
|
||||||
void *arena_get(ConstantArena *arena, size_t offset);
|
void *arena_get(ConstantArena *arena, size_t offset);
|
||||||
|
|
||||||
size_t arena_push(ConstantArena *arena, const void *data, size_t length);
|
size_t arena_push(ConstantArena *arena, const void *data, size_t length);
|
||||||
|
|
||||||
void set_instruction_code(Translated * translator, size_t offset, uint64_t code);
|
size_t push_instruction_byte(Translated *translator, uint8_t byte);
|
||||||
|
|
||||||
size_t push_instruction_code(Translated *translator, uint64_t code);
|
size_t push_instruction_code(Translated *translator, uint64_t code);
|
||||||
|
|
||||||
void set_registers(Translated *translator, size_t count);
|
void set_registers(Translated *translator, uint8_t count);
|
||||||
|
|
||||||
Translated init_translator();
|
Translated init_translator();
|
||||||
|
|
||||||
|
|||||||
35
test.py
Normal file
35
test.py
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import string
|
||||||
|
from itertools import product
|
||||||
|
import sys
|
||||||
|
|
||||||
|
def generate_names(max_width, skip_keywords=None):
|
||||||
|
if skip_keywords is None:
|
||||||
|
skip_keywords = {"if", "else", "while", "forever", "for", "break", "continue",
|
||||||
|
"return", "let", "import", "from", "do", "true", "false", "null",
|
||||||
|
"delete", "not", "try", "catch", "in"}
|
||||||
|
else:
|
||||||
|
skip_keywords = set(skip_keywords)
|
||||||
|
|
||||||
|
chars = string.ascii_lowercase
|
||||||
|
first = True
|
||||||
|
write = sys.stdout.write
|
||||||
|
|
||||||
|
for length in range(1, max_width + 1):
|
||||||
|
print(length, file=sys.stderr)
|
||||||
|
i = 0
|
||||||
|
for p in product(chars, repeat=length):
|
||||||
|
name = ''.join(p)
|
||||||
|
if name in skip_keywords:
|
||||||
|
continue
|
||||||
|
if not first:
|
||||||
|
write('\n')
|
||||||
|
write(name)
|
||||||
|
first = False
|
||||||
|
if i>10000000:
|
||||||
|
break
|
||||||
|
i+=1
|
||||||
|
|
||||||
|
# Example usage:
|
||||||
|
max_width = 15
|
||||||
|
# sys.stdout.write("let ")
|
||||||
|
generate_names(max_width)
|
||||||
1
testing.ar
Normal file
1
testing.ar
Normal file
@@ -0,0 +1 @@
|
|||||||
|
let x = 10
|
||||||
Reference in New Issue
Block a user