From 8057c2e8a3fc03f7771c5d09db0a2b3568dc57d2 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 11 May 2025 20:45:57 +0900 Subject: take source file name as cli arguments --- justfile | 2 +- main.c | 15 +++++++++++++-- tests/050.sh | 29 +++++++++++++++++++++++++++++ tests/test_diff.sh | 2 +- tests/test_exit_code.sh | 2 +- tests/test_output.sh | 2 +- 6 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 tests/050.sh diff --git a/justfile b/justfile index 86a53e3..016fa19 100644 --- a/justfile +++ b/justfile @@ -10,7 +10,7 @@ build N="1": else prev=$(({{N}} - 1)) fi - "./ducc${prev}" < main.c > main{{N}}.s + "./ducc${prev}" main.c > main{{N}}.s gcc -s -Wl,-z,noexecstack -o ducc{{N}} main{{N}}.s fi diff --git a/main.c b/main.c index ffc0dd3..9ce3e81 100644 --- a/main.c +++ b/main.c @@ -10,7 +10,9 @@ extern FILE* stderr; int atoi(const char*); void* calloc(size_t, size_t); void exit(int); +int fclose(FILE*); char* fgets(char*, int, FILE*); +FILE* fopen(const char*, const char*); int getchar(void); int isalnum(int); int isalpha(int); @@ -2182,8 +2184,17 @@ void codegen(Program* prog) { } } -int main() { - char* source = read_all(stdin); +int main(int argc, char** argv) { + if (argc == 1) { + fatal_error("usage: ducc "); + } + FILE* in; + if (strcmp(argv[1], "-") == 0) { + in = stdin; + } else { + in = fopen(argv[1], "rb"); + } + char* source = read_all(in); Token* tokens = tokenize(source); Program* prog = parse(tokens); analyze(prog); diff --git a/tests/050.sh b/tests/050.sh new file mode 100644 index 0000000..295ac2d --- /dev/null +++ b/tests/050.sh @@ -0,0 +1,29 @@ +set -e + +cat <<'EOF' > expected +hello, world +EOF + +cat <<'EOF' > main.c +int printf(); +int main() { + printf("hello, world\n"); + return 0; +} +EOF + +"$ducc" - < main.c > main.s +if [[ $? -ne 0 ]]; then + cat main.s >&2 + exit 1 +fi +gcc -Wl,-z,noexecstack -o a.out main.s +./a.out "$@" > output +exit_code=$? + +if [[ $exit_code -ne 0 ]]; then + echo "invalid exit code: $exit_code" >&2 + exit 1 +fi + +diff -u expected output diff --git a/tests/test_diff.sh b/tests/test_diff.sh index 8e938de..6520b42 100644 --- a/tests/test_diff.sh +++ b/tests/test_diff.sh @@ -1,6 +1,6 @@ cat > main.c -"$ducc" < main.c > main.s +"$ducc" main.c > main.s if [[ $? -ne 0 ]]; then cat main.s >&2 exit 1 diff --git a/tests/test_exit_code.sh b/tests/test_exit_code.sh index 490de5b..44d1e06 100644 --- a/tests/test_exit_code.sh +++ b/tests/test_exit_code.sh @@ -1,6 +1,6 @@ cat > main.c -"$ducc" < main.c > main.s +"$ducc" main.c > main.s if [[ $? -ne 0 ]]; then cat main.s >&2 exit 1 diff --git a/tests/test_output.sh b/tests/test_output.sh index 2f8b984..575e399 100644 --- a/tests/test_output.sh +++ b/tests/test_output.sh @@ -1,6 +1,6 @@ cat > main.c -"$ducc" < main.c > main.s +"$ducc" main.c > main.s if [[ $? -ne 0 ]]; then cat main.s >&2 exit 1 -- cgit v1.2.3-70-g09d2