Changeset 16200 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 3, 2006, 12:08:07 PM (19 years ago)

Author:

ap

Message:

Reviewed by Tim H.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=10693
Convert JavaScript arrays to AppleScript lists

JavaScriptCore:

• JavaScriptCore.exp: Export ArrayInstance::info and ArrayInstance::getItem().
• kjs/array_instance.h:
• kjs/array_object.cpp: (ArrayInstance::getItem): Added a method to access array items from C++.

WebCore:

• bridge/mac/WebCoreFrameBridge.mm: (aeDescFromJSValue): Added a case for ArrayInstance.

LayoutTests:

• fast/AppleScript/array-expected.txt:
• fast/AppleScript/array.html: Updated results, added a test for circular dependencies.

WebKitTools:

• DumpRenderTree/AppleScriptController.m: (convertAEDescToObject): (-[AppleScriptController doJavaScript:]): Support printing AEDescLists.

Location:

trunk/JavaScriptCore/kjs

Files:

• array_instance.h (modified) (1 diff)
• array_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/array_instance.h

@@ -48 +48 @@
     
     unsigned getLength() const { return length; }
+    JSValue* getItem(unsigned) const;
     
     void sort(ExecState *exec);

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -5 +5 @@
  *  Copyright (C) 2003 Apple Computer, Inc.
  *  Copyright (C) 2003 Peter Kelly ([email protected])
+ *  Copyright (C) 2006 Alexey Proskuryakov ([email protected])
  *
  *  This library is free software; you can redistribute it and/or
@@ -68 +69 @@
 {
   fastFree(storage);
+}
+
+JSValue* ArrayInstance::getItem(unsigned i) const
+{
+    if (i >= length)
+        return jsUndefined();
+    
+    JSValue* val = (i < storageLength) ? 
+                            storage[i] :
+                            getDirect(Identifier::from(i));
+
+    return val ? val : jsUndefined();
 }