Apply join prefixes/rename to unpaired records (#1821) (#2062)

The --lp/--rp prefixes and -j output-field rename were applied only to
paired records, leaving unpaired records emitted via --ul/--ur with their
original (left/right) field names. This broke downstream operations like
unsparsify that expected consistent column names across paired and
unpaired output.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs/src/reference-verbs.md

@@ -1702,9 +1702,9 @@ Options:
                Tip: you can use --lk "": this means the left file becomes solely a row-selector
                for the input files.
   --lp {text}  Additional prefix for non-join output field names from
-               the left file
+               the left file. Applies to paired and unpaired output records.
   --rp {text}  Additional prefix for non-join output field names from
-               the right file(s)
+               the right file(s). Applies to paired and unpaired output records.
   --np         Do not emit paired records
   --ul         Emit unpaired records from the left file
   --ur         Emit unpaired records from the right file(s)

pkg/transformers/join.go

@@ -91,9 +91,9 @@ func transformerJoinUsage(
 	fmt.Fprintf(o, "               Tip: you can use --lk \"\": this means the left file becomes solely a row-selector\n")
 	fmt.Fprintf(o, "               for the input files.\n")
 	fmt.Fprintf(o, "  --lp {text}  Additional prefix for non-join output field names from\n")
-	fmt.Fprintf(o, "               the left file\n")
+	fmt.Fprintf(o, "               the left file. Applies to paired and unpaired output records.\n")
 	fmt.Fprintf(o, "  --rp {text}  Additional prefix for non-join output field names from\n")
-	fmt.Fprintf(o, "               the right file(s)\n")
+	fmt.Fprintf(o, "               the right file(s). Applies to paired and unpaired output records.\n")
 	fmt.Fprintf(o, "  --np         Do not emit paired records\n")
 	fmt.Fprintf(o, "  --ul         Emit unpaired records from the left file\n")
 	fmt.Fprintf(o, "  --ur         Emit unpaired records from the right file(s)\n")
@@ -401,7 +401,8 @@ func (tr *TransformerJoin) transformHalfStreaming(
 			leftBucket := tr.leftBucketsByJoinFieldValues.Get(groupingKey)
 			if leftBucket == nil {
 				if tr.opts.emitRightUnpairables {
-					*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
+					*outputRecordsAndContexts = append(*outputRecordsAndContexts,
+						tr.transformRightUnpairedRecord(inrecAndContext))
 				}
 			} else {
 				leftBucket.WasPaired = true
@@ -414,7 +415,8 @@ func (tr *TransformerJoin) transformHalfStreaming(
 				}
 			}
 		} else if tr.opts.emitRightUnpairables {
-			*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
+			*outputRecordsAndContexts = append(*outputRecordsAndContexts,
+				tr.transformRightUnpairedRecord(inrecAndContext))
 		}
 
 	} else { // end of record stream
@@ -445,7 +447,7 @@ func (tr *TransformerJoin) transformDoublyStreaming(
 			isPaired = keeper.FindJoinBucket(rightFieldValues)
 		}
 		if tr.opts.emitLeftUnpairables {
-			keeper.OutputAndReleaseLeftUnpaireds(outputRecordsAndContexts)
+			tr.outputLeftUnpaireds(keeper, outputRecordsAndContexts)
 		} else {
 			keeper.ReleaseLeftUnpaireds(outputRecordsAndContexts)
 		}
@@ -453,7 +455,8 @@ func (tr *TransformerJoin) transformDoublyStreaming(
 		lefts := keeper.JoinBucket.RecordsAndContexts // keystroke-saver
 
 		if !isPaired && tr.opts.emitRightUnpairables {
-			*outputRecordsAndContexts = append(*outputRecordsAndContexts, rightRecAndContext)
+			*outputRecordsAndContexts = append(*outputRecordsAndContexts,
+				tr.transformRightUnpairedRecord(rightRecAndContext))
 		}
 
 		if isPaired && tr.opts.emitPairables && lefts != nil {
@@ -464,13 +467,24 @@ func (tr *TransformerJoin) transformDoublyStreaming(
 		keeper.FindJoinBucket(nil)
 
 		if tr.opts.emitLeftUnpairables {
-			keeper.OutputAndReleaseLeftUnpaireds(outputRecordsAndContexts)
+			tr.outputLeftUnpaireds(keeper, outputRecordsAndContexts)
 		}
 
 		*outputRecordsAndContexts = append(*outputRecordsAndContexts, rightRecAndContext) // emit end-of-stream marker
 	}
 }
 
+func (tr *TransformerJoin) outputLeftUnpaireds(
+	keeper *utils.JoinBucketKeeper,
+	outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
+) {
+	startIdx := len(*outputRecordsAndContexts)
+	keeper.OutputAndReleaseLeftUnpaireds(outputRecordsAndContexts)
+	for i := startIdx; i < len(*outputRecordsAndContexts); i++ {
+		(*outputRecordsAndContexts)[i] = tr.transformLeftUnpairedRecord((*outputRecordsAndContexts)[i])
+	}
+}
+
 // This is for the half-streaming case. We ingest the entire left file,
 // matching each right record against those.
 //
@@ -625,7 +639,10 @@ func (tr *TransformerJoin) formAndEmitPairs(
 func (tr *TransformerJoin) emitLeftUnpairables(
 	outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
 ) {
-	*outputRecordsAndContexts = append(*outputRecordsAndContexts, tr.leftUnpairableRecordsAndContexts...)
+	for _, recordAndContext := range tr.leftUnpairableRecordsAndContexts {
+		*outputRecordsAndContexts = append(*outputRecordsAndContexts,
+			tr.transformLeftUnpairedRecord(recordAndContext))
+	}
 }
 
 func (tr *TransformerJoin) emitLeftUnpairedBuckets(
@@ -634,7 +651,70 @@ func (tr *TransformerJoin) emitLeftUnpairedBuckets(
 	for pe := tr.leftBucketsByJoinFieldValues.Head; pe != nil; pe = pe.Next {
 		bucket := pe.Value
 		if !bucket.WasPaired {
-			*outputRecordsAndContexts = append(*outputRecordsAndContexts, bucket.RecordsAndContexts...)
+			for _, recordAndContext := range bucket.RecordsAndContexts {
+				*outputRecordsAndContexts = append(*outputRecordsAndContexts,
+					tr.transformLeftUnpairedRecord(recordAndContext))
+			}
 		}
 	}
 }
+
+// transformLeftUnpairedRecord and transformRightUnpairedRecord rename the
+// join-field names to the output-join-field names and apply the side's prefix
+// to all non-join field names. This keeps unpaired-record column names
+// consistent with those produced by paired joins, so downstream operations
+// like `unsparsify` align columns across paired and unpaired output.
+func (tr *TransformerJoin) transformLeftUnpairedRecord(
+	inrecAndContext *types.RecordAndContext,
+) *types.RecordAndContext {
+	return tr.transformUnpairedRecord(
+		inrecAndContext, tr.opts.leftJoinFieldNames, tr.opts.leftPrefix,
+	)
+}
+
+func (tr *TransformerJoin) transformRightUnpairedRecord(
+	inrecAndContext *types.RecordAndContext,
+) *types.RecordAndContext {
+	return tr.transformUnpairedRecord(
+		inrecAndContext, tr.opts.rightJoinFieldNames, tr.opts.rightPrefix,
+	)
+}
+
+func (tr *TransformerJoin) transformUnpairedRecord(
+	inrecAndContext *types.RecordAndContext,
+	joinFieldNames []string,
+	prefix string,
+) *types.RecordAndContext {
+	inrec := inrecAndContext.Record
+	if inrec == nil {
+		return inrecAndContext
+	}
+
+	needsRename := false
+	for i, name := range joinFieldNames {
+		if name != tr.opts.outputJoinFieldNames[i] {
+			needsRename = true
+			break
+		}
+	}
+	if !needsRename && prefix == "" {
+		return inrecAndContext
+	}
+
+	renameMap := make(map[string]string, len(joinFieldNames))
+	for i, name := range joinFieldNames {
+		renameMap[name] = tr.opts.outputJoinFieldNames[i]
+	}
+
+	outrec := mlrval.NewMlrmapAsRecord()
+	for pe := inrec.Head; pe != nil; pe = pe.Next {
+		if outName, ok := renameMap[pe.Key]; ok {
+			outrec.PutCopy(outName, pe.Value)
+		} else {
+			outrec.PutCopy(prefix+pe.Key, pe.Value)
+		}
+	}
+
+	context := inrecAndContext.Context // struct copy
+	return types.NewRecordAndContext(outrec, &context)
+}

test/cases/cli-help/0001/expout

@@ -478,9 +478,9 @@ Options:
                Tip: you can use --lk "": this means the left file becomes solely a row-selector
                for the input files.
   --lp {text}  Additional prefix for non-join output field names from
-               the left file
+               the left file. Applies to paired and unpaired output records.
   --rp {text}  Additional prefix for non-join output field names from
-               the right file(s)
+               the right file(s). Applies to paired and unpaired output records.
   --np         Do not emit paired records
   --ul         Emit unpaired records from the left file
   --ur         Emit unpaired records from the right file(s)

test/cases/verb-join/0003/expout

@@ -13,5 +13,5 @@ o x y
 3 e y
 3 f y
 
-l x
+o x
 4 g

test/cases/verb-join/0004/expout

@@ -13,5 +13,5 @@ o x y
 3 e y
 3 f y
 
-l x
+o x
 4 g

test/cases/verb-join/0005/expout

@@ -13,5 +13,5 @@ o x y
 3 e y
 3 f y
 
-r y
+o y
 5 z

test/cases/verb-join/0006/expout

@@ -13,5 +13,5 @@ o x y
 3 e y
 3 f y
 
-r y
+o y
 5 z

test/cases/verb-join/0007/expout

@@ -13,8 +13,8 @@ o x y
 3 e y
 3 f y
 
-l x
+o x
 4 g
 
-r y
+o y
 5 z

test/cases/verb-join/0008/expout

@@ -13,8 +13,8 @@ o x y
 3 e y
 3 f y
 
-r y
+o y
 5 z
 
-l x
+o x
 4 g

test/cases/verb-join/0009/expout

@@ -1,2 +1,2 @@
-l x
+o x
 4 g

test/cases/verb-join/0010/expout

@@ -1,2 +1,2 @@
-l x
+o x
 4 g

test/cases/verb-join/0011/expout

@@ -1,2 +1,2 @@
-r y
+o y
 5 z

test/cases/verb-join/0012/expout

@@ -1,2 +1,2 @@
-r y
+o y
 5 z

test/cases/verb-join/0013/expout

@@ -1,5 +1,5 @@
-l x
+o x
 4 g
 
-r y
+o y
 5 z

test/cases/verb-join/0014/expout

@@ -1,5 +1,5 @@
-r y
+o y
 5 z
 
-l x
+o x
 4 g

test/cases/verb-join/0022/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0023/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0024/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0025/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0028/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0029/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0030/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0031/expout

@@ -1,4 +1,4 @@
-r y
+o y
 1 s
 2 t
 2 v

test/cases/verb-join/0034/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0035/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0038/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0039/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0040/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0041/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0044/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0045/expout

@@ -1,4 +1,4 @@
-l x
+o x
 1 a
 2 b
 2 c

test/cases/verb-join/0078/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0079/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0080/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
 x=300,b=16
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0081/expout

@@ -1,6 +1,6 @@
 x=100,b=10
 x=200,b=13
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0082/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18

test/cases/verb-join/0083/expout

@@ -1,6 +1,6 @@
 x=100,b=10
 x=200,b=13
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19

test/cases/verb-join/0084/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0085/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0086/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0087/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0088/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=400,b=19
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18

test/cases/verb-join/0089/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=400,b=19

test/cases/verb-join/0090/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0091/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0092/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0093/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
 x=400,b=19
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18

test/cases/verb-join/0094/expout

@@ -1,6 +1,6 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
 x=400,b=19

test/cases/verb-join/0095/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0096/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18

test/cases/verb-join/0097/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18

test/cases/verb-join/0098/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19

test/cases/verb-join/0099/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18

test/cases/verb-join/0100/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19

test/cases/verb-join/0101/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19

test/cases/verb-join/0102/expout

@@ -1,8 +1,8 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
 x=400,b=19

test/cases/verb-join/0103/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0104/expout

@@ -1,10 +1,10 @@
 x=100,b=10
 x=200,b=13
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=300,b=16
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=400,b=19

test/cases/verb-join/0107/expout

@@ -1,4 +1,4 @@
 y=111
 y=222
-r=2
+j=2
 y=333

test/cases/verb-join/0109/expout

@@ -1,4 +1,4 @@
 y=111
 y=222
-r=4
+j=4
 y=333

test/cases/verb-join/0111/expout

@@ -1,4 +1,4 @@
 y=111
 y=222
-r=6
+j=6
 y=333

test/cases/verb-join/0112/expout

@@ -1,3 +1,3 @@
 y=111
-r=2
+j=2
 y=333

test/cases/verb-join/0113/expout

@@ -1,5 +1,5 @@
 y=111
-r=2
+j=2
 y=222
-r=2
+j=2
 y=333

test/cases/verb-join/0114/expout

@@ -1,4 +1,4 @@
 y=111
-r=2
+j=2
 y=222
 y=333

test/cases/verb-join/0115/expout

@@ -1,5 +1,5 @@
 y=111
-r=2
+j=2
 y=222
-r=4
+j=4
 y=333

test/cases/verb-join/0116/expout

@@ -1,4 +1,4 @@
 y=111
-r=2
+j=2
 y=222
 y=333

test/cases/verb-join/0117/expout

@@ -1,5 +1,5 @@
 y=111
-r=2
+j=2
 y=222
-r=6
+j=6
 y=333

test/cases/verb-join/0120/expout

@@ -1,4 +1,4 @@
 y=111
 y=222
-r=4
+j=4
 y=333

test/cases/verb-join/0122/expout

@@ -1,4 +1,4 @@
 y=111
 y=222
-r=6
+j=6
 y=333

test/cases/verb-join/0123/expout

@@ -1,3 +1,3 @@
 y=111
-r=4
+j=4
 y=333

test/cases/verb-join/0124/expout

@@ -1,5 +1,5 @@
 y=111
-r=4
+j=4
 y=222
-r=4
+j=4
 y=333

test/cases/verb-join/0125/expout

@@ -1,4 +1,4 @@
 y=111
-r=4
+j=4
 y=222
 y=333

test/cases/verb-join/0126/expout

@@ -1,5 +1,5 @@
 y=111
-r=4
+j=4
 y=222
-r=6
+j=6
 y=333

test/cases/verb-join/0129/expout

@@ -1,4 +1,4 @@
 y=111
 y=222
-r=6
+j=6
 y=333

test/cases/verb-join/0130/expout

@@ -1,3 +1,3 @@
 y=111
-r=6
+j=6
 y=333

test/cases/verb-join/0131/expout

@@ -1,5 +1,5 @@
 y=111
-r=6
+j=6
 y=222
-r=6
+j=6
 y=333

test/cases/verb-join/0159/expout

@@ -1,7 +1,7 @@
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0160/expout

@@ -1,7 +1,7 @@
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0161/expout

@@ -1,7 +1,7 @@
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0162/expout

@@ -1,5 +1,5 @@
-l=5,b=17
-l=5,b=18
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0163/expout

@@ -1,7 +1,7 @@
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0164/expout

@@ -1,5 +1,5 @@
-l=3,b=14
-l=3,b=15
+j=3,b=14
+j=3,b=15
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0165/expout

@@ -1,7 +1,7 @@
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0166/expout

@@ -1,9 +1,9 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0167/expout

@@ -1,9 +1,9 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0168/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0169/expout

@@ -1,9 +1,9 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0170/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0171/expout

@@ -1,9 +1,9 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0172/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0173/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0174/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0175/expout

@@ -1,5 +1,5 @@
-l=1,b=11
-l=1,b=12
+j=1,b=11
+j=1,b=12
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0176/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0177/expout

@@ -1,9 +1,9 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0178/expout

@@ -1,9 +1,9 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0179/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0180/expout

@@ -1,9 +1,9 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
-l=5,b=17
-l=5,b=18
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
+j=5,b=17
+j=5,b=18
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0181/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=100,b=10
 x=200,b=13
 x=300,b=16

test/cases/verb-join/0182/expout

@@ -1,7 +1,7 @@
-l=1,b=11
-l=1,b=12
-l=3,b=14
-l=3,b=15
+j=1,b=11
+j=1,b=12
+j=3,b=14
+j=3,b=15
 x=100,b=10
 x=200,b=13
 x=300,b=16