From 581a2290590268039cacfbe0762b343f710c3116 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Sat, 30 May 2009 09:59:10 -0400
Subject: String.length

---
 lib/js/urweb.js   | 6 +++---
 lib/ur/basis.urs  | 1 +
 lib/ur/string.ur  | 3 +++
 lib/ur/string.urs | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/js/urweb.js b/lib/js/urweb.js
index 40b170c4..db3c934c 100644
--- a/lib/js/urweb.js
+++ b/lib/js/urweb.js
@@ -237,7 +237,6 @@ function setHTML(html) {
   x.innerHTML = html;
   addNode(x);
   runScripts(x);
-  alert("HTML:\n" + html);
 }  
 
 var thisScript = null;
@@ -351,8 +350,9 @@ function eh(x) {
 function ts(x) { return x.toString() }
 function bs(b) { return (b ? "True" : "False") }
 
-function sub(x, i) { return x[i]; }
-function suf(x, i) { return x.substring(i); }
+function sub(s, i) { return s[i]; }
+function suf(s, i) { return s.substring(i); }
+function slen(s) { return s.length; }
 
 function pi(s) {
   var r = parseInt(s);
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs
index 1209d265..c63c5ed4 100644
--- a/lib/ur/basis.urs
+++ b/lib/ur/basis.urs
@@ -53,6 +53,7 @@ val ord_time : ord time
 
 (** String operations *)
 
+val strlen : string -> int
 val strcat : string -> string -> string
 val strsub : string -> int -> char
 val strsuffix : string -> int -> string
diff --git a/lib/ur/string.ur b/lib/ur/string.ur
index 5362805b..23670966 100644
--- a/lib/ur/string.ur
+++ b/lib/ur/string.ur
@@ -1,4 +1,7 @@
 type t = Basis.string
 
+val length = Basis.strlen
+val append = Basis.strcat
+
 val sub = Basis.strsub
 val suffix = Basis.strsuffix
diff --git a/lib/ur/string.urs b/lib/ur/string.urs
index 524e002d..ef522387 100644
--- a/lib/ur/string.urs
+++ b/lib/ur/string.urs
@@ -1,4 +1,8 @@
 type t = string
 
+val length : t -> int
+
+val append : t -> t -> t
+
 val sub : t -> int -> char
 val suffix : t -> int -> string
-- 
cgit v1.2.3