Merge pull request #10 from Sean-Der/global-and-reduce-implementation

Global and reduce implementation

ogórek.go

@@ -399,8 +399,16 @@ func (d *Decoder) loadBinPersid() error {
 	return errNotImplemented
 }
 
+type Call struct {
+	Callable Class
+	Args     []interface{}
+}
+
 func (d *Decoder) reduce() error {
-	return errNotImplemented
+	args := d.pop().([]interface{})
+	class := d.pop().(Class)
+	d.stack = append(d.stack, Call{Callable: class, Args: args})
+	return nil
 }
 
 func decodeStringEscape(b []byte) string {
@@ -527,8 +535,21 @@ func (d *Decoder) build() error {
 	return errNotImplemented
 }
 
+type Class struct {
+	Module, Name string
+}
+
 func (d *Decoder) global() error {
-	return errNotImplemented
+	module, _, err := d.r.ReadLine()
+	if err != nil {
+		return err
+	}
+	name, _, err := d.r.ReadLine()
+	if err != nil {
+		return err
+	}
+	d.stack = append(d.stack, Class{Module: string(module), Name: string(name)})
+	return nil
 }
 
 func (d *Decoder) loadDict() error {

ogórek_test.go

@@ -50,6 +50,7 @@ func TestDecode(t *testing.T) {
 		{"unicode", "V\\u65e5\\u672c\\u8a9e\np0\n.", string("日本語")},
 		{"empty dict", "(dp0\n.", make(map[interface{}]interface{})},
 		{"dict with strings", "(dp0\nS'a'\np1\nS'1'\np2\nsS'b'\np3\nS'2'\np4\ns.", map[interface{}]interface{}{"a": "1", "b": "2"}},
+		{"GLOBAL and REDUCE opcodes", "cfoo\nbar\nS'bing'\n\x85R.", Call{Callable: Class{Module: "foo", Name: "bar"}, Args: []interface{} {"bing"}}},
 		{"graphite message1", string(graphitePickle1), []interface{}{map[interface{}]interface{}{"values": []interface{}{float64(473), float64(497), float64(540), float64(1497), float64(1808), float64(1890), float64(2013), float64(1821), float64(1847), float64(2176), float64(2156), float64(1250), float64(2055), float64(1570), None{}, None{}}, "start": int64(1383782400), "step": int64(86400), "end": int64(1385164800), "name": "ZZZZ.UUUUUUUU.CCCCCCCC.MMMMMMMM.XXXXXXXXX.TTT"}}},
 		{"graphite message2", string(graphitePickle2), []interface{}{map[interface{}]interface{}{"values": []interface{}{float64(473), float64(497), float64(540), float64(1497), float64(1808), float64(1890), float64(2013), float64(1821), float64(1847), float64(2176), float64(2156), float64(1250), float64(2055), float64(1570), None{}, None{}}, "start": int64(1383782400), "step": int64(86400), "end": int64(1385164800), "name": "user.login.area.machine.metric.minute"}}},
 		{"graphite message3", string(graphitePickel3), []interface{}{map[interface{}]interface{}{"intervals": []interface{}{}, "metric_path": "carbon.agents", "isLeaf": false}, map[interface{}]interface{}{"intervals": []interface{}{}, "metric_path": "carbon.aggregator", "isLeaf": false}, map[interface{}]interface{}{"intervals": []interface{}{}, "metric_path": "carbon.relays", "isLeaf": false}}},