Fix version type string

* Also various small cleanups

tosca/grammars/v1_1/timestamp.go

@@ -177,17 +177,15 @@ func (self *Timestamp) Time() time.Time {
 }
 
 func parseTimestampUint(value string) uint32 {
-	u, err := strconv.ParseUint(value, 10, 32)
-	if err != nil {
-		panic("as long as the regexp does it's job we should never get here")
+	if u, err := strconv.ParseUint(value, 10, 32); err == nil {
+		return uint32(u)
 	}
-	return uint32(u)
+	panic("as long as the regexp does its job we should never get here")
 }
 
 func parseTimestampFloat(value string) float64 {
-	u, err := strconv.ParseFloat(value, 64)
-	if err != nil {
-		panic("as long as the regexp does it's job we should never get here")
+	if u, err := strconv.ParseFloat(value, 64); err == nil {
+		return u
 	}
-	return u
+	panic("as long as the regexp does its job we should never get here")
 }

tosca/grammars/v1_1/version.go

@@ -21,7 +21,7 @@ var VersionRE = regexp.MustCompile(
 //
 
 type Version struct {
-	String_ string `json:"$str" yaml:"$str"`
+	String_ string `json:"$string" yaml:"$string"`
 
 	Major     uint32 `json:"major" yaml:"major"`
 	Minor     uint32 `json:"minor" yaml:"minor"`
@@ -111,9 +111,8 @@ func (self *Version) Compare(data interface{}) (int, error) {
 }
 
 func parseVersionUint(value string) uint32 {
-	u, err := strconv.ParseUint(value, 10, 32)
-	if err != nil {
-		panic("as long as the regexp does it's job we should never get here")
+	if u, err := strconv.ParseUint(value, 10, 32); err == nil {
+		return uint32(u)
 	}
-	return uint32(u)
+	panic("as long as the regexp does its job we should never get here")
 }

tosca/normal/workflow.go

@@ -45,6 +45,8 @@ type WorkflowPrecondition struct {
 // WorkflowStep
 //
 
+// TODO: JSON/YAML marshalling
+
 type WorkflowStep struct {
 	Workflow           *Workflow     `json:"-" yaml:"-"`
 	Name               string        `json:"-" yaml:"-"`