Author: marek
Date: 2007-11-07 09:32:08 -0500 (Wed, 07 Nov 2007)
New Revision: 89103
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/cs-parser.jay
trunk/mcs/mcs/decl.cs
trunk/mcs/mcs/gcs-parser.jay
Log:
2007-11-07 Marek Safar <[EMAIL PROTECTED]>
A fix for bug #325161
* cs-parser.jay, gcs-parser.jay, decl.cs: Implemented namespace alias
qualifier for generic types.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-11-07 13:55:05 UTC (rev 89102)
+++ trunk/mcs/mcs/ChangeLog 2007-11-07 14:32:08 UTC (rev 89103)
@@ -1,5 +1,11 @@
2007-11-07 Marek Safar <[EMAIL PROTECTED]>
+ A fix for bug #325161
+ * cs-parser.jay, gcs-parser.jay, decl.cs: Implemented namespace alias
+ qualifier for generic types.
+
+2007-11-07 Marek Safar <[EMAIL PROTECTED]>
+
A fix for bug #322971
* expression.cs, ecore.cs: Added intermediate result value check for
indexers.
Modified: trunk/mcs/mcs/cs-parser.jay
===================================================================
--- trunk/mcs/mcs/cs-parser.jay 2007-11-07 13:55:05 UTC (rev 89102)
+++ trunk/mcs/mcs/cs-parser.jay 2007-11-07 14:32:08 UTC (rev 89103)
@@ -2650,7 +2650,7 @@
| IDENTIFIER DOUBLE_COLON IDENTIFIER {
LocatedToken lt1 = (LocatedToken) $1;
LocatedToken lt2 = (LocatedToken) $3;
- $$ = new MemberName (lt1.Value, lt2.Value, lt2.Location);
+ $$ = new MemberName (lt1.Value, lt2.Value, null, lt2.Location);
}
| namespace_or_type_name DOT IDENTIFIER {
LocatedToken lt = (LocatedToken) $3;
Modified: trunk/mcs/mcs/decl.cs
===================================================================
--- trunk/mcs/mcs/decl.cs 2007-11-07 13:55:05 UTC (rev 89102)
+++ trunk/mcs/mcs/decl.cs 2007-11-07 14:32:08 UTC (rev 89103)
@@ -79,8 +79,8 @@
: this (left, name, false, args, loc)
{ }
- public MemberName (string alias, string name, Location loc)
- : this (new MemberName (alias, loc), name, true, loc)
+ public MemberName (string alias, string name, TypeArguments
args, Location loc)
+ : this (new MemberName (alias, loc), name, true, args,
loc)
{ }
public MemberName (MemberName left, MemberName right)
@@ -145,7 +145,7 @@
if (is_double_colon) {
if (Left.Left != null)
throw new InternalErrorException ("The
left side of a :: should be an identifier");
- return new QualifiedAliasMember (Left.Name,
Name, Location);
+ return new QualifiedAliasMember (Left.Name,
Basename, Location);
}
Expression lexpr = Left.GetTypeExpression ();
Modified: trunk/mcs/mcs/gcs-parser.jay
===================================================================
--- trunk/mcs/mcs/gcs-parser.jay 2007-11-07 13:55:05 UTC (rev 89102)
+++ trunk/mcs/mcs/gcs-parser.jay 2007-11-07 14:32:08 UTC (rev 89103)
@@ -2902,10 +2902,10 @@
LocatedToken lt = (LocatedToken) $1;
$$ = new MemberName (lt.Value, (TypeArguments) $2, lt.Location);
}
- | IDENTIFIER DOUBLE_COLON IDENTIFIER {
+ | IDENTIFIER DOUBLE_COLON IDENTIFIER opt_type_argument_list {
LocatedToken lt1 = (LocatedToken) $1;
LocatedToken lt2 = (LocatedToken) $3;
- $$ = new MemberName (lt1.Value, lt2.Value, lt2.Location);
+ $$ = new MemberName (lt1.Value, lt2.Value, (TypeArguments) $4,
lt2.Location);
}
| namespace_or_type_name DOT IDENTIFIER opt_type_argument_list {
LocatedToken lt = (LocatedToken) $3;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
