Compare commits
60 Commits
prerelease
...
prerelease
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db650d8ccf | ||
|
|
6ad0b2c02e | ||
|
|
624a54c90c | ||
|
|
c856e7d654 | ||
|
|
a96023ced1 | ||
|
|
1908d9bbbb | ||
|
|
47db2ca27d | ||
|
|
2e7b3b4baa | ||
|
|
24163e3389 | ||
|
|
0c0832d131 | ||
|
|
1742a0c52d | ||
|
|
224039ba43 | ||
|
|
5e7ce495e4 | ||
|
|
35a0f35cf8 | ||
|
|
f9490ceac0 | ||
|
|
4cda311008 | ||
|
|
b3aa653076 | ||
|
|
fc3321bcf0 | ||
|
|
868b3bfc3d | ||
|
|
f5e241aba0 | ||
|
|
8c3ee3fe05 | ||
|
|
eb285b6e8f | ||
|
|
78a1edd572 | ||
|
|
b905026010 | ||
|
|
677afd9433 | ||
|
|
757da3f973 | ||
|
|
5a86510c3b | ||
|
|
fb8b6a89ae | ||
|
|
6ddf9953e7 | ||
|
|
1609227a42 | ||
|
|
51f6a88ce8 | ||
|
|
f420273471 | ||
|
|
4b2a747338 | ||
|
|
5277814af0 | ||
|
|
8928ab2d99 | ||
|
|
d08b307c6e | ||
|
|
6474329afc | ||
|
|
c49e67c839 | ||
|
|
25cb96e473 | ||
|
|
f11890a8b3 | ||
|
|
59b1d222c2 | ||
|
|
2fba132016 | ||
|
|
bddc2cdc79 | ||
|
|
e1b80b42d9 | ||
|
|
dab86925b4 | ||
|
|
0f45052dce | ||
|
|
68f4207216 | ||
|
|
f9f8ca08c6 | ||
|
|
0666b02c13 | ||
|
|
1654507835 | ||
|
|
d054ece8e2 | ||
|
|
4937942d6e | ||
|
|
82ea92183f | ||
|
|
5fb15b476f | ||
|
|
d1a455dbbe | ||
|
|
a81640747d | ||
|
|
4a1ed23f96 | ||
|
|
eb36d02fcb | ||
|
|
7b3a1e1835 | ||
|
|
8e53579682 |
127
.github/workflows/release.yml
vendored
127
.github/workflows/release.yml
vendored
@@ -10,8 +10,8 @@ on:
|
||||
- '*' # Any tag
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
runs-on: ubuntu-latest
|
||||
build-linux-x86_64:
|
||||
runs-on: ubuntu-latest # build both architectures
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
@@ -51,18 +51,17 @@ jobs:
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: linux-artifact
|
||||
name: linux-x86_64-artifact
|
||||
path: ${{ env.TAR_NAME }}
|
||||
|
||||
build-macos:
|
||||
runs-on: macos-latest
|
||||
build-linux-arm64:
|
||||
runs-on: ubuntu-22.04-arm # build both architectures
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Install build tools
|
||||
run: brew install flex bison
|
||||
run: sudo apt-get update && sudo apt-get install -y flex bison
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v4
|
||||
@@ -95,18 +94,21 @@ jobs:
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: macos-artifact
|
||||
name: linux-arm64-artifact
|
||||
path: ${{ env.TAR_NAME }}
|
||||
|
||||
build-windows:
|
||||
runs-on: ubuntu-latest
|
||||
build-macos:
|
||||
runs-on: macos-latest
|
||||
strategy:
|
||||
matrix:
|
||||
arch: [x86_64, arm64] # build both architectures
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Install MinGW-w64 for cross-compilation
|
||||
run: sudo apt-get update && sudo apt-get install -y mingw-w64
|
||||
- name: Install build tools
|
||||
run: brew install flex bison
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v4
|
||||
@@ -117,27 +119,97 @@ jobs:
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install conan
|
||||
conan profile new default --detect
|
||||
conan profile update settings.compiler.version=13 default
|
||||
conan profile update settings.compiler=gcc default
|
||||
conan profile update settings.os=Windows default
|
||||
conan profile update env.CC=x86_64-w64-mingw32-gcc default
|
||||
conan profile update env.CXX=x86_64-w64-mingw32-g++ default
|
||||
if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
|
||||
arch -x86_64 conan profile detect
|
||||
else
|
||||
conan profile detect
|
||||
fi
|
||||
|
||||
- name: Build Windows with MinGW
|
||||
- name: Build
|
||||
run: |
|
||||
conan install . --profile:host=default --profile:build=default --build=missing
|
||||
conan build .
|
||||
BUILD_DIR="build_${{ matrix.arch }}"
|
||||
mkdir -p "$BUILD_DIR"
|
||||
cd "$BUILD_DIR"
|
||||
|
||||
- name: Package Windows build
|
||||
# Use Rosetta for x86_64 builds on Apple Silicon
|
||||
if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
|
||||
arch -x86_64 bash -c "
|
||||
export CMAKE_OSX_ARCHITECTURES=x86_64
|
||||
conan install .. --build=missing
|
||||
conan build ..
|
||||
"
|
||||
else
|
||||
export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
|
||||
conan install .. --build=missing
|
||||
conan build ..
|
||||
fi
|
||||
|
||||
cd ..
|
||||
|
||||
- name: Package
|
||||
run: |
|
||||
TAG=${GITHUB_REF##refs/tags/}
|
||||
FOLDER="chloride-$TAG-windows-x64"
|
||||
ZIP="$FOLDER.zip"
|
||||
OS="macos"
|
||||
ARCH="${{ matrix.arch }}"
|
||||
FOLDER="chloride-$TAG-$OS-$ARCH"
|
||||
TAR="$FOLDER.tar.gz"
|
||||
mv build/bin "$FOLDER"
|
||||
cp LICENSE.txt "$FOLDER"
|
||||
zip -r "$ZIP" "$FOLDER"
|
||||
echo "TAR_NAME=$ZIP" >> $GITHUB_ENV
|
||||
tar -czf "$TAR" "$FOLDER"
|
||||
echo "TAR_NAME=$TAR" >> $GITHUB_ENV
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: macos-${{ matrix.arch }}-artifact
|
||||
path: ${{ env.TAR_NAME }}
|
||||
|
||||
build-windows:
|
||||
runs-on: windows-latest
|
||||
defaults:
|
||||
run:
|
||||
shell: msys2 {0}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- uses: msys2/setup-msys2@v2
|
||||
with:
|
||||
msystem: MINGW64
|
||||
update: true
|
||||
install: >
|
||||
base-devel
|
||||
mingw-w64-x86_64-gcc
|
||||
mingw-w64-x86_64-make
|
||||
mingw-w64-x86_64-cmake
|
||||
mingw-w64-x86_64-python
|
||||
mingw-w64-x86_64-python-pip
|
||||
msys/flex
|
||||
|
||||
- name: Install Conan
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install conan
|
||||
conan profile detect
|
||||
|
||||
- name: Build Project
|
||||
run: |
|
||||
conan install . --profile windows-profile.txt --build=missing
|
||||
conan build . --profile windows-profile.txt
|
||||
|
||||
- name: Package
|
||||
run: |
|
||||
TAG=${GITHUB_REF##refs/tags/}
|
||||
OS="windows"
|
||||
ARCH=$(uname -m)
|
||||
FOLDER="chloride-$TAG-$OS-$ARCH"
|
||||
TAR="$FOLDER.tar.gz"
|
||||
mv build/bin "$FOLDER"
|
||||
cp LICENSE.txt "$FOLDER"
|
||||
tar -czf "$TAR" "$FOLDER"
|
||||
echo "TAR_NAME=$TAR" >> $GITHUB_ENV
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
@@ -147,12 +219,13 @@ jobs:
|
||||
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [build-linux, build-macos, build-windows]
|
||||
needs: [build-linux-x86_64, build-linux-arm64, build-macos, build-windows]
|
||||
steps:
|
||||
- name: Download artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: ./artifacts
|
||||
merge-multiple: true
|
||||
|
||||
- name: Create GitHub Release
|
||||
uses: ncipollo/release-action@v1
|
||||
|
||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -11,3 +11,6 @@
|
||||
[submodule "external/libdye"]
|
||||
path = external/libdye
|
||||
url = https://github.com/Ugric/libdye.git
|
||||
[submodule "external/linenoise"]
|
||||
path = external/linenoise
|
||||
url = https://github.com/antirez/linenoise
|
||||
|
||||
@@ -33,8 +33,16 @@ add_custom_command(
|
||||
# Step 2: Custom target for lexer
|
||||
add_custom_target(GenerateLexer DEPENDS ${LEXER_C} ${LEXER_H})
|
||||
|
||||
set(SOURCES
|
||||
external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c ${CFILES} ${LEXER_C}
|
||||
)
|
||||
|
||||
if(NOT WIN32)
|
||||
list(APPEND SOURCES external/linenoise/linenoise.c)
|
||||
endif()
|
||||
|
||||
# Step 3: Add executable
|
||||
add_executable(argon external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c ${CFILES} ${LEXER_C})
|
||||
add_executable(argon ${SOURCES})
|
||||
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)
|
||||
@@ -52,14 +60,12 @@ find_package(BDWgc REQUIRED)
|
||||
find_package(gmp REQUIRED)
|
||||
|
||||
target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
|
||||
if(NOT APPLE)
|
||||
target_link_options(argon PRIVATE -static)
|
||||
endif()
|
||||
|
||||
target_link_libraries(argon PRIVATE
|
||||
BDWgc::BDWgc
|
||||
gmp::gmp
|
||||
m
|
||||
$<$<PLATFORM_ID:Windows>:bcrypt>
|
||||
)
|
||||
|
||||
target_include_directories(argon PRIVATE
|
||||
|
||||
23
Makefile
23
Makefile
@@ -2,26 +2,31 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# Default FLEX tool
|
||||
BINARY = bin/argon
|
||||
FLEX_TOOL = flex
|
||||
|
||||
CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c external/linenoise/linenoise.c $(shell find src -name '*.c')
|
||||
|
||||
LEXER_SRC = src/lexer/lex.l
|
||||
LEXER_C = src/lexer/lex.yy.c
|
||||
LEXER_H = src/lexer/lex.yy.h
|
||||
|
||||
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 -Werror=unused-result -Iexternal/cwalk/include -Iexternal/libdye/include
|
||||
BINARY = bin/argon
|
||||
LDFLAGS = -lgc -lgmp -lm
|
||||
|
||||
all: $(BINARY)
|
||||
|
||||
|
||||
$(LEXER_C) $(LEXER_H): $(LEXER_SRC)
|
||||
flex --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
|
||||
$(FLEX_TOOL) --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
|
||||
|
||||
$(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
|
||||
gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS} -s
|
||||
|
||||
native: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||
gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
|
||||
|
||||
debug: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
@@ -29,13 +34,13 @@ debug: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
|
||||
full-debug: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||
gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
|
||||
|
||||
optimised: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||
gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
|
||||
${BINARY} rand_test.ar
|
||||
gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||
gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
|
||||
|
||||
|
||||
clean:
|
||||
|
||||
11
conanfile.py
11
conanfile.py
@@ -33,14 +33,9 @@ class ArgonConan(ConanFile):
|
||||
os.environ["CONAN_NON_INTERACTIVE"] = "1"
|
||||
tc = CMakeToolchain(self)
|
||||
|
||||
if os.name == "nt": # Windows
|
||||
flex_path = which("win_flex") or which("win_flex.exe")
|
||||
if not flex_path:
|
||||
raise Exception("win_flex not found in PATH. Install winflexbison via choco.")
|
||||
else:
|
||||
flex_path = which("flex")
|
||||
if not flex_path:
|
||||
raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
|
||||
flex_path = which("flex")
|
||||
if not flex_path:
|
||||
raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
|
||||
|
||||
tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\")
|
||||
tc.generate()
|
||||
|
||||
1
external/linenoise
vendored
Submodule
1
external/linenoise
vendored
Submodule
Submodule external/linenoise added at d895173d67
111
src/main.c
111
src/main.c
@@ -11,6 +11,8 @@
|
||||
#include "lexer/token.h"
|
||||
#include "memory.h"
|
||||
#include "parser/parser.h"
|
||||
#include "returnTypes.h"
|
||||
#include "shell.h"
|
||||
#include "runtime/runtime.h"
|
||||
#include "translator/translator.h"
|
||||
|
||||
@@ -66,8 +68,9 @@ static inline uint64_t htole64(uint64_t x) { return x; }
|
||||
#define htole64(x) OSSwapHostToLittleInt64(x)
|
||||
#define le64toh(x) OSSwapLittleToHostInt64(x)
|
||||
// Add others as needed
|
||||
#else
|
||||
#error "Unsupported platform"
|
||||
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
#include <stdlib.h>
|
||||
#include <sys/endian.h>
|
||||
#endif
|
||||
|
||||
char *get_current_directory() {
|
||||
@@ -158,7 +161,7 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
|
||||
char *source_path) {
|
||||
FILE *bytecode_file = fopen(joined_paths, "rb");
|
||||
if (!bytecode_file) {
|
||||
fprintf(stderr,"cache doesnt exist... compiling from source.\n");
|
||||
fprintf(stderr, "cache doesnt exist... compiling from source.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -194,7 +197,7 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
|
||||
XXH64_freeState(state);
|
||||
|
||||
if (calc_hash != stored_hash) {
|
||||
fprintf(stderr,"cache hash mismatch (corrupted?)\n");
|
||||
fprintf(stderr, "cache hash mismatch (corrupted?)\n");
|
||||
goto FAILED;
|
||||
}
|
||||
|
||||
@@ -268,27 +271,29 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
|
||||
goto FAILED;
|
||||
}
|
||||
|
||||
fprintf(stderr,"cache exists and is valid, so will be used.\n");
|
||||
fprintf(stderr, "cache exists and is valid, so will be used.\n");
|
||||
fclose(bytecode_file);
|
||||
return 0;
|
||||
FAILED:
|
||||
fprintf(stderr,"cache is invalid... compiling from source.\n");
|
||||
fprintf(stderr, "cache is invalid... compiling from source.\n");
|
||||
fclose(bytecode_file);
|
||||
return 1;
|
||||
}
|
||||
|
||||
Execution execute(char *path, Stack *stack) {
|
||||
Translated load_argon_file(char *path, ArErr *err) {
|
||||
clock_t start, end;
|
||||
clock_t beginning = clock();
|
||||
double time_spent, total_time_spent = 0;
|
||||
|
||||
const char *basename_ptr;
|
||||
size_t basename_length;
|
||||
cwk_path_get_basename(path, &basename_ptr, &basename_length);
|
||||
|
||||
if (!basename_ptr)
|
||||
return (Execution){create_err(0, 0, 0, NULL, "Path Error",
|
||||
"path has no basename '%s'", path),
|
||||
(Stack){NULL, NULL}};
|
||||
if (!basename_ptr) {
|
||||
*err = create_err(0, 0, 0, NULL, "Path Error", "path has no basename '%s'",
|
||||
path);
|
||||
return (Translated){};
|
||||
}
|
||||
|
||||
char basename[FILENAME_MAX];
|
||||
memcpy(basename, basename_ptr, basename_length);
|
||||
@@ -312,9 +317,9 @@ Execution execute(char *path, Stack *stack) {
|
||||
|
||||
FILE *file = fopen(path, "r");
|
||||
if (!file) {
|
||||
return (Execution){create_err(0, 0, 0, NULL, "File Error",
|
||||
"Unable to open file '%s'", path),
|
||||
(Stack){NULL, NULL}};
|
||||
*err = create_err(0, 0, 0, NULL, "File Error", "Unable to open file '%s'",
|
||||
path);
|
||||
return (Translated){};
|
||||
}
|
||||
|
||||
XXH3_state_t *hash_state = XXH3_createState();
|
||||
@@ -338,15 +343,14 @@ Execution execute(char *path, Stack *stack) {
|
||||
|
||||
LexerState state = {path, file, 0, 0, &tokens};
|
||||
start = clock();
|
||||
ArErr err = lexer(state);
|
||||
if (err.exists) {
|
||||
*err = lexer(state);
|
||||
if (err->exists) {
|
||||
darray_free(&tokens, free_token);
|
||||
return (Execution){err, (Stack){NULL, NULL}};
|
||||
return (Translated){};
|
||||
}
|
||||
end = clock();
|
||||
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||
total_time_spent += time_spent;
|
||||
fprintf(stderr,"Lexer time taken: %f seconds\n", time_spent);
|
||||
fprintf(stderr, "Lexer time taken: %f seconds\n", time_spent);
|
||||
fclose(state.file);
|
||||
|
||||
DArray ast;
|
||||
@@ -354,35 +358,30 @@ Execution execute(char *path, Stack *stack) {
|
||||
darray_init(&ast, sizeof(ParsedValue));
|
||||
|
||||
start = clock();
|
||||
err = parser(path, &ast, &tokens, false);
|
||||
if (err.exists) {
|
||||
darray_free(&tokens, free_token);
|
||||
*err = parser(path, &ast, &tokens, false);
|
||||
darray_free(&tokens, free_token);
|
||||
if (err->exists) {
|
||||
darray_free(&ast, free_parsed);
|
||||
return (Execution){err, (Stack){NULL, NULL}};
|
||||
return (Translated){};
|
||||
}
|
||||
end = clock();
|
||||
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||
total_time_spent += time_spent;
|
||||
fprintf(stderr,"Parser time taken: %f seconds\n", time_spent);
|
||||
darray_free(&tokens, free_token);
|
||||
fprintf(stderr, "Parser time taken: %f seconds\n", time_spent);
|
||||
|
||||
start = clock();
|
||||
|
||||
translated = init_translator(path);
|
||||
err = translate(&translated, &ast);
|
||||
if (err.exists) {
|
||||
*err = translate(&translated, &ast);
|
||||
darray_free(&ast, free_parsed);
|
||||
if (err->exists) {
|
||||
darray_free(&translated.bytecode, NULL);
|
||||
free(translated.constants.data);
|
||||
hashmap_free(translated.constants.hashmap, NULL);
|
||||
darray_free(&ast, free_parsed);
|
||||
return (Execution){err, (Stack){NULL, NULL}};
|
||||
return (Translated){};
|
||||
}
|
||||
end = clock();
|
||||
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||
total_time_spent += time_spent;
|
||||
fprintf(stderr,"Translation time taken: %f seconds\n", time_spent);
|
||||
|
||||
darray_free(&ast, free_parsed);
|
||||
fprintf(stderr, "Translation time taken: %f seconds\n", time_spent);
|
||||
#if defined(__linux__)
|
||||
malloc_trim(0);
|
||||
#endif
|
||||
@@ -429,7 +428,7 @@ Execution execute(char *path, Stack *stack) {
|
||||
hashmap_free(translated.constants.hashmap, NULL);
|
||||
Translated gc_translated = {
|
||||
translated.registerCount, NULL, {}, {}, translated.path};
|
||||
gc_translated.bytecode.data = ar_alloc(translated.bytecode.capacity);
|
||||
gc_translated.bytecode.data = ar_alloc_atomic(translated.bytecode.capacity);
|
||||
memcpy(gc_translated.bytecode.data, translated.bytecode.data,
|
||||
translated.bytecode.capacity);
|
||||
gc_translated.bytecode.element_size = translated.bytecode.element_size;
|
||||
@@ -437,25 +436,17 @@ Execution execute(char *path, Stack *stack) {
|
||||
gc_translated.bytecode.resizable = false;
|
||||
gc_translated.bytecode.capacity =
|
||||
translated.bytecode.size * translated.bytecode.element_size;
|
||||
gc_translated.constants.data = ar_alloc(translated.constants.capacity);
|
||||
gc_translated.constants.data = ar_alloc_atomic(translated.constants.capacity);
|
||||
memcpy(gc_translated.constants.data, translated.constants.data,
|
||||
translated.constants.capacity);
|
||||
gc_translated.constants.size = translated.constants.size;
|
||||
gc_translated.constants.capacity = translated.constants.capacity;
|
||||
darray_free(&translated.bytecode, NULL);
|
||||
free(translated.constants.data);
|
||||
|
||||
start = clock();
|
||||
RuntimeState state = init_runtime_state(gc_translated, path);
|
||||
Stack *main_scope = create_scope(stack);
|
||||
ArErr err = runtime(gc_translated, state, main_scope);
|
||||
end = clock();
|
||||
time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||
total_time_spent += time_spent;
|
||||
fprintf(stderr,"Execution time taken: %f seconds\n", time_spent);
|
||||
fprintf(stderr,"total time taken: %f seconds\n", total_time_spent);
|
||||
|
||||
return (Execution){err, *main_scope};
|
||||
total_time_spent = (double)(clock() - beginning) / CLOCKS_PER_SEC;
|
||||
fprintf(stderr, "total time taken loading file (%s): %f seconds\n", path,
|
||||
total_time_spent);
|
||||
return gc_translated;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
@@ -465,18 +456,32 @@ int main(int argc, char *argv[]) {
|
||||
generate_siphash_key(siphash_key);
|
||||
bootstrap_types();
|
||||
bootstrap_globals();
|
||||
char *CWD = get_current_directory();
|
||||
if (argc <= 1)
|
||||
return -1;
|
||||
return shell();
|
||||
char *CWD = get_current_directory();
|
||||
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, Global_Scope);
|
||||
ArErr err;
|
||||
Translated translated = load_argon_file(path, &err);
|
||||
if (err.exists) {
|
||||
output_err(err);
|
||||
return 1;
|
||||
}
|
||||
clock_t start = clock(), end;
|
||||
RuntimeState state = init_runtime_state(translated, path);
|
||||
Stack *main_scope = create_scope(Global_Scope);
|
||||
err = runtime(translated, state, main_scope);
|
||||
|
||||
end = clock();
|
||||
double time_spent = (double)(end - start) / CLOCKS_PER_SEC;
|
||||
fprintf(stderr, "Execution time taken: %f seconds\n", time_spent);
|
||||
|
||||
if (runtime_hash_table)
|
||||
hashmap_free(runtime_hash_table, NULL);
|
||||
if (resp.err.exists) {
|
||||
output_err(resp.err);
|
||||
if (err.exists) {
|
||||
output_err(err);
|
||||
return 1;
|
||||
}
|
||||
// Your main thread code
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
#include "../../memory.h"
|
||||
#include <ctype.h>
|
||||
#include <gmp.h>
|
||||
#include <gmp.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -180,7 +179,8 @@ ParsedValueReturn parse_number(Token *token, char *path) {
|
||||
mpq_init(*r_ptr);
|
||||
int err = mpq_set_decimal_str_exp(*r_ptr, token->value, token->length);
|
||||
if (err) {
|
||||
free_parsed(parsedValue);
|
||||
mpq_clear(*r_ptr);
|
||||
free(r_ptr);
|
||||
free(parsedValue);
|
||||
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||
token->length, path, "Parsing Error",
|
||||
@@ -189,4 +189,5 @@ ParsedValueReturn parse_number(Token *token, char *path) {
|
||||
}
|
||||
parsedValue->data = r_ptr;
|
||||
return (ParsedValueReturn){no_err, parsedValue};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
#include "parentheses-and-anonymous-function.h"
|
||||
#include "../assignable/identifier/identifier.h"
|
||||
#include "../function/function.h"
|
||||
#include "../../memory.h"
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
ParsedValueReturn parse_parentheses(char *file, DArray *tokens, size_t *index) {
|
||||
(*index)++;
|
||||
skip_newlines_and_indents(tokens, index);
|
||||
ArErr err = error_if_finished(file, tokens, index);
|
||||
if (err.exists) {
|
||||
// darray_free(&list, free_parsed);
|
||||
return (ParsedValueReturn){err, NULL};
|
||||
}
|
||||
DArray list;
|
||||
darray_init(&list, sizeof(ParsedValue));
|
||||
Token *token = darray_get(tokens, *index);
|
||||
if (token->type != TOKEN_RPAREN) {
|
||||
while (*index < tokens->size) {
|
||||
ParsedValueReturn parsedItem = parse_token(file, tokens, index, true);
|
||||
if (parsedItem.err.exists) {
|
||||
darray_free(&list, free_parsed);
|
||||
return parsedItem;
|
||||
}
|
||||
darray_push(&list, parsedItem.value);
|
||||
free(parsedItem.value);
|
||||
skip_newlines_and_indents(tokens, index);
|
||||
ArErr err = error_if_finished(file, tokens, index);
|
||||
if (err.exists) {
|
||||
darray_free(&list, free_parsed);
|
||||
return (ParsedValueReturn){err, NULL};
|
||||
}
|
||||
token = darray_get(tokens, *index);
|
||||
if (token->type == TOKEN_RPAREN) {
|
||||
break;
|
||||
} else if (token->type != TOKEN_COMMA) {
|
||||
darray_free(&list, free_parsed);
|
||||
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||
token->length, file,
|
||||
"Syntax Error", "expected comma"),
|
||||
NULL};
|
||||
}
|
||||
skip_newlines_and_indents(tokens, index);
|
||||
err = error_if_finished(file, tokens, index);
|
||||
if (err.exists) {
|
||||
darray_free(&list, free_parsed);
|
||||
return (ParsedValueReturn){err, NULL};
|
||||
}
|
||||
}
|
||||
}
|
||||
(*index)++;
|
||||
if (*index < tokens->size) {
|
||||
token = darray_get(tokens, *index);
|
||||
if (token->type == TOKEN_ASSIGN) {
|
||||
(*index)++;
|
||||
ArErr err = error_if_finished(file, tokens, index);
|
||||
if (err.exists) {
|
||||
darray_free(&list, free_parsed);
|
||||
return (ParsedValueReturn){err, NULL};
|
||||
}
|
||||
DArray parameters;
|
||||
darray_init(¶meters, sizeof(char *));
|
||||
for (size_t i = 0; i < list.size; i++) {
|
||||
ParsedValue *item = darray_get(&list, i);
|
||||
if (item->type != AST_IDENTIFIER) {
|
||||
return (ParsedValueReturn){
|
||||
create_err(token->line, token->column, token->length, file,
|
||||
"Syntax Error", "expected identifier"),
|
||||
NULL};
|
||||
}
|
||||
char *param = strdup(((ParsedIdentifier *)item->data)->name);
|
||||
darray_push(¶meters, ¶m);
|
||||
}
|
||||
darray_free(&list, free_parsed);
|
||||
ParsedValueReturn parsedBody = parse_token(file, tokens, index, true);
|
||||
if (parsedBody.err.exists) {
|
||||
darray_free(¶meters, free_parameter);
|
||||
return parsedBody;
|
||||
}
|
||||
return (ParsedValueReturn){
|
||||
no_err,
|
||||
create_parsed_function("anonymous", parameters, parsedBody.value)};
|
||||
}
|
||||
}
|
||||
if (list.size != 1) {
|
||||
return (ParsedValueReturn){create_err(token->line, token->column,
|
||||
token->length, file, "Syntax Error",
|
||||
"expected 1 body"),
|
||||
NULL};
|
||||
}
|
||||
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));
|
||||
memcpy(parsedValue, darray_get(&list, 0), sizeof(ParsedValue));
|
||||
darray_free(&list, NULL);
|
||||
return (ParsedValueReturn){no_err, parsedValue};
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2025 William Bell
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef parentheses_and_anonymous_function_H
|
||||
#define parentheses_and_anonymous_function_H
|
||||
#include "../parser.h"
|
||||
#include "../../lexer/token.h"
|
||||
|
||||
ParsedValueReturn parse_parentheses(char *file, DArray *tokens, size_t *index);
|
||||
|
||||
#endif // parentheses_and_anonymous_function_H
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "assignable/identifier/identifier.h"
|
||||
#include "declaration/declaration.h"
|
||||
#include "dictionary/dictionary.h"
|
||||
#include "parentheses-and-anonymous-function/parentheses-and-anonymous-function.h"
|
||||
#include "dowrap/dowrap.h"
|
||||
#include "function/function.h"
|
||||
#include "if/if.h"
|
||||
@@ -128,6 +129,9 @@ ParsedValueReturn parse_token_full(char *file, DArray *tokens, size_t *index,
|
||||
case TOKEN_LBRACKET:
|
||||
output = parse_list(file, tokens, index);
|
||||
break;
|
||||
case TOKEN_LPAREN:
|
||||
output = parse_parentheses(file, tokens, index);
|
||||
break;
|
||||
case TOKEN_LBRACE:
|
||||
output = parse_dictionary(file, tokens, index);
|
||||
break;
|
||||
|
||||
@@ -20,9 +20,4 @@ typedef struct ArErr {
|
||||
char type[32];
|
||||
char message[ERR_MSG_MAX_LEN];
|
||||
} ArErr;
|
||||
|
||||
typedef struct Execution {
|
||||
ArErr err;
|
||||
Stack stack;
|
||||
} Execution;
|
||||
#endif // RETURN_TYPES_
|
||||
@@ -15,19 +15,19 @@ ArgonObject *ARGON_TYPE_TYPE___get_attr__(size_t argc, ArgonObject **argv,
|
||||
return ARGON_NULL;
|
||||
}
|
||||
ArgonObject *to_access = argv[0];
|
||||
ArgonObject *access = argv[1];
|
||||
bool check_field = argv[2] == ARGON_TRUE;
|
||||
bool check_field = argv[1] == ARGON_TRUE;
|
||||
if (check_field) {
|
||||
ArgonObject *access = argv[2];
|
||||
ArgonObject *value = get_field_l(to_access, access->value.as_str.data,
|
||||
access->value.as_str.length, true, false);
|
||||
if (value)
|
||||
return value;
|
||||
ArgonObject *name = get_field_for_class(
|
||||
get_field(to_access, "__class__", false, false), "__name__", to_access);
|
||||
*err = create_err(
|
||||
0, 0, 0, "", "Runtime Error", "'%.*s' object has no attribute '%.*s'",
|
||||
(int)name->value.as_str.length, name->value.as_str.data,
|
||||
(int)access->value.as_str.length, access->value.as_str.data);
|
||||
}
|
||||
ArgonObject *name = get_field_for_class(
|
||||
get_field(to_access, "__class__", false, false), "__name__", to_access);
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"'%.*s' object has no attribute '%.*s'",
|
||||
(int)name->value.as_str.length, name->value.as_str.data,
|
||||
(int)access->value.as_str.length, access->value.as_str.data);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
@@ -16,8 +16,11 @@
|
||||
#include <string.h>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <psapi.h>
|
||||
#ifndef _WIN32_WINNT
|
||||
#define _WIN32_WINNT 0x0602
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#include <psapi.h>
|
||||
|
||||
double get_memory_usage_mb() {
|
||||
PROCESS_MEMORY_COUNTERS pmc;
|
||||
|
||||
@@ -126,6 +126,56 @@ ArgonObject *ARGON_NUMBER_TYPE___subtract__(size_t argc, ArgonObject **argv,
|
||||
return result;
|
||||
}
|
||||
|
||||
ArgonObject *ARGON_NUMBER_TYPE___multiply__(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
(void)state;
|
||||
if (argc != 2) {
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"__multiply__ expects 2 arguments, got %" PRIu64, argc);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
mpq_t r;
|
||||
mpq_init(r);
|
||||
if (argv[1]->type != TYPE_NUMBER) {
|
||||
ArgonObject *type_name = get_field_for_class(
|
||||
get_field(argv[1], "__class__", false, false), "__name__", argv[1]);
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"__multiply__ cannot perform multiplication between number and %.*s",
|
||||
type_name->value.as_str.length,
|
||||
type_name->value.as_str.data);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
mpq_mul(r, *argv[0]->value.as_number, *argv[1]->value.as_number);
|
||||
ArgonObject *result = new_number_object(r);
|
||||
mpq_clear(r);
|
||||
return result;
|
||||
}
|
||||
|
||||
ArgonObject *ARGON_NUMBER_TYPE___division__(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
(void)state;
|
||||
if (argc != 2) {
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"__division__ expects 2 arguments, got %" PRIu64, argc);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
mpq_t r;
|
||||
mpq_init(r);
|
||||
if (argv[1]->type != TYPE_NUMBER) {
|
||||
ArgonObject *type_name = get_field_for_class(
|
||||
get_field(argv[1], "__class__", false, false), "__name__", argv[1]);
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"__division__ cannot perform division between number and %.*s",
|
||||
type_name->value.as_str.length,
|
||||
type_name->value.as_str.data);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
mpq_div(r, *argv[0]->value.as_number, *argv[1]->value.as_number);
|
||||
ArgonObject *result = new_number_object(r);
|
||||
mpq_clear(r);
|
||||
return result;
|
||||
}
|
||||
|
||||
ArgonObject *ARGON_NUMBER_TYPE___string__(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
(void)state;
|
||||
@@ -298,12 +348,18 @@ void create_ARGON_NUMBER_TYPE() {
|
||||
add_field(ARGON_NUMBER_TYPE, "__subtract__",
|
||||
create_argon_native_function("__subtract__",
|
||||
ARGON_NUMBER_TYPE___subtract__));
|
||||
add_field(ARGON_NUMBER_TYPE, "__multiply__",
|
||||
create_argon_native_function("__multiply__",
|
||||
ARGON_NUMBER_TYPE___multiply__));
|
||||
add_field(ARGON_NUMBER_TYPE, "__division__",
|
||||
create_argon_native_function("__division__",
|
||||
ARGON_NUMBER_TYPE___division__));
|
||||
}
|
||||
|
||||
void mpz_init_gc_managed(mpz_t z, size_t limbs_count) {
|
||||
z->_mp_alloc = limbs_count;
|
||||
z->_mp_size = 0;
|
||||
z->_mp_d = ar_alloc(limbs_count * sizeof(mp_limb_t));
|
||||
z->_mp_d = ar_alloc_atomic(limbs_count * sizeof(mp_limb_t));
|
||||
}
|
||||
|
||||
void mpq_init_gc_managed(mpq_t q, size_t num_limbs, size_t den_limbs) {
|
||||
|
||||
@@ -37,10 +37,10 @@ ArgonObject *ACCESS_FUNCTION;
|
||||
ArgonObject *ADDITION_FUNCTION;
|
||||
ArgonObject *SUBTRACTION_FUNCTION;
|
||||
ArgonObject *MULTIPLY_FUNCTION;
|
||||
ArgonObject *DIVIDE_FUNCTION;
|
||||
ArgonObject *DIVISION_FUNCTION;
|
||||
ArgonObject *POWER_FUNCTION;
|
||||
ArgonObject *MODULO_FUNCTION;
|
||||
ArgonObject *FLOORDIV_FUNCTION;
|
||||
ArgonObject *FLOORDIVISION_FUNCTION;
|
||||
|
||||
ArgonObject *ARGON_ADDITION_FUNCTION(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
@@ -70,7 +70,7 @@ ArgonObject *ARGON_SUBTRACTION_FUNCTION(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
if (argc < 1) {
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"add expects at least 1 argument, got %" PRIu64, argc);
|
||||
"subtract expects at least 1 argument, got %" PRIu64, argc);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
ArgonObject *output = argv[0];
|
||||
@@ -91,6 +91,56 @@ ArgonObject *ARGON_SUBTRACTION_FUNCTION(size_t argc, ArgonObject **argv,
|
||||
return output;
|
||||
}
|
||||
|
||||
ArgonObject *ARGON_MULTIPLY_FUNCTION(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
if (argc < 1) {
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"multiply expects at least 1 argument, got %" PRIu64, argc);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
ArgonObject *output = argv[0];
|
||||
for (size_t i = 1; i < argc; i++) {
|
||||
ArgonObject *__multiply__ = get_field_for_class(
|
||||
get_field(output, "__class__", false, false), "__multiply__", output);
|
||||
if (!__multiply__) {
|
||||
ArgonObject *cls___name__ = get_field(output, "__name__", true, false);
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"Object '%.*s' is missing __multiply__ method",
|
||||
(int)cls___name__->value.as_str.length,
|
||||
cls___name__->value.as_str.data);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
output =
|
||||
argon_call(__multiply__, 1, (ArgonObject *[]){argv[i]}, err, state);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
ArgonObject *ARGON_DIVISION_FUNCTION(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
if (argc < 1) {
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"division expects at least 1 argument, got %" PRIu64, argc);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
ArgonObject *output = argv[0];
|
||||
for (size_t i = 1; i < argc; i++) {
|
||||
ArgonObject *__multiply__ = get_field_for_class(
|
||||
get_field(output, "__class__", false, false), "__division__", output);
|
||||
if (!__multiply__) {
|
||||
ArgonObject *cls___name__ = get_field(output, "__name__", true, false);
|
||||
*err = create_err(0, 0, 0, "", "Runtime Error",
|
||||
"Object '%.*s' is missing __division__ method",
|
||||
(int)cls___name__->value.as_str.length,
|
||||
cls___name__->value.as_str.data);
|
||||
return ARGON_NULL;
|
||||
}
|
||||
output =
|
||||
argon_call(__multiply__, 1, (ArgonObject *[]){argv[i]}, err, state);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
ArgonObject *ARGON_TYPE_TYPE___call__(size_t argc, ArgonObject **argv,
|
||||
ArErr *err, RuntimeState *state) {
|
||||
(void)state;
|
||||
@@ -509,6 +559,10 @@ void bootstrap_types() {
|
||||
create_argon_native_function("add", ARGON_ADDITION_FUNCTION);
|
||||
SUBTRACTION_FUNCTION =
|
||||
create_argon_native_function("subtract", ARGON_SUBTRACTION_FUNCTION);
|
||||
MULTIPLY_FUNCTION =
|
||||
create_argon_native_function("multiply", ARGON_MULTIPLY_FUNCTION);
|
||||
DIVISION_FUNCTION =
|
||||
create_argon_native_function("division", ARGON_DIVISION_FUNCTION);
|
||||
add_field(BASE_CLASS, "__get_attr__", ACCESS_FUNCTION);
|
||||
}
|
||||
|
||||
@@ -527,6 +581,8 @@ void bootstrap_globals() {
|
||||
add_to_scope(Global_Scope, "number", ARGON_NUMBER_TYPE);
|
||||
add_to_scope(Global_Scope, "add", ADDITION_FUNCTION);
|
||||
add_to_scope(Global_Scope, "subtract", SUBTRACTION_FUNCTION);
|
||||
add_to_scope(Global_Scope, "multiply", MULTIPLY_FUNCTION);
|
||||
add_to_scope(Global_Scope, "division", DIVISION_FUNCTION);
|
||||
|
||||
ArgonObject *argon_term = new_object();
|
||||
add_field(argon_term, "__init__", ARGON_NULL);
|
||||
@@ -722,6 +778,12 @@ ArErr run_instruction(Translated *translated, RuntimeState *state,
|
||||
case OP_LOAD_SUBTRACTION_FUNCTION:
|
||||
state->registers[0] = SUBTRACTION_FUNCTION;
|
||||
break;
|
||||
case OP_LOAD_MULTIPLY_FUNCTION:
|
||||
state->registers[0] = MULTIPLY_FUNCTION;
|
||||
break;
|
||||
case OP_LOAD_DIVISION_FUNCTION:
|
||||
state->registers[0] = DIVISION_FUNCTION;
|
||||
break;
|
||||
default:
|
||||
return create_err(0, 0, 0, NULL, "Runtime Error", "Invalid Opcode %#x",
|
||||
opcode);
|
||||
|
||||
273
src/shell.c
Normal file
273
src/shell.c
Normal file
@@ -0,0 +1,273 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2025 William Bell
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
*/
|
||||
#include "./lexer/lexer.h"
|
||||
#include "./runtime/call/call.h"
|
||||
#include "./runtime/objects/functions/functions.h"
|
||||
#include "./runtime/objects/term/term.h"
|
||||
#include "./runtime/runtime.h"
|
||||
#include "./translator/translator.h"
|
||||
#include <signal.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#if defined(__linux__)
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
FILE *fmemopen(void *buf, size_t size, const char *mode) {
|
||||
if (strchr(mode, 'r') == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
FILE *tmp = tmpfile();
|
||||
if (!tmp)
|
||||
return NULL;
|
||||
|
||||
if (fwrite(buf, 1, size, tmp) != size) {
|
||||
fclose(tmp);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
rewind(tmp);
|
||||
|
||||
return tmp;
|
||||
}
|
||||
#else
|
||||
#include "../external/linenoise/linenoise.h"
|
||||
#endif
|
||||
|
||||
// Ctrl+C handler
|
||||
void handle_sigint(int sig) {
|
||||
(void)sig;
|
||||
printf("\nBye :)\n");
|
||||
exit(0);
|
||||
}
|
||||
|
||||
int execute_code(FILE *stream, char *path, Stack *scope,
|
||||
RuntimeState *runtime_state) {
|
||||
if (!stream) {
|
||||
perror("fmemopen");
|
||||
return 1;
|
||||
}
|
||||
|
||||
ArErr err;
|
||||
|
||||
DArray tokens;
|
||||
darray_init(&tokens, sizeof(Token));
|
||||
LexerState state = {path, stream, 0, 0, &tokens};
|
||||
err = lexer(state);
|
||||
if (err.exists) {
|
||||
darray_free(&tokens, free_token);
|
||||
output_err(err);
|
||||
return 1;
|
||||
}
|
||||
|
||||
DArray ast;
|
||||
|
||||
darray_init(&ast, sizeof(ParsedValue));
|
||||
|
||||
err = parser(path, &ast, &tokens, false);
|
||||
darray_free(&tokens, free_token);
|
||||
if (err.exists) {
|
||||
darray_free(&ast, free_parsed);
|
||||
output_err(err);
|
||||
return 1;
|
||||
}
|
||||
Translated __translated = init_translator(path);
|
||||
err = translate(&__translated, &ast);
|
||||
darray_free(&ast, free_parsed);
|
||||
if (err.exists) {
|
||||
darray_free(&__translated.bytecode, NULL);
|
||||
free(__translated.constants.data);
|
||||
hashmap_free(__translated.constants.hashmap, NULL);
|
||||
output_err(err);
|
||||
return 1;
|
||||
}
|
||||
|
||||
hashmap_free(__translated.constants.hashmap, NULL);
|
||||
Translated translated = {
|
||||
__translated.registerCount, NULL, {}, {}, __translated.path};
|
||||
translated.bytecode.data = ar_alloc(__translated.bytecode.capacity);
|
||||
memcpy(translated.bytecode.data, __translated.bytecode.data,
|
||||
__translated.bytecode.capacity);
|
||||
translated.bytecode.element_size = __translated.bytecode.element_size;
|
||||
translated.bytecode.size = __translated.bytecode.size;
|
||||
translated.bytecode.resizable = false;
|
||||
translated.bytecode.capacity =
|
||||
__translated.bytecode.size * __translated.bytecode.element_size;
|
||||
translated.constants.data = ar_alloc(__translated.constants.capacity);
|
||||
memcpy(translated.constants.data, __translated.constants.data,
|
||||
__translated.constants.capacity);
|
||||
translated.constants.size = __translated.constants.size;
|
||||
translated.constants.capacity = __translated.constants.capacity;
|
||||
darray_free(&__translated.bytecode, NULL);
|
||||
free(__translated.constants.data);
|
||||
*runtime_state = init_runtime_state(translated, path);
|
||||
err = runtime(translated, *runtime_state, scope);
|
||||
if (err.exists) {
|
||||
output_err(err);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Simple input function
|
||||
char *input(const char *prompt) {
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
printf("%s", prompt);
|
||||
fflush(stdout);
|
||||
|
||||
char *buffer = NULL;
|
||||
size_t size = 0;
|
||||
ssize_t len = getline(&buffer, &size, stdin);
|
||||
|
||||
if (len == -1) {
|
||||
free(buffer);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (len > 0 && buffer[len - 1] == '\n') {
|
||||
buffer[len - 1] = '\0';
|
||||
}
|
||||
#else
|
||||
char *buffer = linenoise(prompt);
|
||||
if (buffer && buffer[0] != '\0') {
|
||||
linenoiseHistoryAdd(buffer);
|
||||
}
|
||||
#endif
|
||||
return buffer;
|
||||
}
|
||||
|
||||
char *read_all_stdin(size_t *out_len) {
|
||||
size_t size = 1024;
|
||||
size_t len = 0;
|
||||
char *buffer = malloc(size);
|
||||
if (!buffer)
|
||||
exit(1);
|
||||
|
||||
int c;
|
||||
while ((c = fgetc(stdin)) != EOF) {
|
||||
if (len + 1 >= size) {
|
||||
size *= 2;
|
||||
buffer = realloc(buffer, size);
|
||||
if (!buffer)
|
||||
exit(1);
|
||||
}
|
||||
buffer[len++] = (char)c;
|
||||
}
|
||||
|
||||
*out_len = len;
|
||||
return buffer;
|
||||
}
|
||||
|
||||
int shell() {
|
||||
|
||||
Stack *main_scope = create_scope(Global_Scope);
|
||||
|
||||
if (!isatty(STDIN_FILENO)) {
|
||||
RuntimeState runtime_state;
|
||||
size_t len;
|
||||
char *data = read_all_stdin(&len);
|
||||
FILE *file = fmemopen(data, len, "r");
|
||||
int resp = execute_code(file, "<stdin>", main_scope, &runtime_state);
|
||||
fclose(file);
|
||||
free(data);
|
||||
return resp;
|
||||
}
|
||||
|
||||
signal(SIGINT, handle_sigint);
|
||||
|
||||
printf("Welcome to the Argon shell!\n\n");
|
||||
|
||||
ArgonObject *output_object = create_argon_native_function("log", term_log);
|
||||
char *totranslate = NULL;
|
||||
size_t totranslatelength = 0;
|
||||
|
||||
while (true) {
|
||||
#if defined(__linux__)
|
||||
malloc_trim(0);
|
||||
#endif
|
||||
if (totranslate) {
|
||||
free(totranslate);
|
||||
totranslate = NULL;
|
||||
totranslatelength = 0;
|
||||
};
|
||||
int indent = 0;
|
||||
char textBefore[] = ">>> ";
|
||||
|
||||
// Dynamic array of lines
|
||||
|
||||
do {
|
||||
// indent string
|
||||
size_t isz = (size_t)indent * 4;
|
||||
char *indentStr = (char *)malloc(isz + 1);
|
||||
if (!indentStr)
|
||||
exit(1);
|
||||
memset(indentStr, ' ', isz);
|
||||
indentStr[isz] = '\0';
|
||||
|
||||
// prompt
|
||||
size_t p_len = strlen(textBefore) + isz;
|
||||
char *prompt = (char *)malloc(p_len + 1);
|
||||
if (!prompt)
|
||||
exit(1);
|
||||
memcpy(prompt, textBefore, strlen(textBefore));
|
||||
memcpy(prompt + strlen(textBefore), indentStr, isz + 1);
|
||||
|
||||
char *inp = input(prompt);
|
||||
free(prompt);
|
||||
|
||||
if (!inp) {
|
||||
printf("\nBye :)\n");
|
||||
// Free previously collected lines
|
||||
free(inp);
|
||||
free(totranslate);
|
||||
free(indentStr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Append line to totranslate
|
||||
size_t length = strlen(inp);
|
||||
totranslate = realloc(totranslate, totranslatelength + isz + length + 1);
|
||||
memcpy(totranslate + totranslatelength, indentStr, isz);
|
||||
memcpy(totranslate + totranslatelength + isz, inp, length);
|
||||
totranslatelength += isz + length + 1;
|
||||
totranslate[totranslatelength - 1] = '\n';
|
||||
|
||||
char *trimmed = inp;
|
||||
while (*trimmed == ' ' || *trimmed == '\t')
|
||||
trimmed++;
|
||||
|
||||
size_t len = strlen(trimmed);
|
||||
if (len >= 2 && strcmp(trimmed + len - 2, "do") == 0) {
|
||||
indent++;
|
||||
} else if (len == 0 && indent > 0) {
|
||||
indent--;
|
||||
}
|
||||
free(inp);
|
||||
strcpy(textBefore, "... ");
|
||||
free(indentStr);
|
||||
|
||||
} while (indent > 0);
|
||||
totranslate = realloc(totranslate, totranslatelength + 1);
|
||||
totranslate[totranslatelength] = '\0';
|
||||
RuntimeState runtime_state;
|
||||
FILE *file = fmemopen((void *)totranslate, totranslatelength, "r");
|
||||
int resp = execute_code(file, "<shell>", main_scope, &runtime_state);
|
||||
fclose(file);
|
||||
if (resp) {
|
||||
continue;
|
||||
}
|
||||
ArErr err;
|
||||
argon_call(output_object, 1, (ArgonObject *[]){runtime_state.registers[0]},
|
||||
&err, &runtime_state);
|
||||
totranslatelength = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
12
src/shell.h
Normal file
12
src/shell.h
Normal file
@@ -0,0 +1,12 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2025 William Bell
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef ARGON_SHELL_H
|
||||
#define ARGON_SHELL_H
|
||||
|
||||
int shell();
|
||||
|
||||
#endif // ARGON_SHELL_H
|
||||
@@ -10,19 +10,22 @@ size_t translate_access(Translated *translated, ParsedAccess *access,
|
||||
set_registers(translated, 1);
|
||||
uint64_t first = push_instruction_byte(translated, OP_LOAD_ACCESS_FUNCTION);
|
||||
push_instruction_byte(translated, OP_INIT_CALL);
|
||||
push_instruction_code(translated, 3);
|
||||
push_instruction_code(translated, access->access.size + 2);
|
||||
|
||||
translate_parsed(translated, &access->to_access, err);
|
||||
push_instruction_byte(translated, OP_INSERT_ARG);
|
||||
push_instruction_code(translated, 0);
|
||||
translate_parsed(translated, darray_get(&access->access, 0), err);
|
||||
push_instruction_byte(translated, OP_INSERT_ARG);
|
||||
push_instruction_code(translated, 1);
|
||||
|
||||
push_instruction_byte(translated, OP_LOAD_BOOL);
|
||||
push_instruction_byte(translated, access->access_fields);
|
||||
push_instruction_byte(translated, OP_INSERT_ARG);
|
||||
push_instruction_code(translated, 2);
|
||||
push_instruction_code(translated, 1);
|
||||
|
||||
for (size_t i = 0; i < access->access.size; i++) {
|
||||
translate_parsed(translated, darray_get(&access->access, i), err);
|
||||
push_instruction_byte(translated, OP_INSERT_ARG);
|
||||
push_instruction_code(translated, 2+i);
|
||||
}
|
||||
|
||||
push_instruction_byte(translated, OP_SOURCE_LOCATION);
|
||||
push_instruction_code(translated, access->line);
|
||||
push_instruction_code(translated, access->column);
|
||||
|
||||
@@ -135,4 +135,12 @@ loads the addition function into register 1
|
||||
|
||||
## OP_LOAD_SUBTRACTION_FUNCTION
|
||||
|
||||
loads the subtraction function into register 1
|
||||
loads the subtraction function into register 1
|
||||
|
||||
## OP_LOAD_MULTIPLY_FUNCTION
|
||||
|
||||
loads the multiply function into register 1
|
||||
|
||||
## OP_LOAD_DIVISION_FUNCTION
|
||||
|
||||
loads the division function into register 1
|
||||
@@ -18,6 +18,12 @@ size_t translate_operation(Translated *translated, ParsedOperation *operation,
|
||||
case TOKEN_MINUS:
|
||||
first = push_instruction_byte(translated, OP_LOAD_SUBTRACTION_FUNCTION);
|
||||
break;
|
||||
case TOKEN_STAR:
|
||||
first = push_instruction_byte(translated, OP_LOAD_MULTIPLY_FUNCTION);
|
||||
break;
|
||||
case TOKEN_SLASH:
|
||||
first = push_instruction_byte(translated, OP_LOAD_DIVISION_FUNCTION);
|
||||
break;
|
||||
default:
|
||||
*err = create_err(operation->line, operation->column, operation->length,
|
||||
translated->path, "Syntax Error", "unknown operation");
|
||||
|
||||
@@ -33,7 +33,9 @@ typedef enum {
|
||||
OP_LOAD_BOOL,
|
||||
OP_LOAD_NUMBER,
|
||||
OP_LOAD_ADDITION_FUNCTION,
|
||||
OP_LOAD_SUBTRACTION_FUNCTION
|
||||
OP_LOAD_SUBTRACTION_FUNCTION,
|
||||
OP_LOAD_MULTIPLY_FUNCTION,
|
||||
OP_LOAD_DIVISION_FUNCTION
|
||||
} OperationType;
|
||||
|
||||
void arena_resize(ConstantArena *arena, size_t new_size);
|
||||
|
||||
31
testing.ar
31
testing.ar
@@ -5,6 +5,33 @@ let say_hi(name) = do
|
||||
do
|
||||
return name
|
||||
)
|
||||
return "hello "+u+", how are you?"
|
||||
|
||||
term.log(say_hi("william"))
|
||||
return "hello "+u+", how are you?"
|
||||
term.log(say_hi("william")
|
||||
, say_hi)
|
||||
|
||||
let a = 9
|
||||
let b = 10
|
||||
term.log(string(a)+'+'+string(b)+'='+string(a+b))
|
||||
|
||||
|
||||
let call(f) = do
|
||||
term.log(f)
|
||||
|
||||
return f()
|
||||
|
||||
|
||||
term.log(
|
||||
call(
|
||||
()=call(
|
||||
()=call(
|
||||
()=call(
|
||||
()=do
|
||||
term.log("hello this is a test of anonymous functions. hopefully this works :)")
|
||||
|
||||
return say_hi("test")
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
12
windows-profile.txt
Normal file
12
windows-profile.txt
Normal file
@@ -0,0 +1,12 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
compiler=gcc
|
||||
compiler.version=12
|
||||
compiler.libcxx=libstdc++11
|
||||
compiler.threads=posix
|
||||
compiler.exception=seh
|
||||
arch=x86_64
|
||||
build_type=Release
|
||||
|
||||
[tool_requires]
|
||||
mingw-builds/12.2.0
|
||||
Reference in New Issue
Block a user