me/befide
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more consistent naming, corrected abstract class

Browse Source
This commit is contained in:
David Allemang
2018-11-27 18:18:05 -05:00
parent 2e03a031b0
commit 81750a920d
8 changed files with 81 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
befunge/src/main/kotlin/befide/befunge/b93/Befunge93.kt
View File

@@ -2,23 +2,20 @@ package befide.befunge.b93
import befide.befunge.b93.state.*
import befide.befunge.core.*
import befide.befunge.core.events.IpChange
import befide.befunge.core.events.StackChange
import befide.befunge.core.util.readAll
import befide.befunge.core.util.Event
import java.io.PipedReader
import java.io.PipedWriter
import java.util.*
class Interpreter93(stdinSrc: PipedWriter, stdoutDest: PipedReader)
: MutableInterpreter<Vec2, LongData, PointerMode>() {
: MutableInterpreter<Vec2, Data93, PointerMode>() {
override val ip = Pointer93()
override val funge = Funge93()
override val stack = Stack<LongData>()
override val stack = Stack<Data93>()
override fun stackDefault() = LongData.ZERO
override fun stackDefault() = Data93.ZERO
override val stdin: PipedReader = PipedReader(stdinSrc)
override val stdout: PipedWriter = PipedWriter(stdoutDest)
@@ -32,16 +29,20 @@ fun main(args: Array<String>) {
val int = Interpreter93(stdinSrc, stdoutDest)
// int.onIpChange += {
// println(it.to.pos)
// }
int.funge.onChange += { (pos, from, to) ->
println("$pos from $from to $to")
}
// int.funge.src = """2>:3g" "-!v\ g30 <
// |!`"O":+1_:.:03p>03g+:"O"`|
// @ ^ p3\" ":<
//2 234567890123456789012345678901234567890123456789012345678901234567890123456789"""
int.onIpChange += { (_, to) ->
println("ip to ${to.pos}")
}
int.funge.src = """fedc;ba9876;54321>:#._@"""
int.funge.src = """2>:3g" "-!v\ g30 <
|!`"O":+1_:.:03p>03g+:"O"`|
@ ^ p3\" ":<
2 234567890123456789012345678901234567890123456789012345678901234567890123456789"""
// int.funge.src = """fedc;ba9876;54321>:#._@"""
while (int.ip.mode != PointerMode.Terminated) {
int.step()

22
befunge/src/main/kotlin/befide/befunge/b93/Instructions.kt
View File

@@ -1,14 +1,14 @@
package befide.befunge.b93
import befide.befunge.b93.state.LongData
import befide.befunge.b93.state.Data93
import befide.befunge.b93.state.PointerMode
import befide.befunge.b93.state.Vec2
import befide.befunge.core.InstructionSet
import befide.befunge.core.MutableInterpreter
import befide.befunge.core.util.chooseOne
class B93Instructions : InstructionSet<Vec2, LongData, PointerMode> {
override fun MutableInterpreter<Vec2, LongData, PointerMode>.handle(): Boolean {
class B93Instructions : InstructionSet<Vec2, Data93, PointerMode> {
override fun MutableInterpreter<Vec2, Data93, PointerMode>.handle(): Boolean {
when (mode) {
PointerMode.Terminated -> return true
PointerMode.String -> when (instr.char) {
@@ -19,15 +19,15 @@ class B93Instructions : InstructionSet<Vec2, LongData, PointerMode> {
PointerMode.Normal -> when (instr.char) {
null -> return false
in "0123456789" -> push(LongData(instr.char.toString().toLong(16)))
in "0123456789" -> push(Data93(instr.char.toString().toLong(16)))
'+' -> pop(2).let { (b, a) -> push(a + b) }
'-' -> pop(2).let { (b, a) -> push(a - b) }
'*' -> pop(2).let { (b, a) -> push(a * b) }
'/' -> pop(2).let { (b, a) -> push(a / b) }
'%' -> pop(2).let { (b, a) -> push(a mod b) }
'!' -> pop(1).let { (n) -> push(LongData(if (n.data == 0L) 1L else 0L)) }
'`' -> pop(2).let { (b, a) -> push(LongData(if (a.data > b.data) 1L else 0L)) }
'!' -> pop(1).let { (n) -> push(Data93(if (n.data == 0L) 1L else 0L)) }
'`' -> pop(2).let { (b, a) -> push(Data93(if (a.data > b.data) 1L else 0L)) }
'>' -> delta = Vec2.RIGHT
'<' -> delta = Vec2.LEFT
@@ -51,13 +51,13 @@ class B93Instructions : InstructionSet<Vec2, LongData, PointerMode> {
'p' -> pop(3).let { (y, x, n) -> funge[Vec2(x.data.toInt(), y.data.toInt())] = n }
'g' -> pop(2).let { (y, x) -> push(funge[Vec2(x.data.toInt(), y.data.toInt())]) }
'~' -> push(LongData(stdin.read().toLong()))
'~' -> push(Data93(stdin.read().toLong()))
'&' -> {
val chars = generateSequence {
stdin.read().takeIf { it.toChar().isDigit() }
}
val long = chars.joinToString("").toLong()
push(LongData(long))
push(Data93(long))
}
'@' -> mode = PointerMode.Terminated
@@ -70,15 +70,15 @@ class B93Instructions : InstructionSet<Vec2, LongData, PointerMode> {
}
}
class B93Extras : InstructionSet<Vec2, LongData, PointerMode> {
override fun MutableInterpreter<Vec2, LongData, PointerMode>.handle(): Boolean {
class B93Extras : InstructionSet<Vec2, Data93, PointerMode> {
override fun MutableInterpreter<Vec2, Data93, PointerMode>.handle(): Boolean {
when (mode) {
PointerMode.Terminated -> return true
PointerMode.String -> return false
PointerMode.Normal -> when (instr.char) {
null -> return false
in "0123456789abcdef" -> push(LongData(instr.char.toString().toLong(16)))
in "0123456789abcdef" -> push(Data93(instr.char.toString().toLong(16)))
'\'' -> {
move()

26
befunge/src/main/kotlin/befide/befunge/b93/state/Data93.kt Normal file
View File

@@ -0,0 +1,26 @@
package befide.befunge.b93.state
import befide.befunge.core.state.Data
import befide.befunge.core.util.mod
data class Data93(val data: Long)
: Data {
companion object {
val SPACE = Data93(' ')
val ZERO = Data93(0)
}
override val char = data.toChar().takeUnless { it.isISOControl() }
constructor(char: Char) : this(char.toLong())
operator fun plus(o: Data93) = Data93(data + o.data)
operator fun minus(o: Data93) = Data93(data - o.data)
operator fun times(o: Data93) = Data93(data * o.data)
operator fun div(o: Data93) = Data93(data / o.data)
operator fun unaryMinus() = Data93(-data)
infix fun mod(o: Data93) = Data93(data mod o.data)
override fun toString() = "${char ?: '\u2022'} ($data)"
}

26
befunge/src/main/kotlin/befide/befunge/b93/state/LongData.kt
View File

@@ -1,26 +0,0 @@
package befide.befunge.b93.state
import befide.befunge.core.state.Data
import befide.befunge.core.util.mod
data class LongData(val data: Long)
: Data {
companion object {
val SPACE = LongData(' ')
val ZERO = LongData(0)
}
override val char = data.toChar().takeUnless { it.isISOControl() }
constructor(char: Char) : this(char.toLong())
operator fun plus(o: LongData) = LongData(data + o.data)
operator fun minus(o: LongData) = LongData(data - o.data)
operator fun times(o: LongData) = LongData(data * o.data)
operator fun div(o: LongData) = LongData(data / o.data)
operator fun unaryMinus() = LongData(-data)
infix fun mod(o: LongData) = LongData(data mod o.data)
override fun toString() = "${char ?: '\u2022'} ($data)"
}

11
befunge/src/main/kotlin/befide/befunge/b93/state/Vec2.kt
View File

@@ -27,4 +27,13 @@ data class Vec2(val x: Int, val y: Int) {
operator fun unaryMinus() = Vec2(-x, -y)
infix fun mod(o: Vec2) = Vec2(x mod o.x, y mod o.y)
}
operator fun rangeTo(o: Vec2) = Bounds2(x..o.x, y..o.y)
infix fun until(o: Vec2) = Bounds2(x until o.x, y until o.y)
}
data class Bounds2(val x: IntRange, val y: IntRange) {
override fun toString(): String = "($x, $y)"
operator fun contains(o: Vec2): Boolean = o.x in x && o.y in y
}

3
befunge/src/main/kotlin/befide/befunge/core/events/FungeChange.kt
View File

@@ -4,7 +4,6 @@ import befide.befunge.core.state.Data
import befide.befunge.core.state.Funge
data class FungeChange<V, D : Data>
(val funge: Funge<V, D>,
val pos: V,
(val pos: V,
val from: D,
val to: D)

3
befunge/src/main/kotlin/befide/befunge/core/state/Funge.kt
View File

@@ -9,9 +9,6 @@ interface Funge<V, D : Data> {
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

23
befunge/src/main/kotlin/befide/befunge/core/state/MutableFunge.kt
View File

@@ -1,12 +1,25 @@
package befide.befunge.core.state
interface MutableFunge<V, D : Data>
import befide.befunge.core.events.FungeChange
import befide.befunge.core.util.Event
abstract class MutableFunge<V, D : Data>
: Funge<V, D> {
override var data: Map<V, D>
override var src: String
abstract override var data: Map<V, D>
abstract override var src: String
operator fun set(pos: V, data: D)
override val onChange = Event<FungeChange<V, D>>()
fun clear()
fun notify(pos: V, op: () -> Unit) {
val from = this[pos]
op()
val to = this[pos]
onChange(FungeChange(pos, from, to))
}
abstract operator fun set(pos: V, data: D)
abstract fun clear()
}