Fix support for default package classes in Proguard loader. Closes #20

Fix Tiny v2 variable comments causing loading error. Closes #21

Author: LexManos

src/main/java/net/minecraftforge/srgutils/InternalUtils.java

@@ -441,7 +441,7 @@ private static IMappingBuilder loadTinyV2(List<String> lines) throws IOException
             if (newdepth != 0)
                 line = line.substring(newdepth);
 
-            if (newdepth != stack.size()) {
+            if (newdepth <= stack.size()) {
                 while (stack.size() != newdepth) {
                     switch(stack.pop()) {
                         case CLASS:     cls    = null; break;
@@ -451,6 +451,8 @@ private static IMappingBuilder loadTinyV2(List<String> lines) throws IOException
                         default: break;
                     }
                 }
+            } else {
+                throw tiny2Exception(x, line);
             }
 
             String[] parts = line.split("\t");
@@ -486,6 +488,8 @@ private static IMappingBuilder loadTinyV2(List<String> lines) throws IOException
                                 if (param == null) throw tiny2Exception(x, line);
                                 param.meta("comment", comment);
                                 break;
+                            case VARIABLE:
+                                break; // TODO: [SRGUtils][LocalVariables] Support LocalVariable comments in Mapping files
                             default:
                                 throw tiny2Exception(x, line);
                         }
@@ -518,17 +522,18 @@ private static IMappingBuilder loadTinyV2(List<String> lines) throws IOException
 
                     break;
                 case "v": // Local Variable: v index start Name1 Name2 Name3?
-                    break; //TODO: Unsupported, is this used? Should we expose it?
+                    stack.push(TinyV2State.VARIABLE);
+                    break; // TODO: [SRGUtils][LocalVariables] Support LocalVariables in Mapping files
                 default:
                     throw tiny2Exception(x, line);
             }
         }
 
         return ret;
     }
-    enum TinyV2State { ROOT, CLASS, FIELD, METHOD, PARAMETER }
+    enum TinyV2State { ROOT, CLASS, FIELD, METHOD, PARAMETER, VARIABLE }
     private static IOException tiny2Exception(int line, String data) {
-        return new IOException("Invalid Tiny v2 line: #" + line + ": " + data);
+        return new IOException("Invalid Tiny v2 line: #" + (line + 1) + ": " + data);
     }
 
     /* <escaped-string> is a string that must not contain <eol> and escapes
@@ -565,8 +570,7 @@ static String toDesc(String type) {
         if (type.equals("double"))  return "D";
         if (type.equals("float"))   return "F";
         if (type.equals("long"))    return "J";
-        if (type.contains("/"))     return "L" + type + ";";
-        throw new RuntimeException("Invalid toDesc input: " + type);
+        return "L" + type + ";";
     }
 
     static String toSource(String desc) {

src/test/java/net/minecraftforge/srgutils/test/MappingTest.java

@@ -18,7 +18,10 @@
 
 import net.minecraftforge.srgutils.IMappingBuilder;
 import net.minecraftforge.srgutils.IMappingFile;
-import net.minecraftforge.srgutils.IMappingFile.Format;
+import net.minecraftforge.srgutils.IMappingFile.Format;
+import net.minecraftforge.srgutils.IMappingFile.IClass;
+import net.minecraftforge.srgutils.IMappingFile.IField;
+import net.minecraftforge.srgutils.IMappingFile.IMethod;
 import net.minecraftforge.srgutils.INamedMappingFile;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -135,8 +138,37 @@ void tinyV2PackageComments() throws IOException {
 
     @Test
     void tinyV2NamedLoad() throws IOException {
-        INamedMappingFile map = INamedMappingFile.load(getStream("./tiny_v2_named.tiny"));
-        assertIterableEquals(Arrays.asList("A", "B", "C"), map.getNames());
+        INamedMappingFile named = INamedMappingFile.load(getStream("./tiny_v2_named.tiny"));
+        assertIterableEquals(Arrays.asList("A", "B", "C"), named.getNames());
+        tinyV2NamedTest(named, "A", "B");
+        tinyV2NamedTest(named, "A", "C");
+        tinyV2NamedTest(named, "B", "A");
+        tinyV2NamedTest(named, "B", "C");
+        tinyV2NamedTest(named, "C", "B");
+        tinyV2NamedTest(named, "C", "A");
+    }
+
+    void tinyV2NamedTest(INamedMappingFile named, String left, String right) {
+        IMappingFile map = named.getMap(left, right);
+        IClass cls = map.getClass("cls" + left);
+        assertNotNull(cls, "Could not find cls" + left + " in " + left + " -> " + right);
+        assertEquals("cls" + right, cls.getMapped());
+
+        IField fld = cls.getField("fld" + left);
+        assertNotNull(cls, "Could not find fld" + left + " in " + left + " -> " + right);
+        assertEquals("fld" + right, fld.getMapped());
+
+        IMethod mtd = cls.getMethod("mtd" + left, "()Lcls" + left + ';');
+        assertNotNull(cls, "Could not find mtd" + left + " in " + left + " -> " + right);
+        assertEquals("mtd" + right, mtd.getMapped());
+        assertEquals("()Lcls" + right + ';', mtd.getMappedDescriptor());
+    }
+
+    @Test
+    void tinyV2OptionalAndLVs() throws IOException {
+        INamedMappingFile named = INamedMappingFile.load(getStream("./tiny_v2_09_2024_edition.tiny"));
+        assertIterableEquals(Arrays.asList("source", "same", "rename"), named.getNames());
+
     }
 
     @Test

src/test/resources/tiny_v2_named.tiny

@@ -6,4 +6,6 @@ c	clsA	clsB	clsC
 	m	()LclsA;	mtdA	mtdB	mtdC
 		c	Method Comment
 		p	1	parA	parB	parC
-			c	Param Comment
+			c	Param Comment
+		v	1	1	1	varA	varB	varC
+			c	A varaible comment this would trigger https://github.com/MinecraftForge/SrgUtils/issues/21