Commit b59989db authored by Sean DuBois's avatar Sean DuBois

WIP: Implement opMemoize/opShortBinUnicode/opFrame from 'Protocol 4'

parent 3185aa3b
...@@ -76,6 +76,11 @@ const ( ...@@ -76,6 +76,11 @@ const (
opNewfalse = '\x89' // push False opNewfalse = '\x89' // push False
opLong1 = '\x8a' // push long from < 256 bytes opLong1 = '\x8a' // push long from < 256 bytes
opLong4 = '\x8b' // push really big long opLong4 = '\x8b' // push really big long
// Protocol 4
opShortBinUnicode = '\x8c' // push short string; UTF-8 length < 256 bytes
opMemoize = '\x94' // store top of the stack in memo
opFrame = '\x95' // indicate the beginning of a new frame
) )
var errNotImplemented = errors.New("unimplemented opcode") var errNotImplemented = errors.New("unimplemented opcode")
...@@ -218,6 +223,12 @@ func (d Decoder) Decode() (interface{}, error) { ...@@ -218,6 +223,12 @@ func (d Decoder) Decode() (interface{}, error) {
err = d.loadSetItems() err = d.loadSetItems()
case opBinfloat: case opBinfloat:
err = d.binFloat() err = d.binFloat()
case opFrame:
err = d.loadFrame()
case opShortBinUnicode:
err = d.loadShortBinUnicode()
case opMemoize:
err = d.loadMemoize()
case opProto: case opProto:
v, err := d.r.ReadByte() v, err := d.r.ReadByte()
if err == nil && v != 2 { if err == nil && v != 2 {
...@@ -786,6 +797,35 @@ func (d *Decoder) binFloat() error { ...@@ -786,6 +797,35 @@ func (d *Decoder) binFloat() error {
return nil return nil
} }
func (d *Decoder) loadFrame() error {
var b [8]byte
_, err := io.ReadFull(d.r, b[:])
if err != nil {
return err
}
return nil
}
func (d *Decoder) loadShortBinUnicode() error {
b, err := d.r.ReadByte()
if err != nil {
return err
}
s := make([]byte, b)
_, err = io.ReadFull(d.r, s)
if err != nil {
return err
}
d.push(string(s))
return nil
}
func (d *Decoder) loadMemoize() error {
d.memo[strconv.Itoa(len(d.memo))] = d.stack[len(d.stack)-1]
return nil
}
// decodeLong takes a byte array of 2's compliment little-endian binary words and converts them // decodeLong takes a byte array of 2's compliment little-endian binary words and converts them
// to a big integer // to a big integer
func decodeLong(data string) (*big.Int, error) { func decodeLong(data string) (*big.Int, error) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment