diff options
Diffstat (limited to 'mcs/class/System/Microsoft.CSharp')
| -rw-r--r-- | mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs | 4 | ||||
| -rw-r--r-- | mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs | 5 | ||||
| -rw-r--r-- | mcs/class/System/Microsoft.CSharp/ChangeLog | 10 |
3 files changed, 16 insertions, 3 deletions
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs index a09a812bedc..edc8da68872 100644 --- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs +++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs @@ -97,7 +97,7 @@ namespace Mono.CSharp StringCollection assemblies = options.ReferencedAssemblies; foreach (CodeCompileUnit e in ea) { - fileNames [i] = GetTempFileNameWithExtension (options.TempFiles, "cs"); + fileNames [i] = GetTempFileNameWithExtension (options.TempFiles, i.ToString () + ".cs"); FileStream f=new FileStream(fileNames[i],FileMode.OpenOrCreate); StreamWriter s=new StreamWriter(f, Encoding.UTF8); if (e.ReferencedAssemblies != null) { @@ -183,7 +183,7 @@ namespace Mono.CSharp string[] fileNames=new string[sources.Length]; int i=0; foreach (string source in sources) { - fileNames [i] = GetTempFileNameWithExtension (options.TempFiles, "cs"); + fileNames [i] = GetTempFileNameWithExtension (options.TempFiles, i.ToString () + ".cs"); FileStream f=new FileStream(fileNames[i],FileMode.OpenOrCreate); StreamWriter s=new StreamWriter(f); s.Write(source); diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs index 4be6da4cf77..c22c8fc653d 100644 --- a/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs +++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs @@ -503,7 +503,10 @@ namespace Mono.CSharp OutputMemberAccessModifier( attributes ); OutputFieldScopeModifier( attributes ); - OutputTypeNamePair( field.Type, GetSafeName (field.Name) ); + if (IsCurrentEnum) + Output.Write(field.Name); + else + OutputTypeNamePair( field.Type, GetSafeName (field.Name) ); CodeExpression initExpression = field.InitExpression; if ( initExpression != null ) { diff --git a/mcs/class/System/Microsoft.CSharp/ChangeLog b/mcs/class/System/Microsoft.CSharp/ChangeLog index b9e06652430..6fbed3e9cc0 100644 --- a/mcs/class/System/Microsoft.CSharp/ChangeLog +++ b/mcs/class/System/Microsoft.CSharp/ChangeLog @@ -1,3 +1,13 @@ +2004-07-13 Peter Williams <peter@newton.cx> + + * CSharpCodeCompiler.cs (CompileAssemblyFromDomBatch): Include + counter in the extension so that batch compilations work. + (CompileAssemblyFromSourceBatch): Same. + +2004-07-12 Fawad Halim <fawad@fawad.net> + + * CSharpCodeGenerator.cs : Have GenerateField generate field sans the type for enums. + 2004-06-28 Atsushi Enomoto <atsushi@ximian.com> * CSharpCodeCompiler.cs : (only for windows) First check mcs.bat, then |