Merge branch 'develop' of git@github.com:Sable/soot.git into develop

generated/options/soot/AntTask.java

@@ -1215,10 +1215,16 @@ public Object createp_wjpp_cimbt() {
         }
         public class PhaseOptwjpp_cimbt {
 
-          public void set(boolean arg) {
+          public void setenabled(boolean arg) {
+            addArg("-p");
+            addArg("wjpp.cimbt");
+            addArg("enabled:"+(arg?"true":"false"));
+          }
+
+          public void setverbose(boolean arg) {
             addArg("-p");
             addArg("wjpp.cimbt");
-            addArg(":"+(arg?"true":"false"));
+            addArg("verbose:"+(arg?"true":"false"));
           }
 
         }

generated/options/soot/options/CGOptions.java

@@ -197,8 +197,8 @@ public String reflection_log() {
      * ignore: no guard is inserted, the program executes normally but 
      * under unsound assumptions. print: the program prints a stack 
      * trace when reaching a porgram location that was not traced but 
-     * continues to run. throw (default): the program throws an Error 
-     * instead. 
+     * continues to run. throw (default): 
+     * the program throws an Error instead. 
      */
     public String guards() {
         return soot.PhaseOptions.getString( options, "guards" );
@@ -213,18 +213,21 @@ public String guards() {
      * treated as an application or a library. 									.
     
      * 										Specifies whether the target classes should be 
-     * treated as an application or a library. 										If library 
-     * mode is disabled (default), the call graph construction assumes 
-     * that the target is an application and 										starts the 
-     * construction from the specified entry points (main method by 
+     * treated as an application or a library. 
+     * If library mode is disabled (default), the call 
+     * graph construction assumes that 
+     * the target is an application and 
+     * starts the construction from the specified entry 
+     * points (main method by 
      * default). 										Under the assumption that the target is a 
      * library, possible call edges might be missing in the call graph. 
-     * 										The two different library modes add theses missing 
-     * calls to the call graph and differ only in the view of the class 
-     * hierachy 										(hierachy of target library or possible 
-     * extended hierachy). 										If simulate-natives is also set, 
-     * the results of native methods are also set to any sub type of 
-     * the declared return type. 									
+     * The two different 
+     * library modes add theses missing calls to the call graph and 
+     * differ only in the view of 
+     * the class hierachy 										(hierachy of target library or 
+     * possible extended hierachy). 										If simulate-natives is 
+     * also set, the results of native methods are also set to any sub 
+     * type of the declared return type. 									
      */
     public int library() {
         String s = soot.PhaseOptions.getString( options, "library" );

generated/options/soot/options/JBOptions.java

@@ -58,8 +58,9 @@ public boolean use_original_names() {
     
      * .
     
-     * Preserves annotations of retention type SOURCE. (for everything 
-     * but package and local variable annotations) 
+     * Preserves annotations of retention type SOURCE. (for 
+     * everything but package and local variable 
+     * annotations) 
      */
     public boolean preserve_source_annotations() {
         return soot.PhaseOptions.getBoolean( options, "preserve-source-annotations" );

generated/options/soot/options/SIOptions.java

@@ -138,7 +138,8 @@ public float expansion_factor() {
     
      * .
     
-     * Specify which changes in visibility modifiers are allowed. 
+     * Specify which changes in visibility modifiers 
+     * are allowed. 
      */
     public int allowed_modifier_changes() {
         String s = soot.PhaseOptions.getString( options, "allowed-modifier-changes" );

generated/options/soot/options/SMBOptions.java

@@ -88,7 +88,8 @@ public boolean insert_redundant_casts() {
     
      * .
     
-     * Specify which changes in visibility modifiers are allowed. 
+     * Specify which changes in visibility modifiers 
+     * are allowed. 
      */
     public int allowed_modifier_changes() {
         String s = soot.PhaseOptions.getString( options, "allowed-modifier-changes" );

generated/options/soot/options/SparkOptions.java

@@ -201,7 +201,8 @@ public boolean simulate_natives() {
     
      * Treat singletons for empty sets etc. as allocation sites.
     
-     * When this option is set to true, Spark treats references to 
+     * When this option is set to 
+     * true, Spark treats references to 
      * EMPTYSET, EMPTYMAP, and EMPTYLIST as allocation sites for 
      * HashSet, HashMap and LinkedList objects respectively, and 
      * references to Hashtable.emptyIterator as allocation sites for 
@@ -726,11 +727,12 @@ public int double_set_new() {
     
      * Encoding methodology.
     
-     * 						 This switch specifies the encoding methodology used 
-     * in the analysis. 						 All possible options are: Geom, 
-     * HeapIns, PtIns. The efficiency order 						 is (from slow to 
-     * fast) Geom - HeapIns - PtIns, but the precision order is 						 
-     * the reverse. 						 
+     * This switch specifies the 
+     * encoding methodology used in the analysis. 						 All 
+     * possible options are: Geom, HeapIns, PtIns. The efficiency order 
+     * 						 is (from slow to fast) Geom - HeapIns - PtIns, but the 
+     * precision order is 						 the reverse. 
+     * 
      */
     public int geom_encoding() {
         String s = soot.PhaseOptions.getString( options, "geom-encoding" );
@@ -756,7 +758,7 @@ public int geom_encoding() {
      * 						 Specifies the worklist used for selecting the next 
      * propagation pointer. All possible options are: PQ, FIFO. They 
      * stand for the priority queue (sorted by the last fire time and 
-     * topology order) and FIFO queue. 						 
+     * topology order) and FIFO queue. 
      */
     public int geom_worklist() {
         String s = soot.PhaseOptions.getString( options, "geom-worklist" );