move src into src (#87)

* move src into src * format
isaacbrodsky · Feb 28, 2024 · c2298ea · c2298ea
1 parent 7fd6873
commit c2298ea
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,16 +33,16 @@ set(BUILD_SHARED_LIBS ON)
 
 
 set(EXTENSION_SOURCES
-  h3-extension.cpp
-  h3_common.cpp
-  h3_functions/h3_indexing.cpp
-  h3_functions/h3_inspection.cpp
-  h3_functions/h3_hierarchy.cpp
-  h3_functions/h3_traversal.cpp
-  h3_functions/h3_vertex.cpp
-  h3_functions/h3_directededge.cpp
-  h3_functions/h3_misc.cpp
-  h3_functions/h3_regions.cpp
+  src/h3ext_extension.cpp
+  src/h3_common.cpp
+  src/h3_indexing.cpp
+  src/h3_inspection.cpp
+  src/h3_hierarchy.cpp
+  src/h3_traversal.cpp
+  src/h3_vertex.cpp
+  src/h3_directededge.cpp
+  src/h3_misc.cpp
+  src/h3_regions.cpp
 )
 set(LIB_HEADER_FILES
   src/include/h3_common.hpp

diff --git a/h3_common.cpp → src/h3_common.cpp b/h3_common.cpp → src/h3_common.cpp
diff --git a/h3_functions/h3_directededge.cpp → src/h3_directededge.cpp b/h3_functions/h3_directededge.cpp → src/h3_directededge.cpp
diff --git a/h3_functions/h3_hierarchy.cpp → src/h3_hierarchy.cpp b/h3_functions/h3_hierarchy.cpp → src/h3_hierarchy.cpp
diff --git a/h3_functions/h3_indexing.cpp → src/h3_indexing.cpp b/h3_functions/h3_indexing.cpp → src/h3_indexing.cpp
diff --git a/h3_functions/h3_inspection.cpp → src/h3_inspection.cpp b/h3_functions/h3_inspection.cpp → src/h3_inspection.cpp
diff --git a/h3_functions/h3_misc.cpp → src/h3_misc.cpp b/h3_functions/h3_misc.cpp → src/h3_misc.cpp
diff --git a/h3_functions/h3_regions.cpp → src/h3_regions.cpp b/h3_functions/h3_regions.cpp → src/h3_regions.cpp
@@ -141,13 +141,13 @@ static size_t readNumber(const std::string &str, size_t offset, double &num) {
 		offset++;
 	}
 	std::string part = str.substr(start, offset - start);
-	
-    try {
+
+	try {
 		num = std::stod(part);
 		return offset;
-    } catch (std::invalid_argument const& ex) {
+	} catch (std::invalid_argument const &ex) {
 		throw InvalidInputException(StringUtil::Format("Invalid number around %lu, %lu", start, offset));
-    }
+	}
 }
 
 static size_t readGeoLoop(const std::string &str, size_t offset, duckdb::shared_ptr<std::vector<LatLng>> verts,

diff --git a/h3_functions/h3_traversal.cpp → src/h3_traversal.cpp b/h3_functions/h3_traversal.cpp → src/h3_traversal.cpp
diff --git a/h3_functions/h3_vertex.cpp → src/h3_vertex.cpp b/h3_functions/h3_vertex.cpp → src/h3_vertex.cpp
diff --git a/h3-extension.cpp → src/h3ext_extension.cpp b/h3-extension.cpp → src/h3ext_extension.cpp
@@ -1,12 +1,13 @@
 #define DUCKDB_EXTENSION_MAIN
+#include "h3ext_extension.hpp"
+
 #include "duckdb/catalog/catalog_entry/macro_catalog_entry.hpp"
 #include "duckdb/catalog/default/default_functions.hpp"
 #include "duckdb/common/string_util.hpp"
 #include "duckdb/parser/expression/constant_expression.hpp"
 #include "duckdb/parser/expression/function_expression.hpp"
 #include "duckdb/parser/tableref/table_function_ref.hpp"
 #include "h3_functions.hpp"
-#include "h3ext_extension.hpp"
 
 namespace duckdb {