aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
diff options
context:
space:
mode:
author zaaarf <me@zaaarf.foo>2024-05-31 18:56:00 +0200
committer zaaarf <me@zaaarf.foo>2024-05-31 18:56:00 +0200
commitf7123206100c7026bab4478ad276bcda63f1be6a (patch)
tree52120e0f9dae87cda80ff029b6c70c5dbcf7de46 /src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
parentc48450085ba07655abc8b119629634f5ca43ebb9 (diff)
fix: solved various (glaring) mistakes, now it works!HEAD0.4.1dev
Diffstat (limited to 'src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java')
-rw-r--r--src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java35
1 files changed, 20 insertions, 15 deletions
diff --git a/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java b/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
index e60b7ed..d91e955 100644
--- a/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
+++ b/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
@@ -28,41 +28,46 @@ public class TinyV2Mapper implements IMappingFormat {
for(int i = 1; i < lines.size(); i++) {
String currentLine = lines.get(i);
String[] tokens = currentLine.trim().split("\t");
- int tabCount = currentLine.indexOf(tokens[0]); //get number of leading tabs
+ int tabCount = currentLine.indexOf(tokens[0]); // get number of leading tabs
switch(tabCount) {
- case 0: //classes
+ case 0: // classes
if(tokens.length == 3) {
if(tokens[0].charAt(0) == 'c') {
result.getRawMappings().put(tokens[1], new ClassData(tokens[1], tokens[2]));
currentClass = tokens[1];
} else if(!ignoreErrors)
- throw new MalformedMappingsException(i, "root-level element must be class");
+ throw new MalformedMappingsException(i + 1, "root-level element must be class");
continue;
}
break;
- case 1: //class members
+ case 1: // class members
if(currentClass.isEmpty()) {
if(ignoreErrors) continue;
- else throw new MalformedMappingsException(i, "class member without parent class");
+ else throw new MalformedMappingsException(i + 1, "class member without parent class");
}
switch(tokens[0].charAt(0)) {
- case 'm': //methods
+ case 'm': // methods
if(tokens.length == 4)
- break;
- result.getClassData(currentClass).addMethod(tokens[2], tokens[3], tokens[1]);
+ result.getClassData(currentClass).addMethod(tokens[2], tokens[3], tokens[1]);
+ else if(!ignoreErrors)
+ throw new MalformedMappingsException(i + 1, "incomplete method member");
continue;
- case 'f': //fields
+ case 'f': // fields
if(tokens.length == 4)
- break;
- result.getClassData(currentClass).addField(tokens[2], tokens[3], tokens[1]);
+ result.getClassData(currentClass).addField(tokens[2], tokens[3], tokens[1]);
+ else if(!ignoreErrors)
+ throw new MalformedMappingsException(i + 1, "incomplete field member");
continue;
}
break;
- case 2: //parameters, our mappers don't really support those
- break;
+ case 2: // parameters, our mappers don't really support those
+ continue;
+ default:
+ if(tokens[0].charAt(0) == 'c')
+ continue; // skip comments
+ if(!ignoreErrors)
+ throw new MalformedMappingsException(i + 1, "wrong number of tab-separated tokens");
}
- if(!ignoreErrors)
- throw new MalformedMappingsException(i, "wrong number of tab-separated tokens");
}
return result;
}