private RE re;
private int lastIndex;
- public Regexp(JS.Array args) throws JS.Exn {
- if(args.length() < 1) throw new JS.Exn("Not enough args to regexp");
- Object arg0 = args.elementAt(0);
+ public Regexp(Object arg0, Object arg1) throws JS.Exn {
if(arg0 instanceof Regexp) {
Regexp r = (Regexp) arg0;
this.global = r.global;
String pattern = arg0.toString();
String sFlags = null;
int flags = 0;
- if(args.length() == 2) sFlags = args.elementAt(1).toString();
+ if(arg1 != null) sFlags = (String)arg1;
if(sFlags == null) sFlags = "";
for(int i=0;i<sFlags.length();i++) {
switch(sFlags.charAt(i)) {
_put("ignoreCase",wrapBool(flags & RE.REG_ICASE));
_put("multiline",wrapBool(flags & RE.REG_MULTILINE));
}
- // FIXME: Do whatever we need to do to take advantage of the GETCALL bytecode when its available
- final JS.Callable execFN = new JS.Callable() { public Object call(JS.Array args) { return exec(args); } };
- final JS.Callable testFN = new JS.Callable() { public Object call(JS.Array args) { return test(args); } };
- final JS.Callable toStringFN = new JS.Callable() { public Object call(JS.Array args) { return Regexp.this.toString(); } };
- _put("exec",execFN);
- _put("test",testFN);
- _put("toString",toStringFN);
+ }
+
+ public Object callMethod(Object method, Array args, boolean checkOnly) throws JS.Exn {
+ if (method.equals("exec")) {
+ if (checkOnly) return Boolean.TRUE;
+ return exec(args);
+ } else if (method.equals("test")) {
+ if (checkOnly) return Boolean.TRUE;
+ return test(args);
+ } else if (method.equals("toString")) {
+ if (checkOnly) return Boolean.TRUE;
+ return toString();
+ }
+ if (checkOnly) return Boolean.FALSE;
+ return null;
}
// gcj bug...
public Object get(Object key) { return _get(key); }
- public void put(Object key,Object value) { _put(key,value); }
+ public Object put(Object key,Object value) { _put(key,value); return null; }
public Object _get(Object key) {
if(key.equals("lastIndex")) return new Integer(lastIndex);