diff options
| author | Eduardo Julian | 2017-07-22 18:09:53 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2017-07-22 18:09:53 -0400 |
| commit | a878ffc5f8d71848db3f400bc3ebd40176c19973 (patch) | |
| tree | ac106d1c9c8548d4dae2a60bd971402e598626f4 | |
| parent | 607904a5238ecfcf7761143207ca41e082a12aa8 (diff) | |
- Changed inheritance syntax for interfaces and classes to make it more homogeneous.
| -rw-r--r-- | stdlib/source/lux/paradigm/object/inheritance.lux | 4 | ||||
| -rw-r--r-- | stdlib/test/test/lux/paradigm/object.lux | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/stdlib/source/lux/paradigm/object/inheritance.lux b/stdlib/source/lux/paradigm/object/inheritance.lux index 9b384fd1d..d3eef515d 100644 --- a/stdlib/source/lux/paradigm/object/inheritance.lux +++ b/stdlib/source/lux/paradigm/object/inheritance.lux @@ -104,6 +104,6 @@ (|> reference (p;after (s;this (' <keyword>)))))] - [extension #extends] - [inheritance #inherits] + [extension #super] + [inheritance #super] ) diff --git a/stdlib/test/test/lux/paradigm/object.lux b/stdlib/test/test/lux/paradigm/object.lux index 7998d0000..215dcee77 100644 --- a/stdlib/test/test/lux/paradigm/object.lux +++ b/stdlib/test/test/lux/paradigm/object.lux @@ -18,11 +18,11 @@ get@Counter)) (interface: Resettable-Counter - #extends Counter + #super Counter (reset [] @)) (class: NatRC Resettable-Counter - #inherits NatC + #super NatC Unit (def: reset @@ -43,11 +43,11 @@ (|>. get@Collection list;size))) (interface: (Iterable a) - #extends (Collection a) + #super (Collection a) (enumerate [] (List a))) (class: (ListI a) (Iterable a) - #inherits (ListC a) + #super (ListC a) Unit (def: enumerate |