Author: atsushi
Date: 2005-12-09 13:16:07 -0500 (Fri, 09 Dec 2005)
New Revision: 54168
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/cs-tokenizer.cs
trunk/mcs/tests/ChangeLog
trunk/mcs/tests/known-issues-mcs
Log:
2005-12-09 Atsushi Enomoto <[EMAIL PROTECTED]>
* cs-tokenizer.cs : reverted the latest change: it somehow broke
Mono.C5.
* known-issues-mcs : test-476 is broken (since the corresponding
patch is reverted.)
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2005-12-09 17:59:00 UTC (rev 54167)
+++ trunk/mcs/mcs/ChangeLog 2005-12-09 18:16:07 UTC (rev 54168)
@@ -1,5 +1,10 @@
2005-12-09 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * cs-tokenizer.cs : reverted the latest change: it somehow broke
+ Mono.C5.
+
+2005-12-09 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* doc.cs : so it turned out that we cannot skip override check for
interface members. Fixed bug #76954.
Modified: trunk/mcs/mcs/cs-tokenizer.cs
===================================================================
--- trunk/mcs/mcs/cs-tokenizer.cs 2005-12-09 17:59:00 UTC (rev 54167)
+++ trunk/mcs/mcs/cs-tokenizer.cs 2005-12-09 18:16:07 UTC (rev 54168)
@@ -1595,13 +1595,6 @@
//
bool process_directives = true;
- // get current status of if blocks.
- bool is_inside_disabled_block ()
- {
- return ifstack != null && ifstack.Count != 0 &&
- ((int) ifstack.Peek ()) & TAKING == 0;
- }
-
//
// if true, then the code continues processing the code
// if false, the code stays in a loop until another directive is
@@ -1611,7 +1604,6 @@
{
string cmd, arg;
bool region_directive = false;
- current_location = new Location (ref_line, Col);
get_cmd_arg (out cmd, out arg);
@@ -1632,22 +1624,12 @@
PreProcessPragma (arg);
return caller_is_taking;
- case "define":
- if (any_token_seen){
- Error_TokensSeen ();
- return true;
- }
- if (caller_is_taking)
- PreProcessDefinition (true, arg);
- return true;
- case "undef":
- if (any_token_seen){
- Error_TokensSeen ();
- return caller_is_taking;
- }
- if (caller_is_taking)
- PreProcessDefinition (false, arg);
+ case "line":
+ if (!PreProcessLine (arg))
+ Report.Error (
+ 1576, Location,
+ "The line number specified for
#line directive is missing or invalid");
return caller_is_taking;
case "region":
@@ -1780,14 +1762,6 @@
return ret;
}
- case "line":
- case "error":
- case "warning":
- // processed only when current code block is
not disabled.
- break;
- default:
- Report.Error (1024, Location, "Wrong
preprocessor directive");
- return caller_is_taking;
}
//
@@ -1797,13 +1771,22 @@
return false;
switch (cmd){
- case "line":
- if (!PreProcessLine (arg))
- Report.Error (
- 1576, Location,
- "The line number specified for
#line directive is missing or invalid");
- return caller_is_taking;
+ case "define":
+ if (any_token_seen){
+ Error_TokensSeen ();
+ return true;
+ }
+ PreProcessDefinition (true, arg);
+ return true;
+ case "undef":
+ if (any_token_seen){
+ Error_TokensSeen ();
+ return true;
+ }
+ PreProcessDefinition (false, arg);
+ return true;
+
case "error":
Report.Error (1029, Location, "#error: '" + arg
+ "'");
return true;
@@ -1812,7 +1795,10 @@
Report.Warning (1030, 1, Location, "#warning:
`{0}'", arg);
return true;
}
+
+ Report.Error (1024, Location, "Wrong preprocessor
directive");
return true;
+
}
private int consume_string (bool quoted)
Modified: trunk/mcs/tests/ChangeLog
===================================================================
--- trunk/mcs/tests/ChangeLog 2005-12-09 17:59:00 UTC (rev 54167)
+++ trunk/mcs/tests/ChangeLog 2005-12-09 18:16:07 UTC (rev 54168)
@@ -1,5 +1,10 @@
2005-12-09 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * known-issues-mcs : test-476 is broken (since the corresponding
+ patch is reverted.)
+
+2005-12-09 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* test-xml-050-ref.xml, test-xml-050.cs : new test for bug #76954.
* known-issues-gmcs : fixed filename and removed test-60.cs.
Modified: trunk/mcs/tests/known-issues-mcs
===================================================================
--- trunk/mcs/tests/known-issues-mcs 2005-12-09 17:59:00 UTC (rev 54167)
+++ trunk/mcs/tests/known-issues-mcs 2005-12-09 18:16:07 UTC (rev 54168)
@@ -9,5 +9,7 @@
test-465.cs IGNORE # need to fix the path separator to work both on Unix
and Windows
+test-476.cs
+
test-anon-27.cs
test-xml-027.cs
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
