objects: chan/map plain coding

go-air · Aug 22, 2021 · 7905e91 · 7905e91
1 parent 85e87c2
commit 7905e91
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/objects/chan.go b/objects/chan.go
@@ -17,6 +17,7 @@ package objects
 import (
 	"io"
 
+	"github.com/go-air/pal/internal/plain"
 	"github.com/go-air/pal/memory"
 )
 
@@ -40,6 +41,10 @@ func (c *Chan) Send(src memory.Loc, mm *memory.Model) {
 
 func (c *Chan) PlainEncode(w io.Writer) error {
 	var err error
+	err = plain.Put(w, "c")
+	if err != nil {
+		return err
+	}
 	if err = c.object.plainEncode(w); err != nil {
 		return err
 	}
@@ -48,6 +53,10 @@ func (c *Chan) PlainEncode(w io.Writer) error {
 
 func (c *Chan) PlainDecode(r io.Reader) error {
 	var err error
+	err = plain.Expect(r, "c")
+	if err != nil {
+		return err
+	}
 	p := &c.object
 	if err = p.plainDecode(r); err != nil {
 		return err

diff --git a/objects/map.go b/objects/map.go
@@ -17,6 +17,7 @@ package objects
 import (
 	"io"
 
+	"github.com/go-air/pal/internal/plain"
 	"github.com/go-air/pal/memory"
 )
 
@@ -45,9 +46,28 @@ func (m *Map) Lookup(dst memory.Loc, mm *memory.Model) {
 }
 
 func (m *Map) PlainEncode(w io.Writer) error {
-	return nil
+	var err error
+	err = plain.Put(w, "m")
+	if err != nil {
+		return err
+	}
+	err = m.object.plainEncode(w)
+	if err != nil {
+		return err
+	}
+	return plain.EncodeJoin(w, " ", m.key, m.elem)
 }
 
 func (m *Map) PlainDecode(r io.Reader) error {
-	return nil
+	var err error
+	err = plain.Expect(r, "m")
+	if err != nil {
+		return err
+	}
+	pobj := &m.object
+	err = pobj.plainDecode(r)
+	if err != nil {
+		return err
+	}
+	return plain.DecodeJoin(r, " ", &m.key, &m.elem)
 }