Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
65 changes: 65 additions & 0 deletions evaluator/evaluator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,71 @@ func TestTraitMethodLookup(t *testing.T) {
}
}

func TestInheritedProperties(t *testing.T) {
tests := []struct {
name string
input string
expected int64
}{
{
name: "access parent class property",
input: `
class Animal {
species = 42
}

class Dog extends Animal {
}

d = Dog.new()
d.species
`,
expected: 42,
},
{
name: "access grandparent class property",
input: `
class Animal {
legs = 4
}

class Mammal extends Animal {
}

class Dog extends Mammal {
}

d = Dog.new()
d.legs
`,
expected: 4,
},
{
name: "child property overrides parent",
input: `
class Animal {
sound = 1
}

class Dog extends Animal {
sound = 2
}

d = Dog.new()
d.sound
`,
expected: 2,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := evaluate(tt.input)
isNumberObject(t, result, tt.expected)
})
}
}

// =============================================================================
// Helper functions

Expand Down
12 changes: 12 additions & 0 deletions evaluator/property.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ func evaluateInstanceProperty(left object.Object, node *ast.Property) object.Obj
return val
}

class := instance.Class.Super

for class != nil {
if class.Environment.Has(property.Value) {
val, _ = class.Environment.Get(property.Value)

return val
}

class = class.Super
}

for _, trait := range instance.Class.Traits {
if trait.Environment.Has(property.Value) {
val, _ = trait.Environment.Get(property.Value)
Expand Down