package def

import (
	"bytes"

	"github.com/go-yaml/yaml"
	"github.com/ugorji/go/codec"

	"polydawn.net/repeatr/lib/cereal"
)

var codecBounceHandler = &codec.CborHandle{}

func ParseYaml(ser []byte) *Formula {
	// Turn tabs into spaces so that tabs are acceptable inputs.
	ser = cereal.Tab2space(ser)
	// Bounce the serial form into another temporary intermediate form.
	// Yes.  Feel the sadness in your soul.
	// This lets us feed a byte area to ugorji codec that it understands,
	//  because it doesn't have any mechanisms to accept in-memory structs.
	var raw interface{}
	if err := yaml.Unmarshal(ser, &raw); err != nil {
		panic(ConfigError.New("Could not parse formula: %s", err))
	}
	var buf bytes.Buffer
	if err := codec.NewEncoder(&buf, codecBounceHandler).Encode(raw); err != nil {
		panic(ConfigError.New("Could not parse formula: %s", err))
	}
	// Actually decode with the smart codecs.
	var frm Formula
	if err := codec.NewDecoder(&buf, codecBounceHandler).Decode(&frm); err != nil {
		panic(ConfigError.New("Could not parse formula: %s", err))
	}
	return &frm
}

package def

import (
	"bytes"

	"github.com/go-yaml/yaml"
	"github.com/ugorji/go/codec"

	"polydawn.net/repeatr/lib/cereal"
)

var codecBounceHandler = &codec.CborHandle{}

func ParseYaml(ser []byte) *Formula {
	// Turn tabs into spaces so that tabs are acceptable inputs.
	ser = cereal.Tab2space(ser)
	// Bounce the serial form into another temporary intermediate form.
	// Yes.  Feel the sadness in your soul.
	// This lets us feed a byte area to ugorji codec that it understands,
	//  because it doesn't have any mechanisms to accept in-memory structs.
	var raw interface{}
	if err := yaml.Unmarshal(ser, &raw); err != nil {
		panic(ConfigError.New("Could not parse formula: %s", err))
	}
	var buf bytes.Buffer
	if err := codec.NewEncoder(&buf, codecBounceHandler).Encode(raw); err != nil {
		panic(ConfigError.New("Could not parse formula (stg2): %s", err))
	}
	// Actually decode with the smart codecs.
	var frm Formula
	if err := codec.NewDecoder(&buf, codecBounceHandler).Decode(&frm); err != nil {
		// one would really hope this is impossible...
		panic(ConfigError.New("Could not parse formula (stg3): %s", err))
	}
	return &frm
}

--- 
+++ 
@@ -24,13 +24,12 @@
 	}
 	var buf bytes.Buffer
 	if err := codec.NewEncoder(&buf, codecBounceHandler).Encode(raw); err != nil {
-		panic(ConfigError.New("Could not parse formula (stg2): %s", err))
+		panic(ConfigError.New("Could not parse formula: %s", err))
 	}
 	// Actually decode with the smart codecs.
 	var frm Formula
 	if err := codec.NewDecoder(&buf, codecBounceHandler).Decode(&frm); err != nil {
-		// one would really hope this is impossible...
-		panic(ConfigError.New("Could not parse formula (stg3): %s", err))
+		panic(ConfigError.New("Could not parse formula: %s", err))
 	}
 	return &frm
 }
Drop mention of what phase of parsing errored.

These are... implementation details that are not at all meaningful to an end-user.  And also still quite distinguishable if you really care enough to ask for full stacks by setting the DEBUG var.

Signed-off-by: Eric Myhre <2346ad27d7568ba9896f1b7da6b5991251debdf2@exultant.us>
