Fix #354663

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

diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
index 28f0c44100942e311cc50cc56f03975b20433f17..86c215d472d2f844743e3d87d5c34a32fd3d5ac8 100644 (file)
--- a/mcs/mcs/cs-tokenizer.cs
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -45,17 +45,8 @@ namespace Mono.CSharp
                Location current_comment_location = Location.Null;
                ArrayList escaped_identifiers = new ArrayList ();
                public int parsing_block;
-
-#if GMCS_SOURCE
                internal int query_parsing;
-#endif
                
-               static bool IsLinqEnabled {
-                       get {
-                               return RootContext.Version == LanguageVersion.LINQ;
-                       }
-               }
-
                //
                // XML documentation buffer. The save point is used to divide
                // comments on types and comments on members.
@@ -392,7 +383,6 @@ namespace Mono.CSharp
                        AddKeyword ("volatile", Token.VOLATILE);
                        AddKeyword ("while", Token.WHILE);
                        AddKeyword ("partial", Token.PARTIAL);
-#if GMCS_SOURCE
                        AddKeyword ("where", Token.WHERE);
 
                        // LINQ keywords
@@ -408,7 +398,6 @@ namespace Mono.CSharp
                        AddKeyword ("ascending", Token.ASCENDING);
                        AddKeyword ("descending", Token.DESCENDING);
                        AddKeyword ("into", Token.INTO);
-#endif
                }
 
                //
@@ -450,7 +439,7 @@ namespace Mono.CSharp
                                return -1;
                        if (!handle_assembly && res == Token.ASSEMBLY)
                                return -1;
-#if GMCS_SOURCE
+                       
                        //
                        // A query expression is any expression that starts with `from identifier'
                        // followed by any token except ; , =
@@ -502,9 +491,8 @@ namespace Mono.CSharp
 
                        if (res == Token.WHERE && !handle_where && query_parsing == 0)
                                return -1;
-#endif
-                       return res;
                        
+                       return res;
                }
 
                public Location Location {
@@ -573,12 +561,14 @@ namespace Mono.CSharp
 
                                        case Token.STAR:
                                        case Token.SEMICOLON:
+                                       case Token.OPEN_BRACE:
                                        case Token.OPEN_PARENS:
+                                       case Token.LITERAL_STRING:
                                                return false;
                                }
                        }
 
-                       Error_TokenExpected (")");
+                       Error_TokenExpected (",' or `)");
                        return false;
                }
 
@@ -656,7 +646,6 @@ namespace Mono.CSharp
                        return false;
                }
 
-#if GMCS_SOURCE
                public void PutbackNullable ()
                {
                        if (nullable_pos < 0)
@@ -699,8 +688,7 @@ namespace Mono.CSharp
                        }
 
                        return false;
-               }               
-#endif
+               }
                
                public int peek_token ()
                {
@@ -737,14 +725,18 @@ namespace Mono.CSharp
                        case ']':
                                return Token.CLOSE_BRACKET;
                        case '(':
-                               if (IsLinqEnabled && !lambda_arguments_parsing) {
+                               if (!lambda_arguments_parsing) {
                                        lambda_arguments_parsing = true;
                                        PushPosition ();
                                        bool lambda_start = IsLambdaOpenParens ();
                                        PopPosition ();
                                        lambda_arguments_parsing = false;
-                                       if (lambda_start)
+                                       if (lambda_start) {
+                                               if (RootContext.Version <= LanguageVersion.ISO_2)
+                                                       Report.FeatureIsNotAvailable (Location, "lambda expressions");
+                                               
                                                return Token.OPEN_PARENS_LAMBDA;
+                                       }
                                }
                                return Token.OPEN_PARENS;
                        case ')': {
@@ -778,16 +770,14 @@ namespace Mono.CSharp
                                val = Location;
                                return Token.TILDE;
                        case '?':
-#if GMCS_SOURCE
                                d = peek_char ();
                                if (d == '?') {
                                        get_char ();
                                        return Token.OP_COALESCING;
                                }
-#endif
                                return Token.INTERR;
                        }
-#if GMCS_SOURCE
+                       
                        if (c == '<') {
                                if (parsing_generic_less_than++ > 0)
                                        return Token.OP_GENERICS_LT;
@@ -850,7 +840,7 @@ namespace Mono.CSharp
                                }
                                return Token.OP_GT;
                        }
-#endif
+                       
                        d = peek_char ();
                        if (c == '+'){
                                
@@ -963,41 +953,6 @@ namespace Mono.CSharp
                                return Token.CARRET;
                        }
 
-#if !GMCS_SOURCE
-                       if (c == '<'){
-                               if (d == '<'){
-                                       get_char ();
-                                       d = peek_char ();
-
-                                       if (d == '='){
-                                               doread = true;
-                                               return Token.OP_SHIFT_LEFT_ASSIGN;
-                                       }
-                                       return Token.OP_SHIFT_LEFT;
-                               } else if (d == '='){
-                                       doread = true;
-                                       return Token.OP_LE;
-                               }
-                               return Token.OP_LT;
-                       }
-
-                       if (c == '>'){
-                               if (d == '>'){
-                                       get_char ();
-                                       d = peek_char ();
-
-                                       if (d == '='){
-                                               doread = true;
-                                               return Token.OP_SHIFT_RIGHT_ASSIGN;
-                                       }
-                                       return Token.OP_SHIFT_RIGHT;
-                               } else if (d == '='){
-                                       doread = true;
-                                       return Token.OP_GE;
-                               }
-                               return Token.OP_GT;
-                       }
-#endif
                        if (c == ':'){
                                if (d == ':'){
                                        doread = true;
@@ -1454,16 +1409,21 @@ namespace Mono.CSharp
                        } else
                                x = reader.Read ();
                        if (x == '\n') {
-                               line++;
-                               ref_line++;
-                               previous_col = col;
-                               col = 0;
+                               advance_line ();
                        }
                        else
                                col++;
                        return x;
                }
 
+               void advance_line ()
+               {
+                       line++;
+                       ref_line++;
+                       previous_col = col;
+                       col = 0;
+               }
+
                int peek_char ()
                {
                        if (putback_char != -1)
@@ -1541,9 +1501,7 @@ namespace Mono.CSharp
                        case Token.TYPEOF:
                        case Token.UNCHECKED:
                        case Token.UNSAFE:
-#if GMCS_SOURCE
                        case Token.DEFAULT:
-#endif
 
                                //
                                // These can be part of a member access
@@ -1568,7 +1526,6 @@ namespace Mono.CSharp
                {
                        current_token = xtoken ();
 
-#if GMCS_SOURCE
                        if (current_token != Token.DEFAULT)
                                return current_token;
 
@@ -1582,7 +1539,7 @@ namespace Mono.CSharp
                                current_token = Token.DEFAULT_COLON;
                        else
                                PopPosition();
-#endif
+                       
                        return current_token;
                }
 
@@ -1733,12 +1690,12 @@ namespace Mono.CSharp
                        const string w_restore = "warning restore";
 
                        if (arg == w_disable) {
-                               Report.RegisterWarningRegion (Location).WarningDisable (line);
+                               Report.RegisterWarningRegion (Location).WarningDisable (Location.Row);
                                return;
                        }
 
                        if (arg == w_restore) {
-                               Report.RegisterWarningRegion (Location).WarningEnable (line);
+                               Report.RegisterWarningRegion (Location).WarningEnable (Location.Row);
                                return;
                        }
 
@@ -1970,7 +1927,7 @@ namespace Mono.CSharp
 
                void Error_TokenExpected (string token)
                {
-                       Report.Error (1026, Location, "Expecting `{0}'", token);
+                       Report.Error (1026, Location, "Expected `{0}'", token);
                }
 
                void Error_TokensSeen ()
@@ -2198,7 +2155,13 @@ namespace Mono.CSharp
                {
                        int c;
                        string_builder.Length = 0;
-                                                               
+
+                       //
+                       // No need to parse full string when parsing lambda arguments
+                       //
+                       if (lambda_arguments_parsing)
+                               return Token.LITERAL_STRING;                    
+                       
                        while ((c = get_char ()) != -1){
                                if (c == '"'){
                                        if (quoted && peek_char () == '"'){
@@ -2259,8 +2222,9 @@ namespace Mono.CSharp
                                PopPosition ();
 
                                if (ok) {
-                                       if (RootContext.Version == LanguageVersion.ISO_2 && next_token == Token.VOID) {
-                                               Report.FeatureIsNotAvailable (Location, "partial methods");
+                                       if (next_token == Token.VOID) {
+                                               if (RootContext.Version <= LanguageVersion.ISO_2)
+                                                       Report.FeatureIsNotAvailable (Location, "partial methods");
                                        } else if (RootContext.Version == LanguageVersion.ISO_1)
                                                Report.FeatureIsNotAvailable (Location, "partial types");
 
@@ -2376,7 +2340,9 @@ namespace Mono.CSharp
                                        continue;
 
                                if (c == '\r') {
-                                       if (peek_char () == '\n')
+                                       if (peek_char () != '\n')
+                                               advance_line ();
+                                       else
                                                get_char ();
 
                                        any_token_seen |= tokens_seen;