diff -r 1c8c15c30356 -r 5debc3e4fa81 src/Pure/Thy/rail.ML --- a/src/Pure/Thy/rail.ML Thu Aug 23 15:44:47 2012 +0200 +++ b/src/Pure/Thy/rail.ML Thu Aug 23 17:46:03 2012 +0200 @@ -31,7 +31,7 @@ | Ident => "identifier" | String => "single-quoted string" | Antiq _ => "antiquotation" - | EOF => "end-of-file"; + | EOF => "end-of-input"; fun print (Token ((pos, _), (k, x))) = (if k = EOF then print_kind k else print_kind k ^ " " ^ quote x) ^ @@ -91,7 +91,7 @@ let val prefix = "Rail syntax error"; - fun get_pos [] = " (past end-of-file!)" + fun get_pos [] = " (end-of-input)" | get_pos (tok :: _) = Position.str_of (pos_of tok); fun err (toks, NONE) = (fn () => prefix ^ get_pos toks) @@ -106,7 +106,7 @@ fun $$$ x = Scan.one (fn tok => kind_of tok = Keyword andalso content_of tok = x) || Scan.fail_with - (fn [] => (fn () => print_keyword x ^ " expected (past end-of-file!)") + (fn [] => (fn () => print_keyword x ^ " expected,\nbut end-of-input was found") | tok :: _ => (fn () => print_keyword x ^ " expected,\nbut " ^ print tok ^ " was found")); fun enum1 sep scan = scan ::: Scan.repeat ($$$ sep |-- !!! scan);