Merge pull request kodecocodes#158 from APesate/Array2DImprovement

kelvinlauKL · web-flow · commit 01eb805c527b · 2016-07-23T21:50:16.000-07:00
Added preconditions to subscript to avoid unwanted changes or crashes.
diff --git a/Array2D/Array2D.swift b/Array2D/Array2D.swift
@@ -19,6 +19,9 @@ public struct Array2D<T> {
       return array[row*columns + column]
     }
     set {
+      precondition(row < rows, "Row \(row) Index is out of range. Array<T>(columns: \(columns), rows:\(rows))")
+      precondition(column < columns, "Column \(column) Index is out of range. Array<T>(columns: \(columns), rows:\(rows))")
+        
       array[row*columns + column] = newValue
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ public struct Array2D<T> {`
`19`	`19`	`return array[row*columns + column]`
`20`	`20`	`}`
`21`	`21`	`set {`
	`22`	`+ precondition(row < rows, "Row \(row) Index is out of range. Array<T>(columns: \(columns), rows:\(rows))")`
	`23`	`+ precondition(column < columns, "Column \(column) Index is out of range. Array<T>(columns: \(columns), rows:\(rows))")`
	`24`	`+`
`22`	`25`	`array[row*columns + column] = newValue`
`23`	`26`	`}`
`24`	`27`	`}`