Merge pull request #2094 from MarcMil/dotnet

Improve .NET import support

src/main/generated/sablecc/soot/jimple/parser/analysis/Analysis.java

@@ -138,6 +138,7 @@ public interface Analysis extends Switch
     void caseAIntegerConstant(AIntegerConstant node);
     void caseAFloatConstant(AFloatConstant node);
     void caseAStringConstant(AStringConstant node);
+    void caseABoolConstant(ABoolConstant node);
     void caseAClzzConstant(AClzzConstant node);
     void caseANullConstant(ANullConstant node);
     void caseAAndBinop(AAndBinop node);
@@ -270,4 +271,5 @@ public interface Analysis extends Switch
     void caseTFloatConstant(TFloatConstant node);
     void caseTStringConstant(TStringConstant node);
     void caseEOF(EOF node);
+    void caseInvalidToken(InvalidToken node);
 }

src/main/generated/sablecc/soot/jimple/parser/analysis/AnalysisAdapter.java

@@ -830,6 +830,12 @@ public void caseAStringConstant(AStringConstant node)
         defaultCase(node);
     }
 
+    @Override
+    public void caseABoolConstant(ABoolConstant node)
+    {
+        defaultCase(node);
+    }
+
     @Override
     public void caseAClzzConstant(AClzzConstant node)
     {
@@ -1616,6 +1622,12 @@ public void caseEOF(EOF node)
         defaultCase(node);
     }
 
+    @Override
+    public void caseInvalidToken(InvalidToken node)
+    {
+        defaultCase(node);
+    }
+
     public void defaultCase(@SuppressWarnings("unused") Node node)
     {
         // do nothing

src/main/generated/sablecc/soot/jimple/parser/analysis/DepthFirstAdapter.java

@@ -3360,6 +3360,27 @@ public void caseAStringConstant(AStringConstant node)
         outAStringConstant(node);
     }
 
+    public void inABoolConstant(ABoolConstant node)
+    {
+        defaultIn(node);
+    }
+
+    public void outABoolConstant(ABoolConstant node)
+    {
+        defaultOut(node);
+    }
+
+    @Override
+    public void caseABoolConstant(ABoolConstant node)
+    {
+        inABoolConstant(node);
+        if(node.getBoolConstant() != null)
+        {
+            node.getBoolConstant().apply(this);
+        }
+        outABoolConstant(node);
+    }
+
     public void inAClzzConstant(AClzzConstant node)
     {
         defaultIn(node);

src/main/generated/sablecc/soot/jimple/parser/analysis/ReversedDepthFirstAdapter.java

@@ -3374,6 +3374,27 @@ public void caseAStringConstant(AStringConstant node)
         outAStringConstant(node);
     }
 
+    public void inABoolConstant(ABoolConstant node)
+    {
+        defaultIn(node);
+    }
+
+    public void outABoolConstant(ABoolConstant node)
+    {
+        defaultOut(node);
+    }
+
+    @Override
+    public void caseABoolConstant(ABoolConstant node)
+    {
+        inABoolConstant(node);
+        if(node.getBoolConstant() != null)
+        {
+            node.getBoolConstant().apply(this);
+        }
+        outABoolConstant(node);
+    }
+
     public void inAClzzConstant(AClzzConstant node)
     {
         defaultIn(node);

src/main/generated/sablecc/soot/jimple/parser/lexer/IPushbackReader.java

@@ -0,0 +1,12 @@
+/* This file was generated by SableCC (http://www.sablecc.org/). */
+
+package soot.jimple.parser.lexer;
+
+import java.io.*;
+
+@SuppressWarnings("serial")
+public interface IPushbackReader
+{
+    public int read() throws IOException;
+    public void unread(int c) throws IOException;
+}

src/main/generated/sablecc/soot/jimple/parser/lexer/Lexer.java

@@ -11,7 +11,7 @@ public class Lexer
     protected Token token;
     protected State state = State.INITIAL;
 
-    private PushbackReader in;
+    private IPushbackReader in;
     private int line;
     private int pos;
     private boolean cr;
@@ -24,7 +24,25 @@ protected void filter() throws LexerException, IOException
         // Do nothing
     }
 
-    public Lexer(@SuppressWarnings("hiding") PushbackReader in)
+    public Lexer(@SuppressWarnings("hiding") final PushbackReader in)
+    {
+        this.in = new IPushbackReader() {
+
+            private PushbackReader pushbackReader = in;
+
+            @Override
+            public void unread(int c) throws IOException {
+                pushbackReader.unread(c);
+            }
+
+            @Override
+            public int read() throws IOException {
+                return pushbackReader.read();
+            }
+        };
+    }
+
+    public Lexer(@SuppressWarnings("hiding") IPushbackReader in)
     {
         this.in = in;
     }
@@ -1182,6 +1200,7 @@ else if(c > tmp2[1])
                     if(this.text.length() > 0)
                     {
                         throw new LexerException(
+                            new InvalidToken(this.text.substring(0, 1), start_line + 1, start_pos + 1),
                             "[" + (start_line + 1) + "," + (start_pos + 1) + "]" +
                             " Unknown token: " + this.text);
                     }
@@ -2202,7 +2221,7 @@ public int id()
         {
             DataInputStream s = new DataInputStream(
                 new BufferedInputStream(
-                Lexer.class.getResourceAsStream("/lexer.dat")));
+                Lexer.class.getResourceAsStream("lexer.dat")));
 
             // read gotoTable
             int length = s.readInt();

src/main/generated/sablecc/soot/jimple/parser/lexer/LexerException.java

@@ -2,11 +2,21 @@
 
 package soot.jimple.parser.lexer;
 
+import soot.jimple.parser.node.*;
+
 @SuppressWarnings("serial")
 public class LexerException extends Exception
 {
-    public LexerException(String message)
+    private InvalidToken invalidToken;
+
+    public LexerException(@SuppressWarnings("hiding") InvalidToken invalidToken, String message)
     {
         super(message);
+        this.invalidToken = invalidToken;
+    }
+
+    public InvalidToken getToken()
+    {
+        return this.invalidToken;
     }
 }

src/main/generated/sablecc/soot/jimple/parser/node/ABoolConstant.java

@@ -0,0 +1,95 @@
+/* This file was generated by SableCC (http://www.sablecc.org/). */
+
+package soot.jimple.parser.node;
+
+import soot.jimple.parser.analysis.*;
+
+@SuppressWarnings("nls")
+public final class ABoolConstant extends PConstant
+{
+    private TBoolConstant _boolConstant_;
+
+    public ABoolConstant()
+    {
+        // Constructor
+    }
+
+    public ABoolConstant(
+        @SuppressWarnings("hiding") TBoolConstant _boolConstant_)
+    {
+        // Constructor
+        setBoolConstant(_boolConstant_);
+
+    }
+
+    @Override
+    public Object clone()
+    {
+        return new ABoolConstant(
+            cloneNode(this._boolConstant_));
+    }
+
+    @Override
+    public void apply(Switch sw)
+    {
+        ((Analysis) sw).caseABoolConstant(this);
+    }
+
+    public TBoolConstant getBoolConstant()
+    {
+        return this._boolConstant_;
+    }
+
+    public void setBoolConstant(TBoolConstant node)
+    {
+        if(this._boolConstant_ != null)
+        {
+            this._boolConstant_.parent(null);
+        }
+
+        if(node != null)
+        {
+            if(node.parent() != null)
+            {
+                node.parent().removeChild(node);
+            }
+
+            node.parent(this);
+        }
+
+        this._boolConstant_ = node;
+    }
+
+    @Override
+    public String toString()
+    {
+        return ""
+            + toString(this._boolConstant_);
+    }
+
+    @Override
+    void removeChild(@SuppressWarnings("unused") Node child)
+    {
+        // Remove child
+        if(this._boolConstant_ == child)
+        {
+            this._boolConstant_ = null;
+            return;
+        }
+
+        throw new RuntimeException("Not a child.");
+    }
+
+    @Override
+    void replaceChild(@SuppressWarnings("unused") Node oldChild, @SuppressWarnings("unused") Node newChild)
+    {
+        // Replace child
+        if(this._boolConstant_ == oldChild)
+        {
+            setBoolConstant((TBoolConstant) newChild);
+            return;
+        }
+
+        throw new RuntimeException("Not a child.");
+    }
+}

src/main/generated/sablecc/soot/jimple/parser/node/InvalidToken.java

@@ -0,0 +1,33 @@
+/* This file was generated by SableCC (http://www.sablecc.org/). */
+
+package soot.jimple.parser.node;
+
+import soot.jimple.parser.analysis.*;
+
+@SuppressWarnings("nls")
+public final class InvalidToken extends Token
+{
+    public InvalidToken(String text)
+    {
+        setText(text);
+    }
+
+    public InvalidToken(String text, int line, int pos)
+    {
+        setText(text);
+        setLine(line);
+        setPos(pos);
+    }
+
+    @Override
+    public Object clone()
+    {
+        return new InvalidToken(getText(), getLine(), getPos());
+    }
+
+    @Override
+    public void apply(Switch sw)
+    {
+        ((Analysis) sw).caseInvalidToken(this);
+    }
+}