Skip to content

Commit 4c012e5

Browse files
committed
Data -> Config
1 parent 92eb179 commit 4c012e5

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

lib/ruby_header_parser.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module RubyHeaderParser
1010
class Error < StandardError; end
1111

1212
autoload :ArgumentDefinition, "ruby_header_parser/argument_definition"
13-
autoload :Data, "ruby_header_parser/data"
13+
autoload :Config, "ruby_header_parser/config"
1414
autoload :EnumDefinition, "ruby_header_parser/enum_definition"
1515
autoload :FunctionDefinition, "ruby_header_parser/function_definition"
1616
autoload :Parser, "ruby_header_parser/parser"

lib/ruby_header_parser/data.rb renamed to lib/ruby_header_parser/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module RubyHeaderParser
44
# Manager for config file
5-
class Data
5+
class Config
66
# @!attribute [r] data
77
# @return [Hash]
88
attr_reader :data

lib/ruby_header_parser/parser.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class Parser # rubocop:disable Metrics/ClassLength
1616
attr_reader :dist_preprocessed_header_file
1717

1818
# @!attribute [r] data
19-
# @return [RubyHeaderParser::Data]
20-
attr_reader :data
19+
# @return [RubyHeaderParser::Config]
20+
attr_reader :config
2121

2222
DEFAULT_HEADER_FILE = "#{RbConfig::CONFIG["rubyhdrdir"]}/ruby.h".freeze
2323

@@ -38,7 +38,7 @@ def initialize(dist_preprocessed_header_file: nil, header_file: DEFAULT_HEADER_F
3838
@header_file = header_file
3939
@include_paths = include_paths
4040
@dist_preprocessed_header_file = dist_preprocessed_header_file || File.join(Dir.tmpdir, "ruby_preprocessed.h")
41-
@data = Data.new
41+
@config = Config.new
4242
end
4343

4444
# @return [Array<RubyHeaderParser::FunctionDefinition>]
@@ -59,7 +59,7 @@ def extract_struct_definitions
5959
parts = line.split("\t")
6060

6161
struct_name = parts[0]
62-
next unless data.should_generate_struct?(struct_name)
62+
next unless config.should_generate_struct?(struct_name)
6363

6464
definitions << StructDefinition.new(
6565
name: struct_name,
@@ -76,7 +76,7 @@ def extract_type_definitions
7676

7777
type_name = parts[0]
7878

79-
next unless data.should_generate_type?(type_name)
79+
next unless config.should_generate_type?(type_name)
8080

8181
definitions << TypeDefinition.new(
8282
name: type_name,
@@ -97,7 +97,7 @@ def extract_enum_definitions
9797

9898
value = parts[0]
9999

100-
next unless data.should_generate_enum?(enum_name)
100+
next unless config.should_generate_enum?(enum_name)
101101

102102
hash[enum_name] ||= EnumDefinition.new(name: enum_name)
103103
hash[enum_name].values << value
@@ -131,7 +131,7 @@ def generate_function_definition_from_line(line:, kind:, is_parse_multiline_defi
131131
function_name = parts[0]
132132
filepath = parts[1]
133133

134-
return nil unless data.should_generate_function?(function_name)
134+
return nil unless config.should_generate_function?(function_name)
135135

136136
return nil unless parts[3] == kind
137137

@@ -228,7 +228,7 @@ def create_typeref(definition:, function_name:, typeref_field:, filepath:, line_
228228
typeref_pointer = nil
229229
if typeref_type.match?(/\*+$/)
230230
typeref_type = typeref_type.gsub(/\*+$/, "").strip
231-
typeref_pointer = data.function_self_pointer_hint(function_name)
231+
typeref_pointer = config.function_self_pointer_hint(function_name)
232232
end
233233

234234
TyperefDefinition.new(type: typeref_type, pointer: typeref_pointer)
@@ -319,12 +319,12 @@ def analyze_argument_type(function_name:, arg_pos:, parts:)
319319
case original_type
320320
when /\*+$/
321321
type = original_type.gsub(/\*+$/, "").strip
322-
pointer = data.function_arg_pointer_hint(function_name:, pos: arg_pos)
322+
pointer = config.function_arg_pointer_hint(function_name:, pos: arg_pos)
323323

324324
when /^void\s*/, /\(.*\)/
325325
# function pointer (e.g. void *(*func)(void *)) is treated as `void*`
326326
type = "void"
327-
pointer = data.function_arg_pointer_hint(function_name:, pos: arg_pos)
327+
pointer = config.function_arg_pointer_hint(function_name:, pos: arg_pos)
328328

329329
else
330330
type = original_type

sig/ruby_header_parser/data.rbs renamed to sig/ruby_header_parser/config.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module RubyHeaderParser
2-
class Data
2+
class Config
33
attr_reader data: Hash[untyped, untyped]
44

55
def initialize: () -> void

sig/ruby_header_parser/parser.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module RubyHeaderParser
33
attr_reader header_file: String
44
attr_reader include_paths: Array[String]
55
attr_reader dist_preprocessed_header_file: String
6-
attr_reader data: Data
6+
attr_reader config: Config
77

88
DEFAULT_HEADER_FILE: String
99
DEFAULT_INCLUDE_PATHS: Array[String]

spec/ruby_header_parser/data_spec.rb renamed to spec/ruby_header_parser/config_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# frozen_string_literal: true
22

3-
RSpec.describe RubyHeaderParser::Data do
4-
let(:data) { RubyHeaderParser::Data.new }
3+
RSpec.describe RubyHeaderParser::Config do
4+
let(:config) { RubyHeaderParser::Config.new }
55

66
describe "#function_arg_pointer_hint" do
7-
subject { data.function_arg_pointer_hint(function_name:, pos:) }
7+
subject { config.function_arg_pointer_hint(function_name:, pos:) }
88

99
context "found in config/default.yml" do
1010
let(:function_name) { "rb_funcallv" }
@@ -22,7 +22,7 @@
2222
end
2323

2424
describe "#function_self_pointer_hint" do
25-
subject { data.function_self_pointer_hint(function_name) }
25+
subject { config.function_self_pointer_hint(function_name) }
2626

2727
context "found in default.yml" do
2828
let(:function_name) { "RSTRING_PTR" }
@@ -38,7 +38,7 @@
3838
end
3939

4040
describe "#should_generate_function?" do
41-
subject { data.should_generate_function?(function_name) }
41+
subject { config.should_generate_function?(function_name) }
4242

4343
context "rb function (denied)" do
4444
let(:function_name) { "rb_check_safe_str" }
@@ -60,7 +60,7 @@
6060
end
6161

6262
describe "#should_generate_struct?" do
63-
subject { data.should_generate_struct?(struct_name) }
63+
subject { config.should_generate_struct?(struct_name) }
6464

6565
context "rb struct" do
6666
let(:struct_name) { "rb_random_struct" }
@@ -76,7 +76,7 @@
7676
end
7777

7878
describe "#should_generate_type?" do
79-
subject { data.should_generate_type?(type_name) }
79+
subject { config.should_generate_type?(type_name) }
8080

8181
context "rb type" do
8282
let(:type_name) { "rb_data_type_t" }
@@ -98,7 +98,7 @@
9898
end
9999

100100
describe "#should_generate_enum?" do
101-
subject { data.should_generate_enum?(enum_name) }
101+
subject { config.should_generate_enum?(enum_name) }
102102

103103
context "ruby_value_type" do
104104
let(:enum_name) { "ruby_value_type" }

0 commit comments

Comments
 (0)