From dfc6d93bae8ad6e21263ffa60395119935a44ad0 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 26 Feb 2024 13:08:30 -0800
Subject: [PATCH] Rename wasm C sources to avoid conflicts with standard wasm
 headers

Co-authored-by: Marshall <marshall@zed.dev>
---
 lib/src/language.c               | 2 +-
 lib/src/lib.c                    | 2 +-
 lib/src/parser.c                 | 2 +-
 lib/src/wasm/README.md           | 9 ---------
 lib/src/{wasm.c => wasm_store.c} | 2 +-
 lib/src/{wasm.h => wasm_store.h} | 0
 6 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 lib/src/wasm/README.md
 rename lib/src/{wasm.c => wasm_store.c} (99%)
 rename lib/src/{wasm.h => wasm_store.h} (100%)

diff --git a/lib/src/language.c b/lib/src/language.c
index f5ec6083..d49907f9 100644
--- a/lib/src/language.c
+++ b/lib/src/language.c
@@ -1,5 +1,5 @@
 #include "./language.h"
-#include "./wasm.h"
+#include "./wasm_store.h"
 #include "tree_sitter/api.h"
 #include <string.h>
 
diff --git a/lib/src/lib.c b/lib/src/lib.c
index 15cd980d..70671ee6 100644
--- a/lib/src/lib.c
+++ b/lib/src/lib.c
@@ -11,4 +11,4 @@
 #include "./subtree.c"
 #include "./tree_cursor.c"
 #include "./tree.c"
-#include "./wasm.c"
+#include "./wasm_store.c"
diff --git a/lib/src/parser.c b/lib/src/parser.c
index a65dd90c..54e3b0a8 100644
--- a/lib/src/parser.c
+++ b/lib/src/parser.c
@@ -19,7 +19,7 @@
 #include "./stack.h"
 #include "./subtree.h"
 #include "./tree.h"
-#include "./wasm.h"
+#include "./wasm_store.h"
 
 #define LOG(...)                                                                            \
   if (self->lexer.logger.log || self->dot_graph_file) {                                     \
diff --git a/lib/src/wasm/README.md b/lib/src/wasm/README.md
deleted file mode 100644
index c67121af..00000000
--- a/lib/src/wasm/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## WASM
-
-The `wasm.h` header file contains a standard interface implemented by multiple WASM implementations. It was taken from here:
-
-https://github.com/WebAssembly/wasm-c-api/blob/c9d31284651b975f05ac27cee0bab1377560b87e/include/wasm.h
-
-The `wasmtime` headers were taken from here:
-
-https://github.com/bytecodealliance/wasmtime/tree/main/crates/c-api/include/wasmtime
\ No newline at end of file
diff --git a/lib/src/wasm.c b/lib/src/wasm_store.c
similarity index 99%
rename from lib/src/wasm.c
rename to lib/src/wasm_store.c
index 3ebbcf22..45ca57d4 100644
--- a/lib/src/wasm.c
+++ b/lib/src/wasm_store.c
@@ -12,7 +12,7 @@
 #include "./atomic.h"
 #include "./language.h"
 #include "./lexer.h"
-#include "./wasm.h"
+#include "./wasm_store.h"
 #include "./wasm/wasm-stdlib.h"
 
 // The following symbols from the C and C++ standard libraries are available
diff --git a/lib/src/wasm.h b/lib/src/wasm_store.h
similarity index 100%
rename from lib/src/wasm.h
rename to lib/src/wasm_store.h