Refactoring & Enhanced logging

1 files changed, 24 insertions, 26 deletions

diff --git a/adapters/gtest/config.go b/adapters/gtest/config.go
index 6a6c8bf..cb5ba75 100644
--- a/adapters/gtest/config.go
+++ b/adapters/gtest/config.go
@@ -8,23 +8,23 @@ import (
 )
 
 type GtestDefaults struct {
-  Name      *string
-  Suite     *string
-  Testfile  *string
-  Test_root *string
-  Srcs      *[]string
-  Srcs_root *string
+  Name          *string
+  Suite         *string
+  Testfile      *string
+  Test_root     *string
+  Srcs          *[]string
+  Srcs_root     *string
 }
 
 func (child *GtestDefaults) Inherit(p interface{}) {
   parent := p.(*GtestDefaults)
 
-  if(child.Name == nil)      { child.Name = parent.Name }
-  if(child.Suite == nil)     { child.Suite = parent.Suite }
-  if(child.Testfile == nil)  { child.Testfile = parent.Testfile }
-  if(child.Test_root == nil) { child.Test_root = parent.Test_root }
-  if(child.Srcs == nil)      { child.Srcs = parent.Srcs }
-  if(child.Srcs_root == nil) { child.Srcs_root = parent.Srcs_root }
+  if(child.Name == nil)          { child.Name = parent.Name }
+  if(child.Suite == nil)         { child.Suite = parent.Suite }
+  if(child.Testfile == nil)      { child.Testfile = parent.Testfile }
+  if(child.Test_root == nil)     { child.Test_root = parent.Test_root }
+  if(child.Srcs == nil)          { child.Srcs = parent.Srcs }
+  if(child.Srcs_root == nil)     { child.Srcs_root = parent.Srcs_root }
 }
 
 
@@ -73,24 +73,22 @@ func (cfg GtestConfig) srcList() string {
   return srcList
 }
 
-func primitiveDecode(primitive toml.Primitive, config interface{}) {
-  if err := toml.PrimitiveDecode(primitive, config); err != nil {
-    log.Fatal(err)
-  }
-}
-
-func ParseConfig(prim toml.Primitive) planr.InheritableConfig {
+func ParseConfig(prim toml.Primitive) (planr.InheritableConfig, error) {
     config := GtestConfig{}
-
-    primitiveDecode(prim, &config)
-
-    return &config
+  
+    if err := toml.PrimitiveDecode(prim, &config); err != nil {
+      return nil, err
+    }
+    
+    return &config, nil
 }
 
-func ParseDefaultConfig(prim toml.Primitive) planr.InheritableConfig {
+func ParseDefaultConfig(prim toml.Primitive) (planr.InheritableConfig, error) {
     config := GtestDefaults{}
 
-    primitiveDecode(prim, &config)
+    if err := toml.PrimitiveDecode(prim, &config); err != nil {
+      return nil, err
+    }
 
-    return &config
+    return &config, nil
 }