use map rather than jagged array

This commit is contained in:
2018-11-27 14:02:45 -05:00
parent ffab11f785
commit dad81ffd40
3 changed files with 43 additions and 28 deletions

View File

@@ -12,45 +12,55 @@ class Funge93
override fun next(pos: Vec2, delta: Vec2): Vec2 = (pos + delta) mod size
val contents = Array(size.y) { Array(size.x) { LongData.SPACE } }
override fun defaultData(): LongData = LongData.SPACE
override fun defaultChar(): Char = '\u2022' // bullet
override fun get(pos: Vec2): LongData = contents[pos.y][pos.x]
val contents = hashMapOf<Vec2, LongData>()
override fun get(pos: Vec2): LongData = contents[pos] ?: defaultData()
override fun set(pos: Vec2, data: LongData) {
if (pos.x !in 0 until size.x || pos.y !in 0 until size.y)
return
val from = this[pos]
contents[pos.y][pos.x] = data
contents[pos] = data
onChange(FungeChange(this, pos, from, data))
}
override var data: List<List<LongData>>
override var data: Map<Vec2, LongData>
get() {
return contents.map(Array<LongData>::toList)
return contents.toMap()
}
set(data) {
for (y in 0 until size.y) for (x in 0 until size.x) {
val pos = Vec2(x, y)
val new = data.getOrNull(y)?.getOrNull(x) ?: this[pos]
this[pos] = new
}
clear()
for ((v, d) in data.entries)
this[v] = d
}
override var src: String
get() {
return contents.map { row ->
row.dropLastWhile { ch ->
ch.char?.isISOControl() ?: false
}.map { ch ->
ch.char ?: '\u2022' // bullet
}.joinToString("")
}.dropLastWhile { line ->
line.isEmpty()
}.joinToString("\n")
}
set(data) {
val lines = data.lines()
for (y in 0 until size.y) for (x in 0 until size.x) {
val pos = Vec2(x, y)
val new = lines.getOrNull(y)?.getOrNull(x)?.let(::LongData) ?: this[pos]
this[pos] = new
val lines = mutableListOf<String>()
for ((y, row) in contents.entries.groupBy { it.key.y }.toSortedMap()) {
lines += List(y - lines.size) { "" }
val chars = mutableListOf<Char>()
for ((v, ch) in row.sortedBy { it.key.x }) {
chars += List(v.x - chars.size) { ' ' }
chars += ch.char ?: defaultChar()
}
lines += chars.joinToString("")
}
return lines.joinToString("\n")
}
set(src) {
data = src.lines().mapIndexed { y, line ->
line.mapIndexed { x, ch ->
Pair(Vec2(x, y), LongData(ch))
}
}.flatten().toMap()
}
override fun clear() {
contents.clear()
}
}

View File

@@ -6,9 +6,12 @@ import befide.befunge.core.util.Event
interface Funge<V, D : Data> {
val size: V
val data: List<List<D>>
val data: Map<V, D>
val src: String
fun defaultData(): D
fun defaultChar(): Char
fun next(pos: V, delta: V): V
operator fun get(pos: V): D

View File

@@ -3,8 +3,10 @@ package befide.befunge.core.state
interface MutableFunge<V, D : Data>
: Funge<V, D> {
override var data: List<List<D>>
override var data: Map<V, D>
override var src: String
operator fun set(pos: V, data: D)
fun clear()
}