Do away with the "nextID" attribute

Instead of being an increment over "end" that is carried along on NFA
transformation, now the id is computed directly as an increment on
"end".  During this refactor, I even saw that "end" and "nextID" of
`concat()` are computed differently, despite arriving at the same
result: "end" is rhs.end, while "nextID" is the max of the nextID from
lhs and rhs.

1 files changed, 4 insertions, 32 deletions

diff --git a/tests/paca.mjs b/tests/paca.mjs
index 82640b1..36ab2a7 100644
--- a/tests/paca.mjs
+++ b/tests/paca.mjs
@@ -1765,7 +1765,6 @@ const test_emptyNFA = t => {
 		const expected = {
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes: {
 				1: {
 					direct: [ 2 ],
@@ -1788,7 +1787,6 @@ const test_literal = t => {
 		const expected = {
 			start:  123,
 			end:    124,
-			nextID: 125,
 			nodes:  {
 				123: {
 					direct:      [],
@@ -1809,12 +1807,11 @@ const test_concat = t => {
 
 	t.testing("on literal() and on more complex NFAs", () => {
 		const a  = literal("a", 1);
-		const b  = literal("b", a.nextID);
-		const a_ = literal("a", b.nextID);
+		const b  = literal("b", a.end + 1);
+		const a_ = literal("a", b.end + 1);
 		const expected1 = {
 			start:  1,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				1: {
 					direct:      [],
@@ -1839,7 +1836,6 @@ const test_concat = t => {
 		const expected2 = {
 			start:  1,
 			end:    6,
-			nextID: 7,
 			nodes: {
 				1: {
 					direct:      [],
@@ -1876,11 +1872,10 @@ const test_union = t => {
 
 	t.testing("on literal() and on more complex NFAs", () => {
 		const a = literal("a", 1);
-		const b = literal("b", a.nextID);
+		const b = literal("b", a.end + 1);
 		const expected1 = {
 			start:  5,
 			end:    6,
-			nextID: 7,
 			nodes: {
 				1: {
 					direct:      [],
@@ -1910,11 +1905,10 @@ const test_union = t => {
 		};
 		t.assertEq(union(a, b), expected1);
 
-		const c = literal("c", expected1.nextID);
+		const c = literal("c", expected1.end + 1);
 		const expected2 = {
 			start:  9,
 			end:    10,
-			nextID: 11,
 			nodes: {
 				1: {
 					direct:      [],
@@ -1970,7 +1964,6 @@ const test_zeroOrMore = t => {
 		const expected = {
 			start:  3,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				1: {
 					direct:      [],
@@ -2002,7 +1995,6 @@ const test_oneOrMore = t => {
 		const expected = {
 			start:  1,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				1: {
 					direct:      [],
@@ -2034,7 +2026,6 @@ const test_zeroOrOne = t => {
 		const expected = {
 			start:  3,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				1: {
 					direct:      [],
@@ -2161,7 +2152,6 @@ const test_characterClass = t => {
 		const expected = {
 			start:  3,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				3: {
 					direct:      [],
@@ -2198,7 +2188,6 @@ const test_characterClass = t => {
 		const expected = {
 			start:  7,
 			end:    8,
-			nextID: 9,
 			nodes: {
 				7: {
 					direct:      [],
@@ -2233,7 +2222,6 @@ const test_characterClass = t => {
 		const expected = {
 			start:  3,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				3: {
 					direct:      [],
@@ -2274,7 +2262,6 @@ const test_wildcard = t => {
 		const expected = {
 			start:  5,
 			end:    6,
-			nextID: 7,
 			nodes: {
 				5: {
 					direct:      [],
@@ -2361,7 +2348,6 @@ const test_baseNFA = t => {
 		const expected1 = {
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes:  {
 				1: {
 					direct:      [],
@@ -2376,7 +2362,6 @@ const test_baseNFA = t => {
 		const expected2 = {
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes:  {
 				1: {
 					direct:      [],
@@ -2404,7 +2389,6 @@ const test_buildNFAStep = t => {
 		const expected = [{
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes: {
 				1: {
 					direct:      [],
@@ -2425,7 +2409,6 @@ const test_buildNFAStep = t => {
 		const expected = [{
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes: {
 				1: {
 					direct:      [],
@@ -2439,7 +2422,6 @@ const test_buildNFAStep = t => {
 		}, {
 			start:  3,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				3: {
 					direct:      [],
@@ -2463,7 +2445,6 @@ const test_buildNFAStep = t => {
 		const expected = [{
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes: {
 				1: {
 					direct:      [],
@@ -2477,7 +2458,6 @@ const test_buildNFAStep = t => {
 		}, {
 			start:  3,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				3: {
 					direct:      [],
@@ -2504,7 +2484,6 @@ const test_buildNFAStep = t => {
 		const expected = [{
 			start:  1,
 			end:    4,
-			nextID: 5,
 			nodes: {
 				1: {
 					direct:      [],
@@ -2538,7 +2517,6 @@ const test_buildNFA = t => {
 		const expected = {
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes: {
 				1: {
 					direct:      [ 2 ],
@@ -2558,7 +2536,6 @@ const test_buildNFA = t => {
 		const expected = {
 			start:  7,
 			end:    14,
-			nextID: 15,
 			nodes: {
 				1: {
 					direct:      [],
@@ -3092,7 +3069,6 @@ const test_buildDFA = t => {
 		const nfa = {
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes:  {
 				1: {
 					direct:      [ 2 ],
@@ -3120,7 +3096,6 @@ const test_buildDFA = t => {
 		const nfa = {
 			start:  7,
 			end:    10,
-			nextID: 11,
 			nodes:  {
 				1: {
 					direct:      [],
@@ -3275,7 +3250,6 @@ const test_compileNFA = t => {
 		const expected = {
 			start:  1,
 			end:    2,
-			nextID: 3,
 			nodes: {
 				1: {
 					direct:      [ 2 ],
@@ -3295,7 +3269,6 @@ const test_compileNFA = t => {
 		const expected1 = {
 			start:  7,
 			end:    10,
-			nextID: 11,
 			nodes: {
 				1: {
 					direct:      [],
@@ -3343,7 +3316,6 @@ const test_compileNFA = t => {
 		const expected2 = {
 			start:  15,
 			end:    18,
-			nextID: 19,
 			nodes: {
 				1: {
 					direct:      [],