readapt 1.4.0 → 1.4.4

data/ext/readapt/lookup_table.c

@@ -1,211 +1,211 @@
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lookup_table.h"
-
-static lt_long_array *copy_array(const long *value, const long size)
-{
-    long i;
-    long *items = malloc(sizeof(long) * size);
-    lt_long_array *result;
-
-    for (i = 0; i < size; i++)
-    {
-        items[i] = value[i];
-    }
-    result = malloc(sizeof(lt_long_array));
-    result->items = (size ? items : NULL);
-    result->size = size;
-    return result;
-}
-
-/*
- * Initialize a new item
- */
-static lt_item *lt_new_item(char *key, const long *value, const long size)
-{
-    lt_item *i = malloc(sizeof(lt_item));
-    i->key = malloc(sizeof(char) * (strlen(key) + 1));
-    strcpy(i->key, key);
-    i->value = copy_array(value, size);
-    return i;
-}
-
-/*
- * Delete the lt_item
- */
-static void lt_del_item(lt_item *i)
-{
-    free(i->key);
-    free(i->value->items);
-    free(i);
-}
-
-/*
- * Initialize a new empty lookup table
- */
-lt_lookup_table *lt_new()
-{
-    lt_lookup_table *ht = malloc(sizeof(lt_lookup_table));
-    ht->items = NULL;
-    ht->size = 0;
-    return ht;
-}
-
-/*
- * Delete the lookup table
- */
-void lt_del_lookup_table(lt_lookup_table *ht)
-{
-    int i;
-    lt_item *item;
-
-    // Iterate through items and delete any that are found
-    for (i = 0; i < ht->size; i++)
-    {
-        item = ht->items[i];
-        lt_del_item(item);
-    }
-    free(ht->items);
-    free(ht);
-}
-
-static lt_long_array *lt_search_part(lt_lookup_table *ht, char *key, long cursor, long next)
-{
-    int cmp;
-
-    if (cursor >= ht->size)
-    {
-        return NULL;
-    }
-
-    cmp = strcmp(ht->items[cursor]->key, key);
-    if (cmp == 0)
-    {
-        return ht->items[cursor]->value;
-    }
-    if (next > cursor && next < ht->size)
-    {
-        cmp = strcmp(ht->items[next]->key, key);
-        if (cmp == 0)
-        {
-            return ht->items[next]->value;
-        }
-        else if (cmp < 0)
-        {
-            return lt_search_part(ht, key, next + 1, next + ((ht->size - next) / 2));
-        }
-        else
-        {
-            return lt_search_part(ht, key, cursor + 1, next / 2);
-        }
-    }
-    return lt_search_part(ht, key, cursor + 1, next / 2);
-}
-
-static lt_long_array *lt_search_key(lt_lookup_table *ht, char *key)
-{
-    return lt_search_part(ht, key, 0, ht->size / 2);
-}
-
-static void lt_delete_key(lt_lookup_table *ht, char *key)
-{
-    lt_long_array *found;
-    lt_item **tmp;
-    long i;
-    long cursor = 0;
-
-    found = lt_search_key(ht, key);
-    if (found)
-    {
-        tmp = malloc(sizeof(lt_item) * (ht->size - 1));
-        for (i = 0; i < ht->size; i++)
-        {
-            if (ht->items[i]->key == key)
-            {
-                lt_del_item(ht->items[i]);
-            }
-            else
-            {
-                tmp[cursor] = ht->items[cursor];
-                cursor++;
-            }
-        }
-        free(ht->items);
-        ht->items = tmp;
-        ht->size--;
-    }
-}
-
-static void lt_insert_key(lt_lookup_table *ht, char *key, const long *value, const long size)
-{
-    lt_item *item;
-    lt_item **tmp;
-    long i;
-    long cursor = 0;
-    int inserted = 0;
-    int cmp;
-
-    lt_delete_key(ht, key);
-
-    if (size == 0)
-    {
-        return;
-    }
-
-    item = lt_new_item(key, value, size);
-    tmp = malloc(sizeof(lt_item) * (ht->size + 1));
-
-    for (i = 0; i < ht->size; i++)
-    {
-        if (!inserted)
-        {
-            cmp = strcmp(item->key, ht->items[i]->key);
-            if (cmp > 0)
-            {
-                tmp[cursor] = item;
-                cursor++;
-                inserted = 1;
-            }
-            tmp[cursor] = ht->items[i];
-            cursor++;
-        }
-        else
-        {
-            tmp[cursor] = ht->items[i];
-            cursor++;
-        }
-    }
-    if (!inserted)
-    {
-        tmp[ht->size] = item;
-    }
-    free(ht->items);
-    ht->items = tmp;
-    ht->size++;
-}
-
-/*
- * Add an item to the lookup table
- */
-void lt_insert(lt_lookup_table *ht, char *key, const long *value, const long size)
-{
-    lt_insert_key(ht, key, value, size);
-}
-
-/*
- * Get the key's value or NULL if it doesn't exist
- */
-lt_long_array *lt_search(lt_lookup_table *ht, char *key)
-{
-    return lt_search_key(ht, key);
-}
-
-/*
- * Delete the key's item if it exists
- */
-void lt_delete(lt_lookup_table *ht, char *key)
-{
-    lt_delete_key(ht, key);
-}
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lookup_table.h"
+
+static lt_long_array *copy_array(const long *value, const long size)
+{
+    long i;
+    long *items = malloc(sizeof(long) * size);
+    lt_long_array *result;
+
+    for (i = 0; i < size; i++)
+    {
+        items[i] = value[i];
+    }
+    result = malloc(sizeof(lt_long_array));
+    result->items = (size ? items : NULL);
+    result->size = size;
+    return result;
+}
+
+/*
+ * Initialize a new item
+ */
+static lt_item *lt_new_item(char *key, const long *value, const long size)
+{
+    lt_item *i = malloc(sizeof(lt_item));
+    i->key = malloc(sizeof(char) * (strlen(key) + 1));
+    strcpy(i->key, key);
+    i->value = copy_array(value, size);
+    return i;
+}
+
+/*
+ * Delete the lt_item
+ */
+static void lt_del_item(lt_item *i)
+{
+    free(i->key);
+    free(i->value->items);
+    free(i);
+}
+
+/*
+ * Initialize a new empty lookup table
+ */
+lt_lookup_table *lt_new()
+{
+    lt_lookup_table *ht = malloc(sizeof(lt_lookup_table));
+    ht->items = NULL;
+    ht->size = 0;
+    return ht;
+}
+
+/*
+ * Delete the lookup table
+ */
+void lt_del_lookup_table(lt_lookup_table *ht)
+{
+    int i;
+    lt_item *item;
+
+    // Iterate through items and delete any that are found
+    for (i = 0; i < ht->size; i++)
+    {
+        item = ht->items[i];
+        lt_del_item(item);
+    }
+    free(ht->items);
+    free(ht);
+}
+
+static lt_long_array *lt_search_part(lt_lookup_table *ht, char *key, long cursor, long next)
+{
+    int cmp;
+
+    if (cursor >= ht->size)
+    {
+        return NULL;
+    }
+
+    cmp = strcmp(ht->items[cursor]->key, key);
+    if (cmp == 0)
+    {
+        return ht->items[cursor]->value;
+    }
+    if (next > cursor && next < ht->size)
+    {
+        cmp = strcmp(ht->items[next]->key, key);
+        if (cmp == 0)
+        {
+            return ht->items[next]->value;
+        }
+        else if (cmp < 0)
+        {
+            return lt_search_part(ht, key, next + 1, next + ((ht->size - next) / 2));
+        }
+        else
+        {
+            return lt_search_part(ht, key, cursor + 1, next / 2);
+        }
+    }
+    return lt_search_part(ht, key, cursor + 1, next / 2);
+}
+
+static lt_long_array *lt_search_key(lt_lookup_table *ht, char *key)
+{
+    return lt_search_part(ht, key, 0, ht->size / 2);
+}
+
+static void lt_delete_key(lt_lookup_table *ht, char *key)
+{
+    lt_long_array *found;
+    lt_item **tmp;
+    long i;
+    long cursor = 0;
+
+    found = lt_search_key(ht, key);
+    if (found)
+    {
+        tmp = malloc(sizeof(lt_item) * (ht->size - 1));
+        for (i = 0; i < ht->size; i++)
+        {
+            if (ht->items[i]->key == key)
+            {
+                lt_del_item(ht->items[i]);
+            }
+            else
+            {
+                tmp[cursor] = ht->items[cursor];
+                cursor++;
+            }
+        }
+        free(ht->items);
+        ht->items = tmp;
+        ht->size--;
+    }
+}
+
+static void lt_insert_key(lt_lookup_table *ht, char *key, const long *value, const long size)
+{
+    lt_item *item;
+    lt_item **tmp;
+    long i;
+    long cursor = 0;
+    int inserted = 0;
+    int cmp;
+
+    lt_delete_key(ht, key);
+
+    if (size == 0)
+    {
+        return;
+    }
+
+    item = lt_new_item(key, value, size);
+    tmp = malloc(sizeof(lt_item) * (ht->size + 1));
+
+    for (i = 0; i < ht->size; i++)
+    {
+        if (!inserted)
+        {
+            cmp = strcmp(item->key, ht->items[i]->key);
+            if (cmp > 0)
+            {
+                tmp[cursor] = item;
+                cursor++;
+                inserted = 1;
+            }
+            tmp[cursor] = ht->items[i];
+            cursor++;
+        }
+        else
+        {
+            tmp[cursor] = ht->items[i];
+            cursor++;
+        }
+    }
+    if (!inserted)
+    {
+        tmp[ht->size] = item;
+    }
+    free(ht->items);
+    ht->items = tmp;
+    ht->size++;
+}
+
+/*
+ * Add an item to the lookup table
+ */
+void lt_insert(lt_lookup_table *ht, char *key, const long *value, const long size)
+{
+    lt_insert_key(ht, key, value, size);
+}
+
+/*
+ * Get the key's value or NULL if it doesn't exist
+ */
+lt_long_array *lt_search(lt_lookup_table *ht, char *key)
+{
+    return lt_search_key(ht, key);
+}
+
+/*
+ * Delete the key's item if it exists
+ */
+void lt_delete(lt_lookup_table *ht, char *key)
+{
+    lt_delete_key(ht, key);
+}

data/ext/readapt/lookup_table.h

@@ -1,30 +1,30 @@
-#ifndef LOOKUP_TABLE_H_
-#define LOOKUP_TABLE_H_
-
-typedef struct lt_long_array
-{
-    long *items;
-    long size;
-} lt_long_array;
-
-// lt_item is an item in the lookup table
-typedef struct lt_item
-{
-    char *key;
-    lt_long_array *value;
-} lt_item;
-
-typedef struct lt_lookup_table
-{
-    long size;
-    lt_item **items;
-} lt_lookup_table;
-
-lt_lookup_table *lt_new();
-void lt_del_lookup_table(lt_lookup_table *ht);
-
-void lt_insert(lt_lookup_table *ht, char *key, const long *value, const long size);
-lt_long_array *lt_search(lt_lookup_table *ht, char *key);
-void lt_delete(lt_lookup_table *h, char *key);
-
-#endif // LOOKUP_TABLE_H_
+#ifndef LOOKUP_TABLE_H_
+#define LOOKUP_TABLE_H_
+
+typedef struct lt_long_array
+{
+    long *items;
+    long size;
+} lt_long_array;
+
+// lt_item is an item in the lookup table
+typedef struct lt_item
+{
+    char *key;
+    lt_long_array *value;
+} lt_item;
+
+typedef struct lt_lookup_table
+{
+    long size;
+    lt_item **items;
+} lt_lookup_table;
+
+lt_lookup_table *lt_new();
+void lt_del_lookup_table(lt_lookup_table *ht);
+
+void lt_insert(lt_lookup_table *ht, char *key, const long *value, const long size);
+lt_long_array *lt_search(lt_lookup_table *ht, char *key);
+void lt_delete(lt_lookup_table *h, char *key);
+
+#endif // LOOKUP_TABLE_H_

data/ext/readapt/monitor.c

@@ -51,7 +51,7 @@ monitor_debug(const char *file, const long line, VALUE tracepoint, thread_refere
 
 	// Disable garbage collection to avoid segfaults in Frame#frame_binding
 	gc_disabled = rb_gc_disable();
-	thread_reference_build_frames(ptr);
+    thread_reference_build_frames(ptr);
 	snapshot = rb_funcall(c_Snapshot, rb_intern("new"), 4,
 		INT2NUM(ptr->id),
 		rb_str_new_cstr(file),
@@ -103,7 +103,7 @@ process_line_event(VALUE tracepoint, void *data)
 		tp_file = StringValueCStr(tmp);
 		normalize_path(tp_file);
 		tmp = rb_tracearg_lineno(arg);
-		tp_line = NUM2INT(tmp);
+		tp_line = NUM2LONG(tmp);
 
 		dapEvent = id_continue;
 		if (!firstLineEvent)

data/ext/readapt/normalize.c

@@ -1,59 +1,62 @@
-#include "ruby.h"
-#include "ruby/debug.h"
-#include <ctype.h>
-
-static int isWindows;
-
-static int
-checkIfWindows()
-{
-    VALUE regexp, result;
-    
-    regexp = rb_reg_new("/cygwin|mswin|mingw|bccwin|wince|emx/", 37, 0);
-    result = rb_reg_match(regexp, rb_str_new_cstr(RUBY_PLATFORM));
-    return result == Qnil ? 0 : 1;
-}
-
-void normalize_path(char *str)
-{
-    long i, len;
-
-    if (isWindows)
-    {
-        str[0] = toupper(str[0]);
-        len = strlen(str);
-        for (i = 2; i < len; i++)
-        {
-            if (str[i] == '\\')
-            {
-                str[i] = '/';
-            }
-        }
-    }
-}
-
-char *normalize_path_new_cstr(char *str)
-{
-    char *buffer;
-
-    buffer = malloc((strlen(str) + 1) * sizeof(char));
-    strcpy(buffer, str);
-    normalize_path(buffer);
-    return buffer;
-}
-
-static VALUE
-normalize_path_s(VALUE self, VALUE str)
-{
-    char *path = normalize_path_new_cstr(StringValueCStr(str));
-    VALUE result = rb_str_new_cstr(path);
-    free(path);
-    return result;
-}
-
-void initialize_normalize(VALUE m_Readapt)
-{
-    isWindows = checkIfWindows();
-    
-    rb_define_singleton_method(m_Readapt, "normalize_path", normalize_path_s, 1);
-}
+#include "ruby.h"
+#include "ruby/debug.h"
+#include <ctype.h>
+
+static int isWindows;
+
+static int
+checkIfWindows()
+{
+    VALUE regexp, result;
+    
+    regexp = rb_reg_new("/cygwin|mswin|mingw|bccwin|wince|emx/", 37, 0);
+    result = rb_reg_match(regexp, rb_str_new_cstr(RUBY_PLATFORM));
+    return result == Qnil ? 0 : 1;
+}
+
+void normalize_path(char *str)
+{
+    long i, len;
+
+    if (isWindows)
+    {
+        if (isalpha(str[0]))
+        {
+            str[0] = toupper(str[0]);
+        }
+        len = strlen(str);
+        for (i = 0; i < len; i++)
+        {
+            if (str[i] == '\\')
+            {
+                str[i] = '/';
+            }
+        }
+    }
+}
+
+char *normalize_path_new_cstr(char *str)
+{
+    char *buffer;
+
+    buffer = malloc((strlen(str) + 1) * sizeof(char));
+    strcpy(buffer, str);
+    normalize_path(buffer);
+    return buffer;
+}
+
+static VALUE
+normalize_path_s(VALUE self, VALUE str)
+{
+    char *path = normalize_path_new_cstr(StringValueCStr(str));
+    VALUE result = rb_str_new_cstr(path);
+    free(path);
+    return result;
+}
+
+void initialize_normalize(VALUE m_Readapt)
+{
+    isWindows = checkIfWindows();
+    
+    rb_define_singleton_method(m_Readapt, "normalize_path", normalize_path_s, 1);
+}

data/ext/readapt/normalize.h

@@ -1,7 +1,7 @@
-#ifndef NORMALIZE_H_
-#define NORMALIZE_H_
-
-void initialize_normalize(VALUE);
-char *normalize_path_new_cstr(char *str);
-void normalize_path(char *str);
-#endif
+#ifndef NORMALIZE_H_
+#define NORMALIZE_H_
+
+void initialize_normalize(VALUE);
+char *normalize_path_new_cstr(char *str);
+void normalize_path(char *str);
+#endif

data/ext/readapt/readapt.c

@@ -1,18 +1,18 @@
-#include "ruby.h"
-#include "ruby/debug.h"
-#include "monitor.h"
-#include "normalize.h"
-#include "breakpoints.h"
-#include "frame.h"
-
-static VALUE m_Readapt;
-
-void Init_readapt()
-{
-	m_Readapt = rb_define_module("Readapt");
-
-	initialize_normalize(m_Readapt);
-	initialize_breakpoints(m_Readapt);
-	initialize_frame(m_Readapt);
-	initialize_monitor(m_Readapt);
-}
+#include "ruby.h"
+#include "ruby/debug.h"
+#include "monitor.h"
+#include "normalize.h"
+#include "breakpoints.h"
+#include "frame.h"
+
+static VALUE m_Readapt;
+
+void Init_readapt()
+{
+	m_Readapt = rb_define_module("Readapt");
+
+	initialize_normalize(m_Readapt);
+	initialize_breakpoints(m_Readapt);
+	initialize_frame(m_Readapt);
+	initialize_monitor(m_Readapt);
+}