# HG changeset patch # User Adam Chlipala # Date 1346680283 14400 # Node ID 2d9f831d45c90334c54bc810bdcbd11b852a76f5 # Parent 4c61bb7acb9bf0956180c8d2deefce1c8c7814da Update tutorial for Ur/Web changes diff -r 4c61bb7acb9b -r 2d9f831d45c9 doc/intro.ur --- a/doc/intro.ur Thu Aug 30 17:58:37 2012 +0400 +++ b/doc/intro.ur Mon Sep 03 09:51:23 2012 -0400 @@ -385,7 +385,7 @@ end structure Double : DOUBLE = struct - class double a = a -> a + con double a = a -> a fun double [a] (f : double a) (x : a) : a = f x fun mkDouble [a] (f : a -> a) : double a = f @@ -420,7 +420,7 @@ end structure OkType : OK_TYPE = struct - class ok a = unit + con ok a = unit fun importantOperation [a] (_ : ok a) (_ : a) = "You found an OK value!" val ok_int = () val ok_float = () diff -r 4c61bb7acb9b -r 2d9f831d45c9 src/c/static.c --- a/src/c/static.c Thu Aug 30 17:58:37 2012 +0400 +++ b/src/c/static.c Mon Sep 03 09:51:23 2012 -0400 @@ -25,6 +25,7 @@ ctx = uw_init(0, NULL, log_debug); uw_set_app(ctx, &uw_application); + uw_initialize(ctx); while (1) { fk = uw_begin(ctx, argv[1]); diff -r 4c61bb7acb9b -r 2d9f831d45c9 src/tutorial.sml --- a/src/tutorial.sml Thu Aug 30 17:58:37 2012 +0400 +++ b/src/tutorial.sml Mon Sep 03 09:51:23 2012 -0400 @@ -251,13 +251,13 @@ val s = readAll inf val _ = Unix.reap proc - val (befor, after) = Substring.position "" s + val (befor, after) = Substring.position "" s in if Substring.isEmpty after then print ("Bad output for " ^ fname ^ "! [1]\n") else let - val after = Substring.slice (after, 4, NONE) + val after = Substring.slice (after, 6, NONE) val (befor, after) = Substring.position "" after in if Substring.isEmpty after then