update ASM/Guava, merge ASM port fixes

1 files changed, 29 insertions, 0 deletions

diff --git a/src/main/java/oml/ast/transformers/InvalidIdentifierFix.java b/src/main/java/oml/ast/transformers/InvalidIdentifierFix.java
new file mode 100644
index 00000000..3e052ded
--- /dev/null
+++ b/src/main/java/oml/ast/transformers/InvalidIdentifierFix.java
@@ -0,0 +1,29 @@
+package oml.ast.transformers;
+
+import com.strobel.decompiler.languages.java.ast.AstNode;
+import com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor;
+import com.strobel.decompiler.languages.java.ast.Identifier;
+import com.strobel.decompiler.languages.java.ast.transforms.IAstTransform;
+
+/**
+ * Created by Thiakil on 13/07/2018.
+ */
+public class InvalidIdentifierFix implements IAstTransform {
+        @Override
+        public void run(AstNode compilationUnit) {
+                compilationUnit.acceptVisitor(new Visitor(), null);
+        }
+
+        class Visitor extends DepthFirstAstVisitor<Void,Void>{
+                @Override
+                public Void visitIdentifier(Identifier node, Void data) {
+                        super.visitIdentifier(node, data);
+                        if (node.getName().equals("do") || node.getName().equals("if")){
+                                Identifier newIdentifier = Identifier.create(node.getName() + "_", node.getStartLocation());
+                                newIdentifier.copyUserDataFrom(node);
+                                node.replaceWith(newIdentifier);
+                        }
+                        return null;
+                }
+        }
+}