# HG changeset patch # User wenzelm # Date 1214408318 -7200 # Node ID d6679949a869d356269c0eecc1f3f61f752723b0 # Parent 5b3a087ff2929c91f020161016fd88aa01cbfccd scan: prefer command over keyword, allowing lexicons to overlap; diff -r 5b3a087ff292 -r d6679949a869 src/Pure/Isar/outer_lex.ML --- a/src/Pure/Isar/outer_lex.ML Wed Jun 25 17:38:37 2008 +0200 +++ b/src/Pure/Isar/outer_lex.ML Wed Jun 25 17:38:38 2008 +0200 @@ -312,8 +312,8 @@ Scan.lift (Scan.one Symbol.is_sync >> sync) || (Scan.max token_leq (Scan.max token_leq - (counted (Scan.literal lex1) >> token Keyword) - (counted (Scan.literal lex2) >> token Command)) + (counted (Scan.literal lex2) >> token Command) + (counted (Scan.literal lex1) >> token Keyword)) (counted Syntax.scan_longid >> token LongIdent || counted Syntax.scan_id >> token Ident || counted Syntax.scan_var >> token Var ||