Skip to content
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

Add lazy versions of Object#getter?/property? macros #7322

Merged
merged 1 commit into from
Feb 16, 2019
Merged

Add lazy versions of Object#getter?/property? macros #7322

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
42 changes: 42 additions & 0 deletions spec/std/object_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ private class TestObject
@getter13_counter = 0
getter(getter13) { @getter13_counter += 1; false }

getter?(getter14 : Bool) { true }
getter?(getter15) { true }

setter setter1
setter setter2 : Int32
setter setter3 : Int32 = 3
Expand All @@ -64,6 +67,9 @@ private class TestObject
@property13_counter = 0
property(property13) { @property13_counter += 1; false }

property?(property14 : Bool) { true }
property?(property15) { true }

def initialize
@getter1 = 1
@getter2 = 2
Expand Down Expand Up @@ -272,6 +278,24 @@ describe Object do
typeof(obj.@getter10).should eq(Bool)
typeof(obj.getter10?).should eq(Bool)
end

it "uses getter? with type declaration and block" do
obj = TestObject.new
typeof(obj.@getter14).should eq(Bool?)
typeof(obj.getter14?).should eq(Bool)
obj.@getter14.should be_nil
obj.getter14?.should be_true
obj.@getter14.should be_true
end

it "uses getter? with block" do
obj = TestObject.new
typeof(obj.@getter15).should eq(Bool?)
typeof(obj.getter15?).should eq(Bool)
obj.@getter15.should be_nil
obj.getter15?.should be_true
obj.@getter15.should be_true
end
end

describe "setter" do
Expand Down Expand Up @@ -400,6 +424,24 @@ describe Object do
obj.property10 = false
obj.property10?.should be_false
end

it "uses property? with type declaration and block" do
obj = TestObject.new
typeof(obj.@property14).should eq(Bool?)
typeof(obj.property14?).should eq(Bool)
obj.@property14.should be_nil
obj.property14?.should be_true
obj.@property14.should be_true
end

it "uses property? with block" do
obj = TestObject.new
typeof(obj.@property15).should eq(Bool?)
typeof(obj.property15?).should eq(Bool)
obj.@property15.should be_nil
obj.property15?.should be_true
obj.@property15.should be_true
end
end

it "#unsafe_as" do
Expand Down
124 changes: 97 additions & 27 deletions src/object.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,25 +559,57 @@ class Object
# end
# end
# ```
macro {{macro_prefix}}getter?(*names)
\{% for name in names %}
\{% if name.is_a?(TypeDeclaration) %}
{{var_prefix}}\{{name}}
#
# If a block is given to the macro, a getter is generated
# with a variable that is lazily initialized with
# the block's contents, for examples see `#{{macro_prefix}}getter`.
macro {{macro_prefix}}getter?(*names, &block)
\{% if block %}
\{% if names.size != 1 %}
\{{ raise "Only one argument can be passed to `getter?` with a block" }}
\{% end %}

def {{method_prefix}}\{{name.var.id}}? : \{{name.type}}
{{var_prefix}}\{{name.var.id}}
end
\{% elsif name.is_a?(Assign) %}
{{var_prefix}}\{{name}}
\{% name = names[0] %}

def {{method_prefix}}\{{name.target.id}}?
{{var_prefix}}\{{name.target.id}}
\{% if name.is_a?(TypeDeclaration) %}
{{var_prefix}}\{{name.var.id}} : \{{name.type}}?

def {{method_prefix}}\{{name.var.id}}?
if (value = {{var_prefix}}\{{name.var.id}}).nil?
{{var_prefix}}\{{name.var.id}} = \{{yield}}
else
value
end
end
\{% else %}
def {{method_prefix}}\{{name.id}}?
{{var_prefix}}\{{name.id}}
if (value = {{var_prefix}}\{{name.id}}).nil?
{{var_prefix}}\{{name.id}} = \{{yield}}
else
value
end
end
\{% end %}
\{% else %}
\{% for name in names %}
\{% if name.is_a?(TypeDeclaration) %}
{{var_prefix}}\{{name}}

def {{method_prefix}}\{{name.var.id}}? : \{{name.type}}
{{var_prefix}}\{{name.var.id}}
end
\{% elsif name.is_a?(Assign) %}
{{var_prefix}}\{{name}}

def {{method_prefix}}\{{name.target.id}}?
{{var_prefix}}\{{name.target.id}}
end
\{% else %}
def {{method_prefix}}\{{name.id}}?
{{var_prefix}}\{{name.id}}
end
\{% end %}
\{% end %}
\{% end %}
end

Expand Down Expand Up @@ -1051,34 +1083,72 @@ class Object
# end
# end
# ```
macro {{macro_prefix}}property?(*names)
\{% for name in names %}
\{% if name.is_a?(TypeDeclaration) %}
{{var_prefix}}\{{name}}
#
# If a block is given to the macro, a property is generated
# with a variable that is lazily initialized with
# the block's contents, for examples see `#{{macro_prefix}}property`.
macro {{macro_prefix}}property?(*names, &block)
\{% if block %}
\{% if names.size != 1 %}
\{{ raise "Only one argument can be passed to `property?` with a block" }}
\{% end %}

def {{method_prefix}}\{{name.var.id}}? : \{{name.type}}
{{var_prefix}}\{{name.var.id}}
end
\{% name = names[0] %}

def {{method_prefix}}\{{name.var.id}}=({{var_prefix}}\{{name.var.id}} : \{{name.type}})
end
\{% elsif name.is_a?(Assign) %}
{{var_prefix}}\{{name}}
\{% if name.is_a?(TypeDeclaration) %}
{{var_prefix}}\{{name.var.id}} : \{{name.type}}?

def {{method_prefix}}\{{name.target.id}}?
{{var_prefix}}\{{name.target.id}}
def {{method_prefix}}\{{name.var.id}}?
if (value = {{var_prefix}}\{{name.var.id}}).nil?
{{var_prefix}}\{{name.var.id}} = \{{yield}}
else
value
end
end

def {{method_prefix}}\{{name.target.id}}=({{var_prefix}}\{{name.target.id}})
def {{method_prefix}}\{{name.var.id}}=({{var_prefix}}\{{name.var.id}} : \{{name.type}})
end
\{% else %}
def {{method_prefix}}\{{name.id}}?
{{var_prefix}}\{{name.id}}
if (value = {{var_prefix}}\{{name.id}}).nil?
{{var_prefix}}\{{name.id}} = \{{yield}}
else
value
end
end

def {{method_prefix}}\{{name.id}}=({{var_prefix}}\{{name.id}})
end
\{% end %}
\{% else %}
\{% for name in names %}
\{% if name.is_a?(TypeDeclaration) %}
{{var_prefix}}\{{name}}

def {{method_prefix}}\{{name.var.id}}? : \{{name.type}}
{{var_prefix}}\{{name.var.id}}
end

def {{method_prefix}}\{{name.var.id}}=({{var_prefix}}\{{name.var.id}} : \{{name.type}})
end
\{% elsif name.is_a?(Assign) %}
{{var_prefix}}\{{name}}

def {{method_prefix}}\{{name.target.id}}?
{{var_prefix}}\{{name.target.id}}
end

def {{method_prefix}}\{{name.target.id}}=({{var_prefix}}\{{name.target.id}})
end
\{% else %}
def {{method_prefix}}\{{name.id}}?
{{var_prefix}}\{{name.id}}
end

def {{method_prefix}}\{{name.id}}=({{var_prefix}}\{{name.id}})
end
\{% end %}
\{% end %}
\{% end %}
end
{% end %}
Expand Down