2 keyword swaps in initKeywords

1 files changed, 11 insertions, 7 deletions

diff --git a/sources/scalac/ast/parser/Scanner.java b/sources/scalac/ast/parser/Scanner.java
index 7d180b3ef3..82b41f6e3a 100644
--- a/sources/scalac/ast/parser/Scanner.java
+++ b/sources/scalac/ast/parser/Scanner.java
@@ -3,9 +3,11 @@
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
 **                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
+
 package scalac.ast.parser;
 
 import ch.epfl.lamp.util.Position;
@@ -481,10 +483,12 @@ public class Scanner extends TokenData {
 	}
     }
 
-    /** returns true if argument corresponds to a keyword. used in dtd2scala tool */
-    public boolean isKeyword( String str ) {
-	Name name = Name.fromString( str );
-	return (name.index <= maxKey) ;
+    /** returns true if argument corresponds to a keyword.
+     *  Used in dtd2scala tool.
+     */
+    public boolean isKeyword(String str) {
+	Name name = Name.fromString(str);
+	return (name.index <= maxKey);
     }
 
     void treatIdent(int start, int end) {
@@ -799,12 +803,12 @@ public class Scanner extends TokenData {
         enterKeyword("do", DO);
         enterKeyword("else", ELSE);
         enterKeyword("extends", EXTENDS);
-        enterKeyword("final", FINAL);
 	enterKeyword("false", FALSE);
+        enterKeyword("final", FINAL);
         enterKeyword("for", FOR);
         enterKeyword("if", IF);
-	enterKeyword("is", IS);
         enterKeyword("import", IMPORT);
+	enterKeyword("is", IS);
         enterKeyword("new", NEW);
         enterKeyword("null", NULL);
         enterKeyword("object", OBJECT);