rename Junction to Tuple, update syntax, rename Null to ZeroGraph

gg/gg.go

@@ -21,7 +21,7 @@ type Value struct {
 // passed in twice then the two returned Value instances will be treated as
 // being different values by Graph.
 func NewValue(V interface{}) Value {
-	b := make([]byte, 8)
+	b := make([]byte, 16)
 	if _, err := rand.Read(b); err != nil {
 		panic(err)
 	}
@@ -39,9 +39,11 @@ const (
 	// one edge (either input or output)
 	ValueVertex VertexType = "value"
 
-	// JunctionVertex is a Vertex which contains two or more in edges and
+	// TupleVertex is a Vertex which contains two or more in edges and
 	// exactly one out edge
-	JunctionVertex VertexType = "junction"
+	//
+	// TODO ^ what about 0 or 1 in edges?
+	TupleVertex VertexType = "tuple"
 )
 
 // Edge is a uni-directional connection between two vertices with an attribute
@@ -85,7 +87,7 @@ func (oe OpenEdge) id() string {
 // as a branch.
 //
 // If a OpenEdge contains a fromV which is a Value that vertex won't have its in
-// slice populated no matter what. If fromV is a Junction it will be populated,
+// slice populated no matter what. If fromV is a Tuple it will be populated,
 // with any sub-Value's not being populated and so-on recursively
 //
 // When a view is constructed in makeView these Value instances are deduplicated
@@ -135,8 +137,9 @@ type Graph struct {
 	all   map[string]*Vertex
 }
 
-// Null is the root empty graph, and is the base off which all graphs are built
+// ZeroGraph is the root empty graph, and is the base off which all graphs are
-var Null = &Graph{
+// built.
+var ZeroGraph = &Graph{
 	vM:    map[string]vertex{},
 	byVal: map[string]*Vertex{},
 	all:   map[string]*Vertex{},
@@ -163,7 +166,7 @@ func mkVertex(typ VertexType, val Value, ins ...OpenEdge) vertex {
 	case ValueVertex:
 		v.id = val.ID
 		v.val = val
-	case JunctionVertex:
+	case TupleVertex:
 		inIDs := make([]string, len(ins))
 		for i := range ins {
 			inIDs[i] = ins[i].id()
@@ -186,16 +189,16 @@ func ValueOut(val, edgeVal Value) OpenEdge {
 	return OpenEdge{fromV: mkVertex(ValueVertex, val), val: edgeVal}
 }
 
-// JunctionOut creates a OpenEdge which, when used to construct a Graph,
+// TupleOut creates an OpenEdge which, when used to construct a Graph,
 // represents an edge (with edgeVal attached to it) coming from the
-// JunctionVertex comprised of the given ordered-set of input edges.
+// TupleVertex comprised of the given ordered-set of input edges.
 //
-// When constructing Graphs Junction vertices are de-duplicated on their input
+// When constructing Graphs Tuple vertices are de-duplicated on their input
-// edges. So multiple Junction OpenEdges constructed with the same set of input
+// edges. So multiple Tuple OpenEdges constructed with the same set of input
-// edges will be leaving the same Junction instance in the constructed Graph.
+// edges will be leaving the same Tuple instance in the constructed Graph.
-func JunctionOut(ins []OpenEdge, edgeVal Value) OpenEdge {
+func TupleOut(ins []OpenEdge, edgeVal Value) OpenEdge {
 	return OpenEdge{
-		fromV: mkVertex(JunctionVertex, Value{}, ins...),
+		fromV: mkVertex(TupleVertex, Value{}, ins...),
 		val:   edgeVal,
 	}
 }
@@ -278,7 +281,7 @@ func (g *Graph) DelValueIn(oe OpenEdge, val Value) *Graph {
 		for _, in := range curr.in {
 			if in.fromV.VertexType == ValueVertex && in.fromV.id == vID {
 				return true
-			} else if in.fromV.VertexType == JunctionVertex && connectedTo(vID, in.fromV) {
+			} else if in.fromV.VertexType == TupleVertex && connectedTo(vID, in.fromV) {
 				return true
 			}
 		}
@@ -313,7 +316,7 @@ func (g *Graph) DelValueIn(oe OpenEdge, val Value) *Graph {
 	rmOrphaned = func(oe OpenEdge) {
 		if oe.fromV.VertexType == ValueVertex && isOrphaned(oe.fromV) {
 			delete(g.vM, oe.fromV.id)
-		} else if oe.fromV.VertexType == JunctionVertex {
+		} else if oe.fromV.VertexType == TupleVertex {
 			for _, juncOe := range oe.fromV.in {
 				rmOrphaned(juncOe)
 			}
@@ -352,9 +355,9 @@ func (g *Graph) Union(g2 *Graph) *Graph {
 // and not across to the other Graphs, and the Union of all returned Graphs will
 // be the original again.
 //
-// The order of the Graphs returned is not deterministic.
+// The order of the Graphs returned is not deterministic. (TODO booooooo)
 //
-// Null.Disjoin() returns empty slice.
+// ZeroGraph.Disjoin() returns empty slice.
 func (g *Graph) Disjoin() []*Graph {
 	m := map[string]*Graph{}    // maps each id to the Graph it belongs to
 	mG := map[*Graph]struct{}{} // tracks unique Graphs created
@@ -375,8 +378,8 @@ func (g *Graph) Disjoin() []*Graph {
 	}
 
 	// used upon finding out that previously-thought-to-be disconnected vertices
-	// aren't. Merges the two graphs they're connected into together into one
+	// aren't. Merges the two graphs they're connected into one and updates all
-	// and updates all state internal to this function accordingly.
+	// state internal to this function accordingly.
 	rejoin := func(gDst, gSrc *Graph) {
 		for id, v := range gSrc.vM {
 			gDst.vM[id] = v
@@ -404,7 +407,7 @@ func (g *Graph) Disjoin() []*Graph {
 		// if gV is nil it means this vertex is part of a new Graph which
 		// nothing else has been connected to yet.
 		if gV == nil {
-			gV = Null.cp()
+			gV = ZeroGraph.cp()
 			mG[gV] = struct{}{}
 		}
 		gV.vM[id] = v
@@ -443,8 +446,8 @@ func (g *Graph) makeView() {
 		// we can be sure all Value vertices will be called with top==true at
 		// some point, so we only need to descend into the input edges if:
 		// * top is true
-		// * this is a junction's first time being gotten
+		// * this is a tuple's first time being gotten
-		if !top && (ok || v.VertexType != JunctionVertex) {
+		if !top && (ok || v.VertexType != TupleVertex) {
 			return V
 		}
 
@@ -498,7 +501,7 @@ func Equal(g1, g2 *Graph) bool {
 
 		// since the vertices are values we must make sure their input sets are
 		// the same (which is tricky since they're unordered, unlike a
-		// junction's)
+		// tuple's)
 		if len(v1.in) != len(v2.in) {
 			return false
 		}

gg/gg_test.go

@@ -21,10 +21,10 @@ func value(val Value, in ...Edge) *Vertex {
 	}
 }
 
-func junction(val Value, in ...Edge) Edge {
+func tuple(val Value, in ...Edge) Edge {
 	return Edge{
 		From: &Vertex{
-			VertexType: JunctionVertex,
+			VertexType: TupleVertex,
 			In:         in,
 		},
 		Value: val,
@@ -113,7 +113,7 @@ func TestGraph(t *T) {
 		mkTest(
 			"values-basic",
 			func() *Graph {
-				return Null.AddValueIn(ValueOut(v0, e0), v1)
+				return ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
 			},
 			2, 0,
 			value(v0),
@@ -123,7 +123,7 @@ func TestGraph(t *T) {
 		mkTest(
 			"values-2edges",
 			func() *Graph {
-				g0 := Null.AddValueIn(ValueOut(v0, e0), v2)
+				g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v2)
 				return g0.AddValueIn(ValueOut(v1, e1), v2)
 			},
 			3, 0,
@@ -138,7 +138,7 @@ func TestGraph(t *T) {
 		mkTest(
 			"values-separate",
 			func() *Graph {
-				g0 := Null.AddValueIn(ValueOut(v0, e0), v1)
+				g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
 				return g0.AddValueIn(ValueOut(v2, e2), v3)
 			},
 			4, 0,
@@ -151,7 +151,7 @@ func TestGraph(t *T) {
 		mkTest(
 			"values-circular",
 			func() *Graph {
-				return Null.AddValueIn(ValueOut(v0, e0), v0)
+				return ZeroGraph.AddValueIn(ValueOut(v0, e0), v0)
 			},
 			1, 0,
 			value(v0, edge(e0, value(v0))),
@@ -160,7 +160,7 @@ func TestGraph(t *T) {
 		mkTest(
 			"values-circular2",
 			func() *Graph {
-				g0 := Null.AddValueIn(ValueOut(v0, e0), v1)
+				g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
 				return g0.AddValueIn(ValueOut(v1, e1), v0)
 			},
 			2, 0,
@@ -171,7 +171,7 @@ func TestGraph(t *T) {
 		mkTest(
 			"values-circular3",
 			func() *Graph {
-				g0 := Null.AddValueIn(ValueOut(v0, e0), v1)
+				g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
 				g1 := g0.AddValueIn(ValueOut(v1, e1), v2)
 				return g1.AddValueIn(ValueOut(v2, e2), v1)
 			},
@@ -188,41 +188,41 @@ func TestGraph(t *T) {
 		),
 
 		mkTest(
-			"junction-basic",
+			"tuple-basic",
 			func() *Graph {
 				e0 := ValueOut(v0, e0)
 				e1 := ValueOut(v1, e1)
-				ej0 := JunctionOut([]OpenEdge{e0, e1}, ej0)
+				ej0 := TupleOut([]OpenEdge{e0, e1}, ej0)
-				return Null.AddValueIn(ej0, v2)
+				return ZeroGraph.AddValueIn(ej0, v2)
 			},
 			3, 1,
 			value(v0), value(v1),
-			value(v2, junction(ej0,
+			value(v2, tuple(ej0,
 				edge(e0, value(v0)),
 				edge(e1, value(v1)),
 			)),
 		),
 
 		mkTest(
-			"junction-basic2",
+			"tuple-basic2",
 			func() *Graph {
 				e00 := ValueOut(v0, e00)
 				e10 := ValueOut(v1, e10)
-				ej0 := JunctionOut([]OpenEdge{e00, e10}, ej0)
+				ej0 := TupleOut([]OpenEdge{e00, e10}, ej0)
 				e01 := ValueOut(v0, e01)
 				e11 := ValueOut(v1, e11)
-				ej1 := JunctionOut([]OpenEdge{e01, e11}, ej1)
+				ej1 := TupleOut([]OpenEdge{e01, e11}, ej1)
-				ej2 := JunctionOut([]OpenEdge{ej0, ej1}, ej2)
+				ej2 := TupleOut([]OpenEdge{ej0, ej1}, ej2)
-				return Null.AddValueIn(ej2, v2)
+				return ZeroGraph.AddValueIn(ej2, v2)
 			},
 			3, 3,
 			value(v0), value(v1),
-			value(v2, junction(ej2,
+			value(v2, tuple(ej2,
-				junction(ej0,
+				tuple(ej0,
 					edge(e00, value(v0)),
 					edge(e10, value(v1)),
 				),
-				junction(ej1,
+				tuple(ej1,
 					edge(e01, value(v0)),
 					edge(e11, value(v1)),
 				),
@@ -230,27 +230,27 @@ func TestGraph(t *T) {
 		),
 
 		mkTest(
-			"junction-circular",
+			"tuple-circular",
 			func() *Graph {
 				e0 := ValueOut(v0, e0)
 				e1 := ValueOut(v1, e1)
-				ej0 := JunctionOut([]OpenEdge{e0, e1}, ej0)
+				ej0 := TupleOut([]OpenEdge{e0, e1}, ej0)
-				g0 := Null.AddValueIn(ej0, v2)
+				g0 := ZeroGraph.AddValueIn(ej0, v2)
 				e20 := ValueOut(v2, e20)
 				g1 := g0.AddValueIn(e20, v0)
 				e21 := ValueOut(v2, e21)
 				return g1.AddValueIn(e21, v1)
 			},
 			3, 1,
-			value(v0, edge(e20, value(v2, junction(ej0,
+			value(v0, edge(e20, value(v2, tuple(ej0,
 				edge(e0, value(v0)),
 				edge(e1, value(v1, edge(e21, value(v2)))),
 			)))),
-			value(v1, edge(e21, value(v2, junction(ej0,
+			value(v1, edge(e21, value(v2, tuple(ej0,
 				edge(e0, value(v0, edge(e20, value(v2)))),
 				edge(e1, value(v1)),
 			)))),
-			value(v2, junction(ej0,
+			value(v2, tuple(ej0,
 				edge(e0, value(v0, edge(e20, value(v2)))),
 				edge(e1, value(v1, edge(e21, value(v2)))),
 			)),
@@ -290,9 +290,9 @@ func TestGraphImmutability(t *T) {
 	v1 := NewValue("v1")
 	e0 := NewValue("e0")
 	oe0 := ValueOut(v0, e0)
-	g0 := Null.AddValueIn(oe0, v1)
+	g0 := ZeroGraph.AddValueIn(oe0, v1)
-	assert.Nil(t, Null.ValueVertex(v0))
+	assert.Nil(t, ZeroGraph.ValueVertex(v0))
-	assert.Nil(t, Null.ValueVertex(v1))
+	assert.Nil(t, ZeroGraph.ValueVertex(v1))
 	assert.NotNil(t, g0.ValueVertex(v0))
 	assert.NotNil(t, g0.ValueVertex(v1))
 
@@ -323,39 +323,39 @@ func TestGraphDelValueIn(t *T) {
 	v1 := NewValue("v1")
 	e0 := NewValue("e0")
 	{ // removing from null
-		g := Null.DelValueIn(ValueOut(v0, e0), v1)
+		g := ZeroGraph.DelValueIn(ValueOut(v0, e0), v1)
-		assert.True(t, Equal(Null, g))
+		assert.True(t, Equal(ZeroGraph, g))
 	}
 
 	e1 := NewValue("e1")
 	{ // removing edge from vertex which doesn't have that edge
-		g0 := Null.AddValueIn(ValueOut(v0, e0), v1)
+		g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
 		g1 := g0.DelValueIn(ValueOut(v0, e1), v1)
 		assert.True(t, Equal(g0, g1))
 	}
 
 	{ // removing only edge
 		oe := ValueOut(v0, e0)
-		g0 := Null.AddValueIn(oe, v1)
+		g0 := ZeroGraph.AddValueIn(oe, v1)
 		g1 := g0.DelValueIn(oe, v1)
-		assert.True(t, Equal(Null, g1))
+		assert.True(t, Equal(ZeroGraph, g1))
 	}
 
 	ej0 := NewValue("ej0")
 	v2 := NewValue("v2")
-	{ // removing only edge (junction)
+	{ // removing only edge (tuple)
-		oe := JunctionOut([]OpenEdge{
+		oe := TupleOut([]OpenEdge{
 			ValueOut(v0, e0),
 			ValueOut(v1, e1),
 		}, ej0)
-		g0 := Null.AddValueIn(oe, v2)
+		g0 := ZeroGraph.AddValueIn(oe, v2)
 		g1 := g0.DelValueIn(oe, v2)
-		assert.True(t, Equal(Null, g1))
+		assert.True(t, Equal(ZeroGraph, g1))
 	}
 
 	{ // removing one of two edges
 		oe := ValueOut(v1, e0)
-		g0 := Null.AddValueIn(ValueOut(v0, e0), v2)
+		g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v2)
 		g1 := g0.AddValueIn(oe, v2)
 		g2 := g1.DelValueIn(oe, v2)
 		assert.True(t, Equal(g0, g2))
@@ -367,14 +367,14 @@ func TestGraphDelValueIn(t *T) {
 	e2 := NewValue("e2")
 	eja, ejb := NewValue("eja"), NewValue("ejb")
 	v3 := NewValue("v3")
-	{ // removing one of two edges (junction)
+	{ // removing one of two edges (tuple)
 		e0 := ValueOut(v0, e0)
 		e1 := ValueOut(v1, e1)
 		e2 := ValueOut(v2, e2)
-		oeA := JunctionOut([]OpenEdge{e0, e1}, eja)
+		oeA := TupleOut([]OpenEdge{e0, e1}, eja)
-		oeB := JunctionOut([]OpenEdge{e1, e2}, ejb)
+		oeB := TupleOut([]OpenEdge{e1, e2}, ejb)
-		g0a := Null.AddValueIn(oeA, v3)
+		g0a := ZeroGraph.AddValueIn(oeA, v3)
-		g0b := Null.AddValueIn(oeB, v3)
+		g0b := ZeroGraph.AddValueIn(oeB, v3)
 		g1 := g0a.Union(g0b).DelValueIn(oeA, v3)
 		assert.True(t, Equal(g1, g0b))
 		assert.Nil(t, g1.ValueVertex(v0))
@@ -386,24 +386,24 @@ func TestGraphDelValueIn(t *T) {
 	{ // removing one of two edges in circular graph
 		e0 := ValueOut(v0, e0)
 		e1 := ValueOut(v1, e1)
-		g0 := Null.AddValueIn(e0, v1).AddValueIn(e1, v0)
+		g0 := ZeroGraph.AddValueIn(e0, v1).AddValueIn(e1, v0)
 		g1 := g0.DelValueIn(e0, v1)
-		assert.True(t, Equal(Null.AddValueIn(e1, v0), g1))
+		assert.True(t, Equal(ZeroGraph.AddValueIn(e1, v0), g1))
 		assert.NotNil(t, g1.ValueVertex(v0))
 		assert.NotNil(t, g1.ValueVertex(v1))
 	}
 
 	ej := NewValue("ej")
 	{ // removing to's only edge, sub-nodes have edge to each other
-		oej := JunctionOut([]OpenEdge{
+		oej := TupleOut([]OpenEdge{
 			ValueOut(v0, ej0),
 			ValueOut(v1, ej0),
 		}, ej)
-		g0 := Null.AddValueIn(oej, v2)
+		g0 := ZeroGraph.AddValueIn(oej, v2)
 		e0 := ValueOut(v0, e0)
 		g1 := g0.AddValueIn(e0, v1)
 		g2 := g1.DelValueIn(oej, v2)
-		assert.True(t, Equal(Null.AddValueIn(e0, v1), g2))
+		assert.True(t, Equal(ZeroGraph.AddValueIn(e0, v1), g2))
 		assert.NotNil(t, g2.ValueVertex(v0))
 		assert.NotNil(t, g2.ValueVertex(v1))
 		assert.Nil(t, g2.ValueVertex(v2))
@@ -481,11 +481,11 @@ func TestGraphUnion(t *T) {
 	v0 := NewValue("v0")
 	v1 := NewValue("v1")
 	e0 := NewValue("e0")
-	{ // Union with Null
+	{ // Union with ZeroGraph
-		assert.True(t, Equal(Null, Null.Union(Null)))
+		assert.True(t, Equal(ZeroGraph, ZeroGraph.Union(ZeroGraph)))
 
-		g := Null.AddValueIn(ValueOut(v0, e0), v1)
+		g := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
-		assert.True(t, Equal(g, assertUnion(g, Null)))
+		assert.True(t, Equal(g, assertUnion(g, ZeroGraph)))
 
 		assertDisjoin(g, g)
 	}
@@ -494,8 +494,8 @@ func TestGraphUnion(t *T) {
 	v3 := NewValue("v3")
 	e1 := NewValue("e1")
 	{ // Two disparate graphs union'd
-		g0 := Null.AddValueIn(ValueOut(v0, e0), v1)
+		g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
-		g1 := Null.AddValueIn(ValueOut(v2, e1), v3)
+		g1 := ZeroGraph.AddValueIn(ValueOut(v2, e1), v3)
 		g := assertUnion(g0, g1)
 		assertVertexEqual(t, value(v0), g.ValueVertex(v0))
 		assertVertexEqual(t, value(v1, edge(e0, value(v0))), g.ValueVertex(v1))
@@ -511,12 +511,12 @@ func TestGraphUnion(t *T) {
 	ea0, eb0 := NewValue("ea0"), NewValue("eb0")
 	ea1, eb1 := NewValue("ea1"), NewValue("eb1")
 	eaj, ebj := NewValue("eaj"), NewValue("ebj")
-	{ // Two disparate graphs with junctions
+	{ // Two disparate graphs with tuples
-		ga := Null.AddValueIn(JunctionOut([]OpenEdge{
+		ga := ZeroGraph.AddValueIn(TupleOut([]OpenEdge{
 			ValueOut(va0, ea0),
 			ValueOut(va1, ea1),
 		}, eaj), va2)
-		gb := Null.AddValueIn(JunctionOut([]OpenEdge{
+		gb := ZeroGraph.AddValueIn(TupleOut([]OpenEdge{
 			ValueOut(vb0, eb0),
 			ValueOut(vb1, eb1),
 		}, ebj), vb2)
@@ -524,7 +524,7 @@ func TestGraphUnion(t *T) {
 		assertVertexEqual(t, value(va0), g.ValueVertex(va0))
 		assertVertexEqual(t, value(va1), g.ValueVertex(va1))
 		assertVertexEqual(t,
-			value(va2, junction(eaj,
+			value(va2, tuple(eaj,
 				edge(ea0, value(va0)),
 				edge(ea1, value(va1)))),
 			g.ValueVertex(va2),
@@ -532,7 +532,7 @@ func TestGraphUnion(t *T) {
 		assertVertexEqual(t, value(vb0), g.ValueVertex(vb0))
 		assertVertexEqual(t, value(vb1), g.ValueVertex(vb1))
 		assertVertexEqual(t,
-			value(vb2, junction(ebj,
+			value(vb2, tuple(ebj,
 				edge(eb0, value(vb0)),
 				edge(eb1, value(vb1)))),
 			g.ValueVertex(vb2),
@@ -542,8 +542,8 @@ func TestGraphUnion(t *T) {
 	}
 
 	{ // Two partially overlapping graphs
-		g0 := Null.AddValueIn(ValueOut(v0, e0), v2)
+		g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v2)
-		g1 := Null.AddValueIn(ValueOut(v1, e1), v2)
+		g1 := ZeroGraph.AddValueIn(ValueOut(v1, e1), v2)
 		g := assertUnion(g0, g1)
 		assertVertexEqual(t, value(v0), g.ValueVertex(v0))
 		assertVertexEqual(t, value(v1), g.ValueVertex(v1))
@@ -560,12 +560,12 @@ func TestGraphUnion(t *T) {
 
 	ej0 := NewValue("ej0")
 	ej1 := NewValue("ej1")
-	{ // two partially overlapping graphs with junctions
+	{ // two partially overlapping graphs with tuples
-		g0 := Null.AddValueIn(JunctionOut([]OpenEdge{
+		g0 := ZeroGraph.AddValueIn(TupleOut([]OpenEdge{
 			ValueOut(v0, e0),
 			ValueOut(v1, e1),
 		}, ej0), v2)
-		g1 := Null.AddValueIn(JunctionOut([]OpenEdge{
+		g1 := ZeroGraph.AddValueIn(TupleOut([]OpenEdge{
 			ValueOut(v0, e0),
 			ValueOut(v1, e1),
 		}, ej1), v2)
@@ -574,8 +574,8 @@ func TestGraphUnion(t *T) {
 		assertVertexEqual(t, value(v1), g.ValueVertex(v1))
 		assertVertexEqual(t,
 			value(v2,
-				junction(ej0, edge(e0, value(v0)), edge(e1, value(v1))),
+				tuple(ej0, edge(e0, value(v0)), edge(e1, value(v1))),
-				junction(ej1, edge(e0, value(v0)), edge(e1, value(v1))),
+				tuple(ej1, edge(e0, value(v0)), edge(e1, value(v1))),
 			),
 			g.ValueVertex(v2),
 		)
@@ -584,7 +584,7 @@ func TestGraphUnion(t *T) {
 	}
 
 	{ // Two equal graphs
-		g0 := Null.AddValueIn(ValueOut(v0, e0), v1)
+		g0 := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
 		g := assertUnion(g0, g0)
 		assertVertexEqual(t, value(v0), g.ValueVertex(v0))
 		assertVertexEqual(t,
@@ -593,8 +593,8 @@ func TestGraphUnion(t *T) {
 		)
 	}
 
-	{ // Two equal graphs with junctions
+	{ // Two equal graphs with tuples
-		g0 := Null.AddValueIn(JunctionOut([]OpenEdge{
+		g0 := ZeroGraph.AddValueIn(TupleOut([]OpenEdge{
 			ValueOut(v0, e0),
 			ValueOut(v1, e1),
 		}, ej0), v2)
@@ -603,7 +603,7 @@ func TestGraphUnion(t *T) {
 		assertVertexEqual(t, value(v1), g.ValueVertex(v1))
 		assertVertexEqual(t,
 			value(v2,
-				junction(ej0, edge(e0, value(v0)), edge(e1, value(v1))),
+				tuple(ej0, edge(e0, value(v0)), edge(e1, value(v1))),
 			),
 			g.ValueVertex(v2),
 		)
@@ -621,7 +621,7 @@ func TestGraphEqual(t *T) {
 		assert.False(t, Equal(g2, g1))
 	}
 
-	assertEqual(Null, Null) // duh
+	assertEqual(ZeroGraph, ZeroGraph) // duh
 
 	v0 := NewValue("v0")
 	v1 := NewValue("v1")
@@ -632,8 +632,8 @@ func TestGraphEqual(t *T) {
 	{
 		// graph is equal to itself, not to null
 		e0 := ValueOut(v0, e0)
-		g0 := Null.AddValueIn(e0, v1)
+		g0 := ZeroGraph.AddValueIn(e0, v1)
-		assertNotEqual(g0, Null)
+		assertNotEqual(g0, ZeroGraph)
 		assertEqual(g0, g0)
 
 		// adding the an existing edge again shouldn't do anything
@@ -646,19 +646,19 @@ func TestGraphEqual(t *T) {
 	}
 
 	{ // equal construction should yield equality, even if out of order
-		ga := Null.AddValueIn(ValueOut(v0, e0), v1)
+		ga := ZeroGraph.AddValueIn(ValueOut(v0, e0), v1)
 		ga = ga.AddValueIn(ValueOut(v1, e1), v2)
-		gb := Null.AddValueIn(ValueOut(v1, e1), v2)
+		gb := ZeroGraph.AddValueIn(ValueOut(v1, e1), v2)
 		gb = gb.AddValueIn(ValueOut(v0, e0), v1)
 		assertEqual(ga, gb)
 	}
 
 	ej := NewValue("ej")
-	{ // junction basic test
+	{ // tuple basic test
 		e0 := ValueOut(v0, e0)
 		e1 := ValueOut(v1, e1)
-		ga := Null.AddValueIn(JunctionOut([]OpenEdge{e0, e1}, ej), v2)
+		ga := ZeroGraph.AddValueIn(TupleOut([]OpenEdge{e0, e1}, ej), v2)
-		gb := Null.AddValueIn(JunctionOut([]OpenEdge{e1, e0}, ej), v2)
+		gb := ZeroGraph.AddValueIn(TupleOut([]OpenEdge{e1, e0}, ej), v2)
 		assertEqual(ga, ga)
 		assertNotEqual(ga, gb)
 	}

gim/main.go

@@ -40,7 +40,7 @@ func mkGraph() (*gg.Graph, gg.Value) {
 	oaE1 := gg.ValueOut(a, aE1)
 	oaE2 := gg.ValueOut(a, aE2)
 	oaE3 := gg.ValueOut(a, aE3)
-	g := gg.Null
+	g := gg.ZeroGraph
 	g = g.AddValueIn(oaE0, b0)
 	g = g.AddValueIn(oaE1, b1)
 	g = g.AddValueIn(oaE2, b2)
@@ -48,7 +48,7 @@ func mkGraph() (*gg.Graph, gg.Value) {
 
 	c := gg.NewValue("c")
 	empty := gg.NewValue("")
-	jE := gg.JunctionOut([]gg.OpenEdge{
+	jE := gg.TupleOut([]gg.OpenEdge{
 		gg.ValueOut(b0, empty),
 		gg.ValueOut(b1, empty),
 		gg.ValueOut(b2, empty),

gim/view/constraint/constraint.go

@@ -27,7 +27,7 @@ type Engine struct {
 
 // NewEngine initializes and returns an empty Engine
 func NewEngine() *Engine {
-	return &Engine{g: gg.Null, vals: map[string]gg.Value{}}
+	return &Engine{g: gg.ZeroGraph, vals: map[string]gg.Value{}}
 }
 
 func (e *Engine) getVal(elem string) gg.Value {

lexer/lexer.go

@@ -112,7 +112,7 @@ func (l *Lexer) emitErr(err error) {
 		Row:       l.absRow,
 		Col:       l.absCol,
 	}
-	if err == io.EOF {
+	if errors.Is(err, io.EOF) {
 		tok.TokenType = EOF
 	}
 	l.emitTok(tok)

sandbox/syntax.txt

@@ -1,15 +1,108 @@
-decr- add- |- in
+# 2021/08/26
-           |- (-1)
+#
+# output of godoc on gg is this:
 
-fib- (
+var ZeroGraph = &Graph{ ... }
-    fibInner- (
+func Equal(g1, g2 *Graph) bool
-        {n, a, b}- in
+type Edge struct{ ... }
-        out- if- |- zero?- n
+type Graph struct{ ... }
-                 |- a
+type OpenEdge struct{ ... }
-                 |- fibInner- |- decr- n
+    func TupleOut(ins []OpenEdge, edgeVal Value) OpenEdge
-                              |- b
+    func ValueOut(val, edgeVal Value) OpenEdge
-                              |- add- {a,b}
+type Value struct{ ... }
+    func NewValue(V interface{}) Value
+type Vertex struct{ ... }
+type VertexType string
+    const ValueVertex VertexType = "value" ...
+
+We just need to formulate a syntax which describes these operations and
+entities.
+
+Based on an old note I found in this file it seems like it reads
+better to actually order everything "backwards" in the syntax, so I'm going to
+go with that. I left the note at the bottom, commented out
+
+-(<openEdge>,...)           TupleOut                 (an openEdge)
+-<edgeVal>-(<openEdge>,...) TupleOut with an edgeVal (an openEdge)
+-<val>                      ValueOut                 (an openEdge)
+-<edgeVal>-<val>            ValueOut with an edgeVal (an openEdge)
+{<val> <openEdge>, ...}     ValueIn                  (a graph)
+
+values can only be alphanumeric, or graphs.
+TODO what to do about negative numbers? -1 is ambiguous
+
+This means the below fibonnaci can be done using:
+
+{
+    decr -{ out -sub-(-in, -1) }
+
+    out -{
+        n -0-in,
+        a -1-in,
+        b -2-in,
+
+        out -if-(
+            -zero?-n,
+            -a,
+            -recur-(
+                -decr-n,
+                -b,
+                -add-(-a,-b)
+            ),
         )
+    }-(-in, -0, -1)
+}
+
+###
+
+Let's try to get rid of all the ugly prefix dashes (and maybe solve the -1
+question). We ditch the dashes all-together; TupleOut with an edgeVal can be
+done by just joining the two, and ValueOut with an edgeVal we can just make look
+like a TupleOut with a single openEdge (which... it kind of is anyway).
+
+(<openEdge>,...)          TupleOut                 (an openEdge)
+<edgeVal>(<openEdge>,...) TupleOut with an edgeVal (an openEdge)
+<val>                     ValueOut                 (an openEdge)
+<edgeVal>(<val>)          ValueOut with an edgeVal (an openEdge)
+{<val> <openEdge>[, ...]} ValueIn                  (a graph)
+
+values can only be alphanumeric, or graphs.
+
+```
+{
+    decr { out add(in, -1) }
+
+    out {
+        n 0(in),
+        a 1(in),
+        b 2(in),
+
+        out if(
+            zero?(n),
+            a,
+            recur(decr(n), b, add(a,b))
         )
 
-out- fib- atoi- first- in
+    }(in, 0, 1)
+}
+```
+
+################
+# The Old Note #
+################
+#
+#decr- add- |- in
+#           |- (-1)
+#
+#fib- (
+#    fibInner- (
+#        {n, a, b}- in
+#        out- if- |- zero?- n
+#                 |- a
+#                 |- fibInner- |- decr- n
+#                              |- b
+#                              |- add- {a,b}
+#    )
+#)
+#
+#out- fib- atoi- first- in