ferret 0.9.1 → 0.9.2

data/ext/global.c

@@ -17,7 +17,7 @@ int min3(int a, int b, int c)
   return MIN3(a, b, c);
 }
 
-int min(int a, int b)
+int min2(int a, int b)
 {
   return MIN(a, b);
 }
@@ -27,7 +27,7 @@ int max3(int a, int b, int c)
   return MAX3(a, b, c);
 }
 
-int max(int a, int b)
+int max2(int a, int b)
 {
   return MAX(a, b);
 }
@@ -127,8 +127,8 @@ char *progname(void)
 /* concatenate two strings freeing the second */
 char *estrcat(char *str1, char *str2)
 {
-  int len1 = strlen(str1);
-  int len2 = strlen(str2);
+  size_t len1 = strlen(str1);
+  size_t len2 = strlen(str2);
   REALLOC_N(str1, char, len1 + len2 + 3); // leave room for <CR>
   memcpy(str1 + len1, str2, len2 + 1); // make sure '\0' copied too
   free(str2);
@@ -138,10 +138,11 @@ char *estrcat(char *str1, char *str2)
 /* epstrdup: duplicate a string with a format, report if error */
 char *epstrdup(const char *fmt, int len, ...)
 {
+  char *string;
   va_list args;
-  len += strlen(fmt);
+  len += (int)strlen(fmt);
 
-  char *string = ALLOC_N(char, len + 1);
+  string = ALLOC_N(char, len + 1);
   va_start(args, len);
   vsprintf(string, fmt, args);
   va_end(args);
@@ -227,7 +228,7 @@ char *strfmt(const char *fmt, ...)
   char *string;
   char *p = (char *)fmt, *q;
   va_list args;
-  int len = strlen(fmt) + 1;
+  int len = (int)strlen(fmt) + 1;
   int slen;
   char *s;
   long i;
@@ -244,7 +245,7 @@ char *strfmt(const char *fmt, ...)
           p++;
           s = va_arg(args, char *);
           if (s) {
-            slen = strlen(s);
+            slen = (int)strlen(s);
             len += slen;
             *q = 0;
             REALLOC_N(string, char, len);

data/ext/global.h

@@ -4,29 +4,34 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-//#define DEBUG
+/*
+#define DEBUG 
 #define VALGRIND
-
+*/
 #define false 0
 #define true 1
 
-typedef unsigned char bool;
+typedef unsigned int bool;
 typedef unsigned char uchar;
 typedef unsigned int uint;
 
-typedef void (*destroy_func_t)(void *p);
+typedef void (*free_ft)(void *key);
 
 #include "lang.h"
 #include "except.h"
 
+#define ref(obj) obj->ref_cnt++
+#define deref(obj) obj->ref_cnt--
+
 #define MAX_WORD_SIZE 255
-#define MAX_PATH 1024
+#define MAX_FILE_PATH 1024
 #define MAX_BUFFER_SIZE 1024
 #define ARRAY_INIT_SIZE 4
 
 #define NELEMS(array) sizeof(array)/sizeof(array[0])
 
 #define ZEROSET(ptr, type, n) memset(ptr, 0, sizeof(type)*(n))
+#define ALLOC_AND_ZERO(type) (type*)memset(emalloc(sizeof(type)), 0, sizeof(type))
 #define ALLOC_AND_ZERO_N(type,n) (type*)ZEROSET(emalloc(sizeof(type)*(n)), type, n)
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -50,7 +55,6 @@ typedef void (*destroy_func_t)(void *p);
 #define Jx fprintf(stderr,"%s, %d: %s\n", __FILE__, __LINE__, __func__);
 #define Xj fprintf(stdout,"%s, %d: %s\n", __FILE__, __LINE__, __func__);
 
-#define efree free
 extern void *emalloc(size_t n);
 extern void *erealloc(void *ptr, size_t n);
 extern char *estrdup(const char *s);
@@ -63,12 +67,12 @@ extern int scmp(const void *p1, const void *p2);
 extern int icmp(const void *p1, const void *p2);
 extern int icmp_risky(const void *p1, const void *p2);
 
-int min(int a, int b);
-int min3(int a, int b, int c);
-int max(int a, int b);
-int max3(int a, int b, int c);
+extern int min2(int a, int b);
+extern int min3(int a, int b, int c);
+extern int max2(int a, int b);
+extern int max3(int a, int b, int c);
 
-char *dbl_to_s(char *buf, double num);
-void lower_str(char *str);
-char *strfmt(const char *fmt, ...);
+extern char *dbl_to_s(char *buf, double num);
+extern void lower_str(char *str);
+extern char *strfmt(const char *fmt, ...);
 #endif

data/ext/hash.c

@@ -255,11 +255,9 @@ HshEntry *h_lookup(HshTable *ht, register const void *key)
 
 typedef void (*free_func)(void *);
 void dummy_free(void *p)
-{
-  //printf("Shouldn't do nuthin");
-}
+{ }
 
-HshTable *h_new_str(void (*free_key)(void *key), void (*free_value)(void *value))
+HshTable *h_new_str(free_ft free_key, free_ft free_value)
 {
   HshTable *ht;
   if (num_free_hts > 0) {
@@ -278,10 +276,7 @@ HshTable *h_new_str(void (*free_key)(void *key), void (*free_value)(void *value)
   return ht;
 }
 
-HshTable *h_new(unsigned int (*hash)(const void *key),
-    int (*eq)(const void *key1, const void *key2),
-    void (*free_key)(void *key),
-    void (*free_value)(void *value))
+HshTable *h_new(hash_ft hash, eq_ft eq, free_ft free_key, free_ft free_value)
 {
   HshTable *ht = h_new_str(free_key, free_value);
 
@@ -298,7 +293,7 @@ void h_clear(HshTable *ht)
   free_func free_key = ht->free_key;
   free_func free_value = ht->free_value;
 
-  // Clear all the hash values and keys as necessary
+  /* Clear all the hash values and keys as necessary */
   for (i = 0; i <= ht->mask; i++) {
     he = &ht->table[i];
     if (he->key != NULL && he->key != dummy_key) {
@@ -309,13 +304,15 @@ void h_clear(HshTable *ht)
   }
   ht->used = 0;
   ht->fill = 0;
+  /* for some reason the following line doesn't seem to help */
+  /* ZEROSET(ht->table, HshEntry, ht->mask + 1); */
 }
 
 void h_destroy(HshTable *ht)
 {
   h_clear(ht);
 
-  // if a new table was created, be sure to free it
+  /* if a new table was created, be sure to free it */
   if (ht->table != ht->smalltable) free(ht->table);
 
   if (num_free_hts < MAX_FREE_HASH_TABLES) {
@@ -389,20 +386,16 @@ int h_resize(HshTable *ht, int min_newsize) {
   }
   memset(ht->table, 0, sizeof(HshEntry) * newsize);
   i = ht->used;
-  //i = ht->fill;
   ht->fill = ht->used;
   ht->mask = newsize - 1;
-  int j = 0;
+
   for (he_old = oldtable; i > 0; he_old++) {
-    j++;
-    if (he_old->value != NULL) {// active entry
+    if (he_old->value != NULL) {/* active entry */
       he_new = ht->lookup(ht, he_old->key);
       he_new->key = he_old->key;
       he_new->value = he_old->value;
       i--;
-    //} else if (he_old->key == dummy_key) { //dummy entry
-     // i--;
-    } // else empty entry so nothing to do
+    } /* else empty entry so nothing to do */
   }
   if (oldtable != smallcopy && oldtable != ht->smalltable)
     free(oldtable);
@@ -453,7 +446,7 @@ void h_each(HshTable *ht,
   HshEntry *he;
   int i = ht->used;
   for (he = ht->table; i > 0; he++) {
-    if (he->value != NULL) {// active entry
+    if (he->value != NULL) {/* active entry */
       each_kv(he->key, he->value, arg);
       i--;
     }
@@ -468,6 +461,7 @@ HshTable *h_clone(HshTable *ht,
   HshEntry *he;
   int i = ht->used;
   HshTable *ht_clone;
+
   if (ht->lookup == &h_lookup_str) {
     ht_clone = h_new_str(ht->free_key, ht->free_value);
   } else {
@@ -475,7 +469,7 @@ HshTable *h_clone(HshTable *ht,
   }
 
   for (he = ht->table; i > 0; he++) {
-    if (he->value != NULL) {// active entry
+    if (he->value != NULL) {/* active entry */
       key = clone_key ? clone_key(he->key) : he->key;
       value = clone_value ? clone_value(he->value) : he->value;
       h_set(ht_clone, key, value);

data/ext/hash.h

@@ -27,8 +27,8 @@ void *ht_delete(HashEntry **ht, char *name);
  ****************************************************************************/
 
 #define Hsh_MINSIZE 8
-#define SLOW_DOWN 50000 // stop increasing the hash table so quickly to
-                        // conserve memory
+#define SLOW_DOWN 50000 /* stop increasing the hash table so quickly to
+                         * conserve memory */
 extern char *dummy_key;
 enum {
   HASH_KEY_DOES_NOT_EXIST = 0,
@@ -45,24 +45,24 @@ typedef struct {
 typedef struct HshTable {
 	int fill;  /* # Active + # Dummy */
 	int used;  /* # Active */
-	int mask;
+	int mask;  /* size of table - 1 */
 
 	/* table points to smalltable for small tables, else to
 	 * additional malloc'ed memory. */
 	HshEntry *table;
 	HshEntry smalltable[Hsh_MINSIZE];
-  HshEntry *(*lookup)(struct HshTable *ht, const void *key);
+  HshEntry *(*lookup)(struct HshTable *ht, register const void *key);
   unsigned int (*hash)(const void *key);
   int (*eq)(const void *key1, const void *key2);
-  void (*free_key)(void *key);
-  void (*free_value)(void *value);
+  free_ft free_key;
+  free_ft free_value;
 } HshTable;
 
-HshTable *h_new_str(void (*free_key)(void *key), void (*free_value)(void *value));
-HshTable *h_new(unsigned int (*hash)(const void *key),
-    int (*eq)(const void *key1, const void *key2),
-    void (*free_key)(void *key),
-    void (*free_value)(void *value));
+typedef unsigned int (*hash_ft)(const void *key);
+typedef int (*eq_ft)(const void *key1, const void *key2);
+
+HshTable *h_new_str(free_ft free_key, free_ft free_value);
+HshTable *h_new(hash_ft hash, eq_ft eq, free_ft free_key, free_ft free_value);
 void h_destroy(HshTable *ht);
 void h_clear(HshTable *ht);
 

data/ext/hashset.c

@@ -16,7 +16,7 @@ HashSet *hs_create(unsigned int (*hash)(const void *p),
     void (*free_elem)(void *p))
 {
   HashSet *hs = ALLOC(HashSet);
-  hs->ht = h_new(hash, eq, NULL, &efree);
+  hs->ht = h_new(hash, eq, NULL, &free);
   hs->elems = NULL;
   hs->capa = hs->size = 0;
   if (free_elem == NULL)
@@ -29,7 +29,7 @@ HashSet *hs_create(unsigned int (*hash)(const void *p),
 HashSet *hs_str_create(void (*free_elem)(void *p))
 {
   HashSet *hs = ALLOC(HashSet);
-  hs->ht = h_new_str(NULL, &efree);
+  hs->ht = h_new_str((free_ft)NULL, &free);
   hs->elems = NULL;
   hs->capa = hs->size = 0;
   if (free_elem == NULL)
@@ -39,9 +39,8 @@ HashSet *hs_str_create(void (*free_elem)(void *p))
   return hs;
 }
 
-void hs_destroy(void *p)
+void hs_destroy(HashSet *hs)
 {
-  HashSet *hs = (HashSet *)p;
   h_destroy(hs->ht);
   free(hs->elems);
   free(hs);
@@ -54,14 +53,13 @@ void hs_clear(HashSet *self)
     hs_del(self, self->elems[i]);
 }
 
-void hs_destroy_all(void *p)
+void hs_destroy_all(HashSet *hs)
 {
   int i;
-  HashSet *hs = (HashSet *)p;
   if (hs->free_elem != &dummy_free)
     for (i = 0; i < hs->size; i++)
       hs->free_elem(hs->elems[i]);
-  hs_destroy(p);
+  hs_destroy(hs);
 }
 
 int hs_add(HashSet *hs, void *elem)

data/ext/hashset.h

@@ -17,8 +17,8 @@ HashSet *hs_create(unsigned int (*hash)(const void *p),
                    int (*eq)(const void *p1, const void *p2),
                    void (*free_elem)(void *p));
 HashSet *hs_str_create(void (*free_elem)(void *p));
-void hs_destroy(void *p);
-void hs_destroy_all(void *p);
+void hs_destroy(HashSet *hs);
+void hs_destroy_all(HashSet *hs);
 int hs_add(HashSet *hs, void *elem);
 int hs_del(HashSet *hs, void *elem);
 void *hs_rem(HashSet *hs, void *elem);
@@ -27,11 +27,12 @@ HashSet *hs_merge(HashSet *hs, HashSet *other);
 void *hs_orig(HashSet *hs, void *elem);
 void hs_clear(HashSet *self);
 
-// TODO: finish these functions.
-//int hs_osf(HashSet *hs, void *elem);
-//HashSet hs_or(HashSet *hs1, HashSet *h2);
-//HashSet hs_excl_or(HashSet *hs1, HashSet *h2);
-//HashSet hs_and(HashSet *hs1, HashSet *h2);
-//HashSet hs_mask(HashSet *hs1, HashSet *h2);
+/* TODO: finish these functions.
+int hs_osf(HashSet *hs, void *elem);
+HashSet hs_or(HashSet *hs1, HashSet *h2);
+HashSet hs_excl_or(HashSet *hs1, HashSet *h2);
+HashSet hs_and(HashSet *hs1, HashSet *h2);
+HashSet hs_mask(HashSet *hs1, HashSet *h2);
+*/
 
 #endif

data/ext/helper.c

@@ -1,4 +1,4 @@
-#include <string.h>
+#include "helper.h"
 
 inline int hlp_string_diff(register const char *const s1,
                            register const char *const s2)

data/ext/helper.h

@@ -1,5 +1,6 @@
 #ifndef FRT_HELPER_H
 #define FRT_HELPER_H
 
-int hlp_string_diff(char *s1, char *s2);
+extern inline int hlp_string_diff(register const char *const s1,
+                                  register const char *const s2);
 #endif

data/ext/inc/except.h

@@ -7,7 +7,6 @@
 #define BODY 0
 #define FINALLY -1
 #define EXCEPTION 1
-#define ERROR 1
 #define IO_ERROR 2
 #define ARG_ERROR 3
 #define EOF_ERROR 4
@@ -29,35 +28,38 @@ RUBY_EXTERN int rb_thread_critical;
 extern xcontext_t *xtop_context;
 
 #define TRY\
-  xcontext_t xcontext;\
-  rb_thread_critical = Qtrue;\
-  xcontext.next = xtop_context;\
-  xtop_context = &xcontext;\
-  xcontext.handled = true;\
-  xcontext.in_finally = false;\
-  switch (setjmp(xcontext.jbuf)) {\
-    case BODY:
+  do {\
+    xcontext_t xcontext;\
+    rb_thread_critical = Qtrue;\
+    xcontext.next = xtop_context;\
+    xtop_context = &xcontext;\
+    xcontext.handled = true;\
+    xcontext.in_finally = false;\
+    switch (setjmp(xcontext.jbuf)) {\
+      case BODY:
 
 
 #define XENDTRY\
-  }\
-  xtop_context = xcontext.next;\
-  if (!xcontext.handled) {\
-    RAISE(xcontext.excode, xcontext.msg);\
-  }\
-  rb_thread_critical = 0;
-
-#define ENDTRY\
-  }\
-  if (!xcontext.in_finally) {\
+    }\
     xtop_context = xcontext.next;\
     if (!xcontext.handled) {\
       RAISE(xcontext.excode, xcontext.msg);\
     }\
-    xcontext.in_finally = 1;\
-    longjmp(xcontext.jbuf, FINALLY);\
-  }\
-  rb_thread_critical = 0;
+    rb_thread_critical = 0;\
+  } while (0);
+
+#define ENDTRY\
+    }\
+    if (!xcontext.in_finally) {\
+      xtop_context = xcontext.next;\
+      if (!xcontext.handled) {\
+        RAISE(xcontext.excode, xcontext.msg);\
+      }\
+      xcontext.in_finally = 1;\
+      longjmp(xcontext.jbuf, FINALLY);\
+    }\
+    rb_thread_critical = 0;\
+  } while (0);
 
 #define XFINALLY default: xcontext.in_finally = 1;
 

data/ext/inc/lang.h

@@ -7,7 +7,17 @@
 #define FERRET_EXT
 
 #define MAX_ERROR_LEN 2048
-#define eprintf(...) ft_raise(__FILE__, __LINE__, __VA_ARGS__)
+
+typedef LONG_LONG llong;
+typedef unsigned LONG_LONG ullong;
+
+#ifdef WIN32
+# undef close
+# undef rename
+extern void eprintf(VALUE etype, const char *fmt, ...);
+#else
+# define eprintf(...) ft_raise(__FILE__, __LINE__, __VA_ARGS__)
+#endif
 extern void ft_raise(char *file, int line_num, VALUE etype, const char *fmt, ...);
 extern void weprintf(const char *fmt, ...);
 extern char *progname(void);