sashakoshka
/
creature
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Ran gofmt

This commit is contained in:
Sasha Koshka 2022-09-08 14:43:19 -04:00
parent b0068336cd
commit a52e5d3426
5 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/main.go Normal file
View File

@ -0,0 +1 @@
package main

6
creature.go
View File

@ -10,7 +10,7 @@ type Word interface {
// Machine is a stack machine. It contains an array of integers as its program
// data, and provides methods to run this program data, as well as interact with
// it.
type Machine [WORD Word] struct {
type Machine[WORD Word] struct {
program []WORD
stack []WORD
block []WORD
@ -22,7 +22,7 @@ type Machine [WORD Word] struct {
// MachineFunction is a function that can extend the functionality of the stack
// machine. It is passed a pointer to the machine that is calling it, and the
// machine will halt execution if true is returned.
type MachineFunction [WORD Word] func(machine *Machine[WORD]) (stop bool)
type MachineFunction[WORD Word] func(machine *Machine[WORD]) (stop bool)
// All supported opcodes
const (
@ -259,7 +259,7 @@ func (machine *Machine[WORD]) Poke(address WORD, word WORD) {
// Register registers a function at the specified ID. If there is already a
// function registered at that ID, this method will return an error.
func (machine *Machine[WORD]) Register (
func (machine *Machine[WORD]) Register(
id WORD,
function MachineFunction[WORD],
) (

23
creature_test.go
View File

@ -2,14 +2,14 @@ package creature
import "testing"
func runMachineTest (
func runMachineTest(
program []int,
memory []int,
test *testing.T,
) (
machine *Machine[int],
) {
machine = &Machine[int] {}
machine = &Machine[int]{}
machine.LoadProgram(program)
if memory != nil {
machine.LoadMemory(memory)
@ -25,7 +25,7 @@ func runMachineTest (
}
func TestPush(test *testing.T) {
machine := runMachineTest ([]int {
machine := runMachineTest([]int{
PUSH, 3,
POP,
PUSH, 654,
@ -41,7 +41,7 @@ func TestPush(test *testing.T) {
}
func TestArithmetic(test *testing.T) {
machine := runMachineTest([]int {
machine := runMachineTest([]int{
PUSH, 3,
PUSH, 2,
ADD,
@ -102,7 +102,7 @@ func TestArithmetic(test *testing.T) {
}
func TestComparison(test *testing.T) {
machine := runMachineTest([]int {
machine := runMachineTest([]int{
PUSH, 6,
PUSH, 6,
EQ,
@ -118,7 +118,6 @@ func TestComparison(test *testing.T) {
PUSH, 54,
PUSH, 6,
NEQ,
}, nil, test)
neqResult := machine.Pop()
@ -153,7 +152,7 @@ func TestComparison(test *testing.T) {
}
func TestPeekPoke(test *testing.T) {
machine := runMachineTest ([]int {
machine := runMachineTest([]int{
PUSH, 0,
PEEK,
@ -163,7 +162,7 @@ func TestPeekPoke(test *testing.T) {
PUSH, 1,
PEEK,
}, []int {
}, []int{
632,
13,
}, test)
@ -186,7 +185,7 @@ func TestPeekPoke(test *testing.T) {
}
func TestHalt(test *testing.T) {
machine := runMachineTest ([]int {
machine := runMachineTest([]int{
PUSH, 32,
HALT,
PUSH, 3,
@ -202,7 +201,7 @@ func TestHalt(test *testing.T) {
}
func TestJump(test *testing.T) {
machine := runMachineTest ([]int {
machine := runMachineTest([]int{
PUSH, 1,
PUSH, 8,
JMP,
@ -231,8 +230,8 @@ func TestJump(test *testing.T) {
func TestRegister(test *testing.T) {
output := ""
machine := &Machine[int] {}
machine.LoadProgram([]int {
machine := &Machine[int]{}
machine.LoadProgram([]int{
PUSH, int('h'),
PUSH, 4,
CAL,

21
examples/echo.go
View File

@ -1,3 +1,4 @@
//go:build ignore
// +build ignore
package main
@ -5,12 +6,12 @@ package main
import "os"
import cre "git.tebibyte.media/sashakoshka/creature"
func main () {
func main() {
// this is a simple echo program. it will take in input indefinetly and
// repeat it. due to line buffering in the terminal however, it will
// only print output once you have pressed enter.
machine := cre.Machine[int] {}
machine.LoadProgram([]int {
machine := cre.Machine[int]{}
machine.LoadProgram([]int{
cre.PUSH, 0,
cre.CAL,
@ -22,20 +23,22 @@ func main () {
cre.JMP,
})
machine.Register (0, read)
machine.Register (1, write)
machine.Register(0, read)
machine.Register(1, write)
err := machine.Execute(0)
if err != nil { panic(err.Error()) }
if err != nil {
panic(err.Error())
}
}
func read (machine *cre.Machine[int]) (stop bool) {
ch := []byte { 0 }
func read(machine *cre.Machine[int]) (stop bool) {
ch := []byte{0}
os.Stdin.Read(ch)
machine.Push(int(ch[0]))
return
}
func write (machine *cre.Machine[int]) (stop bool) {
func write(machine *cre.Machine[int]) (stop bool) {
print(string(rune(machine.Pop())))
return
}

23
examples/psychiatrist.go
View File

@ -1,3 +1,4 @@
//go:build ignore
// +build ignore
package main
@ -5,7 +6,7 @@ package main
import "os"
import cre "git.tebibyte.media/sashakoshka/creature"
func main () {
func main() {
// this is an "ai psychiatrist" program. when it starts, it asks the
// user "What brings you in today?", and no matter what the user types,
// the program will respond with "And how does that make you feel?".
@ -20,8 +21,8 @@ func main () {
responseStart := 71
responseLoopStart := 50
machine := cre.Machine[int] {}
machine.LoadProgram([]int {
machine := cre.Machine[int]{}
machine.LoadProgram([]int{
// reset x
cre.PUSH, introStart,
cre.PUSH, x,
@ -111,7 +112,7 @@ func main () {
cre.JMP,
})
stringData := []byte (
stringData := []byte(
"\x00" +
"== Artificial Intelligence Psychiatrist ==\n" +
"What brings you in today?\n\x00" +
@ -123,21 +124,23 @@ func main () {
}
machine.LoadMemory(block)
machine.Register (0, read)
machine.Register (1, write)
machine.Register(0, read)
machine.Register(1, write)
err := machine.Execute(0)
if err != nil { panic(err.Error()) }
if err != nil {
panic(err.Error())
}
}
func read (machine *cre.Machine[int]) (stop bool) {
ch := []byte { 0 }
func read(machine *cre.Machine[int]) (stop bool) {
ch := []byte{0}
os.Stdin.Read(ch)
machine.Push(int(ch[0]))
return
}
func write (machine *cre.Machine[int]) (stop bool) {
func write(machine *cre.Machine[int]) (stop bool) {
print(string(rune(machine.Pop())))
return
}