[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kdom/ecma
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2005-08-19 8:48:51
Message-ID: 1124441331.248271.14082.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 450841 by wildfox:

Integrate GlobalObject <-> Ecma*Constructors.
No more evaluation errors in test/data/*.js, though....

KSVG - Ecma: GlobalObject (0x8192310)::get Node
KSVG - Ecma: GlobalObject (0x8192310)::get debug
KDOM Test: [Debug] Node.DOCUMENT_NODE = undefined

... it doesn't yet work. Must be an off-by-one somewhere. Investigating.


 M  +87 -24    GlobalObject.cpp  
 M  +9 -1      GlobalObject.h  


--- trunk/kdenonbeta/kdom/ecma/GlobalObject.cpp #450840:450841
@@ -28,7 +28,29 @@
 #include <qstylesheet.h>
 
 #include <kdom/bindings/js/core/NodeWrapper.h>
+#include <kdom/bindings/js/core/TypeInfoWrapper.h>
+#include <kdom/bindings/js/core/DOMErrorWrapper.h>
+#include <kdom/bindings/js/core/DOMExceptionWrapper.h>
 
+#include <kdom/bindings/js/events/EventWrapper.h>
+#include <kdom/bindings/js/events/MutationEventWrapper.h>
+#include <kdom/bindings/js/events/EventExceptionWrapper.h>
+
+#include <kdom/bindings/js/css/CSSRuleWrapper.h>
+#include <kdom/bindings/js/css/CSSValueWrapper.h>
+#include <kdom/bindings/js/css/CSSPrimitiveValueWrapper.h>
+
+#include <kdom/bindings/js/range/RangeWrapper.h>
+#include <kdom/bindings/js/range/RangeExceptionWrapper.h>
+
+#include <kdom/bindings/js/traversal/NodeFilterWrapper.h>
+
+#include <kdom/bindings/js/xpath/XPathResultWrapper.h>
+#include <kdom/bindings/js/xpath/XPathExceptionWrapper.h>
+#include <kdom/bindings/js/xpath/XPathNamespaceWrapper.h>
+
+#include <kdom/bindings/js/xpointer/XPointerResultWrapper.h>
+
 #include "Ecma.h"
 #include "DOMLookup.h"
 #include "kdom/Helper.h"
@@ -42,34 +64,41 @@
 
 /*
 @begin GlobalObject::s_hashTable 15
- closed			GlobalObject::Closed		DontDelete|ReadOnly
- window			GlobalObject::Window		DontDelete|ReadOnly
- evt			GlobalObject::Evt			DontDelete|ReadOnly
- document		GlobalObject::Document		DontDelete|ReadOnly
+ # Attributes
+ closed				GlobalObject::Closed			DontDelete|ReadOnly
+ window				GlobalObject::Window			DontDelete|ReadOnly
+ evt				GlobalObject::Evt				DontDelete|ReadOnly
+ document			GlobalObject::Document			DontDelete|ReadOnly
 
-# Functions
- setTimeout		GlobalObject::SetTimeout	DontDelete|Function 2
- clearTimeout	GlobalObject::ClearTimeout	DontDelete|Function 1
- setInterval	GlobalObject::SetInterval	DontDelete|Function 2
- clearInterval	GlobalObject::ClearInterval	DontDelete|Function 1
- printNode		GlobalObject::PrintNode		DontDelete|Function 1
- alert			GlobalObject::Alert			DontDelete|Function 1
- prompt			GlobalObject::Prompt		DontDelete|Function 2
- confirm		GlobalObject::Confirm		DontDelete|Function 1
- debug			GlobalObject::Debug			DontDelete|Function 1
-@end
-*/
+ # Functions
+ setTimeout			GlobalObject::SetTimeout		DontDelete|Function 2
+ clearTimeout		GlobalObject::ClearTimeout		DontDelete|Function 1
+ setInterval		GlobalObject::SetInterval		DontDelete|Function 2
+ clearInterval		GlobalObject::ClearInterval		DontDelete|Function 1
+ printNode			GlobalObject::PrintNode			DontDelete|Function 1
+ alert				GlobalObject::Alert				DontDelete|Function 1
+ prompt				GlobalObject::Prompt			DontDelete|Function 2
+ confirm			GlobalObject::Confirm			DontDelete|Function 1
+ debug				GlobalObject::Debug				DontDelete|Function 1
 
-/*
-# Constructors - TODO IN THE NEW ECMA CONCEPT! FIX IT!
- Node				GlobalObject::Node					DontDelete|Function 1
- DOMException		GlobalObject::DOMException			DontDelete|Function 1
- CSSRule			GlobalObject::CSSRule				DontDelete|Function 1
- CSSValue			GlobalObject::CSSValue				DontDelete|Function 1
- CSSPrimitiveValue	GlobalObject::CSSPrimitiveValue	DontDelete|Function 1
+ # Constants
  Event				GlobalObject::Event				DontDelete|Function 1
- EventException		GlobalObject::EventException		DontDelete|Function 1
  MutationEvent		GlobalObject::MutationEvent		DontDelete|Function 1
+ EventException		GlobalObject::EventException	DontDelete|Function 1
+ CSSRule			GlobalObject::CSSRule			DontDelete|Function 1
+ CSSValue			GlobalObject::CSSValue			DontDelete|Function 1
+ CSSPrimitiveValue	GlobalObject::CSSPrimitiveValue	DontDelete|Function 1
+ Node				GlobalObject::Node				DontDelete|Function 1
+ TypeInfo			GlobalObject::TypeInfo			DontDelete|Function 1
+ DOMError			GlobalObject::DOMError			DontDelete|Function 1
+ DOMException		GlobalObject::DOMException		DontDelete|Function 1
+ Range				GlobalObject::Range				DontDelete|Function 1
+ RangeException		GlobalObject::RangeException	DontDelete|Function 1
+ NodeFilter			GlobalObject::NodeFilter		DontDelete|Function 1
+ XPathResult		GlobalObject::XPathResult		DontDelete|Function 1
+ XPathException		GlobalObject::XPathException	DontDelete|Function 1
+ XPathNamespace		GlobalObject::XPathNamespace	DontDelete|Function 1
+ XPointerResult		GlobalObject::XPointerResult	DontDelete|Function 1
 @end
 */
 
@@ -169,6 +198,40 @@
 				else
 					return KJS::Undefined();
 			}
+			case GlobalObject::Event:
+				return getEventConstructor(exec);
+			case GlobalObject::MutationEvent:
+				return getMutationEventConstructor(exec);
+			case GlobalObject::EventException:
+				return getEventExceptionConstructor(exec);
+			case GlobalObject::CSSRule:
+				return getCSSRuleConstructor(exec);
+			case GlobalObject::CSSValue:
+				return getCSSValueConstructor(exec);
+			case GlobalObject::CSSPrimitiveValue:
+				return getCSSPrimitiveValueConstructor(exec);
+			case GlobalObject::Node:
+				return getNodeConstructor(exec);
+			case GlobalObject::TypeInfo:
+				return getTypeInfoConstructor(exec);
+			case GlobalObject::DOMError:
+				return getDOMErrorConstructor(exec);
+			case GlobalObject::DOMException:
+				return getDOMExceptionConstructor(exec);
+			case GlobalObject::Range:
+				return getRangeConstructor(exec);
+			case GlobalObject::RangeException:
+				return getRangeExceptionConstructor(exec);
+			case GlobalObject::NodeFilter:
+				return getNodeFilterConstructor(exec);
+			case GlobalObject::XPathResult:
+				return KDOM::XPath::getXPathResultConstructor(exec);
+			case GlobalObject::XPathException:
+				return KDOM::XPath::getXPathExceptionConstructor(exec);
+			case GlobalObject::XPathNamespace:
+				return KDOM::XPath::getXPathNamespaceConstructor(exec);
+			case GlobalObject::XPointerResult:
+				return KDOM::XPointer::getXPointerResultConstructor(exec);
 		}
 	}
 
--- trunk/kdenonbeta/kdom/ecma/GlobalObject.h #450840:450841
@@ -72,7 +72,15 @@
 			// Functions
 			SetTimeout, ClearTimeout, SetInterval,
 			ClearInterval, PrintNode, Alert, Prompt,
-			Confirm, Debug
+			Confirm, Debug,
+
+			// Constants
+			Event, MutationEvent, EventException,
+			CSSRule, CSSValue, CSSPrimitiveValue,
+			Node, TypeInfo, DOMError, DOMException,
+			Range, RangeException, NodeFilter, XPathResult,
+			XPathException, XPathNamespace, XPointerResult
+
 		};
 
 	private:
[prev in list] [next in list] [prev in thread] [next in thread]