sketched out cursor inerface a bit more

diff --git a/docs/Buf.Cursor.html b/docs/Buf.Cursor.html
index 0123ebb50a9f3cf31c4401cc2863abe619cddd49..eba0995b570dcb894bc322794d52b6958732cb66 100644 (file)
--- a/docs/Buf.Cursor.html
+++ b/docs/Buf.Cursor.html
@@ -49,6 +49,7 @@
 
 <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type"><a href="Buf.html#TYPEbuf">Buf.buf</a> -> int -> <a href="Buf.Cursor.html#TYPEcsr">csr</a></code></pre>
 <pre><span id="VALgoto"><span class="keyword">val</span> goto</span> : <code class="type"><a href="Buf.html#TYPEbuf">Buf.buf</a> -> <a href="Buf.Cursor.html#TYPEcsr">csr</a> -> int -> unit</code></pre>
+<pre><span id="VALgetc"><span class="keyword">val</span> getc</span> : <code class="type"><a href="Buf.html#TYPEbuf">Buf.buf</a> -> <a href="Buf.Cursor.html#TYPEcsr">csr</a> -> <a href="Rope.html#TYPErune">Rope.rune</a></code></pre>
 <pre><span id="VALnextc"><span class="keyword">val</span> nextc</span> : <code class="type"><a href="Buf.html#TYPEbuf">Buf.buf</a> -> <a href="Buf.Cursor.html#TYPEcsr">csr</a> -> unit</code></pre>
 <pre><span id="VALprevc"><span class="keyword">val</span> prevc</span> : <code class="type"><a href="Buf.html#TYPEbuf">Buf.buf</a> -> <a href="Buf.Cursor.html#TYPEcsr">csr</a> -> unit</code></pre>
 <pre><span id="VALnextln"><span class="keyword">val</span> nextln</span> : <code class="type"><a href="Buf.html#TYPEbuf">Buf.buf</a> -> <a href="Buf.Cursor.html#TYPEcsr">csr</a> -> unit</code></pre>

diff --git a/docs/index_values.html b/docs/index_values.html
index 5748025f66c091e33ce4063e1fd33dc19be40408..4ad49944e0c5477dd58af202c65ff1ddf9bc98c6 100644 (file)
--- a/docs/index_values.html
+++ b/docs/index_values.html
@@ -127,6 +127,8 @@
 <td></td></tr>
 <tr><td><a href="Rope.html#VALgetb">getb</a> [<a href="Rope.html">Rope</a>]</td>
 <td></td></tr>
+<tr><td><a href="Buf.Cursor.html#VALgetc">getc</a> [<a href="Buf.Cursor.html">Buf.Cursor</a>]</td>
+<td></td></tr>
 <tr><td><a href="Rope.html#VALgetc">getc</a> [<a href="Rope.html">Rope</a>]</td>
 <td></td></tr>
 <tr><td><a href="Rope.html#VALgets">gets</a> [<a href="Rope.html">Rope</a>]</td>

diff --git a/docs/type_Buf.Cursor.html b/docs/type_Buf.Cursor.html
index ca872d554e3357623afd74fcecf6b71ab81b89c6..0c8a7e4c1a2b303a437a419bcc0e7f51f916a546 100644 (file)
--- a/docs/type_Buf.Cursor.html
+++ b/docs/type_Buf.Cursor.html
@@ -21,6 +21,7 @@
 &nbsp;&nbsp;<span class="keyword">type</span>&nbsp;t&nbsp;=&nbsp;<span class="constructor">Buf</span>.<span class="constructor">Cursor</span>.csr<br>
 &nbsp;&nbsp;<span class="keyword">val</span>&nbsp;make&nbsp;:&nbsp;<span class="constructor">Buf</span>.buf&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;int&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Buf</span>.<span class="constructor">Cursor</span>.csr<br>
 &nbsp;&nbsp;<span class="keyword">val</span>&nbsp;goto&nbsp;:&nbsp;<span class="constructor">Buf</span>.buf&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Buf</span>.<span class="constructor">Cursor</span>.csr&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;int&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;unit<br>
+&nbsp;&nbsp;<span class="keyword">val</span>&nbsp;getc&nbsp;:&nbsp;<span class="constructor">Buf</span>.buf&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Buf</span>.<span class="constructor">Cursor</span>.csr&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Rope</span>.rune<br>
 &nbsp;&nbsp;<span class="keyword">val</span>&nbsp;nextc&nbsp;:&nbsp;<span class="constructor">Buf</span>.buf&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Buf</span>.<span class="constructor">Cursor</span>.csr&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;unit<br>
 &nbsp;&nbsp;<span class="keyword">val</span>&nbsp;prevc&nbsp;:&nbsp;<span class="constructor">Buf</span>.buf&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Buf</span>.<span class="constructor">Cursor</span>.csr&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;unit<br>
 &nbsp;&nbsp;<span class="keyword">val</span>&nbsp;nextln&nbsp;:&nbsp;<span class="constructor">Buf</span>.buf&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Buf</span>.<span class="constructor">Cursor</span>.csr&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;unit<br>

diff --git a/lib/buf.ml b/lib/buf.ml
index f2e6c7b10d72f44b73cc3c84966bf8d2e79c379e..fc71ccd8e2567e158293edfd86a51f0aad216a23 100644 (file)
--- a/lib/buf.ml
+++ b/lib/buf.ml
@@ -2,6 +2,7 @@ type buf = {
   path : string;
   rope : Rope.t
 }
+
 type t = buf
 
 let empty =
@@ -10,7 +11,7 @@ let empty =
 let load path =
   { path = path; rope = Rope.from_string (Misc.load_file path) }
 
-let rope buf =
+let rope buf = (* DELETEME *)
   buf.rope
 
 let iter_from fn buf i =

diff --git a/lib/buf.mli b/lib/buf.mli
index 6562edfcb92706e11f8ccbcb5b6a142f6e819eea..0aa7f06baca4fc6712f44715a385ef20ad1a5dfa 100644 (file)
--- a/lib/buf.mli
+++ b/lib/buf.mli
@@ -11,6 +11,11 @@ module Cursor : sig
   val make : buf -> int -> t
   val goto : buf -> t -> int -> unit
   val getc : buf -> t -> int
+  (*
+  val putc : buf -> t -> int -> unit
+  val gets : buf -> t -> string
+  val puts : buf -> t -> string -> unit
+  *)
   val nextc : buf -> t -> unit
   val prevc : buf -> t -> unit
   val nextln : buf -> t -> unit