2001-08-28 Ravi Pratap <ravi@che.iitm.ac.in>

	* cs-tokenizer.cs (initTokens): Add keywords 'add' and 'remove'

	* cs-parser.jay (event_declaration): Correct to remove the semicolon
	when the add and remove accessors are specified.

svn path=/trunk/mcs/; revision=651

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 186d7d9d99dc70533671481a789ca1b378f1f3e1..d39fae5bb379601a64ab5021f42452576f44d9f7 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-28  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+       * cs-tokenizer.cs (initTokens): Add keywords 'add' and 'remove'
+
+       * cs-parser.jay (event_declaration): Correct to remove the semicolon
+       when the add and remove accessors are specified. 
+
 2001-08-28  Ravi Pratap  <ravi@che.iitm.ac.in>
 
        * cs-parser.jay (IndexerDeclaration): New helper class to hold

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index d9e5b53e420a0a2d241bd5508cd91eda26fb032c..5bf1de94660a83a668d19e89f50029445678a19a 100755 (executable)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -1171,7 +1171,7 @@ event_declaration
        | opt_attributes\r
          opt_modifiers\r
          EVENT type member_name \r
-         OPEN_BRACE event_accessor_declarations CLOSE_BRACE SEMICOLON\r
+         OPEN_BRACE event_accessor_declarations CLOSE_BRACE\r
        {\r
                DictionaryEntry pair = (DictionaryEntry) $7;\r
                Block add_block = null;\r

diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
index 7d309a6e8dd2faa81b8836ca26a9a62150f25d81..3416256a84f5388d94f76ef3830aa0274bca13a7 100755 (executable)
--- a/mcs/mcs/cs-tokenizer.cs
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -148,6 +148,7 @@ namespace CIR
 \r
                        keywords.Add ("abstract", Token.ABSTRACT);\r
                        keywords.Add ("as", Token.AS);\r
+                       keywords.Add ("add", Token.ADD);\r
                        keywords.Add ("base", Token.BASE);\r
                        keywords.Add ("bool", Token.BOOL);\r
                        keywords.Add ("break", Token.BREAK);\r
@@ -199,6 +200,7 @@ namespace CIR
                        keywords.Add ("public", Token.PUBLIC);\r
                        keywords.Add ("readonly", Token.READONLY);\r
                        keywords.Add ("ref", Token.REF);\r
+                       keywords.Add ("remove", Token.REMOVE);\r
                        keywords.Add ("return", Token.RETURN);\r
                        keywords.Add ("sbyte", Token.SBYTE);\r
                        keywords.Add ("sealed", Token.SEALED);\r