Fixed a bug in the way that UFO functions were called

now using generated symbols with UFO_C_ prefix in the ufovectors package
Feel free to change to taste

ufos/rust/ufos_c/src/lib.rs

@@ -116,7 +116,7 @@ impl UfoCore {
                 .and_then(|core| {
                     let ufo = core
                         .get_ufo_by_address(ptr as usize)
-                        .expect("UFO lookup failed");
+                        .ok()?; // okay if this fails, we just return "none"
                     Some(UfoObj::wrap(ufo))
                 })
                 .unwrap_or_else(UfoObj::none)

ufovectors/..Rcheck/tests/csv/test.c

@@ -0,0 +1,217 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "../../src/csv/token.h"
+#include "../../src/csv/tokenizer.h"
+#include "../../src/csv/reader.h"
+#include "../../src/csv/string_set.h"
+
+/*
+ * gcc -o test -I../src/csv/ ../../src/csv/reader.c  ../../src/csv/tokenizer.c ../../src/csv/token.c ../../src/csv/string_vector.c ../../src/csv/string_set.c test.c -g -O0 -Wall
+ */
+
+void test_file(char* path) {
+    tokenizer_t tokenizer = csv_tokenizer();
+    tokenizer_state_t *state = tokenizer_state_init(path, 0, 10, 10);
+    tokenizer_start(&tokenizer, state);
+    tokenizer_token_t *token;
+
+    while (true) {
+        int result = tokenizer_next(&tokenizer, state, &token, false);
+
+        printf("Token: [size: %li, start: %li, end: %li, string: <%s>], %s\n",
+               token->size, token->position_start, token->position_end, token->string,
+               tokenizer_result_to_string(result));
+
+        if (result == TOKENIZER_END_OF_FILE || result == TOKENIZER_ERROR || result == TOKENIZER_PARSE_ERROR) {
+            break;
+        }
+    }
+
+    tokenizer_close(&tokenizer, state);
+};
+
+void test_initial_scan(char* path, bool headers) {
+    //tokenizer_t tokenizer = csv_tokenizer();
+    scan_results_t *results = ufo_csv_perform_initial_scan(path, 5, headers);
+
+    printf("After initial scan of %s: \n\n", path);
+    printf("    rows: %li\n", results->rows);
+    printf("    cols: %li\n", results->columns);
+
+    printf("    column_names:\n\n");
+    for (size_t i = 0; i < results->columns; i++) {
+        printf("        [%li]: %s\n", i, results->column_names[i]);
+    }
+    printf("\n");
+
+    printf("    column_types:\n\n");
+    for (size_t i = 0; i < results->columns; i++) {
+        printf("        [%li]: %s/%i\n",
+                i, token_type_to_string(results->column_types[i]),
+                results->column_types[i]);
+    }
+    printf("\n");
+
+    printf("    row_offsets:\n\n");
+    for (size_t i = 0; i < results->row_offsets->size; i++) {
+        printf("        [%li] (row #%li): %li\n",
+                i, offset_record_human_readable_key(results->row_offsets, i),
+                results->row_offsets->offsets[i]);
+    }
+    printf("\n");
+};
+
+
+
+void test_read_individual_columns(char* path, bool headers) {
+    //tokenizer_t tokenizer = csv_tokenizer();
+    scan_results_t *results = ufo_csv_perform_initial_scan(path, 3, headers);
+
+    printf("After initial scan of %s: \n\n", path);
+    printf("    rows: %li\n", results->rows);
+    printf("    cols: %li\n", results->columns);
+
+    printf("    column_names:\n\n");
+    for (size_t i = 0; i < results->columns; i++) {
+        printf("        [%li]: %s\n", i, results->column_names[i]);
+    }
+    printf("\n");
+
+    printf("    column_types:\n\n");
+    for (size_t i = 0; i < results->columns; i++) {
+        printf("        [%li]: %s/%i\n",
+               i, token_type_to_string(results->column_types[i]),
+               results->column_types[i]);
+    }
+    printf("\n");
+
+    printf("    row_offsets:\n\n");
+    for (size_t i = 0; i < results->row_offsets->size; i++) {
+        printf("        [%li] (row #%li): %li\n",
+               i, offset_record_human_readable_key(results->row_offsets, i),
+               results->row_offsets->offsets[i]);
+    }
+    printf("\n");
+
+    size_t start = 4;
+    size_t end = 5;
+
+    for (size_t column = 0; column <= results->columns; column++) {
+        read_results_t column_tokens = ufo_csv_read_column(path, column, results, start, end);
+
+        printf("After reading column %li of %s/%li from row %li to row %li (inclusive): \n\n",
+                column, path, column_tokens.size, start, end);
+
+
+        for (size_t row = 0; row < column_tokens.size; row++) {
+            printf("    [%li+%li]: %s\n", start, row, column_tokens.tokens[row]->string);
+        }
+        printf("\n");
+    }
+}
+
+void test_read_typed_columns(char* path, bool headers) {
+    //tokenizer_t tokenizer = csv_tokenizer();
+    scan_results_t *results = ufo_csv_perform_initial_scan(path, 3, headers);
+
+    printf("After initial scan of %s: \n\n", path);
+    printf("    rows: %li\n", results->rows);
+    printf("    cols: %li\n", results->columns);
+
+    printf("    column_names:\n\n");
+    for (size_t i = 0; i < results->columns; i++) {
+        printf("        [%li]: %s\n", i, results->column_names[i]);
+    }
+    printf("\n");
+
+    printf("    column_types:\n\n");
+    for (size_t i = 0; i < results->columns; i++) {
+        printf("        [%li]: %s/%i\n",
+                i, token_type_to_string(results->column_types[i]),
+                results->column_types[i]);
+    }
+    printf("\n");
+
+    printf("    row_offsets:\n\n");
+    for (size_t i = 0; i < results->row_offsets->size; i++) {
+        printf("        [%li] (row #%li): %li\n",
+                i, offset_record_human_readable_key(results->row_offsets, i),
+                results->row_offsets->offsets[i]);
+    }
+    printf("\n");
+
+    for (size_t column = 0; column <= results->columns; column++) {
+        read_results_t column_tokens = ufo_csv_read_column(path, column, results, 0L, 0L);
+
+        printf("After reading column %li of %s/%li from row %li to row %li (inclusive): \n\n",
+               column, path, column_tokens.size, 0L, 0L);
+
+        for (size_t row = 0; row < column_tokens.size; row++) {
+            switch (results->column_types[column]) {
+                case TOKEN_NOTHING:
+                    printf("    [%li]: <nothing>\n", row);
+                    break;
+                case TOKEN_EMPTY: {
+                    printf("    [%li]: <empty>\n", row);
+                    break;
+                }
+                case TOKEN_NA: {
+                    printf("    [%li]: <NA>\n", row);
+                    break;
+                }
+                case TOKEN_BOOLEAN: {
+                    trinary_t value = token_to_logical(column_tokens.tokens[row]);
+                    printf("    [%li]: %s\n", row, (value == TRUE ? "true" : (value == FALSE ? "false" : "NA")));
+                    break;
+                }
+                case TOKEN_INTEGER: {
+                    int value = token_to_integer(column_tokens.tokens[row]);
+                    if (value != NA_INTEGER) {
+                        printf("    [%li]: %i\n", row, value);
+                    } else {
+                        printf("    [%li]: <NA>\n", row);
+                    }
+                    break;
+                }
+                case TOKEN_DOUBLE: {
+                    double value = token_to_numeric(column_tokens.tokens[row]);
+                    printf("    [%li]: %f\n", row, value);
+                    break;
+                }
+                case TOKEN_STRING: {
+                    printf("    [%li]: %s\n", row, column_tokens.tokens[row]->string);
+                    break;
+                }
+            }
+        }
+        printf("\n");
+    }
+
+    for (size_t column = 0; column <= results->columns; column++) {
+        string_set_t *tokens = ufo_csv_read_column_unique_values(path, column, results);
+
+        printf("Column %li of %s has the following unique values: \n\n", column, path);
+
+        for (size_t i = 0; i < tokens->size; i++) {
+            printf("    [%li]: %s\n", i, tokens->strings[i]);
+        }
+
+        printf("\n");
+    }
+}
+
+int main (int argc, char *argv[]) {
+    //test_file("test.csv");
+
+    //test_initial_scan("test.csv");
+    //test_read_individual_columns("test.csv");
+
+    //test_initial_scan("test2.csv", true);
+    test_read_individual_columns("test3.csv", true);
+    //test_read_typ`ed_columns("test2.csv", true);
+    test_read_typed_columns("test3.csv", true);
+    return 0;
+}

ufovectors/..Rcheck/tests/testthat.R

@@ -0,0 +1,4 @@
+library(testthat)
+library(ufovectors)
+
+test_check("ufovectors")