Author: cesar
Date: 2005-04-28 21:10:55 -0400 (Thu, 28 Apr 2005)
New Revision: 43759

Modified:
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Block.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanObject.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanPrototype.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BreakOutOfFinally.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Closure.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Enum.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/EnumeratorObject.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Equality.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FormalParameterList.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs
   
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs
   trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
Log:
Changes for API compliance

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Block.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Block.cs        
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Block.cs        
2005-04-29 01:10:55 UTC (rev 43759)
@@ -62,17 +62,6 @@
                                elems.Add (e);
                }
 
-               public override string ToString ()
-               {
-                       StringBuilder sb = new StringBuilder ();
-
-                       foreach (AST a in elems)
-                               if (a != null)
-                                       sb.Append (a.ToString () + " ");
-
-                       return sb.ToString ();
-               }
-
                internal override void Emit (EmitContext ec)
                {
                        int i, n = elems.Count;

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanObject.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanObject.cs        
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanObject.cs        
2005-04-29 01:10:55 UTC (rev 43759)
@@ -80,11 +80,16 @@
                                        throw new Exception ("Unknown TypeCode, 
" + tc.ToString ());
                                }
                        }
-               }
+               }               
 
                public new Type GetType ()
                {
                        throw new NotImplementedException ();
                }
+
+               protected BooleanObject (ScriptObject prototype, Type subType)
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }

Modified: 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanPrototype.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanPrototype.cs     
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BooleanPrototype.cs     
2005-04-29 01:10:55 UTC (rev 43759)
@@ -53,6 +53,11 @@
                        BooleanObject bo = thisObj as BooleanObject;
                        return bo.value;
                }
+
+               protected BooleanPrototype (ObjectPrototype prototype, Type 
baseType)
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }
 

Modified: 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BreakOutOfFinally.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BreakOutOfFinally.cs    
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/BreakOutOfFinally.cs    
2005-04-29 01:10:55 UTC (rev 43759)
@@ -28,10 +28,10 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Microsoft.JScript.Tmp
-{
-       using System;
+using System;
 
+namespace Microsoft.JScript {
+
        public sealed class BreakOutOfFinally : ApplicationException
        {
                public int target;
@@ -41,4 +41,4 @@
                        this.target = target;
                }
        }
-}
\ No newline at end of file
+}

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Closure.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Closure.cs      
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Closure.cs      
2005-04-29 01:10:55 UTC (rev 43759)
@@ -33,8 +33,8 @@
 
        public class Closure : ScriptFunction {
 
-               public Object args;
-               public Object caller;
+               public object arguments;
+               public object caller;
 
                public Closure (FunctionObject func)
                {

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs        
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs        
2005-04-29 01:10:55 UTC (rev 43759)
@@ -69,7 +69,7 @@
                }
        }
 
-       public class CodeGenerator {
+       internal class CodeGenerator {
 
                private static string MODULE = "JScript Module";
 

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Enum.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Enum.cs 2005-04-29 
00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Enum.cs 2005-04-29 
01:10:55 UTC (rev 43759)
@@ -34,7 +34,7 @@
 
 namespace Microsoft.JScript {
 
-       public class Enum : AST {
+       internal class Enum : AST {
 
                private ArrayList modifiers;
                private string name;

Modified: 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/EnumeratorObject.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/EnumeratorObject.cs     
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/EnumeratorObject.cs     
2005-04-29 01:10:55 UTC (rev 43759)
@@ -27,8 +27,17 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System;
+using System.Collections;
+
 namespace Microsoft.JScript {
 
-       public class EnumeratorObject : JSObject
-       {}
-}
\ No newline at end of file
+       public class EnumeratorObject : JSObject {
+               protected IEnumerator enumerator;
+               
+               protected void LoadObject()
+               {
+                       throw new NotImplementedException ();
+               }
+       }
+}

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Equality.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Equality.cs     
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Equality.cs     
2005-04-29 01:10:55 UTC (rev 43759)
@@ -92,21 +92,6 @@
                        throw new NotImplementedException ();
                }
 
-               public override string ToString ()
-               {
-                       StringBuilder sb = new StringBuilder ();
-
-                       sb.Append (left.ToString ());
-
-                       if (op != JSToken.None)
-                               sb.Append (op + " ");
-
-                       if (right != null)
-                               sb.Append (right.ToString ());
-
-                       return sb.ToString ();
-               }
-
                internal override bool Resolve (IdentificationTable context)
                {
                        bool r = true;

Modified: 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FormalParameterList.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FormalParameterList.cs  
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FormalParameterList.cs  
2005-04-29 01:10:55 UTC (rev 43759)
@@ -69,7 +69,7 @@
                }
        }
                        
-       public class FormalParameterList : AST {
+       internal class FormalParameterList : AST {
 
                internal ArrayList ids;
 

Modified: 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs  
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs  
2005-04-29 01:10:55 UTC (rev 43759)
@@ -76,11 +76,6 @@
                        return new Closure (f);
                }
 
-               public override string ToString ()
-               {
-                       return func_obj.ToString ();
-               }
-
                internal void create_closure (EmitContext ec)
                {
                        string name = func_obj.name;

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs 
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs 
2005-04-29 01:10:55 UTC (rev 43759)
@@ -38,6 +38,27 @@
                public const double NaN = Double.NaN;
                public static readonly Empty undefined = null;
 
+               protected ActiveXObjectConstructor originalActiveXObjectField;
+               protected ArrayConstructor originalArrayField;
+               protected BooleanConstructor originalBooleanField;
+               protected DateConstructor originalDateField;
+               protected EnumeratorConstructor originalEnumeratorField;
+               protected ErrorConstructor originalErrorField;
+               protected ErrorConstructor originalEvalErrorField;
+               protected FunctionConstructor originalFunctionField;
+               protected NumberConstructor originalNumberField;
+               protected ObjectConstructor originalObjectField;
+               protected ObjectPrototype originalObjectPrototypeField;
+               protected ErrorConstructor originalRangeErrorField;
+               protected ErrorConstructor originalReferenceErrorField;
+               protected RegExpConstructor originalRegExpField;
+               protected StringConstructor originalStringField;
+               protected ErrorConstructor originalSyntaxErrorField;
+               protected ErrorConstructor originalTypeErrorField;
+               protected ErrorConstructor originalURIErrorField;
+               protected VBArrayConstructor originalVBArrayField;
+               
+               
                public static ActiveXObjectConstructor ActiveXObject {
                        get { return ActiveXObjectConstructor.Ctr; }
                }
@@ -493,6 +514,6 @@
 
                public static Type @ushort {
                        get { throw new NotImplementedException (); }
-               }
+               }               
        }
 }

Modified: 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs
===================================================================
--- 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs  
    2005-04-29 00:54:11 UTC (rev 43758)
+++ 
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs  
    2005-04-29 01:10:55 UTC (rev 43759)
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System;
+
 namespace Microsoft.JScript.Tmp
 {
        public sealed class LenientBooleanPrototype : BooleanPrototype
@@ -35,5 +37,11 @@
                public new object constructor;
                public new object toString;
                public new object valueOf;
+               
+               internal LenientBooleanPrototype ()
+                       : base (null, null)
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }

Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs    
2005-04-29 00:54:11 UTC (rev 43758)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs    
2005-04-29 01:10:55 UTC (rev 43759)
@@ -529,12 +529,12 @@
                }
        }
 
-       public class Clause : AST {
+       internal class Clause : AST {
                internal AST exp;
                internal ArrayList stm_list;
                internal Label matched_block;
 
-               public Clause (AST parent)
+               internal Clause (AST parent)
                {
                        this.parent = parent;
                        stm_list = new ArrayList ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to