Compare commits

...

13 Commits

Author SHA1 Message Date
William Bell
a96023ced1 fix for winblows 2025-08-18 15:03:11 +01:00
William Bell
1908d9bbbb fix for winblows 2025-08-18 14:43:49 +01:00
William Bell
47db2ca27d fix for winblows 2025-08-18 06:40:59 +01:00
William Bell
2e7b3b4baa fix for winblows 2025-08-18 06:38:30 +01:00
William Bell
24163e3389 fix gmp bug 2025-08-18 06:25:29 +01:00
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
11 changed files with 365 additions and 42 deletions

View File

@@ -10,11 +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
strategy:
matrix:
arch: [x86_64, arm64] # build both architectures
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@@ -36,14 +33,8 @@ jobs:
- name: Build - name: Build
run: | run: |
if [ "${{ matrix.arch }}" = "x86_64" ]; then conan install . --build=missing
conan install . --build=missing conan build .
conan build .
else
sudo apt-get install -y gcc-aarch64-linux-gnu
conan install . --profile linux-arm-profile.txt --build=missing
conan build . --profile linux-arm-profile.txt
fi
- name: Package - name: Package
run: | run: |
@@ -60,7 +51,50 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: linux-${{ matrix.arch }}-artifact name: linux-x86_64-artifact
path: ${{ env.TAR_NAME }}
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: sudo apt-get update && sudo apt-get install -y flex bison
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install Conan
run: |
python -m pip install --upgrade pip
pip install conan
conan profile detect
- name: Build
run: |
conan install . --build=missing
conan build .
- name: Package
run: |
TAG=${GITHUB_REF##refs/tags/}
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
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
with:
name: linux-arm64-artifact
path: ${{ env.TAR_NAME }} path: ${{ env.TAR_NAME }}
build-macos: build-macos:
@@ -185,7 +219,7 @@ 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

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

@@ -33,8 +33,16 @@ add_custom_command(
# Step 2: Custom target for lexer # Step 2: Custom target for lexer
add_custom_target(GenerateLexer DEPENDS ${LEXER_C} ${LEXER_H}) 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 # 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) 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)

View File

@@ -6,7 +6,7 @@
BINARY = bin/argon BINARY = bin/argon
FLEX_TOOL = flex FLEX_TOOL = flex
CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c') 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

1
external/linenoise vendored Submodule

Submodule external/linenoise added at d895173d67

View File

@@ -1,15 +0,0 @@
[settings]
os=Linux
arch=armv8
compiler=gcc
compiler.version=12
compiler.libcxx=libstdc++11
build_type=Release
[env]
CC=aarch64-linux-gnu-gcc
CXX=aarch64-linux-gnu-g++
AR=aarch64-linux-gnu-ar
RANLIB=aarch64-linux-gnu-ranlib
LD=aarch64-linux-gnu-ld
STRIP=aarch64-linux-gnu-strip

View File

@@ -12,6 +12,7 @@
#include "memory.h" #include "memory.h"
#include "parser/parser.h" #include "parser/parser.h"
#include "returnTypes.h" #include "returnTypes.h"
#include "shell.h"
#include "runtime/runtime.h" #include "runtime/runtime.h"
#include "translator/translator.h" #include "translator/translator.h"
@@ -358,32 +359,29 @@ Translated load_argon_file(char *path, ArErr *err) {
start = clock(); start = clock();
*err = parser(path, &ast, &tokens, false); *err = parser(path, &ast, &tokens, false);
darray_free(&tokens, free_token);
if (err->exists) { if (err->exists) {
darray_free(&tokens, free_token);
darray_free(&ast, free_parsed); darray_free(&ast, free_parsed);
return (Translated){}; return (Translated){};
} }
end = clock(); end = clock();
time_spent = (double)(end - start) / CLOCKS_PER_SEC; time_spent = (double)(end - start) / CLOCKS_PER_SEC;
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);
darray_free(&ast, free_parsed);
if (err->exists) { 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 (Translated){};
} }
end = clock(); end = clock();
time_spent = (double)(end - start) / CLOCKS_PER_SEC; time_spent = (double)(end - start) / CLOCKS_PER_SEC;
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
@@ -458,9 +456,9 @@ 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));

View File

@@ -8,7 +8,6 @@
#include "../../memory.h" #include "../../memory.h"
#include <ctype.h> #include <ctype.h>
#include <gmp.h> #include <gmp.h>
#include <gmp.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -180,7 +179,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 +189,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};
} }

281
src/shell.c Normal file
View File

@@ -0,0 +1,281 @@
/*
* 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
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;
}
#if defined(_WIN32) || defined(_WIN64)
// 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;
}
#endif
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);
#if defined(_WIN32) || defined(_WIN64)
char *inp = input(prompt);
#else
char *inp = linenoise(prompt);
#endif
free(prompt);
if (!inp) {
printf("\nBye :)\n");
// Free previously collected lines
free(inp);
free(totranslate);
free(indentStr);
return 0;
}
#if defined(_WIN32) || defined(_WIN64)
#else
if (inp[0] != '\0') {
// Optionally add line to history
linenoiseHistoryAdd(inp);
}
#endif
// 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