# HG changeset patch
# User wenzelm
# Date 1353959921 -3600
# Node ID e356f86729bc64aa76c6e03b2a12028b1e8b87b0
# Parent  476a3350589c28471f46387b23999d72ba497208
tuned;

diff -r 476a3350589c -r e356f86729bc src/Pure/General/symbol.ML
--- a/src/Pure/General/symbol.ML	Mon Nov 26 20:39:19 2012 +0100
+++ b/src/Pure/General/symbol.ML	Mon Nov 26 20:58:41 2012 +0100
@@ -54,13 +54,13 @@
   val is_letdig: symbol -> bool
   val is_ident: symbol list -> bool
   val beginning: int -> symbol list -> string
-  val scanner: string -> (string list -> 'a * string list) -> symbol list -> 'a
   val source: (string, 'a) Source.source -> (symbol, (string, 'a) Source.source) Source.source
   val explode: string -> symbol list
+  val esc: symbol -> string
+  val escape: string -> string
+  val scanner: string -> (string list -> 'a * string list) -> symbol list -> 'a
   val split_words: symbol list -> string list
   val explode_words: string -> string list
-  val esc: symbol -> string
-  val escape: string -> string
   val strip_blanks: string -> string
   val bump_init: string -> string
   val bump_string: string -> string
@@ -399,27 +399,10 @@
 fun is_quasi_letter s = let val k = kind s in k = Letter orelse k = Quasi end;
 fun is_letdig s = let val k = kind s in k = Letter orelse k = Digit orelse k = Quasi end;
 
-fun is_ident [] = false
-  | is_ident (c :: cs) = is_letter c andalso forall is_letdig cs;
-
 
 
 (** symbol input **)
 
-(* scanning through symbols *)
-
-fun scanner msg scan syms =
-  let
-    fun message (ss, NONE) = (fn () => msg ^ ": " ^ quote (beginning 10 ss))
-      | message (ss, SOME msg') = (fn () => msg ^ ", " ^ msg' () ^ ": " ^ quote (beginning 10 ss));
-    val finite_scan = Scan.error (Scan.finite stopper (!! message scan));
-  in
-    (case finite_scan syms of
-      (result, []) => result
-    | (_, rest) => error (message (rest, NONE) ()))
-  end;
-
-
 (* source *)
 
 local
@@ -477,6 +460,33 @@
 end;
 
 
+(* escape *)
+
+val esc = fn s =>
+  if is_char s then s
+  else if is_utf8 s then translate_string (fn c => "\\" ^ string_of_int (ord c)) s
+  else "\\" ^ s;
+
+val escape = implode o map esc o sym_explode;
+
+
+
+(** scanning through symbols **)
+
+(* scanner *)
+
+fun scanner msg scan syms =
+  let
+    fun message (ss, NONE) = (fn () => msg ^ ": " ^ quote (beginning 10 ss))
+      | message (ss, SOME msg') = (fn () => msg ^ ", " ^ msg' () ^ ": " ^ quote (beginning 10 ss));
+    val finite_scan = Scan.error (Scan.finite stopper (!! message scan));
+  in
+    (case finite_scan syms of
+      (result, []) => result
+    | (_, rest) => error (message (rest, NONE) ()))
+  end;
+
+
 (* space-separated words *)
 
 val scan_word =
@@ -488,16 +498,6 @@
 val explode_words = split_words o sym_explode;
 
 
-(* escape *)
-
-val esc = fn s =>
-  if is_char s then s
-  else if is_utf8 s then translate_string (fn c => "\\" ^ string_of_int (ord c)) s
-  else "\\" ^ s;
-
-val escape = implode o map esc o sym_explode;
-
-
 (* blanks *)
 
 fun strip_blanks s =
@@ -507,6 +507,12 @@
   |> implode;
 
 
+(* identifiers *)
+
+fun is_ident [] = false
+  | is_ident (c :: cs) = is_letter c andalso forall is_letdig cs;
+
+
 (* bump string -- treat as base 26 or base 1 numbers *)
 
 fun symbolic_end (_ :: "\\<^isub>" :: _) = true