azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests: "infix modifier required" and "operator modifier required" errors

Browse Source
This commit is contained in:
Yan Zhulanow
2015-11-26 15:56:56 +03:00
parent a3ff3ffc45
commit 9d1af5a17e
635 changed files with 1283 additions and 1617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt
Vendored
+4 -4
View File
@@ -72,7 +72,7 @@ class Image(val src: String, override var pos: Vector, var imageSize: Vector) :
imageSize.x, imageSize.y)
}
fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize)
operator fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize)
}
class Button(val src: String, override var pos: Vector, var imageSize: Vector) : Shape() {
@@ -121,7 +121,7 @@ class Button(val src: String, override var pos: Vector, var imageSize: Vector) :
}
fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize)
operator fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize)
}
class Border() : Shape() {
@@ -484,9 +484,9 @@ abstract class Shape() {
class Vector(val x: Double = 0.0, val y: Double = 0.0) {
operator fun plus(v: Vector) = v(x + v.x, y + v.y)
operator fun minus() = v(-x, -y)
operator fun unaryMinus() = v(-x, -y)
operator fun minus(v: Vector) = v(x - v.x, y - v.y)
fun times(koef: Double) = v(x * koef, y * koef)
operator fun times(koef: Double) = v(x * koef, y * koef)
fun distanceTo(v: Vector) = Math.sqrt((this - v).sqr)
fun rotatedBy(theta: Double): Vector {
val sin = Math.sin(theta)