counter.ur

4bdcb4911815b9e206a48c843022a284d9c61de6 · ovidiucs · Jan 6, 2016 21:56

+21 −15 · 2 files changed

demo/counter.ur +20 −15
demo/counter.urp +1 −0

diff --git a/demo/counter.ur b/demo/counter.ur
index 032a52c..3e31acd 100644
--- a/demo/counter.ur
+++ b/demo/counter.ur
@@ -1,18 +1,23 @@
 (* Workhorse function, which [main] will call *)
-fun counter n = return <xml><body>
+fun counter' n = <xml>
   Current counter: {[n]}<br/>
   <a link={counter (n + 1)}>Increment</a><br/>
-  <a link={counter (n - 1)}>Decrement</a>
-</body></xml>
-(*
-fun square x = return <xml><body>
-  Current value: {[x]}<br/>
-  <a link={square (x * x)}>Square</a><br/>
-</body></xml>
- *)
-fun acounter z = return <xml><body>
-  Current acounter: {[z]}<br/>
-  <a link={acounter (z + 1)}>Increment</a><br/>
-  <a link={acounter (z - 1)}>Decrement</a>
-</body></xml>
-fun main () =  counter (0)
+  <a link={counter (n - 1)}>Decrement</a><br/>
+</xml>
+and square' z = <xml>
+  Current value: {[z]}<br/>
+  <a link={square (z * 2)}>Square</a><br/>
+</xml>
+and divide' p = <xml>
+  Current value = {[p]}<br/>
+  <a link={divide (p / 2)}>Divide</a><br/>
+</xml>
+and counter n = return <xml><body>{counter' n}</body></xml>
+
+and square z = return <xml><body>{square' z}</body></xml>
+
+and divide p = return <xml><body>{divide' p}</body></xml>
+
+
+fun main () = return <xml><body>{counter' 0}{square' 2}{divide' 100}{url} </body></xml>
+
diff --git a/demo/counter.urp b/demo/counter.urp
index e64bdbf..6c4de18 100644
--- a/demo/counter.urp
+++ b/demo/counter.urp
@@ -1 +1,2 @@
 counter
+url