Small changes to fix rectangular slab codegen

block-library/blocks.json

@@ -622,7 +622,7 @@
 		{ "begin":0, "end":0, "cps":[[-0.300,-0.500,0.000],[-0.300,-0.402,0.000],[-0.305,-0.263,-0.093],[-0.271,-0.193,-0.088],[-0.212,-0.070,-0.079],[-0.123,-0.011,-0.047],[0.008,-0.012,0.000],[0.126,-0.013,0.042],[0.224,-0.101,0.096],[0.261,-0.204,0.096],[0.298,-0.309,0.096],[0.300,-0.402,0.000],[0.300,-0.500,0.000]], "oriented": false },
 		{ "begin":2, "end":4, "cps":[[-1.000,-0.222,0.000],[-0.861,-0.222,0.000],[-0.329,-0.222,0.277],[0.000,-0.222,-0.000],[0.329,-0.222,-0.277],[0.861,-0.222,0.000],[1.000,-0.222,0.000]], "oriented": true }
 	],
-	"machine":["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+	"machine":["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 	"human":[]
 },
 {
@@ -650,7 +650,7 @@
 		{ "begin":0, "end":0, "cps":[[-0.300,-0.500,0.000],[-0.300,-0.402,0.000],[-0.305,-0.263,-0.093],[-0.271,-0.193,-0.088],[-0.212,-0.070,-0.079],[-0.123,-0.011,-0.047],[0.008,-0.012,0.000],[0.126,-0.013,0.042],[0.224,-0.101,0.096],[0.261,-0.204,0.096],[0.298,-0.309,0.096],[0.300,-0.402,0.000],[0.300,-0.500,0.000]], "oriented": false },
 		{ "begin":4, "end":2, "cps":[[1.000,-0.222,0.000],[0.861,-0.222,0.000],[0.329,-0.222,-0.277],[0.000,-0.222,-0.000],[-0.329,-0.222,0.277],[-0.861,-0.222,0.000],[-1.000,-0.222,0.000]], "oriented": true }
 	],
-	"machine":["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+	"machine":["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 	"human":[]
 },
 {
@@ -678,7 +678,7 @@
 		{ "begin":0, "end":0, "cps":[[0.300,-0.500,0.000],[0.300,-0.402,0.000],[0.305,-0.263,-0.093],[0.271,-0.193,-0.088],[0.212,-0.070,-0.079],[0.123,-0.011,-0.047],[-0.008,-0.012,0.000],[-0.126,-0.013,0.042],[-0.224,-0.101,0.096],[-0.261,-0.204,0.096],[-0.298,-0.309,0.096],[-0.300,-0.402,0.000],[-0.300,-0.500,0.000]], "oriented": false },
 		{ "begin":2, "end":4, "cps":[[-1.000,-0.222,0.000],[-0.861,-0.222,0.000],[-0.329,-0.222,-0.277],[-0.000,-0.222,-0.000],[0.329,-0.222,0.277],[0.861,-0.222,0.000],[1.000,-0.222,0.000]], "oriented": true }
 	],
-	"machine":["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+	"machine":["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 	"human":[]
 },
 {
@@ -706,7 +706,7 @@
 		{ "begin":0, "end":0, "cps":[[0.300,-0.500,0.000],[0.300,-0.402,0.000],[0.305,-0.263,-0.093],[0.271,-0.193,-0.088],[0.212,-0.070,-0.079],[0.123,-0.011,-0.047],[-0.008,-0.012,0.000],[-0.126,-0.013,0.042],[-0.224,-0.101,0.096],[-0.261,-0.204,0.096],[-0.298,-0.309,0.096],[-0.300,-0.402,0.000],[-0.300,-0.500,0.000]], "oriented": false },
 		{ "begin":4, "end":2, "cps":[[1.000,-0.222,0.000],[0.861,-0.222,0.000],[0.329,-0.222,0.277],[-0.000,-0.222,-0.000],[-0.329,-0.222,-0.277],[-0.861,-0.222,0.000],[-1.000,-0.222,0.000]], "oriented": true }
 	],
-	"machine":["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+	"machine":["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 	"human":[]
 },
 {

block-library/instructions.json

@@ -1,18 +1,18 @@
 {
 	"bind-off-through-down.left": {
-		"machine": ["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+		"machine": ["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 		"human": []
 	},
 	"bind-off-through-down.right": {
-		"machine": ["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+		"machine": ["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 		"human": []
 	},
 	"bind-off-through-up.left.001": {
-		"machine": ["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+		"machine": ["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 		"human": []
 	},
 	"bind-off-through-up.right.001": {
-		"machine": ["roll [HFxy] [HBxy]", "pause Please bind off the final row"],
+		"machine": ["xfer [Nx] [Hxy]", "roll [HFxy] [HBxy]", "pause Please bind off the final row"],
 		"human": []
 	},
 	"cast-on.left": {

code/sk.mjs

@@ -118,20 +118,36 @@ export function noPassGrouping(fragmentList) {
 
 // Take a list of program fragments and group them into passes before emitting the resulting code
 // Consecutive fragments with the same id have their instructions interleaved into unified passes
+// Fragments are in the form { "id": "fragName", "instructions": ["list", "of", "instructions"] }
+// Also does the following:
+//    drops any releases that happen at the beginning of the program (artifacts from cast on row)
+//    drops empty fragments
 export function groupPasses(fragmentList) {
+	// console.log(fragmentList)
+
 	let solidk = "";
 	let iF = 0;
+	let atProgramStart = true;
 	while (iF < fragmentList.length) {
 		let currID = fragmentList[iF]["id"];
+
+		// only perform releases associated with yarn-next-row after program has started making stitches
+		if (atProgramStart && currID.startsWith("yarn-next-row")) {
+			iF++;
+			continue;
+		}
+
 		let passFragments = [];
 		let lookahead = 0;
 		// accumulate all following fragments with the same id
 		while (iF + lookahead < fragmentList.length
-			   && fragmentList[iF + lookahead]["id"] === currID) {
-			passFragments.push(fragmentList[iF + lookahead]["instructions"]);
+			   && (fragmentList[iF + lookahead]["id"] === currID || fragmentList[iF + lookahead]["instructions"].length == 0)) {
+			if (fragmentList[iF + lookahead]["instructions"].length > 0) passFragments.push(fragmentList[iF + lookahead]["instructions"]);
 			lookahead++;
 		}
 
+		// console.log(currID, atProgramStart, passFragments);
+
 		// interleave fragments
 		for (let iI = 0; iI < passFragments[0].length; ++iI) {
 			for (let iF = 0; iF < passFragments.length; ++iF) {
@@ -143,6 +159,11 @@ export function groupPasses(fragmentList) {
 			solidk += "\n";
 		}
 		iF += lookahead;
+		if ( ! (currID.startsWith("pause")
+			    || currID.startsWith("comment")
+			    || currID.startsWith("yarn-in")
+			    || currID.startsWith("cast-on")
+			 ) ) atProgramStart = false;
 	}
 	return solidk;
 }