Merge pull request ActiveState#3659 from ActiveState/mitchell/dx-3230

Allow buildscript functions without arguments.

Author: mitchell-as

pkg/buildscript/marshal.go

@@ -136,11 +136,13 @@ func funcCallString(f *funcCall) string {
 	}
 
 	buf := bytes.Buffer{}
-	buf.WriteString(fmt.Sprintf("%s(%s", f.Name, newline))
-
-	buf.WriteString(argsToString(f.Arguments, newline, comma, indent))
-
-	buf.WriteString(")")
+	if len(f.Arguments) > 0 {
+		buf.WriteString(fmt.Sprintf("%s(%s", f.Name, newline))
+		buf.WriteString(argsToString(f.Arguments, newline, comma, indent))
+		buf.WriteString(")")
+	} else {
+		buf.WriteString(fmt.Sprintf("%s()", f.Name))
+	}
 	return buf.String()
 }
 

pkg/buildscript/raw.go

@@ -71,5 +71,5 @@ type null struct {
 
 type funcCall struct {
 	Name      string   `parser:"@Ident"`
-	Arguments []*value `parser:"'(' @@ (',' @@)* ','? ')'"`
+	Arguments []*value `parser:"'(' (@@ (',' @@)* ','?)? ')'"`
 }

test/integration/buildscript_int_test.go

@@ -168,9 +168,8 @@ func (suite *BuildScriptIntegrationTestSuite) TestBuildScriptRequirementVersionA
 	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
 	cp.ExpectExitCode(0)
 
-	// Enable as part of DX-3230.
-	//cp = ts.Spawn("config", "set", constants.OptinBuildscriptsConfig, "true")
-	//cp.ExpectExitCode(0)
+	cp = ts.Spawn("config", "set", constants.OptinBuildscriptsConfig, "true")
+	cp.ExpectExitCode(0)
 
 	// This project's build expression has a requirement whose version is the "Any()" function.
 	// Make sure we can successfully checkout and modify this project.