Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Avoid trying to store new DataConverter type in frozen TypeDefs hash #1057

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

Merged
larskanis merged 1 commit into from
Sep 29, 2023
Merged

Avoid trying to store new DataConverter type in frozen TypeDefs hash #1057

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
3 changes: 2 additions & 1 deletion lib/ffi/types.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ def self.find_type(name, type_map = nil)
TypeDefs[name]

elsif name.is_a?(DataConverter)
(type_map || TypeDefs)[name] = Type::Mapped.new(name)
tm = (type_map || custom_typedefs)
tm[name] = Type::Mapped.new(name)
else
raise TypeError, "unable to resolve type '#{name}'"
end
Expand Down
13 changes: 13 additions & 0 deletions spec/ffi/struct_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,19 @@ def initialize(a, b)
expect(s[:b]).to eq(0xdeadcafebabe)
end

it "Can use DataConverter in an embedded array" do
class Blub #< FFI::Struct
extend FFI::DataConverter
native_type FFI::Type::INT
end

class Zork < FFI::Struct
layout :c, [Blub, 2], 2
end
z = Zork.new
expect(z[:c].to_a).to eq [0, 0]
end

it "Can use Struct subclass as parameter type" do
expect(module StructParam
extend FFI::Library
Expand Down