--- a/src/Pure/General/scan.scala Sun Dec 20 17:47:59 2009 +0100
+++ b/src/Pure/General/scan.scala Sun Dec 20 18:02:13 2009 +0100
@@ -275,10 +275,8 @@
/* tokens */
- // FIXME right-assoc !?
-
- (string | alt_string | verbatim ^^ Verbatim | comment ^^ Comment | space) |
- ((ident | var_ | type_ident | type_var | nat_ | sym_ident) |||
+ (space | (string | (alt_string | (verbatim ^^ Verbatim | comment ^^ Comment)))) |
+ ((ident | (var_ | (type_ident | (type_var | (nat_ | sym_ident))))) |||
keyword ^^ (x => if (is_command(x)) Command(x) else Keyword(x))) |
bad_input
}