diff options
-rw-r--r-- | .hgtags | 11 | ||||
-rw-r--r-- | THIRD_PARTY_README | 118 | ||||
-rw-r--r-- | src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java | 6 | ||||
-rw-r--r-- | src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java | 6 | ||||
-rw-r--r-- | src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java | 16 |
5 files changed, 144 insertions, 13 deletions
@@ -1067,3 +1067,14 @@ fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-ga 1bccea33f6dbb43bf0cb74b82bd9669aba5319ab jdk8u242-b07 0704986602a8506f41e5a4648d724be74f1e6f95 jdk8u242-b08 0704986602a8506f41e5a4648d724be74f1e6f95 jdk8u242-ga +191f7b51899b59c104f0ec3fc135cf50bf836e99 jdk8u252-b00 +7487b6f12a01cd9596f80b49440859aa33ba4890 jdk8u252-b01 +bbf9c324a735c6b9f95fedc61803346ef93b27f2 jdk8u252-b02 +91381cf36ea49a3e08b10971160f714a6bf71dfd jdk8u252-b03 +e767af0b6500d829977e23cfb3fe19f28a4e9f88 jdk8u252-b04 +7fd34fff5c4418b869b96c6f3c1f9fd632590a5b jdk8u252-b05 +b988f627520c45015f0b91d2ee35e69531300770 jdk8u252-b06 +0666ec7fe2b45353dc0e09c1f6f386bdf763eeb4 jdk8u252-b07 +95d61d0f326bbfaddc2cbd29e67b12c00041caaa jdk8u252-b08 +2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-b09 +2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-ga diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index 643ea79c..a9adb432 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -1712,10 +1712,60 @@ which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. --- begin of LICENSE --- + Mesa 3-D Graphics Library v19.2.1 + + Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +Attention, Contributors + +When contributing to the Mesa project you must agree to the licensing terms +of the component to which you're contributing. +The following section lists the primary components of the Mesa distribution +and their respective licenses. +Mesa Component Licenses + + + +Component Location License +------------------------------------------------------------------ +Main Mesa code src/mesa/ MIT +Device drivers src/mesa/drivers/* MIT, generally + +Gallium code src/gallium/ MIT + +Ext headers GL/glext.h Khronos + GL/glxext.h Khronos + GL/wglext.h Khronos + KHR/khrplatform.h Khronos + +***************************************************************************** + +---- +include/GL/gl.h : + + Mesa 3-D graphics library - Version: 5.0 - Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + Copyright (C) 2009 VMware, Inc. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -1730,9 +1780,67 @@ which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + ***************************************************************************** + +---- +include/GL/glext.h +include/GL/glxext.h +include/GL/wglxext.h : + + + Copyright (c) 2013 - 2018 The Khronos Group Inc. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + + ***************************************************************************** + +---- +include/KHR/khrplatform.h : + + Copyright (c) 2008 - 2018 The Khronos Group Inc. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + + ***************************************************************************** --- end of LICENSE --- diff --git a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java index d194e2d9..6f122a3b 100644 --- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -141,14 +141,14 @@ final class RegExpScanner extends Scanner { throw new PatternSyntaxException(e.getMessage(), string, scanner.position); } - scanner.processForwardReferences(); - // Throw syntax error unless we parsed the entire JavaScript regexp without syntax errors if (scanner.position != string.length()) { final String p = scanner.getStringBuilder().toString(); throw new PatternSyntaxException(string, p, p.length() + 1); } + scanner.processForwardReferences(); + return scanner; } diff --git a/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java b/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java index 9960899d..35fba719 100644 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java @@ -452,7 +452,7 @@ class Parser extends Lexer { private Node parseExp(final TokenType term) { if (token.type == term) { - return StringNode.EMPTY; // goto end_of_token + return StringNode.createEmpty(); // goto end_of_token } Node node = null; @@ -461,7 +461,7 @@ class Parser extends Lexer { switch(token.type) { case ALT: case EOT: - return StringNode.EMPTY; // end_of_token:, node_new_empty + return StringNode.createEmpty(); // end_of_token:, node_new_empty case SUBEXP_OPEN: node = parseEnclose(TokenType.SUBEXP_CLOSE); @@ -569,7 +569,7 @@ class Parser extends Lexer { if (syntax.contextInvalidRepeatOps()) { throw new SyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED); } - node = StringNode.EMPTY; // node_new_empty + node = StringNode.createEmpty(); // node_new_empty } else { return parseExpTkByte(group); // goto tk_byte } diff --git a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java index 985c95e6..8b9bd938 100644 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java @@ -27,7 +27,6 @@ public final class StringNode extends Node implements StringType { private static final int NODE_STR_MARGIN = 16; private static final int NODE_STR_BUF_SIZE = 24; - public static final StringNode EMPTY = new StringNode(null, Integer.MAX_VALUE, Integer.MAX_VALUE); public char[] chars; public int p; @@ -36,7 +35,13 @@ public final class StringNode extends Node implements StringType { public int flag; public StringNode() { - this.chars = new char[NODE_STR_BUF_SIZE]; + this(NODE_STR_BUF_SIZE); + } + + private StringNode(int size) { + this.chars = new char[size]; + this.p = 0; + this.end = 0; } public StringNode(final char[] chars, final int p, final int end) { @@ -51,6 +56,13 @@ public final class StringNode extends Node implements StringType { chars[end++] = c; } + /** + * Create a new empty StringNode. + */ + public static StringNode createEmpty() { + return new StringNode(0); + } + /* Ensure there is ahead bytes available in node's buffer * (assumes that the node is not shared) */ |