rubydex 0.1.0.beta7-x86_64-linux → 0.1.0.beta9-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af219fca3433166a3612377811acbbfdb9168fe9d3d26c2360b5135790be7086
-  data.tar.gz: 732a60f49ef00bda8a6568ce7aca09c9a82661312b26a0791735a33697ab4e5d
+  metadata.gz: edf2302fdc66d1c0e0560a3f59af9fb2acae9269b3db80dea4a70a70b7b6e0b4
+  data.tar.gz: 541747276861c81cb5d4339a9961a8d1b6ab1f58dc6f85f9f1ef0fb00b429449
 SHA512:
-  metadata.gz: c2606966fe84e9a746b4ae84e5c070f442c2aa3bc02920b2d2ccd1301af76e8076eda7f49d6cff90f5d2297432a6d87aeea3a2f44afdc2495b5a1bb95987d25a
-  data.tar.gz: dead00ebb43015352492f217c18cfa747ed7c817a719da0dc3b7b04460a390ffb5df03ff83521800784096ccd182679858e5f08cf6991f50d426531f061d3e59
+  metadata.gz: aa0cad72232ba1e55b22aac62c28cd294f06cff2a51ed6583ba8f25974f957adbfd20929266cd112d08b00aa637270d53527584d93fb785fb3be90733c5c62c4
+  data.tar.gz: 5521008248d353fc0779882e914d4b50fe882dcc614731298e99ecaff0b88a48aff3e3e0a19e6c7dc661cfac30cbf78e512bd34c3879de713b9cad67bd1305b5

data/ext/rubydex/declaration.c

@@ -2,6 +2,7 @@
 #include "definition.h"
 #include "graph.h"
 #include "handle.h"
+#include "reference.h"
 #include "rustbindings.h"
 #include "utils.h"
 
@@ -10,6 +11,7 @@ VALUE cNamespace;
 VALUE cClass;
 VALUE cModule;
 VALUE cSingletonClass;
+VALUE cTodo;
 VALUE cConstant;
 VALUE cConstantAlias;
 VALUE cMethod;
@@ -26,6 +28,8 @@ VALUE rdxi_declaration_class_for_kind(CDeclarationKind kind) {
         return cModule;
     case CDeclarationKind_SingletonClass:
         return cSingletonClass;
+    case CDeclarationKind_Todo:
+        return cTodo;
     case CDeclarationKind_Constant:
         return cConstant;
     case CDeclarationKind_ConstantAlias:
@@ -291,12 +295,49 @@ static VALUE rdxr_declaration_descendants(VALUE self) {
     return self;
 }
 
+// Size function for the Declaration#references enumerator
+static VALUE declaration_references_size(VALUE self, VALUE _args, VALUE _eobj) {
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    struct ReferencesIter *iter = rdx_declaration_references_iter_new(graph, data->id);
+    size_t len = rdx_references_iter_len(iter);
+    rdx_references_iter_free(iter);
+
+    return SIZET2NUM(len);
+}
+
+// Returns an enumerator for all references to this declaration
+//
+// Declaration#references: () -> Enumerator[Reference]
+static VALUE rdxr_declaration_references(VALUE self) {
+    if (!rb_block_given_p()) {
+        return rb_enumeratorize_with_size(self, rb_str_new2("references"), 0, NULL, declaration_references_size);
+    }
+
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    void *iter = rdx_declaration_references_iter_new(graph, data->id);
+    VALUE args = rb_ary_new_from_args(2, data->graph_obj, ULL2NUM((uintptr_t)iter));
+    rb_ensure(rdxi_references_yield, args, rdxi_references_ensure, args);
+
+    return self;
+}
+
 void rdxi_initialize_declaration(VALUE mRubydex) {
     cDeclaration = rb_define_class_under(mRubydex, "Declaration", rb_cObject);
     cNamespace = rb_define_class_under(mRubydex, "Namespace", cDeclaration);
     cClass = rb_define_class_under(mRubydex, "Class", cNamespace);
     cModule = rb_define_class_under(mRubydex, "Module", cNamespace);
     cSingletonClass = rb_define_class_under(mRubydex, "SingletonClass", cNamespace);
+    cTodo = rb_define_class_under(mRubydex, "Todo", cNamespace);
     cConstant = rb_define_class_under(mRubydex, "Constant", cDeclaration);
     cConstantAlias = rb_define_class_under(mRubydex, "ConstantAlias", cDeclaration);
     cMethod = rb_define_class_under(mRubydex, "Method", cDeclaration);
@@ -309,6 +350,7 @@ void rdxi_initialize_declaration(VALUE mRubydex) {
     rb_define_method(cDeclaration, "name", rdxr_declaration_name, 0);
     rb_define_method(cDeclaration, "unqualified_name", rdxr_declaration_unqualified_name, 0);
     rb_define_method(cDeclaration, "definitions", rdxr_declaration_definitions, 0);
+    rb_define_method(cDeclaration, "references", rdxr_declaration_references, 0);
     rb_define_method(cDeclaration, "owner", rdxr_declaration_owner, 0);
 
     // Namespace only methods

data/ext/rubydex/declaration.h

@@ -9,6 +9,7 @@ extern VALUE cNamespace;
 extern VALUE cClass;
 extern VALUE cModule;
 extern VALUE cSingletonClass;
+extern VALUE cTodo;
 extern VALUE cConstant;
 extern VALUE cConstantAlias;
 extern VALUE cMethod;

data/ext/rubydex/graph.c

@@ -228,31 +228,6 @@ static VALUE rdxr_graph_aref(VALUE self, VALUE key) {
     return rb_class_new_instance(2, argv, decl_class);
 }
 
-// Body function for rb_ensure for the reference enumerators
-static VALUE graph_references_yield(VALUE args) {
-    VALUE self = rb_ary_entry(args, 0);
-    void *iter = (void *)(uintptr_t)NUM2ULL(rb_ary_entry(args, 1));
-
-    uint64_t id = 0;
-    ReferenceKind kind;
-    while (rdx_references_iter_next(iter, &id, &kind)) {
-        VALUE ref_class = rdxi_reference_class_for_kind(kind);
-        VALUE argv[] = {self, ULL2NUM(id)};
-        VALUE obj = rb_class_new_instance(2, argv, ref_class);
-        rb_yield(obj);
-    }
-
-    return Qnil;
-}
-
-// Ensure function for rb_ensure for the reference enumerators to always free the iterator
-static VALUE graph_references_ensure(VALUE args) {
-    void *iter = (void *)(uintptr_t)NUM2ULL(rb_ary_entry(args, 1));
-    rdx_references_iter_free(iter);
-
-    return Qnil;
-}
-
 // Size function for the constant_references enumerator
 static VALUE graph_constant_references_size(VALUE self, VALUE _args, VALUE _eobj) {
     void *graph;
@@ -278,7 +253,7 @@ static VALUE rdxr_graph_constant_references(VALUE self) {
 
     void *iter = rdx_graph_constant_references_iter_new(graph);
     VALUE args = rb_ary_new_from_args(2, self, ULL2NUM((uintptr_t)iter));
-    rb_ensure(graph_references_yield, args, graph_references_ensure, args);
+    rb_ensure(rdxi_references_yield, args, rdxi_references_ensure, args);
 
     return self;
 }
@@ -308,7 +283,7 @@ static VALUE rdxr_graph_method_references(VALUE self) {
 
     void *iter = rdx_graph_method_references_iter_new(graph);
     VALUE args = rb_ary_new_from_args(2, self, ULL2NUM((uintptr_t)iter));
-    rb_ensure(graph_references_yield, args, graph_references_ensure, args);
+    rb_ensure(rdxi_references_yield, args, rdxi_references_ensure, args);
 
     return self;
 }

data/ext/rubydex/utils.c

@@ -1,5 +1,6 @@
 #include "utils.h"
 #include "declaration.h"
+#include "reference.h"
 #include "rustbindings.h"
 
 // Convert a Ruby array of strings into a double char pointer so that we can pass that to Rust.
@@ -50,3 +51,26 @@ VALUE rdxi_declarations_ensure(VALUE args) {
     rdx_graph_declarations_iter_free(iter);
     return Qnil;
 }
+
+// Yield body for iterating over references
+VALUE rdxi_references_yield(VALUE args) {
+    VALUE graph_obj = rb_ary_entry(args, 0);
+    void *iter = (void *)(uintptr_t)NUM2ULL(rb_ary_entry(args, 1));
+
+    CReference cref;
+    while (rdx_references_iter_next(iter, &cref)) {
+        VALUE ref_class = rdxi_reference_class_for_kind(cref.kind);
+        VALUE argv[] = {graph_obj, ULL2NUM(cref.id)};
+        VALUE obj = rb_class_new_instance(2, argv, ref_class);
+        rb_yield(obj);
+    }
+
+    return Qnil;
+}
+
+// Ensure function for iterating over references to always free the iterator
+VALUE rdxi_references_ensure(VALUE args) {
+    void *iter = (void *)(uintptr_t)NUM2ULL(rb_ary_entry(args, 1));
+    rdx_references_iter_free(iter);
+    return Qnil;
+}

data/ext/rubydex/utils.h

@@ -16,4 +16,10 @@ VALUE rdxi_declarations_yield(VALUE args);
 // Ensure function for iterating over declarations to always free the iterator
 VALUE rdxi_declarations_ensure(VALUE args);
 
+// Yield body for iterating over references
+VALUE rdxi_references_yield(VALUE args);
+
+// Ensure function for iterating over references to always free the iterator
+VALUE rdxi_references_ensure(VALUE args);
+
 #endif // RUBYDEX_UTILS_H

data/lib/rubydex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubydex
-  VERSION = "0.1.0.beta7"
+  VERSION = "0.1.0.beta9"
 end