jdk-sandbox: comparison nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java

equal deleted inserted replaced

-:3e057d4357e0
+:dff592a332a4
 package jdk.nashorn.internal.objects;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import jdk.nashorn.internal.objects.annotations.Function;
 import jdk.nashorn.internal.objects.annotations.Getter;
 import jdk.nashorn.internal.objects.annotations.Property;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.objects.annotations.Where;
 import jdk.nashorn.internal.parser.RegExp;
 import jdk.nashorn.internal.runtime.BitVector;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ParserException;
 import jdk.nashorn.internal.runtime.RegExpMatch;
 /**
 * ECMA 15.10 RegExp Objects.
 */
 @ScriptClass("RegExp")
 public final class NativeRegExp extends ScriptObject {
-static final MethodHandle REGEXP_STATICS_HANDLER = findOwnMH("regExpStaticsHandler", Object.class, Object.class, Object.class);
 /** ECMA 15.10.7.5 lastIndex property */
 @Property(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
 public Object lastIndex;
 /** Pattern string. */
 /** Java regex pattern to use for match. We compile to one of these */
 private Pattern pattern;
 private BitVector groupsInNegativeLookahead;
-// RegExp constructor object. Needed to support RegExp "static" properties,
+// Reference to global object needed to support static RegExp properties
-private Object constructor;
+private Global globalObject;
 /*
 public NativeRegExp() {
 init();
 }*/
 * ECMA 15.10.7.1 source
 *
 * @param self self reference
 * @return the input string for the regexp
 */
-@Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+@Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
 public static Object source(final Object self) {
 return checkRegExp(self).input;
 }
 /**
 * ECMA 15.10.7.2 global
 *
 * @param self self reference
 * @return true if this regexp is flagged global, false otherwise
 */
-@Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+@Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
 public static Object global(final Object self) {
 return checkRegExp(self).global;
 }
 /**
 * ECMA 15.10.7.3 ignoreCase
 *
 * @param self self reference
 * @return true if this regexp if flagged to ignore case, false otherwise
 */
-@Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+@Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
 public static Object ignoreCase(final Object self) {
 return checkRegExp(self).ignoreCase;
 }
 /**
 * ECMA 15.10.7.4 multiline
 *
 * @param self self reference
 * @return true if this regexp is flagged to be multiline, false otherwise
 */
-@Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+@Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
 public static Object multiline(final Object self) {
 return checkRegExp(self).multiline;
+}
+/**
+* Getter for non-standard RegExp.input property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "input")
+public static Object getLastInput(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getInput();
+}
+/**
+* Getter for non-standard RegExp.multiline property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "multiline")
+public static Object getLastMultiline(Object self) {
+return false; // doesn't ever seem to become true and isn't documented anyhwere
+}
+/**
+* Getter for non-standard RegExp.lastMatch property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastMatch")
+public static Object getLastMatch(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(0);
+}
+/**
+* Getter for non-standard RegExp.lastParen property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastParen")
+public static Object getLastParen(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getLastParen();
+}
+/**
+* Getter for non-standard RegExp.leftContext property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "leftContext")
+public static Object getLeftContext(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getInput().substring(0, match.getIndex());
+}
+/**
+* Getter for non-standard RegExp.rightContext property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "rightContext")
+public static Object getRightContext(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getInput().substring(match.getIndex() + match.length());
+}
+/**
+* Getter for non-standard RegExp.$1 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$1")
+public static Object getGroup1(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(1);
+}
+/**
+* Getter for non-standard RegExp.$2 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$2")
+public static Object getGroup2(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(2);
+}
+/**
+* Getter for non-standard RegExp.$3 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$3")
+public static Object getGroup3(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(3);
+}
+/**
+* Getter for non-standard RegExp.$4 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$4")
+public static Object getGroup4(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(4);
+}
+/**
+* Getter for non-standard RegExp.$5 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$5")
+public static Object getGroup5(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(5);
+}
+/**
+* Getter for non-standard RegExp.$6 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$6")
+public static Object getGroup6(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(6);
+}
+/**
+* Getter for non-standard RegExp.$7 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$7")
+public static Object getGroup7(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(7);
+}
+/**
+* Getter for non-standard RegExp.$8 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$8")
+public static Object getGroup8(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(8);
+}
+/**
+* Getter for non-standard RegExp.$9 property.
+* @param self self object
+* @return last regexp input
+*/
+@Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$9")
+public static Object getGroup9(Object self) {
+final RegExpMatch match = Global.instance().getLastRegExpMatch();
+return match == null ? "" : match.getGroup(9);
 }
 private RegExpMatch execInner(final String string) {
 if (this.pattern == null) {
 return null; // never matches or similar, e.g. a[]
 if (global) {
 setLastIndex(matcher.end());
 }
-return new RegExpMatch(string, matcher.start(), groups(matcher));
+final RegExpMatch match = new RegExpMatch(string, matcher.start(), groups(matcher));
+globalObject.setLastRegExpMatch(match);
+return match;
 }
 /**
 * Convert java.util.regex.Matcher groups to JavaScript groups.
 * That is, replace null and groups that didn't match with undefined.
 *
 * @param string String to match.
 * @return NativeArray of matches, string or null.
 */
 public Object exec(final String string) {
-final RegExpMatch m = execInner(string);
+final RegExpMatch match = execInner(string);
-// the input string
-if (m == null) {
+if (match == null) {
-return setLastRegExpMatch(null);
+return null;
 }
-return setLastRegExpMatch(new NativeRegExpExecResult(m));
+return new NativeRegExpExecResult(match);
-}
-// Name of the "last successful match" property of the RegExp constructor
-static final String LAST_REGEXP_MATCH = "__last_regexp_match__";
-/**
-* Handles "static" properties of RegExp constructor. These are "deprecated"
-* properties of RegExp constructor.
-*
-* @param self self object passed to this method
-* @param name name of the property being searched
-*
-* @return value of the specified property or undefined if not found
-*/
-public static Object regExpStaticsHandler(final Object self, final  Object name) {
-final String propName = JSType.toString(name);
-if (self instanceof ScriptObject) {
-final ScriptObject sobj = (ScriptObject)self;
-final Object value = sobj.get(LAST_REGEXP_MATCH);
-if (! (value instanceof NativeRegExpExecResult)) {
-return UNDEFINED;
-}
-// get the last match object
-final NativeRegExpExecResult lastMatch = (NativeRegExpExecResult)value;
-// look for $1... $9
-if (propName.length() > 0 && propName.charAt(0) == '$') {
-int index = 0;
-try {
-index = Integer.parseInt(propName.substring(1));
-} catch (final Exception ignored) {
-return UNDEFINED;
-}
-// index out of range
-if (index < 1 && index > 9) {
-return UNDEFINED;
-}
-// retrieve indexed value from last match object.
-return lastMatch.get(index);
-}
-// misc. "static" properties supported
-switch (propName) {
-case "input": {
-return lastMatch.input;
-}
-case "lastMatch": {
-return lastMatch.get(0);
-}
-case "lastParen": {
-final int len = ((Number)NativeRegExpExecResult.length(lastMatch)).intValue();
-return (len > 0)? lastMatch.get(len - 1) : UNDEFINED;
-}
-}
-}
-return UNDEFINED;
-}
-// Support for RegExp static properties. We set last successful match
-// to the RegExp constructor object.
-private Object setLastRegExpMatch(final Object match) {
-if (constructor instanceof ScriptObject) {
-((ScriptObject)constructor).set(LAST_REGEXP_MATCH, match, isStrictContext());
-}
-return match;
 }
 /**
 * Executes a search for a match within a string based on a regular
 * expression.
 *
 * @param string String to match.
 * @return Index of match.
 */
 Object search(final String string) {
-final RegExpMatch m = execInner(string);
+final RegExpMatch match = execInner(string);
-// the input string
-if (m == null) {
+if (match == null) {
-setLastRegExpMatch(null);
 return -1;
 }
-setLastRegExpMatch(new NativeRegExpExecResult(m));
+return match.getIndex();
-return m.getIndex();
 }
 /**
 * Fast lastIndex getter
 * @return last index property as int
 public void setLastIndex(final int lastIndex) {
 this.lastIndex = JSType.toObject(lastIndex);
 }
 private void init() {
-final ScriptObject proto = Global.instance().getRegExpPrototype();
+// Keep reference to global object to support "static" properties of RegExp
-this.setProto(proto);
+this.globalObject = Global.instance();
-// retrieve constructor to support "static" properties of RegExp
+this.setProto(globalObject.getRegExpPrototype());
-this.constructor = PrototypeObject.getConstructor(proto);
 }
 private static NativeRegExp checkRegExp(final Object self) {
 Global.checkObjectCoercible(self);
 if (self instanceof NativeRegExp) {
 private void setGroupsInNegativeLookahead(final BitVector groupsInNegativeLookahead) {
 this.groupsInNegativeLookahead = groupsInNegativeLookahead;
 }
-private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-return MH.findStatic(MethodHandles.publicLookup(), NativeRegExp.class, name, MH.type(rtype, types));
-}
 }

changeset 16223	dff592a332a4
parent 16217	c5ac9be5c444
child 16226	0e4f37e6cc40