Make call to indexOf() more efficient

java/daikon/Chicory.java

@@ -641,7 +641,7 @@ public static long elapsed_msecs() {
   public String args_to_string(List<String> args) {
     String str = "";
     for (String arg : args) {
-      if (arg.indexOf(" ") != -1) {
+      if (arg.indexOf(' ') != -1) {
         str = "'" + str + "'";
       }
       str += arg + " ";

java/daikon/Debug.java

@@ -837,7 +837,7 @@ public static String toString(VarInfo[] vis, ValueTuple vt) {
 
     // Get the classes, vars, and ppt
     int var_start = def.indexOf('<');
-    int ppt_start = def.indexOf("@");
+    int ppt_start = def.indexOf('@');
     if ((var_start == -1) && (ppt_start == -1)) {
       classes = def;
     } else if (var_start != -1) {

java/daikon/DynComp.java

@@ -418,7 +418,7 @@ public static long elapsedMsecs() {
   public String argsToString(List<String> args) {
     String str = "";
     for (String arg : args) {
-      if (arg.indexOf(" ") != -1) {
+      if (arg.indexOf(' ') != -1) {
         arg = "'" + arg + "'";
       }
       str += arg + " ";

java/daikon/PrintInvariants.java

@@ -1249,8 +1249,8 @@ public static String parse_csharp_invariant_variable(VarInfo varInfo, boolean so
 
     if (!sort) {
       String r = varInfo.name_using(OutputFormat.CSHARPCONTRACT);
-      int a = r.indexOf("[");
-      int b = r.indexOf("]");
+      int a = r.indexOf('[');
+      int b = r.indexOf(']');
       if (a != 1 && b != 1 && a < b) {
         String middle = r.substring(a + 1, b);
         if (middle.equals("..")) {

java/daikon/VarComparabilityImplicit.java

@@ -99,7 +99,7 @@ static VarComparabilityImplicit parse(String rep, @Nullable ProglangType vartype
     List<String> dim_reps = new ArrayList<>();
     // handle array types
     while (rep.endsWith("]")) {
-      int openpos = rep.lastIndexOf("[");
+      int openpos = rep.lastIndexOf('[');
       dim_reps.add(0, rep.substring(openpos + 1, rep.length() - 1));
       rep = rep.substring(0, openpos);
     }

java/daikon/VarInfo.java

@@ -1111,7 +1111,7 @@ public boolean isClosure() {
     // This should eventually turn into
     //   return name.indexOf("closure(") != -1;
     // when I rename those variables to "closure(...)".
-    return name().indexOf("~") != -1; // XXX
+    return name().indexOf('~') != -1; // XXX
   }
 
   /** Cached value for getDerivedParam(). */
@@ -3202,7 +3202,7 @@ public String csharp_name(@Nullable String index) {
         if (enclosing_var != null) {
 
           if (isStatic(str_name, enclosing_var.name())) {
-            String qualifiedName = str_name.substring(0, str_name.indexOf("("));
+            String qualifiedName = str_name.substring(0, str_name.indexOf('('));
             return qualifiedName + "(" + enclosing_var.csharp_name(index) + ")";
           } else if (var_flags.contains(VarFlags.IS_PROPERTY)) {
             return enclosing_var.csharp_name(index) + "." + relative_name;

java/daikon/VarInfoName.java

@@ -127,7 +127,7 @@ public static VarInfoName parse(String name) {
     if (name.endsWith("]")) {
       // This isn't quite right:  we really want the matching open bracket,
       // not the last open bracket.
-      int lbracket = name.lastIndexOf("[");
+      int lbracket = name.lastIndexOf('[');
       if (lbracket >= 0) {
         String seqname = name.substring(0, lbracket) + "[]";
         String idxname = name.substring(lbracket + 1, name.length() - 1);
@@ -1731,14 +1731,14 @@ public <T> T accept(Visitor<T> v) {
   // sansOrig()
   //      int origpos = s.indexOf("orig(");
   //      assert origpos != -1;
-  //      int rparenpos = s.lastIndexOf(")");
+  //      int rparenpos = s.lastIndexOf(')');
   //      return s.substring(0, origpos)
   //        + s.substring(origpos+5, rparenpos)
   //        + s.substring(rparenpos+1);
 
   //      int origpos = s.indexOf("\\old(");
   //      assert origpos != -1;
-  //      int rparenpos = s.lastIndexOf(")");
+  //      int rparenpos = s.lastIndexOf(')');
   //      return s.substring(0, origpos)
   //        + s.substring(origpos+5, rparenpos)
   //        + s.substring(rparenpos+1);

java/daikon/chicory/Instrument.java

@@ -1154,7 +1154,7 @@ private boolean isConstructor(MethodGen mgen) {
     // the outer class constructor.  I need to detect this and adjust the
     // parameter names appropriately.  This check is ugly.
     if (mgen.getName().equals("<init>") && mgen.getArgumentTypes().length > 0) {
-      int dollarPos = mgen.getClassName().lastIndexOf("$");
+      int dollarPos = mgen.getClassName().lastIndexOf('$');
       String arg0Name = mgen.getArgumentType(0).toString();
       if (dollarPos >= 0
           &&

java/daikon/chicory/Instrument24.java

@@ -1373,7 +1373,7 @@ private boolean isConstructor(MethodGen24 mgen) {
     // the outer class constructor.  I need to detect this and adjust the
     // parameter names appropriately.  This check is ugly.
     if (mgen.getName().equals("<init>") && mgen.getParameterTypes().length > 0) {
-      int dollarPos = mgen.getClassName().lastIndexOf("$");
+      int dollarPos = mgen.getClassName().lastIndexOf('$');
       @SuppressWarnings("signature:assignment") // need JDK annotations
       @FieldDescriptor String arg0Fd = mgen.getParameterType(0).descriptorString();
       String arg0Name = convertDescriptorToFqBinaryName(arg0Fd);

java/daikon/dcomp/DCRuntime.java

@@ -2200,7 +2200,7 @@ private static String skinyOutput(DaikonVariableInfo dv, boolean on) {
     }
     String dvtxt = dv.toString();
     String type = dvtxt.split(":")[0];
-    type = type.substring(type.lastIndexOf(".") + 1);
+    type = type.substring(type.lastIndexOf('.') + 1);
     String name = dvtxt.split(":")[1];
     if (type.equals("ThisObjInfo")) {
       dvtxt = "this";

java/daikon/dcomp/TagEntry.java

@@ -318,7 +318,7 @@ public static String generateTraceString() {
   private static String traceLineToString(StackTraceElement ste, boolean abbreviate) {
     String className = ste.getClassName();
     if (abbreviate) {
-      className = className.substring(className.lastIndexOf("."));
+      className = className.substring(className.lastIndexOf('.'));
     }
     return className + ":" + ste.getMethodName() + "(), " + ste.getLineNumber();
   }

java/daikon/diff/MatchCountVisitor.java

@@ -178,7 +178,7 @@ private static boolean acceptableNumber(String numLiteral) {
     // point number
 
     // could be float, look for "."
-    if (numLiteral.indexOf(".") > -1) {
+    if (numLiteral.indexOf('.') > -1) {
       // float fnum = Float.parseFloat(numLiteral);
       // for now, accept all floats (ignore return value of parseFloat)
       return true;

java/daikon/diff/MultiDiffVisitor.java

@@ -248,7 +248,7 @@ public void printAllSpinfo() {
   @Override
   protected boolean shouldPrint(@Nullable Invariant inv1, @Nullable Invariant inv2) {
     return true; // super.shouldPrint (inv1, inv2) &&
-    //    inv1.format().toString().indexOf(">") == -1 &&
+    //    inv1.format().toString().indexOf('>') == -1 &&
     // inv1.format().toString().indexOf("orig") == -1;
   }
 }

java/daikon/test/inv/InvariantAddAndCheckTester.java

@@ -448,7 +448,7 @@ private static boolean initFields(LineNumberReader commands, boolean generatingC
     private static void executeCheckOrAddCommand(String command, int lineNumber) {
 
       // remove the command
-      String args = command.substring(command.indexOf(":") + 1);
+      String args = command.substring(command.indexOf(':') + 1);
 
       StringTokenizer tokens = new StringTokenizer(args, argDivider);
       if (tokens.countTokens() != types.length + 2) {
@@ -495,7 +495,7 @@ private static void executeCheckOrAddCommand(String command, int lineNumber) {
     /** Given a line from an input file, generates appropriate check or add command. */
     private static void generateCheckOrAddCommand(String command, int lineNumber) {
       // remove the command
-      String args = command.substring(command.indexOf(":") + 1);
+      String args = command.substring(command.indexOf(':') + 1);
 
       StringTokenizer tokens = new StringTokenizer(args, argDivider);
       if (tokens.countTokens() != types.length) {

java/daikon/tools/ExtractConsequent.java

@@ -414,11 +414,16 @@ private static boolean contains_constant_non_012(Invariant inv) {
     return false;
   }
 
-  // remove non-word characters and everything after ":::" from the
-  // program point name, leaving PackageName.ClassName.MethodName
+  /**
+   * Remove non-word characters and everything after "(" (which includes everything after ":::")
+   * from the program point name, leaving "PackageName.ClassName.MethodName".
+   *
+   * @param pptname a program point name
+   * @return the argument, without non-word characters and without parens or ":::" suffix
+   */
   private static String cleanup_pptname(String pptname) {
     int index;
-    if ((index = pptname.indexOf("(")) > 0) {
+    if ((index = pptname.indexOf('(')) > 0) {
       pptname = pptname.substring(0, index);
     }
 

java/daikon/tools/compare/LogicalCompare.java

@@ -603,9 +603,10 @@ private static void readExtraAssumptions(String filename) {
           // expression, then look for a comment after that. But that
           // would involve counting parens and vertical bars and
           // backslashes, which I'm too lazy to do right now.
-          if (line.indexOf("#") != -1) {
-            formula = line.substring(0, line.indexOf("#"));
-            comment = line.substring(line.indexOf("#") + 1);
+          int hash = line.indexOf('#');
+          if (hash != -1) {
+            formula = line.substring(0, hash);
+            comment = line.substring(hash + 1);
           } else {
             formula = line;
             comment = "User-supplied assumption";

java/daikon/tools/jtb/CreateSpinfo.java

@@ -157,7 +157,7 @@ private static String spinfoFileName(String javaFileName) {
         "Warning: CreateSpinfo input file " + javaFileName + "does not end in .java.");
 
     // change the file extension to .spinfo
-    int dotPos = javaFileName.indexOf(".");
+    int dotPos = javaFileName.indexOf('.');
     if (dotPos == -1) {
       return javaFileName + ".spinfo";
     } else {

java/daikon/tools/jtb/CreateSpinfoC.java

@@ -27,7 +27,7 @@ public static void main(String[] args) {
       return;
     }
     try {
-      String fileName = args[0].substring(0, args[0].lastIndexOf("."));
+      String fileName = args[0].substring(0, args[0].lastIndexOf('.'));
       File temp = new File(fileName + ".temp");
       // filter out the '\f' characters in the file
       try (Reader reader = Files.newBufferedReader(Paths.get(args[0]), UTF_8);

java/daikon/tools/runtimechecker/InstrumentVisitor.java

@@ -1076,7 +1076,7 @@ private static Property toProperty(Invariant inv) {
 
     String javarep = inv.format_using(OutputFormat.JAVA);
 
-    if (daikonrep.indexOf("\"") != -1 || daikonrep.indexOf("\\") != -1) {
+    if (daikonrep.indexOf('\"') != -1 || daikonrep.indexOf('\\') != -1) {
       // Now comes some real ugliness: [[ ... ]] It's easier to do
       // this transformation on a character list than by pattern
       // matching against a String.