zaaarf/lillero
2
1
Fork 0
mirror of https://github.com/zaaarf/lillero.git synced 2024-11-12 18:49:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: added empty predicates edge case to find function, and single-instruction constructor to InsnSequence

Browse source
This commit is contained in:
zaaarf 2023-03-04 11:52:40 +01:00
parent 3185d840c4
commit c9ea715ba1
No known key found for this signature in database
GPG key ID: AD8563472FD43386
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ftbsc/lll/tools/InsnSequence.java
View file

@ -19,6 +19,16 @@ public class InsnSequence extends InsnList {
super(); super();
} }
/**
* Public constructor for list with single item.
* Must be given a single non-null node.
* @param node the node in question
*/
public InsnSequence(AbstractInsnNode node) {
super();
super.add(node);
}
/** /**
* Public constructor. * Public constructor.
* Must be given two non-null, connected nodes. * Must be given two non-null, connected nodes.

10
src/main/java/ftbsc/lll/tools/PatternMatcher.java
View file

@ -85,6 +85,7 @@ public class PatternMatcher {
if(ignoreLabels && cur.getType() == AbstractInsnNode.LABEL) continue; if(ignoreLabels && cur.getType() == AbstractInsnNode.LABEL) continue;
if(ignoreFrames && cur.getType() == AbstractInsnNode.FRAME) continue; if(ignoreFrames && cur.getType() == AbstractInsnNode.FRAME) continue;
if(ignoreLineNumbers && cur.getType() == AbstractInsnNode.LINE) continue; if(ignoreLineNumbers && cur.getType() == AbstractInsnNode.LINE) continue;
if(predicates.get(match) != null) {
if(predicates.get(match).test(cur)) { if(predicates.get(match).test(cur)) {
match++; match++;
if (first == null) if (first == null)
@ -93,18 +94,17 @@ public class PatternMatcher {
first = null; first = null;
match = 0; match = 0;
} }
}
//check if we found the last one //check if we found the last one
if(match == predicates.size()) { if(match == predicates.size()) {
if(match == 0)
return new InsnSequence(cur); //match whatever
last = cur; last = cur;
break;
}
}
//only return value if we found both a start and an end
if(first != null && last != null) {
if(reverse) return new InsnSequence(last, first); //we are matching backwards if(reverse) return new InsnSequence(last, first); //we are matching backwards
else return new InsnSequence(first, last); else return new InsnSequence(first, last);
} }
} }
}
throw new PatternNotFoundException("Failed to find pattern!"); throw new PatternNotFoundException("Failed to find pattern!");
} }