//\r
// Licensed under the terms of the GNU GPL\r
//\r
-// (C) 2001 Ximian, Inc (http://www.ximian.com)\r
+// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)\r
//\r
\r
/*\r
using System.Collections;\r
using System.IO;\r
using System.Globalization;\r
+using System.Reflection;\r
\r
namespace Mono.CSharp\r
{\r
public class Tokenizer : yyParser.yyInput\r
{\r
StreamReader reader;\r
- public string ref_name;\r
+ public SourceFile ref_name;\r
+ public SourceFile file_name;\r
public int ref_line = 1;\r
public int line = 1;\r
public int col = 1;\r
// after a token has been seen.\r
//\r
bool any_token_seen = false;\r
+ static Hashtable tokenValues;\r
+ \r
+ private static Hashtable TokenValueName\r
+ {\r
+ get {\r
+ if (tokenValues == null)\r
+ tokenValues = GetTokenValueNameHash ();\r
+\r
+ return tokenValues;\r
+ }\r
+ }\r
+\r
+ private static Hashtable GetTokenValueNameHash ()\r
+ {\r
+ Type t = typeof (Token);\r
+ FieldInfo [] fields = t.GetFields ();\r
+ Hashtable hash = new Hashtable ();\r
+ foreach (FieldInfo field in fields) {\r
+ if (field.IsLiteral && field.IsStatic && field.FieldType == typeof (int))\r
+ hash.Add (field.GetValue (null), field.Name);\r
+ }\r
+ return hash;\r
+ }\r
\r
//\r
// Returns a verbose representation of the current location\r
// return "Line: "+line+" Col: "+col + "\n" +\r
// "VirtLine: "+ref_line +\r
// " Token: "+current_token + " " + det;\r
-\r
- return ref_name + " " + "(" + line + "," + col + "), Token:" + current_token + " " + det;\r
+ string current_token_name = TokenValueName [current_token] as string;\r
+ if (current_token_name == null)\r
+ current_token_name = current_token.ToString ();\r
+\r
+ return String.Format ("{0} ({1},{2}), Token: {3} {4}", ref_name.Name,\r
+ ref_line,\r
+ col,\r
+ current_token_name,\r
+ det);\r
}\r
}\r
\r
const int TAKEN_BEFORE = 2;\r
const int ELSE_SEEN = 4;\r
const int PARENT_TAKING = 8;\r
- \r
+ const int REGION = 16; \r
+\r
//\r
// pre-processor if stack state:\r
//\r
Stack ifstack;\r
\r
- static System.Text.StringBuilder id_builder;\r
static System.Text.StringBuilder string_builder;\r
- static System.Text.StringBuilder number_builder;\r
+\r
+ const int max_id_size = 512;\r
+ static char [] id_builder = new char [max_id_size];\r
+\r
+ const int max_number_size = 128;\r
+ static char [] number_builder = new char [max_number_size];\r
+ static int number_pos;\r
\r
//\r
// Details about the error encoutered by the tokenizer\r
\r
public int Line {\r
get {\r
- return line;\r
+ return ref_line;\r
}\r
}\r
\r
return col;\r
}\r
}\r
- \r
+\r
static void InitTokens ()\r
{\r
keywords = new Hashtable ();\r
keywords.Add ("void", Token.VOID);\r
keywords.Add ("volatile", Token.VOLATILE);\r
keywords.Add ("while", Token.WHILE);\r
+\r
+ if (RootContext.V2){\r
+ keywords.Add ("__yield", Token.YIELD);\r
+ keywords.Add ("yield", Token.YIELD);\r
+ }\r
}\r
\r
//\r
static Tokenizer ()\r
{\r
InitTokens ();\r
- csharp_format_info = new NumberFormatInfo ();\r
- csharp_format_info.CurrencyDecimalSeparator = ".";\r
- styles = NumberStyles.AllowExponent | NumberStyles.AllowDecimalPoint;\r
- id_builder = new System.Text.StringBuilder ();\r
+ csharp_format_info = NumberFormatInfo.InvariantInfo;\r
+ styles = NumberStyles.Float;\r
+ \r
string_builder = new System.Text.StringBuilder ();\r
- number_builder = new System.Text.StringBuilder ();\r
}\r
\r
- bool is_keyword (string name)\r
+ int GetKeyword (string name)\r
{\r
- bool res;\r
+ object o = keywords [name];\r
+\r
+ if (o == null)\r
+ return -1;\r
\r
- res = keywords.Contains (name);\r
- if (handle_get_set == false && (name == "get" || name == "set"))\r
- return false;\r
- if (handle_remove_add == false && (name == "remove" || name == "add"))\r
- return false;\r
- if (handle_assembly == false && (name == "assembly"))\r
- return false;\r
- return res;\r
- }\r
+ int res = (int) o;\r
\r
- int GetKeyword (string name)\r
- {\r
- return (int) (keywords [name]);\r
+ if (handle_get_set == false && (res == Token.GET || res == Token.SET))\r
+ return -1;\r
+ if (handle_remove_add == false && (res == Token.REMOVE || res == Token.ADD))\r
+ return -1;\r
+ if (handle_assembly == false && res == Token.ASSEMBLY)\r
+ return -1;\r
+ return res;\r
+ \r
}\r
\r
public Location Location {\r
return new Location (ref_line);\r
}\r
}\r
+\r
+ void define (string def)\r
+ {\r
+ if (!RootContext.AllDefines.Contains (def)){\r
+ RootContext.AllDefines [def] = true;\r
+ }\r
+ if (defines.Contains (def))\r
+ return;\r
+ defines [def] = true;\r
+ }\r
\r
- public Tokenizer (System.IO.Stream input, string fname, ArrayList defs)\r
+ public Tokenizer (StreamReader input, SourceFile file, ArrayList defs)\r
{\r
- this.ref_name = fname;\r
- reader = new System.IO.StreamReader (input);\r
+ this.ref_name = file;\r
+ this.file_name = file;\r
+ reader = input;\r
+ \r
putback_char = -1;\r
\r
if (defs != null){\r
defines = new Hashtable ();\r
foreach (string def in defs)\r
- defines [def] = true;\r
+ define (def);\r
}\r
\r
//\r
// FIXME: This could be `Location.Push' but we have to\r
// find out why the MS compiler allows this\r
//\r
- Mono.CSharp.Location.Push (fname);\r
+ Mono.CSharp.Location.Push (file);\r
}\r
\r
bool is_identifier_start_character (char c)\r
{\r
- return Char.IsLetter (c) || c == '_' ;\r
+ return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_' || Char.IsLetter (c);\r
}\r
\r
bool is_identifier_part_character (char c)\r
{\r
- return (Char.IsLetter (c) || Char.IsDigit (c) || c == '_');\r
+ return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' || (c >= '0' && c <= '9') || Char.IsLetter (c);\r
}\r
\r
int is_punct (char c, ref bool doread)\r
return Token.ERROR;\r
}\r
\r
+ void Error_NumericConstantTooLong ()\r
+ {\r
+ Report.Error (1021, Location, "Numeric constant too long"); \r
+ }\r
+ \r
bool decimal_digits (int c)\r
{\r
int d;\r
bool seen_digits = false;\r
\r
- if (c != -1)\r
- number_builder.Append ((char) c);\r
+ if (c != -1){\r
+ if (number_pos == max_number_size)\r
+ Error_NumericConstantTooLong ();\r
+ number_builder [number_pos++] = (char) c;\r
+ }\r
\r
- while ((d = peekChar ()) != -1){\r
- if (Char.IsDigit ((char)d)){\r
- number_builder.Append ((char) d);\r
+ //\r
+ // We use peekChar2, because decimal_digits needs to do a \r
+ // 2-character look-ahead (5.ToString for example).\r
+ //\r
+ while ((d = peekChar2 ()) != -1){\r
+ if (d >= '0' && d <= '9'){\r
+ if (number_pos == max_number_size)\r
+ Error_NumericConstantTooLong ();\r
+ number_builder [number_pos++] = (char) d;\r
getChar ();\r
seen_digits = true;\r
} else\r
return seen_digits;\r
}\r
\r
- bool is_hex (char e)\r
+ bool is_hex (int e)\r
{\r
- return Char.IsDigit (e) || (e >= 'A' && e <= 'F');\r
+ return (e >= '0' && e <= '9') || (e >= 'A' && e <= 'F') || (e >= 'a' && e <= 'f');\r
}\r
\r
void hex_digits (int c)\r
{\r
- int d;\r
-\r
if (c != -1)\r
- number_builder.Append ((char) c);\r
- while ((d = peekChar ()) != -1){\r
- char e = Char.ToUpper ((char) d);\r
- \r
- if (is_hex (e)){\r
- number_builder.Append ((char) e);\r
- getChar ();\r
- } else\r
- break;\r
- }\r
+ number_builder [number_pos++] = (char) c;\r
+ \r
}\r
\r
int real_type_suffix (int c)\r
//\r
int adjust_int (int c)\r
{\r
- ulong ul = System.UInt64.Parse (number_builder.ToString ());\r
- return integer_type_suffix (ul, c);\r
- }\r
+ try {\r
+ if (number_pos > 9){\r
+ ulong ul = (uint) (number_builder [0] - '0');\r
\r
+ for (int i = 1; i < number_pos; i++){\r
+ ul = checked ((ul * 10) + ((uint)(number_builder [i] - '0')));\r
+ }\r
+ return integer_type_suffix (ul, c);\r
+ } else {\r
+ uint ui = (uint) (number_builder [0] - '0');\r
+\r
+ for (int i = 1; i < number_pos; i++){\r
+ ui = checked ((ui * 10) + ((uint)(number_builder [i] - '0')));\r
+ }\r
+ return integer_type_suffix (ui, c);\r
+ }\r
+ } catch (OverflowException) {\r
+ error_details = "Integral constant is too large";\r
+ Report.Error (1021, Location, error_details);\r
+ val = 0ul;\r
+ return Token.LITERAL_INTEGER;\r
+ }\r
+ }\r
+ \r
int adjust_real (int t)\r
{\r
- string s = number_builder.ToString ();\r
+ string s = new String (number_builder, 0, number_pos);\r
\r
switch (t){\r
case Token.LITERAL_DECIMAL:\r
- val = new System.Decimal ();\r
- val = System.Decimal.Parse (\r
- s, styles, csharp_format_info);\r
- break;\r
- case Token.LITERAL_DOUBLE:\r
- val = new System.Double ();\r
- val = System.Double.Parse (\r
- s, styles, csharp_format_info);\r
+ try {\r
+ val = System.Decimal.Parse (s, styles, csharp_format_info);\r
+ } catch (OverflowException) {\r
+ val = 0m; \r
+ error_details = "Floating-point constant is outside the range of the type 'decimal'";\r
+ Report.Error (594, Location, error_details);\r
+ }\r
break;\r
case Token.LITERAL_FLOAT:\r
- val = new System.Double ();\r
- val = (float) System.Double.Parse (\r
- s, styles, csharp_format_info);\r
+ try {\r
+ val = (float) System.Double.Parse (s, styles, csharp_format_info);\r
+ } catch (OverflowException) {\r
+ val = 0.0f; \r
+ error_details = "Floating-point constant is outside the range of the type 'float'";\r
+ Report.Error (594, Location, error_details);\r
+ }\r
break;\r
-\r
+ \r
+ case Token.LITERAL_DOUBLE:\r
case Token.NONE:\r
- val = new System.Double ();\r
- val = System.Double.Parse (\r
- s, styles, csharp_format_info);\r
t = Token.LITERAL_DOUBLE;\r
+ try {\r
+ val = System.Double.Parse (s, styles, csharp_format_info);\r
+ } catch (OverflowException) {\r
+ val = 0.0; \r
+ error_details = "Floating-point constant is outside the range of the type 'double'";\r
+ Report.Error (594, Location, error_details);\r
+ }\r
break;\r
}\r
return t;\r
}\r
\r
+ int handle_hex ()\r
+ {\r
+ int d;\r
+ ulong ul;\r
+ \r
+ getChar ();\r
+ while ((d = peekChar ()) != -1){\r
+ if (is_hex (d)){\r
+ if (number_pos == 16){\r
+ Report.Error (1021, Location, "Integral constant too large");\r
+ return Token.ERROR;\r
+ }\r
+ number_builder [number_pos++] = (char) d;\r
+ getChar ();\r
+ } else\r
+ break;\r
+ }\r
+ \r
+ string s = new String (number_builder, 0, number_pos);\r
+ if (number_pos <= 8)\r
+ ul = System.UInt32.Parse (s, NumberStyles.HexNumber);\r
+ else\r
+ ul = System.UInt64.Parse (s, NumberStyles.HexNumber);\r
+ return integer_type_suffix (ul, peekChar ());\r
+ }\r
+\r
//\r
// Invoked if we know we have .digits or digits\r
//\r
bool is_real = false;\r
int type;\r
\r
- number_builder.Length = 0;\r
-\r
- if (Char.IsDigit ((char)c)){\r
- if (c == '0' && peekChar () == 'x' || peekChar () == 'X'){\r
- ulong ul;\r
- getChar ();\r
- hex_digits (-1);\r
+ number_pos = 0;\r
\r
- string s = number_builder.ToString ();\r
+ if (c >= '0' && c <= '9'){\r
+ if (c == '0'){\r
+ int peek = peekChar ();\r
\r
- ul = System.UInt64.Parse (s, NumberStyles.HexNumber);\r
- return integer_type_suffix (ul, peekChar ());\r
+ if (peek == 'x' || peek == 'X')\r
+ return handle_hex ();\r
}\r
decimal_digits (c);\r
c = getChar ();\r
c = getChar ();\r
} else {\r
putback ('.');\r
- number_builder.Length -= 1;\r
+ number_pos--;\r
return adjust_int (-1);\r
}\r
}\r
\r
if (c == 'e' || c == 'E'){\r
is_real = true;\r
- number_builder.Append ("e");\r
+ if (number_pos == max_number_size)\r
+ Error_NumericConstantTooLong ();\r
+ number_builder [number_pos++] = 'e';\r
c = getChar ();\r
\r
if (c == '+'){\r
- number_builder.Append ((char) c);\r
- c = getChar ();\r
- } else if (c == '-'){\r
- number_builder.Append ((char) c);\r
- c = getChar ();\r
+ if (number_pos == max_number_size)\r
+ Error_NumericConstantTooLong ();\r
+ number_builder [number_pos++] = '+';\r
+ c = -1;\r
+ } else if (c == '-') {\r
+ if (number_pos == max_number_size)\r
+ Error_NumericConstantTooLong ();\r
+ number_builder [number_pos++] = '-';\r
+ c = -1;\r
+ } else {\r
+ if (number_pos == max_number_size)\r
+ Error_NumericConstantTooLong ();\r
+ number_builder [number_pos++] = '+';\r
}\r
- decimal_digits (-1);\r
+ \r
+ decimal_digits (c);\r
c = getChar ();\r
}\r
\r
int i;\r
int total = 0;\r
int c;\r
- char e;\r
int top = count != -1 ? count : 4;\r
\r
getChar ();\r
error = false;\r
for (i = 0; i < top; i++){\r
c = getChar ();\r
- e = Char.ToUpper ((char) c);\r
\r
- if (!is_hex (e)){\r
+ if (c >= '0' && c <= '9')\r
+ c = (int) c - (int) '0';\r
+ else if (c >= 'A' && c <= 'F')\r
+ c = (int) c - (int) 'A' + 10;\r
+ else if (c >= 'a' && c <= 'f')\r
+ c = (int) c - (int) 'a' + 10;\r
+ else {\r
error = true;\r
return 0;\r
}\r
- if (Char.IsDigit (e))\r
- c = (int) e - (int) '0';\r
- else\r
- c = (int) e - (int) 'A';\r
+ \r
total = (total * 16) + c;\r
if (count == -1){\r
int p = peekChar ();\r
return v;\r
default:\r
Report.Error (1009, Location, "Unrecognized escape sequence in " + (char)d);\r
- return -1;\r
+ return d;\r
}\r
getChar ();\r
return v;\r
{\r
if (putback_char != -1)\r
return putback_char;\r
- return reader.Peek ();\r
+ putback_char = reader.Read ();\r
+ return putback_char;\r
}\r
\r
- void putback (int c)\r
+ int peekChar2 ()\r
{\r
if (putback_char != -1)\r
+ return putback_char;\r
+ return reader.Peek ();\r
+ }\r
+ \r
+ void putback (int c)\r
+ {\r
+ if (putback_char != -1){\r
+ Console.WriteLine ("Col: " + col);\r
+ Console.WriteLine ("Row: " + line);\r
+ Console.WriteLine ("Name: " + ref_name.Name);\r
+ Console.WriteLine ("Current [{0}] putting back [{1}] ", putback_char, c);\r
throw new Exception ("This should not happen putback on putback");\r
+ }\r
putback_char = c;\r
}\r
\r
arg = "";\r
static_cmd_arg.Length = 0;\r
\r
- while ((c = getChar ()) != -1 && (c != '\n') && (c != ' ') && (c != '\t')){\r
- if (c == '\r')\r
- continue;\r
+ while ((c = getChar ()) != -1 && (c != '\n') && (c != ' ') && (c != '\t') && (c != '\r')){\r
static_cmd_arg.Append ((char) c);\r
}\r
\r
line++;\r
ref_line++;\r
return;\r
- }\r
+ } else if (c == '\r')\r
+ col = 0;\r
\r
// skip over white space\r
- while ((c = getChar ()) != -1 && (c != '\n') && ((c == ' ') || (c == '\t')))\r
+ while ((c = getChar ()) != -1 && (c != '\n') && ((c == '\r') || (c == ' ') || (c == '\t')))\r
;\r
\r
if (c == '\n'){\r
line++;\r
ref_line++;\r
return;\r
+ } else if (c == '\r'){\r
+ col = 0;\r
+ return;\r
}\r
\r
static_cmd_arg.Length = 0;\r
static_cmd_arg.Append ((char) c);\r
\r
- while ((c = getChar ()) != -1 && (c != '\n')){\r
- if (c == '\r')\r
- continue;\r
+ while ((c = getChar ()) != -1 && (c != '\n') && (c != '\r')){\r
static_cmd_arg.Append ((char) c);\r
}\r
\r
if (c == '\n'){\r
line++;\r
ref_line++;\r
- }\r
+ } else if (c == '\r')\r
+ col = 0;\r
arg = static_cmd_arg.ToString ().Trim ();\r
}\r
\r
return false;\r
\r
if (arg == "default"){\r
- line = ref_line = line;\r
- return false;\r
+ ref_line = line;\r
+ ref_name = file_name;\r
+ Location.Push (ref_name);\r
+ return true;\r
}\r
\r
try {\r
\r
char [] quotes = { '\"' };\r
\r
- ref_name = arg.Substring (pos). Trim(quotes);\r
+ string name = arg.Substring (pos). Trim (quotes);\r
+ ref_name = Location.LookupFile (name);\r
+ Location.Push (ref_name);\r
} else {\r
ref_line = System.Int32.Parse (arg);\r
}\r
void PreProcessDefinition (bool is_define, string arg)\r
{\r
if (arg == "" || arg == "true" || arg == "false"){\r
- Report.Error(1001, Location, "Missing identifer to pre-processor directive");\r
+ Report.Error (1001, Location, "Missing identifer to pre-processor directive");\r
+ return;\r
+ }\r
+\r
+ char[] whitespace = { ' ', '\t' };\r
+ if (arg.IndexOfAny (whitespace) != -1){\r
+ Report.Error (1025, Location, "Single-line comment or end-of-line expected");\r
return;\r
}\r
\r
+ foreach (char c in arg){\r
+ if (!Char.IsLetter (c) && (c != '_')){\r
+ Report.Error (1001, Location, "Identifier expected");\r
+ return;\r
+ }\r
+ }\r
+\r
if (is_define){\r
if (defines == null)\r
defines = new Hashtable ();\r
- defines [arg] = 1;\r
+ define (arg);\r
} else {\r
if (defines == null)\r
return;\r
if (c == '('){\r
s = s.Substring (1);\r
bool val = pp_expr (ref s);\r
- if (s.Length > 0 && s [0] == ')')\r
+ if (s.Length > 0 && s [0] == ')'){\r
+ s = s.Substring (1);\r
return val;\r
+ }\r
Error_InvalidDirective ();\r
return false;\r
}\r
\r
- if (Char.IsLetter (c) || c == '_'){\r
+ if (is_identifier_start_character (c)){\r
int j = 1;\r
\r
while (j < len){\r
c = s [j];\r
\r
- if (Char.IsLetter (c) || Char.IsDigit (c) || c == '_'){\r
+ if (is_identifier_part_character (c)){\r
j++;\r
continue;\r
}\r
\r
return va != pp_unary (ref s);\r
\r
- }\r
+ } \r
}\r
\r
return va;\r
if (s [0] == '&'){\r
if (len > 2 && s [1] == '&'){\r
s = s.Substring (2);\r
- return va && pp_eq (ref s);\r
+ return (va & pp_eq (ref s));\r
} else {\r
Error_InvalidDirective ();\r
return false;\r
bool pp_expr (ref string s)\r
{\r
bool va = pp_and (ref s);\r
-\r
s = s.Trim ();\r
int len = s.Length;\r
if (len > 0){\r
- if (s [0] == '|'){\r
+ char c = s [0];\r
+ \r
+ if (c == '|'){\r
if (len > 2 && s [1] == '|'){\r
s = s.Substring (2);\r
- return va || pp_and (ref s);\r
+ return va | pp_expr (ref s);\r
} else {\r
Error_InvalidDirective ();\r
return false;\r
}\r
- } else {\r
- Error_InvalidDirective ();\r
- return false;\r
- }\r
+ } \r
}\r
-\r
+ \r
return va;\r
}\r
\r
bool eval (string s)\r
{\r
bool v = pp_expr (ref s);\r
+ s = s.Trim ();\r
+ if (s.Length != 0){\r
+ Error_InvalidDirective ();\r
+ return false;\r
+ }\r
\r
return v;\r
}\r
{\r
char [] blank = { ' ', '\t' };\r
string cmd, arg;\r
- \r
+ bool region_directive = false;\r
+\r
get_cmd_arg (out cmd, out arg);\r
\r
+ // Eat any trailing whitespaces and single-line comments\r
+ if (arg.IndexOf ("//") != -1)\r
+ arg = arg.Substring (0, arg.IndexOf ("//"));\r
+ arg = arg.TrimEnd (' ', '\t');\r
+\r
//\r
// The first group of pre-processing instructions is always processed\r
//\r
return true;\r
\r
case "region":\r
+ region_directive = true;\r
arg = "true";\r
goto case "if";\r
\r
case "endregion":\r
+ region_directive = true;\r
goto case "endif";\r
\r
case "if":\r
if ((state & TAKING) != 0)\r
taking = true;\r
}\r
- \r
+\r
if (eval (arg) && taking){\r
- ifstack.Push (TAKING | TAKEN_BEFORE | PARENT_TAKING);\r
+ int push = TAKING | TAKEN_BEFORE | PARENT_TAKING;\r
+ if (region_directive)\r
+ push |= REGION;\r
+ ifstack.Push (push);\r
return true;\r
} else {\r
- ifstack.Push (taking ? PARENT_TAKING : 0);\r
+ int push = (taking ? PARENT_TAKING : 0);\r
+ if (region_directive)\r
+ push |= REGION;\r
+ ifstack.Push (push);\r
return false;\r
}\r
\r
Error_UnexpectedDirective ("no #if for this #endif");\r
return true;\r
} else {\r
- ifstack.Pop ();\r
+ int pop = (int) ifstack.Pop ();\r
+ \r
+ if (region_directive && ((pop & REGION) == 0))\r
+ Report.Error (1027, Location, "#endif directive expected");\r
+ else if (!region_directive && ((pop & REGION) != 0))\r
+ Report.Error (1038, Location, "#endregion directive expected");\r
+ \r
if (ifstack.Count == 0)\r
return true;\r
else {\r
} else {\r
int state = (int) ifstack.Peek ();\r
\r
+ if ((state & REGION) != 0) {\r
+ Report.Error (1038, Location, "#endregion directive expected");\r
+ return true;\r
+ }\r
+\r
if ((state & ELSE_SEEN) != 0){\r
Error_UnexpectedDirective ("#elif not valid after #else");\r
return true;\r
} else {\r
int state = (int) ifstack.Peek ();\r
\r
+ if ((state & REGION) != 0) {\r
+ Report.Error (1038, Location, "#endregion directive expected");\r
+ return true;\r
+ }\r
+\r
if ((state & ELSE_SEEN) != 0){\r
Error_UnexpectedDirective ("#else within #else");\r
return true;\r
}\r
\r
ifstack.Pop ();\r
- ifstack.Push (state | ELSE_SEEN);\r
\r
+ bool ret;\r
if ((state & TAKEN_BEFORE) == 0){\r
- if ((state & PARENT_TAKING) != 0)\r
- return true;\r
- else\r
- return false;\r
- }\r
- return false;\r
+ ret = ((state & PARENT_TAKING) != 0);\r
+ } else\r
+ ret = false;\r
+ \r
+ if (ret)\r
+ state |= TAKING;\r
+ else\r
+ state &= ~TAKING;\r
+ \r
+ ifstack.Push (state | ELSE_SEEN);\r
+ \r
+ return ret;\r
}\r
}\r
\r
\r
Report.Error (1024, Location, "Preprocessor directive expected (got: " + cmd + ")");\r
return true;\r
+\r
}\r
- \r
- public int xtoken ()\r
+\r
+ private int consume_string (bool quoted) \r
{\r
- int t;\r
- bool allow_keyword_as_ident = false;\r
- bool doread = false;\r
int c;\r
+ string_builder.Length = 0;\r
+ \r
+ while ((c = getChar ()) != -1){\r
+ if (c == '"'){\r
+ if (quoted && peekChar () == '"'){\r
+ string_builder.Append ((char) c);\r
+ getChar ();\r
+ continue;\r
+ } else {\r
+ val = string_builder.ToString ();\r
+ return Token.LITERAL_STRING;\r
+ }\r
+ }\r
\r
- val = null;\r
- // optimization: eliminate col and implement #directive semantic correctly.\r
- for (;(c = getChar ()) != -1; col++) {\r
- if (Char.IsLetter ((char)c) || c == '_'){\r
- string ids;\r
+ if (c == '\n'){\r
+ if (!quoted)\r
+ Report.Error (1010, Location, "Newline in constant");\r
+ line++;\r
+ ref_line++;\r
+ col = 0;\r
+ } else\r
+ col++;\r
\r
- id_builder.Length = 0;\r
- tokens_seen = true;\r
- id_builder.Append ((char) c);\r
+ if (!quoted){\r
+ c = escape (c);\r
+ if (c == -1)\r
+ return Token.ERROR;\r
+ }\r
+ string_builder.Append ((char) c);\r
+ }\r
+\r
+ Report.Error (1039, Location, "Unterminated string literal");\r
+ return Token.EOF;\r
+ }\r
+\r
+ private int consume_identifier (int s, bool quoted) \r
+ {\r
+ int pos = 1;\r
+ int c;\r
+ \r
+ id_builder [0] = (char) s;\r
\r
- while ((c = peekChar ()) != -1) {\r
- if (is_identifier_part_character ((char) c)){\r
- id_builder.Append ((char)getChar ());\r
- col++;\r
- } else \r
- break;\r
+ while ((c = reader.Read ()) != -1) {\r
+ if (is_identifier_part_character ((char) c)){\r
+ if (pos == max_id_size){\r
+ Report.Error (645, Location, "Identifier too long (limit is 512 chars)");\r
+ return Token.ERROR;\r
}\r
\r
- ids = id_builder.ToString ();\r
-\r
- if (!is_keyword (ids) || allow_keyword_as_ident) {\r
- val = ids;\r
- if (ids.Length > 512){\r
- Report.Error (\r
- 645, Location,\r
- "Identifier too long (limit is 512 chars)");\r
- }\r
- allow_keyword_as_ident = false;\r
- return Token.IDENTIFIER;\r
- }\r
+ id_builder [pos++] = (char) c;\r
+ putback_char = -1;\r
+ col++;\r
+ } else {\r
+ putback_char = c;\r
+ break;\r
+ }\r
+ }\r
\r
- // true, false and null are in the hash anyway.\r
- return GetKeyword (ids);\r
+ string ids = new String (id_builder, 0, pos);\r
\r
+ if (s >= 'a'){\r
+ int keyword = GetKeyword (ids);\r
+ if (keyword == -1 || quoted){\r
+ val = ids;\r
+ return Token.IDENTIFIER;\r
}\r
+ return keyword;\r
+ }\r
+ val = ids;\r
+ return Token.IDENTIFIER;\r
+ }\r
+ \r
+ public int xtoken ()\r
+ {\r
+ int t;\r
+ bool doread = false;\r
+ int c;\r
\r
- if (c == '.'){\r
- tokens_seen = true;\r
- if (Char.IsDigit ((char) peekChar ()))\r
- return is_number (c);\r
- return Token.DOT;\r
- }\r
- \r
- if (Char.IsDigit ((char) c)){\r
- tokens_seen = true;\r
- return is_number (c);\r
+ val = null;\r
+ // optimization: eliminate col and implement #directive semantic correctly.\r
+ for (;(c = getChar ()) != -1; col++) {\r
+ if (c == ' ' || c == '\t' || c == '\f' || c == '\v' || c == '\r' || c == 0xa0){\r
+ \r
+ if (c == '\t')\r
+ col = (((col + 8) / 8) * 8) - 1;\r
+ continue;\r
}\r
\r
// Handle double-slash comments.\r
\r
if (d == '/'){\r
getChar ();\r
- while ((d = getChar ()) != -1 && (d != '\n'))\r
+ while ((d = getChar ()) != -1 && (d != '\n') && d != '\r')\r
col++;\r
- line++;\r
- ref_line++;\r
- col = 0;\r
+ if (d == '\n'){\r
+ line++;\r
+ ref_line++;\r
+ col = 0;\r
+ }\r
any_token_seen |= tokens_seen;\r
tokens_seen = false;\r
continue;\r
}\r
continue;\r
}\r
+ goto is_punct_label;\r
+ }\r
+\r
+ \r
+ if (is_identifier_start_character ((char)c)){\r
+ tokens_seen = true;\r
+ return consume_identifier (c, false);\r
+ }\r
+\r
+ is_punct_label:\r
+ if ((t = is_punct ((char)c, ref doread)) != Token.ERROR){\r
+ tokens_seen = true;\r
+ if (doread){\r
+ getChar ();\r
+ col++;\r
+ }\r
+ return t;\r
+ }\r
+\r
+ // white space\r
+ if (c == '\n'){\r
+ line++;\r
+ ref_line++;\r
+ col = 0;\r
+ any_token_seen |= tokens_seen;\r
+ tokens_seen = false;\r
+ continue;\r
}\r
\r
+ if (c >= '0' && c <= '9'){\r
+ tokens_seen = true;\r
+ return is_number (c);\r
+ }\r
+\r
+ if (c == '.'){\r
+ tokens_seen = true;\r
+ int peek = peekChar ();\r
+ if (peek >= '0' && peek <= '9')\r
+ return is_number (c);\r
+ return Token.DOT;\r
+ }\r
+ \r
/* For now, ignore pre-processor commands */\r
// FIXME: In C# the '#' is not limited to appear\r
// on the first column.\r
line++;\r
ref_line++;\r
skipping = false;\r
- } else if (c == ' ' || c == '\t' || c == '\v' || c == '\r')\r
+ } else if (c == ' ' || c == '\t' || c == '\v' || c == '\r' || c == 0xa0)\r
continue;\r
else if (c != '#')\r
skipping = true;\r
any_token_seen |= tokens_seen;\r
tokens_seen = false;\r
if (c == -1)\r
- Report.Error (1027, Location, "#endif expected");\r
+ Report.Error (1027, Location, "#endif/#endregion expected");\r
continue;\r
}\r
\r
- if ((t = is_punct ((char)c, ref doread)) != Token.ERROR){\r
- tokens_seen = true;\r
- if (doread){\r
- getChar ();\r
- col++;\r
- }\r
- return t;\r
- }\r
- \r
- if (c == '"'){\r
- string_builder.Length = 0;\r
- \r
- tokens_seen = true;\r
- \r
- while ((c = getChar ()) != -1){\r
- if (c == '"'){\r
- if (allow_keyword_as_ident && peekChar () == '"'){\r
- string_builder.Append ((char) c);\r
- getChar ();\r
- continue;\r
- } \r
- allow_keyword_as_ident = false;\r
- val = string_builder.ToString ();\r
- return Token.LITERAL_STRING;\r
- }\r
-\r
- if (!allow_keyword_as_ident){\r
- c = escape (c);\r
- if (c == -1)\r
- return Token.ERROR;\r
- }\r
- string_builder.Append ((char) c);\r
- }\r
- }\r
+ if (c == '"') \r
+ return consume_string (false);\r
\r
if (c == '\''){\r
c = getChar ();\r
\r
// Try to recover, read until newline or next "'"\r
while ((c = getChar ()) != -1){\r
- if (c == '\n' || c == '\'')\r
+ if (c == '\n' || c == '\''){\r
+ line++;\r
+ ref_line++;\r
+ col = 0;\r
break;\r
+ } else\r
+ col++;\r
\r
}\r
return Token.ERROR;\r
return Token.LITERAL_CHARACTER;\r
}\r
\r
- // white space\r
- if (c == '\n'){\r
- line++;\r
- ref_line++;\r
- col = 0;\r
- any_token_seen |= tokens_seen;\r
- tokens_seen = false;\r
- continue;\r
- }\r
-\r
- if (c == ' ' || c == '\t' || c == '\f' || c == '\v' || c == '\r'){\r
- if (c == '\t')\r
- col = (((col + 8) / 8) * 8) - 1;\r
- continue;\r
- }\r
-\r
- if (c == '@'){\r
- tokens_seen = true;\r
- allow_keyword_as_ident = true;\r
- continue;\r
+ if (c == '@') {\r
+ c = getChar ();\r
+ if (c == '"') {\r
+ tokens_seen = true;\r
+ return consume_string (true);\r
+ } else if (is_identifier_start_character ((char) c)){\r
+ return consume_identifier (c, true);\r
+ } else {\r
+ Report.Error (1033, Location, "'@' must be followed by string constant or identifier");\r
+ }\r
}\r
\r
error_details = ((char)c).ToString ();\r
return Token.ERROR;\r
}\r
\r
- if (ifstack != null && ifstack.Count > 1)\r
- Report.Error (1027, Location, "#endif expected");\r
return Token.EOF;\r
}\r
+\r
+ public void cleanup ()\r
+ {\r
+ if (ifstack != null && ifstack.Count >= 1) {\r
+ int state = (int) ifstack.Pop ();\r
+ if ((state & REGION) != 0)\r
+ Report.Error (1038, "#endregion directive expected");\r
+ else \r
+ Report.Error (1027, "#endif directive expected");\r
+ }\r
+ \r
+ }\r
+\r
}\r
}\r
\r
projects / mono.git / blobdiff