Set up cmake and update workflow

Author: SamSyntax

.github/workflows/c.yml

@@ -2,23 +2,20 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: configure
-      run: wget https://ocw.mit.edu/ans7870/6/6.006/s08/lecturenotes/files/t8.shakespeare.txt
-    - name: build c
-      run: cc -Wall -Wextra -ggdb -pedantic -o bit ./main.c && ./bit ./t8.shakespeare.txt
-
-    - name: build c++
-      run: g++ -Wall -Wextra -ggdb -pedantic -o hashcpp ./hash.cpp && ./hashcpp ./t8.shakespeare.txt
-
+      - uses: actions/checkout@v4
+      - name: configure
+        run: wget https://ocw.mit.edu/ans7870/6/6.006/s08/lecturenotes/files/t8.shakespeare.txt
+      - name: build c
+        run: ./build.sh
 
+      - name: build c++
+        run: g++ -Wall -Wextra -ggdb -pedantic -o hashcpp ./hash.cpp && ./hashcpp ./t8.shakespeare.txt

.gitignore

@@ -2,4 +2,7 @@ t8.shakespeare.txt
 test.txt
 .git
 build
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
 

CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.10)
+project(hash_table)
+
+add_library(hash_library STATIC src/hash_table.c)
+
+target_include_directories(hash_library PUBLIC ${PROJECT_SOURCE_DIR}/include)
+
+add_executable(hash_binary src/main.c)
+
+target_link_libraries(hash_binary PRIVATE hash_library)

Makefile

@@ -1,5 +1,5 @@
 run:
-	cc -Wall -Wextra -ggdb -pedantic -o ./build/bit ./main.c && ./build/bit ./t8.shakespeare.txt
+	@./build/hash_binary ./t8.shakespeare.txt
 
 runCpp:
-	g++ -Wall -Wextra -ggdb -pedantic -o ./build/hashcpp ./hash.cpp && ./build/hashcpp ./t8.shakespeare.txt
+	@mkdir -p ./build && g++ -Wall -Wextra -ggdb -pedantic -o ./build/hashcpp ./hash.cpp && ./build/hashcpp ./t8.shakespeare.txt

build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+BUILD_DIR="./build"
+
+mkdir -p ${BUILD_DIR} &&
+  echo -e "Changing directory to ${BUILD_DIR}" &&
+  cd build && echo -e ${pwd} && cmake .. && make && cd ../ && make run

hash.cpp

@@ -35,16 +35,16 @@ int main(int argc, char *argv[]) {
     return 1;
   }
 
-  std::string content((std::istreambuf_iterator<char>(ifs)),
-                      (std::istreambuf_iterator<char>()));
+  const std::string content((std::istreambuf_iterator<char>(ifs)),
+                            (std::istreambuf_iterator<char>()));
 
   ifs.close();
   auto start = std::chrono::high_resolution_clock::now();
 
   tokenize(content, hash_table);
 
-  auto end = std::chrono::high_resolution_clock::now();
-  auto duration = std::chrono::duration<double>(end - start);
+  const auto end = std::chrono::high_resolution_clock::now();
+  const auto duration = std::chrono::duration<double>(end - start);
   std::cout << "Token counts:\n";
   std::vector<std::pair<std::string, size_t>> sorted_tokens(hash_table.begin(),
                                                             hash_table.end());

includes/hash_table.h

@@ -25,4 +25,4 @@ void init_table(hash_table *hash_table);
 size_t hash(char *str, size_t capacity);
 void *tokenize(char *input, hash_table *table);
 void free_table(token_t *table, size_t capacity);
-void naive(char *input, hash_table* hash_table);
+void naive(char *input, hash_table *hash_table);

includes/hash_table.c src/hash_table.cincludes/hash_table.c renamed to src/hash_table.c

@@ -1,4 +1,4 @@
-#include "hash_table.h"
+#include "../includes/hash_table.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -63,19 +63,19 @@ void *tokenize(char *input, hash_table *hash_table) {
       }
 
       for (size_t i = 0; i < hash_table->capacity; i++) {
-        token_t *old_entry = &((token_t*)hash_table->table)[i];
+        token_t *old_entry = &((token_t *)hash_table->table)[i];
         if (old_entry->key != NULL) {
-            size_t new_key = hash(old_entry->key, new_capacity);
-            size_t original_new_key = new_key;
-            while (new_table[new_key].key != NULL) {
-                new_key = (new_key + 1) % new_capacity;
-                if (new_key == original_new_key) {
-                    break;
-                }
+          size_t new_key = hash(old_entry->key, new_capacity);
+          size_t original_new_key = new_key;
+          while (new_table[new_key].key != NULL) {
+            new_key = (new_key + 1) % new_capacity;
+            if (new_key == original_new_key) {
+              break;
             }
-            new_table[new_key].key = old_entry->key;
-            new_table[new_key].value = old_entry->value;
-            new_table[new_key].hash_key = new_key;
+          }
+          new_table[new_key].key = old_entry->key;
+          new_table[new_key].value = old_entry->value;
+          new_table[new_key].hash_key = new_key;
         }
       }
       free(hash_table->table);
@@ -140,7 +140,7 @@ void naive(char *input, hash_table *hash_table) {
       if (naive_table[i].key == NULL) {
         naive_table[i].key = strdup(token);
         if (naive_table[i].key == NULL) {
-            continue;
+          continue;
         }
         naive_table[i].value = 1;
         hash_table->size++;

main.c src/main.cmain.c renamed to src/main.c

@@ -1,4 +1,4 @@
-#include "includes/hash_table.c"
+#include "../includes/hash_table.h"
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>