Changeset 7ba2ad4

Timestamp:

Sep 18, 2010, 3:17:27 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

b3b1b05

Parents:

4cf7b1b

git-author:

David Benjamin <davidben@mit.edu> (07/31/10 20:30:49)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 15:17:27)

Message:

Implement owl_fmtext_line_extents and add test case

Files:

• fmtext.c (modified) (1 diff)
• tester.c (modified) (2 diffs)

fmtext.c

@@ -597 +597 @@
 }
 
+/* Searches for line 'lineno' in 'f'. The returned range, [start,
+ * end), forms a half-open interval for the extent of the line. */
+void owl_fmtext_line_extents(const owl_fmtext *f, int lineno, int *o_start, int *o_end)
+{
+  int start, end;
+  char *newline;
+  for (start = 0; lineno > 0 && start < f->textlen; start++) {
+    if (f->textbuff[start] == '\n')
+      lineno--;
+  }
+  newline = strchr(f->textbuff + start, '\n');
+  /* Include the newline, if it is there. */
+  end = newline ? newline - f->textbuff + 1 : f->textlen;
+  if (o_start) *o_start = start;
+  if (o_end) *o_end = end;
+}
+
 const char *owl_fmtext_get_text(const owl_fmtext *f)
 {

tester.c

@@ -434 +434 @@
 int owl_fmtext_regtest(void) {
   int numfailed = 0;
+  int start, end;
   owl_fmtext fm1;
   owl_fmtext fm2;
@@ -557 +558 @@
   owl_regex_cleanup(&re);
 
+  /* Test owl_fmtext_line_extents. */
+  owl_fmtext_clear(&fm1);
+  owl_fmtext_append_normal(&fm1, "123\n456\n789");
+  owl_fmtext_line_extents(&fm1, 1, &start, &end);
+  FAIL_UNLESS("line contents",
+              !strncmp("456\n", owl_fmtext_get_text(&fm1)+start, end-start));
+  owl_fmtext_line_extents(&fm1, 2, &start, &end);
+  FAIL_UNLESS("point to end of buffer", end == owl_fmtext_num_bytes(&fm1));
+
   owl_fmtext_cleanup(&fm1);
   owl_fmtext_cleanup(&fm2);