fix unit tests. implement urlifyChar

2 files changed, 1275 insertions, 364 deletions

diff --git a/tests/utf8.ur b/tests/utf8.ur
index 4a89c22b..2150fde6 100644
--- a/tests/utf8.ur
+++ b/tests/utf8.ur
@@ -8,12 +8,47 @@ fun from_m_upto_n f m n =
     else
 	<xml></xml>
 
+fun from_m_upto_n2 (f : int -> transaction xbody) (m : int) (n : int) : transaction xbody =
+    if m < n then
+	h <- f m;
+	t <- from_m_upto_n2 f (m + 1) n;
+	return <xml>
+	  { h }
+	  { t }
+	</xml>
+    else
+	return <xml></xml>
+	
 fun test_fn_both_sides [a ::: Type] (_ : eq a) (_ : show a) (f : unit -> a) (expected : a) (testname : string) : xbody =
 <xml>
   <p>Server side test: {[testname]}</p>
   <pre>{[show (f () = expected)]}</pre>	
   <active code={return <xml><p>Client side test: {[testname]}</p><pre>{[show (f () = expected)]}</pre></xml>}>
 </active>
+	</xml>
+
+fun test_fn_both_sides2 [a ::: Type] (_ : eq a) (_ : show a) (f : unit -> a) (serverexp : a) (expected : a) (testname : string) : xbody =
+<xml>
+  <p>Test: {[testname]}</p>
+  <active code={
+	   let
+	       val stest = (serverexp = expected)
+	   in
+	   return <xml>
+	     <p>Server side test: {[testname]}</p>
+	     <pre>{[show stest]}</pre>
+	     {if stest then
+		  <xml></xml>
+	      else
+		  <xml>
+		    <p>S: {[serverexp]}</p>
+		    <p>E: {[expected]}</p>
+		  </xml>}
+	   </xml>
+	   end}>
+</active>
+  <active code={return <xml><p>Client side test: {[testname]}</p><pre>{[show (f () = expected)]}</pre></xml>}>
+</active>
 </xml>
 
 fun test_fn_sside [a ::: Type] (_ : eq a) (_ : show a) (f : unit -> a) (expected : a) (testname : string) : xbody =
@@ -22,12 +57,34 @@ fun test_fn_sside [a ::: Type] (_ : eq a) (_ : show a) (f : unit -> a) (expected
       <pre>{[show (f () = expected)]}</pre>
     </xml>
 
-fun test_fn_cside [a ::: Type] (_ : eq a) (_ : show a) (f : unit -> a) (expected : a) (testname : string) : xbody =
-    <xml>
-      <active code={return <xml><p>Client side test: {[testname]}</p><pre>{[show (f () = expected)]}</pre></xml>}>
-      </active>
-    </xml>
+    fun test_fn_cside [a ::: Type] (_ : eq a) (_ : show a) (f : unit -> a) (expected : a) (testname : string) : xbody =
+	let
+	    val r = f ()
+	    val v = r = expected
+	in
+	    <xml>
+	      <active code={return <xml><p>Client side test: {[testname]}</p><pre>{[show v]}</pre>
+		{if v then
+		     <xml></xml>
+		 else
+		     <xml>Expected '{[show expected]}', is '{[show r]}'</xml>}
+	      </xml>}>
+</active>
+	</xml>
+	end
 
+fun test_fn_cside_int (f : unit -> int) (expected : int) (testname : string) : xbody =
+    <xml>
+      <active code={let
+		    val computed = f ()		    
+		    in
+			if computed = expected then
+			    return <xml><p>{[testname]}</p><pre>True</pre></xml>
+			else
+			    return <xml><p>{[testname]}</p><pre>False</pre></xml>
+		    end}>
+</active>
+	</xml>
 
 fun test_fn_cside_ch (f : unit -> char) (expected : char) (testname : string) : xbody =
     <xml>
@@ -57,123 +114,297 @@ fun test_fn_cside_b (f : unit -> bool) (expected : bool) (testname : string) : x
 			    return <xml><p>ERROR {[testname]}: {[msgErr]}</p></xml>
 		    end}>
       </active>
-</xml>
+	</xml>
 
+fun generateTests _ =
+    return { SL1 = (strlen "𝌆𝌇𝌈𝌉"),
+	     SL2 = (strlen "𝌇𝌈𝌉"),
+	     SL3 = (strlen "𝌈𝌉"),
+	     SL4 = (strlen "𝌉"),
+	     SS1 = (substring "𝌆𝌇𝌈𝌉" 1 3),
+	     SS2 = (substring "𝌆𝌇𝌈𝌉" 2 2),
+	     SS3 = (substring "𝌆𝌇𝌈𝌉" 3 1) ,
+	     SLSS1 = (strlen (substring "𝌆𝌇𝌈𝌉" 1 3)),
+	     SLSS2 = (strlen (substring "𝌆𝌇𝌈𝌉" 2 2)),
+	     SLSS3 = (strlen (substring "𝌆𝌇𝌈𝌉" 3 1)),
+
+	     SSB1 = (strsub "𝌆𝌇𝌈𝌉" 0),
+	     SSB2 = (strsub "𝌆𝌇𝌈𝌉" 1),
+	     SSB3 = (strsub "𝌆𝌇𝌈𝌉" 2),
+	     SSB4 = (strsub "𝌆𝌇𝌈𝌉" 3),
+
+	     SSF1 = (strsuffix "𝌆𝌇𝌈𝌉" 0),
+	     SSF2 = (strsuffix "𝌆𝌇𝌈𝌉" 1),
+	     SSF3 = (strsuffix "𝌆𝌇𝌈𝌉" 2),
+	     SSF4 = (strsuffix "𝌆𝌇𝌈𝌉" 3),
+
+	     SC1 = (strchr "𝌆𝌇𝌈𝌉" #"c"),
+	     SC2 = (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)),
+	     SC3 = (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)),
+	     SC4 = (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)),
+	     SC5 = (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)),
+
+	     SI1 = (strindex "𝌆𝌇𝌈𝌉" #"c"),
+	     SI2 = (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)),
+	     SI3 = (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)),
+	     SI4 = (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)),
+	     SI5 = (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)),
+
+	     SSI1 = (strsindex "𝌆𝌇𝌈𝌉" ""),
+	     SSI2 = (strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉"),
+	     SSI3 = (strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈c"),
+	     SSI4 = (strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉"),
+	     SSI5 = (strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈c"),
+	     SSI6 = (strsindex "𝌆𝌇𝌈𝌉" "𝌈𝌉"),
+	     SSI7 = (strsindex "𝌆𝌇𝌈𝌉" "𝌈c"),
+	     SSI8 = (strsindex "𝌆𝌇𝌈𝌉" "𝌉"),
+	     SSI9 = (strsindex "𝌆𝌇𝌈𝌉" "c"),
+
+	     SCSP1 = (strcspn "𝌆𝌇𝌈𝌉" ""),
+	     SCSP2 = (strcspn "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉"),
+	     SCSP3 = (strcspn "𝌆𝌇𝌈𝌉" "𝌆"),
+	     SCSP4 = (strcspn "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉"),
+	     SCSP5 = (strcspn "𝌆𝌇𝌈𝌉" "𝌈𝌉"),
+	     SCSP6 = (strcspn "𝌆𝌇𝌈𝌉" "𝌉"),
+
+	     OSS1 = (ord (strsub "𝌆𝌇𝌈𝌉" 0)),
+	     OSS2 = (ord (strsub "𝌆𝌇𝌈𝌉" 1)),
+	     OSS3 = (ord (strsub "𝌆𝌇𝌈𝌉" 2)),
+	     OSS4 = (ord (strsub "𝌆𝌇𝌈𝌉" 3)),
+
+	     SSS1 = (show (strsub "𝌆𝌇𝌈𝌉" 0)),
+	     SSS2 = (show (strsub "𝌆𝌇𝌈𝌉" 1)),
+	     SSS3 = (show (strsub "𝌆𝌇𝌈𝌉" 2)),
+	     SSS4 = (show (strsub "𝌆𝌇𝌈𝌉" 3))
+	   }
 
 fun highencode () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_cside (fn _ => strlen "𝌆𝌇𝌈𝌉") (strlen "𝌆𝌇𝌈𝌉") "high encode - strlen 1"}
-	{test_fn_cside (fn _ => strlen "𝌇𝌈𝌉") (strlen "𝌇𝌈𝌉") "high encode - strlen 2"}
-	{test_fn_cside (fn _ => strlen "𝌈𝌉") (strlen "𝌈𝌉") "high encode - strlen 3"}
-	{test_fn_cside (fn _ => strlen "𝌉") (strlen "𝌉") "high encode - strlen 4"}
-	
-	{test_fn_cside (fn _ => substring "𝌆𝌇𝌈𝌉" 1 3) (substring "𝌆𝌇𝌈𝌉" 1 3) "high encode - substring 1"}
-	{test_fn_cside (fn _ => substring "𝌆𝌇𝌈𝌉" 2 2) (substring "𝌆𝌇𝌈𝌉" 2 2) "high encode - substring 2"}
-	{test_fn_cside (fn _ => substring "𝌆𝌇𝌈𝌉" 3 1) (substring "𝌆𝌇𝌈𝌉" 3 1) "high encode - substring 3"}
-
-	{test_fn_cside (fn _ => strlen (substring "𝌆𝌇𝌈𝌉" 1 3)) (strlen (substring "𝌆𝌇𝌈𝌉" 1 3)) "high encode - strlen of substring 1"}
-	{test_fn_cside (fn _ => strlen (substring "𝌆𝌇𝌈𝌉" 2 2)) (strlen (substring "𝌆𝌇𝌈𝌉" 2 2)) "high encode - strlen of substring 2"}
-	{test_fn_cside (fn _ => strlen (substring "𝌆𝌇𝌈𝌉" 3 1)) (strlen (substring "𝌆𝌇𝌈𝌉" 3 1)) "high encode - strlen of substring 3"}
-
-	{test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 0) (strsub "𝌆𝌇𝌈𝌉" 0) "high encode - strsub 1"}
-	{test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 1) (strsub "𝌆𝌇𝌈𝌉" 1) "high encode - strsub 2"}
-	{test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 2) (strsub "𝌆𝌇𝌈𝌉" 2) "high encode - strsub 3"}
-	{test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 3) (strsub "𝌆𝌇𝌈𝌉" 3) "high encode - strsub 4"}
-
-	{test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 0) (strsuffix "𝌆𝌇𝌈𝌉" 0) "high encode - strsuffix 1"}
-	{test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 1) (strsuffix "𝌆𝌇𝌈𝌉" 1) "high encode - strsuffix 2"}
-	{test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 2) (strsuffix "𝌆𝌇𝌈𝌉" 2) "high encode - strsuffix 3"}
-	{test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 3) (strsuffix "𝌆𝌇𝌈𝌉" 3) "high encode - strsuffix 4"}
-
-	{test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" #"c") (strchr "𝌆𝌇𝌈𝌉" #"c") "high encode - strchr 1"}
-	{test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)) (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)) "high encode - strchr 2"}
-	{test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)) (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)) "high encode - strchr 3"}
-	{test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)) (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)) "high encode - strchr 4"}
-	{test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)) (strchr "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)) "high encode - strchr 5"}
-
-	{test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" #"c") (strindex "𝌆𝌇𝌈𝌉" #"c") "high encode - strindex 1"}
-	{test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)) (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)) "high encode - strindex 2"}
-	{test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)) (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)) "high encode - strindex 3"}
-	{test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)) (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)) "high encode - strindex 4"}
-	{test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)) (strindex "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)) "high encode - strindex 5"}
-
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "") (strsindex "𝌆𝌇𝌈𝌉" "") "high encode - strsindex 1"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉") (strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉") "high encode - strsindex 2"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈c") (strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈c") "high encode - strsindex 3"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉") (strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉") "high encode - strsindex 4"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈c") (strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈c") "high encode - strsindex 5"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌈𝌉") (strsindex "𝌆𝌇𝌈𝌉" "𝌈𝌉") "high encode - strsindex 6"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌈c") (strsindex "𝌆𝌇𝌈𝌉" "𝌈c") "high encode - strsindex 7"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌉") (strsindex "𝌆𝌇𝌈𝌉" "𝌉") "high encode - strsindex 8"}
-	{test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "c") (strsindex "𝌆𝌇𝌈𝌉" "c") "high encode - strsindex 9"}
-
-	{test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "") (strcspn "𝌆𝌇𝌈𝌉" "") "high encode - strcspn 1"}
-	{test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉") (strcspn "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉") "high encode - strcspn 2"}
-	{test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌆") (strcspn "𝌆𝌇𝌈𝌉" "𝌆") "high encode - strcspn 3"}
-	{test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉") (strcspn "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉") "high encode - strcspn 4"}
-	{test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌈𝌉") (strcspn "𝌆𝌇𝌈𝌉" "𝌈𝌉") "high encode - strcspn 5"}
-	{test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌉") (strcspn "𝌆𝌇𝌈𝌉" "𝌉") "high encode - strcspn 6"}
-	
-	{test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 0)) (ord (strsub "𝌆𝌇𝌈𝌉" 0)) "high encode - ord 1"}
-	{test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 1)) (ord (strsub "𝌆𝌇𝌈𝌉" 1)) "high encode - ord 2"}
-	{test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 2)) (ord (strsub "𝌆𝌇𝌈𝌉" 2)) "high encode - ord 3"}
-	{test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 3)) (ord (strsub "𝌆𝌇𝌈𝌉" 3)) "high encode - ord 4"}
+      <body onload={tests <- rpc (generateTests ()); set t (Some tests); return ()}>
+
+	<dyn signal={tests' <- signal t;
+		     case tests' of
+			 None => return <xml></xml>
+		       | Some tests => return <xml>
+
+			 {test_fn_cside (fn _ => strlen "𝌆𝌇𝌈𝌉") tests.SL1 "high encode - strlen 1"}
+			 {test_fn_cside (fn _ => strlen "𝌇𝌈𝌉") tests.SL2 "high encode - strlen 2"}
+			 {test_fn_cside (fn _ => strlen "𝌈𝌉") tests.SL3 "high encode - strlen 3"}
+			 {test_fn_cside (fn _ => strlen "𝌉") tests.SL4 "high encode - strlen 4"}
+			 
+			 {test_fn_cside (fn _ => substring "𝌆𝌇𝌈𝌉" 1 3) tests.SS1 "high encode - substring 1"}
+			 {test_fn_cside (fn _ => substring "𝌆𝌇𝌈𝌉" 2 2) tests.SS2 "high encode - substring 2"}
+			 {test_fn_cside (fn _ => substring "𝌆𝌇𝌈𝌉" 3 1) tests.SS3 "high encode - substring 3"}
 
-	{test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 0)) (show (strsub "𝌆𝌇𝌈𝌉" 0)) "high encode - show 1"}
-	{test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 1)) (show (strsub "𝌆𝌇𝌈𝌉" 1)) "high encode - show 2"}
-	{test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 2)) (show (strsub "𝌆𝌇𝌈𝌉" 2)) "high encode - show 3"}
-	{test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 3)) (show (strsub "𝌆𝌇𝌈𝌉" 3)) "high encode - show 4"}
+			 {test_fn_cside (fn _ => strlen (substring "𝌆𝌇𝌈𝌉" 1 3)) tests.SLSS1 "high encode - strlen of substring 1"}
+			 {test_fn_cside (fn _ => strlen (substring "𝌆𝌇𝌈𝌉" 2 2)) tests.SLSS2 "high encode - strlen of substring 2"}
+			 {test_fn_cside (fn _ => strlen (substring "𝌆𝌇𝌈𝌉" 3 1)) tests.SLSS3 "high encode - strlen of substring 3"}
+
+			 {test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 0) tests.SSB1 "high encode - strsub 1"}
+			 {test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 1) tests.SSB2 "high encode - strsub 2"}
+			 {test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 2) tests.SSB3 "high encode - strsub 3"}
+			 {test_fn_cside (fn _ => strsub "𝌆𝌇𝌈𝌉" 3) tests.SSB4 "high encode - strsub 4"}
+
+			 {test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 0) tests.SSF1 "high encode - strsuffix 1"}
+			 {test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 1) tests.SSF2 "high encode - strsuffix 2"}
+			 {test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 2) tests.SSF3 "high encode - strsuffix 3"}
+			 {test_fn_cside (fn _ => strsuffix "𝌆𝌇𝌈𝌉" 3) tests.SSF4 "high encode - strsuffix 4"}
+
+			 {test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" #"c") tests.SC1 "high encode - strchr 1"}
+			 {test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)) tests.SC2 "high encode - strchr 2"}
+			 {test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)) tests.SC3 "high encode - strchr 3"}
+			 {test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)) tests.SC4 "high encode - strchr 4"}
+			 {test_fn_cside (fn _ => strchr "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)) tests.SC5 "high encode - strchr 5"}
+
+			 {test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" #"c") tests.SI1 "high encode - strindex 1"}
+			 {test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌆" 0)) tests.SI2 "high encode - strindex 2"}
+			 {test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌇" 0)) tests.SI3 "high encode - strindex 3"}
+			 {test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌈" 0)) tests.SI4 "high encode - strindex 4"}
+			 {test_fn_cside (fn _ => strindex "𝌆𝌇𝌈𝌉" (strsub "𝌉" 0)) tests.SI5 "high encode - strindex 5"}
+
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "") tests.SSI1 "high encode - strsindex 1"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉") tests.SSI2 "high encode - strsindex 2"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈c") tests.SSI3 "high encode - strsindex 3"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉") tests.SSI4 "high encode - strsindex 4"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌇𝌈c") tests.SSI5 "high encode - strsindex 5"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌈𝌉") tests.SSI6 "high encode - strsindex 6"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌈c") tests.SSI7 "high encode - strsindex 7"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "𝌉") tests.SSI8 "high encode - strsindex 8"}
+			 {test_fn_cside (fn _ => strsindex "𝌆𝌇𝌈𝌉" "c") tests.SSI9 "high encode - strsindex 9"}
+
+			 {test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "") tests.SCSP1 "high encode - strcspn 1"}
+			 {test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌆𝌇𝌈𝌉") tests.SCSP2 "high encode - strcspn 2"}
+			 {test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌆") tests.SCSP3 "high encode - strcspn 3"}
+			 {test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌇𝌈𝌉") tests.SCSP4 "high encode - strcspn 4"}
+			 {test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌈𝌉") tests.SCSP5 "high encode - strcspn 5"}
+			 {test_fn_cside (fn _ => strcspn "𝌆𝌇𝌈𝌉" "𝌉") tests.SCSP6 "high encode - strcspn 6"}
+			 
+			 {test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 0)) tests.OSS1 "high encode - ord 1"}
+			 {test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 1)) tests.OSS2 "high encode - ord 2"}
+			 {test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 2)) tests.OSS3 "high encode - ord 3"}
+			 {test_fn_cside (fn _ => ord (strsub "𝌆𝌇𝌈𝌉" 3)) tests.OSS4 "high encode - ord 4"}
+
+			 {test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 0)) tests.SSS1 "high encode - show 1"}
+			 {test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 1)) tests.SSS2 "high encode - show 2"}
+			 {test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 2)) tests.SSS3 "high encode - show 3"}
+			 {test_fn_cside (fn _ => show (strsub "𝌆𝌇𝌈𝌉" 3)) tests.SSS4 "high encode - show 4"}
+
+		       </xml> } />
 
 	</body>
-      </xml>
+    </xml>
+
+(* substrings *)
+fun substring1 _ = substring "abc" 0 3
+fun substring2 _ = substring "abc" 1 2
+fun substring3 _ = substring "abc" 2 1
+fun substring4 _ = substring "ábó" 0 3
+fun substring5 _ = substring "ábó" 1 2
+fun substring6 _ = substring "ábó" 2 1
+fun substring7 _ = substring "ábó" 0 2
+fun substring8 _ = substring "ábó" 0 1
+fun substring9 _ = substring "" 0 0
 
+fun substringsserver _ =
+    return {
+     T1 = substring1 (),
+     T2 = substring2 (),
+     T3 = substring3 (),
+     T4 = substring4 (),
+     T5 = substring5 (),
+     T6 = substring6 (),
+     T7 = substring7 (),
+     T8 = substring8 (),
+     T9 = substring9 ()
+    }
+		   
 fun substrings () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => substring "abc" 0 3) "abc" "substrings 1"}
-	{test_fn_both_sides (fn _ => substring "abc" 1 2) "bc" "substrings 2"}
-	{test_fn_both_sides (fn _ => substring "abc" 2 1) "c" "substrings 3"}
-	{test_fn_both_sides (fn _ => substring "ábó" 0 3) "ábó" "substrings 4"}
-	{test_fn_both_sides (fn _ => substring "ábó" 1 2) "bó" "substrings 5"}
-	{test_fn_both_sides (fn _ => substring "ábó" 2 1) "ó" "substrings 6"}
-	{test_fn_both_sides (fn _ => substring "ábó" 0 2) "áb" "substrings 7"}
-	{test_fn_both_sides (fn _ => substring "ábó" 0 1) "á" "substrings 8"}
-	{test_fn_both_sides (fn _ => substring "" 0 0) "" "substrings 9"}
+      <body onload={r <- rpc (substringsserver ());
+		    set t (Some r);
+		    return () }>
+	
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' =>
+					      return <xml>
+					   	{test_fn_both_sides2 substring1 t'.T1 "abc" "substrings 1"}
+						{test_fn_both_sides2 substring2 t'.T2 "bc" "substrings 2"} 
+						{test_fn_both_sides2 substring3 t'.T3 "c" "substrings 3"}
+						{test_fn_both_sides2 substring4 t'.T4 "ábó" "substrings 4"}
+						{test_fn_both_sides2 substring5 t'.T5 "bó" "substrings 5"}
+						{test_fn_both_sides2 substring6 t'.T6 "ó" "substrings 6"}
+						{test_fn_both_sides2 substring7 t'.T7 "áb" "substrings 7"}
+						{test_fn_both_sides2 substring8 t'.T8 "á" "substrings 8"}
+						{test_fn_both_sides2 substring9 t'.T9 "" "substrings 9"}
+					      </xml>
+		    } />
       </body>
     </xml>
 
+(* strlen *)
+fun strlen1 _ = strlen "abc"
+fun strlen2 _ = strlen "çbc"
+fun strlen3 _ = strlen "çãc"
+fun strlen4 _ = strlen "çãó"
+fun strlen5 _ = strlen "ç"
+fun strlen6 _ = strlen "c"
+fun strlen7 _ = strlen ""
+fun strlen8 _ = strlen "が"
+fun strlen9 _ = strlen "漢"
+fun strlen10 _ = strlen "カ"
+fun strlen11 _ = strlen "وظيفية"
+fun strlen12 _ = strlen "函數"
+fun strlen13 _ = strlen "Функциональное"
+		 
+fun strlensserver _ =
+    return {
+     T1 = strlen1 (),
+     T2 = strlen2 (),
+     T3 = strlen3 (),
+     T4 = strlen4 (),
+     T5 = strlen5 (),
+     T6 = strlen6 (),
+     T7 = strlen7 (),
+     T8 = strlen8 (),
+     T9 = strlen9 (),
+     T10 = strlen10 (),
+     T11 = strlen11 (),
+     T12 = strlen12 (),
+     T13 = strlen13 ()
+    }
+		 
+fun strlens () : transaction page =
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (strlensserver());
+		    set t (Some r);
+		    return ()}>
+
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' =>
+					      return <xml>
+						{test_fn_both_sides2 strlen1 t'.T1 3 "strlen 1"}
+						{test_fn_both_sides2 strlen2 t'.T2 3 "strlen 2"}
+						{test_fn_both_sides2 strlen3 t'.T3 3 "strlen 3"}
+						{test_fn_both_sides2 strlen4 t'.T4 3 "strlen 4"}
+						{test_fn_both_sides2 strlen5 t'.T5 1 "strlen 5"}
+						{test_fn_both_sides2 strlen6 t'.T6 1 "strlen 6"}
+						{test_fn_both_sides2 strlen7 t'.T7 0 "strlen 7"}
+						{test_fn_both_sides2 strlen8 t'.T8 1 "strlen 8"}
+						{test_fn_both_sides2 strlen9 t'.T9 1 "strlen 9"}
+						{test_fn_both_sides2 strlen10 t'.T10 1 "strlen 10"}
+						{test_fn_both_sides2 strlen11 t'.T11 6 "strlen 11"}
+						{test_fn_both_sides2 strlen12 t'.T12 2 "strlen 12"}
+						{test_fn_both_sides2 strlen13 t'.T13 14 "strlen 13"}    
+					      </xml>} />
 
-fun strlens () : transaction page = return <xml>
-  <body> 
-    {test_fn_both_sides (fn _ => strlen "abc") 3 "strlen 1"}
-    {test_fn_both_sides (fn _ => strlen "çbc") 3 "strlen 2"}
-    {test_fn_both_sides (fn _ => strlen "çãc") 3 "strlen 3"}
-    {test_fn_both_sides (fn _ => strlen "çãó") 3 "strlen 4"}
-    {test_fn_both_sides (fn _ => strlen "ç") 1 "strlen 5"}
-    {test_fn_both_sides (fn _ => strlen "c") 1 "strlen 6"}
-    {test_fn_both_sides (fn _ => strlen "") 0 "strlen 7"}
-    {test_fn_both_sides (fn _ => strlen "が") 1 "strlen 8"}
-    {test_fn_both_sides (fn _ => strlen "漢") 1 "strlen 9"}
-    {test_fn_both_sides (fn _ => strlen "カ") 1 "strlen 10"}
-    {test_fn_both_sides (fn _ => strlen "وظيفية") 6 "strlen 11"}
-    {test_fn_both_sides (fn _ => strlen "函數") 2 "strlen 12"}
-    {test_fn_both_sides (fn _ => strlen "Функциональное") 14 "strlen 13"}    
-  </body>
-  </xml>
-				       
-fun strlenGens () : transaction page = return <xml>
-  <body>
-    {test_fn_both_sides (fn _ => strlenGe "" 1) False "strlenGe 1"}
-    {test_fn_both_sides (fn _ => strlenGe "" 0) True "strlenGe 2"}
-    {test_fn_both_sides (fn _ => strlenGe "aba" 4) False "strlenGe 3"}
-    {test_fn_both_sides (fn _ => strlenGe "aba" 3) True "strlenGe 4"}
-    {test_fn_both_sides (fn _ => strlenGe "aba" 2) True "strlenGe 5"}
-    {test_fn_both_sides (fn _ => strlenGe "àçá" 4) False "strlenGe 6"}
-    {test_fn_both_sides (fn _ => strlenGe "àçá" 3) True "strlenGe 7"}
-    {test_fn_both_sides (fn _ => strlenGe "àçá" 2) True "strlenGe 8"}    
   </body>
-  </xml>
+	</xml>
+
+(* strlenGe *)
+fun strlenGe1 _ = strlenGe "" 1
+fun strlenGe2 _ = strlenGe "" 0
+fun strlenGe3 _ = strlenGe "aba" 4
+fun strlenGe4 _ = strlenGe "aba" 3
+fun strlenGe5 _ = strlenGe "aba" 2
+fun strlenGe6 _ = strlenGe "àçá" 4
+fun strlenGe7 _ = strlenGe "àçá" 3
+fun strlenGe8 _ = strlenGe "àçá" 2
+
+fun strleGesserver _ = return {
+		       T1 = strlenGe1 (),
+		       T2 = strlenGe2 (),
+		       T3 = strlenGe3 (),
+		       T4 = strlenGe4 (),
+		       T5 = strlenGe5 (),
+		       T6 = strlenGe6 (),
+		       T7 = strlenGe7 (),
+		       T8 = strlenGe8 ()
+		       }
+		  
+fun strlenGens () : transaction page =
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (strleGesserver());
+		    set t (Some r);
+		    return ()}>
+
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					| Some t' =>
+					  return <xml>
+					    {test_fn_both_sides2 strlenGe1 t'.T1 False "strlenGe 1"}
+					    {test_fn_both_sides2 strlenGe2 t'.T2 True "strlenGe 2"}
+					    {test_fn_both_sides2 strlenGe3 t'.T3 False "strlenGe 3"}
+					    {test_fn_both_sides2 strlenGe4 t'.T4 True "strlenGe 4"}
+					    {test_fn_both_sides2 strlenGe5 t'.T5 True "strlenGe 5"}
+					    {test_fn_both_sides2 strlenGe6 t'.T6 False "strlenGe 6"}
+					    {test_fn_both_sides2 strlenGe7 t'.T7 True "strlenGe 7"}
+					    {test_fn_both_sides2 strlenGe8 t'.T8 True "strlenGe 8"}    
+					  </xml>} />
+						  </body>
+    </xml>
 
 type clen = { S : string, L : int }
 
@@ -182,181 +413,530 @@ val clen_eq : eq clen = mkEq (fn a b =>
 
 val clen_show : show clen = mkShow (fn a =>
 				   "{S = " ^ a.S ^ ", L = " ^ (show a.L) ^ "}")
+(* strcat *)
+
+fun teststrcat a b = let val c = strcat a b in {S = c, L = strlen c} end
+fun teststrcat1 _ = teststrcat "" ""
+fun teststrcat2 _ = teststrcat "aa" "bb"
+fun teststrcat3 _ = teststrcat "" "bb"
+fun teststrcat4 _ = teststrcat "aa" ""
+fun teststrcat5 _ = teststrcat "àà" "áá"
+fun teststrcat6 _ = teststrcat "" "áá"
+fun teststrcat7 _ = teststrcat "àà" ""
+fun teststrcat8 _ = teststrcat "函數" "ãã"
+fun teststrcat9 _ = teststrcat "ç" "ã"
+fun teststrcat10 _ = teststrcat (show (strsub "ç" 0)) (show (strsub "ã" 0))
+fun teststrcat11 _ = teststrcat (show (chr 231)) (show (chr 227))
 
+fun strcatsserver () =
+    return {
+    T1 = teststrcat1 (),
+    T2 = teststrcat2 (),
+    T3 = teststrcat3 (),
+    T4 = teststrcat4 (),
+    T5 = teststrcat5 (),
+    T6 = teststrcat6 (),
+    T7 = teststrcat7 (),
+    T8 = teststrcat8 (),
+    T9 = teststrcat9 (),
+    T10 = teststrcat10 (),
+    T11 = teststrcat11 ()   
+    }
+		     
 fun strcats () : transaction page =
-    let
-	fun test_cat_and_len n a b expS expL =
-	    test_fn_both_sides (fn _ => let val c = strcat a b in {S = c, L = strlen c} end) {S=expS, L=expL} ("strcat " ^ (show n))
-    in
-	return <xml>
-	  <body>
-	    {test_cat_and_len 1 "" "" "" 0}	    
-	    {test_cat_and_len 2 "aa" "bb" "aabb" 4}
-	    {test_cat_and_len 3 "" "bb" "bb" 2}
-	    {test_cat_and_len 4 "aa" "" "aa" 2}
-	    {test_cat_and_len 5 "àà" "áá" "ààáá" 4}
-	    {test_cat_and_len 6 "" "áá" "áá" 2}
-	    {test_cat_and_len 7 "àà" "" "àà" 2}
-	    {test_cat_and_len 8 "函數" "ãã" "函數ãã" 4}
-	    {test_cat_and_len 9 "ç" "ã" "çã" 2}
-	    {test_cat_and_len 10 (show (strsub "ç" 0)) (show (strsub "ã" 0)) "çã" 2}
-	    {test_cat_and_len 11 (show (chr 231)) (show (chr 227)) "çã" 2}
-	  </body>
-	</xml>
-end
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (strcatsserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 teststrcat1 t'.T1 {S="",L=0} "strcat 1" }
+					      {test_fn_both_sides2 teststrcat2 t'.T2 {S="aabb",L=4} "strcat 2" }
+					      {test_fn_both_sides2 teststrcat3 t'.T3 {S="bb",L=2} "strcat 3" }
+					      {test_fn_both_sides2 teststrcat4 t'.T4 {S="aa",L=2} "strcat 4" }
+					      {test_fn_both_sides2 teststrcat5 t'.T5 {S="ààáá",L=4} "strcat 5" }
+					      {test_fn_both_sides2 teststrcat6 t'.T6 {S="áá",L=2} "strcat 6" }
+					      {test_fn_both_sides2 teststrcat7 t'.T7 {S="àà",L=2} "strcat 7" }
+					      {test_fn_both_sides2 teststrcat8 t'.T8 {S="函數ãã",L=4} "strcat 8" }
+					      {test_fn_both_sides2 teststrcat9 t'.T9 {S="çã",L=2} "strcat 9" }
+					      {test_fn_both_sides2 teststrcat10 t'.T10 {S="çã",L=2} "strcat 10" }
+					      {test_fn_both_sides2 teststrcat11 t'.T11 {S="çã",L=2} "strcat 11" }
+					    </xml>} />
+			</body>
+      </xml>
+
+(* strsubs *)
 
+fun strsub1 _ = strsub "abàç" 0
+fun strsub2 _ = strsub "abàç" 1
+fun strsub3 _ = strsub "àb" 0
+fun strsub4 _ = strsub "abàç" 2
+fun strsub5 _ = strsub "abàç" 3
+
+fun strsubsserver _ = return {
+		      T1 = strsub1 (),
+		      T2 = strsub2 (),
+		      T3 = strsub3 (),
+		      T4 = strsub4 (),
+		      T5 = strsub5 ()
+		      }
+		
 fun strsubs () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => strsub "abàç" 0) #"a" "strsub 1"}
-	{test_fn_both_sides (fn _ => strsub "abàç" 1) #"b" "strsub 2"}
-	{test_fn_both_sides (fn _ => strsub "àb" 0) (strsub "à" 0) "strsub 3"}
-	{test_fn_both_sides (fn _ => strsub "abàç" 2) (strsub "à" 0) "strsub 4"}
-	{test_fn_both_sides (fn _ => strsub "abàç" 3) (strsub "ç" 0) "strsub 5"}
+      <body onload={r <- rpc (strsubsserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      	{test_fn_both_sides2 strsub1 t'.T1 #"a" "strsub 1"}
+						{test_fn_both_sides2 strsub2 t'.T2 #"b" "strsub 2"}
+						{test_fn_both_sides2 strsub3 t'.T3 (strsub "à" 0) "strsub 3"}
+						{test_fn_both_sides2 strsub4 t'.T4 (strsub "à" 0) "strsub 4"}
+						{test_fn_both_sides2 strsub5 t'.T5 (strsub "ç" 0) "strsub 5"}
+					      </xml>
+					      } />
+
       </body>
-      </xml>
+	</xml>
 
+(* strsuffixs *)
+fun strsuffix1 _ = strsuffix "abàç" 0
+fun strsuffix2 _ = strsuffix "abàç" 1
+fun strsuffix3 _ = strsuffix "abàç" 2
+fun strsuffix4 _ = strsuffix "abàç" 3
+
+fun strsuffixsserver _ =
+    return {
+    T1 = strsuffix1 (),
+    T2 = strsuffix2 (),
+    T3 = strsuffix3 (),
+    T4 = strsuffix4 ()
+    }
+		   
 fun strsuffixs () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => strsuffix "abàç" 0) "abàç" "strsuffix 1"}
-	{test_fn_both_sides (fn _ => strsuffix "abàç" 1) "bàç" "strsuffix 2"}
-	{test_fn_both_sides (fn _ => strsuffix "abàç" 2) "àç" "strsuffix 3"}
-	{test_fn_both_sides (fn _ => strsuffix "abàç" 3) "ç" "strsuffix 4"}
+      <body  onload={r <- rpc (strsuffixsserver ());
+		    set t (Some r);
+		     return ()}>
+		<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      		{test_fn_both_sides2 strsuffix1 t'.T1 "abàç" "strsuffix 1"}
+							{test_fn_both_sides2 strsuffix2 t'.T2 "bàç" "strsuffix 2"}
+							{test_fn_both_sides2 strsuffix3 t'.T3 "àç" "strsuffix 3"}
+							{test_fn_both_sides2 strsuffix4 t'.T4 "ç" "strsuffix 4"}
+					      </xml>
+					      } />
+
       </body>
     </xml>
 
+(* strchrs *)
+
+fun strchr1 _ = strchr "abàç" #"c"
+fun strchr2 _ = strchr "abàç" #"a"
+fun strchr3 _ = strchr "abàç" #"b"
+fun strchr4 _ = strchr "abàç" (strsub "à" 0)
+fun strchr5 _ = strchr "abàç" (strsub "ç" 0)
+
+fun strchrssserver _ =
+    return {
+    T1 = strchr1 (),
+    T2 = strchr2 (),
+    T3 = strchr3 (),
+    T4 = strchr4 (),
+    T5 = strchr5 ()
+    }
+		
 fun strchrs () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => strchr "abàç" #"c") None "strchr 1"}
-	{test_fn_both_sides (fn _ => strchr "abàç" #"a") (Some "abàç") "strchr 2"}
-	{test_fn_both_sides (fn _ => strchr "abàç" #"b") (Some "bàç") "strchr 3"}
-	{test_fn_both_sides (fn _ => strchr "abàç" (strsub "à" 0)) (Some "àç") "strchr 4"}
-	{test_fn_both_sides (fn _ => strchr "abàç" (strsub "ç" 0)) (Some "ç") "strchr 5"}	    
+      <body onload={r <- rpc (strchrssserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 strchr1 t'.T1 None "strchr 1"}
+					      {test_fn_both_sides2 strchr2 t'.T2 (Some "abàç") "strchr 2"}
+					      {test_fn_both_sides2 strchr3 t'.T3 (Some "bàç") "strchr 3"}
+					      {test_fn_both_sides2 strchr4 t'.T4 (Some "àç") "strchr 4"}
+					      {test_fn_both_sides2 strchr5 t'.T5 (Some "ç") "strchr 5"}
+					      </xml>
+					      } />
+	    
       </body>
-    </xml>
+	</xml>
+
+(* strindexs *)
+fun strindex1 _ = strindex "abàç" #"c"
+fun strindex2 _ = strindex "abàç" #"a"
+fun strindex3 _ = strindex "abàç" #"b"
+fun strindex4 _ = strindex "abàç" (strsub "à" 0)
+fun strindex5 _ = strindex "abàç" (strsub "ç" 0)
 
+fun strindexsserver _ =
+    return {
+    T1 = strindex1 (),
+    T2 = strindex2 (),
+    T3 = strindex3 (),
+    T4 = strindex4 (),
+    T5 = strindex5 ()
+    }
+		  
 fun strindexs () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => strindex "abàç" #"c") None "strindex 1"}
-	{test_fn_both_sides (fn _ => strindex "abàç" #"a") (Some 0) "strindex 2"}
-	{test_fn_both_sides (fn _ => strindex "abàç" #"b") (Some 1) "strindex 3"}
-	{test_fn_both_sides (fn _ => strindex "abàç" (strsub "à" 0)) (Some 2) "strindex 4"}
-	{test_fn_both_sides (fn _ => strindex "abàç" (strsub "ç" 0)) (Some 3) "strindex 5"}	
+      <body onload={r <- rpc (strindexsserver ());
+		    set t (Some r);
+		    return ()}>
+		<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      	{test_fn_both_sides2 strindex1 t'.T1 None "strindex 1"}
+						{test_fn_both_sides2 strindex2 t'.T2 (Some 0) "strindex 2"}
+						{test_fn_both_sides2 strindex3 t'.T3 (Some 1) "strindex 3"}
+						{test_fn_both_sides2 strindex4 t'.T4 (Some 2) "strindex 4"}
+						{test_fn_both_sides2 strindex5 t'.T5 (Some 3) "strindex 5"}
+					      </xml>
+					      } />
+	
       </body>
     </xml>
 
+(*strsindexs*)
+fun strsindex1 _ = strsindex "abàç" ""
+fun strsindex2 _ = strsindex "abàç" "abàç"
+fun strsindex3 _ = strsindex "abàç" "abàc"
+fun strsindex4 _ = strsindex "abàç" "bàç"
+fun strsindex5 _ = strsindex "abàç" "bàc"
+fun strsindex6 _ = strsindex "abàç" "àç"
+fun strsindex7 _ = strsindex "abàç" "àc"
+fun strsindex8 _ = strsindex "abàç" "ç"
+fun strsindex9 _ = strsindex "abàç" "c"
+
+fun strsindexsserver _ =
+    return {
+    T1 = strsindex1 (),
+    T2 = strsindex2 (),
+    T3 = strsindex3 (),
+    T4 = strsindex4 (),
+    T5 = strsindex5 (),
+    T6 = strsindex6 (),
+    T7 = strsindex7 (),
+    T8 = strsindex8 (),
+    T9 = strsindex9 ()
+    }
+    
 fun strsindexs () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => strsindex "abàç" "") (Some 0) "strsindex 1"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "abàç") (Some 0) "strsindex 2"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "abàc") None "strsindex 3"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "bàç") (Some 1) "strsindex 4"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "bàc") None "strsindex 5"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "àç") (Some 2) "strsindex 6"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "àc") None "strsindex 7"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "ç") (Some 3) "strsindex 8"}
-	{test_fn_both_sides (fn _ => strsindex "abàç" "c") None "strsindex 9"}
+      <body onload={r <- rpc (strsindexsserver ());
+		    set t (Some r);
+		    return ()}>
+		<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      		{test_fn_both_sides2 strsindex1 t'.T1 (Some 0) "strsindex 1"}
+							{test_fn_both_sides2 strsindex2 t'.T2 (Some 0) "strsindex 2"}
+							{test_fn_both_sides2 strsindex3 t'.T3 None "strsindex 3"}
+							{test_fn_both_sides2 strsindex4 t'.T4 (Some 1) "strsindex 4"}
+							{test_fn_both_sides2 strsindex5 t'.T5 None "strsindex 5"}
+							{test_fn_both_sides2 strsindex6 t'.T6 (Some 2) "strsindex 6"}
+							{test_fn_both_sides2 strsindex7 t'.T7 None "strsindex 7"}
+							{test_fn_both_sides2 strsindex8 t'.T8 (Some 3) "strsindex 8"}
+							{test_fn_both_sides2 strsindex9 t'.T9 None "strsindex 9"}
+					      </xml>
+					      } />
+
       </body>
-    </xml>
+		</xml>
+
+(*strcspns*)
+fun strcspn1 _ = strcspn "abàç" ""
+fun strcspn2 _ = strcspn "abàç" "abàç"
+fun strcspn3 _ = strcspn "abàç" "a"
+fun strcspn4 _ = strcspn "abàç" "bà"
+fun strcspn5 _ = strcspn "abàç" "àç"
+fun strcspn6 _ = strcspn "abàç" "ç"
 	
+fun strcspnsserver _ =
+    return {
+    T1 = strcspn1 (),
+    T2 = strcspn2 (),
+    T3 = strcspn3 (),
+    T4 = strcspn4 (),
+    T5 = strcspn5 (),
+    T6 = strcspn6 ()
+    }
+    
 fun strcspns () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => strcspn "abàç" "") 4 "strcspn 1"}
-	{test_fn_both_sides (fn _ => strcspn "abàç" "abàç") 0 "strcspn 2"}
-	{test_fn_both_sides (fn _ => strcspn "abàç" "a") 0 "strcspn 3"}
-	{test_fn_both_sides (fn _ => strcspn "abàç" "bàç") 1 "strcspn 4"}
-	{test_fn_both_sides (fn _ => strcspn "abàç" "àç") 2 "strcspn 5"}
-	{test_fn_both_sides (fn _ => strcspn "abàç" "ç") 3 "strcspn 6"}	
+      <body onload={r <- rpc (strcspnsserver ());
+		    set t (Some r);
+		    return ()}>
+		<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 strcspn1 t'.T1 4 "strcspn 1"}
+					      {test_fn_both_sides2 strcspn2 t'.T2 0 "strcspn 2"}
+					      {test_fn_both_sides2 strcspn3 t'.T3 0 "strcspn 3"}
+					      {test_fn_both_sides2 strcspn4 t'.T4 1 "strcspn 4"}
+					      {test_fn_both_sides2 strcspn5 t'.T5 2 "strcspn 5"}
+					      {test_fn_both_sides2 strcspn6 t'.T6 3 "strcspn 6"}	
+					      </xml>
+					      } />
+
       </body>
-      </xml>
+		</xml>
 
-fun str1s () : transaction page = return <xml>
-  <body>
-    {test_fn_both_sides (fn _ => str1 #"a") "a" "str1 1"}
-    {test_fn_both_sides (fn _ => str1 (strsub "à" 0)) "à" "str1 2"}
-    {test_fn_both_sides (fn _ => str1 (strsub "aá" 1)) "á" "str1 3"}    
-  </body>
-  </xml>
-
-fun isalnums () : transaction page = return <xml>
-  <body>
-    {test_fn_both_sides (fn _ => isalnum #"a") True "isalnum 1"}
-    {test_fn_both_sides (fn _ => isalnum #"a") True "isalnum 2"}
-    {test_fn_both_sides (fn _ => isalnum (strsub "à" 0)) True "isalnum 3"}
-    {test_fn_both_sides (fn _ => isalnum #"A") True "isalnum 4"}
-    {test_fn_both_sides (fn _ => isalnum (strsub "À" 0)) True "isalnum 5"}
-    {test_fn_both_sides (fn _ => isalnum #"1") True "isalnum 6"}
-    {test_fn_both_sides (fn _ => not (isalnum #"!")) True "isalnum 7"}
-    {test_fn_both_sides (fn _ => not (isalnum #"#")) True "isalnum 8"}
-    {test_fn_both_sides (fn _ => not (isalnum #" ")) True "isalnum 9"}
-  </body>
-</xml>
+(* str1 *)
+fun str11 _ = str1 #"a"
+fun str12 _ = str1 (strsub "à" 0)
+fun str13 _ = str1 (strsub "aá" 1)
 
-fun isalphas () : transaction page = return <xml>
-  <body>
-    {test_fn_both_sides (fn _ => isalpha #"a") True "isalpha 1"}
-    {test_fn_both_sides (fn _ => isalpha (strsub "à" 0)) True "isalpha 2"}
-    {test_fn_both_sides (fn _ => isalpha #"A") True "isalpha 3"}
-    {test_fn_both_sides (fn _ => isalpha (strsub "À" 0)) True "isalpha 4"}
-    {test_fn_both_sides (fn _ => not (isalpha #"1")) True "isalpha 5"}
-    {test_fn_both_sides (fn _ => not (isalpha #"!")) True "isalpha 6"}
-    {test_fn_both_sides (fn _ => not (isalpha #"#")) True "isalpha 7"}
-    {test_fn_both_sides (fn _ => not (isalpha #" ")) True "isalpha 8"}
-  </body>
+fun str1server _ =
+    return {
+    T1 = str11 (),
+    T2 = str12 (),
+    T3 = str13 ()
+    }
+	      
+fun str1s () : transaction page =
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (str1server ());
+		    set t (Some r);
+		    return ()}>
+		<dyn signal={r <- signal t; case r of None => return <xml></xml>
+						    | Some t' => return <xml>
+					      	      {test_fn_both_sides2 str11 t'.T1 "a" "str1 1"}
+						      {test_fn_both_sides2 str12 t'.T2 "à" "str1 2"}
+						      {test_fn_both_sides2 str13 t'.T3 "á" "str1 3"}   
+					      </xml>
+					      } />
+ 
+      </body>
+		</xml>
+
+(* isalnum *)
+
+fun isalnum1 _ = isalnum #"a"
+fun isalnum2 _ = isalnum #"a"
+fun isalnum3 _ = isalnum (strsub "à" 0)
+fun isalnum4 _ = isalnum #"A"
+fun isalnum5 _ = isalnum (strsub "À" 0)
+fun isalnum6 _ = isalnum #"1"
+fun isalnum7 _ = not (isalnum #"!")
+fun isalnum8 _ = not (isalnum #"#")
+fun isalnum9 _ = not (isalnum #" ")
+
+fun isalnumsserver _ = return {
+		      T1 = isalnum1 (),
+		      T2 = isalnum2 (),
+		      T3 = isalnum3 (),
+		      T4 = isalnum4 (),
+		      T5 = isalnum5 (),
+		      T6 = isalnum6 (),
+		      T7 = isalnum7 (),
+		      T8 = isalnum8 (),
+		      T9 = isalnum9 ()
+		      }
+		      
+fun isalnums () : transaction page =
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (isalnumsserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 isalnum1 t'.T1 True "isalnum 1"}
+					      {test_fn_both_sides2 isalnum2 t'.T2 True "isalnum 2"}
+					      {test_fn_both_sides2 isalnum3 t'.T3 True "isalnum 3"}
+					      {test_fn_both_sides2 isalnum4 t'.T4 True "isalnum 4"}
+					      {test_fn_both_sides2 isalnum5 t'.T5 True "isalnum 5"}
+					      {test_fn_both_sides2 isalnum6 t'.T6 True "isalnum 6"}
+					      {test_fn_both_sides2 isalnum7 t'.T7 True "isalnum 7"}
+					      {test_fn_both_sides2 isalnum8 t'.T8 True "isalnum 8"}
+					      {test_fn_both_sides2 isalnum9 t'.T9 True "isalnum 9"}				      	    
+					    </xml>
+		    } />
+
+		      </body>
+	</xml>
+
+(* isalpha *)
+fun isalpha1 _ = isalpha #"a"
+fun isalpha2 _ = isalpha (strsub "à" 0)
+fun isalpha3 _ = isalpha #"A"
+fun isalpha4 _ = isalpha (strsub "À" 0)
+fun isalpha5 _ = not (isalpha #"1")
+fun isalpha6 _ = not (isalpha #"!")
+fun isalpha7 _ = not (isalpha #"#")
+fun isalpha8 _ = not (isalpha #" ")
+
+fun isalphasserver () =
+    return {
+    T1 = isalpha1 (),
+    T2 = isalpha2 (),
+    T3 = isalpha3 (),
+    T4 = isalpha4 (),
+    T5 = isalpha5 (),
+    T6 = isalpha6 (),
+    T7 = isalpha7 (),
+    T8 = isalpha8 ()    
+    }
+		 
+fun isalphas () : transaction page =
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (isalphasserver ());
+		    set t (Some r);
+		    return ()}>
+		<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      		{test_fn_both_sides2 isalpha1 t'.T1 True "isalpha 1"}
+							{test_fn_both_sides2 isalpha2 t'.T2 True "isalpha 2"}
+							{test_fn_both_sides2 isalpha3 t'.T3 True "isalpha 3"}
+							{test_fn_both_sides2 isalpha4 t'.T4  True "isalpha 4"}
+							{test_fn_both_sides2 isalpha5 t'.T5 True "isalpha 5"}
+							{test_fn_both_sides2 isalpha6 t'.T6 True "isalpha 6"}
+							{test_fn_both_sides2 isalpha7 t'.T7 True "isalpha 7"}
+							{test_fn_both_sides2 isalpha8 t'.T8 True "isalpha 8"}			      	    
+					    </xml>
+		    } />
+
+      </body>
 </xml>
 
-fun isblanks () : transaction page = 
+(* isblanks *)
+fun isblank1 _ = not (isblank #"a")
+fun isblank2 _ = not (isblank (strsub "à" 0))
+fun isblank3 _ = not (isblank #"A")
+fun isblank4 _ = not (isblank (strsub "À" 0))
+fun isblank5 _ = not (isblank #"1")
+fun isblank6 _ = not (isblank #"!")
+fun isblank7 _ = not (isblank #"#")
+fun isblank8 _ = isblank #" "
+fun isblank9 _ = isblank #"\t"
+fun isblank10 _ = not (isblank #"\n")
+
+fun isblanksserver _ =
+    return {
+    T1 = isblank1 (),
+    T2 = isblank2 (),
+    T3 = isblank3 (),
+    T4 = isblank4 (),
+    T5 = isblank5 (),
+    T6 = isblank6 (),
+    T7 = isblank7 (),
+    T8 = isblank8 (),
+    T9 = isblank9 (),
+    T10 = isblank10 ()
+    }
+		  
+fun isblanks () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => not (isblank #"a")) True "isblank 1"}
-	{test_fn_both_sides (fn _ => not (isblank (strsub "à" 0))) True "isblank 2"}
-	{test_fn_both_sides (fn _ => not (isblank #"A")) True "isblank 3"}
-	{test_fn_both_sides (fn _ => not (isblank (strsub "À" 0))) True "isblank 4"}
-	{test_fn_both_sides (fn _ => not (isblank #"1")) True "isblank 5"}
-	{test_fn_both_sides (fn _ => not (isblank #"!")) True "isblank 6"}
-	{test_fn_both_sides (fn _ => not (isblank #"#")) True "isblank 7"}
-	{test_fn_both_sides (fn _ => isblank #" ") True "isblank 8"}
-	{test_fn_both_sides (fn _ => isblank #"\t") True "isblank 9"}
-	{test_fn_both_sides (fn _ => not (isblank #"\n")) True "isblank 10"}
+      <body onload={r <- rpc (isblanksserver ());
+		    set t (Some r);
+		    return ()}>
+		<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      	{test_fn_both_sides2 isblank1 t'.T1 True "isblank 1"}
+						{test_fn_both_sides2 isblank2 t'.T2 True "isblank 2"}
+						{test_fn_both_sides2 isblank3 t'.T3 True "isblank 3"}
+						{test_fn_both_sides2 isblank4 t'.T4 True "isblank 4"}
+						{test_fn_both_sides2 isblank5 t'.T5 True "isblank 5"}
+						{test_fn_both_sides2 isblank6 t'.T6 True "isblank 6"}
+						{test_fn_both_sides2 isblank7 t'.T7 True "isblank 7"}
+						{test_fn_both_sides2 isblank8 t'.T8 True "isblank 8"}
+						{test_fn_both_sides2 isblank9 t'.T9 True "isblank 9"}
+						{test_fn_both_sides2 isblank10 t'.T10 True "isblank 10"}			      	    
+					    </xml>
+		    } />
+	
       </body>
-    </xml>
+		</xml>
+
+(* iscntrls *)
+fun iscntrl1 _ = not (iscntrl #"a")
+fun iscntrl2 _ = not (iscntrl (strsub "à" 0))
+fun iscntrl3 _ = not (iscntrl #"A")
+fun iscntrl4 _ = not (iscntrl (strsub "À" 0))
+fun iscntrl5 _ = not (iscntrl #"1")
+fun iscntrl6 _ = not (iscntrl #"!")
+fun iscntrl7 _ = not (iscntrl #"#")
+fun iscntrl8 _ = not (iscntrl #" ")
+fun iscntrl9 _ = iscntrl #"\t"
+fun iscntrl10 _ = iscntrl #"\n"
 
 fun iscntrls () : transaction page =
     return <xml>
       <body>
-	{test_fn_sside (fn _ => not (iscntrl #"a")) True "iscntrl 1"}
-	{test_fn_sside (fn _ => not (iscntrl (strsub "à" 0))) True "iscntrl 2"}
-	{test_fn_sside (fn _ => not (iscntrl #"A")) True "iscntrl 3"}
-	{test_fn_sside (fn _ => not (iscntrl (strsub "À" 0))) True "iscntrl 4"}
-	{test_fn_sside (fn _ => not (iscntrl #"1")) True "iscntrl 5"}
-	{test_fn_sside (fn _ => not (iscntrl #"!")) True "iscntrl 6"}
-	{test_fn_sside (fn _ => not (iscntrl #"#")) True "iscntrl 7"}
-	{test_fn_sside (fn _ => not (iscntrl #" ")) True "iscntrl 8"}
-	{test_fn_sside (fn _ => iscntrl #"\t") True "iscntrl 9"}
-	{test_fn_sside (fn _ => iscntrl #"\n") True "iscntrl 10"}
+	{test_fn_sside iscntrl1 True "iscntrl 1"}
+	{test_fn_sside iscntrl2 True "iscntrl 2"}
+	{test_fn_sside iscntrl3 True "iscntrl 3"}
+	{test_fn_sside iscntrl4 True "iscntrl 4"}
+	{test_fn_sside iscntrl5 True "iscntrl 5"}
+	{test_fn_sside iscntrl6 True "iscntrl 6"}
+	{test_fn_sside iscntrl7 True "iscntrl 7"}
+	{test_fn_sside iscntrl8 True "iscntrl 8"}
+	{test_fn_sside iscntrl9 True "iscntrl 9"}
+	{test_fn_sside iscntrl10 True "iscntrl 10"}
       </body>
-      </xml>
+    </xml>
+
+(* isdigits *)
+fun isdigit1 _ = not (isdigit #"a")
+fun isdigit2 _ = not (isdigit (strsub "à" 0))
+fun isdigit3 _ = not (isdigit #"A")
+fun isdigit4 _ = not (isdigit (strsub "À" 0))
+fun isdigit5 _ = isdigit #"1"
+fun isdigit6 _ = not (isdigit #"!")
+fun isdigit7 _ = not (isdigit #"#")
+fun isdigit8 _ = not (isdigit #" ")
+fun isdigit9 _ = not (isdigit #"\t")
+fun isdigit10 _ = not (isdigit #"\n")
 
+fun isdigitsserver _ =
+    return {
+    T1 = isdigit1 (),
+    T2 = isdigit2 (),
+    T3 = isdigit3 (),
+    T4 = isdigit4 (),
+    T5 = isdigit5 (),
+    T6 = isdigit6 (),
+    T7 = isdigit7 (),
+    T8 = isdigit8 (),
+    T9 = isdigit9 (),
+    T10 = isdigit10 ()
+    }
+    
 fun isdigits () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => not (isdigit #"a")) True "isdigit 1"}
-	{test_fn_both_sides (fn _ => not (isdigit (strsub "à" 0))) True "isdigit 2"}
-	{test_fn_both_sides (fn _ => not (isdigit #"A")) True "isdigit 3"}
-	{test_fn_both_sides (fn _ => not (isdigit (strsub "À" 0))) True "isdigit 4"}
-	{test_fn_both_sides (fn _ => isdigit #"1") True "isdigit 5"}
-	{test_fn_both_sides (fn _ => not (isdigit #"!")) True "isdigit 6"}
-	{test_fn_both_sides (fn _ => not (isdigit #"#")) True "isdigit 7"}
-	{test_fn_both_sides (fn _ => not (isdigit #" ")) True "isdigit 8"}
-	{test_fn_both_sides (fn _ => not (isdigit #"\t")) True "isdigit 9"}
-	{test_fn_both_sides (fn _ => not (isdigit #"\n")) True "isdigit 10"}
-      </body>
-    </xml>
+      <body onload={r <- rpc (isdigitsserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 isdigit1 t'.T1 True "isdigit 1"}
+					      {test_fn_both_sides2 isdigit2 t'.T2 True "isdigit 2"}
+					      {test_fn_both_sides2 isdigit3 t'.T3 True "isdigit 3"}
+					      {test_fn_both_sides2 isdigit4 t'.T4 True "isdigit 4"}
+					      {test_fn_both_sides2 isdigit5 t'.T5 True "isdigit 5"}
+					      {test_fn_both_sides2 isdigit6 t'.T6 True "isdigit 6"}
+					      {test_fn_both_sides2 isdigit7 t'.T7 True "isdigit 7"}
+					      {test_fn_both_sides2 isdigit8 t'.T8 True "isdigit 8"}
+					      {test_fn_both_sides2 isdigit9 t'.T9 True "isdigit 9"}
+					      {test_fn_both_sides2 isdigit10 t'.T10 True "isdigit 10"}		      	    
+					    </xml>
+		    } />
+		      
+
+		      </body>
+	</xml>
 
 fun isgraphs () : transaction page =
     return <xml>
@@ -374,169 +954,498 @@ fun isgraphs () : transaction page =
       </body>
     </xml>
 
+(* islowers *)
+fun islower1 _ = islower #"a"
+fun islower2 _ = islower (strsub "à" 0)
+fun islower3 _ = not (islower #"A")
+fun islower4 _ = not (islower (strsub "À" 0))
+fun islower5 _ = not (islower #"1")
+fun islower6 _ = not (islower #"!")
+fun islower7 _ = not (islower #"#")
+fun islower8 _ = not (islower #" ")
+fun islower9 _ = not (islower #"\t")
+fun islower10 _ = not (islower #"\n")
+
+fun islowersserver _ =
+    return {
+    T1 = islower1 (),
+    T2 = islower2 (),
+    T3 = islower3 (),
+    T4 = islower4 (),
+    T5 = islower5 (),
+    T6 = islower6 (),
+    T7 = islower7 (),
+    T8 = islower8 (),
+    T9 = islower9 (),
+    T10 = islower10 ()    
+    }
+    
 fun islowers () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => islower #"a") True "islower 1"}
-	{test_fn_both_sides (fn _ => islower (strsub "à" 0)) True "islower 2"}
-	{test_fn_both_sides (fn _ => not (islower #"A")) True "islower 3"}
-	{test_fn_both_sides (fn _ => not (islower (strsub "À" 0))) True "islower 4"}
-	{test_fn_both_sides (fn _ => not (islower #"1")) True "islower 5"}
-	{test_fn_both_sides (fn _ => not (islower #"!")) True "islower 6"}
-	{test_fn_both_sides (fn _ => not (islower #"#")) True "islower 7"}
-	{test_fn_both_sides (fn _ => not (islower #" ")) True "islower 8"}
-	{test_fn_both_sides (fn _ => not (islower #"\t")) True "islower 9"}
-	{test_fn_both_sides (fn _ => not (islower #"\n")) True "islower 10"}
+      <body onload={r <- rpc (islowersserver ());
+		    set t (Some r);
+		     return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 islower1 t'.T1 True "islower 1"}
+					      {test_fn_both_sides2 islower2 t'.T2 True "islower 2"}
+					      {test_fn_both_sides2 islower3 t'.T3 True "islower 3"}
+					      {test_fn_both_sides2 islower4 t'.T4 True "islower 4"}
+					      {test_fn_both_sides2 islower5 t'.T5 True "islower 5"}
+					      {test_fn_both_sides2 islower6 t'.T6 True "islower 6"}
+					      {test_fn_both_sides2 islower7 t'.T7 True "islower 7"}
+					      {test_fn_both_sides2 islower8 t'.T8 True "islower 8"}
+					      {test_fn_both_sides2 islower9 t'.T9 True "islower 9"}
+					      {test_fn_both_sides2 islower10 t'.T10 True "islower 10"}		      	    
+					    </xml>
+		    } />
       </body>
-      </xml>
+	</xml>
+
+(* isprint *)
+fun isprint1 _ = isprint #"a"
+fun isprint2 _ = isprint (strsub "à" 0)
+fun isprint3 _ = isprint #"A"
+fun isprint4 _ = isprint (strsub "À" 0)
+fun isprint5 _ = isprint #"1"
+fun isprint6 _ = isprint #"!"
+fun isprint7 _ = isprint #"#"
+fun isprint8 _ = isprint #" "
+fun isprint9 _ = not (isprint #"\t")
+fun isprint10 _ = not (isprint #"\n")
 
+fun isprintsserver _ = return {
+		     T1 = isprint1 (),
+		     T2 = isprint2 (),
+		     T3 = isprint3 (),
+		     T4 = isprint4 (),
+		     T5 = isprint5 (),
+		     T6 = isprint6 (),
+		     T7 = isprint7 (),
+		     T8 = isprint8 (),
+		     T9 = isprint9 (),
+		     T10 = isprint10 ()		     
+		     }
+		  
 fun isprints () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => isprint #"a") True "isprint 1"}
-	{test_fn_both_sides (fn _ => isprint (strsub "à" 0)) True "isprint 2"}
-	{test_fn_both_sides (fn _ => isprint #"A") True "isprint 3"}
-	{test_fn_both_sides (fn _ => isprint (strsub "À" 0)) True "isprint 4"}
-	{test_fn_both_sides (fn _ => isprint #"1") True "isprint 5"}
-	{test_fn_both_sides (fn _ => isprint #"!") True "isprint 6"}
-	{test_fn_both_sides (fn _ => isprint #"#") True "isprint 7"}
-	{test_fn_both_sides (fn _ => isprint #" ") True "isprint 8"}
-	{test_fn_both_sides (fn _ => not (isprint #"\t")) True "isprint 9"}
-	{test_fn_both_sides (fn _ => not (isprint #"\n")) True "isprint 10"}
-      </body>
-      </xml>
+      <body onload={r <- rpc (isprintsserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 isprint1 t'.T1 True "isprint 1"}
+					      {test_fn_both_sides2 isprint2 t'.T2 True "isprint 2"}
+					      {test_fn_both_sides2 isprint3 t'.T3 True "isprint 3"}
+					      {test_fn_both_sides2 isprint4 t'.T4 True "isprint 4"}
+					      {test_fn_both_sides2 isprint5 t'.T5 True "isprint 5"}
+					      {test_fn_both_sides2 isprint6 t'.T6 True "isprint 6"}
+					      {test_fn_both_sides2 isprint7 t'.T7 True "isprint 7"}
+					      {test_fn_both_sides2 isprint8 t'.T8 True "isprint 8"}
+					      {test_fn_both_sides2 isprint9 t'.T9 True "isprint 9"}
+					      {test_fn_both_sides2 isprint10 t'.T10 True "isprint 10"}	    
+					    </xml>
+		    } />
+		      </body>
+	</xml>
 
+(* ispunct *)
+fun ispunct1  _ = not (ispunct #"a")
+fun ispunct2  _ = not (ispunct (strsub "à" 0))
+fun ispunct3  _ = not (ispunct #"A")
+fun ispunct4  _ = not (ispunct (strsub "À" 0))
+fun ispunct5  _ = not (ispunct #"1")
+fun ispunct6  _ = ispunct #"!"
+fun ispunct7  _ = ispunct #"#"
+fun ispunct8  _ = not (ispunct #" ")
+fun ispunct9  _ = not (ispunct #"\t")
+fun ispunct10 _ = not (ispunct #"\n")
+	
 fun ispuncts () : transaction page =
     return <xml>
-      <body>
-	{test_fn_sside (fn _ => not (ispunct #"a")) True "ispunct 1"}
-	{test_fn_sside (fn _ => not (ispunct (strsub "à" 0))) True "ispunct 2"}
-	{test_fn_sside (fn _ => not (ispunct #"A")) True "ispunct 3"}
-	{test_fn_sside (fn _ => not (ispunct (strsub "À" 0))) True "ispunct 4"}
-	{test_fn_sside (fn _ => not (ispunct #"1")) True "ispunct 5"}
-	{test_fn_sside (fn _ => ispunct #"!") True "ispunct 6"}
-	{test_fn_sside (fn _ => ispunct #"#") True "ispunct 7"}
-	{test_fn_sside (fn _ => not (ispunct #" ")) True "ispunct 8"}
-	{test_fn_sside (fn _ => not (isprint #"\t")) True "ispunct 9"}
-	{test_fn_sside (fn _ => not (isprint #"\n")) True "ispunct 10"}
+      <body>		
+	{test_fn_sside ispunct1 True "ispunct 1"}
+	{test_fn_sside ispunct2 True "ispunct 2"}
+	{test_fn_sside ispunct3 True "ispunct 3"}
+	{test_fn_sside ispunct4 True "ispunct 4"}
+	{test_fn_sside ispunct5 True "ispunct 5"}
+	{test_fn_sside ispunct6 True "ispunct 6"}
+	{test_fn_sside ispunct7 True "ispunct 7"}
+	{test_fn_sside ispunct8 True "ispunct 8"}
+	{test_fn_sside ispunct9 True "ispunct 9"}
+	{test_fn_sside ispunct10 True "ispunct 10"}
       </body>
-      </xml>
+    </xml>
+
+(* isspace *)
+fun isspace1 _ = not (isspace #"a")
+fun isspace2 _ = not (isspace (strsub "à" 0))
+fun isspace3 _ = not (isspace #"A")
+fun isspace4 _ = not (isspace (strsub "À" 0))
+fun isspace5 _ = not (isspace #"1")
+fun isspace6 _ = not (isspace #"!")
+fun isspace7 _ = not (isspace #"#")
+fun isspace8 _ = isspace #" "
+fun isspace9 _ = isspace #"\t"
+fun isspace10 _ = isspace #"\n"
 
+fun isspacesserver _ =
+    return {
+    T1 = isspace1 (),
+    T2 = isspace2 (),
+    T3 = isspace3 (),
+    T4 = isspace4 (),
+    T5 = isspace5 (),
+    T6 = isspace6 (),
+    T7 = isspace7 (),
+    T8 = isspace8 (),
+    T9 = isspace9 (),
+    T10 = isspace10 ()
+    }
+		  
 fun isspaces () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => not (isspace #"a")) True "isspace 1"}
-	{test_fn_both_sides (fn _ => not (isspace (strsub "à" 0))) True "isspace 2"}
-	{test_fn_both_sides (fn _ => not (isspace #"A")) True "isspace 3"}
-	{test_fn_both_sides (fn _ => not (isspace (strsub "À" 0))) True "isspace 4"}
-	{test_fn_both_sides (fn _ => not (isspace #"1")) True "isspace 5"}
-	{test_fn_both_sides (fn _ => not (isspace #"!")) True "isspace 6"}
-	{test_fn_both_sides (fn _ => not (isspace #"#")) True "isspace 7"}
-	{test_fn_both_sides (fn _ => isspace #" ") True "isspace 8"}
-	{test_fn_both_sides (fn _ => isspace #"\t") True "isspace 9"}
-	{test_fn_both_sides (fn _ => isspace #"\n") True "isspace 10"}
+      <body onload={r <- rpc (isspacesserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 isspace1 t'.T1 True "isspace 1"}
+					      {test_fn_both_sides2 isspace2 t'.T2 True "isspace 2"}
+					      {test_fn_both_sides2 isspace3 t'.T3 True "isspace 3"}
+					      {test_fn_both_sides2 isspace4 t'.T4 True "isspace 4"}
+					      {test_fn_both_sides2 isspace5 t'.T5 True "isspace 5"}
+					      {test_fn_both_sides2 isspace6 t'.T6 True "isspace 6"}
+					      {test_fn_both_sides2 isspace7 t'.T7 True "isspace 7"}
+					      {test_fn_both_sides2 isspace8 t'.T8 True "isspace 8"}
+					      {test_fn_both_sides2 isspace9 t'.T9 True "isspace 9"}
+					      {test_fn_both_sides2 isspace10 t'.T10 True "isspace 10"}
+					    </xml>
+		    } />
+
       </body>
-    </xml>
-    
+	</xml>
+
+(* isupper *)
+fun isupper1 _ = not (isupper #"a")
+fun isupper2 _ = not (isupper (strsub "à" 0))
+fun isupper3 _ = isupper #"A"
+fun isupper4 _ = isupper (strsub "À" 0)
+fun isupper5 _ = not (isupper #"1")
+fun isupper6 _ = not (isupper #"!")
+fun isupper7 _ = not (isupper #"#")
+fun isupper8 _ = not (isupper #" ")
+fun isupper9 _ = not (isupper #"\t")
+fun isupper10 _ = not (isupper #"\n")
+
+fun isuppersserver _ =
+    return {
+    T1 = isupper1 (),
+    T2 = isupper2 (),
+    T3 = isupper3 (),
+    T4 = isupper4 (),
+    T5 = isupper5 (),
+    T6 = isupper6 (),
+    T7 = isupper7 (),
+    T8 = isupper8 (),
+    T9 = isupper9 (),
+    T10 = isupper10 ()
+    }
+	
 fun isuppers () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => not (isupper #"a")) True "isupper 1"}
-	{test_fn_both_sides (fn _ => not (isupper (strsub "à" 0))) True "isupper 2"}
-	{test_fn_both_sides (fn _ => isupper #"A") True "isupper 3"}
-	{test_fn_both_sides (fn _ => isupper (strsub "À" 0)) True "isupper 4"}
-	{test_fn_both_sides (fn _ => not (isupper #"1")) True "isupper 5"}
-	{test_fn_both_sides (fn _ => not (isupper #"!")) True "isupper 6"}
-	{test_fn_both_sides (fn _ => not (isupper #"#")) True "isupper 7"}
-	{test_fn_both_sides (fn _ => not (isupper #" ")) True "isupper 8"}
-	{test_fn_both_sides (fn _ => not (isupper #"\t")) True "isupper 9"}
-	{test_fn_both_sides (fn _ => not (isupper #"\n")) True "isupper 10"}
-      </body>
-      </xml>
+      <body onload={r <- rpc (isuppersserver ());
+		     set t (Some r);
+		     return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 isupper1 t'.T1 True "isupper 1"}
+					      {test_fn_both_sides2 isupper2 t'.T2 True "isupper 2"}
+					      {test_fn_both_sides2 isupper3 t'.T3 True "isupper 3"}
+					      {test_fn_both_sides2 isupper4 t'.T4 True "isupper 4"}
+					      {test_fn_both_sides2 isupper5 t'.T5 True "isupper 5"}
+					      {test_fn_both_sides2 isupper6 t'.T6 True "isupper 6"}
+					      {test_fn_both_sides2 isupper7 t'.T7 True "isupper 7"}
+					      {test_fn_both_sides2 isupper8 t'.T8 True "isupper 8"}
+					      {test_fn_both_sides2 isupper9 t'.T9 True "isupper 9"}
+					      {test_fn_both_sides2 isupper10 t'.T10 True "isupper 10"}
+					    </xml>
+		    } />
 
+		      </body>
+	</xml>
+
+(* isxdigit *)
+fun isxdigit1 _ = isxdigit #"a"
+fun isxdigit2 _ = not (isxdigit (strsub "à" 0))
+fun isxdigit3 _ = isxdigit #"A"
+fun isxdigit4 _ = not (isxdigit (strsub "À" 0))
+fun isxdigit5 _ = isxdigit #"1"
+fun isxdigit6 _ = not (isxdigit #"!")
+fun isxdigit7 _ = not (isxdigit #"#")
+fun isxdigit8 _ = not (isxdigit #" ")
+fun isxdigit9 _ = not (isxdigit #"\t")
+fun isxdigit10 _ = not (isxdigit #"\n")
+
+fun isxdigitsserver _ =
+    return {
+    T1 = isxdigit1 (),
+    T2 = isxdigit2 (),
+    T3 = isxdigit3 (),
+    T4 = isxdigit4 (),
+    T5 = isxdigit5 (),
+    T6 = isxdigit6 (),
+    T7 = isxdigit7 (),
+    T8 = isxdigit8 (),
+    T9 = isxdigit9 (),
+    T10 = isxdigit10 ()
+    }
+		   
 fun isxdigits () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => isxdigit #"a") True "isxdigit 1"}
-	{test_fn_both_sides (fn _ => not (isxdigit (strsub "à" 0))) True "isxdigit 2"}
-	{test_fn_both_sides (fn _ => isxdigit #"A") True "isxdigit 3"}
-	{test_fn_both_sides (fn _ => not (isxdigit (strsub "À" 0))) True "isxdigit 4"}
-	{test_fn_both_sides (fn _ => isxdigit #"1") True "isxdigit 5"}
-	{test_fn_both_sides (fn _ => not (isxdigit #"!")) True "isxdigit 6"}
-	{test_fn_both_sides (fn _ => not (isxdigit #"#")) True "isxdigit 7"}
-	{test_fn_both_sides (fn _ => not (isxdigit #" ")) True "isxdigit 8"}
-	{test_fn_both_sides (fn _ => not (isxdigit #"\t")) True "isxdigit 9"}
-	{test_fn_both_sides (fn _ => not (isxdigit #"\n")) True "isxdigit 10"}
+      <body onload={r <- rpc (isxdigitsserver ());
+		     set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 isxdigit1 t'.T1 True "isxdigit 1"}
+					      {test_fn_both_sides2 isxdigit2 t'.T2 True "isxdigit 2"}
+					      {test_fn_both_sides2 isxdigit3 t'.T3 True "isxdigit 3"}
+					      {test_fn_both_sides2 isxdigit4 t'.T4 True "isxdigit 4"}
+					      {test_fn_both_sides2 isxdigit5 t'.T5 True "isxdigit 5"}
+					      {test_fn_both_sides2 isxdigit6 t'.T6 True "isxdigit 6"}
+					      {test_fn_both_sides2 isxdigit7 t'.T7 True "isxdigit 7"}
+					      {test_fn_both_sides2 isxdigit8 t'.T8 True "isxdigit 8"}
+					      {test_fn_both_sides2 isxdigit9 t'.T9 True "isxdigit 9"}
+					      {test_fn_both_sides2 isxdigit10 t'.T10 True "isxdigit 10"}					    
+					    </xml>
+		    } />
+
       </body>
-      </xml>
+	</xml>
+
+(* tolower *)
+
+fun tolower1 _ = tolower #"A"
+fun tolower2 _ = tolower #"a"
+fun tolower3 _ = tolower (strsub "á" 0)
+fun tolower4 _ = tolower (strsub "Á" 0)
+fun tolower5 _ = tolower #"1"
+fun tolower6 _ = tolower (strsub "ß" 0)
+
+fun tolowersserver _ =
+    return {
+    T1 = tolower1 (),
+    T2 = tolower2 (),
+    T3 = tolower3 (),
+    T4 = tolower4 (),
+    T5 = tolower5 (),
+    T6 = tolower6 ()
+    }
 
 fun tolowers () : transaction page =
-    let
-	fun lower_of a _ =
-	    tolower a
-    in
-	return <xml>
-	  <body>
-	    {test_fn_both_sides (lower_of #"A") #"a" "tolower 1"}
-	    {test_fn_both_sides (lower_of #"a") #"a" "tolower 2"}
-	    {test_fn_both_sides (lower_of (strsub "á" 0)) (strsub "á" 0) "tolower 3"}
-	    {test_fn_both_sides (lower_of (strsub "Á" 0)) (strsub "á" 0) "tolower 4"}
-	    {test_fn_both_sides (lower_of #"1") #"1" "tolower 5"}
-	    {test_fn_cside (lower_of (strsub "ß" 0)) (lower_of (strsub "ß" 0) ()) "tolower 6"}
-	  </body>
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (tolowersserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 tolower1 t'.T1 #"a" "tolower 1"}
+					      {test_fn_both_sides2 tolower2 t'.T2 #"a" "tolower 2"}
+					      {test_fn_both_sides2 tolower3 t'.T3 (strsub "á" 0) "tolower 3"}
+					      {test_fn_both_sides2 tolower4 t'.T4 (strsub "á" 0) "tolower 4"}
+					      {test_fn_both_sides2 tolower5 t'.T5 #"1" "tolower 5"}
+					      {test_fn_both_sides2 tolower6 t'.T6 (strsub "ß" 0) "tolower 6"}
+					      
+					    </xml>
+		    } />
+
+		      </body>
 	</xml>
-    end
-    
+
+(* toupper *)    
+fun toupper1 _ = toupper #"A"
+fun toupper2 _ = toupper #"a"
+fun toupper3 _ = toupper (strsub "á" 0)
+fun toupper4 _ = toupper (strsub "Á" 0)
+fun toupper5 _ = toupper #"1"
+fun toupper6 _ = toupper (strsub "ß" 0)
+
+fun touppersserver _ =
+    return {
+    T1 = toupper1 (),
+    T2 = toupper2 (),
+    T3 = toupper3 (),
+    T4 = toupper4 (),
+    T5 = toupper5 (),
+    T6 = toupper6 ()
+    }
+
 fun touppers () : transaction page =
-    let
-	fun upper_of a _ =
-	    toupper a
-    in
-	return <xml>
-	  <body>
-	    {test_fn_both_sides (upper_of #"A") #"A" "toupper 1"}
-	    {test_fn_both_sides (upper_of #"a") #"A" "toupper 2"}
-	    {test_fn_both_sides (upper_of (strsub "á" 0)) (strsub "Á" 0) "toupper 3"}
-	    {test_fn_both_sides (upper_of (strsub "Á" 0)) (strsub "Á" 0) "toupper 4"}
-	    {test_fn_both_sides (upper_of #"1") #"1" "toupper 5"}
-	    
-	    {test_fn_cside (upper_of (strsub "ß" 0)) (upper_of (strsub "ß" 0) ()) "toupper 6"}
-	  </body>
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (touppersserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_both_sides2 toupper1 t'.T1 #"A" "toupper 1"}
+					      {test_fn_both_sides2 toupper2 t'.T2 #"A" "toupper 2"}
+					      {test_fn_both_sides2 toupper3 t'.T3 (strsub "Á" 0) "toupper 3"}
+					      {test_fn_both_sides2 toupper4 t'.T4 (strsub "Á" 0) "toupper 4"}
+					      {test_fn_both_sides2 toupper5 t'.T5 #"1" "toupper 5"}
+					      {test_fn_both_sides2 toupper6 t'.T6 (strsub "ß" 0) "toupper 6"}
+					      
+					    </xml>
+		    } />
+
+		      </body>
 	</xml>
-    end
     
+(* ord and chr*)
+fun ordchr1 _ = chr (ord #"A")
+fun ordchr2 _ = chr (ord #"a")
+fun ordchr3 _ = chr (ord (strsub "á" 0))
+fun ordchr4 _ = chr (ord (strsub "Á" 0))
+fun ordchr5 _ = chr (ord #"1")
+fun ordchr6 _ = chr (ord #"\n")
+fun ordchr7 _ = chr (ord (strsub "が" 0))
+fun ordchr8 _ = chr (ord (strsub "漢" 0))
+fun ordchr9 _ = chr (ord (strsub "カ" 0))
+
+fun ordchrsserver _ = return {
+		      T1 = ordchr1 (),
+		      T2 = ordchr2 (),
+		      T3 = ordchr3 (),
+		      T4 = ordchr4 (),
+		      T5 = ordchr5 (),
+		      T6 = ordchr6 (),
+		      T7 = ordchr7 (),
+		      T8 = ordchr8 (),
+		      T9 = ordchr9 ()
+		      }
+		
 fun ord_and_chrs () : transaction page =
+    t <- source None;
     return <xml>
-      <body>
-	{test_fn_both_sides (fn _ => chr (ord #"A")) #"A" "ord => chr 1"}
-	{test_fn_both_sides (fn _ => chr (ord #"a")) #"a" "ord => chr 2"}
-	{test_fn_both_sides (fn _ => chr (ord (strsub "á" 0))) (strsub "á" 0) "ord => chr 3"}
-	{test_fn_both_sides (fn _ => chr (ord (strsub "Á" 0))) (strsub "Á" 0) "ord => chr 4"}
-	{test_fn_both_sides (fn _ => chr (ord #"1")) #"1" "ord => chr 5"}
-	{test_fn_both_sides (fn _ => chr (ord #"\n")) #"\n" "ord => chr 6"}
-	{test_fn_both_sides (fn _ => chr (ord (strsub "が" 0))) (strsub "が" 0) "ord => chr 7"}
-	{test_fn_both_sides (fn _ => chr (ord (strsub "漢" 0))) (strsub "漢" 0) "ord => chr 8"}
-	{test_fn_both_sides (fn _ => chr (ord (strsub "カ" 0))) (strsub "カ" 0) "ord => chr 9"}	
+      <body onload={r <- rpc (ordchrsserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      
+					      {test_fn_both_sides2 ordchr1 t'.T1 #"A" "ord => chr 1"}
+					      {test_fn_both_sides2 ordchr2 t'.T2 #"a" "ord => chr 2"}
+					      {test_fn_both_sides2 ordchr3 t'.T3 (strsub "á" 0) "ord => chr 3"}
+					      {test_fn_both_sides2 ordchr4 t'.T4 (strsub "Á" 0) "ord => chr 4"}
+					      {test_fn_both_sides2 ordchr5 t'.T5 #"1" "ord => chr 5"}
+					      {test_fn_both_sides2 ordchr6 t'.T6 #"\n" "ord => chr 6"}
+					      {test_fn_both_sides2 ordchr7 t'.T7 (strsub "が" 0) "ord => chr 7"}
+					      {test_fn_both_sides2 ordchr8 t'.T8 (strsub "漢" 0) "ord => chr 8"}
+					      {test_fn_both_sides2 ordchr9 t'.T9 (strsub "カ" 0) "ord => chr 9"}	
+					    </xml>
+		    } />
       </body>
     </xml>
 
+(* ord *)
+fun ord1 _ = ord #"a"
+fun ord2 _ = ord (strsub "á" 0)
+fun ord3 _ = ord #"5"
+fun ord4 _ = ord (strsub "が" 0)
+fun ord5 _ = ord (strsub "漢" 0)
+fun ord6 _ = ord (strsub "カ" 0)
+
+fun ordsserver _ =
+    return {
+    T1 = ord1 (),
+    T2 = ord2 (),
+    T3 = ord3 (),
+    T4 = ord4 (),
+    T5 = ord5 (),
+    T6 = ord6 ()
+    }
+	     
 fun test_ords () : transaction page =
+    t <- source None;
+    return <xml>
+      <body onload={r <- rpc (ordsserver ());
+		    set t (Some r);
+		    return ()}>
+	<dyn signal={r <- signal t; case r of None => return <xml></xml>
+					    | Some t' => return <xml>
+					      {test_fn_cside ord1 t'.T1 "test ord 1"}
+					      {test_fn_cside ord2 t'.T2 "test ord 2"}
+					      {test_fn_cside ord3 t'.T3 "test ord 3"}
+					      {test_fn_cside ord4 t'.T4 "test ord 4"}
+					      {test_fn_cside ord5 t'.T5 "test ord 5"}
+					      {test_fn_cside ord6 t'.T6 "test ord 6"}
+					    </xml>
+		    } />
+      </body>
+    </xml>
+
+    
+    
+and test_post () : transaction page =
     let
-	fun ord_of c _ =
-	    ord c
+	fun test_post_cb r =
+	    return <xml>
+	      <body>
+		<pre>
+		  {[r.T1]}
+		</pre>
+		<pre>
+		  {[r.T2]}
+		</pre>
+		<pre>
+		  {[r.T3]}
+		</pre>
+		<pre>
+		  {[r.T4]}
+		</pre>
+		<pre>
+		  {[r.T5]}
+		</pre>
+		<pre>
+		  {[r.T6]}
+		</pre>
+		<pre>
+		  {[r.T7]}
+		</pre>
+	      </body>
+	    </xml>
+
     in
+	t1 <- source "";
+	t2 <- source "aco";
+	t3 <- source "áçõ";
+	t4 <- source "が";
+	t5 <- source "𝌆𝌇𝌈𝌉";
+	t6 <- source "Функциональное";
+	t7 <- source "وظيفية";
 	return <xml>
 	  <body>
-	    {test_fn_cside (ord_of (strsub "a" 0)) (ord_of (strsub "a" 0) ()) "test ord 1"}
-	    {test_fn_cside (ord_of (strsub "á" 0)) (ord_of (strsub "á" 0) ()) "test ord 2"}
-	    {test_fn_cside (ord_of (strsub "5" 0)) (ord_of (strsub "5" 0) ()) "test ord 3"}
-	    {test_fn_cside (ord_of (strsub "が" 0)) (ord_of (strsub "が" 0) ()) "test ord 4"}
-	    {test_fn_cside (ord_of (strsub "漢" 0)) (ord_of (strsub "漢" 0) ()) "test ord 5"}
-	    {test_fn_cside (ord_of (strsub "カ" 0)) (ord_of (strsub "カ" 0) ()) "test ord 6"}
+	    <form>
+	      <textbox{#T1} source={t1} />
+	      <textbox{#T2} source={t2} />
+	      <textbox{#T3} source={t3} />
+	      <textbox{#T4} source={t4} />
+	      <textbox{#T5} source={t5} />
+	      <textbox{#T6} source={t6} />
+	      <textbox{#T7} source={t7} />
+	      <submit action={test_post_cb} value="submit" />
+	    </form>
 	  </body>
 	</xml>
     end
-    
+
 table t : { Id : int, Text : string }
 
 fun test_db () : transaction page =
@@ -790,5 +1699,6 @@ fun index () : transaction page =
 	<a link={test_ords ()}>test ord</a>
 	<a link={highencode ()}>highencode</a>
 	<a link={test_db ()}>test_db</a>
+	<a link={test_post ()}>test_post</a>
       </body>
       </xml>
diff --git a/tests/utf8.urp b/tests/utf8.urp
index 25288aa8..74fcb1c2 100644
--- a/tests/utf8.urp
+++ b/tests/utf8.urp
@@ -1,6 +1,7 @@
 database dbname=utf8
 sql utf8.sql
 safeGet Utf8/test_db
+serverOnly Utf8.generateTests
 
 $/option
 utf8
\ No newline at end of file