Author: cesar
Date: 2005-04-28 22:04:06 -0400 (Thu, 28 Apr 2005)
New Revision: 43762
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Eval.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FieldAccessor.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientDatePrototype.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientFunctionPrototype.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientMathObject.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientNumberPrototype.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientStringConstructor.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Literal.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/RegExpObject.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Relational.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Throw.cs
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/VariableStatement.cs
Log:
Changes for MS API compliance
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Eval.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Eval.cs 2005-04-29
02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Eval.cs 2005-04-29
02:04:06 UTC (rev 43762)
@@ -40,6 +40,13 @@
throw new NotImplementedException ();
}
+#if NET_1_1 || NET_2_0
+ public static object JScriptEvaluate (object source, object
unsafeOption, VsaEngine engine)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
internal override bool Resolve (IdentificationTable context)
{
throw new NotImplementedException ();
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FieldAccessor.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FieldAccessor.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/FieldAccessor.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -28,8 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Microsoft.JScript.Tmp
-{
+namespace Microsoft.JScript {
public abstract class FieldAccessor
{
public abstract object GetValue (object thisObj);
@@ -38,4 +37,4 @@
public abstract void SetValue (object thisObj, object value);
}
}
-
\ No newline at end of file
+
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs
===================================================================
---
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientBooleanPrototype.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -30,10 +30,10 @@
using System;
-namespace Microsoft.JScript.Tmp
-{
- public sealed class LenientBooleanPrototype : BooleanPrototype
- {
+namespace Microsoft.JScript {
+
+ public sealed class LenientBooleanPrototype : BooleanPrototype {
+
public new object constructor;
public new object toString;
public new object valueOf;
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientDatePrototype.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientDatePrototype.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientDatePrototype.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -28,12 +28,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Microsoft.JScript.Tmp
-{
- using System;
+using System;
- public sealed class LenientDatePrototype : DatePrototype
- {
+namespace Microsoft.JScript {
+
+ public sealed class LenientDatePrototype : DatePrototype {
+
public new Object constructor;
public new Object getTime;
public new Object getYear;
@@ -81,4 +81,4 @@
public new Object toUTCString;
public new Object valueOf;
}
-}
\ No newline at end of file
+}
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientFunctionPrototype.cs
===================================================================
---
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientFunctionPrototype.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientFunctionPrototype.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -28,13 +28,13 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Microsoft.JScript.Tmp
-{
- public sealed class LenientFunctionPrototype : FunctionPrototype
- {
+namespace Microsoft.JScript {
+
+ public sealed class LenientFunctionPrototype : FunctionPrototype {
+
public new object constructor;
public new object apply;
public new object call;
public new object toString;
}
-}
\ No newline at end of file
+}
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientMathObject.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientMathObject.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientMathObject.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -28,10 +28,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Microsoft.JScript.Tmp
-{
- public sealed class LenientMathobject : MathObject
- {
+namespace Microsoft.JScript {
+
+ public sealed class LenientMathObject : MathObject {
+
public new const double E = 2.7182818284590452354;
public new const double LN10 = 2.302585092994046;
public new const double LN2 = 0.6931471805599453;
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientNumberPrototype.cs
===================================================================
---
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientNumberPrototype.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientNumberPrototype.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -28,12 +28,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Microsoft.JScript.Tmp
-{
- using System;
+using System;
- public sealed class LenientNumberPrototype : NumberPrototype
- {
+namespace Microsoft.JScript {
+
+ public sealed class LenientNumberPrototype : NumberPrototype {
+
public new object constructor;
public new object toExponential;
public new object toFixed;
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientStringConstructor.cs
===================================================================
---
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientStringConstructor.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/LenientStringConstructor.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -28,10 +28,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Microsoft.JScript.Tmp
-{
- public class LenientStringConstructor : StringConstructor
- {
+namespace Microsoft.JScript {
+ public class LenientStringConstructor : StringConstructor {
public new object fromCharCode;
}
-}
\ No newline at end of file
+}
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Literal.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Literal.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Literal.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -100,7 +100,7 @@
}
}
- public class NumericLiteral : Exp {
+ internal class NumericLiteral : Exp {
double val;
@@ -139,7 +139,7 @@
}
}
- public class ObjectLiteral : Exp {
+ internal class ObjectLiteral : Exp {
internal ArrayList elems;
@@ -214,7 +214,7 @@
}
}
- public class PropertyName {
+ internal class PropertyName {
string name;
internal string Name {
get { return name; }
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -901,7 +901,7 @@
else if (tt == Token.MOD)
return JSToken.Modulo;
else if (tt == Token.INSTANCEOF)
- return JSToken.InstanceOf;
+ return JSToken.Instanceof;
else if (tt == Token.LE)
return JSToken.LessThanEqual;
else if (tt == Token.LT)
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/RegExpObject.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/RegExpObject.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/RegExpObject.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -38,7 +38,7 @@
throw new NotImplementedException ();
}
- public string Source {
+ public string source {
get { throw new NotImplementedException (); }
}
@@ -59,4 +59,4 @@
set { throw new NotImplementedException (); }
}
}
-}
\ No newline at end of file
+}
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Relational.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Relational.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Relational.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -59,21 +59,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)
{
if (left != null)
@@ -98,7 +83,7 @@
if (op == JSToken.None && right == null) {
left.Emit (ec);
return;
- } else if (op == JSToken.InstanceOf) {
+ } else if (op == JSToken.Instanceof) {
if (left != null)
left.Emit (ec);
if (right != null)
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -35,7 +35,7 @@
namespace Microsoft.JScript {
- public class SemanticAnalyser {
+ internal class SemanticAnalyser {
internal static bool print = true;
public static bool allow_member_expr_as_function_name;
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -440,7 +440,7 @@
}
}
- public class Switch : AST {
+ internal class Switch : AST {
internal AST exp;
internal ArrayList case_clauses;
Modified: trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Throw.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Throw.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/Throw.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -47,11 +47,6 @@
throw new NotImplementedException ();
}
- public override string ToString ()
- {
- return expression.ToString ();
- }
-
internal override bool Resolve (IdentificationTable context)
{
return expression.Resolve (context);
Modified:
trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/VariableStatement.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/VariableStatement.cs
2005-04-29 02:00:50 UTC (rev 43761)
+++ trunk/mcs/class/Microsoft.JScript/Microsoft.JScript/VariableStatement.cs
2005-04-29 02:04:06 UTC (rev 43762)
@@ -34,7 +34,7 @@
namespace Microsoft.JScript {
- public class VariableStatement : AST {
+ internal class VariableStatement : AST {
internal ArrayList var_decls;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
