Finally go back to backticks again.

svn path=/trunk/mcs/; revision=31440

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index db62a8e53b8913e49a99b73c2f2de0ad2550a581..22395cabc5847f525d3964345c446d36f3cd72a2 100755 (executable)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -17,8 +17,7 @@
 
 2004-07-17  Martin Baulig  <martin@ximian.com>
 
-       * decl.cs (MemberName.MakeName): Create the "class`1" names here;
-       use an exclamation mark (!) instead of backticks (`) again.
+       * decl.cs (MemberName.MakeName): Create the "class`1" names here.
 
 2004-07-16  Martin Baulig  <martin@ximian.com>
 

diff --git a/mcs/gmcs/decl.cs b/mcs/gmcs/decl.cs
index c2892b14fcf89286708b42bed9299cd358025992..f47402488eb82a99f3c49bf373ea4a040cef249a 100755 (executable)
--- a/mcs/gmcs/decl.cs
+++ b/mcs/gmcs/decl.cs
@@ -105,12 +105,12 @@ namespace Mono.CSharp {
                        if (args == null)
                                return name;
                        else
-                               return name + "!" + args.Count;
+                               return name + "`" + args.Count;
                }
 
                public static string MakeName (string name, int count)
                {
-                       return name + "!" + count;
+                       return name + "`" + count;
                }
 
                public string GetTypeName ()

diff --git a/mcs/gmcs/generic.cs b/mcs/gmcs/generic.cs
index f8482bdf2777a0d68b3a6fda654e21e1e7eff2c0..b170ad2bb804cea1f2c2a32afca8c803a298f4da 100644 (file)
--- a/mcs/gmcs/generic.cs
+++ b/mcs/gmcs/generic.cs
@@ -861,7 +861,7 @@ namespace Mono.CSharp {
 
                public string Basename {
                        get {
-                               int pos = name.LastIndexOf ('!');
+                               int pos = name.LastIndexOf ('`');
                                if (pos >= 0)
                                        return name.Substring (0, pos);
                                else

diff --git a/mcs/gmcs/rootcontext.cs b/mcs/gmcs/rootcontext.cs
index 0ce7729d99d31fb09f355871ebfc894fd88b98ba..8b5027e3696a44c4b49b7668646db1cc92ccbd1f 100755 (executable)
--- a/mcs/gmcs/rootcontext.cs
+++ b/mcs/gmcs/rootcontext.cs
@@ -315,8 +315,8 @@ namespace Mono.CSharp {
                                //
                                // Generic types
                                //
-                               "System.Collections.Generic.IEnumerator!1",
-                               "System.Collections.Generic.IEnumerable!1"
+                               "System.Collections.Generic.IEnumerator`1",
+                               "System.Collections.Generic.IEnumerable`1"
                        };
 
                        foreach (string iname in interfaces_first_stage)