jdk8-mips64-public/nashorn: src/jdk/nashorn/internal/parser/AbstractParser.java@e2497b11a021 (annotated)

src/jdk/nashorn/internal/parser/AbstractParser.java@e2497b11a021 (annotated)

src/jdk/nashorn/internal/parser/AbstractParser.java

Wed, 20 Aug 2014 10:26:01 +0200

author: attila
date: Wed, 20 Aug 2014 10:26:01 +0200
changeset 963: e2497b11a021
parent 761: 37bf1b9838b5
child 975: 85e3f07fc5fc
permissions: -rw-r--r--

8027043: Turn global accesses into MethodHandle.constant, with one chance of reassignment, e.g. x = value occuring once in the global scope is ok, twice is not.
8027958: NASHORN TEST: Create tests to test markdown javascript engine work with Nashorn
8028345: Remove nashorn repo "bin" scripts to avoid confusion with JDK bin launcher programs
8029090: Developers should be able to pass nashorn properties and enable/disable JFR from command line
8030169: Need regression test for bug JDK-8010731
8033105: Make sure Nashorn test harness can run zlib benchmark
8033334: Make sure that scope depth information is maintained in the RecompilableScriptFunctionDatas, to avoid unnecessary slow proto linkage when doing on demand compilation
8034206: Make parts of code pipeline reusable in order to facilitate faster warmup and faster lazy compilation.
8035820: Optimistic recompilation
8035836: Array performance improvements
8036127: Prototype filter needs to be applied to getter guard as well, not just getter
8036986: Test should check that correctly type is returned running with optimistic. If optimistic assumption was wrong we should get the right one.
8037086: Check that deoptimizing recompilations are correct
8037177: -Dnashorn.optimistic should be enabled by default, meaning that it has to be explicitly set to false to run with the jdk 8 style conservative types
8037534: Use scope types to determine optimistic types
8037572: Add more test cases to check static types
8037967: Broke the build, by commiting without saving the last review comment
8038223: Symbol trace debug output takes time
8038396: fix for the compiler expression evaluator to be more inquisitive about types
8038398: OptimisticRecompilationTest fails on staging repo nashorn/jdk9/nashorn due to test framework
8038406: Testability: as a first step of moving loggers away from the process global space, the Debug object now supports logging POJOs from log entries as an event queue, which can be introspected from test scripts. This is way better than screen scraping brittle and subject-to-change log output.
8038413: NPE in unboxInteger
8038416: Access to undefined scoped variables deoptimized too much
8038426: Move all loggers from process wide scope into Global scope
8038799: Guard and unbox boxed primitives types on setting them in Properties to avoid megamorphisism
8038945: Simplify strict undefined checks
8039044: Expand undefined intrinsics for all commutative combinators of scrict undefined checks
8039746: Transform applies to calls wherever possible, for ScriptFunctions and JSObjects.
8040024: BranchOptimizer produces bad code for NaN FP comparison
8040089: Apply to call transform was incomplete. Now passes all tests and performance is back
8040093: Make sure that optimistic splitting works in optimistic types
8040102: Remove all references to Unsafe and definition of anonymous clases from the code
8040655: When processing a RewriteException debug object, the return value has already been reset to null. We need to catch this value before that.
8041434: Add synchronization to the common global constants structure
8041625: AccessorProperty currentType must only by Object.class when non-primitive, and scoping followup problem for lazily generated with bodies
8041905: Fix apply2call bug that prevented avatar.js unit tests from running correctly
8041995: Problems when loading tree expressions with several optimistic program points when optimistically initializing ObjectNodes
8042118: Separate types from symbols
8043002: Improve performance of Nashorn equality operators
8043003: Use strongly referenced generic invokers
8043004: Reduce variability at JavaAdapter call sites
8043132: Nashorn : all tests failed with java.security.AccessControlException
8043133: Fix corner cases of JDK-8041995
8043137: Collapse long sequences of NOP in Nashorn bytecode output
8043232: Index selection of overloaded java new constructors
8043235: Type-based optimizations interfere with continuation methods
8043431: Fix yet another corner case of JDK-8041995
8043504: Octane test harness was missing argument to print_always at one callsite, causing erroneous logging
8043605: Enable history for empty property maps
8043608: Make equality tests inline better
8043611: Move timing dependent benchmark for apply2call specialization to currently_failing. It is dependent that nothing takes machine time when doing the two runs, causing spurious assertions. Suggest running octane.raytrace manually instead to verify that this works, or incorporating it in the nightly test suite
8043632: Parallelize class installation and various script fixes.
8043633: In order to remove global state outside of contexts, make sure Timing class is an instance and not a static global collection of data. Move into Context. Move -Dnashorn.timing to an official logging option.
8043956: Make code caching work with optimistic typing and lazy compilation
8044012: Integrate the latest best known performance flags int ant octane jobs, and make sure that it's easy to compare 'ant octane-nashorn' and 'ant octane-v8' at the push of a button. (or rather; the entry of a command line)
8044102: Ensure bechmark exclude list for Octane benchmarks is in only one place, project.properties, and fix benchmark harness
8044154: Nashorn : all tests failed with java.security.AccessControlException
8044171: Make optimistic exception handlers smaller
8044502: Get rid of global optimistic flag
8044518: Ensure exceptions related to optimistic recompilation are not serializable
8044533: Deoptimizing negation produces wrong result for zero
8044534: Constant folding for unary + should produce int for boolean literals
8044760: Avoid PropertyMap duplicate for global instances
8044786: Some tests fail with non-optimistic compilation
8044803: Unnecessary restOf check
8044816: On-demand compiled top-level program doesn't need :createProgramFunction
8044851: nashorn properties leak memory
8046013: TypeError: Cannot apply "with" to non script object
8046014: MultiGlobalCompiledScript should cache :createProgramFunction handle
8046025: AccessorProperty.getGetter is not threadsafe
8046026: CompiledFunction.relinkComposableInvoker assert is being hit
8046201: Avoid repeated flattening of nested ConsStrings
8046215: Running uncompilable scripts throws NullPointerException
8046898: Make sure that lazy compilation is the default, remove redundant "enable lazy compilation" flags, added warning message if compile logging is enabled and lazy is switched off. Verified existing test suite code coverage equivalence between lazy and eager.
8046905: apply on apply is broken
8046921: Deoptimization type information peristence
8047035: (function() "hello")() crashes in Lexer with jdk9
8047057: Add a regression test for the passing test cases from JDK-8042304
8047067: all eval arguments need to be copied in Lower
8047078: Fuzzing bug discovered when ArrayLiteralNodes weren't immutable
8047166: 'do with({}) break ; while(0);' crashes in CodeGenerator
8047331: Assertion in CompiledFunction when running earley-boyer after Merge
8047357: More precise synthetic return + unreachable throw
8047359: large string size RangeError should be thrown rather than reporting negative length
8047369: Add regression tests for passing test cases of JDK-8024971
8047371: local variable declaration in TypeEvaluator should use ScriptObject.addOwnProperty instead of .set
8047728: (function(x){var o={x:0}; with(o){delete x} return o.x})() evaluates to 0 instead of undefined
8047959: bindings created for declarations in eval code are not mutable
8048009: Type info caching accidentally defeated
8048071: eval within 'with' statement does not use correct scope if with scope expression has a copy of eval
8048079: Persistent code store is broken after optimistic types merge
8048505: ScriptingFunctions.readFully couldn't handle file names represented as ConsStrings
8048586: String concatenation with optimistic types is slow
8048718: JSON.parse('{"0":0, "64":0}') throws ArrayindexOutOfBoundsException
8048869: Reduce compile time by about 5% by removing the Class.casts from the AST nodes
8049086: Minor API convenience functions on "Java" object
8049222: JSType class exposes public mutable arrays
8049223: RewriteException class exposes public mutable arrays
8049242: Explicit constructor overload selection should work with StaticClass as well
8049318: Test hideLocationProperties.js fails on Window due to backslash in path
8049524: Global object initialization via javax.script API should be minimal
8050432: javax.script.filename variable should not be enumerable with nashorn engine's ENGINE_SCOPE bindings
8050964: OptimisticTypesPersistence.java should use java.util.Date instead of java.sql.Date
8051019: Separate src and test execution sandbox directories
8051346: Test262 tests for ECMAScript 5 now in branch "es5-tests"
8051439: Wrong type calculated for ADD operator with undefined operand
8051839: GuardedInvocation needs to clone an argument
8053908: jdeps is not PATH on Mac, results in ant clean test failure on Mac
8053910: ScriptObjectMirror causing havoc with Invocation interface
8053913: Auto format caused warning in CompositeTypeBasedGuardingDynamicLinker
8054223: Nashorn: AssertionError when use __DIR__ and ScriptEngine.eval()
8054411: Add nashorn.args.prepend system property
8054503: test/script/external/test262/test/suite/ch12/12.6/12.6.4/12.6.4-2.js fails with tip
8054651: Global.initConstructor and ScriptFunction.getPrototype(Object) can have stricter types
8054898: Avoid creation of empty type info files
8054993: type info cache may be disabled for test262 and tests explicitly changing that property should use @fork
8055034: jjs exits interactive mode if exception was thrown when trying to print value of last evaluated expression
8055042: Compile-time expression evaluator was missing variables
8055107: Extension directives to turn on callsite profiling, tracing, AST print and other debug features locally
8055139: test/script/trusted/JDK-8055107.js fails with access control exception
8055186: Backport Nashorn optimistic typing to 8u repository
8055529: Clean up the bin directory
Reviewed-by: jlaskey, lagergren, sundar
Contributed-by: marcus.largergren@oracle.com, hannes.wallnoefer@oracle.com, sundararajan.athijegannathan@oracle.com

 /*
  * Copyright (c) 2010, 2013, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 package jdk.nashorn.internal.parser;
 import static jdk.nashorn.internal.parser.TokenType.COMMENT;
 import static jdk.nashorn.internal.parser.TokenType.DIRECTIVE_COMMENT;
 import static jdk.nashorn.internal.parser.TokenType.EOF;
 import static jdk.nashorn.internal.parser.TokenType.EOL;
 import static jdk.nashorn.internal.parser.TokenType.IDENT;
 import jdk.nashorn.internal.ir.IdentNode;
 import jdk.nashorn.internal.ir.LiteralNode;
 import jdk.nashorn.internal.parser.Lexer.LexerToken;
 import jdk.nashorn.internal.parser.Lexer.RegexToken;
 import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.regexp.RegExpFactory;
 /**
  * Base class for parsers.
  */
 public abstract class AbstractParser {
     /** Source to parse. */
     protected final Source source;
     /** Error manager to report errors. */
     protected final ErrorManager errors;
     /** Stream of lex tokens to parse. */
     protected TokenStream stream;
     /** Index of current token. */
     protected int k;
     /** Previous token - accessible to sub classes */
     protected long previousToken;
     /** Descriptor of current token. */
     protected long token;
     /** Type of current token. */
     protected TokenType type;
     /** Type of last token. */
     protected TokenType last;
     /** Start position of current token. */
     protected int start;
     /** Finish position of previous token. */
     protected int finish;
     /** Current line number. */
     protected int line;
     /** Position of last EOL + 1. */
     protected int linePosition;
     /** Lexer used to scan source content. */
     protected Lexer lexer;
     /** Is this parser running under strict mode? */
     protected boolean isStrictMode;
     /** What should line numbers be counted from? */
     protected final int lineOffset;
     /**
      * Construct a parser.
      *
      * @param source     Source to parse.
      * @param errors     Error reporting manager.
      * @param strict     True if we are in strict mode
      * @param lineOffset Offset from which lines should be counted
      */
     protected AbstractParser(final Source source, final ErrorManager errors, final boolean strict, final int lineOffset) {
         this.source       = source;
         this.errors       = errors;
         this.k            = -1;
         this.token        = Token.toDesc(EOL, 0, 1);
         this.type         = EOL;
         this.last         = EOL;
         this.isStrictMode = strict;
         this.lineOffset   = lineOffset;
     }
     /**
      * Get the ith token.
      *
      * @param i Index of token.
      *
      * @return  the token
      */
     protected final long getToken(final int i) {
         // Make sure there are enough tokens available.
         while (i > stream.last()) {
             // If we need to buffer more for lookahead.
             if (stream.isFull()) {
                 stream.grow();
             }
             // Get more tokens.
             lexer.lexify();
         }
         return stream.get(i);
     }
     /**
      * Return the tokenType of the ith token.
      *
      * @param i Index of token
      *
      * @return the token type
      */
     protected final TokenType T(final int i) {
         // Get token descriptor and extract tokenType.
         return Token.descType(getToken(i));
     }
     /**
      * Seek next token that is not an EOL or comment.
      *
      * @return tokenType of next token.
      */
     protected final TokenType next() {
         do {
             nextOrEOL();
         } while (type == EOL || type == COMMENT);
         return type;
     }
     /**
      * Seek next token or EOL (skipping comments.)
      *
      * @return tokenType of next token.
      */
     protected final TokenType nextOrEOL() {
         do {
             nextToken();
             if (type == DIRECTIVE_COMMENT) {
                 checkDirectiveComment();
             }
         } while (type == COMMENT || type == DIRECTIVE_COMMENT);
         return type;
     }
     // sourceURL= after directive comment
     private static final String SOURCE_URL_PREFIX = "sourceURL=";
     // currently only @sourceURL=foo supported
     private void checkDirectiveComment() {
         // if already set, ignore this one
         if (source.getExplicitURL() != null) {
             return;
         }
         final String comment = (String) lexer.getValueOf(token, isStrictMode);
         final int len = comment.length();
         // 4 characters for directive comment marker //@\s or //#\s
         if (len > 4 && comment.substring(4).startsWith(SOURCE_URL_PREFIX)) {
             source.setExplicitURL(comment.substring(4 + SOURCE_URL_PREFIX.length()));
         }
     }
     /**
      * Seek next token.
      *
      * @return tokenType of next token.
      */
     private TokenType nextToken() {
         // Capture last token tokenType.
         last = type;
         if (type != EOF) {
             // Set up next token.
             k++;
             final long lastToken = token;
             previousToken = token;
             token = getToken(k);
             type = Token.descType(token);
             // do this before the start is changed below
             if (last != EOL) {
                 finish = start + Token.descLength(lastToken);
             }
             if (type == EOL) {
                 line         = Token.descLength(token);
                 linePosition = Token.descPosition(token);
             } else {
                 start = Token.descPosition(token);
             }
         }
         return type;
     }
     /**
      * Get the message string for a message ID and arguments
      *
      * @param msgId The Message ID
      * @param args  The arguments
      *
      * @return The message string
      */
     protected static String message(final String msgId, final String... args) {
         return ECMAErrors.getMessage("parser.error." + msgId, args);
     }
     /**
      * Report an error.
      *
      * @param message    Error message.
      * @param errorToken Offending token.
      * @return ParserException upon failure. Caller should throw and not ignore
      */
     protected final ParserException error(final String message, final long errorToken) {
         return error(JSErrorType.SYNTAX_ERROR, message, errorToken);
     }
     /**
      * Report an error.
      *
      * @param errorType  The error type
      * @param message    Error message.
      * @param errorToken Offending token.
      * @return ParserException upon failure. Caller should throw and not ignore
      */
     protected final ParserException error(final JSErrorType errorType, final String message, final long errorToken) {
         final int position  = Token.descPosition(errorToken);
         final int lineNum   = source.getLine(position);
         final int columnNum = source.getColumn(position);
         final String formatted = ErrorManager.format(message, source, lineNum, columnNum, errorToken);
         return new ParserException(errorType, formatted, source, lineNum, columnNum, errorToken);
     }
     /**
      * Report an error.
      *
      * @param message Error message.
      * @return ParserException upon failure. Caller should throw and not ignore
      */
     protected final ParserException error(final String message) {
         return error(JSErrorType.SYNTAX_ERROR, message);
     }
     /**
      * Report an error.
      *
      * @param errorType  The error type
      * @param message    Error message.
      * @return ParserException upon failure. Caller should throw and not ignore
      */
     protected final ParserException error(final JSErrorType errorType, final String message) {
         // TODO - column needs to account for tabs.
         final int position = Token.descPosition(token);
         final int column = position - linePosition;
         final String formatted = ErrorManager.format(message, source, line, column, token);
         return new ParserException(errorType, formatted, source, line, column, token);
     }
     /**
      * Report a warning to the error manager.
      *
      * @param errorType  The error type of the warning
      * @param message    Warning message.
      * @param errorToken error token
      */
     protected final void warning(final JSErrorType errorType, final String message, final long errorToken) {
         errors.warning(error(errorType, message, errorToken));
     }
     /**
      * Generate 'expected' message.
      *
      * @param expected Expected tokenType.
      *
      * @return the message string
      */
     protected final String expectMessage(final TokenType expected) {
         final String tokenString = Token.toString(source, token);
         String msg;
         if (expected == null) {
             msg = AbstractParser.message("expected.stmt", tokenString);
         } else {
             final String expectedName = expected.getNameOrType();
             msg = AbstractParser.message("expected", expectedName, tokenString);
         }
         return msg;
     }
     /**
      * Check next token and advance.
      *
      * @param expected Expected tokenType.
      *
      * @throws ParserException on unexpected token type
      */
     protected final void expect(final TokenType expected) throws ParserException {
         if (type != expected) {
             throw error(expectMessage(expected));
         }
         next();
     }
     /**
      * Check next token, get its value and advance.
      *
      * @param  expected Expected tokenType.
      * @return The JavaScript value of the token
      * @throws ParserException on unexpected token type
      */
     protected final Object expectValue(final TokenType expected) throws ParserException {
         if (type != expected) {
             throw error(expectMessage(expected));
         }
         final Object value = getValue();
         next();
         return value;
     }
     /**
      * Get the value of the current token.
      *
      * @return JavaScript value of the token.
      */
     protected final Object getValue() {
         return getValue(token);
     }
     /**
      * Get the value of a specific token
      *
      * @param valueToken the token
      *
      * @return JavaScript value of the token
      */
     protected final Object getValue(final long valueToken) {
         try {
             return lexer.getValueOf(valueToken, isStrictMode);
         } catch (final ParserException e) {
             errors.error(e);
         }
         return null;
     }
     /**
      * Certain future reserved words can be used as identifiers in
      * non-strict mode. Check if the current token is one such.
      *
      * @return true if non strict mode identifier
      */
     protected final boolean isNonStrictModeIdent() {
         return !isStrictMode && type.getKind() == TokenKind.FUTURESTRICT;
     }
     /**
      * Get ident.
      *
      * @return Ident node.
      */
     protected final IdentNode getIdent() {
         // Capture IDENT token.
         long identToken = token;
         if (isNonStrictModeIdent()) {
             // Fake out identifier.
             identToken = Token.recast(token, IDENT);
             // Get IDENT.
             final String ident = (String)getValue(identToken);
             next();
             // Create IDENT node.
             return new IdentNode(identToken, finish, ident).setIsFutureStrictName();
         }
         // Get IDENT.
         final String ident = (String)expectValue(IDENT);
         if (ident == null) {
             return null;
         }
         // Create IDENT node.
         return new IdentNode(identToken, finish, ident);
     }
     /**
      * Check if current token is in identifier name
      *
      * @return true if current token is an identifier name
      */
     protected final boolean isIdentifierName() {
         final TokenKind kind = type.getKind();
         if (kind == TokenKind.KEYWORD || kind == TokenKind.FUTURE || kind == TokenKind.FUTURESTRICT) {
             return true;
         }
         // Fake out identifier.
         final long identToken = Token.recast(token, IDENT);
         // Get IDENT.
         final String ident = (String)getValue(identToken);
         return !ident.isEmpty() && Character.isJavaIdentifierStart(ident.charAt(0));
     }
     /**
      * Create an IdentNode from the current token
      *
      * @return an IdentNode representing the current token
      */
     protected final IdentNode getIdentifierName() {
         if (type == IDENT) {
             return getIdent();
         } else if (isIdentifierName()) {
             // Fake out identifier.
             final long identToken = Token.recast(token, IDENT);
             // Get IDENT.
             final String ident = (String)getValue(identToken);
             next();
             // Create IDENT node.
             return new IdentNode(identToken, finish, ident);
         } else {
             expect(IDENT);
             return null;
         }
     }
     /**
      * Create a LiteralNode from the current token
      *
      * @return LiteralNode representing the current token
      * @throws ParserException if any literals fails to parse
      */
     protected final LiteralNode<?> getLiteral() throws ParserException {
         // Capture LITERAL token.
         final long literalToken = token;
         // Create literal node.
         final Object value = getValue();
         // Advance to have a correct finish
         next();
         LiteralNode<?> node = null;
         if (value == null) {
             node = LiteralNode.newInstance(literalToken, finish);
         } else if (value instanceof Number) {
             node = LiteralNode.newInstance(literalToken, finish, (Number)value);
         } else if (value instanceof String) {
             node = LiteralNode.newInstance(literalToken, finish, (String)value);
         } else if (value instanceof LexerToken) {
             if (value instanceof RegexToken) {
                 final RegexToken regex = (RegexToken)value;
                 try {
                     RegExpFactory.validate(regex.getExpression(), regex.getOptions());
                 } catch (final ParserException e) {
                     throw error(e.getMessage());
                 }
             }
             node = LiteralNode.newInstance(literalToken, finish, (LexerToken)value);
         } else {
             assert false : "unknown type for LiteralNode: " + value.getClass();
         }
         return node;
     }
 }

Mercurial > jdk8-mips64-public > nashorn / annotate

src/jdk/nashorn/internal/parser/AbstractParser.java@e2497b11a021 (annotated)

src/jdk/nashorn/internal/parser/AbstractParser.java