Skip to content

Commit 226b8a7

Browse files
committed
decouple ResourceKindedValue.isInvalidatedResource from interpreter
1 parent 72c0a5d commit 226b8a7

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

interpreter/value.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ type ResourceKindedValue interface {
198198
Value
199199
Destroy(interpreter *Interpreter, locationRange LocationRange)
200200
IsDestroyed() bool
201-
isInvalidatedResource(*Interpreter) bool
201+
isInvalidatedResource(context ValueStaticTypeContext) bool
202202
}
203203

204204
func maybeDestroy(interpreter *Interpreter, locationRange LocationRange, value Value) {

interpreter/value_array.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ func (v *ArrayValue) IsImportable(inter *Interpreter, locationRange LocationRang
323323
return importable
324324
}
325325

326-
func (v *ArrayValue) isInvalidatedResource(interpreter *Interpreter) bool {
327-
return v.isDestroyed || (v.array == nil && v.IsResourceKinded(interpreter))
326+
func (v *ArrayValue) isInvalidatedResource(context ValueStaticTypeContext) bool {
327+
return v.isDestroyed || (v.array == nil && v.IsResourceKinded(context))
328328
}
329329

330330
func (v *ArrayValue) IsStaleResource(interpreter *Interpreter) bool {

interpreter/value_composite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ func compositeMember(interpreter *Interpreter, compositeValue Value, memberValue
501501
return memberValue
502502
}
503503

504-
func (v *CompositeValue) isInvalidatedResource(_ *Interpreter) bool {
504+
func (v *CompositeValue) isInvalidatedResource(context ValueStaticTypeContext) bool {
505505
return v.isDestroyed || (v.dictionary == nil && v.Kind == common.CompositeKindResource)
506506
}
507507

interpreter/value_dictionary.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,8 @@ func (v *DictionaryValue) IsDestroyed() bool {
474474
return v.isDestroyed
475475
}
476476

477-
func (v *DictionaryValue) isInvalidatedResource(interpreter *Interpreter) bool {
478-
return v.isDestroyed || (v.dictionary == nil && v.IsResourceKinded(interpreter))
477+
func (v *DictionaryValue) isInvalidatedResource(context ValueStaticTypeContext) bool {
478+
return v.isDestroyed || (v.dictionary == nil && v.IsResourceKinded(context))
479479
}
480480

481481
func (v *DictionaryValue) IsStaleResource(interpreter *Interpreter) bool {

interpreter/value_nil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,6 @@ func (NilValue) ChildStorables() []atree.Storable {
181181
return nil
182182
}
183183

184-
func (NilValue) isInvalidatedResource(_ *Interpreter) bool {
184+
func (NilValue) isInvalidatedResource(context ValueStaticTypeContext) bool {
185185
return false
186186
}

interpreter/value_some.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ func (v *SomeValue) InnerValue() Value {
404404
return v.value
405405
}
406406

407-
func (v *SomeValue) isInvalidatedResource(_ *Interpreter) bool {
407+
func (v *SomeValue) isInvalidatedResource(context ValueStaticTypeContext) bool {
408408
return v.value == nil || v.IsDestroyed()
409409
}
410410

0 commit comments

Comments
 (0)