diff options
| author | Chris Toshok <toshok@novell.com> | 2006-03-08 00:58:01 +0300 |
|---|---|---|
| committer | Chris Toshok <toshok@novell.com> | 2006-03-08 00:58:01 +0300 |
| commit | ffcc362a420d56d3f0e050a8f98a16c8c72d2334 (patch) | |
| tree | 46e643bd189f00a0747095da73c89544b1c15d82 /mcs | |
| parent | 83ef4b0864e389abd1d3a1142631cca3deb53cff (diff) | |
2006-03-07 Chris Toshok <toshok@ximian.com>
* BaseCompiler.cs: fix typo in "initialize" in multiple places.
(Init): move the CreateMethods call here.
svn path=/trunk/mcs/; revision=57669
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs | 12 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/ChangeLog | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs index 6f67bcb42a7..3b4abcf9290 100644 --- a/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs +++ b/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs @@ -110,6 +110,7 @@ namespace System.Web.Compilation CreateStaticFields (); AddApplicationAndSessionObjects (); AddScripts (); + CreateMethods (); CreateConstructor (null, null); } @@ -124,7 +125,7 @@ namespace System.Web.Compilation #endif protected virtual void CreateStaticFields () { - CodeMemberField fld = new CodeMemberField (typeof (bool), "__intialized"); + CodeMemberField fld = new CodeMemberField (typeof (bool), "__initialized"); fld.Attributes = MemberAttributes.Private | MemberAttributes.Static; fld.InitExpression = new CodePrimitiveExpression (false); mainClass.Members.Add (fld); @@ -147,15 +148,15 @@ namespace System.Web.Compilation else #endif r = new CodeTypeReferenceExpression (mainNS.Name + "." + mainClass.Name); - CodeFieldReferenceExpression intialized; - intialized = new CodeFieldReferenceExpression (r, "__intialized"); + CodeFieldReferenceExpression initialized; + initialized = new CodeFieldReferenceExpression (r, "__initialized"); CodeBinaryOperatorExpression bin; - bin = new CodeBinaryOperatorExpression (intialized, + bin = new CodeBinaryOperatorExpression (initialized, CodeBinaryOperatorType.ValueEquality, new CodePrimitiveExpression (false)); - CodeAssignStatement assign = new CodeAssignStatement (intialized, + CodeAssignStatement assign = new CodeAssignStatement (initialized, new CodePrimitiveExpression (true)); CodeConditionStatement cond = new CodeConditionStatement (bin, assign); @@ -356,7 +357,6 @@ namespace System.Web.Compilation compiler = provider.CreateCompiler (); - CreateMethods (); compilerParameters.IncludeDebugInformation = parser.Debug; compilerParameters.CompilerOptions = compilerOptions + " " + parser.CompilerOptions; diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog index 742eb71bb47..5cd910ed575 100644 --- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog +++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog @@ -1,3 +1,8 @@ +2006-03-07 Chris Toshok <toshok@ximian.com> + + * BaseCompiler.cs: fix typo in "initialize" in multiple places. + (Init): move the CreateMethods call here. + 2006-03-02 Chris Toshok <toshok@ximian.com> * TemplateControlCompiler.cs (InitMethod): emit an assignment for |