Changeset 2783 in webkit for trunk/JavaScriptCore/kjs/regexp_object.cpp

Timestamp:

Nov 20, 2002, 1:12:14 PM (23 years ago)

Author:

darin

Message:

• decrease ref/deref -- 5% speedup in iBench

• JavaScriptCore.pbproj/project.pbxproj: Added array_instance.h
• kjs/array_instance.h: Added so it can be shared by function.h.

• kjs/array_object.cpp:
• kjs/array_object.h:
• kjs/bool_object.cpp:
• kjs/bool_object.h:
• kjs/collector.cpp:
• kjs/date_object.cpp:
• kjs/date_object.h:
• kjs/error_object.cpp:
• kjs/function.cpp:
• kjs/function.h:
• kjs/function_object.cpp:
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/math_object.cpp:
• kjs/nodes.cpp:
• kjs/number_object.cpp:
• kjs/object.cpp:
• kjs/object.h:
• kjs/object_object.cpp:
• kjs/property_map.cpp:
• kjs/reference.cpp:
• kjs/reference.h:
• kjs/regexp_object.cpp:
• kjs/string_object.cpp:
• kjs/string_object.h:
• kjs/value.cpp:
• kjs/value.h: Switched lots of interfaces so they don't require ref/deref.

File:

• trunk/JavaScriptCore/kjs/regexp_object.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -41 +41 @@
                                        ObjectPrototypeImp *objProto,
                                        FunctionPrototypeImp *funcProto)
-  : ObjectImp(Object(objProto))
+  : ObjectImp(objProto)
 {
   Value protect(this);
@@ -48 +48 @@
   // The constructor will be added later in RegExpObject's constructor (?)
 
-  put(exec, "exec",     Object(new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Exec,     0)), DontEnum);
-  put(exec, "test",     Object(new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Test,     0)), DontEnum);
-  put(exec, toStringPropertyName, Object(new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::ToString, 0)), DontEnum);
+  static const Identifier execPropertyName("exec");
+  putDirect(execPropertyName,     new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Exec,     0), DontEnum);
+  static const Identifier testPropertyName("test");
+  putDirect(testPropertyName,     new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Test,     0), DontEnum);
+  putDirect(toStringPropertyName, new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::ToString, 0), DontEnum);
 }
 
@@ -60 +62 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -138 +140 @@
 
 RegExpImp::RegExpImp(RegExpPrototypeImp *regexpProto)
-  : ObjectImp(Object(regexpProto)), reg(0L)
+  : ObjectImp(regexpProto), reg(0L)
 {
 }
@@ -157 +159 @@
   Value protect(this);
   // ECMA 15.10.5.1 RegExp.prototype
-  put(exec,prototypePropertyName, Object(regProto), DontEnum|DontDelete|ReadOnly);
+  putDirect(prototypePropertyName, regProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(2), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::two(), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -222 +224 @@
 Object RegExpObjectImp::construct(ExecState *exec, const List &args)
 {
-  String p = args.isEmpty() ? UString("") : args[0].toString(exec);
+  UString p = args.isEmpty() ? UString("") : args[0].toString(exec);
   UString flags = args[1].toString(exec);
 
@@ -234 +236 @@
   // TODO: throw a syntax error on invalid flags
 
-  dat->put(exec, "global", Boolean(global));
-  dat->put(exec, "ignoreCase", Boolean(ignoreCase));
-  dat->put(exec, "multiline", Boolean(multiline));
-
-  dat->put(exec, "source", p);
-  dat->put(exec, "lastIndex", Number(0), DontDelete | DontEnum);
+  dat->putDirect("global", global ? BooleanImp::staticTrue : BooleanImp::staticFalse);
+  dat->putDirect("ignoreCase", ignoreCase ? BooleanImp::staticTrue : BooleanImp::staticFalse);
+  dat->putDirect("multiline", multiline ? BooleanImp::staticTrue : BooleanImp::staticFalse);
+
+  dat->putDirect("source", new StringImp(p));
+  dat->putDirect("lastIndex", NumberImp::zero(), DontDelete | DontEnum);
 
   int reflags = RegExp::None;
@@ -248 +250 @@
   if (multiline)
       reflags |= RegExp::Multiline;
-  dat->setRegExp(new RegExp(p.value(), reflags));
+  dat->setRegExp(new RegExp(p, reflags));
 
   return obj;