2005-03-16 Alexander Olk <xenomorph2@onlinehome.de>

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

diff --git a/mcs/gmcs/cs-tokenizer.cs b/mcs/gmcs/cs-tokenizer.cs
index 47b47736373553be4ac26467c7b3cb3f13eabd22..e4daa8fe3811dfdfd3d8c6c814809c5f49f6b6b0 100644 (file)
--- a/mcs/gmcs/cs-tokenizer.cs
+++ b/mcs/gmcs/cs-tokenizer.cs
@@ -499,6 +499,8 @@ namespace Mono.CSharp
                                return true;
                        else if ((the_token == Token.COMMA) || (the_token == Token.DOT))
                                goto start;
+                       else if (the_token == Token.INTERR)
+                               goto again;
                        else if (the_token == Token.OP_GENERICS_LT) {
                                if (!parse_less_than ())
                                        return false;
@@ -745,11 +747,38 @@ namespace Mono.CSharp
                        deambiguate_close_parens++;
                }
 
+               public void PutbackNullable ()
+               {
+                       if (nullable_pos < 0)
+                               throw new Exception ();
+
+                       current_token = -1;
+                       val = null;
+                       reader.Position = nullable_pos;
+
+                       putback_char = '?';
+               }
+
+               public void PutbackCloseParens ()
+               {
+                       putback_char = ')';
+               }
+
                void Error_NumericConstantTooLong ()
                {
                        Report.Error (1021, Location, "Numeric constant too long");                     
                }
-               
+
+               int nullable_pos = -1;
+
+               public void CheckNullable (bool is_nullable)
+               {
+                       if (is_nullable)
+                               nullable_pos = reader.Position;
+                       else
+                               nullable_pos = -1;
+               }
+
                bool decimal_digits (int c)
                {
                        int d;