Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java	Fri Aug 23 13:10:45 2013 +0200
     1.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java	Fri Aug 23 14:16:16 2013 +0200
     1.3 @@ -27,7 +27,6 @@
     1.4  
     1.5  import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL;
     1.6  import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
     1.7 -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
     1.8  import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
     1.9  import static jdk.internal.org.objectweb.asm.Opcodes.V1_7;
    1.10  import static jdk.nashorn.internal.tools.nasgen.StringConstants.CONSTRUCTOR_SUFFIX;

     2.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java	Fri Aug 23 13:10:45 2013 +0200
     2.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java	Fri Aug 23 14:16:16 2013 +0200
     2.3 @@ -27,7 +27,6 @@
     2.4  
     2.5  import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
     2.6  import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
     2.7 -import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
     2.8  import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
     2.9  import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
    2.10  import static jdk.internal.org.objectweb.asm.Opcodes.NEW;

     3.1 --- a/src/jdk/internal/dynalink/ChainedCallSite.java	Fri Aug 23 13:10:45 2013 +0200
     3.2 +++ b/src/jdk/internal/dynalink/ChainedCallSite.java	Fri Aug 23 14:16:16 2013 +0200
     3.3 @@ -121,7 +121,6 @@
     3.4       * to change the value. If your override returns a value less than 1, the code will break.
     3.5       * @return the maximum number of method handles in the chain.
     3.6       */
     3.7 -    @SuppressWarnings("static-method")
     3.8      protected int getMaxChainLength() {
     3.9          return 8;
    3.10      }

     4.1 --- a/src/jdk/internal/dynalink/DefaultBootstrapper.java	Fri Aug 23 13:10:45 2013 +0200
     4.2 +++ b/src/jdk/internal/dynalink/DefaultBootstrapper.java	Fri Aug 23 14:16:16 2013 +0200
     4.3 @@ -133,7 +133,7 @@
     4.4       * @param type the method signature at the call site
     4.5       * @return a new {@link MonomorphicCallSite} linked with the default dynamic linker.
     4.6       */
     4.7 -    public static CallSite publicBootstrap(@SuppressWarnings("unused") MethodHandles.Lookup caller, String name, MethodType type) {
     4.8 +    public static CallSite publicBootstrap(MethodHandles.Lookup caller, String name, MethodType type) {
     4.9          return bootstrapInternal(MethodHandles.publicLookup(), name, type);
    4.10      }
    4.11  

     5.1 --- a/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java	Fri Aug 23 13:10:45 2013 +0200
     5.2 +++ b/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java	Fri Aug 23 14:16:16 2013 +0200
     5.3 @@ -97,6 +97,7 @@
     5.4  import java.util.HashMap;
     5.5  import java.util.List;
     5.6  import java.util.Map;
     5.7 +
     5.8  import jdk.internal.dynalink.CallSiteDescriptor;
     5.9  import jdk.internal.dynalink.beans.GuardedInvocationComponent.ValidationType;
    5.10  import jdk.internal.dynalink.linker.GuardedInvocation;

     6.1 --- a/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java	Fri Aug 23 13:10:45 2013 +0200
     6.2 +++ b/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java	Fri Aug 23 14:16:16 2013 +0200
     6.3 @@ -148,6 +148,7 @@
     6.4          }
     6.5      }
     6.6  
     6.7 +    @SuppressWarnings("fallthrough")
     6.8      @Override
     6.9      public MethodHandle getInvocation(final CallSiteDescriptor callSiteDescriptor, final LinkerServices linkerServices) {
    6.10          final MethodType callSiteType = callSiteDescriptor.getMethodType();

     7.1 --- a/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Fri Aug 23 13:10:45 2013 +0200
     7.2 +++ b/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Fri Aug 23 14:16:16 2013 +0200
     7.3 @@ -124,6 +124,7 @@
     7.4      }
     7.5  
     7.6      // load engine.js and return content as a char[]
     7.7 +    @SuppressWarnings("resource")
     7.8      private static char[] loadEngineJSSource() {
     7.9          final String script = "resources/engine.js";
    7.10          try {
    7.11 @@ -212,9 +213,8 @@
    7.12              // just create normal SimpleBindings.
    7.13              // We use same 'global' for all Bindings.
    7.14              return new SimpleBindings();
    7.15 -        } else {
    7.16 -            return createGlobalMirror(null);
    7.17          }
    7.18 +        return createGlobalMirror(null);
    7.19      }
    7.20  
    7.21      // Compilable methods

     8.1 --- a/src/jdk/nashorn/internal/codegen/CompilationPhase.java	Fri Aug 23 13:10:45 2013 +0200
     8.2 +++ b/src/jdk/nashorn/internal/codegen/CompilationPhase.java	Fri Aug 23 14:16:16 2013 +0200
     8.3 @@ -414,30 +414,34 @@
     8.4                      compiler.getCodeInstaller().verify(bytecode);
     8.5                  }
     8.6  
     8.7 -                // should code be dumped to disk - only valid in compile_only
     8.8 -                // mode?
     8.9 +                // should code be dumped to disk - only valid in compile_only mode?
    8.10                  if (env._dest_dir != null && env._compile_only) {
    8.11                      final String fileName = className.replace('.', File.separatorChar) + ".class";
    8.12 -                    final int index = fileName.lastIndexOf(File.separatorChar);
    8.13 +                    final int    index    = fileName.lastIndexOf(File.separatorChar);
    8.14  
    8.15 +                    final File dir;
    8.16                      if (index != -1) {
    8.17 -                        final File dir = new File(fileName.substring(0, index));
    8.18 -                        try {
    8.19 -                            if (!dir.exists() && !dir.mkdirs()) {
    8.20 -                                throw new IOException(dir.toString());
    8.21 -                            }
    8.22 -                            final File file = new File(env._dest_dir, fileName);
    8.23 -                            try (final FileOutputStream fos = new FileOutputStream(file)) {
    8.24 -                                fos.write(bytecode);
    8.25 -                            }
    8.26 -                        } catch (final IOException e) {
    8.27 -                            Compiler.LOG.warning("Skipping class dump for ",
    8.28 -                                    className,
    8.29 -                                    ": ",
    8.30 -                                    ECMAErrors.getMessage(
    8.31 -                                        "io.error.cant.write",
    8.32 -                                        dir.toString()));
    8.33 +                        dir = new File(env._dest_dir, fileName.substring(0, index));
    8.34 +                    } else {
    8.35 +                        dir = new File(env._dest_dir);
    8.36 +                    }
    8.37 +
    8.38 +                    try {
    8.39 +                        if (!dir.exists() && !dir.mkdirs()) {
    8.40 +                            throw new IOException(dir.toString());
    8.41                          }
    8.42 +                        final File file = new File(env._dest_dir, fileName);
    8.43 +                        try (final FileOutputStream fos = new FileOutputStream(file)) {
    8.44 +                            fos.write(bytecode);
    8.45 +                        }
    8.46 +                        Compiler.LOG.info("Wrote class to '" + file.getAbsolutePath() + '\'');
    8.47 +                    } catch (final IOException e) {
    8.48 +                        Compiler.LOG.warning("Skipping class dump for ",
    8.49 +                                className,
    8.50 +                                ": ",
    8.51 +                                ECMAErrors.getMessage(
    8.52 +                                    "io.error.cant.write",
    8.53 +                                    dir.toString()));
    8.54                      }
    8.55                  }
    8.56              }

     9.1 --- a/src/jdk/nashorn/internal/objects/NativeArray.java	Fri Aug 23 13:10:45 2013 +0200
     9.2 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java	Fri Aug 23 14:16:16 2013 +0200
     9.3 @@ -40,6 +40,7 @@
     9.4  import java.util.Iterator;
     9.5  import java.util.List;
     9.6  import java.util.concurrent.Callable;
     9.7 +
     9.8  import jdk.nashorn.api.scripting.ScriptObjectMirror;
     9.9  import jdk.nashorn.internal.objects.annotations.Attribute;
    9.10  import jdk.nashorn.internal.objects.annotations.Constructor;
    9.11 @@ -632,6 +633,7 @@
    9.12          return new NativeArray(list.toArray());
    9.13      }
    9.14  
    9.15 +    @SuppressWarnings("null")
    9.16      private static void concatToList(final ArrayList<Object> list, final Object obj) {
    9.17          final boolean isScriptArray = isArray(obj);
    9.18          final boolean isScriptObject = isScriptArray || obj instanceof ScriptObject;

    10.1 --- a/src/jdk/nashorn/internal/objects/NativeRegExp.java	Fri Aug 23 13:10:45 2013 +0200
    10.2 +++ b/src/jdk/nashorn/internal/objects/NativeRegExp.java	Fri Aug 23 14:16:16 2013 +0200
    10.3 @@ -65,10 +65,9 @@
    10.4      private RegExp regexp;
    10.5  
    10.6      // Reference to global object needed to support static RegExp properties
    10.7 -    private Global globalObject;
    10.8 +    private final Global globalObject;
    10.9  
   10.10      // initialized by nasgen
   10.11 -    @SuppressWarnings("unused")
   10.12      private static PropertyMap $nasgenmap$;
   10.13  
   10.14      static PropertyMap getInitialMap() {

    11.1 --- a/src/jdk/nashorn/internal/runtime/Context.java	Fri Aug 23 13:10:45 2013 +0200
    11.2 +++ b/src/jdk/nashorn/internal/runtime/Context.java	Fri Aug 23 14:16:16 2013 +0200
    11.3 @@ -894,7 +894,6 @@
    11.4          return script;
    11.5      }
    11.6  
    11.7 -    @SuppressWarnings("static-method")
    11.8      private ScriptLoader createNewLoader() {
    11.9          return AccessController.doPrivileged(
   11.10               new PrivilegedAction<ScriptLoader>() {

    12.1 --- a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Fri Aug 23 13:10:45 2013 +0200
    12.2 +++ b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Fri Aug 23 14:16:16 2013 +0200
    12.3 @@ -44,6 +44,7 @@
    12.4           * Hook to force the loading of the DebuggerValueDesc class so that it is
    12.5           * available to external debuggers.
    12.6           */
    12.7 +        @SuppressWarnings("unused")
    12.8          DebuggerValueDesc forceLoad = new DebuggerValueDesc(null, false, null, null);
    12.9      }
   12.10  
   12.11 @@ -111,9 +112,8 @@
   12.12          if (value instanceof ScriptObject && !(value instanceof ScriptFunction)) {
   12.13              final ScriptObject object = (ScriptObject)value;
   12.14              return new DebuggerValueDesc(name, !object.isEmpty(), value, objectAsString(object, all, duplicates));
   12.15 -        } else {
   12.16 -            return new DebuggerValueDesc(name, false, value, valueAsString(value));
   12.17          }
   12.18 +        return new DebuggerValueDesc(name, false, value, valueAsString(value));
   12.19      }
   12.20  
   12.21      /**
   12.22 @@ -199,7 +199,7 @@
   12.23                      final String valueAsString = descs[i].valueAsString;
   12.24                      sb.append(descs[i].key);
   12.25                      sb.append(": ");
   12.26 -                    sb.append(descs[i].valueAsString);
   12.27 +                    sb.append(valueAsString);
   12.28                  }
   12.29              }
   12.30  
   12.31 @@ -239,9 +239,8 @@
   12.32          case FUNCTION:
   12.33              if (value instanceof ScriptFunction) {
   12.34                  return ((ScriptFunction)value).toSource();
   12.35 -            } else {
   12.36 -                return value.toString();
   12.37              }
   12.38 +            return value.toString();
   12.39  
   12.40          default:
   12.41              return value.toString();

    13.1 --- a/src/jdk/nashorn/internal/runtime/ScriptObject.java	Fri Aug 23 13:10:45 2013 +0200
    13.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptObject.java	Fri Aug 23 14:16:16 2013 +0200
    13.3 @@ -52,6 +52,7 @@
    13.4  import java.util.List;
    13.5  import java.util.Map;
    13.6  import java.util.Set;
    13.7 +
    13.8  import jdk.internal.dynalink.CallSiteDescriptor;
    13.9  import jdk.internal.dynalink.linker.GuardedInvocation;
   13.10  import jdk.internal.dynalink.linker.LinkRequest;
   13.11 @@ -1149,12 +1150,12 @@
   13.12  
   13.13          if (newProto == null || newProto instanceof ScriptObject) {
   13.14              // check for circularity
   13.15 -            ScriptObject proto = (ScriptObject)newProto;
   13.16 -            while (proto != null) {
   13.17 -                if (proto == this) {
   13.18 +            ScriptObject p = (ScriptObject)newProto;
   13.19 +            while (p != null) {
   13.20 +                if (p == this) {
   13.21                      throw typeError("circular.__proto__.set", ScriptRuntime.safeToString(this));
   13.22                  }
   13.23 -                proto = proto.getProto();
   13.24 +                p = p.getProto();
   13.25              }
   13.26              setProto((ScriptObject)newProto);
   13.27          } else {
   13.28 @@ -2017,6 +2018,7 @@
   13.29       * @param request the link request
   13.30       * @return GuardedInvocation to be invoked at call site.
   13.31       */
   13.32 +    @SuppressWarnings("null")
   13.33      public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) {
   13.34          final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
   13.35          final FindProperty find = findProperty(NO_SUCH_PROPERTY_NAME, true);

    14.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java	Fri Aug 23 13:10:45 2013 +0200
    14.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java	Fri Aug 23 14:16:16 2013 +0200
    14.3 @@ -39,7 +39,6 @@
    14.4  import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
    14.5  import jdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
    14.6  import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
    14.7 -import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
    14.8  
    14.9  final class ArrayCompiler extends Compiler {
   14.10      private int[] code;
   14.11 @@ -345,6 +344,7 @@
   14.12  
   14.13      private static final int QUANTIFIER_EXPAND_LIMIT_SIZE   = 50; // was 50
   14.14  
   14.15 +    @SuppressWarnings("unused")
   14.16      private static boolean cknOn(int ckn) {
   14.17          return ckn > 0;
   14.18      }
   14.19 @@ -879,6 +879,7 @@
   14.20          }
   14.21      }
   14.22  
   14.23 +    @SuppressWarnings("unused")
   14.24      private void addStateCheckNum(int num) {
   14.25          addInt(num);
   14.26      }
   14.27 @@ -887,6 +888,7 @@
   14.28          addInt(addr);
   14.29      }
   14.30  
   14.31 +    @SuppressWarnings("unused")
   14.32      private void addAbsAddr(int addr) {
   14.33          addInt(addr);
   14.34      }

    15.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java	Fri Aug 23 13:10:45 2013 +0200
    15.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java	Fri Aug 23 14:16:16 2013 +0200
    15.3 @@ -29,6 +29,7 @@
    15.4      final int[] bits = new int[BITSET_SIZE];
    15.5  
    15.6      private static final int BITS_TO_STRING_WRAP = 4;
    15.7 +    @Override
    15.8      public String toString() {
    15.9          StringBuilder buffer = new StringBuilder();
   15.10          buffer.append("BitSet");

    16.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java	Fri Aug 23 13:10:45 2013 +0200
    16.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java	Fri Aug 23 14:16:16 2013 +0200
    16.3 @@ -96,6 +96,7 @@
    16.4          }
    16.5      }
    16.6  
    16.7 +    @Override
    16.8      protected final int matchAt(int range, int sstart, int sprev) {
    16.9          this.range = range;
   16.10          this.sstart = sstart;
   16.11 @@ -731,8 +732,6 @@
   16.12          // STRING_CMP
   16.13          while(n-- > 0) if (chars[pstart++] != chars[s++]) {opFail(); return;}
   16.14  
   16.15 -        int len;
   16.16 -
   16.17          // beyond string check
   16.18          if (sprev < range) {
   16.19              while (sprev + 1 < s) sprev++;
   16.20 @@ -768,7 +767,6 @@
   16.21          if (!stringCmpIC(regex.caseFoldFlag, pstart, this, n, end)) {opFail(); return;}
   16.22          s = value;
   16.23  
   16.24 -        int len;
   16.25          // if (sprev < chars.length)
   16.26          while (sprev + 1 < s) sprev++;
   16.27      }
   16.28 @@ -796,8 +794,6 @@
   16.29  
   16.30              s = swork;
   16.31  
   16.32 -            int len;
   16.33 -
   16.34              // beyond string check
   16.35              if (sprev < range) {
   16.36                  while (sprev + 1 < s) sprev++;
   16.37 @@ -829,7 +825,6 @@
   16.38              if (!stringCmpIC(regex.caseFoldFlag, pstart, this, n, end)) continue loop; // STRING_CMP_VALUE_IC
   16.39              s = value;
   16.40  
   16.41 -            int len;
   16.42              // if (sprev < chars.length)
   16.43              while (sprev + 1 < s) sprev++;
   16.44  
   16.45 @@ -902,7 +897,6 @@
   16.46  
   16.47          sprev = s;
   16.48          if (backrefMatchAtNestedLevel(ic != 0, regex.caseFoldFlag, level, tlen, ip)) { // (s) and (end) implicit
   16.49 -            int len;
   16.50              while (sprev + 1 < s) sprev++;
   16.51              ip += tlen; // * SIZE_MEMNUM
   16.52          } else {

    17.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java	Fri Aug 23 13:10:45 2013 +0200
    17.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java	Fri Aug 23 14:16:16 2013 +0200
    17.3 @@ -58,6 +58,7 @@
    17.4          used = orig.used;
    17.5      }
    17.6  
    17.7 +    @Override
    17.8      public String toString() {
    17.9          StringBuilder buf = new StringBuilder();
   17.10          buf.append("CodeRange");

    18.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java	Fri Aug 23 13:10:45 2013 +0200
    18.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java	Fri Aug 23 14:16:16 2013 +0200
    18.3 @@ -139,6 +139,7 @@
    18.4          }
    18.5      }
    18.6  
    18.7 +    @SuppressWarnings("fallthrough")
    18.8      /* \M-, \C-, \c, or \... */
    18.9      private int fetchEscapedValue() {
   18.10          if (!left()) {

    19.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java	Fri Aug 23 13:10:45 2013 +0200
    19.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java	Fri Aug 23 14:16:16 2013 +0200
    19.3 @@ -297,8 +297,6 @@
    19.4                  throw new SyntaxException(ERR_END_PATTERN_IN_GROUP);
    19.5              }
    19.6  
    19.7 -            boolean listCapture = false;
    19.8 -
    19.9              fetch();
   19.10              switch(c) {
   19.11              case ':':  /* (?:...) grouping only */

    20.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java	Fri Aug 23 13:10:45 2013 +0200
    20.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java	Fri Aug 23 14:16:16 2013 +0200
    20.3 @@ -32,6 +32,7 @@
    20.4          this.end = new int[num];
    20.5      }
    20.6  
    20.7 +    @Override
    20.8      public String toString() {
    20.9          StringBuilder sb = new StringBuilder();
   20.10          sb.append("Region: \n");

    21.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java	Fri Aug 23 13:10:45 2013 +0200
    21.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java	Fri Aug 23 14:16:16 2013 +0200
    21.3 @@ -21,9 +21,6 @@
    21.4  
    21.5  import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
    21.6  import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
    21.7 -import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
    21.8 -import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
    21.9 -import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
   21.10  
   21.11  abstract class ScannerSupport extends IntHolder implements ErrorMessages {
   21.12  

    22.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java	Fri Aug 23 13:10:45 2013 +0200
    22.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java	Fri Aug 23 14:16:16 2013 +0200
    22.3 @@ -28,14 +28,17 @@
    22.4  
    22.5      public static final SearchAlgorithm NONE = new SearchAlgorithm() {
    22.6  
    22.7 +        @Override
    22.8          public final String getName() {
    22.9              return "NONE";
   22.10          }
   22.11  
   22.12 +        @Override
   22.13          public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
   22.14              return textP;
   22.15          }
   22.16  
   22.17 +        @Override
   22.18          public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
   22.19              return textP;
   22.20          }
   22.21 @@ -44,10 +47,12 @@
   22.22  
   22.23      public static final SearchAlgorithm SLOW = new SearchAlgorithm() {
   22.24  
   22.25 +        @Override
   22.26          public final String getName() {
   22.27              return "EXACT";
   22.28          }
   22.29  
   22.30 +        @Override
   22.31          public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
   22.32              char[] target = regex.exact;
   22.33              int targetP = regex.exactP;
   22.34 @@ -78,6 +83,7 @@
   22.35              return -1;
   22.36          }
   22.37  
   22.38 +        @Override
   22.39          public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
   22.40              char[] target = regex.exact;
   22.41              int targetP = regex.exactP;
   22.42 @@ -114,10 +120,12 @@
   22.43              this.caseFoldFlag = regex.caseFoldFlag;
   22.44          }
   22.45  
   22.46 +        @Override
   22.47          public final String getName() {
   22.48              return "EXACT_IC";
   22.49          }
   22.50  
   22.51 +        @Override
   22.52          public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
   22.53              char[] target = regex.exact;
   22.54              int targetP = regex.exactP;
   22.55 @@ -136,6 +144,7 @@
   22.56              return -1;
   22.57          }
   22.58  
   22.59 +        @Override
   22.60          public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
   22.61              char[] target = regex.exact;
   22.62              int targetP = regex.exactP;
   22.63 @@ -163,14 +172,16 @@
   22.64              }
   22.65              return true;
   22.66          }
   22.67 -    };
   22.68 +    }
   22.69  
   22.70      public static final SearchAlgorithm BM = new SearchAlgorithm() {
   22.71  
   22.72 +        @Override
   22.73          public final String getName() {
   22.74              return "EXACT_BM";
   22.75          }
   22.76  
   22.77 +        @Override
   22.78          public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
   22.79              char[] target = regex.exact;
   22.80              int targetP = regex.exactP;
   22.81 @@ -212,6 +223,7 @@
   22.82  
   22.83          private static final int BM_BACKWARD_SEARCH_LENGTH_THRESHOLD = 100;
   22.84  
   22.85 +        @Override
   22.86          public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
   22.87              char[] target = regex.exact;
   22.88              int targetP = regex.exactP;
   22.89 @@ -263,10 +275,12 @@
   22.90  
   22.91      public static final SearchAlgorithm MAP = new SearchAlgorithm() {
   22.92  
   22.93 +        @Override
   22.94          public final String getName() {
   22.95              return "MAP";
   22.96          }
   22.97  
   22.98 +        @Override
   22.99          public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
  22.100              byte[] map = regex.map;
  22.101              int s = textP;
  22.102 @@ -278,6 +292,7 @@
  22.103              return -1;
  22.104          }
  22.105  
  22.106 +        @Override
  22.107          public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
  22.108              byte[] map = regex.map;
  22.109              int s = textStart;

    23.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java	Fri Aug 23 13:10:45 2013 +0200
    23.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java	Fri Aug 23 14:16:16 2013 +0200
    23.3 @@ -458,7 +458,7 @@
    23.4                                          isNull = 0;
    23.5                                          break;
    23.6                                      } else if (endp != s) {
    23.7 -                                        isNull = -1;; /* empty, but position changed */
    23.8 +                                        isNull = -1; /* empty, but position changed */
    23.9                                      }
   23.10                                  }
   23.11                                  k++;

    24.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java	Fri Aug 23 13:10:45 2013 +0200
    24.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java	Fri Aug 23 14:16:16 2013 +0200
    24.3 @@ -24,6 +24,7 @@
    24.4   */
    24.5  public interface WarnCallback {
    24.6      WarnCallback DEFAULT = new WarnCallback() {
    24.7 +        @Override
    24.8          public void warn(String message) {
    24.9              System.err.println(message);
   24.10          }

    25.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java	Fri Aug 23 13:10:45 2013 +0200
    25.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java	Fri Aug 23 14:16:16 2013 +0200
    25.3 @@ -19,7 +19,6 @@
    25.4   */
    25.5  package jdk.nashorn.internal.runtime.regexp.joni.ast;
    25.6  
    25.7 -import jdk.nashorn.internal.runtime.regexp.joni.Config;
    25.8  import jdk.nashorn.internal.runtime.regexp.joni.Option;
    25.9  import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
   25.10  

    26.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java	Fri Aug 23 13:10:45 2013 +0200
    26.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java	Fri Aug 23 14:16:16 2013 +0200
    26.3 @@ -35,7 +35,7 @@
    26.4      }
    26.5  
    26.6      protected void setChild(Node tgt){}         // default definition
    26.7 -    protected Node getChild(){return null;};    // default definition
    26.8 +    protected Node getChild(){return null;}     // default definition
    26.9  
   26.10      public void swap(Node with) {
   26.11          Node tmp;
   26.12 @@ -74,6 +74,7 @@
   26.13          return getName() + ":0x" + Integer.toHexString(System.identityHashCode(this));
   26.14      }
   26.15  
   26.16 +    @Override
   26.17      public final String toString() {
   26.18          StringBuilder s = new StringBuilder();
   26.19          s.append("<" + getAddressName() + " (" + (parent == null ? "NULL" : parent.getAddressName())  + ")>");

    27.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java	Fri Aug 23 13:10:45 2013 +0200
    27.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java	Fri Aug 23 14:16:16 2013 +0200
    27.3 @@ -223,6 +223,7 @@
    27.4          other.target = null; // remove target from reduced quantifier
    27.5      }
    27.6  
    27.7 +    @SuppressWarnings("fallthrough")
    27.8      public int setQuantifier(Node tgt, boolean group, ScanEnvironment env, char[] chars, int p, int end) {
    27.9          if (lower == 1 && upper == 1) return 1;
   27.10  

    28.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java	Fri Aug 23 13:10:45 2013 +0200
    28.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java	Fri Aug 23 14:16:16 2013 +0200
    28.3 @@ -19,8 +19,6 @@
    28.4   */
    28.5  package jdk.nashorn.internal.runtime.regexp.joni.exception;
    28.6  
    28.7 -import jdk.nashorn.internal.runtime.regexp.joni.Config;
    28.8 -
    28.9  public interface ErrorMessages {
   28.10  
   28.11      /* from jcodings */

    29.1 --- a/tools/fxshell/jdk/nashorn/tools/FXShell.java	Fri Aug 23 13:10:45 2013 +0200
    29.2 +++ b/tools/fxshell/jdk/nashorn/tools/FXShell.java	Fri Aug 23 14:16:16 2013 +0200
    29.3 @@ -32,13 +32,9 @@
    29.4  import java.util.ArrayList;
    29.5  import java.util.List;
    29.6  import java.util.Map;
    29.7 -import java.util.Set;
    29.8 -import java.util.logging.Level;
    29.9 -import java.util.logging.Logger;
   29.10  import javafx.application.Application;
   29.11  import javafx.stage.Stage;
   29.12  import javax.script.Invocable;
   29.13 -import javax.script.ScriptContext;
   29.14  import javax.script.ScriptEngine;
   29.15  import javax.script.ScriptEngineFactory;
   29.16  import javax.script.ScriptEngineManager;
   29.17 @@ -180,6 +176,7 @@
   29.18       *
   29.19       * @return Last evaluation result (discarded.)
   29.20       */
   29.21 +    @SuppressWarnings("resource")
   29.22      private Object load(String path) {
   29.23          try {
   29.24              FileInputStream file = new FileInputStream(path);