Initial import of the Generic MCS tree.

[mono.git] / mcs / gmcs / cs-tokenizer.cs

diff --git a/mcs/gmcs/cs-tokenizer.cs b/mcs/gmcs/cs-tokenizer.cs
index de90a126fbafe2040e503dd849e782f488ee9164..8cc6e44085105fdf16c72cba4dfa1bdc1a4670c0 100755 (executable)
--- a/mcs/gmcs/cs-tokenizer.cs
+++ b/mcs/gmcs/cs-tokenizer.cs
@@ -279,6 +279,7 @@ namespace Mono.CSharp
                        keywords.Add ("virtual", Token.VIRTUAL);\r
                        keywords.Add ("void", Token.VOID);\r
                        keywords.Add ("volatile", Token.VOLATILE);\r
+                       keywords.Add ("where", Token.WHERE);\r
                        keywords.Add ("while", Token.WHILE);\r
 \r
                        if (RootContext.V2){\r
@@ -493,16 +494,7 @@ namespace Mono.CSharp
                        }\r
 \r
                        if (c == '<'){\r
-                               if (d == '<'){\r
-                                       getChar ();\r
-                                       d = peekChar ();\r
-\r
-                                       if (d == '='){\r
-                                               doread = true;\r
-                                               return Token.OP_SHIFT_LEFT_ASSIGN;\r
-                                       }\r
-                                       return Token.OP_SHIFT_LEFT;\r
-                               } else if (d == '='){\r
+                               if (d == '='){\r
                                        doread = true;\r
                                        return Token.OP_LE;\r
                                }\r
@@ -510,16 +502,7 @@ namespace Mono.CSharp
                        }\r
 \r
                        if (c == '>'){\r
-                               if (d == '>'){\r
-                                       getChar ();\r
-                                       d = peekChar ();\r
-\r
-                                       if (d == '='){\r
-                                               doread = true;\r
-                                               return Token.OP_SHIFT_RIGHT_ASSIGN;\r
-                                       }\r
-                                       return Token.OP_SHIFT_RIGHT;\r
-                               } else if (d == '='){\r
+                               if (d == '='){\r
                                        doread = true;\r
                                        return Token.OP_GE;\r
                                }\r