September 2017 Update

Task/Inheritance-Multiple/Elena/inheritance-multiple-1.elena

@@ -1,26 +1,24 @@
-#import system.
-
-#symbol CameraFeature =
+class CameraFeature =
 {
-    #method cameraMsg
+    cameraMsg
         = "camera".
 }.
 
-#class MobilePhone
+class MobilePhone
 {
-    #method mobileMsg
+    mobileMsg
         = "phone".
 }
 
-#class CameraPhone :: MobilePhone
+class CameraPhone :: MobilePhone
 {
-    #method => CameraFeature.
+    dispatch => CameraFeature.
 }
 
-#symbol program =
+program =
 [
-   #var cp := CameraPhone new.
+   var cp := CameraPhone new.
 
-   console writeLine:(cp cameraMsg).
-   console writeLine:(cp mobileMsg).
+   console writeLine(cp cameraMsg).
+   console writeLine(cp mobileMsg).
 ].

Task/Inheritance-Multiple/Elena/inheritance-multiple-2.elena

@@ -1,26 +1,25 @@
-#import system.
-#import system'dynamic.
+import system'dynamic.
 
-#class CameraFeature
+class CameraFeature
 {
-    #method cameraMsg
+    cameraMsg
         = "camera".
 }
 
-#class MobilePhone
+class MobilePhone
 {
-    #method mobileMsg
+    mobileMsg
         = "phone".
 }
 
-#symbol CameraPhone =
+class CameraPhone =
 {
-   new = MobilePhone new mix &into:(CameraFeature new).
+   new = MobilePhone new; mixInto(CameraFeature new).
 }.
 
-#symbol program =
+program =
 [
-   #var cp := CameraPhone new.
+   var cp := CameraPhone new.
 
    console writeLine:(cp cameraMsg).
    console writeLine:(cp mobileMsg).