Merge branch 'master' of github.com:tristanisham/fan

tristanisham · May 28, 2024 · 9759afa · 9759afa
2 parents 9cb567f + 12eaa3d
commit 9759afa
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 145 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "cmake.configureOnOpen": true
+    "cmake.configureOnOpen": true,
+    "files.eol": "\n"
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,13 +30,13 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     ########################
 
     # Add back: fsanitize=leak
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}  -fasynchronous-unwind-tables -ggdb3 -Wall  -fsanitize=leak -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}  -fasynchronous-unwind-tables -ggdb3 -Wall  -fsanitize=leak -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer -flto=auto")
     set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fsanitize=leak -fsanitize=address -fsanitize=undefined -no-pie -Wall -fno-omit-frame-pointer")
 
     ########################
     # RELEASE              #
     ########################
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIE -D_FORTIFY_SOURCE=2 -fexceptions -Wall -O2 -flto -funroll-loops")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIE -D_FORTIFY_SOURCE=2 -fexceptions -Wall -O2 -flto=auto -funroll-loops")
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_LINKER_FLAGS_RELEASE} -fPIE  -s")
     # -static -static-libgcc -static-libstdc++
 elseif(MSVC)

diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@
 
 # Fan
 
-Fan is a dynamically-typed programmign language based on
-[Wren](https://wren.io). Fan's aim is to be _statically compilable_, portable,
+Fan is a dynamically-typed programming language. It is based on
+[Wren](https://wren.io), but features significant customizations to its runtime. Fan's aim is to be _statically compilable_, portable,
 and come with batteries-included.
 
 ```sh

diff --git a/fan.sh b/fan.sh
@@ -1,3 +1,14 @@
 #!/usr/bin/env bash
 
-FAN_LIB=./lang build/debug/fan "$@"
+
+# Check for the existence of the fan executable in different directories
+if [[ -x "./build/debug/fan" ]]; then
+    FAN_EXEC="./build/debug/fan"
+elif [[ -x "./build/release/fan" ]]; then
+    FAN_EXEC="./build/release/fan"
+else
+    FAN_EXEC="./build/fan"
+fi
+
+# Execute the fan command with the given arguments
+FAN_LIB=./lang $FAN_EXEC "$@"
diff --git a/include/lib.hpp b/include/lib.hpp
@@ -271,4 +271,6 @@ namespace encoding {
 	void md_to_html(WrenVM* vm);
 }
 
+
+
 }  // namespace lib
diff --git a/tests/encoding.fan b/tests/encoding.fan
diff --git a/tests/env.fan b/tests/env.fan
diff --git a/tests/fmt.fan b/tests/fmt.fan
diff --git a/tests/fs_cwd.fan b/tests/fs_cwd.fan
diff --git a/tests/fs_test.fan b/tests/fs_test.fan
diff --git a/tests/http_test.fan b/tests/http_test.fan
diff --git a/tests/md_test.fan b/tests/md_test.fan
diff --git a/tests/open_file.fan b/tests/open_file.fan
diff --git a/tests/proc.fan b/tests/proc.fan
diff --git a/tests/recursive_cb.fan b/tests/recursive_cb.fan
diff --git a/tests/std/env_tests b/tests/std/env_tests
diff --git a/tests/std/markdown.fan b/tests/std/markdown.fan
@@ -0,0 +1,16 @@
+import "std/encoding" for Markdown
+import "std/fs" for Fs, Path
+
+var files = Fs.listAllRecursive(Fs.cwd())
+
+// List of markdown files in the directory
+var mdFiles = []
+
+for (i in files) {
+    if (Path.ext(i) == "md") {
+        System.print(i)
+        mdFiles.add(i)
+    }
+}
+
+System.print(mdFiles.count)
diff --git a/valgrind.sh b/valgrind.sh
@@ -1,9 +1,18 @@
 #!/usr/bin/env bash
 
+# Check for the existence of the fan executable in different directories
+if [[ -x "./build/debug/fan" ]]; then
+    FAN_EXEC="./build/debug/fan"
+elif [[ -x "./build/release/fan" ]]; then
+    FAN_EXEC="./build/release/fan"
+else
+    FAN_EXEC="./build/fan"
+fi
+
 FAN_LIB=./lang valgrind --leak-check=full \
          --show-leak-kinds=all \
          --track-origins=yes \
          --verbose \
          --leak-check=full \
          --log-file=build/valgrind-out.txt \
-         ./build/fan $@
+         $(FAN_EXEC) $@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -271,4 +271,6 @@ namespace encoding {
		void md_to_html(WrenVM* vm);
		}



		} // namespace lib