comparison src/prim.sig @ 2211:ef766ef6e242

Merge.
author Ziv Scully <ziv@mit.edu>
date Sat, 13 Sep 2014 19:16:07 -0400
parents 4d64af730e35
children
comparison
equal deleted inserted replaced
2210:69c0f36255cb 2211:ef766ef6e242
1 (* Copyright (c) 2008, Adam Chlipala 1 (* Copyright (c) 2008, 2014, Adam Chlipala
2 * All rights reserved. 2 * All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met: 5 * modification, are permitted provided that the following conditions are met:
6 * 6 *
25 * POSSIBILITY OF SUCH DAMAGE. 25 * POSSIBILITY OF SUCH DAMAGE.
26 *) 26 *)
27 27
28 signature PRIM = sig 28 signature PRIM = sig
29 29
30 datatype string_mode = Normal | Html
31
30 datatype t = 32 datatype t =
31 Int of Int64.int 33 Int of Int64.int
32 | Float of Real64.real 34 | Float of Real64.real
33 | String of string 35 | String of string_mode * string
34 | Char of char 36 | Char of char
35 37
36 val p_t : t Print.printer 38 val p_t : t Print.printer
37 val p_t_GCC : t Print.printer 39 val p_t_GCC : t Print.printer
38 40