Reduced max-line-length to 125

Author: rajatkhanna1994

codingstyle/soot_checkstyle_checks.xml

@@ -43,7 +43,7 @@
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
         <module name="LineLength">
-            <property name="max" value="200"/>
+            <property name="max" value="125"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="AvoidStarImport"/>

codingstyle/soot_eclipse_formatter.xml

@@ -72,7 +72,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="150"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="125"/>
 <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
@@ -138,7 +138,7 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
@@ -198,7 +198,7 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="9"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
@@ -308,7 +308,7 @@
 <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="150"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="125"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
 </profile>

src/main/java/soot/AbstractASMBackend.java

@@ -57,10 +57,11 @@
 import soot.util.backend.SootASMClassWriter;
 
 /**
- * Abstract super-class for ASM-based back-ends. Generates byte-code for everything except the method bodies, as they are dependent on the IR.
- * 
+ * Abstract super-class for ASM-based back-ends. Generates byte-code for everything except the method bodies, as they are
+ * dependent on the IR.
+ *
  * @author Tobias Hamann, Florian Kuebler, Dominik Helm, Lukas Sommer
- * 
+ *
  */
 public abstract class AbstractASMBackend {
 
@@ -75,11 +76,12 @@ public abstract class AbstractASMBackend {
 
   /**
    * Creates a new ASM backend
-   * 
+   *
    * @param sc
    *          The SootClass that is to be converted into bytecode
    * @param javaVersion
-   *          A particular Java version enforced by the user, may be 0 for automatic detection, must not be lower than necessary for all features used
+   *          A particular Java version enforced by the user, may be 0 for automatic detection, must not be lower than
+   *          necessary for all features used
    */
   public AbstractASMBackend(SootClass sc, int javaVersion) {
     this.sc = sc;
@@ -91,8 +93,8 @@ public AbstractASMBackend(SootClass sc, int javaVersion) {
     }
 
     if (javaVersion != Options.java_version_default && javaVersion < minVersion) {
-      throw new IllegalArgumentException("Enforced Java version " + translateJavaVersion(javaVersion) + " too low to support required features ("
-          + translateJavaVersion(minVersion) + " required)");
+      throw new IllegalArgumentException("Enforced Java version " + translateJavaVersion(javaVersion)
+          + " too low to support required features (" + translateJavaVersion(minVersion) + " required)");
     }
 
     javaVersion = Math.max(javaVersion, minVersion);
@@ -126,9 +128,9 @@ public AbstractASMBackend(SootClass sc, int javaVersion) {
   }
 
   /**
-   * Gets the baf body for the given SootMethod. This method will first check whether the method already has a baf body. If not, it will query the
-   * local cache. If this fails as well, it will construct a new baf body.
-   * 
+   * Gets the baf body for the given SootMethod. This method will first check whether the method already has a baf body. If
+   * not, it will query the local cache. If this fails as well, it will construct a new baf body.
+   *
    * @param method
    *          The method for which to obtain a baf body
    * @return The baf body for the given method
@@ -156,7 +158,7 @@ protected BafBody getBafBody(SootMethod method) {
 
   /**
    * Determines the minimum Java version required for the bytecode of the given SootClass
-   * 
+   *
    * @param sc
    *          The SootClass the minimum Java version is to be determined for
    * @return The minimum Java version required for the given SootClass
@@ -211,9 +213,9 @@ private int getMinJavaVersion(SootClass sc) {
   }
 
   /**
-   * Determines the minimum Java version required for the bytecode of the given SootMethod Subclasses should override this method to suit their needs,
-   * otherwise Java 1.7 is assumed for compatibility with invokeDynamic
-   * 
+   * Determines the minimum Java version required for the bytecode of the given SootMethod Subclasses should override this
+   * method to suit their needs, otherwise Java 1.7 is assumed for compatibility with invokeDynamic
+   *
    * @param sm
    *          The SootMethod the minimum Java version is to be determined for
    * @return The minimum Java version required for the given SootMethod
@@ -224,7 +226,7 @@ protected int getMinJavaVersion(SootMethod sm) {
 
   /**
    * Outputs the bytecode generated as a class file
-   * 
+   *
    * @param os
    *          The OutputStream the class file is written to
    */
@@ -241,7 +243,7 @@ public void generateClassFile(OutputStream os) {
 
   /**
    * Outputs the bytecode generated as a textual representation
-   * 
+   *
    * @param pw
    *          The PrintWriter the textual representation is written to
    */
@@ -287,9 +289,9 @@ protected void generateByteCode() {
   }
 
   /**
-   * Comparatator that is used to sort the methods before they are written out. This is mainly used to enforce a deterministic output between runs
-   * which we need for testing.
-   * 
+   * Comparatator that is used to sort the methods before they are written out. This is mainly used to enforce a
+   * deterministic output between runs which we need for testing.
+   *
    * @author Steven Arzt
    *
    */
@@ -355,7 +357,8 @@ protected void generateMethods() {
                   continue;
                 }
                 for (AnnotationTag at : va.getAnnotations()) {
-                  AnnotationVisitor av = mv.visitParameterAnnotation(j, at.getType(), (va.getVisibility() == AnnotationConstants.RUNTIME_VISIBLE));
+                  AnnotationVisitor av = mv.visitParameterAnnotation(j, at.getType(),
+                      (va.getVisibility() == AnnotationConstants.RUNTIME_VISIBLE));
                   generateAnnotationElems(av, at.getElems(), true);
                 }
               }
@@ -406,9 +409,9 @@ protected void generateFields() {
   }
 
   /**
-   * Comparatator that is used to sort the inner class references before they are written out. This is mainly used to enforce a deterministic output
-   * between runs which we need for testing.
-   * 
+   * Comparatator that is used to sort the inner class references before they are written out. This is mainly used to enforce
+   * a deterministic output between runs which we need for testing.
+   *
    * @author Steven Arzt
    *
    */
@@ -452,7 +455,7 @@ protected void generateAttributes() {
 
   /**
    * Emits the bytecode for all attributes of a field
-   * 
+   *
    * @param fv
    *          The FieldVisitor to emit the bytecode to
    * @param f
@@ -469,7 +472,7 @@ protected void generateAttributes(FieldVisitor fv, SootField f) {
 
   /**
    * Emits the bytecode for all attributes of a method
-   * 
+   *
    * @param fv
    *          The MethodVisitor to emit the bytecode to
    * @param f
@@ -486,7 +489,7 @@ protected void generateAttributes(MethodVisitor mv, SootMethod m) {
 
   /**
    * Emits the bytecode for all annotations of a class, field or method
-   * 
+   *
    * @param visitor
    *          A ClassVisitor, FieldVisitor or MethodVisitor to emit the bytecode to
    * @param host
@@ -512,8 +515,8 @@ protected void generateAnnotations(Object visitor, Host host) {
         }
       }
       /*
-       * Here TypeAnnotations could be visited potentially. Currently (2015/02/03) they are not supported by the ASM-front-end and their information
-       * is not accessible.
+       * Here TypeAnnotations could be visited potentially. Currently (2015/02/03) they are not supported by the
+       * ASM-front-end and their information is not accessible.
        */
 
       // Visit AnnotationDefault on methods
@@ -528,7 +531,7 @@ else if (host instanceof SootMethod && t instanceof AnnotationDefaultTag) {
 
   /**
    * Emits the bytecode for the values of an annotation
-   * 
+   *
    * @param av
    *          The AnnotationVisitor to emit the bytecode to
    * @param elements
@@ -665,7 +668,7 @@ protected void generateClassHeader() {
 
   /**
    * Utility method to get the access modifiers of a Host
-   * 
+   *
    * @param modVal
    *          The bitset representation of the Host's modifiers
    * @param host
@@ -724,7 +727,8 @@ protected static int getModifiers(int modVal, Host host) {
       modifier |= Opcodes.ACC_STRICT;
     }
     /*
-     * Retrieve synthetic-modifier. Class not present in source-code but generated by e.g. compiler TODO Do we need both checks?
+     * Retrieve synthetic-modifier. Class not present in source-code but generated by e.g. compiler TODO Do we need both
+     * checks?
      */
     if (Modifier.isSynthetic(modVal) || host.hasTag("SyntheticTag")) {
       modifier |= Opcodes.ACC_SYNTHETIC;
@@ -742,7 +746,7 @@ protected static int getModifiers(int modVal, Host host) {
 
   /**
    * Emits the bytecode for the body of a single method Has to be implemented by subclasses to suit their needs
-   * 
+   *
    * @param mv
    *          The MethodVisitor to emit the bytecode to
    * @param method

src/main/java/soot/AbstractJasminClass.java

@@ -1,6 +1,6 @@
 /* Soot - a J*va Optimization Framework
- * 
- * 
+ *
+ *
  * Copyright (C) 1999 Patrick Lam, Patrick Pominville and Raja Vallee-Rai
  * Copyright (C) 2004 Jennifer Lhotak, Ondrej Lhotak
  *
@@ -21,7 +21,7 @@
  */
 
 /*
- * Modified by the Sable Research Group and others 1997-1999.  
+ * Modified by the Sable Research Group and others 1997-1999.
  * See the 'credits' file distributed with Soot for the complete list of
  * contributors.  (Soot is distributed at http://www.sable.mcgill.ca/soot)
  */
@@ -97,8 +97,10 @@ public abstract class AbstractJasminClass {
   protected Map<Object, Integer> groupToColorCount;
   protected Map<Local, Integer> localToColor;
 
-  protected Map<Block, Integer> blockToStackHeight = new HashMap<Block, Integer>(); // maps a block to the stack height upon entering it
-  protected Map<Block, Integer> blockToLogicalStackHeight = new HashMap<Block, Integer>(); // maps a block to the logical stack height upon entering
+  protected Map<Block, Integer> blockToStackHeight = new HashMap<Block, Integer>(); // maps a block to the stack height upon
+                                                                                    // entering it
+  protected Map<Block, Integer> blockToLogicalStackHeight = new HashMap<Block, Integer>(); // maps a block to the logical
+                                                                                           // stack height upon entering
                                                                                            // it
 
   public static String slashify(String s) {
@@ -550,7 +552,8 @@ public AbstractJasminClass(SootClass sootClass) {
 
         if (field.hasTag("StringConstantValueTag")) {
           fieldString += " = ";
-          fieldString += soot.util.StringTools.getQuotedStringOf(((StringConstantValueTag) field.getTag("StringConstantValueTag")).getStringValue());
+          fieldString += soot.util.StringTools
+              .getQuotedStringOf(((StringConstantValueTag) field.getTag("StringConstantValueTag")).getStringValue());
         } else if (field.hasTag("IntegerConstantValueTag")) {
           fieldString += " = ";
           fieldString += ((IntegerConstantValueTag) field.getTag("IntegerConstantValueTag")).getIntValue();
@@ -593,7 +596,8 @@ public AbstractJasminClass(SootClass sootClass) {
         while (attributeIt.hasNext()) {
           Tag tag = (Tag) attributeIt.next();
           if (tag instanceof Attribute) {
-            emit(".field_attribute " + tag.getName() + " \"" + new String(Base64.encode(((Attribute) tag).getValue())) + "\"");
+            emit(".field_attribute " + tag.getName() + " \"" + new String(Base64.encode(((Attribute) tag).getValue()))
+                + "\"");
           }
         }
 
@@ -684,7 +688,8 @@ protected void emitMethod(SootMethod method) {
     }
 
     // Emit prologue
-    emit(".method " + Modifier.toString(method.getModifiers()) + " " + method.getName() + jasminDescriptorOf(method.makeRef()));
+    emit(".method " + Modifier.toString(method.getModifiers()) + " " + method.getName()
+        + jasminDescriptorOf(method.makeRef()));
 
     Iterator<SootClass> throwsIt = method.getExceptions().iterator();
     while (throwsIt.hasNext()) {

src/main/java/soot/AbstractSootFieldRef.java

@@ -27,8 +27,9 @@
 import soot.options.Options;
 
 /**
- * Representation of a reference to a field as it appears in a class file. Note that the field directly referred to may not actually exist; the actual
- * target of the reference is determined according to the resolution procedure in the Java Virtual Machine Specification, 2nd ed, section 5.4.3.2.
+ * Representation of a reference to a field as it appears in a class file. Note that the field directly referred to may not
+ * actually exist; the actual target of the reference is determined according to the resolution procedure in the Java Virtual
+ * Machine Specification, 2nd ed, section 5.4.3.2.
  */
 
 public class AbstractSootFieldRef implements SootFieldRef {
@@ -82,12 +83,13 @@ public String getSignature() {
 
   public class FieldResolutionFailedException extends ResolutionFailedException {
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = -4657113720516199499L;
 
     public FieldResolutionFailedException() {
-      super("Class " + declaringClass + " doesn't have field " + name + " : " + type + "; failed to resolve in superclasses and interfaces");
+      super("Class " + declaringClass + " doesn't have field " + name + " : " + type
+          + "; failed to resolve in superclasses and interfaces");
     }
 
     @Override
@@ -105,7 +107,8 @@ public SootField resolve() {
   }
 
   private SootField checkStatic(SootField ret) {
-    if (Options.v().wrong_staticness() == Options.wrong_staticness_fail || Options.v().wrong_staticness() == Options.wrong_staticness_fixstrict) {
+    if (Options.v().wrong_staticness() == Options.wrong_staticness_fail
+        || Options.v().wrong_staticness() == Options.wrong_staticness_fixstrict) {
       if (ret.isStatic() != isStatic() && !ret.isPhantom()) {
         throw new ResolutionFailedException("Resolved " + this + " to " + ret + " which has wrong static-ness");
       }
@@ -220,7 +223,8 @@ protected SootField handleFieldTypeMismatch(SootField clField) {
       case Options.field_type_mismatches_null:
         return null;
     }
-    throw new RuntimeException(String.format("Unsupported option for handling field type mismatches: %d", Options.v().field_type_mismatches()));
+    throw new RuntimeException(
+        String.format("Unsupported option for handling field type mismatches: %d", Options.v().field_type_mismatches()));
   }
 
   @Override

src/main/java/soot/AbstractUnit.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Modified by the Sable Research Group and others 1997-1999.  
+ * Modified by the Sable Research Group and others 1997-1999.
  * See the 'credits' file distributed with Soot for the complete list of
  * contributors.  (Soot is distributed at http://www.sable.mcgill.ca/soot)
  */
@@ -40,25 +40,26 @@ public abstract class AbstractUnit extends AbstractHost implements Unit {
   public abstract Object clone();
 
   /**
-   * Returns a list of Boxes containing Values used in this Unit. The list of boxes is dynamically updated as the structure changes. Note that they
-   * are returned in usual evaluation order. (this is important for aggregation)
+   * Returns a list of Boxes containing Values used in this Unit. The list of boxes is dynamically updated as the structure
+   * changes. Note that they are returned in usual evaluation order. (this is important for aggregation)
    */
   @Override
   public List<ValueBox> getUseBoxes() {
     return Collections.emptyList();
   }
 
   /**
-   * Returns a list of Boxes containing Values defined in this Unit. The list of boxes is dynamically updated as the structure changes.
+   * Returns a list of Boxes containing Values defined in this Unit. The list of boxes is dynamically updated as the
+   * structure changes.
    */
   @Override
   public List<ValueBox> getDefBoxes() {
     return Collections.emptyList();
   }
 
   /**
-   * Returns a list of Boxes containing Units defined in this Unit; typically branch targets. The list of boxes is dynamically updated as the
-   * structure changes.
+   * Returns a list of Boxes containing Units defined in this Unit; typically branch targets. The list of boxes is
+   * dynamically updated as the structure changes.
    */
   @Override
   public List<UnitBox> getUnitBoxes() {