Update du6/list_ops.c

du6/list_ops.c

@@ -1,136 +1,101 @@
 #include <stdlib.h>
-#include <stddef.h> 
+#include "list_ops.h"
-#include <stdbool.h> 
 
-typedef int list_element_t;
-
-typedef struct {
-    size_t length;
-    list_element_t elements[];
-} list_t;
-
-// Deklarácie funkcií
-list_t *new_list(size_t length, list_element_t default_value);
-list_t *map_list(list_t *list, list_element_t (*map_fn)(list_element_t));
-list_t *filter_list(list_t *list, bool (*filter_fn)(list_element_t));
-list_element_t foldl_list(list_t *list, list_element_t initial,
-                          list_element_t (*fold_fn)(list_element_t, list_element_t));
-list_element_t foldr_list(list_t *list, list_element_t initial,
-                          list_element_t (*fold_fn)(list_element_t, list_element_t));
-list_t *reverse_list(list_t *list);
-void delete_list(list_t *list);
-list_t *append_list(list_t *list1, list_t *list2);
-size_t length_list(list_t *list);
-
-// Vytvorí nový zoznam a naplní ho default hodnotou
 list_t *new_list(size_t length, list_element_t default_value) {
-    list_t *list = malloc(sizeof(list_t) + length * sizeof(list_element_t));
+    list_t *list = malloc(sizeof(list_t));
-    if (!list) return NULL;
-
     list->length = length;
-    for (size_t i = 0; i < length; i++) {
+    list->elements = malloc(sizeof(list_element_t) * length);
+    for (size_t i = 0; i < length; ++i) {
         list->elements[i] = default_value;
     }
     return list;
 }
 
-// Mapovanie: aplikuje funkciu na každý prvok zoznamu
+void delete_list(list_t *list) {
-list_t *map_list(list_t *list, list_element_t (*map_fn)(list_element_t)) {
+    if (list) {
-    list_t *new = malloc(sizeof(list_t) + list->length * sizeof(list_element_t));
+        free(list->elements);
-    if (!new) return NULL;
+        free(list);
-
-    new->length = list->length;
-    for (size_t i = 0; i < list->length; i++) {
-        new->elements[i] = map_fn(list->elements[i]);
     }
-    return new;
 }
 
-// Filter: ponechá len tie prvky, ktoré spĺňajú podmienku
+size_t length_list(list_t *list) {
+    return list ? list->length : 0;
+}
+
+list_t *append_list(list_t *list1, list_t *list2) {
+    size_t total_length = list1->length + list2->length;
+    list_t *new_list = malloc(sizeof(list_t));
+    new_list->length = total_length;
+    new_list->elements = malloc(sizeof(list_element_t) * total_length);
+
+    for (size_t i = 0; i < list1->length; ++i) {
+        new_list->elements[i] = list1->elements[i];
+    }
+    for (size_t i = 0; i < list2->length; ++i) {
+        new_list->elements[list1->length + i] = list2->elements[i];
+    }
+
+    return new_list;
+}
+
 list_t *filter_list(list_t *list, bool (*filter_fn)(list_element_t)) {
     size_t count = 0;
-
+    for (size_t i = 0; i < list->length; ++i) {
-    // Zistíme koľko prvkov prejde filtrom
-    for (size_t i = 0; i < list->length; i++) {
         if (filter_fn(list->elements[i])) {
             count++;
         }
     }
 
-    list_t *filtered = malloc(sizeof(list_t) + count * sizeof(list_element_t));
+    list_element_t *buffer = malloc(sizeof(list_element_t) * count);
-    if (!filtered) return NULL;
+    size_t index = 0;
-
+    for (size_t i = 0; i < list->length; ++i) {
-    filtered->length = count;
-    size_t j = 0;
-
-    for (size_t i = 0; i < list->length; i++) {
         if (filter_fn(list->elements[i])) {
-            filtered->elements[j++] = list->elements[i];
+            buffer[index++] = list->elements[i];
         }
     }
 
-    return filtered;
+    list_t *new_list = malloc(sizeof(list_t));
+    new_list->length = count;
+    new_list->elements = buffer;
+    return new_list;
 }
 
-// Foldl: zľava doprava
+list_t *map_list(list_t *list, list_element_t (*map_fn)(list_element_t)) {
-list_element_t foldl_list(list_t *list, list_element_t initial,
+    list_t *new_list = malloc(sizeof(list_t));
-                          list_element_t (*fold_fn)(list_element_t, list_element_t)) {
+    new_list->length = list->length;
-    list_element_t acc = initial;
+    new_list->elements = malloc(sizeof(list_element_t) * list->length);
-    for (size_t i = 0; i < list->length; i++) {
+
-        acc = fold_fn(acc, list->elements[i]);
+    for (size_t i = 0; i < list->length; ++i) {
+        new_list->elements[i] = map_fn(list->elements[i]);
+    }
+
+    return new_list;
+}
+
+list_element_t foldl_list(list_t *list, list_element_t init, list_element_t (*fn)(list_element_t, list_element_t)) {
+    list_element_t acc = init;
+    for (size_t i = 0; i < list->length; ++i) {
+        acc = fn(acc, list->elements[i]);
     }
     return acc;
 }
 
-// Foldr: sprava doľava
+list_element_t foldr_list(list_t *list, list_element_t init, list_element_t (*fn)(list_element_t, list_element_t)) {
-list_element_t foldr_list(list_t *list, list_element_t initial,
+    list_element_t acc = init;
-                          list_element_t (*fold_fn)(list_element_t, list_element_t)) {
+    for (size_t i = list->length; i > 0; --i) {
-    list_element_t acc = initial;
+        acc = fn(list->elements[i - 1], acc);
-    // pozor: `size_t` nemôže byť záporné, takže kontrolujeme ručne
-    for (size_t i = list->length; i-- > 0;) {
-        acc = fold_fn(list->elements[i], acc);
     }
     return acc;
 }
 
-// Otočí zoznam
 list_t *reverse_list(list_t *list) {
-    list_t *reversed = malloc(sizeof(list_t) + list->length * sizeof(list_element_t));
+    list_t *new_list = malloc(sizeof(list_t));
-    if (!reversed) return NULL;
+    new_list->length = list->length;
+    new_list->elements = malloc(sizeof(list_element_t) * list->length);
 
-    reversed->length = list->length;
+    for (size_t i = 0; i < list->length; ++i) {
-
+        new_list->elements[i] = list->elements[list->length - i - 1];
-    for (size_t i = 0; i < list->length; i++) {
-        reversed->elements[i] = list->elements[list->length - 1 - i];
-    }
-    return reversed;
     }
 
-// Uvoľní pamäť zoznamu
+    return new_list;
-void delete_list(list_t *list) {
-    free(list);
-}
-
-// Spojí dva zoznamy
-list_t *append_list(list_t *list1, list_t *list2) {
-    size_t new_length = list1->length + list2->length;
-    list_t *result = malloc(sizeof(list_t) + new_length * sizeof(list_element_t));
-    if (!result) return NULL;
-
-    result->length = new_length;
-
-    for (size_t i = 0; i < list1->length; i++) {
-        result->elements[i] = list1->elements[i];
-    }
-
-    for (size_t i = 0; i < list2->length; i++) {
-        result->elements[list1->length + i] = list2->elements[i];
-    }
-
-    return result;
-}
-
-// Vráti dĺžku zoznamu
-size_t length_list(list_t *list) {
-    return list->length;
 }