Make some fixes to ClrTypeSpec2. Add parsing tests for ClrTypeSpec2.

Author: dmiller

Clojure/Clojure/Lib/ClrTypeSpec2.cs

@@ -498,13 +498,6 @@ void SetGenericArgumentCount(int count)
 
     void MergeNested(ClrTypeSpec nestedSpec)
     {
-        // append any generic arguments to the current type
-        if (nestedSpec._genericParams != null)
-        {
-            if (_genericParams == null)
-                _genericParams = new List<ClrTypeSpec>();
-            _genericParams.AddRange(nestedSpec._genericParams);
-        }
 
         // Append all nested names to the current type
         if (_nested == null)
@@ -515,6 +508,29 @@ void MergeNested(ClrTypeSpec nestedSpec)
         {
             _nested.AddRange(nestedSpec._nested);
         }
+
+        // append any generic arguments to the current type
+        if (nestedSpec._genericParams != null)
+        {
+            if (_genericParams == null)
+                _genericParams = new List<ClrTypeSpec>();
+            _genericParams.AddRange(nestedSpec._genericParams);
+        }
+        // append any modifiers to the current type
+        if (nestedSpec._modifierSpec != null)
+        {
+            if (_modifierSpec == null)
+                _modifierSpec = new List<IClrModifierSpec>();
+            _modifierSpec.AddRange(nestedSpec._modifierSpec);
+        }
+
+        // byref flag   
+        if (nestedSpec._isByRef)
+        {
+            if (_isByRef)
+                throw new ArgumentException("Can't have a byref of a byref", "typeName");
+            _isByRef = true;
+        }
     }
 
 
@@ -718,8 +734,8 @@ static ClrTypeSpec Parse(string name, ref int p, bool is_recurse, bool allow_aqn
                             {
                                 // We have a nested type after a generic argument list.  (Extension to the original syntax.)
                                 // Recursively parse to pick up the remainder, then merge the results.
-                                ++pos; //skip '+'
-                                var nested = Parse(name, ref pos, true, false, false);
+                                pos += 2; // skip "]+" to the start of the nested name
+                                var nested = Parse(name, ref pos, true, false, true);
                                 data.MergeNested(nested);
                             }
                         }

Clojure/Csharp.Tests/TypeNameTests/TypeNameParsingTests.cs

@@ -125,24 +125,6 @@ public TypeSpecComparer SetIsByRef()
 [TestFixture]
 public class TypeNameParsingTests
 {
-    //static Namespace _ns;
-
-    [OneTimeSetUp]
-    public void Setup()
-    {
-        //RT.Init();
-
-        //_ns = Namespace.findOrCreate(Symbol.intern("Csharp.Tests"));
-
-        //_ns.importClass(Symbol.intern("TTypeA"), typeof(TypeA));
-        //_ns.importClass(Symbol.intern("TOneG"), typeof(OneG<>));
-        //_ns.importClass(Symbol.intern("TTwoG"), typeof(TwoG<,>));
-        //_ns.importClass(Symbol.intern("TGenParent"), typeof(GenParent<,>));
-
-        //RT.CurrentNSVar.bindRoot(_ns);
-    }
-
-
     [TestCase("A", "A", "#1")]
     [TestCase("A.B", "A.B", "#2")]
     [TestCase("A\\+B", "A\\+B", "#3")]