Skip to content

Remember attributes as bitflags #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vinistock wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remember attributes as bitflags #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions ext/rubydex/definition.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include "graph.h"
#include "handle.h"
#include "location.h"
#include "ruby/internal/scan_args.h"
#include "rustbindings.h"

static VALUE mRubydex;
Expand All @@ -14,9 +13,6 @@ VALUE cModuleDefinition;
VALUE cConstantDefinition;
VALUE cConstantAliasDefinition;
VALUE cMethodDefinition;
VALUE cAttrAccessorDefinition;
VALUE cAttrReaderDefinition;
VALUE cAttrWriterDefinition;
VALUE cGlobalVariableDefinition;
VALUE cInstanceVariableDefinition;
VALUE cClassVariableDefinition;
Expand All @@ -38,12 +34,6 @@ VALUE definition_class_for_kind(DefinitionKind kind) {
return cConstantAliasDefinition;
case DefinitionKind_Method:
return cMethodDefinition;
case DefinitionKind_AttrAccessor:
return cAttrAccessorDefinition;
case DefinitionKind_AttrReader:
return cAttrReaderDefinition;
case DefinitionKind_AttrWriter:
return cAttrWriterDefinition;
case DefinitionKind_GlobalVariable:
return cGlobalVariableDefinition;
case DefinitionKind_InstanceVariable:
Expand Down Expand Up @@ -179,18 +169,6 @@ void initialize_definition(VALUE mod) {
rb_define_alloc_func(cMethodDefinition, sr_handle_alloc);
rb_define_method(cMethodDefinition, "initialize", sr_handle_initialize, 2);

cAttrAccessorDefinition = rb_define_class_under(mRubydex, "AttrAccessorDefinition", cDefinition);
rb_define_alloc_func(cAttrAccessorDefinition, sr_handle_alloc);
rb_define_method(cAttrAccessorDefinition, "initialize", sr_handle_initialize, 2);

cAttrReaderDefinition = rb_define_class_under(mRubydex, "AttrReaderDefinition", cDefinition);
rb_define_alloc_func(cAttrReaderDefinition, sr_handle_alloc);
rb_define_method(cAttrReaderDefinition, "initialize", sr_handle_initialize, 2);

cAttrWriterDefinition = rb_define_class_under(mRubydex, "AttrWriterDefinition", cDefinition);
rb_define_alloc_func(cAttrWriterDefinition, sr_handle_alloc);
rb_define_method(cAttrWriterDefinition, "initialize", sr_handle_initialize, 2);

cGlobalVariableDefinition = rb_define_class_under(mRubydex, "GlobalVariableDefinition", cDefinition);
rb_define_alloc_func(cGlobalVariableDefinition, sr_handle_alloc);
rb_define_method(cGlobalVariableDefinition, "initialize", sr_handle_initialize, 2);
Expand Down
3 changes: 0 additions & 3 deletions ext/rubydex/definition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ extern VALUE cModuleDefinition;
extern VALUE cConstantDefinition;
extern VALUE cConstantAliasDefinition;
extern VALUE cMethodDefinition;
extern VALUE cAttrAccessorDefinition;
extern VALUE cAttrReaderDefinition;
extern VALUE cAttrWriterDefinition;
extern VALUE cGlobalVariableDefinition;
extern VALUE cInstanceVariableDefinition;
extern VALUE cClassVariableDefinition;
Expand Down
16 changes: 5 additions & 11 deletions rust/rubydex-sys/src/definition_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@ pub enum DefinitionKind {
Constant = 3,
ConstantAlias = 4,
Method = 5,
AttrAccessor = 6,
AttrReader = 7,
AttrWriter = 8,
GlobalVariable = 9,
InstanceVariable = 10,
ClassVariable = 11,
MethodAlias = 12,
GlobalVariableAlias = 13,
GlobalVariable = 6,
InstanceVariable = 7,
ClassVariable = 8,
MethodAlias = 9,
GlobalVariableAlias = 10,
}

pub(crate) fn map_definition_to_kind(defn: &Definition) -> DefinitionKind {
Expand All @@ -36,9 +33,6 @@ pub(crate) fn map_definition_to_kind(defn: &Definition) -> DefinitionKind {
Definition::Constant(_) => DefinitionKind::Constant,
Definition::ConstantAlias(_) => DefinitionKind::ConstantAlias,
Definition::Method(_) => DefinitionKind::Method,
Definition::AttrAccessor(_) => DefinitionKind::AttrAccessor,
Definition::AttrReader(_) => DefinitionKind::AttrReader,
Definition::AttrWriter(_) => DefinitionKind::AttrWriter,
Definition::GlobalVariable(_) => DefinitionKind::GlobalVariable,
Definition::InstanceVariable(_) => DefinitionKind::InstanceVariable,
Definition::ClassVariable(_) => DefinitionKind::ClassVariable,
Expand Down
Loading
Loading