Compare commits

..

54 Commits

Author SHA1 Message Date
William Bell
0c0832d131 add shell and stdin piping support 2025-08-18 06:22:13 +01:00
William Bell
1742a0c52d add shell and stdin piping support 2025-08-18 06:22:00 +01:00
William Bell
224039ba43 fix arch name 2025-08-17 01:30:18 +01:00
William Bell
5e7ce495e4 fix runner 2025-08-17 01:12:52 +01:00
William Bell
35a0f35cf8 add native arm support 2025-08-17 00:49:34 +01:00
William Bell
f9490ceac0 bloody ai 2025-08-16 18:28:50 +01:00
William Bell
4cda311008 bloody ai 2025-08-16 18:25:46 +01:00
William Bell
b3aa653076 incorrect environment variable assignment 2025-08-16 18:20:12 +01:00
William Bell
fc3321bcf0 incorrect package name 2025-08-16 18:18:00 +01:00
William Bell
868b3bfc3d change to cross compile linux 2025-08-16 18:15:32 +01:00
William Bell
f5e241aba0 forgot to add cmake and make 2025-08-16 16:08:06 +01:00
William Bell
8c3ee3fe05 fix --break-system-packages 2025-08-16 15:42:34 +01:00
William Bell
eb285b6e8f add linux arm64 to builds and reshape how execution is done. 2025-08-16 15:25:33 +01:00
William Bell
78a1edd572 add calculation to test 2025-08-16 05:40:29 +01:00
William Bell
b905026010 fix rosetta not used 2025-08-16 04:31:21 +01:00
William Bell
677afd9433 fix using Rosetta 2025-08-16 04:10:57 +01:00
William Bell
757da3f973 stupid ai 2025-08-16 03:51:05 +01:00
William Bell
5a86510c3b fix release for macos x86_64 and arm64 2025-08-16 03:48:48 +01:00
William Bell
fb8b6a89ae build for more architectures 2025-08-16 03:41:32 +01:00
William Bell
6ddf9953e7 change windows builds to tar.gz 2025-08-16 03:23:01 +01:00
William Bell
1609227a42 add bcrypt for windows 2025-08-16 03:10:50 +01:00
William Bell
51f6a88ce8 add profile to build 2025-08-16 03:00:01 +01:00
William Bell
f420273471 fix backslashes 2025-08-16 02:46:33 +01:00
William Bell
4b2a747338 use msys/flex 2025-08-16 02:36:47 +01:00
William Bell
5277814af0 fix conan 2025-08-16 02:31:15 +01:00
William Bell
8928ab2d99 add cmake as dependency 2025-08-16 02:20:57 +01:00
William Bell
d08b307c6e add python as a dependency 2025-08-16 02:12:55 +01:00
William Bell
6474329afc switch to conan for windows 2025-08-16 02:08:56 +01:00
William Bell
c49e67c839 switch windows to use conan 2025-08-16 02:04:00 +01:00
William Bell
25cb96e473 try get it to be static 2025-08-16 01:57:56 +01:00
William Bell
f11890a8b3 fix linking for linux and macos 2025-08-16 01:39:44 +01:00
William Bell
59b1d222c2 fix cmake 2025-08-16 01:32:57 +01:00
William Bell
2fba132016 make gc and gmp static and math dynamic 2025-08-16 01:22:08 +01:00
William Bell
bddc2cdc79 fix release to merge multiple 2025-08-16 01:06:06 +01:00
William Bell
e1b80b42d9 fix make release 2025-08-16 01:02:48 +01:00
William Bell
dab86925b4 fix winblows 2025-08-16 00:58:56 +01:00
William Bell
0f45052dce fix for winblows 2025-08-16 00:56:35 +01:00
William Bell
68f4207216 fix for winblows 2025-08-16 00:54:33 +01:00
William Bell
f9f8ca08c6 fix bug for windows 2025-08-16 00:50:23 +01:00
William Bell
0666b02c13 fix flex tool 2025-08-16 00:44:00 +01:00
William Bell
1654507835 fix for windows 2025-08-16 00:42:13 +01:00
William Bell
d054ece8e2 release 2025-08-16 00:39:37 +01:00
William Bell
4937942d6e fix release 2025-08-16 00:35:48 +01:00
William Bell
82ea92183f fix release 2025-08-16 00:28:08 +01:00
William Bell
5fb15b476f fix release 2025-08-16 00:26:26 +01:00
William Bell
d1a455dbbe fix release.yml 2025-08-16 00:07:10 +01:00
William Bell
a81640747d fix release.yml 2025-08-15 22:07:25 +01:00
William Bell
4a1ed23f96 fix release.yml 2025-08-15 22:05:57 +01:00
William Bell
eb36d02fcb fix release.yml 2025-08-15 22:03:23 +01:00
William Bell
7b3a1e1835 fix release.yml 2025-08-15 21:52:16 +01:00
William Bell
8e53579682 fix release.yml 2025-08-15 21:36:51 +01:00
William Bell
0d8f262185 this thing is really annoying me now 2025-08-15 21:34:31 +01:00
William Bell
fc6f41d89b fix release.yml 2025-08-15 21:30:01 +01:00
William Bell
6a7ce72eb7 fix cmake 2025-08-15 21:23:08 +01:00
14 changed files with 472 additions and 110 deletions

View File

@@ -10,8 +10,8 @@ on:
- '*' # Any tag - '*' # Any tag
jobs: jobs:
build-linux: build-linux-x86_64:
runs-on: ubuntu-latest runs-on: ubuntu-latest # build both architectures
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@@ -51,18 +51,17 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: linux-artifact name: linux-x86_64-artifact
path: ${{ env.TAR_NAME }} path: ${{ env.TAR_NAME }}
build-linux-arm64:
build-macos: runs-on: ubuntu-22.04-arm # build both architectures
runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Install build tools - name: Install build tools
run: brew install flex bison run: sudo apt-get update && sudo apt-get install -y flex bison
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4
@@ -95,19 +94,21 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: macos-artifact name: linux-arm64-artifact
path: ${{ env.TAR_NAME }} path: ${{ env.TAR_NAME }}
build-windows: build-macos:
runs-on: windows-latest runs-on: macos-latest
strategy:
matrix:
arch: [x86_64, arm64] # build both architectures
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Install build tools - name: Install build tools
run: choco install winflexbison -y run: brew install flex bison
shell: pwsh
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4
@@ -118,26 +119,97 @@ jobs:
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install conan pip install conan
conan profile detect if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
shell: pwsh arch -x86_64 conan profile detect
else
conan profile detect
fi
- name: Build with MinGW - name: Build
run: | run: |
conan install . BUILD_DIR="build_${{ matrix.arch }}"
conan build . mkdir -p "$BUILD_DIR"
shell: pwsh cd "$BUILD_DIR"
# 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 - name: Package
run: | run: |
$TAG = $env:GITHUB_REF -replace 'refs/tags/', '' TAG=${GITHUB_REF##refs/tags/}
$ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' } OS="macos"
$FOLDER = "chloride-$TAG-windows-$ARCH" ARCH="${{ matrix.arch }}"
$ZIP = "$FOLDER.zip" FOLDER="chloride-$TAG-$OS-$ARCH"
Rename-Item build\bin $FOLDER TAR="$FOLDER.tar.gz"
Copy-Item LICENSE.txt $FOLDER mv build/bin "$FOLDER"
Compress-Archive -Path $FOLDER -DestinationPath $ZIP cp LICENSE.txt "$FOLDER"
echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV tar -czf "$TAR" "$FOLDER"
shell: pwsh 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 - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@@ -147,12 +219,13 @@ jobs:
release: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [build-linux, build-macos, build-windows] needs: [build-linux-x86_64, build-linux-arm64, build-macos, build-windows]
steps: steps:
- name: Download artifacts - name: Download artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
path: ./artifacts path: ./artifacts
merge-multiple: true
- name: Create GitHub Release - name: Create GitHub Release
uses: ncipollo/release-action@v1 uses: ncipollo/release-action@v1

3
.gitmodules vendored
View File

@@ -11,3 +11,6 @@
[submodule "external/libdye"] [submodule "external/libdye"]
path = external/libdye path = external/libdye
url = https://github.com/Ugric/libdye.git url = https://github.com/Ugric/libdye.git
[submodule "external/linenoise"]
path = external/linenoise
url = https://github.com/antirez/linenoise

View File

@@ -34,7 +34,7 @@ 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 external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c ${CFILES} ${LEXER_C}) add_executable(argon external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c external/linenoise/linenoise.c ${CFILES} ${LEXER_C})
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) 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/cwalk/include)
target_include_directories(argon PRIVATE ${CMAKE_SOURCE_DIR}/external/libdye/include) target_include_directories(argon PRIVATE ${CMAKE_SOURCE_DIR}/external/libdye/include)
@@ -51,15 +51,13 @@ set_target_properties(argon PROPERTIES
find_package(BDWgc REQUIRED) find_package(BDWgc REQUIRED)
find_package(gmp REQUIRED) find_package(gmp REQUIRED)
target_compile_options(argon PRIVATE -O3 -Wall -s) 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 target_link_libraries(argon PRIVATE
BDWgc::BDWgc BDWgc::BDWgc
gmp::gmp gmp::gmp
m m
$<$<PLATFORM_ID:Windows>:bcrypt>
) )
target_include_directories(argon PRIVATE target_include_directories(argon PRIVATE

View File

@@ -2,26 +2,31 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # 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_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 = 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 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) all: $(BINARY)
$(LEXER_C) $(LEXER_H): $(LEXER_SRC) $(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) $(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) ${LDFLAGS} -s
native: $(CFILES) $(LEXER_C) $(LEXER_H) native: $(CFILES) $(LEXER_C) $(LEXER_H)
mkdir -p bin 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) debug: $(CFILES) $(LEXER_C) $(LEXER_H)
mkdir -p bin mkdir -p bin
@@ -29,13 +34,13 @@ debug: $(CFILES) $(LEXER_C) $(LEXER_H)
full-debug: $(CFILES) $(LEXER_C) $(LEXER_H) full-debug: $(CFILES) $(LEXER_C) $(LEXER_H)
mkdir -p bin 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) 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) ${LDFLAGS}
${BINARY} rand_test.ar ${BINARY} rand_test.ar
gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS) gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
clean: clean:

View File

@@ -33,14 +33,9 @@ class ArgonConan(ConanFile):
os.environ["CONAN_NON_INTERACTIVE"] = "1" os.environ["CONAN_NON_INTERACTIVE"] = "1"
tc = CMakeToolchain(self) tc = CMakeToolchain(self)
if os.name == "nt": # Windows flex_path = which("flex")
flex_path = which("win_flex") or which("win_flex.exe") if not flex_path:
if not flex_path: raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
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.")
tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\") tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\")
tc.generate() tc.generate()

1
external/linenoise vendored Submodule

Submodule external/linenoise added at d895173d67

View File

@@ -11,6 +11,8 @@
#include "lexer/token.h" #include "lexer/token.h"
#include "memory.h" #include "memory.h"
#include "parser/parser.h" #include "parser/parser.h"
#include "returnTypes.h"
#include "shell.h"
#include "runtime/runtime.h" #include "runtime/runtime.h"
#include "translator/translator.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 htole64(x) OSSwapHostToLittleInt64(x)
#define le64toh(x) OSSwapLittleToHostInt64(x) #define le64toh(x) OSSwapLittleToHostInt64(x)
// Add others as needed // Add others as needed
#else #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
#error "Unsupported platform" #include <stdlib.h>
#include <sys/endian.h>
#endif #endif
char *get_current_directory() { char *get_current_directory() {
@@ -158,7 +161,7 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
char *source_path) { char *source_path) {
FILE *bytecode_file = fopen(joined_paths, "rb"); FILE *bytecode_file = fopen(joined_paths, "rb");
if (!bytecode_file) { if (!bytecode_file) {
fprintf(stderr,"cache doesnt exist... compiling from source.\n"); fprintf(stderr, "cache doesnt exist... compiling from source.\n");
return 1; return 1;
} }
@@ -194,7 +197,7 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
XXH64_freeState(state); XXH64_freeState(state);
if (calc_hash != stored_hash) { if (calc_hash != stored_hash) {
fprintf(stderr,"cache hash mismatch (corrupted?)\n"); fprintf(stderr, "cache hash mismatch (corrupted?)\n");
goto FAILED; goto FAILED;
} }
@@ -268,27 +271,29 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
goto FAILED; 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); fclose(bytecode_file);
return 0; return 0;
FAILED: FAILED:
fprintf(stderr,"cache is invalid... compiling from source.\n"); fprintf(stderr, "cache is invalid... compiling from source.\n");
fclose(bytecode_file); fclose(bytecode_file);
return 1; return 1;
} }
Execution execute(char *path, Stack *stack) { Translated load_argon_file(char *path, ArErr *err) {
clock_t start, end; clock_t start, end;
clock_t beginning = clock();
double time_spent, total_time_spent = 0; double time_spent, total_time_spent = 0;
const char *basename_ptr; const char *basename_ptr;
size_t basename_length; size_t basename_length;
cwk_path_get_basename(path, &basename_ptr, &basename_length); cwk_path_get_basename(path, &basename_ptr, &basename_length);
if (!basename_ptr) if (!basename_ptr) {
return (Execution){create_err(0, 0, 0, NULL, "Path Error", *err = create_err(0, 0, 0, NULL, "Path Error", "path has no basename '%s'",
"path has no basename '%s'", path), path);
(Stack){NULL, NULL}}; return (Translated){};
}
char basename[FILENAME_MAX]; char basename[FILENAME_MAX];
memcpy(basename, basename_ptr, basename_length); memcpy(basename, basename_ptr, basename_length);
@@ -312,9 +317,9 @@ Execution execute(char *path, Stack *stack) {
FILE *file = fopen(path, "r"); FILE *file = fopen(path, "r");
if (!file) { if (!file) {
return (Execution){create_err(0, 0, 0, NULL, "File Error", *err = create_err(0, 0, 0, NULL, "File Error", "Unable to open file '%s'",
"Unable to open file '%s'", path), path);
(Stack){NULL, NULL}}; return (Translated){};
} }
XXH3_state_t *hash_state = XXH3_createState(); XXH3_state_t *hash_state = XXH3_createState();
@@ -338,15 +343,14 @@ Execution execute(char *path, Stack *stack) {
LexerState state = {path, file, 0, 0, &tokens}; LexerState state = {path, file, 0, 0, &tokens};
start = clock(); start = clock();
ArErr err = lexer(state); *err = lexer(state);
if (err.exists) { if (err->exists) {
darray_free(&tokens, free_token); darray_free(&tokens, free_token);
return (Execution){err, (Stack){NULL, NULL}}; return (Translated){};
} }
end = clock(); end = clock();
time_spent = (double)(end - start) / CLOCKS_PER_SEC; 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); fclose(state.file);
DArray ast; DArray ast;
@@ -354,35 +358,30 @@ Execution execute(char *path, Stack *stack) {
darray_init(&ast, sizeof(ParsedValue)); darray_init(&ast, sizeof(ParsedValue));
start = clock(); start = clock();
err = parser(path, &ast, &tokens, false); *err = parser(path, &ast, &tokens, false);
if (err.exists) { darray_free(&tokens, free_token);
darray_free(&tokens, free_token); if (err->exists) {
darray_free(&ast, free_parsed); darray_free(&ast, free_parsed);
return (Execution){err, (Stack){NULL, NULL}}; return (Translated){};
} }
end = clock(); end = clock();
time_spent = (double)(end - start) / CLOCKS_PER_SEC; time_spent = (double)(end - start) / CLOCKS_PER_SEC;
total_time_spent += time_spent; fprintf(stderr, "Parser time taken: %f seconds\n", time_spent);
fprintf(stderr,"Parser time taken: %f seconds\n", time_spent);
darray_free(&tokens, free_token);
start = clock(); start = clock();
translated = init_translator(path); translated = init_translator(path);
err = translate(&translated, &ast); *err = translate(&translated, &ast);
if (err.exists) { darray_free(&ast, free_parsed);
if (err->exists) {
darray_free(&translated.bytecode, NULL); darray_free(&translated.bytecode, NULL);
free(translated.constants.data); free(translated.constants.data);
hashmap_free(translated.constants.hashmap, NULL); hashmap_free(translated.constants.hashmap, NULL);
darray_free(&ast, free_parsed); return (Translated){};
return (Execution){err, (Stack){NULL, NULL}};
} }
end = clock(); end = clock();
time_spent = (double)(end - start) / CLOCKS_PER_SEC; time_spent = (double)(end - start) / CLOCKS_PER_SEC;
total_time_spent += time_spent; fprintf(stderr, "Translation time taken: %f seconds\n", time_spent);
fprintf(stderr,"Translation time taken: %f seconds\n", time_spent);
darray_free(&ast, free_parsed);
#if defined(__linux__) #if defined(__linux__)
malloc_trim(0); malloc_trim(0);
#endif #endif
@@ -444,18 +443,10 @@ Execution execute(char *path, Stack *stack) {
gc_translated.constants.capacity = translated.constants.capacity; gc_translated.constants.capacity = translated.constants.capacity;
darray_free(&translated.bytecode, NULL); darray_free(&translated.bytecode, NULL);
free(translated.constants.data); free(translated.constants.data);
total_time_spent = (double)(clock() - beginning) / CLOCKS_PER_SEC;
start = clock(); fprintf(stderr, "total time taken loading file (%s): %f seconds\n", path,
RuntimeState state = init_runtime_state(gc_translated, path); total_time_spent);
Stack *main_scope = create_scope(stack); return gc_translated;
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};
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@@ -465,18 +456,32 @@ int main(int argc, char *argv[]) {
generate_siphash_key(siphash_key); generate_siphash_key(siphash_key);
bootstrap_types(); bootstrap_types();
bootstrap_globals(); bootstrap_globals();
char *CWD = get_current_directory();
if (argc <= 1) if (argc <= 1)
return -1; return shell();
char *CWD = get_current_directory();
char *path_non_absolute = argv[1]; char *path_non_absolute = argv[1];
char path[FILENAME_MAX]; char path[FILENAME_MAX];
cwk_path_get_absolute(CWD, path_non_absolute, path, sizeof(path)); cwk_path_get_absolute(CWD, path_non_absolute, path, sizeof(path));
free(CWD); 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) if (runtime_hash_table)
hashmap_free(runtime_hash_table, NULL); hashmap_free(runtime_hash_table, NULL);
if (resp.err.exists) { if (err.exists) {
output_err(resp.err); output_err(err);
return 1; return 1;
} }
// Your main thread code // Your main thread code

View File

@@ -7,6 +7,7 @@
#include "number.h" #include "number.h"
#include "../../memory.h" #include "../../memory.h"
#include <ctype.h> #include <ctype.h>
#include <gmp-x86_64.h>
#include <gmp.h> #include <gmp.h>
#include <gmp.h> #include <gmp.h>
#include <stdio.h> #include <stdio.h>
@@ -180,7 +181,8 @@ ParsedValueReturn parse_number(Token *token, char *path) {
mpq_init(*r_ptr); mpq_init(*r_ptr);
int err = mpq_set_decimal_str_exp(*r_ptr, token->value, token->length); int err = mpq_set_decimal_str_exp(*r_ptr, token->value, token->length);
if (err) { if (err) {
free_parsed(parsedValue); mpq_clear(*r_ptr);
free(r_ptr);
free(parsedValue); free(parsedValue);
return (ParsedValueReturn){create_err(token->line, token->column, return (ParsedValueReturn){create_err(token->line, token->column,
token->length, path, "Parsing Error", token->length, path, "Parsing Error",
@@ -189,4 +191,5 @@ ParsedValueReturn parse_number(Token *token, char *path) {
} }
parsedValue->data = r_ptr; parsedValue->data = r_ptr;
return (ParsedValueReturn){no_err, parsedValue}; return (ParsedValueReturn){no_err, parsedValue};
} }

View File

@@ -20,9 +20,4 @@ typedef struct ArErr {
char type[32]; char type[32];
char message[ERR_MSG_MAX_LEN]; char message[ERR_MSG_MAX_LEN];
} ArErr; } ArErr;
typedef struct Execution {
ArErr err;
Stack stack;
} Execution;
#endif // RETURN_TYPES_ #endif // RETURN_TYPES_

View File

@@ -16,8 +16,11 @@
#include <string.h> #include <string.h>
#if defined(_WIN32) #if defined(_WIN32)
#include <psapi.h> #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0602
#endif
#include <windows.h> #include <windows.h>
#include <psapi.h>
double get_memory_usage_mb() { double get_memory_usage_mb() {
PROCESS_MEMORY_COUNTERS pmc; PROCESS_MEMORY_COUNTERS pmc;

252
src/shell.c Normal file
View File

@@ -0,0 +1,252 @@
/*
* SPDX-FileCopyrightText: 2025 William Bell
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "../external/linenoise/linenoise.h"
#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
volatile sig_atomic_t interrupted = 0;
// Ctrl+C handler
void handle_sigint(int sig) {
(void)sig;
interrupted = 1;
}
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) {
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;
}
// Remove trailing newline
if (len > 0 && buffer[len - 1] == '\n') {
buffer[len - 1] = '\0';
}
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 = linenoise(prompt);
free(prompt);
if (!inp) {
printf("\nBye :)\n");
// Free previously collected lines
free(inp);
free(totranslate);
free(indentStr);
return 0;
}
if (inp[0] != '\0') {
// Optionally add line to history
linenoiseHistoryAdd(inp);
}
// 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
View 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

View File

@@ -7,4 +7,9 @@ let say_hi(name) = do
) )
return "hello "+u+", how are you?" return "hello "+u+", how are you?"
term.log(say_hi("william")) term.log(say_hi("william"))
let a = 9
let b = 10
term.log(string(a)+'+'+string(b)+'='+string(a+b))

12
windows-profile.txt Normal file
View 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