ferret 0.11.6 → 0.11.8.4

data/ext/except.h

@@ -3,34 +3,39 @@
  *
  * Exception Handling looks something like this;
  *
+ * ### NOTE ###
+ * You must use a FINALLY block if you use "default:" block. Otherwise the
+ * default: block will get called in place of the FINALLY block.
+ *
+ *
  * <pre>
- *   TRY
- *       RAISE(EXCEPTION, msg1);
+ *   FRT_TRY
+ *       FRT_RAISE(FRT_EXCEPTION, msg1);
  *       break;
- *   case EXCEPTION:
+ *   case FRT_EXCEPTION:
  *       // This should be called
  *       exception_handled = true;
- *       HANDLED();
+ *       FRT_HANDLED();
  *       break;
  *   default:
  *       // shouldn't enter here
  *       break;
- *   XFINALLY
+ *   FRT_XFINALLY
  *       // this code will always be run
  *       if (close_widget_one(arg) == 0) {
- *           RAISE(EXCEPTION_CODE, msg);
+ *           FRT_RAISE(EXCEPTION_CODE, msg);
  *       }
  *       // this code will also always run, even if the above exception is
  *       // raised
  *       if (close_widget_two(arg) == 0) {
- *           RAISE(EXCEPTION_CODE, msg);
+ *           FRT_RAISE(EXCEPTION_CODE, msg);
  *       }
- *   XENDTRY
+ *   FRT_XENDTRY
  * </pre>
  *
  * Basically exception handling uses the following macros;
  *
- * TRY 
+ * FRT_TRY
  *   Sets up the exception handler and need be placed before any expected
  *   exceptions would be raised.
  *
@@ -39,130 +44,138 @@
  *   statement with the appropriate error code to catch Exceptions. Hence, if
  *   you want to catch all exceptions, use the default keyword.
  *
- * HANDLED
+ * FRT_HANDLED
  *   If you catch and handle an exception you need to explicitely call
- *   HANDLED(); or the exeption will be re-raised once the current exception
+ *   FRT_HANDLED(); or the exeption will be re-raised once the current exception
  *   handling context is left.
  *
- * case FINALLY:
+ * case FRT_FINALLY:
  *   Code in this block is always called. Use this block to close any
  *   resources opened in the Exception handling body.
  *
- * ENDTRY
+ * FRT_ENDTRY
  *   Must be placed at the end of all exception handling code.
  *
- * XFINALLY
- *   Similar to case FINALLY: except that it uses a fall through (ie, you must
+ * FRT_XFINALLY
+ *   Similar to case FRT_FINALLY: except that it uses a fall through (ie, you must
  *   not use a break before it) instead of a jump to get to it. This saves a
- *   jump. It must be used in combination with XENDTRY and must not have any
+ *   jump. It must be used in combination with FRT_XENDTRY and must not have any
  *   other catches. This is an optimization so should probably be not be used
  *   in most cases.
  *
- * XCATCHALL
- *   Like XFINALLY but the block is only called when an exception is raised.
- *   Must use in combination with XENDTRY and do not have any other FINALLY or
+ * FRT_XCATCHALL
+ *   Like FRT_XFINALLY but the block is only called when an exception is raised.
+ *   Must use in combination with FRT_XENDTRY and do not have any other FRT_FINALLY or
  *   catch block.
  *
- * XENDTRY
- *   Must use in combination with XFINALLY or XCATCHALL. Simply, it doesn't
- *   jump to FINALLY, making it more efficient.
+ * FRT_XENDTRY
+ *   Must use in combination with FRT_XFINALLY or FRT_XCATCHALL. Simply, it doesn't
+ *   jump to FRT_FINALLY, making it more efficient.
  */
 #ifndef FRT_EXCEPT_H
 #define FRT_EXCEPT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <setjmp.h>
 #include "config.h"
 
-#define BODY 0
-#define FINALLY 1
-#define EXCEPTION 2
-#define FERRET_ERROR 2
-#define IO_ERROR 3
-#define FILE_NOT_FOUND_ERROR 4
-#define ARG_ERROR 5
-#define EOF_ERROR 6
-#define UNSUPPORTED_ERROR 7
-#define STATE_ERROR 8
-#define PARSE_ERROR 9
-#define MEM_ERROR 10
-#define INDEX_ERROR 11
-#define LOCK_ERROR 12
-
-extern char *const UNSUPPORTED_ERROR_MSG;
-extern char *const EOF_ERROR_MSG;
-extern bool except_show_pos;
-
-typedef struct xcontext_t
+/* TODO make this an enum */
+#define FRT_BODY 0
+#define FRT_FINALLY 1
+#define FRT_EXCEPTION 2
+#define FRT_FERRET_ERROR 2
+#define FRT_IO_ERROR 3
+#define FRT_FILE_NOT_FOUND_ERROR 4
+#define FRT_ARG_ERROR 5
+#define FRT_EOF_ERROR 6
+#define FRT_UNSUPPORTED_ERROR 7
+#define FRT_STATE_ERROR 8
+#define FRT_PARSE_ERROR 9
+#define FRT_MEM_ERROR 10
+#define FRT_INDEX_ERROR 11
+#define FRT_LOCK_ERROR 12
+
+extern char *const FRT_UNSUPPORTED_ERROR_MSG;
+extern char *const FRT_EOF_ERROR_MSG;
+
+typedef struct frt_xcontext_t
 {
     jmp_buf jbuf;
-    struct xcontext_t *next;
+    struct frt_xcontext_t *next;
     const char *msg;
     volatile int excode;
     unsigned int handled : 1;
     unsigned int in_finally : 1;
-} xcontext_t;
+} frt_xcontext_t;
 
-#define TRY\
+#define FRT_TRY\
   do {\
-    xcontext_t xcontext;\
-    xpush_context(&xcontext);\
+    frt_xcontext_t xcontext;\
+    frt_xpush_context(&xcontext);\
     switch (setjmp(xcontext.jbuf)) {\
-      case BODY:
+      case FRT_BODY:
 
 
-#define XENDTRY\
+#define FRT_XENDTRY\
     }\
-    xpop_context();\
+    frt_xpop_context();\
   } while (0);
 
-#define ENDTRY\
+#define FRT_ENDTRY\
     }\
     if (!xcontext.in_finally) {\
-      xpop_context();\
+      frt_xpop_context();\
       xcontext.in_finally = 1;\
-      longjmp(xcontext.jbuf, FINALLY);\
+      longjmp(xcontext.jbuf, FRT_FINALLY);\
     }\
   } while (0);
 
-#define RETURN_EARLY() xpop_context()
+#define FRT_RETURN_EARLY() frt_xpop_context()
 
 
-#define XFINALLY default: xcontext.in_finally = 1;
+#define FRT_XFINALLY default: xcontext.in_finally = 1;
 
-#define XCATCHALL break; default: xcontext.in_finally = 1;
+#define FRT_XCATCHALL break; default: xcontext.in_finally = 1;
 
-#define HANDLED() xcontext.handled = 1; /* true */
+#define FRT_HANDLED() xcontext.handled = 1; /* true */
 
-#define XMSG_BUFFER_SIZE 2048
+#define FRT_XMSG_BUFFER_SIZE 2048
 
 #ifdef FRT_HAS_ISO_VARARGS
-# define RAISE(excode, ...) do {\
-  snprintf(xmsg_buffer, XMSG_BUFFER_SIZE, __VA_ARGS__);\
-  snprintf(xmsg_buffer_final, XMSG_BUFFER_SIZE,\
-          "Error occured in %s:%d - %s\n\t%s\n",\
-          __FILE__, __LINE__, __func__, xmsg_buffer);\
-  xraise(excode, xmsg_buffer_final);\
+# define FRT_RAISE(excode, ...) do {\
+  snprintf(frt_xmsg_buffer, FRT_XMSG_BUFFER_SIZE, __VA_ARGS__);\
+  snprintf(frt_xmsg_buffer_final, FRT_XMSG_BUFFER_SIZE,\
+          "Error occured in %s:%d - %s\n\t%s",\
+          __FILE__, __LINE__, __func__, frt_xmsg_buffer);\
+  frt_xraise(excode, frt_xmsg_buffer_final);\
 } while (0)
 #elif defined(FRT_HAS_GNUC_VARARGS)
-# define RAISE(excode, args...) do {\
-  snprintf(xmsg_buffer, XMSG_BUFFER_SIZE, ##args);\
-  snprintf(xmsg_buffer_final, XMSG_BUFFER_SIZE,\
+# define FRT_RAISE(excode, args...) do {\
+  snprintf(frt_xmsg_buffer, FRT_XMSG_BUFFER_SIZE, ##args);\
+  snprintf(frt_xmsg_buffer_final, FRT_XMSG_BUFFER_SIZE,\
           "Error occured in %s:%d - %s\n\t%s\n",\
-          __FILE__, __LINE__, __func__, xmsg_buffer);\
-  xraise(excode, xmsg_buffer_final);\
+          __FILE__, __LINE__, __func__, frt_xmsg_buffer);\
+  frt_xraise(excode, frt_xmsg_buffer_final);\
 } while (0)
 
 #else
-extern void RAISE(int excode, const char *fmt, ...);
+extern void FRT_RAISE(int excode, const char *fmt, ...);
 #endif
-#define RAISE_HELL() RAISE(FERRET_ERROR, "Hell")
+#define RAISE_HELL() FRT_RAISE(FRT_FERRET_ERROR, "Hell")
+
 
+extern void frt_xraise(int excode, const char *const msg);
+extern void frt_xpush_context(frt_xcontext_t *context);
+extern void frt_xpop_context();
 
-extern void xraise(int excode, const char *const msg);
-extern void xpush_context(xcontext_t *context);
-extern void xpop_context();
+extern char frt_xmsg_buffer[FRT_XMSG_BUFFER_SIZE];
+extern char frt_xmsg_buffer_final[FRT_XMSG_BUFFER_SIZE];
 
-extern char xmsg_buffer[XMSG_BUFFER_SIZE];
-extern char xmsg_buffer_final[XMSG_BUFFER_SIZE];
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 #endif

data/ext/extconf.rb

@@ -5,10 +5,11 @@ if (/mswin/ =~ RUBY_PLATFORM) and ENV['make'].nil?
   create_makefile("ferret_ext")
 elsif ENV['FERRET_DEV']
   require 'mkmf'
-  $CFLAGS += " -fno-stack-protector -fno-common -D_FILE_OFFSET_BITS=64"
+  $CFLAGS = " -g -Wall -fno-stack-protector -fno-common -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500"
+  puts $CFLAGS
   create_makefile("ferret_ext")
 else
   require 'mkmf'
-  $CFLAGS += " -D_FILE_OFFSET_BITS=64"
+  $CFLAGS += " -Wall -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500"
   create_makefile("ferret_ext")
 end

data/ext/ferret.c

@@ -4,9 +4,11 @@
 #include "hash.h"
 #include "hashset.h"
 #include "threading.h"
+#include "symbol.h"
+#include "internal.h"
 
 /* Object Map */
-static HashTable *object_map;
+static Hash *object_map;
 
 /* IDs */
 ID id_new;
@@ -84,30 +86,30 @@ void
 //object_del(void *key)
 object_del2(void *key, const char *file, int line)
 {
-    if (object_get(key) == Qnil) 
+    if (object_get(key) == Qnil)
         printf("failed deleting %ld. %s:%d\n", (long)key, file, line);
     //printf("deleting %ld. now contains %ld, %s:%d\n", (long)key, --hash_cnt, file, line);
     h_del(object_map, key);
 }
 
-void frt_gc_mark(void *key)
+void frb_gc_mark(void *key)
 {
     VALUE val = (VALUE)h_get(object_map, key);
     if (val)
         rb_gc_mark(val);
 }
 
-VALUE frt_data_alloc(VALUE klass)
+VALUE frb_data_alloc(VALUE klass)
 {
     return Frt_Make_Struct(klass);
 }
 
-void frt_deref_free(void *p)
+void frb_deref_free(void *p)
 {
     object_del(p);
 }
 
-void frt_thread_once(int *once_control, void (*init_routine) (void))
+void frb_thread_once(int *once_control, void (*init_routine) (void))
 {
     if (*once_control) {
         init_routine();
@@ -115,45 +117,45 @@ void frt_thread_once(int *once_control, void (*init_routine) (void))
     }
 }
 
-void frt_thread_key_create(thread_key_t *key, void (*destr_function)(void *))
+void frb_thread_key_create(thread_key_t *key, void (*destr_function)(void *))
 {
     *key = h_new(&value_hash, &value_eq, NULL, destr_function);
 }
 
-void frt_thread_key_delete(thread_key_t key)
+void frb_thread_key_delete(thread_key_t key)
 {
     h_destroy(key);
 }
 
-void frt_thread_setspecific(thread_key_t key, const void *pointer)
+void frb_thread_setspecific(thread_key_t key, const void *pointer)
 {
     h_set(key, (void *)rb_thread_current(), (void *)pointer);
 }
 
-void *frt_thread_getspecific(thread_key_t key)
+void *frb_thread_getspecific(thread_key_t key)
 {
     return h_get(key, (void *)rb_thread_current());
 }
 
-void frt_create_dir(VALUE rpath)
+void frb_create_dir(VALUE rpath)
 {
     VALUE mFileUtils;
-    rb_require("fileutils");
     mFileUtils = rb_define_module("FileUtils");
     rb_funcall(mFileUtils, id_mkdir_p, 1, rpath);
 }
 
-VALUE frt_hs_to_rb_ary(HashSet *hs)
+VALUE frb_hs_to_rb_ary(HashSet *hs)
 {
-    int i;
+    HashSetEntry *hse;
     VALUE ary = rb_ary_new();
-    for (i = 0; i < hs->size; i++) {
-        rb_ary_push(ary, rb_str_new2(hs->elems[i]));
+
+    for (hse = hs->first; hse; hse = hse->next) {
+        rb_ary_push(ary, rb_str_new2(hse->elem));
     }
     return ary;
 }
 
-void *frt_rb_data_ptr(VALUE val)
+void *frb_rb_data_ptr(VALUE val)
 {
     Check_Type(val, T_DATA);
     return DATA_PTR(val);
@@ -162,31 +164,38 @@ void *frt_rb_data_ptr(VALUE val)
 char *
 rs2s(VALUE rstr)
 {
-    return (char *)(RSTRING(rstr)->ptr ? RSTRING(rstr)->ptr : EMPTY_STRING);
+    return (char *)(RSTRING_PTR(rstr) ? RSTRING_PTR(rstr) : EMPTY_STRING);
 }
 
 char *
-nstrdup(VALUE rstr)
+rstrdup(VALUE rstr)
 {
     char *old = rs2s(rstr);
-    int len = RSTRING(rstr)->len;
+    int len = RSTRING_LEN(rstr);
     char *new = ALLOC_N(char, len + 1);
     memcpy(new, old, len + 1);
     return new;
 }
 
-char *
-frt_field(VALUE rfield)
+Symbol
+rintern(VALUE rstr)
+{
+    char *old = rs2s(rstr);
+    return frt_intern(old);
+}
+
+Symbol
+frb_field(VALUE rfield)
 {
     switch (TYPE(rfield)) {
         case T_SYMBOL:
-            return rb_id2name(SYM2ID(rfield));
+            return SYM2FSYM(rfield);
         case T_STRING:
-            return rs2s(rfield);
+            return I(rs2s(rfield));
         default:
             rb_raise(rb_eArgError, "field name must be a symbol");
+            return NULL;
     }
-    return NULL;
 }
 
 /*
@@ -216,7 +225,7 @@ json_concat_string(char *s, char *field)
 
 static VALUE error_map;
 
-VALUE frt_get_error(const char *err_type)
+VALUE frb_get_error(const char *err_type)
 {
     VALUE error_class;
     if (Qnil != (error_class = rb_hash_aref(error_map, rb_intern(err_type)))) {
@@ -251,11 +260,11 @@ void V_FRT_EXIT(const char *err_type, const char *fmt, va_list args)
     }
 
     snprintf(buf + so_far, FRT_BUF_SIZ - so_far, "\n");
-    rb_raise(frt_get_error(err_type), buf);
+    rb_raise(frb_get_error(err_type), "%s", buf);
 }
 
 #ifdef FRT_HAS_VARARGS
-void frt_rb_raise(const char *file, int line_num, const char *func,
+void frb_rb_raise(const char *file, int line_num, const char *func,
                   const char *err_type, const char *fmt, ...)
 #else
 void FRT_EXIT(const char *err_type, const char *fmt, ...)
@@ -279,23 +288,23 @@ void FRT_EXIT(const char *err_type, const char *fmt, ...)
 static ID id_field;
 static ID id_text;
 
-VALUE frt_get_term(const char *field, const char *text)
+VALUE frb_get_term(Symbol field, const char *text)
 {
     return rb_struct_new(cTerm,
-                         ID2SYM(rb_intern(field)),
+                         FSYM2SYM(field),
                          rb_str_new2(text),
                          NULL);
 }
 
-static VALUE frt_term_to_s(VALUE self)
+static VALUE frb_term_to_s(VALUE self)
 {
     VALUE rstr;
-    VALUE rfield = rb_funcall(self, id_field, 0); 
-    VALUE rtext = rb_funcall(self, id_text, 0); 
+    VALUE rfield = rb_funcall(self, id_field, 0);
+    VALUE rtext = rb_funcall(self, id_text, 0);
     char *field = StringValuePtr(rfield);
     char *text = StringValuePtr(rtext);
     char *term_str = ALLOC_N(char,
-                             5 + RSTRING(rfield)->len + RSTRING(rtext)->len);
+                             5 + RSTRING_LEN(rfield) + RSTRING_LEN(rtext));
     sprintf(term_str, "%s:%s", field, text);
     rstr = rb_str_new2(term_str);
     free(term_str);
@@ -314,7 +323,7 @@ void Init_Term(void)
     cTerm = rb_struct_define(term_class, "field", "text", NULL);
     rb_set_class_path(cTerm, mFerret, term_class);
     rb_const_set(mFerret, rb_intern(term_class), cTerm);
-    rb_define_method(cTerm, "to_s", frt_term_to_s, 0);
+    rb_define_method(cTerm, "to_s", frb_term_to_s, 0);
     id_field = rb_intern("field");
     id_text = rb_intern("text");
 }
@@ -328,6 +337,7 @@ void Init_Ferret(void)
 {
     mFerret = rb_define_module("Ferret");
     Init_Term();
+    rb_require("fileutils");
 }
 
 void Init_ferret_ext(void)
@@ -336,6 +346,10 @@ void Init_ferret_ext(void)
     VALUE cStateError;
     VALUE cFileNotFoundError;
 
+    const char *const progname[] = {"ruby"};
+
+    frt_init(1, progname);
+
     /* initialize object map */
     object_map = h_new(&value_hash, &value_eq, NULL, NULL);