Honor out name for stage out default filename.

Author: adam-azarchs

martian/core/stage.go

@@ -33,12 +33,8 @@ func makeOutArgs(outParams *syntax.OutParams, filesPath string, nullAll bool) ma
 			(syntax.GetEnforcementLevel() == syntax.EnforceError &&
 				param.GetArrayDim() > 0) {
 			args[id] = nil
-		} else if param.IsFile() {
-			if t := param.GetTname(); t == "path" || t == "file" {
-				args[id] = path.Join(filesPath, param.GetId())
-			} else {
-				args[id] = path.Join(filesPath, param.GetId()+"."+param.GetTname())
-			}
+		} else if fn := param.GetOutFilename(); fn != "" {
+			args[id] = path.Join(filesPath, fn)
 		} else {
 			args[id] = nil
 		}
@@ -1101,19 +1097,7 @@ func (self *Fork) postProcess() {
 			}
 
 			// Generate the outs path for this param
-			outPath := ""
-			if len(param.GetOutName()) > 0 {
-				// If MRO explicitly specifies an out name
-				// override, just use that verbatim.
-				outPath = path.Join(outsPath, param.GetOutName())
-			} else {
-				// Otherwise, just use the parameter name, and
-				// append the type unless it is a path.
-				outPath = path.Join(outsPath, id)
-				if param.GetTname() != "path" {
-					outPath += "." + param.GetTname()
-				}
-			}
+			outPath := path.Join(outsPath, param.GetOutFilename())
 
 			// Only continue if path to be copied is inside the pipestance
 			if absFilePath, err := filepath.Abs(filePath); err == nil {

martian/syntax/callable.go

@@ -311,6 +311,20 @@ func (s *OutParam) getSubnodes() []AstNodable {
 	return nil
 }
 
+// Returns the default base filename for this output parameter, or an
+// empty string if the parameter is not a file type.
+func (s *OutParam) GetOutFilename() string {
+	if !s.IsFile() {
+		return ""
+	} else if s.OutName != "" {
+		return s.OutName
+	} else if s.Tname == KindFile || s.Tname == KindPath {
+		return s.Id
+	} else {
+		return s.Id + "." + s.Tname
+	}
+}
+
 func (s *SrcParam) getNode() *AstNode         { return &s.Node }
 func (s *SrcParam) File() *SourceFile         { return s.Node.Loc.File }
 func (s *SrcParam) inheritComments() bool     { return false }

test/files_test/expected/AWESOME/MERGE_JSON/fork0/_outs

@@ -1,3 +1,3 @@
 {
-    "result": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/result.json"
+    "result": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/merged.json"
 }

test/files_test/expected/AWESOME/MERGE_JSON/fork0/chnk0/_outs

@@ -1,3 +1,3 @@
 {
-    "result": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/result.json"
+    "result": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/merged.json"
 }

test/files_test/expected/AWESOME/MERGE_JSON/fork0/files/result.json test/files_test/expected/AWESOME/MERGE_JSON/fork0/files/merged.json

@@ -1,3 +1,3 @@
 {
-    "result": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/result.json"
+    "result": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/merged.json"
 }

test/files_test/expected/AWESOME/MERGE_JSON/fork0/join/_outs

@@ -1,3 +1,3 @@
 {
-    "outfile": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/result.json"
+    "outfile": "/user/test/files_test/pipeline_test/AWESOME/MERGE_JSON/fork0/files/merged.json"
 }

test/files_test/expected/AWESOME/fork0/_outs

@@ -21,7 +21,7 @@ stage ADD_KEY(
 # Takes two files containing json dictionaries and merges them.
 stage MERGE_JSON(
     in  json[] inputs,
-    out json   result,
+    out json   result  "The final merged result."  "merged.json",
     src py     "stages/merge_json",
 ) using (
     mem_gb = 1,