? jikespg.diff
Index: howto/generate parser/generateParser.html
===================================================================
RCS file: /cvsroot/eclipse/jdt-core-home/howto/generate parser/generateParser.html,v
retrieving revision 1.4
diff -u -r1.4 generateParser.html
--- howto/generate parser/generateParser.html	14 Oct 2003 16:49:23 -0000	1.4
+++ howto/generate parser/generateParser.html	12 Oct 2005 15:48:17 -0000
@@ -17,10 +17,10 @@
 	<td ALIGN=RIGHT VALIGN=TOP WIDTH="2%"><img SRC="http://dev.eclipse.org/images/Adarrow.gif" NOSAVE BORDER=0 height=16 width=16></td>
 	<td WIDTH="98%"><b>Where to get the parser generator</b><br>
 	<blockquote>The parser files and resources are automatically generated using the LPG parser generator. This tools has
-	been renamed Jikes Parser generator. You can find more information and latest releases at this <A HREF="http://www-124.ibm.com/developerworks/projects/jikes/">link</A>.
+	been renamed Jikes Parser generator. You can find more information and latest releases at this <A HREF="http://sourceforge.net/project/showfiles.php?group_id=128803&package_id=144579">link</A>.
 	The latest tool is provided in source format. We don't provide any help for compiling these
 	source files. Refer to the link above if you have trouble to get binaries.
-	<br>Our grammar is generated using the version 2.30 of LPG. If newer versions fail to generate resources from our
+    <br>Our grammar is generated using the version 1.3 of LPG. If newer versions fail to generate resources from our
 	grammar, please send request to the Jikes Parser Generator team.
 	</blockquote>
 	</p>
@@ -150,11 +150,7 @@
  </tr>
  <tr>
 <th VALIGN=top align=left>javasym.java</th>
- <td>This is the contents of the class org.eclipse.jdt.core.compiler.TerminalTokens. You need to replace:<br>
- <ul>
- <li>TokenName$eof with TokenNameEOF</li>
- <li>TokenName$error with TokenNameERROR</li>
- </ul></td>
+ <td>This is the contents of the class org.eclipse.jdt.core.compiler.TerminalTokens.</td>
  </tr>
  <tr>
 <th VALIGN=top align=left>javadef.java</th>
@@ -173,12 +169,6 @@
  </li>
  <li>The class <font color="#3366FF">org.eclipse.jdt.internal.compiler.parser.ParserBasicInformation</font> needs to be updated with the content of the file <font color="#3366FF">javadef.java</font>. Don't copy the 
  interface name. Simply copy the field declarations. The actual source of this class will guide you.</li>
- <li>This is the contents of the class org.eclipse.jdt.internal.compiler.parser.TerminalTokens. You need to replace:<br>
- <ul>
- <li><font color="#3366FF">TokenName$eof</font> with <font color="#3366FF">TokenNameEOF</font></li>
- <li><font color="#3366FF">TokenName$error</font> with <font color="#3366FF">TokenNameERROR</font></li>
- </ul>
- </li>
  <li>The last step is to update the resource files:<br>
  Copy the jdtcore.jar file in d:\temp. Compile this <A HREF="UpdateParserFiles.java">source</A> inside d:\temp. You will have a file UpdateParserFiles.class.
  Then run the following command-line:
Index: grammar/java_1_4.g
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/grammar/java_1_4.g,v
retrieving revision 1.15
diff -u -r1.15 java_1_4.g
--- grammar/java_1_4.g	4 Dec 2003 16:12:35 -0000	1.15
+++ grammar/java_1_4.g	12 Oct 2005 15:48:47 -0000
@@ -95,6 +95,7 @@
 	COMMA
 	DOT
 	EQUAL
+    EOF ERROR
 
 --    BodyMarker
 
@@ -147,6 +148,8 @@
 	','    ::= COMMA
 	'.'    ::= DOT
 	'='    ::= EQUAL
+    $EOF   ::= EOF
+    $ERROR ::= ERROR
 	
 $Start
 	Goal
Index: grammar/java_1_5.g
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/grammar/java_1_5.g,v
retrieving revision 1.57
diff -u -r1.57 java_1_5.g
--- grammar/java_1_5.g	29 Sep 2005 18:17:13 -0000	1.57
+++ grammar/java_1_5.g	12 Oct 2005 15:48:48 -0000
@@ -101,6 +101,7 @@
 	EQUAL
 	AT
 	ELLIPSIS
+    EOF ERROR
 
 --    BodyMarker
 
@@ -154,6 +155,8 @@
 	'='    ::= EQUAL
 	'@'	   ::= AT
 	'...'  ::= ELLIPSIS
+    $EOF   ::= EOF
+    $ERROR ::= ERROR
 	
 $Start
 	Goal