Support for negative values in noise generators (#35)

Author: localhots

datamodel/noise/parser.go

@@ -26,8 +26,8 @@ const (
 )
 
 var (
-	genReg  = regexp.MustCompile(`(?P<func_name>\w+)\((?P<args>(?:\w+=[0-9\.]+,?\s*)*)\)\s+as\s+(?P<type_name>[\w:]+)`)
-	argsReg = regexp.MustCompile(`(\w+)=([0-9\.]+)`)
+	genReg  = regexp.MustCompile(`(?P<func_name>\w+)\((?P<args>(?:\w+=-?[0-9\.]+,?\s*)*)\)\s+as\s+(?P<type_name>[\w:]+)`)
+	argsReg = regexp.MustCompile(`(\w+)=(-?[0-9\.]+)`)
 )
 
 // ParseDef parses generator function definitions from a string format.

datamodel/noise/parser_test.go

@@ -49,6 +49,15 @@ func TestParseDef(t *testing.T) {
 			},
 			err: "",
 		},
+		{
+			in: "foo(a=-1) as int",
+			exp: &Func{
+				Name: "foo",
+				Args: map[string]float64{"a": -1},
+				Type: "int",
+			},
+			err: "",
+		},
 		{
 			in:  "foo(a=bar) as int",
 			exp: nil,