Track how slots merge in serial descriptions

toaq · Jul 19, 2024 · 3dc8115 · 3dc8115
1 parent 0cbab0c
commit 3dc8115
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 33 deletions.
diff --git a/src/syntax/serial.test.ts b/src/syntax/serial.test.ts
@@ -41,9 +41,13 @@ function describe(text: string): [boolean, string] {
 	const description = describeSerial(children);
 	if (!description) return [false, 'bizarre'];
 	const slots = description.slots
-		.map(
-			({ verbIndex, slotIndex }) =>
-				`${children[verbIndex].source}${slotIndex + 1}`,
+		.map(group =>
+			group
+				.map(
+					({ verbIndex, slotIndex }) =>
+						`${children[verbIndex].source}${slotIndex + 1}`,
+				)
+				.join('='),
 		)
 		.join(' ');
 	return [description.didSerialize, slots];
@@ -56,7 +60,8 @@ test('it describes serials', () => {
 	expect(describe('jaq cho')).toEqual([true, 'cho1 cho2']);
 	expect(describe('dua cho')).toEqual([true, 'dua1 cho1 cho2']);
 	expect(describe('rua jaq de')).toEqual([true, 'rua1']);
-	expect(describe('leo baı')).toEqual([true, 'leo1 baı2']);
-	expect(describe('taq cho')).toEqual([true, 'taq1']);
+	expect(describe('leo baı')).toEqual([true, 'leo1=baı1 baı2']);
+	expect(describe('taq cho')).toEqual([true, 'taq1=cho1=cho2']);
 	expect(describe('chı do')).toEqual([true, 'chı1 do1 do2 do3']);
+	expect(describe('nue do')).toEqual([true, 'nue1=do1 nue2 do2 do3']);
 });
diff --git a/src/syntax/serial.ts b/src/syntax/serial.ts
@@ -349,7 +349,7 @@ export interface SerialSlot {
 }
 
 export interface SerialDescription {
-	slots: SerialSlot[];
+	slots: SerialSlot[][];
 	didSerialize: boolean;
 }
 
@@ -360,10 +360,11 @@ export interface SerialDescription {
  *
  *     {
  *       slots: [
- *         { verbIndex: 0, slotIndex: 0 },  // nue's subject
- *         { verbIndex: 0, slotIndex: 1 },  // nue's indirect object
- *         { verbIndex: 1, slotIndex: 1 },  // do's indirect object
- *         { verbIndex: 1, slotIndex: 2 },  // do's direct object
+ *         [ { verbIndex: 0, slotIndex: 0 },    // nue's subject
+ *           { verbIndex: 1, slotIndex: 0 } ],  // = do's subject
+ *         [ { verbIndex: 0, slotIndex: 1 } ],  // nue's indirect object
+ *         [ { verbIndex: 1, slotIndex: 1 } ],  // do's indirect object
+ *         [ { verbIndex: 1, slotIndex: 2 } ],  // do's direct object
  *       ],
  *       didSerialize: true,
  *     }
@@ -379,21 +380,25 @@ export function describeSerial(
 	const frames = children.map(getFrame);
 	if (frames.includes('?')) return undefined;
 	const frame = splitNonEmpty(frames[n - 1], ' ');
-	let slots = frame.map((_, j) => ({ verbIndex: n - 1, slotIndex: j }));
+	let slots = frame.map((_, j) => [{ verbIndex: n - 1, slotIndex: j }]);
 	let didSerialize = false;
 	for (let i = n - 2; i >= 0; i--) {
 		const frame = splitNonEmpty(frames[i], ' ');
 		const last = frame.at(-1)!;
 		if (/c/.test(last)) {
 			// Wipe the whole description, it was just an adjective:
-			slots = frame.map((_, j) => ({ verbIndex: i, slotIndex: j }));
+			slots = frame.map((_, j) => [{ verbIndex: i, slotIndex: j }]);
 		} else {
 			// Introduce some new slots and merge away some old slots:
 			didSerialize = true;
-			slots = [
-				...frame.slice(0, -1).map((_, j) => ({ verbIndex: i, slotIndex: j })),
-				...slots.slice(Number(last[0])),
-			];
+			const newSlots = frame
+				.slice(0, -1)
+				.map((_, j) => [{ verbIndex: i, slotIndex: j }]);
+			for (let x = 1; x < last.length; x++) {
+				if (last[x] === 'i') newSlots[0].push(...slots[x - 1]);
+				if (last[x] === 'j') newSlots[1].push(...slots[x - 1]);
+			}
+			slots = [...newSlots, ...slots.slice(Number(last[0]))];
 		}
 	}
 	return { slots, didSerialize };

diff --git a/src/web/Boxes.css b/src/web/Boxes.css
@@ -4,6 +4,11 @@
 	margin: 2px 2px 0px 2px;
 }
 
+.boxes-col {
+	display: flex;
+	flex-direction: column;
+}
+
 .boxes-children {
 	flex: 1;
 	display: flex;

diff --git a/src/web/Boxes.tsx b/src/web/Boxes.tsx
@@ -159,23 +159,28 @@ function argumentDescriptions(serial: Tree): JSX.Element[] {
 	if (serial && 'children' in serial) {
 		const children = serial.children;
 		const description = describeSerial(children);
-		return (description?.slots ?? []).map(({ verbIndex, slotIndex }, i) => {
-			const verb = children[verbIndex];
-			const frame = getFrame(verb);
-			const arity = splitNonEmpty(frame, ' ').length;
-			const roles =
-				arity === 3
-					? ['Subject', 'Indirect object', 'Direct object']
-					: ['Subject', 'Object'];
-			const key = i;
-			return description?.didSerialize ? (
-				<span key={key}>
-					{roles[slotIndex]} of <b>{verb.source.toLowerCase()}</b>
-				</span>
-			) : (
-				<span key={key}>{roles[slotIndex]}</span>
-			);
-		});
+		return (description?.slots ?? []).map((group, i) => (
+			// biome-ignore lint/suspicious/noArrayIndexKey: order is stable
+			<div className="boxes-col" key={i}>
+				{group.map(({ verbIndex, slotIndex }, j) => {
+					const verb = children[verbIndex];
+					const frame = getFrame(verb);
+					const arity = splitNonEmpty(frame, ' ').length;
+					const roles =
+						arity === 3
+							? ['Subject', 'Indirect object', 'Direct object']
+							: ['Subject', 'Object'];
+					const key = 1000 * i + j;
+					return description?.didSerialize ? (
+						<span key={key}>
+							{roles[slotIndex]} of <b>{verb.source.toLowerCase()}</b>
+						</span>
+					) : (
+						<span key={key}>{roles[slotIndex]}</span>
+					);
+				})}
+			</div>
+		));
 	}
 	return [];
 }