Allow file input

README.md

@@ -7,7 +7,7 @@ Download the zip, decompress it, then:
 cd release/
 java -jar ReScue.jar
 ```
-Sample output should be:
+Sample output:
 ```
 Input regex: (?=(a+)+b)aaabx
 (?=(a+)+b)aaabx

release/Readme.txt

@@ -28,6 +28,10 @@ java -jar rescue.jar <-sl string length> <-pz population size> <-g generations>
 -q	Quiet mode, do not show input message, usage:
 	java -jar rescue.jar -q
 	or combine with other options
+
+--regex-file Inputs text file of regexes to program, usage:
+	java -jar rescue.jar
+	> Input regex: regex.txt
 
 For example:
 	java -jar rescue.jar

src/cn/edu/nju/moon/redos/attackers/pp/Pumper.java

@@ -1,18 +1,21 @@
 package cn.edu.nju.moon.redos.attackers.pp;
 
 import cn.edu.nju.moon.redos.RedosAttacker;
+import com.google.gson.Gson;
 import cn.edu.nju.moon.redos.Trace;
 import cn.edu.nju.moon.redos.regex.ReScueMatcher;
 import cn.edu.nju.moon.redos.regex.ReScuePattern;
 
 public class Pumper {
-	private int MAX_LEN = 128; // Max repeat times of the effective sub-string
-
-	public Pumper(int max_len){
-		this.MAX_LEN = max_len;
-	}
-
-	/**
+    private int MAX_LEN = 128; // Max repeat times of the effective sub-string
+
+
+    public Pumper(int max_len) {
+        this.MAX_LEN = max_len;
+    }
+
+
+    /**
     * Repeating the most effective sub-string of the attack string
     * @param p
     * @param t
@@ -96,6 +99,7 @@ public Trace reRepeat(ReScuePattern p, Trace t) {
 			Trace tp = vm.find();
 			if (tp.attackSuccess()) {
 				t = tp;
+				System.out.println("Prefix, pump, and suffix as JSON:\t" + new Gson().toJson(nprefix + npump + nsuffix));
 			}
     	}
     	System.out.println(t.getMatchSteps() + " : " + pump_time + " : " + t.str);