merged
authorhaftmann
Wed, 02 Dec 2009 17:53:44 +0100
changeset 33944 ab87cceed53f
parent 33937 b5ca587d0885 (diff)
parent 33943 f31d645b4e00 (current diff)
child 33945 8493ed132fed
child 33947 2d0d08b5b048
merged
--- a/src/HOL/Tools/sat_solver.ML	Wed Dec 02 17:53:36 2009 +0100
+++ b/src/HOL/Tools/sat_solver.ML	Wed Dec 02 17:53:44 2009 +0100
@@ -311,7 +311,7 @@
     fun int_from_string s =
       case Int.fromString s of
         SOME i => i
-      | NONE   => error ("token " ^ quote s ^ "in DIMACS CNF file is not a number")
+      | NONE   => error ("token " ^ quote s ^ " in DIMACS CNF file is not a number")
     (* int list -> int list list *)
     fun clauses xs =
       let
@@ -350,7 +350,7 @@
     o (map (map literal_from_int))
     o clauses
     o (map int_from_string)
-    o (maps (String.fields (fn c => c mem [#" ", #"\t", #"\n"])))
+    o (maps (String.tokens (fn c => c mem [#" ", #"\t", #"\n"])))
     o filter_preamble
     o filter (fn l => l <> "")
     o split_lines