Clean up code (should be squashed with previous) - broken C tests (#66)

* Fix syntax in GitHub Actions * Refactor project to include under src * Add Python test file
thedavidchu · Jan 7, 2024 · bbcec76 · bbcec76
1 parent a1075e1
commit bbcec76
Show file tree

Hide file tree

Showing 63 changed files with 526 additions and 580 deletions.
diff --git a/.github/workflows/linux_compiler_test.yml b/.github/workflows/linux_compiler_test.yml
@@ -12,15 +12,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
-          uses: actions/setup-python@v4
-          with:
+        uses: actions/setup-python@v4
+        with:
             python-version: '3.10'
       - name: Compile
         run: |
-          cd compiler
+          # For some reason, if we change to the compiler directory, Python complains.
+          export PYTHONPATH="${PYTHONPATH}:/home/runner/work/lolc/lolc/src/"
           for x in fibonacci helloworld math_ops nested_if sum_three
           do
-            python lol.py -i examples/$x.lol -o results
+            python src/compiler/lol.py -i examples/$x.lol -o results
             gcc results/$x-*.c
             ./a.out
           done
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 venv/
 
 # Ignore Python Caches
-compiler/results
+/results/
 __pycache__/
 
 # Ignore CMake's build directory

diff --git a/compiler/error/lol_error.py b/compiler/error/lol_error.py
diff --git a/compiler/parser/__init__.py b/compiler/parser/__init__.py
diff --git a/compiler/examples/fibonacci.lol → examples/fibonacci.lol b/compiler/examples/fibonacci.lol → examples/fibonacci.lol
diff --git a/compiler/examples/helloworld.lol → examples/helloworld.lol b/compiler/examples/helloworld.lol → examples/helloworld.lol
diff --git a/...ples/invalid/duplicate_function_names.lol → ...ples/invalid/duplicate_function_names.lol b/...ples/invalid/duplicate_function_names.lol → ...ples/invalid/duplicate_function_names.lol
diff --git a/compiler/examples/math_ops.lol → examples/math_ops.lol b/compiler/examples/math_ops.lol → examples/math_ops.lol
@@ -9,6 +9,6 @@ function math_operation(a: i32, b: i32, c: i32, d: i32) -> i32 {
 
 function main() -> i32 {
     let sum: i32 = math_operation(1, 2, 3, 4);
-    io::printf("Sum should be 31: %d", sum);
+    io::printf("Sum should be 31: %d\n", sum);
     return 0;
 }
diff --git a/compiler/examples/nested_if.lol → examples/nested_if.lol b/compiler/examples/nested_if.lol → examples/nested_if.lol
diff --git a/compiler/examples/sum_three.lol → examples/sum_three.lol b/compiler/examples/sum_three.lol → examples/sum_three.lol
@@ -7,6 +7,6 @@ function sum_three(a: i32, b: i32, c: i32) -> i32 {
 
 function main() -> i32 {
     let sum: i32 = sum_three(1, 2, 3);
-    io::printf("Sum should be 6: %d", sum);
+    io::printf("Sum should be 6: %d\n", sum);
     return 0;
 }
diff --git a/lint.bat b/lint.bat
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,11 +16,11 @@ documentation = "https://github.com/thedavidchu/lolc/"
 [dependencies]
 
 [dev-dependencies]
-black = { version = "^22.3.0", python = "^3.6" }
+black = { version = "^22.3.0", python = "^3.10" }
 
 [tool.black]
 line-length = 80
-target_version = ['py36']
+target-version = ['py310']
 exclude = '''
 (
     /(

diff --git a/run.sh b/run.sh
diff --git a/src/CMakeLists.txt → src/c_interpretter/CMakeLists.txt b/src/CMakeLists.txt → src/c_interpretter/CMakeLists.txt
@@ -1,16 +1,16 @@
-# Make src public to tests
-include_directories("${CMAKE_SOURCE_DIR}")
-
-# Add libraries
-## Compiler Compatibility Files
-add_subdirectory("${CMAKE_SOURCE_DIR}/src/bool")
-add_subdirectory("${CMAKE_SOURCE_DIR}/src/common")
-
-## Standard Library Wrappers
-add_subdirectory("${CMAKE_SOURCE_DIR}/src/mem")
-
-## Custom Library
-add_subdirectory("${CMAKE_SOURCE_DIR}/src/arr")
-add_subdirectory("${CMAKE_SOURCE_DIR}/src/tbl")
-add_subdirectory("${CMAKE_SOURCE_DIR}/src/rstr")
-
+# Make src public to tests
+include_directories("${CMAKE_SOURCE_DIR}")
+
+# Add libraries
+## Compiler Compatibility Files
+add_subdirectory("${CMAKE_SOURCE_DIR}/src/bool")
+add_subdirectory("${CMAKE_SOURCE_DIR}/src/common")
+
+## Standard Library Wrappers
+add_subdirectory("${CMAKE_SOURCE_DIR}/src/mem")
+
+## Custom Library
+add_subdirectory("${CMAKE_SOURCE_DIR}/src/arr")
+add_subdirectory("${CMAKE_SOURCE_DIR}/src/tbl")
+add_subdirectory("${CMAKE_SOURCE_DIR}/src/rstr")
+
diff --git a/src/CODING_STYLE.md → src/c_interpretter/CODING_STYLE.md b/src/CODING_STYLE.md → src/c_interpretter/CODING_STYLE.md
diff --git a/src/PORTABILITY_IN_C.md → src/c_interpretter/PORTABILITY_IN_C.md b/src/PORTABILITY_IN_C.md → src/c_interpretter/PORTABILITY_IN_C.md
diff --git a/src/STANDARD_LIBRARY.md → src/c_interpretter/STANDARD_LIBRARY.md b/src/STANDARD_LIBRARY.md → src/c_interpretter/STANDARD_LIBRARY.md
diff --git a/src/arr/CMakeLists.txt → src/c_interpretter/arr/CMakeLists.txt b/src/arr/CMakeLists.txt → src/c_interpretter/arr/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Create the 'arr' target
-add_library("arr" "${CMAKE_SOURCE_DIR}/src/arr/arr.c")
-
-# Link executable to libraries
+# Create the 'arr' target
+add_library("arr" "${CMAKE_SOURCE_DIR}/src/arr/arr.c")
+
+# Link executable to libraries
 target_link_libraries("arr" PRIVATE "mem" "common")
diff --git a/src/arr/arr.c → src/c_interpretter/arr/arr.c b/src/arr/arr.c → src/c_interpretter/arr/arr.c
diff --git a/src/arr/arr.h → src/c_interpretter/arr/arr.h b/src/arr/arr.h → src/c_interpretter/arr/arr.h
diff --git a/src/arr/arr_checks.h → src/c_interpretter/arr/arr_checks.h b/src/arr/arr_checks.h → src/c_interpretter/arr/arr_checks.h
diff --git a/src/arr/arr_helper.h → src/c_interpretter/arr/arr_helper.h b/src/arr/arr_helper.h → src/c_interpretter/arr/arr_helper.h
diff --git a/src/arr/arr_macros.h → src/c_interpretter/arr/arr_macros.h b/src/arr/arr_macros.h → src/c_interpretter/arr/arr_macros.h
diff --git a/src/bool/CMakeLists.txt → src/c_interpretter/bool/CMakeLists.txt b/src/bool/CMakeLists.txt → src/c_interpretter/bool/CMakeLists.txt
diff --git a/src/bool/bool.h → src/c_interpretter/bool/bool.h b/src/bool/bool.h → src/c_interpretter/bool/bool.h
@@ -1,7 +1,7 @@
-#pragma once
-
-#ifndef __STDC_VERSION__ /* C89 */
-typedef enum { false = 0, true = 1 } bool;
-#else
-    #include <stdbool.h>
+#pragma once
+
+#ifndef __STDC_VERSION__ /* C89 */
+typedef enum { false = 0, true = 1 } bool;
+#else
+    #include <stdbool.h>
 #endif
diff --git a/src/common/CMakeLists.txt → src/c_interpretter/common/CMakeLists.txt b/src/common/CMakeLists.txt → src/c_interpretter/common/CMakeLists.txt
diff --git a/src/common/common.c → src/c_interpretter/common/common.c b/src/common/common.c → src/c_interpretter/common/common.c
diff --git a/src/common/common.h → src/c_interpretter/common/common.h b/src/common/common.h → src/c_interpretter/common/common.h