@futpib/parser 1.0.3 → 1.0.6

package/src/separatedArrayParser.ts

@@ -21,7 +21,7 @@ export const createSeparatedArrayParser = <ElementOutput, Sequence>(
 		const elements: ElementOutput[] = [];
 
 		while (true) {
-			const elementParserContext = parserContext.lookahead();
+			using elementParserContext = parserContext.lookahead();
 			const initialPosition = elementParserContext.position;
 
 			try {
@@ -39,8 +39,6 @@ export const createSeparatedArrayParser = <ElementOutput, Sequence>(
 				}
 
 				throw error;
-			} finally {
-				elementParserContext.dispose();
 			}
 
 			parser = separatorThenElementParser;

package/src/separatedNonEmptyArrayParser.ts

@@ -21,7 +21,7 @@ export const createSeparatedNonEmptyArrayParser = <ElementOutput, Sequence>(
 		const elements: ElementOutput[] = [];
 
 		while (true) {
-			const elementParserContext = parserContext.lookahead();
+			using elementParserContext = parserContext.lookahead();
 			const initialPosition = elementParserContext.position;
 
 			try {
@@ -39,8 +39,6 @@ export const createSeparatedNonEmptyArrayParser = <ElementOutput, Sequence>(
 				}
 
 				throw error;
-			} finally {
-				elementParserContext.dispose();
 			}
 
 			parser = separatorThenElementParser;

package/src/sliceBoundedParser.test.ts

@@ -32,7 +32,7 @@ test('sliceBoundedParser', async t => {
 test('sliceBoundedParser mustConsumeAll: true fail to cosume all', async t => {
 	const parser = createTupleParser([
 		createElementParser<string>(),
-		createSliceBoundedParser(createArrayParser(createExactElementParser('b' as string)), 2),
+		createSliceBoundedParser(createArrayParser(createExactElementParser<string>('b')), 2),
 		createElementParser(),
 	]);
 
@@ -45,7 +45,7 @@ test('sliceBoundedParser mustConsumeAll: true fail to cosume all', async t => {
 test('sliceBoundedParser mustConsumeAll: false', async t => {
 	const parser = createTupleParser([
 		createElementParser<string>(),
-		createSliceBoundedParser(createArrayParser(createExactElementParser('b' as string)), 2, false),
+		createSliceBoundedParser(createArrayParser(createExactElementParser<string>('b')), 2, false),
 		createElementParser(),
 	]);
 

package/src/sliceBoundedParser.ts

@@ -8,30 +8,26 @@ export const createSliceBoundedParser = <Output, Sequence>(
 	const sliceBoundedParser: typeof childParser = async parserContext => {
 		const absoluteSliceEnd = parserContext.position + sliceEnd;
 
-		const childParserContext = parserContext.lookahead({
+		using childParserContext = parserContext.lookahead({
 			sliceEnd: absoluteSliceEnd,
 		});
 
-		try {
-			const value = await childParser(childParserContext);
+		const value = await childParser(childParserContext);
 
-			childParserContext.invariant(
-				(
-					!mustConsumeAll
-					|| childParserContext.position === absoluteSliceEnd
-				),
-				'child parser must consume all input in the slice (%s in total, up to position %s), instead consumed %s up to position %s',
-				sliceEnd,
-				absoluteSliceEnd,
-				childParserContext.position - parserContext.position,
-				childParserContext.position,
-			);
+		childParserContext.invariant(
+			(
+				!mustConsumeAll
+				|| childParserContext.position === absoluteSliceEnd
+			),
+			'child parser must consume all input in the slice (%s in total, up to position %s), instead consumed %s up to position %s',
+			sliceEnd,
+			absoluteSliceEnd,
+			childParserContext.position - parserContext.position,
+			childParserContext.position,
+		);
 
-			childParserContext.unlookahead();
-			return value;
-		} finally {
-			childParserContext.dispose();
-		}
+		childParserContext.unlookahead();
+		return value;
 	};
 
 	setParserName(sliceBoundedParser, [

package/src/smaliParser.test.ts

@@ -441,3 +441,67 @@ test('parse smali with virtual method after direct methods (a0/n issue)', async
 	t.truthy(actual);
 	t.is(actual.classData?.virtualMethods.length, 1);
 });
+
+// Minimal failing test case for .end local directive
+test('parse smali with .end local directive', async t => {
+	const smali = `.class public Lpl/czak/minimal/MainActivity;
+.super Landroid/app/Activity;
+
+# direct methods
+.method private sumToN(I)I
+    .registers 4
+    .param p1, "n"    # I
+
+    const/4 v0, 0x0
+
+    .local v0, "sum":I
+    const/4 v1, 0x1
+
+    .local v1, "i":I
+    :goto_2
+    if-gt v1, p1, :cond_8
+
+    add-int/2addr v0, v1
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_2
+
+    .end local v1    # "i":I
+    :cond_8
+    return v0
+.end method
+`;
+
+	const actual = await runParser(smaliParser, smali, stringParserInputCompanion, {
+		errorJoinMode: 'all',
+	});
+
+	t.truthy(actual);
+	t.is(actual.classData?.directMethods.length, 1);
+});
+
+// Minimal test case for .local with generic type signature
+test('parse smali with .local directive with generic type signature', async t => {
+	const smali = `.class public Lpl/czak/minimal/MainActivity;
+.super Landroid/app/Activity;
+
+# direct methods
+.method private useLambda()Ljava/lang/String;
+    .registers 3
+
+    new-instance v0, Lpl/czak/minimal/MainActivity$$ExternalSyntheticLambda0;
+
+    .local v0, "supplier":Ljava/util/function/Supplier;, "Ljava/util/function/Supplier<Ljava/lang/String;>;"
+
+    return-object v0
+.end method
+`;
+
+	const actual = await runParser(smaliParser, smali, stringParserInputCompanion, {
+		errorJoinMode: 'all',
+	});
+
+	t.truthy(actual);
+	t.is(actual.classData?.directMethods.length, 1);
+});

package/src/smaliParser.test.ts.md

@@ -252,11 +252,11 @@ Generated by [AVA](https://avajs.dev).
               ],
             },
             {
-              branchOffset: 10,
               operation: 'packed-switch',
               registers: [
                 0,
               ],
+              targetInstructionIndex: 6,
             },
             {
               field: {
@@ -300,10 +300,10 @@ Generated by [AVA](https://avajs.dev).
               ],
             },
             {
-              branchOffsets: [
-                3,
-              ],
               operation: 'packed-switch-payload',
+              targetInstructionIndices: [
+                2,
+              ],
               value: 0,
             },
           ],
@@ -718,11 +718,11 @@ Generated by [AVA](https://avajs.dev).
                   value: 2130903347,
                 },
                 {
-                  branchOffset: 17,
                   operation: 'if-nez',
                   registers: [
                     6,
                   ],
+                  targetInstructionIndex: 10,
                 },
                 {
                   operation: 'new-instance',
@@ -802,8 +802,8 @@ Generated by [AVA](https://avajs.dev).
                   ],
                 },
                 {
-                  branchOffset: 2,
                   operation: 'goto',
+                  targetInstructionIndex: 11,
                 },
                 {
                   operation: 'move',
@@ -905,11 +905,11 @@ Generated by [AVA](https://avajs.dev).
                   ],
                 },
                 {
-                  branchOffset: 16,
                   operation: 'if-nez',
                   registers: [
                     6,
                   ],
+                  targetInstructionIndex: 26,
                 },
                 {
                   operation: 'new-instance',
@@ -1474,11 +1474,11 @@ Generated by [AVA](https://avajs.dev).
                   ],
                 },
                 {
-                  branchOffset: 19,
                   operation: 'if-nez',
                   registers: [
                     0,
                   ],
+                  targetInstructionIndex: 10,
                 },
                 {
                   field: {
@@ -3423,11 +3423,11 @@ Generated by [AVA](https://avajs.dev).
                   ],
                 },
                 {
-                  branchOffset: 11,
                   operation: 'if-nez',
                   registers: [
                     0,
                   ],
+                  targetInstructionIndex: 10,
                 },
                 {
                   method: {
@@ -3456,15 +3456,15 @@ Generated by [AVA](https://avajs.dev).
                   ],
                 },
                 {
-                  branchOffset: 3,
                   operation: 'if-eqz',
                   registers: [
                     2,
                   ],
+                  targetInstructionIndex: 8,
                 },
                 {
-                  branchOffset: 3,
                   operation: 'goto',
+                  targetInstructionIndex: 10,
                 },
                 {
                   operation: 'const/4',
@@ -3474,8 +3474,8 @@ Generated by [AVA](https://avajs.dev).
                   value: 0,
                 },
                 {
-                  branchOffset: 2,
                   operation: 'goto',
+                  targetInstructionIndex: 11,
                 },
                 {
                   operation: 'const/4',