rubydex 0.1.0.beta11 → 0.1.0.beta13

data/ext/rubydex/graph.h

@@ -1,10 +1,10 @@
-#ifndef RUBYDEX_GRAPH_H
-#define RUBYDEX_GRAPH_H
-
-#include "ruby.h"
-
-extern const rb_data_type_t graph_type;
-
-void rdxi_initialize_graph(VALUE mRubydex);
-
-#endif // RUBYDEX_GRAPH_H
+#ifndef RUBYDEX_GRAPH_H
+#define RUBYDEX_GRAPH_H
+
+#include "ruby.h"
+
+extern const rb_data_type_t graph_type;
+
+void rdxi_initialize_graph(VALUE mRubydex);
+
+#endif // RUBYDEX_GRAPH_H

data/ext/rubydex/handle.h

@@ -1,44 +1,44 @@
-#ifndef RUBYDEX_HANDLE_H
-#define RUBYDEX_HANDLE_H
-
-#include "ruby.h"
-
-typedef struct {
-    VALUE graph_obj; // Ruby Graph object to keep it alive
-    uint64_t id;     // Canonical ID mapping to a DeclarationId, DefinitionId, UriId, etc. See `ids.rs`.
-} HandleData;
-
-static void handle_mark(void *ptr) {
-    if (ptr) {
-        HandleData *data = (HandleData *)ptr;
-        rb_gc_mark(data->graph_obj);
-    }
-}
-
-static void handle_free(void *ptr) {
-    if (ptr) {
-        xfree(ptr);
-    }
-}
-
-static const rb_data_type_t handle_type = {
-    "RubydexHandle", {handle_mark, handle_free, 0}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY};
-
-static VALUE rdxr_handle_alloc(VALUE klass) {
-    HandleData *data = ALLOC(HandleData);
-    data->graph_obj = Qnil;
-    data->id = 0;
-
-    return TypedData_Wrap_Struct(klass, &handle_type, data);
-}
-
-static VALUE rdxr_handle_initialize(VALUE self, VALUE graph_obj, VALUE id_val) {
-    HandleData *data;
-    TypedData_Get_Struct(self, HandleData, &handle_type, data);
-    data->graph_obj = graph_obj;
-    data->id = NUM2ULL(id_val);
-
-    return self;
-}
-
-#endif // RUBYDEX_HANDLE_H
+#ifndef RUBYDEX_HANDLE_H
+#define RUBYDEX_HANDLE_H
+
+#include "ruby.h"
+
+typedef struct {
+    VALUE graph_obj; // Ruby Graph object to keep it alive
+    uint64_t id;     // Canonical ID mapping to a DeclarationId, DefinitionId, UriId, etc. See `ids.rs`.
+} HandleData;
+
+static void handle_mark(void *ptr) {
+    if (ptr) {
+        HandleData *data = (HandleData *)ptr;
+        rb_gc_mark(data->graph_obj);
+    }
+}
+
+static void handle_free(void *ptr) {
+    if (ptr) {
+        xfree(ptr);
+    }
+}
+
+static const rb_data_type_t handle_type = {
+    "RubydexHandle", {handle_mark, handle_free, 0}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY};
+
+static VALUE rdxr_handle_alloc(VALUE klass) {
+    HandleData *data = ALLOC(HandleData);
+    data->graph_obj = Qnil;
+    data->id = 0;
+
+    return TypedData_Wrap_Struct(klass, &handle_type, data);
+}
+
+static VALUE rdxr_handle_initialize(VALUE self, VALUE graph_obj, VALUE id_val) {
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+    data->graph_obj = graph_obj;
+    data->id = NUM2ULL(id_val);
+
+    return self;
+}
+
+#endif // RUBYDEX_HANDLE_H

data/ext/rubydex/location.c

@@ -1,22 +1,22 @@
-#include "location.h"
-
-VALUE cLocation;
-
-VALUE rdxi_build_location_value(Location *loc) {
-    if (loc == NULL) {
-        return Qnil;
-    }
-
-    VALUE uri = rb_utf8_str_new_cstr(loc->uri);
-
-    VALUE kwargs = rb_hash_new_capa(5);
-    rb_hash_aset(kwargs, ID2SYM(rb_intern("uri")), uri);
-    rb_hash_aset(kwargs, ID2SYM(rb_intern("start_line")), UINT2NUM(loc->start_line));
-    rb_hash_aset(kwargs, ID2SYM(rb_intern("end_line")), UINT2NUM(loc->end_line));
-    rb_hash_aset(kwargs, ID2SYM(rb_intern("start_column")), UINT2NUM(loc->start_column));
-    rb_hash_aset(kwargs, ID2SYM(rb_intern("end_column")), UINT2NUM(loc->end_column));
-
-    return rb_class_new_instance_kw(1, &kwargs, cLocation, RB_PASS_KEYWORDS);
-}
-
-void rdxi_initialize_location(VALUE mRubydex) { cLocation = rb_define_class_under(mRubydex, "Location", rb_cObject); }
+#include "location.h"
+
+VALUE cLocation;
+
+VALUE rdxi_build_location_value(Location *loc) {
+    if (loc == NULL) {
+        return Qnil;
+    }
+
+    VALUE uri = rb_utf8_str_new_cstr(loc->uri);
+
+    VALUE kwargs = rb_hash_new_capa(5);
+    rb_hash_aset(kwargs, ID2SYM(rb_intern("uri")), uri);
+    rb_hash_aset(kwargs, ID2SYM(rb_intern("start_line")), UINT2NUM(loc->start_line));
+    rb_hash_aset(kwargs, ID2SYM(rb_intern("end_line")), UINT2NUM(loc->end_line));
+    rb_hash_aset(kwargs, ID2SYM(rb_intern("start_column")), UINT2NUM(loc->start_column));
+    rb_hash_aset(kwargs, ID2SYM(rb_intern("end_column")), UINT2NUM(loc->end_column));
+
+    return rb_class_new_instance_kw(1, &kwargs, cLocation, RB_PASS_KEYWORDS);
+}
+
+void rdxi_initialize_location(VALUE mRubydex) { cLocation = rb_define_class_under(mRubydex, "Location", rb_cObject); }

data/ext/rubydex/location.h

@@ -1,15 +1,15 @@
-#ifndef RUBYDEX_LOCATION_H
-#define RUBYDEX_LOCATION_H
-
-#include "ruby.h"
-#include "rustbindings.h"
-
-extern VALUE cLocation;
-
-void rdxi_initialize_location(VALUE mRubydex);
-
-// Helper to build a Ruby Rubydex::Location from a C Location pointer.
-// Does not take ownership; caller remains responsible for freeing the C Location on the Rust side.
-VALUE rdxi_build_location_value(Location *loc);
-
-#endif // RUBYDEX_LOCATION_H
+#ifndef RUBYDEX_LOCATION_H
+#define RUBYDEX_LOCATION_H
+
+#include "ruby.h"
+#include "rustbindings.h"
+
+extern VALUE cLocation;
+
+void rdxi_initialize_location(VALUE mRubydex);
+
+// Helper to build a Ruby Rubydex::Location from a C Location pointer.
+// Does not take ownership; caller remains responsible for freeing the C Location on the Rust side.
+VALUE rdxi_build_location_value(Location *loc);
+
+#endif // RUBYDEX_LOCATION_H

data/ext/rubydex/reference.c

@@ -1,104 +1,123 @@
-#include "reference.h"
-#include "graph.h"
-#include "handle.h"
-#include "location.h"
-#include "rustbindings.h"
-
-VALUE cReference;
-VALUE cConstantReference;
-VALUE cMethodReference;
-
-// ConstantReference#name -> String
-static VALUE rdxr_constant_reference_name(VALUE self) {
-    HandleData *data;
-    TypedData_Get_Struct(self, HandleData, &handle_type, data);
-
-    void *graph;
-    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
-
-    const char *name = rdx_constant_reference_name(graph, data->id);
-    if (name == NULL) {
-        return Qnil;
-    }
-
-    VALUE str = rb_utf8_str_new_cstr(name);
-    free_c_string(name);
-    return str;
-}
-
-// ConstantReference#location -> Rubydex::Location
-static VALUE rdxr_constant_reference_location(VALUE self) {
-    HandleData *data;
-    TypedData_Get_Struct(self, HandleData, &handle_type, data);
-
-    void *graph;
-    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
-
-    Location *loc = rdx_constant_reference_location(graph, data->id);
-    VALUE location = rdxi_build_location_value(loc);
-    rdx_location_free(loc);
-    return location;
-}
-
-// MethodReference#name -> String
-static VALUE rdxr_method_reference_name(VALUE self) {
-    HandleData *data;
-    TypedData_Get_Struct(self, HandleData, &handle_type, data);
-
-    void *graph;
-    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
-
-    const char *name = rdx_method_reference_name(graph, data->id);
-    if (name == NULL) {
-        return Qnil;
-    }
-
-    VALUE str = rb_utf8_str_new_cstr(name);
-    free_c_string(name);
-    return str;
-}
-
-// MethodReference#location -> Rubydex::Location
-static VALUE rdxr_method_reference_location(VALUE self) {
-    HandleData *data;
-    TypedData_Get_Struct(self, HandleData, &handle_type, data);
-
-    void *graph;
-    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
-
-    Location *loc = rdx_method_reference_location(graph, data->id);
-    VALUE location = rdxi_build_location_value(loc);
-    rdx_location_free(loc);
-    return location;
-}
-
-// Keep this in sync with unresolved_reference_api.rs
-VALUE rdxi_reference_class_for_kind(ReferenceKind kind) {
-    switch (kind) {
-    case ReferenceKind_Constant:
-        return cConstantReference;
-    case ReferenceKind_Method:
-        return cMethodReference;
-    default:
-        rb_raise(rb_eRuntimeError, "Unknown UnresolvedReferenceKind: %d", kind);
-    }
-}
-
-void rdxi_initialize_reference(VALUE mRubydex) {
-    cReference = rb_define_class_under(mRubydex, "Reference", rb_cObject);
-    rb_define_alloc_func(cReference, rdxr_handle_alloc);
-    rb_define_method(cReference, "initialize", rdxr_handle_initialize, 2);
-    rb_funcall(rb_singleton_class(cReference), rb_intern("private"), 1, ID2SYM(rb_intern("new")));
-
-    cConstantReference = rb_define_class_under(mRubydex, "ConstantReference", cReference);
-    rb_define_alloc_func(cConstantReference, rdxr_handle_alloc);
-    rb_define_method(cConstantReference, "initialize", rdxr_handle_initialize, 2);
-    rb_define_method(cConstantReference, "name", rdxr_constant_reference_name, 0);
-    rb_define_method(cConstantReference, "location", rdxr_constant_reference_location, 0);
-
-    cMethodReference = rb_define_class_under(mRubydex, "MethodReference", cReference);
-    rb_define_alloc_func(cMethodReference, rdxr_handle_alloc);
-    rb_define_method(cMethodReference, "initialize", rdxr_handle_initialize, 2);
-    rb_define_method(cMethodReference, "name", rdxr_method_reference_name, 0);
-    rb_define_method(cMethodReference, "location", rdxr_method_reference_location, 0);
-}
+#include "reference.h"
+#include "declaration.h"
+#include "graph.h"
+#include "handle.h"
+#include "location.h"
+#include "rustbindings.h"
+
+VALUE cReference;
+VALUE cConstantReference;
+VALUE cUnresolvedConstantReference;
+VALUE cResolvedConstantReference;
+VALUE cMethodReference;
+
+// ConstantReference#name -> String
+static VALUE rdxr_constant_reference_name(VALUE self) {
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    const char *name = rdx_constant_reference_name(graph, data->id);
+    if (name == NULL) {
+        return Qnil;
+    }
+
+    VALUE str = rb_utf8_str_new_cstr(name);
+    free_c_string(name);
+    return str;
+}
+
+// ConstantReference#location -> Rubydex::Location
+static VALUE rdxr_constant_reference_location(VALUE self) {
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    Location *loc = rdx_constant_reference_location(graph, data->id);
+    VALUE location = rdxi_build_location_value(loc);
+    rdx_location_free(loc);
+    return location;
+}
+
+// MethodReference#name -> String
+static VALUE rdxr_method_reference_name(VALUE self) {
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    const char *name = rdx_method_reference_name(graph, data->id);
+    if (name == NULL) {
+        return Qnil;
+    }
+
+    VALUE str = rb_utf8_str_new_cstr(name);
+    free_c_string(name);
+    return str;
+}
+
+// MethodReference#location -> Rubydex::Location
+static VALUE rdxr_method_reference_location(VALUE self) {
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    Location *loc = rdx_method_reference_location(graph, data->id);
+    VALUE location = rdxi_build_location_value(loc);
+    rdx_location_free(loc);
+    return location;
+}
+
+// ResolvedConstantReference#declaration -> Declaration
+static VALUE rdxr_resolved_constant_reference_declaration(VALUE self) {
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    const struct CDeclaration *decl = rdx_resolved_constant_reference_declaration(graph, data->id);
+    if (decl == NULL) {
+        rb_raise(rb_eRuntimeError, "Invalid declaration for a resolved constant reference");
+    }
+
+    VALUE decl_class = rdxi_declaration_class_for_kind(decl->kind);
+    VALUE argv[] = {data->graph_obj, ULL2NUM(decl->id)};
+    free_c_declaration(decl);
+
+    return rb_class_new_instance(2, argv, decl_class);
+}
+
+void rdxi_initialize_reference(VALUE mRubydex) {
+    cReference = rb_define_class_under(mRubydex, "Reference", rb_cObject);
+    rb_define_alloc_func(cReference, rdxr_handle_alloc);
+    rb_define_method(cReference, "initialize", rdxr_handle_initialize, 2);
+    rb_funcall(rb_singleton_class(cReference), rb_intern("private"), 1, ID2SYM(rb_intern("new")));
+
+    cConstantReference = rb_define_class_under(mRubydex, "ConstantReference", cReference);
+    rb_define_alloc_func(cConstantReference, rdxr_handle_alloc);
+    rb_define_method(cConstantReference, "initialize", rdxr_handle_initialize, 2);
+    rb_define_method(cConstantReference, "location", rdxr_constant_reference_location, 0);
+    rb_funcall(rb_singleton_class(cConstantReference), rb_intern("private"), 1, ID2SYM(rb_intern("new")));
+
+    cUnresolvedConstantReference = rb_define_class_under(mRubydex, "UnresolvedConstantReference", cConstantReference);
+    rb_define_alloc_func(cUnresolvedConstantReference, rdxr_handle_alloc);
+    rb_define_method(cUnresolvedConstantReference, "name", rdxr_constant_reference_name, 0);
+
+    cResolvedConstantReference = rb_define_class_under(mRubydex, "ResolvedConstantReference", cConstantReference);
+    rb_define_alloc_func(cResolvedConstantReference, rdxr_handle_alloc);
+    rb_define_method(cResolvedConstantReference, "declaration", rdxr_resolved_constant_reference_declaration, 0);
+
+    cMethodReference = rb_define_class_under(mRubydex, "MethodReference", cReference);
+    rb_define_alloc_func(cMethodReference, rdxr_handle_alloc);
+    rb_define_method(cMethodReference, "initialize", rdxr_handle_initialize, 2);
+    rb_define_method(cMethodReference, "name", rdxr_method_reference_name, 0);
+    rb_define_method(cMethodReference, "location", rdxr_method_reference_location, 0);
+}

data/ext/rubydex/reference.h

@@ -1,16 +1,15 @@
-#ifndef RUBYDEX_REFERENCE_H
-#define RUBYDEX_REFERENCE_H
-
-#include "ruby.h"
-#include "rustbindings.h"
-
-extern VALUE cReference;
-extern VALUE cConstantReference;
-extern VALUE cMethodReference;
-
-void rdxi_initialize_reference(VALUE mRubydex);
-
-// Returns the Ruby class for a given UnresolvedReferenceKind without calling back into Rust
-VALUE rdxi_reference_class_for_kind(ReferenceKind kind);
-
-#endif // RUBYDEX_REFERENCE_H
+#ifndef RUBYDEX_REFERENCE_H
+#define RUBYDEX_REFERENCE_H
+
+#include "ruby.h"
+#include "rustbindings.h"
+
+extern VALUE cReference;
+extern VALUE cConstantReference;
+extern VALUE cUnresolvedConstantReference;
+extern VALUE cResolvedConstantReference;
+extern VALUE cMethodReference;
+
+void rdxi_initialize_reference(VALUE mRubydex);
+
+#endif // RUBYDEX_REFERENCE_H

data/ext/rubydex/rubydex.c

@@ -1,22 +1,22 @@
-#include "declaration.h"
-#include "definition.h"
-#include "diagnostic.h"
-#include "document.h"
-#include "graph.h"
-#include "location.h"
-#include "reference.h"
-
-VALUE mRubydex;
-
-void Init_rubydex(void) {
-    rb_ext_ractor_safe(true);
-
-    mRubydex = rb_define_module("Rubydex");
-    rdxi_initialize_graph(mRubydex);
-    rdxi_initialize_declaration(mRubydex);
-    rdxi_initialize_document(mRubydex);
-    rdxi_initialize_definition(mRubydex);
-    rdxi_initialize_location(mRubydex);
-    rdxi_initialize_diagnostic(mRubydex);
-    rdxi_initialize_reference(mRubydex);
-}
+#include "declaration.h"
+#include "definition.h"
+#include "diagnostic.h"
+#include "document.h"
+#include "graph.h"
+#include "location.h"
+#include "reference.h"
+
+VALUE mRubydex;
+
+void Init_rubydex(void) {
+    rb_ext_ractor_safe(true);
+
+    mRubydex = rb_define_module("Rubydex");
+    rdxi_initialize_graph(mRubydex);
+    rdxi_initialize_declaration(mRubydex);
+    rdxi_initialize_document(mRubydex);
+    rdxi_initialize_definition(mRubydex);
+    rdxi_initialize_location(mRubydex);
+    rdxi_initialize_diagnostic(mRubydex);
+    rdxi_initialize_reference(mRubydex);
+}