#15 - корректировка примеров

samples/equals.js

@@ -1,20 +1,17 @@
 type withEquals = {
     prop: number;
-    equals: (withEquals) => boolean;
 }
 
-let obj1 = {
+function equals(obj: withEquals, that: withEquals) {
+    return obj.prop == that.prop
+}
+
+let obj1: withEquals = {
     prop: 1;
-    equals => (that: withEquals): boolean {
-        return prop == (that.prop)
-    };
 }
 
-let obj2 = {
+let obj2: withEquals = {
     prop: 2;
-    equals => (that: withEquals): boolean {
-        return prop == (that.prop)
-    };
 }
 
 let res = obj1.equals(obj2)

samples/linkedlist.js

@@ -4,8 +4,27 @@ type node = {
 }
 type list = {
     head: node;
-    append: (number,) => void;
-    getOdd: () => number[];
+}
+
+function append(lst: list, item: number) {
+    let tail: node = lst.head
+    while (tail.next != null) {
+        tail = tail.next
+    }
+    tail.next = makeNode(item)
+}
+
+function getOdd(lst: list): number[] {
+    let result: number[]
+    let n = lst.head
+    while (n != null) {
+        if (n.data % 2 != 0) {
+            let i = n.data
+            result = result ++ [i]
+        }
+        n = n.next
+    }
+    return result
 }
 
 function makeNode(item: number): node {
@@ -17,25 +36,6 @@ function makeNode(item: number): node {
 
 let linkedList: list = {
     head: makeNode(1);
-    append => (item: number) {
-        let tail: node = head
-        while ((tail.next) != null) {
-            tail = tail.next
-        }
-        tail.next = makeNode(item)
-    };
-    getOdd => (): number[] {
-        let result: number[]
-        let n = head
-        while (n != null) {
-            if ((n.data) % 2 != 0) {
-                let i = n.data
-                result = result ++ [i,]
-            }
-            n = n.next
-        }
-        return result
-    };
 }
 
 linkedList.append(3)

samples/settable.js

@@ -1,16 +1,16 @@
 type settable = {
     prop: string;
-    setprop: (string) => void;
+}
+
+function setprop(obj: settable, str: string) {
+    obj.prop = str
+    if (obj.prop == "1") {
+        print("prop is one")
+    }
 }
 
 let obj: settable = {
     prop: "prop";
-    setprop => (str: string) {
-        prop = str
-        if (prop == "1") {
-            print("prop is one")
-        }
-    };
 }
 
 obj.setprop("1")

samples/summator.js

@@ -1,9 +1,15 @@
-let summator = {
+type summable{
+    x: number;
+    y: number;
+}
+
+function sum(obj: summable): number {
+    return obj.x + obj.y
+}
+
+let summator: summable = {
     x: 1;
     y: 2;
-    sum => (): number {
-        return x + y
-    };
 }
 
 let s = summator.sum()

samples/this.js

@@ -1,11 +1,18 @@
-let obj = {
+type ObjType = {
+    num: number;
+    flag: boolean;
+    str: string;
+}
+
+function toString(obj: ObjType): string {
+    let s = "object obj:\n"
+    return s + (obj as string)
+}
+
+let obj: ObjType = {
     num: 1;
     flag: true;
     str: "field";
-    toString => (): string {
-        let s = "object obj:\n"
-        return s + (this as string)
-    };
 }
 
 print(obj.toString())

samples/vec2d.js

@@ -18,5 +18,6 @@ function vlensquared(v: vec2d): number {
 
 let v = makeVec(3, 4)
 let l = vlensquared(v)
-
+print(l as string)
+l = v.vlensquared()
 print(l as string)