ferret 0.11.6 → 0.11.8.4

data/ext/compound_io.c

@@ -1,5 +1,6 @@
-#include "index.h" 
-#include "array.h" 
+#include "index.h"
+#include "array.h"
+#include "internal.h"
 
 extern void store_destroy(Store *store);
 extern InStream *is_new();
@@ -16,12 +17,12 @@ typedef struct FileEntry {
     off_t length;
 } FileEntry;
 
-static void cmpd_touch(Store *store, char *file_name)
+static void cmpd_touch(Store *store, const char *file_name)
 {
     store->dir.cmpd->store->touch(store->dir.cmpd->store, file_name);
 }
 
-static int cmpd_exists(Store *store, char *file_name)
+static int cmpd_exists(Store *store, const char *file_name)
 {
     if (h_get(store->dir.cmpd->entries, file_name) != NULL) {
         return true;
@@ -34,23 +35,23 @@ static int cmpd_exists(Store *store, char *file_name)
 /**
  * @throws UNSUPPORTED_ERROR
  */
-static int cmpd_remove(Store *store, char *file_name)
+static int cmpd_remove(Store *store, const char *file_name)
 {
     (void)store;
     (void)file_name;
-    RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG);
+    RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG);
     return 0;
 }
 
 /**
  * @throws UNSUPPORTED_ERROR
  */
-static void cmpd_rename(Store *store, char *from, char *to)
+static void cmpd_rename(Store *store, const char *from, const char *to)
 {
     (void)store;
     (void)from;
     (void)to;
-    RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG);
+    RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG);
 }
 
 static int cmpd_count(Store *store)
@@ -59,9 +60,9 @@ static int cmpd_count(Store *store)
 }
 
 static void cmpd_each(Store *store,
-                     void (*func)(char *fname, void *arg), void *arg)
+                     void (*func)(const char *fname, void *arg), void *arg)
 {
-    HashTable *ht = store->dir.cmpd->entries;
+    Hash *ht = store->dir.cmpd->entries;
     int i;
     for (i = 0; i <= ht->mask; i++) {
         char *fn = (char *)ht->table[i].key;
@@ -78,7 +79,7 @@ static void cmpd_each(Store *store,
 static void cmpd_clear(Store *store)
 {
     (void)store;
-    RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG);
+    RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG);
 }
 
 static void cmpd_close_i(Store *store)
@@ -96,9 +97,9 @@ static void cmpd_close_i(Store *store)
     store_destroy(store);
 }
 
-static off_t cmpd_length(Store *store, char *file_name)
+static off_t cmpd_length(Store *store, const char *file_name)
 {
-    FileEntry *fe = h_get(store->dir.cmpd->entries, file_name);
+    FileEntry *fe = (FileEntry *)h_get(store->dir.cmpd->entries, file_name);
     if (fe != NULL) {
         return fe->length;
     }
@@ -133,7 +134,7 @@ static void cmpdi_read_i(InStream *is, uchar *b, int len)
 
     if ((start + len) > cis->length) {
         RAISE(EOF_ERROR, "Tried to read past end of file. File length is "
-              "<%"F_OFF_T_PFX"d> and tried to read to <%"F_OFF_T_PFX"d>",
+              "<%"OFF_T_PFX"d> and tried to read to <%"OFF_T_PFX"d>",
               cis->length, start + len);
     }
 
@@ -175,7 +176,7 @@ static InStream *cmpd_open_input(Store *store, const char *file_name)
               "stream is closed.");
     }
 
-    entry = h_get(cmpd->entries, file_name);
+    entry = (FileEntry *)h_get(cmpd->entries, file_name);
     if (entry == NULL) {
         mutex_unlock(&store->mutex);
         RAISE(IO_ERROR, "File %s does not exist: ", file_name);
@@ -191,22 +192,22 @@ static OutStream *cmpd_new_output(Store *store, const char *file_name)
 {
     (void)store;
     (void)file_name;
-    RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG);
+    RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
-static Lock *cmpd_open_lock_i(Store *store, char *lock_name)
+static Lock *cmpd_open_lock_i(Store *store, const char *lock_name)
 {
     (void)store;
     (void)lock_name;
-    RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG);
+    RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
 static void cmpd_close_lock_i(Lock *lock)
 {
     (void)lock;
-    RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG);
+    RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG);
 }
 
 Store *open_cmpd_store(Store *store, const char *name)
@@ -322,7 +323,7 @@ static void cw_copy_file(CompoundWriter *cw, CWFileEntry *src, OutStream *os)
     /* Verify that remainder is 0 */
     if (remainder != 0) {
         RAISE(IO_ERROR, "There seems to be an error in the compound file "
-              "should have read to the end but there are <%"F_OFF_T_PFX"d> "
+              "should have read to the end but there are <%"OFF_T_PFX"d> "
               "bytes left", remainder);
     }
 
@@ -331,8 +332,8 @@ static void cw_copy_file(CompoundWriter *cw, CWFileEntry *src, OutStream *os)
     len = end_ptr - start_ptr;
     if (len != length) {
         RAISE(IO_ERROR, "Difference in compound file output file offsets "
-              "<%"F_OFF_T_PFX"d> does not match the original file lenght "
-              "<%"F_OFF_T_PFX"d>", len, length);
+              "<%"OFF_T_PFX"d> does not match the original file lenght "
+              "<%"OFF_T_PFX"d>", len, length);
     }
 
     is_close(is);

data/ext/config.h

@@ -1,6 +1,10 @@
 #ifndef FRT_DEFINES_H
 #define FRT_DEFINES_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <sys/types.h>
 #include <limits.h>
 #include "posh.h"
@@ -12,31 +16,37 @@
 #define true  1
 #endif
 
+#ifndef __cplusplus
 typedef unsigned int        bool;
-typedef unsigned char       uchar;
+#endif
+typedef unsigned char       frt_uchar;
 
-typedef posh_u16_t f_u16;
-typedef posh_i16_t f_i16;
-typedef posh_u32_t f_u32;
-typedef posh_i32_t f_i32;
-typedef posh_u64_t f_u64;
-typedef posh_i64_t f_i64;
+typedef posh_u16_t frt_u16;
+typedef posh_i16_t frt_i16;
+typedef posh_u32_t frt_u32;
+typedef posh_i32_t frt_i32;
+typedef posh_u64_t frt_u64;
+typedef posh_i64_t frt_i64;
 
 #if ( LONG_MAX == 2147483647 ) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-#define F_OFF_T_PFX "ll"
+#define FRT_OFF_T_PFX "ll"
 #else
-#define F_OFF_T_PFX "l"
+#define FRT_OFF_T_PFX "l"
 #endif
 
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
 #define FRT_IS_C99
 #define FRT_HAS_ISO_VARARGS
 #define FRT_HAS_VARARGS
 #endif
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(__cplusplus)
 #define FRT_HAS_GNUC_VARARGS
 #define FRT_HAS_VARARGS
 #endif
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif

data/ext/document.c

@@ -1,5 +1,7 @@
 #include "document.h"
+#include "symbol.h"
 #include <string.h>
+#include "internal.h"
 
 /****************************************************************************
  *
@@ -7,10 +9,10 @@
  *
  ****************************************************************************/
 
-DocField *df_new(const char *name)
+DocField *df_new(Symbol name)
 {
     DocField *df = ALLOC(DocField);
-    df->name = estrdup(name);
+    df->name = name;
     df->size = 0;
     df->capa = DF_INIT_CAPA;
     df->data = ALLOC_N(char *, df->capa);
@@ -48,44 +50,45 @@ void df_destroy(DocField *df)
     }
     free(df->data);
     free(df->lengths);
-    free(df->name);
     free(df);
 }
 
+/*
+ * Format for one item is: name: "data"
+ *        for more items : name: ["data", "data", "data"]
+ */
 char *df_to_s(DocField *df)
 {
-    int i;
-    int len = strlen(df->name) + 10;
+#define APPEND(dst, src) ((dst)[0] = (src)[0], 1)
+#define APPEND2(dst, src) (APPEND(dst, src), APPEND(dst+1, src+1), 2)
+
+    int i, len = 0, namelen = sym_len(df->name);
     char *str, *s;
     for (i = 0; i < df->size; i++) {
-        len += df->lengths[i] + 5;
+        len += df->lengths[i] + 4;
     }
-    s = str = ALLOC_N(char, len);
-    sprintf(str, "%s: ", df->name);
-    s += strlen(str);
-    if (df->size == 1) {
-        *(s++) = '"';
-        strncpy(s, df->data[0], df->lengths[0]);
-        s += df->lengths[0];
-        *(s++) = '"';
-        *(s++) = '\0';
+    s = str = ALLOC_N(char, namelen + len + 5);
+    memcpy(s, df->name, namelen);
+    s += namelen;
+    s += APPEND2(s, ": ");
+
+    if (df->size > 1) {
+        s += APPEND(s, "[");
     }
-    else {
-        *(s++) = '[';
-        *(s++) = '"';
-        strncpy(s, df->data[0], df->lengths[0]);
-        s += df->lengths[0];
-        *(s++) = '"';
-        for (i = 1; i < df->size; i++) {
-            *(s++) = ',';
-            *(s++) = ' ';
-            *(s++) = '"';
-            strncpy(s, df->data[i], df->lengths[i]);
-            s += df->lengths[i];
-            *(s++) = '"';
+    for (i = 0; i < df->size; i++) {
+        if (i != 0) {
+            s += APPEND2(s, ", ");
         }
-        sprintf(s, "]");
+        s += APPEND(s, "\"");
+        memcpy(s, df->data[i], df->lengths[i]);
+        s += df->lengths[i];
+        s += APPEND(s, "\"");
     }
+
+    if (df->size > 1) {
+        s += APPEND(s, "]");
+    }
+    *s = 0;
     return str;
 }
 
@@ -98,7 +101,7 @@ char *df_to_s(DocField *df)
 Document *doc_new()
 {
     Document *doc = ALLOC(Document);
-    doc->field_dict = h_new_str(NULL, (free_ft)&df_destroy);
+    doc->field_dict = h_new_ptr((free_ft)&df_destroy);
     doc->size = 0;
     doc->capa = DOC_INIT_CAPA;
     doc->fields = ALLOC_N(DocField *, doc->capa);
@@ -110,7 +113,7 @@ DocField *doc_add_field(Document *doc, DocField *df)
 {
     if (!h_set_safe(doc->field_dict, df->name, df)) {
         RAISE(EXCEPTION, "tried to add %s field which alread existed\n",
-              df->name);
+              S(df->name));
     }
     if (doc->size >= doc->capa) {
         doc->capa <<= 1;
@@ -121,29 +124,29 @@ DocField *doc_add_field(Document *doc, DocField *df)
     return df;
 }
 
-DocField *doc_get_field(Document *doc, const char *name)
+DocField *doc_get_field(Document *doc, Symbol name)
 {
-    return h_get(doc->field_dict, name);
+    return (DocField *)h_get(doc->field_dict, name);
 }
 
 char *doc_to_s(Document *doc)
 {
     int i;
-    int len = 100;
+    int len = 0;
     char **fields = ALLOC_N(char *, doc->size);
     char *buf, *s;
+
     for (i = 0; i < doc->size; i++) {
         fields[i] = df_to_s(doc->fields[i]);
-        len += strlen(fields[i]) + 10;
+        len += strlen(fields[i]) + 5;
     }
-    s = buf = ALLOC_N(char, len);
-    sprintf(buf, "Document [\n");
-    s += strlen(buf);
+    s = buf = ALLOC_N(char, len + 12);
+    s += sprintf(buf, "Document [\n");
     for (i = 0; i < doc->size; i++) {
-        sprintf(s, "  =>%s\n", fields[i]);
+        s += sprintf(s, "  =>%s\n", fields[i]);
         free(fields[i]);
-        s += strlen(s);
     }
+    free(fields);
     return buf;
 }
 

data/ext/document.h

@@ -1,53 +1,63 @@
 #ifndef FRT_DOCUMENT_H
 #define FRT_DOCUMENT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "global.h"
+#include "symbol.h"
 #include "hash.h"
 
 /****************************************************************************
  *
- * DocField
+ * FrtDocField
  *
  ****************************************************************************/
 
-#define DF_INIT_CAPA 1
-typedef struct DocField
+#define FRT_DF_INIT_CAPA 1
+typedef struct FrtDocField
 {
-    char *name;
+    FrtSymbol name;
     int size;
     int capa;
     int *lengths;
     char **data;
     float boost;
     bool destroy_data : 1;
-} DocField;
+    bool is_compressed : 1;
+} FrtDocField;
 
-extern DocField *df_new(const char *name);
-extern DocField *df_add_data(DocField *df, char *data);
-extern DocField *df_add_data_len(DocField *df, char *data, int len);
-extern void df_destroy(DocField *df);
-extern char *df_to_s(DocField *df);
+extern FrtDocField *frt_df_new(FrtSymbol name);
+extern FrtDocField *frt_df_add_data(FrtDocField *df, char *data);
+extern FrtDocField *frt_df_add_data_len(FrtDocField *df, char *data, int len);
+extern void frt_df_destroy(FrtDocField *df);
+extern char *frt_df_to_s(FrtDocField *df);
 
 /****************************************************************************
  *
- * Document
+ * FrtDocument
  *
  ****************************************************************************/
 
-#define DOC_INIT_CAPA 8
-typedef struct Document
+#define FRT_DOC_INIT_CAPA 8
+typedef struct FrtDocument
 {
-    HashTable *field_dict;
+    FrtHash *field_dict;
     int size;
     int capa;
-    DocField **fields;
+    FrtDocField **fields;
     float boost;
-} Document;
+} FrtDocument;
 
-extern Document *doc_new();
-extern DocField *doc_add_field(Document *doc, DocField *df);
-extern DocField *doc_get_field(Document *doc, const char *fname);
-extern char *doc_to_s(Document *doc);
-extern void doc_destroy(Document *doc);
+extern FrtDocument *frt_doc_new();
+extern FrtDocField *frt_doc_add_field(FrtDocument *doc, FrtDocField *df);
+extern FrtDocField *frt_doc_get_field(FrtDocument *doc, FrtSymbol name);
+extern char *frt_doc_to_s(FrtDocument *doc);
+extern void frt_doc_destroy(FrtDocument *doc);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 #endif

data/ext/except.c

@@ -2,27 +2,22 @@
 #include "global.h"
 #include "except.h"
 #include "threading.h"
+#include "internal.h"
 
-/**
- * Set this to false if you don't want to print the error location when an
- * exception occurs.
- */
-bool except_show_pos = true;
-
-const char *const FRT_ERROR_TYPES[] = {
-  "Body",
-  "Finally",
-  "Exception",
-  "IO Error",
-  "File Not Found Error",
-  "Argument Error",
-  "End-of-File Error",
-  "Unsupported Function Error",
-  "State Error",
-  "Parse Error",
-  "Memory Error",
-  "Index Error",
-  "Lock Error"
+static const char *const ERROR_TYPES[] = {
+    "Body",
+    "Finally",
+    "Exception",
+    "IO Error",
+    "File Not Found Error",
+    "Argument Error",
+    "End-of-File Error",
+    "Unsupported Function Error",
+    "State Error",
+    "Parse Error",
+    "Memory Error",
+    "Index Error",
+    "Lock Error"
 };
 
 char *const UNSUPPORTED_ERROR_MSG = "Unsupported operation";
@@ -38,24 +33,11 @@ static void exception_stack_alloc(void)
     thread_key_create(&exception_stack_key, NULL);
 }
 
-/*
-static void put_stack(char *inst, xcontext_t *top)
-{
-    int x = 10;
-    fprintf(stderr, "( %s )", inst);
-    while (top && x--) {
-        fprintf(stderr, "=> %x ", top);
-        top = top->next;
-    }
-    fprintf(stderr, "\n");
-}
-*/
-
 void xpush_context(xcontext_t *context)
 {
     xcontext_t *top_context;
     thread_once(&exception_stack_key_once, *exception_stack_alloc);
-    top_context = thread_getspecific(exception_stack_key);
+    top_context = (xcontext_t *)thread_getspecific(exception_stack_key);
     context->next = top_context;
     thread_setspecific(exception_stack_key, context);
     context->handled = true;
@@ -87,10 +69,10 @@ void xraise(int excode, const char *const msg)
 {
     xcontext_t *top_context;
     thread_once(&exception_stack_key_once, *exception_stack_alloc);
-    top_context = thread_getspecific(exception_stack_key);
+    top_context = (xcontext_t *)thread_getspecific(exception_stack_key);
 
     if (!top_context) {
-        FRT_EXIT(FRT_ERROR_TYPES[excode], msg);
+        XEXIT(ERROR_TYPES[excode], msg);
     }
     else if (!top_context->in_finally) {
         xraise_context(top_context, excode, msg);
@@ -106,7 +88,7 @@ void xpop_context()
 {
     xcontext_t *top_cxt, *context;
     thread_once(&exception_stack_key_once, *exception_stack_alloc);
-    top_cxt = thread_getspecific(exception_stack_key);
+    top_cxt = (xcontext_t *)thread_getspecific(exception_stack_key);
     context = top_cxt->next;
     thread_setspecific(exception_stack_key, context);
     if (!top_cxt->handled) {
@@ -114,7 +96,7 @@ void xpop_context()
             xraise_context(context, top_cxt->excode, top_cxt->msg);
         }
         else {
-            FRT_EXIT(FRT_ERROR_TYPES[top_cxt->excode], top_cxt->msg);
+            XEXIT(ERROR_TYPES[top_cxt->excode], top_cxt->msg);
         }
     }
 }