2008-06-11 Martin Baulig <martin@ximian.com>
[mono.git] / mcs / mcs / cs-tokenizer.cs
index e288f8d9dfc330d54839c4a957b3b9e22ce765ec..8e107f2682e622ed90c76506c896f3f1b8160d58 100644 (file)
@@ -5,10 +5,10 @@
 // Author: Miguel de Icaza (miguel@gnu.org)
 //         Marek Safar (marek.safar@seznam.cz)
 //
-// Licensed under the terms of the GNU GPL
+// Dual licensed under the terms of the MIT X11 or GNU GPL
 //
-// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
-// (C) 2004 Novell, Inc
+// Copyright 2001, 2002 Ximian, Inc (http://www.ximian.com)
+// Copyright 2004-2008 Novell, Inc
 //
 //
 
@@ -29,7 +29,8 @@ namespace Mono.CSharp
        {
                SeekableStreamReader reader;
                SourceFile ref_name;
-               SourceFile file_name;
+               CompilationUnit file_name;
+               bool hidden = false;
                int ref_line = 1;
                int line = 1;
                int col = 0;
@@ -38,13 +39,15 @@ namespace Mono.CSharp
                bool handle_get_set = false;
                bool handle_remove_add = false;
                bool handle_assembly = false;
-               bool handle_constraints = false;
+               bool handle_where = false;
                bool handle_typeof = false;
-               bool linq;
+               bool lambda_arguments_parsing;
                Location current_location;
                Location current_comment_location = Location.Null;
-               ArrayList escapedIdentifiers = new ArrayList ();
-
+               ArrayList escaped_identifiers = new ArrayList ();
+               public int parsing_block;
+               internal int query_parsing;
+               
                //
                // XML documentation buffer. The save point is used to divide
                // comments on types and comments on members.
@@ -54,7 +57,7 @@ namespace Mono.CSharp
                //
                // See comment on XmlCommentState enumeration.
                //
-               XmlCommentState xmlDocState = XmlCommentState.Allowed;
+               XmlCommentState xml_doc_state = XmlCommentState.Allowed;
 
                //
                // Whether tokens have been seen on this line
@@ -68,16 +71,16 @@ namespace Mono.CSharp
                //
                bool any_token_seen = false;
 
-               static Hashtable tokenValues;
+               static Hashtable token_values;
                static readonly char[] simple_whitespaces = new char[] { ' ', '\t' };
 
                private static Hashtable TokenValueName
                {
                        get {
-                               if (tokenValues == null)
-                                       tokenValues = GetTokenValueNameHash ();
+                               if (token_values == null)
+                                       token_values = GetTokenValueNameHash ();
 
-                               return tokenValues;
+                               return token_values;
                        }
                }
 
@@ -121,69 +124,44 @@ namespace Mono.CSharp
                }
 
                public bool PropertyParsing {
-                       get {
-                               return handle_get_set;
-                       }
-
-                       set {
-                               handle_get_set = value;
-                       }
+                       get { return handle_get_set; }
+                       set { handle_get_set = value; }
                 }
 
                public bool AssemblyTargetParsing {
-                       get {
-                               return handle_assembly;
-                       }
-
-                       set {
-                               handle_assembly = value;
-                       }
+                       get { return handle_assembly; }
+                       set { handle_assembly = value; }
                }
 
                public bool EventParsing {
-                       get {
-                               return handle_remove_add;
-                       }
-
-                       set {
-                               handle_remove_add = value;
-                       }
+                       get { return handle_remove_add; }
+                       set { handle_remove_add = value; }
                }
 
                public bool ConstraintsParsing {
-                       get {
-                               return handle_constraints;
-                       }
-
-                       set {
-                               handle_constraints = value;
-                       }
+                       get { return handle_where; }
+                       set { handle_where = value; }
                }
 
                public bool TypeOfParsing {
-                       get {
-                               return handle_typeof;
-                       }
-
-                       set {
-                               handle_typeof = value;
-                       }
+                       get { return handle_typeof; }
+                       set { handle_typeof = value; }
                }
-
+               
                public XmlCommentState doc_state {
-                       get { return xmlDocState; }
+                       get { return xml_doc_state; }
                        set {
                                if (value == XmlCommentState.Allowed) {
                                        check_incorrect_doc_comment ();
                                        reset_doc_comment ();
                                }
-                               xmlDocState = value;
+                               xml_doc_state = value;
                        }
                }
 
                public bool IsEscapedIdentifier (Location loc)
                {
-                       foreach (LocatedToken lt in escapedIdentifiers)
+                       foreach (LocatedToken lt in escaped_identifiers)
                                if (lt.Location.Equals (loc))
                                        return true;
                        return false;
@@ -193,7 +171,7 @@ namespace Mono.CSharp
                // Class variables
                // 
                static CharArrayHashtable[] keywords;
-               static Hashtable keywordStrings = new Hashtable ();
+               static Hashtable keyword_strings;
                static NumberStyles styles;
                static NumberFormatInfo csharp_format_info;
                
@@ -261,8 +239,10 @@ namespace Mono.CSharp
                Stack position_stack = new Stack (2);
                class Position {
                        public int position;
+                       public int line;
                        public int ref_line;
                        public int col;
+                       public bool hidden;
                        public int putback_char;
                        public int previous_col;
                        public Stack ifstack;
@@ -272,8 +252,10 @@ namespace Mono.CSharp
                        public Position (Tokenizer t)
                        {
                                position = t.reader.Position;
+                               line = t.line;
                                ref_line = t.ref_line;
                                col = t.col;
+                               hidden = t.hidden;
                                putback_char = t.putback_char;
                                previous_col = t.previous_col;
                                if (t.ifstack != null && t.ifstack.Count != 0)
@@ -294,7 +276,9 @@ namespace Mono.CSharp
 
                        reader.Position = p.position;
                        ref_line = p.ref_line;
+                       line = p.line;
                        col = p.col;
+                       hidden = p.hidden;
                        putback_char = p.putback_char;
                        previous_col = p.previous_col;
                        ifstack = p.ifstack;
@@ -308,8 +292,9 @@ namespace Mono.CSharp
                        position_stack.Pop ();
                }
                
-               static void AddKeyword (string kw, int token) {
-                       keywordStrings.Add (kw, kw);
+               static void AddKeyword (string kw, int token)
+               {
+                       keyword_strings.Add (kw, kw);
                        if (keywords [kw.Length] == null) {
                                keywords [kw.Length] = new CharArrayHashtable (kw.Length);
                        }
@@ -318,6 +303,7 @@ namespace Mono.CSharp
 
                static void InitTokens ()
                {
+                       keyword_strings = new Hashtable ();
                        keywords = new CharArrayHashtable [64];
 
                        AddKeyword ("__arglist", Token.ARGLIST);
@@ -404,20 +390,37 @@ namespace Mono.CSharp
                        AddKeyword ("volatile", Token.VOLATILE);
                        AddKeyword ("while", Token.WHILE);
                        AddKeyword ("partial", Token.PARTIAL);
-#if GMCS_SOURCE
                        AddKeyword ("where", Token.WHERE);
-#endif
+
+                       // LINQ keywords
+                       AddKeyword ("from", Token.FROM);
+                       AddKeyword ("join", Token.JOIN);
+                       AddKeyword ("on", Token.ON);
+                       AddKeyword ("equals", Token.EQUALS);
+                       AddKeyword ("select", Token.SELECT);
+                       AddKeyword ("group", Token.GROUP);
+                       AddKeyword ("by", Token.BY);
+                       AddKeyword ("let", Token.LET);
+                       AddKeyword ("orderby", Token.ORDERBY);
+                       AddKeyword ("ascending", Token.ASCENDING);
+                       AddKeyword ("descending", Token.DESCENDING);
+                       AddKeyword ("into", Token.INTO);
                }
 
                //
                // Class initializer
                // 
                static Tokenizer ()
+               {
+                       Reset ();
+               }
+
+               public static void Reset ()
                {
                        InitTokens ();
                        csharp_format_info = NumberFormatInfo.InvariantInfo;
                        styles = NumberStyles.Float;
-                       
+
                        string_builder = new System.Text.StringBuilder ();
                }
 
@@ -437,18 +440,66 @@ namespace Mono.CSharp
                        
                        int res = (int) o;
 
-                       if (handle_get_set == false && (res == Token.GET || res == Token.SET))
+                       if (!handle_get_set && (res == Token.GET || res == Token.SET))
                                return -1;
-                       if (handle_remove_add == false && (res == Token.REMOVE || res == Token.ADD))
+                       if (!handle_remove_add && (res == Token.REMOVE || res == Token.ADD))
                                return -1;
-                       if (handle_assembly == false && res == Token.ASSEMBLY)
+                       if (!handle_assembly && res == Token.ASSEMBLY)
                                return -1;
-#if GMCS_SOURCE
-                       if (handle_constraints == false && res == Token.WHERE)
+                       
+                       //
+                       // A query expression is any expression that starts with `from identifier'
+                       // followed by any token except ; , =
+                       // 
+                       if (query_parsing == 0) {
+                               if (res == Token.FROM && !lambda_arguments_parsing) {
+                                       PushPosition ();
+                                       // HACK: to disable generics micro-parser, because PushPosition does not
+                                       // store identifiers array
+                                       parsing_generic_less_than = 1;
+                                       switch (xtoken ()) {
+                                               case Token.IDENTIFIER:
+                                               case Token.INT:
+                                               case Token.BOOL:
+                                               case Token.BYTE:
+                                               case Token.CHAR:
+                                               case Token.DECIMAL:
+                                               case Token.FLOAT:
+                                               case Token.LONG:
+                                               case Token.OBJECT:
+                                               case Token.STRING:
+                                               case Token.UINT:
+                                               case Token.ULONG:
+                                                       int next_token = xtoken ();
+                                                       if (next_token == Token.SEMICOLON || next_token == Token.COMMA || next_token == Token.EQUALS)
+                                                               goto default;
+
+                                                       ++query_parsing;
+                                                       if (RootContext.Version <= LanguageVersion.ISO_2)
+                                                               Report.FeatureIsNotAvailable (Location, "query expressions");
+                                                       break;
+                                               case Token.VOID:
+                                                       Expression.Error_VoidInvalidInTheContext (Location);
+                                                       break;
+                                               default:
+                                                       PopPosition ();
+                                                       // HACK: A token is not a keyword so we need to restore identifiers buffer
+                                                       // which has been overwritten before we grabbed the identifier
+                                                       id_builder [0] = 'f'; id_builder [1] = 'r'; id_builder [2] = 'o'; id_builder [3] = 'm';
+                                                       return -1;
+                                       }
+                                       PopPosition ();
+                                       return res;
+                               }
+
+                               if (res > Token.QUERY_FIRST_TOKEN && res < Token.QUERY_LAST_TOKEN)
+                                       return -1;
+                       }
+
+                       if (res == Token.WHERE && !handle_where && query_parsing == 0)
                                return -1;
-#endif
-                       return res;
                        
+                       return res;
                }
 
                public Location Location {
@@ -465,11 +516,10 @@ namespace Mono.CSharp
                        defines [def] = true;
                }
                
-               public Tokenizer (SeekableStreamReader input, SourceFile file, ArrayList defs)
+               public Tokenizer (SeekableStreamReader input, CompilationUnit file, ArrayList defs)
                {
                        this.ref_name = file;
                        this.file_name = file;
-                       linq = RootContext.Version == LanguageVersion.LINQ;
                        reader = input;
                        
                        putback_char = -1;
@@ -486,7 +536,7 @@ namespace Mono.CSharp
                        // FIXME: This could be `Location.Push' but we have to
                        // find out why the MS compiler allows this
                        //
-                       Mono.CSharp.Location.Push (file);
+                       Mono.CSharp.Location.Push (file, file);
                }
 
                static bool is_identifier_start_character (char c)
@@ -502,7 +552,31 @@ namespace Mono.CSharp
 
                public static bool IsKeyword (string s)
                {
-                       return keywordStrings [s] != null;
+                       return keyword_strings [s] != null;
+               }
+
+               //
+               // Tests whether '(' is beggining of lambda parameters
+               //
+               bool IsLambdaOpenParens ()
+               {
+                       int ntoken;
+                       while ((ntoken = xtoken ()) != Token.EOF) {
+                               switch (ntoken) {
+                                       case Token.CLOSE_PARENS:
+                                               return xtoken () == Token.ARROW;
+
+                                       case Token.STAR:
+                                       case Token.SEMICOLON:
+                                       case Token.OPEN_BRACE:
+                                       case Token.OPEN_PARENS:
+                                       case Token.LITERAL_STRING:
+                                               return false;
+                               }
+                       }
+
+                       Error_TokenExpected (",' or `)");
+                       return false;
                }
 
                public static bool IsValidIdentifier (string s)
@@ -520,22 +594,6 @@ namespace Mono.CSharp
                        return true;
                }
 
-               bool parse_generic_dimension (out int dimension)
-               {
-                       dimension = 1;
-
-               again:
-                       int the_token = token ();
-                       if (the_token == Token.OP_GENERICS_GT)
-                               return true;
-                       else if (the_token == Token.COMMA) {
-                               dimension++;
-                               goto again;
-                       }
-
-                       return false;
-               }
-
                bool parse_less_than ()
                {
                start:
@@ -595,7 +653,6 @@ namespace Mono.CSharp
                        return false;
                }
 
-#if GMCS_SOURCE
                public void PutbackNullable ()
                {
                        if (nullable_pos < 0)
@@ -623,154 +680,34 @@ namespace Mono.CSharp
                        else
                                nullable_pos = -1;
                }
-#endif
                
-               public int peek_token ()
+               bool parse_generic_dimension (out int dimension)
                {
-                       int the_token;
+                       dimension = 1;
 
-                       PushPosition ();
-                       the_token = token ();
-                       PopPosition ();
-                       
-                       return the_token;
-               }
-               
-               bool parse_namespace_or_typename (int next)
-               {
-                       if (next == -1)
-                               next = peek_token ();
-                       while (next == Token.IDENTIFIER){
-                               token ();
-                         again:
-                               next = peek_token ();
-                               if (next == Token.DOT || next == Token.DOUBLE_COLON){
-                                       token ();
-                                       next = peek_token ();
-                                       continue;
-                               }
-                               if (next == Token.OP_GENERICS_LT){
-                                       token ();
-                                       if (!parse_less_than ())
-                                               return false;
-                                       goto again;
-                               }
+               again:
+                       int the_token = token ();
+                       if (the_token == Token.OP_GENERICS_GT)
                                return true;
+                       else if (the_token == Token.COMMA) {
+                               dimension++;
+                               goto again;
                        }
 
                        return false;
                }
-
-               bool is_simple_type (int token)
-               {
-                       return  (token == Token.BOOL ||
-                                token == Token.DECIMAL ||
-                                token == Token.SBYTE ||
-                                token == Token.BYTE ||
-                                token == Token.SHORT ||
-                                token == Token.USHORT ||
-                                token == Token.INT ||
-                                token == Token.UINT ||
-                                token == Token.LONG ||
-                                token == Token.ULONG ||
-                                token == Token.CHAR ||
-                                token == Token.FLOAT ||
-                                token == Token.DOUBLE);
-               }
-
-               bool is_builtin_reference_type (int token)
-               {
-                       return (token == Token.OBJECT || token == Token.STRING);
-               }
-
-               bool parse_opt_rank (int next)
+               
+               public int peek_token ()
                {
-                       while (true){
-                               if (next != Token.OPEN_BRACKET)
-                                       return true;
+                       int the_token;
 
-                               token ();
-                               while (true){
-                                       next = token ();
-                                       if (next == Token.CLOSE_BRACKET){
-                                               next = peek_token ();
-                                               break;
-                                       }
-                                       if (next == Token.COMMA)
-                                               continue;
-                                       
-                                       return false;
-                               }
-                       }
-               }
-                       
-               bool parse_type ()
-               {
-                       int next = peek_token ();
-                       
-                       if (is_simple_type (next)){
-                               token ();
-                               next = peek_token ();
-                               if (next == Token.INTERR)
-                                       token ();
-                               return parse_opt_rank (peek_token ());
-                       }
-                       if (parse_namespace_or_typename (next)){
-                               next = peek_token ();
-                               if (next == Token.INTERR)
-                                       token ();
-                               return parse_opt_rank (peek_token ());
-                       } else if (is_builtin_reference_type (next)){
-                               token ();
-                               return parse_opt_rank (peek_token ());
-                       }
+                       PushPosition ();
+                       the_token = token ();
+                       PopPosition ();
                        
-                       return false;
-               }
-               
-               //
-               // Invoked after '(' has been seen and tries to parse:
-               // type identifier [, type identifier]*
-               //
-               // if this is the case, instead of returning an
-               // OPEN_PARENS token we return a special token that
-               // triggers lambda parsing.
-               //
-               // This is needed because we can not introduce the
-               // explicitly_typed_lambda_parameter_list after a '(' in the
-               // grammar without introducing reduce/reduce conflicts.
-               //
-               // We need to parse a type and if it is followed by an
-               // identifier, we know it has to be parsed as a lambda
-               // expression.  
-               //
-               // the type expression can be prefixed with `ref' or `out'
-               //
-               public bool parse_lambda_parameters ()
-               {
-                       while (true){
-                               int next = peek_token ();
-
-                               if (next == Token.REF || next == Token.OUT)
-                                       token ();
-                                                
-                               if (parse_type ()){
-                                       next = peek_token ();
-                                       if (next == Token.IDENTIFIER){
-                                               token ();
-                                               next = peek_token ();
-                                               if (next == Token.COMMA){
-                                                       token ();
-                                                       continue;
-                                               }
-                                               if (next == Token.CLOSE_PARENS)
-                                                       return true;
-                                       }
-                               }
-                               return false;
-                       }
+                       return the_token;
                }
-
+                                       
                int parsing_generic_less_than = 0;
                
                int is_punct (char c, ref bool doread)
@@ -795,17 +732,20 @@ namespace Mono.CSharp
                        case ']':
                                return Token.CLOSE_BRACKET;
                        case '(':
-                               if (linq){
+                               if (!lambda_arguments_parsing) {
+                                       lambda_arguments_parsing = true;
                                        PushPosition ();
-                                       bool have_lambda_parameter = parse_lambda_parameters ();
+                                       bool lambda_start = IsLambdaOpenParens ();
                                        PopPosition ();
-                                       
-                                       if (have_lambda_parameter)
+                                       lambda_arguments_parsing = false;
+                                       if (lambda_start) {
+                                               if (RootContext.Version <= LanguageVersion.ISO_2)
+                                                       Report.FeatureIsNotAvailable (Location, "lambda expressions");
+                                               
                                                return Token.OPEN_PARENS_LAMBDA;
-                                       else
-                                               return Token.OPEN_PARENS;
-                               } else
-                                       return Token.OPEN_PARENS;
+                                       }
+                               }
+                               return Token.OPEN_PARENS;
                        case ')': {
                                if (deambiguate_close_parens == 0)
                                        return Token.CLOSE_PARENS;
@@ -837,9 +777,14 @@ namespace Mono.CSharp
                                val = Location;
                                return Token.TILDE;
                        case '?':
+                               d = peek_char ();
+                               if (d == '?') {
+                                       get_char ();
+                                       return Token.OP_COALESCING;
+                               }
                                return Token.INTERR;
                        }
-#if GMCS_SOURCE
+                       
                        if (c == '<') {
                                if (parsing_generic_less_than++ > 0)
                                        return Token.OP_GENERICS_LT;
@@ -865,10 +810,10 @@ namespace Mono.CSharp
                                } else
                                        parsing_generic_less_than = 0;
 
-                               d = peekChar ();
+                               d = peek_char ();
                                if (d == '<'){
-                                       getChar ();
-                                       d = peekChar ();
+                                       get_char ();
+                                       d = peek_char ();
 
                                        if (d == '='){
                                                doread = true;
@@ -886,10 +831,10 @@ namespace Mono.CSharp
                                        return Token.OP_GENERICS_GT;
                                }
 
-                               d = peekChar ();
+                               d = peek_char ();
                                if (d == '>'){
-                                       getChar ();
-                                       d = peekChar ();
+                                       get_char ();
+                                       d = peek_char ();
 
                                        if (d == '='){
                                                doread = true;
@@ -902,8 +847,8 @@ namespace Mono.CSharp
                                }
                                return Token.OP_GT;
                        }
-#endif
-                       d = peekChar ();
+                       
+                       d = peek_char ();
                        if (c == '+'){
                                
                                if (d == '+') {
@@ -955,6 +900,7 @@ namespace Mono.CSharp
                                        val = Location;
                                        return Token.ARROW;
                                }
+
                                return Token.ASSIGN;
                        }
 
@@ -1014,41 +960,6 @@ namespace Mono.CSharp
                                return Token.CARRET;
                        }
 
-#if !GMCS_SOURCE
-                       if (c == '<'){
-                               if (d == '<'){
-                                       getChar ();
-                                       d = peekChar ();
-
-                                       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 == '>'){
-                                       getChar ();
-                                       d = peekChar ();
-
-                                       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;
@@ -1067,8 +978,10 @@ namespace Mono.CSharp
                {
                        putback (')');
 
-                       // When any binary operation is used we are sure it is not a cast
-                       if (expression is Binary)
+                       // When any binary operation, a conditional is used we are sure it is not a cast
+                       // maybe more.
+                       
+                       if (expression is Binary || expression is Conditional)
                                return;
 
                        deambiguate_close_parens++;
@@ -1086,15 +999,15 @@ namespace Mono.CSharp
                        }
                        
                        //
-                       // We use peekChar2, because decimal_digits needs to do a 
+                       // We use peek_char2, because decimal_digits needs to do a 
                        // 2-character look-ahead (5.ToString for example).
                        //
-                       while ((d = peekChar2 ()) != -1){
+                       while ((d = peek_char2 ()) != -1){
                                if (d >= '0' && d <= '9'){
                                        if (number_pos == max_number_size)
                                                Error_NumericConstantTooLong ();
                                        number_builder [number_pos++] = (char) d;
-                                       getChar ();
+                                       get_char ();
                                        seen_digits = true;
                                } else
                                        break;
@@ -1107,7 +1020,7 @@ namespace Mono.CSharp
                {
                        return (e >= '0' && e <= '9') || (e >= 'A' && e <= 'F') || (e >= 'a' && e <= 'f');
                }
-                               
+
                static int real_type_suffix (int c)
                {
                        int t;
@@ -1141,11 +1054,11 @@ namespace Mono.CSharp
                                                if (is_unsigned)
                                                        scanning = false;
                                                is_unsigned = true;
-                                               getChar ();
+                                               get_char ();
                                                break;
 
                                        case 'l':
-                                               if (!is_unsigned && (RootContext.WarningLevel >= 4)){
+                                               if (!is_unsigned){
                                                        //
                                                        // if we have not seen anything in between
                                                        // report this error
@@ -1160,21 +1073,21 @@ namespace Mono.CSharp
                                                if (is_long)
                                                        scanning = false;
                                                is_long = true;
-                                               getChar ();
+                                               get_char ();
                                                break;
 
                                        case 'L': 
                                                if (is_long)
                                                        scanning = false;
                                                is_long = true;
-                                               getChar ();
+                                               get_char ();
                                                break;
                                                
                                        default:
                                                scanning = false;
                                                break;
                                        }
-                                       c = peekChar ();
+                                       c = peek_char ();
                                } while (scanning);
                        }
 
@@ -1291,11 +1204,11 @@ namespace Mono.CSharp
                        int d;
                        ulong ul;
                        
-                       getChar ();
-                       while ((d = peekChar ()) != -1){
+                       get_char ();
+                       while ((d = peek_char ()) != -1){
                                if (is_hex (d)){
                                        number_builder [number_pos++] = (char) d;
-                                       getChar ();
+                                       get_char ();
                                } else
                                        break;
                        }
@@ -1318,7 +1231,7 @@ namespace Mono.CSharp
                                return Token.LITERAL_INTEGER;
                        }
                        
-                       return integer_type_suffix (ul, peekChar ());
+                       return integer_type_suffix (ul, peek_char ());
                }
 
                //
@@ -1333,13 +1246,13 @@ namespace Mono.CSharp
 
                        if (c >= '0' && c <= '9'){
                                if (c == '0'){
-                                       int peek = peekChar ();
+                                       int peek = peek_char ();
 
                                        if (peek == 'x' || peek == 'X')
                                                return handle_hex ();
                                }
                                decimal_digits (c);
-                               c = getChar ();
+                               c = get_char ();
                        }
 
                        //
@@ -1349,7 +1262,7 @@ namespace Mono.CSharp
                        if (c == '.'){
                                if (decimal_digits ('.')){
                                        is_real = true;
-                                       c = getChar ();
+                                       c = get_char ();
                                } else {
                                        putback ('.');
                                        number_pos--;
@@ -1362,7 +1275,7 @@ namespace Mono.CSharp
                                if (number_pos == max_number_size)
                                        Error_NumericConstantTooLong ();
                                number_builder [number_pos++] = 'e';
-                               c = getChar ();
+                               c = get_char ();
                                
                                if (c == '+'){
                                        if (number_pos == max_number_size)
@@ -1381,7 +1294,7 @@ namespace Mono.CSharp
                                }
                                        
                                decimal_digits (c);
-                               c = getChar ();
+                               c = get_char ();
                        }
 
                        type = real_type_suffix (c);
@@ -1412,10 +1325,10 @@ namespace Mono.CSharp
                        int c;
                        int top = count != -1 ? count : 4;
                        
-                       getChar ();
+                       get_char ();
                        error = false;
                        for (i = 0; i < top; i++){
-                               c = getChar ();
+                               c = get_char ();
                                
                                if (c >= '0' && c <= '9')
                                        c = (int) c - (int) '0';
@@ -1430,7 +1343,7 @@ namespace Mono.CSharp
                                
                                total = (total * 16) + c;
                                if (count == -1){
-                                       int p = peekChar ();
+                                       int p = peek_char ();
                                        if (p == -1)
                                                break;
                                        if (!is_hex ((char)p))
@@ -1446,7 +1359,7 @@ namespace Mono.CSharp
                        int d;
                        int v;
 
-                       d = peekChar ();
+                       d = peek_char ();
                        if (c != '\\')
                                return c;
                        
@@ -1492,11 +1405,11 @@ namespace Mono.CSharp
                                Report.Error (1009, Location, "Unrecognized escape sequence `\\{0}'", ((char)d).ToString ());
                                return d;
                        }
-                       getChar ();
+                       get_char ();
                        return v;
                }
 
-               int getChar ()
+               int get_char ()
                {
                        int x;
                        if (putback_char != -1) {
@@ -1505,17 +1418,22 @@ namespace Mono.CSharp
                        } else
                                x = reader.Read ();
                        if (x == '\n') {
-                               line++;
-                               ref_line++;
-                               previous_col = col;
-                               col = 0;
+                               advance_line ();
                        }
                        else
                                col++;
                        return x;
                }
 
-               int peekChar ()
+               void advance_line ()
+               {
+                       line++;
+                       ref_line++;
+                       previous_col = col;
+                       col = 0;
+               }
+
+               int peek_char ()
                {
                        if (putback_char != -1)
                                return putback_char;
@@ -1523,7 +1441,7 @@ namespace Mono.CSharp
                        return putback_char;
                }
 
-               int peekChar2 ()
+               int peek_char2 ()
                {
                        if (putback_char != -1)
                                return putback_char;
@@ -1552,7 +1470,7 @@ namespace Mono.CSharp
 
                public bool advance ()
                {
-                       return peekChar () != -1;
+                       return peek_char () != -1;
                }
 
                public Object Value {
@@ -1592,9 +1510,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
@@ -1608,6 +1524,8 @@ namespace Mono.CSharp
                        case Token.DOUBLE:
                        case Token.FLOAT:
                        case Token.CHAR:
+                       case Token.BYTE:
+                       case Token.DECIMAL:                     
                                return true;
 
                        default:
@@ -1619,7 +1537,6 @@ namespace Mono.CSharp
                {
                        current_token = xtoken ();
 
-#if GMCS_SOURCE
                        if (current_token != Token.DEFAULT)
                                return current_token;
 
@@ -1633,7 +1550,7 @@ namespace Mono.CSharp
                                current_token = Token.DEFAULT_COLON;
                        else
                                PopPosition();
-#endif
+                       
                        return current_token;
                }
 
@@ -1648,13 +1565,13 @@ namespace Mono.CSharp
                        static_cmd_arg.Length = 0;
 
                        // skip over white space
-                       while ((c = getChar ()) != -1 && (c != '\n') && ((c == '\r') || (c == ' ') || (c == '\t')))
+                       while ((c = get_char ()) != -1 && (c != '\n') && ((c == '\r') || (c == ' ') || (c == '\t')))
                                ;
                                
                        while ((c != -1) && (c != '\n') && (c != ' ') && (c != '\t') && (c != '\r')){
                                if (is_identifier_part_character ((char) c)){
                                        static_cmd_arg.Append ((char) c);
-                                       c = getChar ();
+                                       c = get_char ();
                                } else {
                                        putback (c);
                                        break;
@@ -1668,7 +1585,7 @@ namespace Mono.CSharp
                        }
 
                        // skip over white space
-                       while ((c = getChar ()) != -1 && (c != '\n') && ((c == '\r') || (c == ' ') || (c == '\t')))
+                       while ((c = get_char ()) != -1 && (c != '\n') && ((c == '\r') || (c == ' ') || (c == '\t')))
                                ;
 
                        if (c == '\n'){
@@ -1683,7 +1600,7 @@ namespace Mono.CSharp
                        static_cmd_arg.Length = 0;
                        static_cmd_arg.Append ((char) c);
                        
-                       while ((c = getChar ()) != -1 && (c != '\n') && (c != '\r')){
+                       while ((c = get_char ()) != -1 && (c != '\n') && (c != '\r')){
                                static_cmd_arg.Append ((char) c);
                        }
 
@@ -1701,12 +1618,11 @@ namespace Mono.CSharp
                        if (arg == "default"){
                                ref_line = line;
                                ref_name = file_name;
-                               Location.Push (ref_name);
+                               hidden = false;
+                               Location.Push (file_name, ref_name);
                                return true;
                        } else if (arg == "hidden"){
-                               //
-                               // We ignore #line hidden
-                               //
+                               hidden = true;
                                return true;
                        }
                        
@@ -1721,11 +1637,12 @@ namespace Mono.CSharp
                                        
                                        string name = arg.Substring (pos). Trim (quotes);
                                        ref_name = Location.LookupFile (name);
-                                       file_name.HasLineDirective = true;
-                                       ref_name.HasLineDirective = true;
-                                       Location.Push (ref_name);
+                                       file_name.AddFile (ref_name);
+                                       hidden = false;
+                                       Location.Push (file_name, ref_name);
                                } else {
                                        ref_line = System.Int32.Parse (arg);
+                                       hidden = false;
                                }
                        } catch {
                                return false;
@@ -1774,6 +1691,126 @@ namespace Mono.CSharp
                        }
                }
 
+               byte read_hex (string arg, int pos, out bool error)
+               {
+                       error = false;
+
+                       int total;
+                       char c = arg [pos];
+
+                       if ((c >= '0') && (c <= '9'))
+                               total = (int) c - (int) '0';
+                       else if ((c >= 'A') && (c <= 'F'))
+                               total = (int) c - (int) 'A' + 10;
+                       else if ((c >= 'a') && (c <= 'f'))
+                               total = (int) c - (int) 'a' + 10;
+                       else {
+                               error = true;
+                               return 0;
+                       }
+
+                       total *= 16;
+                       c = arg [pos+1];
+
+                       if ((c >= '0') && (c <= '9'))
+                               total += (int) c - (int) '0';
+                       else if ((c >= 'A') && (c <= 'F'))
+                               total += (int) c - (int) 'A' + 10;
+                       else if ((c >= 'a') && (c <= 'f'))
+                               total += (int) c - (int) 'a' + 10;
+                       else {
+                               error = true;
+                               return 0;
+                       }
+
+                       return (byte) total;
+               }
+
+               /// <summary>
+               /// Handles #pragma checksum
+               /// </summary>
+               bool PreProcessPragmaChecksum (string arg)
+               {
+                       if ((arg [0] != ' ') && (arg [0] != '\t'))
+                               return false;
+
+                       arg = arg.Trim (simple_whitespaces);
+                       if ((arg.Length < 2) || (arg [0] != '"'))
+                               return false;
+
+                       StringBuilder file_sb = new StringBuilder ();
+
+                       int pos = 1;
+                       char ch;
+                       while ((ch = arg [pos++]) != '"') {
+                               if (pos >= arg.Length)
+                                       return false;
+
+                               if (ch == '\\') {
+                                       if (pos+1 >= arg.Length)
+                                               return false;
+                                       ch = arg [pos++];
+                               }
+
+                               file_sb.Append (ch);
+                       }
+
+                       if ((pos+2 >= arg.Length) || ((arg [pos] != ' ') && (arg [pos] != '\t')))
+                               return false;
+
+                       arg = arg.Substring (pos).Trim (simple_whitespaces);
+                       if ((arg.Length < 42) || (arg [0] != '"') || (arg [1] != '{') ||
+                           (arg [10] != '-') || (arg [15] != '-') || (arg [20] != '-') ||
+                           (arg [25] != '-') || (arg [38] != '}') || (arg [39] != '"'))
+                               return false;
+
+                       bool error;
+                       byte[] guid_bytes = new byte [16];
+
+                       for (int i = 0; i < 4; i++) {
+                               guid_bytes [i] = read_hex (arg, 2+2*i, out error);
+                               if (error)
+                                       return false;
+                       }
+                       for (int i = 0; i < 2; i++) {
+                               guid_bytes [i+4] = read_hex (arg, 11+2*i, out error);
+                               if (error)
+                                       return false;
+                               guid_bytes [i+6] = read_hex (arg, 16+2*i, out error);
+                               if (error)
+                                       return false;
+                               guid_bytes [i+8] = read_hex (arg, 21+2*i, out error);
+                               if (error)
+                                       return false;
+                       }
+
+                       for (int i = 0; i < 6; i++) {
+                               guid_bytes [i+10] = read_hex (arg, 26+2*i, out error);
+                               if (error)
+                                       return false;
+                       }
+
+                       arg = arg.Substring (40).Trim (simple_whitespaces);
+                       if ((arg.Length < 34) || (arg [0] != '"') || (arg [33] != '"'))
+                               return false;
+
+                       byte[] checksum_bytes = new byte [16];
+                       for (int i = 0; i < 16; i++) {
+                               checksum_bytes [i] = read_hex (arg, 1+2*i, out error);
+                               if (error)
+                                       return false;
+                       }
+
+                       arg = arg.Substring (34).Trim (simple_whitespaces);
+                       if (arg.Length > 0)
+                               return false;
+
+                       SourceFile file = Location.LookupFile (file_sb.ToString ());
+                       file.SetChecksum (guid_bytes, checksum_bytes);
+                       ref_name.AutoGenerated = true;
+                       return true;
+               }
+
                /// <summary>
                /// Handles #pragma directive
                /// </summary>
@@ -1782,14 +1819,15 @@ namespace Mono.CSharp
                        const string warning = "warning";
                        const string w_disable = "warning disable";
                        const string w_restore = "warning restore";
+                       const string checksum = "checksum";
 
                        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;
                        }
 
@@ -1818,6 +1856,12 @@ namespace Mono.CSharp
                                return;
                        }
 
+                       if (arg.StartsWith (checksum)) {
+                               if (!PreProcessPragmaChecksum (arg.Substring (checksum.Length)))
+                                       Warning_InvalidPragmaChecksum ();
+                               return;
+                       }
+
                        Report.Warning (1633, 1, Location, "Unrecognized #pragma directive");
                }
 
@@ -2019,6 +2063,11 @@ namespace Mono.CSharp
                                "Unexpected processor directive (" + extra + ")");
                }
 
+               void Error_TokenExpected (string token)
+               {
+                       Report.Error (1026, Location, "Expected `{0}'", token);
+               }
+
                void Error_TokensSeen ()
                {
                        Report.Error (1032, Location,
@@ -2036,6 +2085,13 @@ namespace Mono.CSharp
                        Report.Error (1025, Location, "Single-line comment or end-of-line expected");
                }
                
+               void Warning_InvalidPragmaChecksum ()
+               {
+                       Report.Warning (1695, 1, Location,
+                                       "Invalid #pragma checksum syntax; should be " +
+                                       "#pragma checksum \"filename\" " +
+                                       "\"{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}\" \"XXXX...\"");
+               }
                //
                // if true, then the code continues processing the code
                // if false, the code stays in a loop until another directive is
@@ -2220,7 +2276,7 @@ namespace Mono.CSharp
 
                        case "pragma":
                                if (RootContext.Version == LanguageVersion.ISO_1) {
-                                       Report.FeatureIsNotISO1 (Location, "#pragma");
+                                       Report.FeatureIsNotAvailable (Location, "#pragma");
                                        return true;
                                }
 
@@ -2244,12 +2300,18 @@ namespace Mono.CSharp
                {
                        int c;
                        string_builder.Length = 0;
-                                                               
-                       while ((c = getChar ()) != -1){
+
+                       //
+                       // 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 && peekChar () == '"'){
+                                       if (quoted && peek_char () == '"'){
                                                string_builder.Append ((char) c);
-                                               getChar ();
+                                               get_char ();
                                                continue;
                                        } else {
                                                val = string_builder.ToString ();
@@ -2288,21 +2350,34 @@ namespace Mono.CSharp
                        }
 
                        if (res == Token.PARTIAL) {
+                               if (parsing_block > 0) {
+                                       val = new LocatedToken (Location, "partial");
+                                       return Token.IDENTIFIER;
+                               }
+
                                // Save current position and parse next token.
                                PushPosition ();
 
                                int next_token = token ();
                                bool ok = (next_token == Token.CLASS) ||
                                        (next_token == Token.STRUCT) ||
-                                       (next_token == Token.INTERFACE);
+                                       (next_token == Token.INTERFACE) ||
+                                       (next_token == Token.VOID);
 
                                PopPosition ();
 
-                               if (ok)
+                               if (ok) {
+                                       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");
+
                                        return res;
+                               }
 
                                if (next_token < Token.LAST_KEYWORD)
-                                       Report.Error (267, Location, "The `partial' modifier can be used only immediately before keyword `class', `struct', or `interface'");
+                                       Report.Error (267, Location, "The `partial' modifier can be used only immediately before `class', `struct', `interface', or `void' keyword");
 
                                val = new LocatedToken (Location, "partial");
                                return Token.IDENTIFIER;
@@ -2318,9 +2393,9 @@ namespace Mono.CSharp
                        
                        id_builder [0] = (char) s;
 
-                       current_location = new Location (ref_line, Col);
+                       current_location = new Location (ref_line, hidden ? -1 : Col);
 
-                       while ((c = getChar ()) != -1) {
+                       while ((c = get_char ()) != -1) {
                        loop:
                                if (is_identifier_part_character ((char) c)){
                                        if (pos == max_id_size){
@@ -2362,7 +2437,7 @@ namespace Mono.CSharp
                                if (val != null) {
                                        val = new LocatedToken (Location, (string) val);
                                        if (quoted)
-                                               escapedIdentifiers.Add (val);
+                                               escaped_identifiers.Add (val);
                                        return Token.IDENTIFIER;
                                }
                        }
@@ -2387,7 +2462,7 @@ namespace Mono.CSharp
 
                        val = new LocatedToken (Location, (string) val);
                        if (quoted)
-                               escapedIdentifiers.Add (val);
+                               escaped_identifiers.Add (val);
                        return Token.IDENTIFIER;
                }
                
@@ -2400,18 +2475,20 @@ namespace Mono.CSharp
                        // Whether we have seen comments on the current line
                        bool comments_seen = false;
                        val = null;
-                       for (;(c = getChar ()) != -1;) {
+                       for (;(c = get_char ()) != -1;) {
                                if (c == '\t'){
                                        col = ((col + 8) / 8) * 8;
                                        continue;
                                }
                                
-                               if (c == ' ' || c == '\t' || c == '\f' || c == '\v' || c == 0xa0)
+                               if (c == ' ' || c == '\f' || c == '\v' || c == 0xa0 || c == 0)
                                        continue;
 
                                if (c == '\r') {
-                                       if (peekChar () == '\n')
-                                               getChar ();
+                                       if (peek_char () != '\n')
+                                               advance_line ();
+                                       else
+                                               get_char ();
 
                                        any_token_seen |= tokens_seen;
                                        tokens_seen = false;
@@ -2421,14 +2498,14 @@ namespace Mono.CSharp
 
                                // Handle double-slash comments.
                                if (c == '/'){
-                                       int d = peekChar ();
+                                       int d = peek_char ();
                                
                                        if (d == '/'){
-                                               getChar ();
-                                               if (RootContext.Documentation != null && peekChar () == '/') {
-                                                       getChar ();
+                                               get_char ();
+                                               if (RootContext.Documentation != null && peek_char () == '/') {
+                                                       get_char ();
                                                        // Don't allow ////.
-                                                       if ((d = peekChar ()) != '/') {
+                                                       if ((d = peek_char ()) != '/') {
                                                                update_comment_location ();
                                                                if (doc_state == XmlCommentState.Allowed)
                                                                        handle_one_line_xml_comment ();
@@ -2436,7 +2513,7 @@ namespace Mono.CSharp
                                                                        warn_incorrect_doc_comment ();
                                                        }
                                                }
-                                               while ((d = getChar ()) != -1 && (d != '\n') && d != '\r')
+                                               while ((d = get_char ()) != -1 && (d != '\n') && d != '\r')
                                                        if (d == '\n'){
                                                        }
                                                any_token_seen |= tokens_seen;
@@ -2444,14 +2521,14 @@ namespace Mono.CSharp
                                                comments_seen = false;
                                                continue;
                                        } else if (d == '*'){
-                                               getChar ();
+                                               get_char ();
                                                bool docAppend = false;
-                                               if (RootContext.Documentation != null && peekChar () == '*') {
-                                                       getChar ();
+                                               if (RootContext.Documentation != null && peek_char () == '*') {
+                                                       get_char ();
                                                        update_comment_location ();
                                                        // But when it is /**/, just do nothing.
-                                                       if (peekChar () == '/') {
-                                                               getChar ();
+                                                       if (peek_char () == '/') {
+                                                               get_char ();
                                                                continue;
                                                        }
                                                        if (doc_state == XmlCommentState.Allowed)
@@ -2468,9 +2545,9 @@ namespace Mono.CSharp
 
                                                Location start_location = Location;
 
-                                               while ((d = getChar ()) != -1){
-                                                       if (d == '*' && peekChar () == '/'){
-                                                               getChar ();
+                                               while ((d = get_char ()) != -1){
+                                                       if (d == '*' && peek_char () == '/'){
+                                                               get_char ();
                                                                comments_seen = true;
                                                                break;
                                                        }
@@ -2504,11 +2581,11 @@ namespace Mono.CSharp
                                }
 
                        is_punct_label:
-                               current_location = new Location (ref_line, Col);
+                               current_location = new Location (ref_line, hidden ? -1 : Col);
                                if ((t = is_punct ((char)c, ref doread)) != Token.ERROR){
                                        tokens_seen = true;
                                        if (doread){
-                                               getChar ();
+                                               get_char ();
                                        }
                                        return t;
                                }
@@ -2528,7 +2605,7 @@ namespace Mono.CSharp
 
                                if (c == '.'){
                                        tokens_seen = true;
-                                       int peek = peekChar ();
+                                       int peek = peek_char ();
                                        if (peek >= '0' && peek <= '9')
                                                return is_number (c);
                                        return Token.DOT;
@@ -2544,7 +2621,7 @@ namespace Mono.CSharp
                                                continue;
 
                                        bool directive_expected = false;
-                                       while ((c = getChar ()) != -1) {
+                                       while ((c = get_char ()) != -1) {
                                                if (col == 1) {
                                                        directive_expected = true;
                                                } else if (!directive_expected) {
@@ -2578,7 +2655,7 @@ namespace Mono.CSharp
                                        return consume_string (false);
 
                                if (c == '\''){
-                                       c = getChar ();
+                                       c = get_char ();
                                        tokens_seen = true;
                                        if (c == '\''){
                                                error_details = "Empty character literal";
@@ -2594,14 +2671,14 @@ namespace Mono.CSharp
                                                return Token.ERROR;
                                        val = new System.Char ();
                                        val = (char) c;
-                                       c = getChar ();
+                                       c = get_char ();
 
                                        if (c != '\''){
                                                error_details = "Too many characters in character literal";
                                                Report.Error (1012, Location, error_details);
 
                                                // Try to recover, read until newline or next "'"
-                                               while ((c = getChar ()) != -1){
+                                               while ((c = get_char ()) != -1){
                                                        if (c == '\n'){
                                                                break;
                                                        }
@@ -2614,7 +2691,7 @@ namespace Mono.CSharp
                                }
                                
                                if (c == '@') {
-                                       c = getChar ();
+                                       c = get_char ();
                                        if (c == '"') {
                                                tokens_seen = true;
                                                return consume_string (true);
@@ -2639,10 +2716,10 @@ namespace Mono.CSharp
                private void handle_one_line_xml_comment ()
                {
                        int c;
-                       while ((c = peekChar ()) == ' ')
-                               getChar (); // skip heading whitespaces.
-                       while ((c = peekChar ()) != -1 && c != '\n' && c != '\r') {
-                               xml_comment_buffer.Append ((char) getChar ());
+                       while ((c = peek_char ()) == ' ')
+                               get_char (); // skip heading whitespaces.
+                       while ((c = peek_char ()) != -1 && c != '\n' && c != '\r') {
+                               xml_comment_buffer.Append ((char) get_char ());
                        }
                        if (c == '\r' || c == '\n')
                                xml_comment_buffer.Append (Environment.NewLine);
@@ -2687,7 +2764,7 @@ namespace Mono.CSharp
                        if (current_comment_location.IsNull) {
                                // "-2" is for heading "//" or "/*"
                                current_comment_location =
-                                       new Location (ref_line, col - 2);
+                                       new Location (ref_line, hidden ? -1 : col - 2);
                        }
                }
 
@@ -2739,7 +2816,7 @@ namespace Mono.CSharp
                public void cleanup ()
                {
                        if (ifstack != null && ifstack.Count >= 1) {
-                               current_location = new Location (ref_line, Col);
+                               current_location = new Location (ref_line, hidden ? -1 : Col);
                                int state = (int) ifstack.Pop ();
                                if ((state & REGION) != 0)
                                        Report.Error (1038, Location, "#endregion directive expected");