Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added 'flat' argument to NewRegExp to force literal interpretation of

Browse Source 
entire string.


git-svn-id: svn://10.0.0.236/trunk@55674 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com 1999-12-08 01:48:03 +00:00
parent 42e4c9ee34
commit 11acc154a5
4 changed files with 72 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/js/rhino/org/mozilla/javascript/optimizer/Codegen.java
View File

@ -1362,12 +1362,13 @@ public class Codegen extends Interpreter {
} else {
push(right.getString());
}
push(0);
addSpecialInvoke("org/mozilla/javascript/regexp/NativeRegExp",
"<init>",
"(Lorg/mozilla/javascript/Context;" +
"Lorg/mozilla/javascript/Scriptable;" +
"Ljava/lang/String;Ljava/lang/String;)",
"Ljava/lang/String;Ljava/lang/String;Z)",
"V");
regexp.putProp(Node.REGEXP_PROP, fieldName);

39
mozilla/js/rhino/org/mozilla/javascript/regexp/NativeRegExp.java
View File

@ -85,11 +85,13 @@ public class NativeRegExp extends ScriptableObject implements Function {
ctor.put("prototype", ctor, proto);
}
public NativeRegExp(Context cx, Scriptable scope, String source, String global) {
init(cx, scope, source, global);
public NativeRegExp(Context cx, Scriptable scope, String source,
String global, boolean flat) {
init(cx, scope, source, global, flat);
}
public void init(Context cx, Scriptable scope, String source, String global) {
public void init(Context cx, Scriptable scope, String source,
String global, boolean flat) {
this.source = source;
flags = 0;
if (global != null) {
@ -113,7 +115,34 @@ public class NativeRegExp extends ScriptableObject implements Function {
}
CompilerState state = new CompilerState(source, flags, cx, scope);
this.ren = parseRegExp(state);
if (flat) {
ren = null;
int sourceLen = source.length();
int index = 0;
while (sourceLen > 0) {
int len = sourceLen;
if (len > REOP_FLATLEN_MAX) {
len = REOP_FLATLEN_MAX;
}
RENode ren2 = new RENode(state, len == 1 ? REOP_FLAT1 : REOP_FLAT,
new Integer(index));
ren2.flags = RENode.NONEMPTY;
if (len > 1) {
ren2.kid2 = index + len;
} else {
ren2.flags |= RENode.SINGLE;
ren2.chr = state.source[index];
}
index += len;
sourceLen -= len;
if (ren == null)
ren = ren2;
else
setNext(state, ren, ren2);
}
}
else
this.ren = parseRegExp(state);
if (ren == null) return;
RENode end = new RENode(state, REOP_END, null);
setNext(state, ren, end);
@ -149,7 +178,7 @@ public class NativeRegExp extends ScriptableObject implements Function {
String s = args.length == 0 ? "" : ScriptRuntime.toString(args[0]);
String global = args.length > 1 ? ScriptRuntime.toString(args[1])
: null;
thisObj.init(cx, funObj, s, global);
thisObj.init(cx, funObj, s, global, false);
return thisObj;
}

3
mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
View File

@ -1362,12 +1362,13 @@ public class Codegen extends Interpreter {
} else {
push(right.getString());
}
push(0);
addSpecialInvoke("org/mozilla/javascript/regexp/NativeRegExp",
"<init>",
"(Lorg/mozilla/javascript/Context;" +
"Lorg/mozilla/javascript/Scriptable;" +
"Ljava/lang/String;Ljava/lang/String;)",
"Ljava/lang/String;Ljava/lang/String;Z)",
"V");
regexp.putProp(Node.REGEXP_PROP, fieldName);

39
mozilla/js/rhino/src/org/mozilla/javascript/regexp/NativeRegExp.java
View File

@ -85,11 +85,13 @@ public class NativeRegExp extends ScriptableObject implements Function {
ctor.put("prototype", ctor, proto);
}
public NativeRegExp(Context cx, Scriptable scope, String source, String global) {
init(cx, scope, source, global);
public NativeRegExp(Context cx, Scriptable scope, String source,
String global, boolean flat) {
init(cx, scope, source, global, flat);
}
public void init(Context cx, Scriptable scope, String source, String global) {
public void init(Context cx, Scriptable scope, String source,
String global, boolean flat) {
this.source = source;
flags = 0;
if (global != null) {
@ -113,7 +115,34 @@ public class NativeRegExp extends ScriptableObject implements Function {
}
CompilerState state = new CompilerState(source, flags, cx, scope);
this.ren = parseRegExp(state);
if (flat) {
ren = null;
int sourceLen = source.length();
int index = 0;
while (sourceLen > 0) {
int len = sourceLen;
if (len > REOP_FLATLEN_MAX) {
len = REOP_FLATLEN_MAX;
}
RENode ren2 = new RENode(state, len == 1 ? REOP_FLAT1 : REOP_FLAT,
new Integer(index));
ren2.flags = RENode.NONEMPTY;
if (len > 1) {
ren2.kid2 = index + len;
} else {
ren2.flags |= RENode.SINGLE;
ren2.chr = state.source[index];
}
index += len;
sourceLen -= len;
if (ren == null)
ren = ren2;
else
setNext(state, ren, ren2);
}
}
else
this.ren = parseRegExp(state);
if (ren == null) return;
RENode end = new RENode(state, REOP_END, null);
setNext(state, ren, end);
@ -149,7 +178,7 @@ public class NativeRegExp extends ScriptableObject implements Function {
String s = args.length == 0 ? "" : ScriptRuntime.toString(args[0]);
String global = args.length > 1 ? ScriptRuntime.toString(args[1])
: null;
thisObj.init(cx, funObj, s, global);
thisObj.init(cx, funObj, s, global, false);
return thisObj;
}