Changeset 3e8ff1e

Timestamp:

Jul 15, 2009, 11:03:48 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

a52d13a

Parents:

72ab15f

git-author:

Nelson Elhage <nelhage@mit.edu> (07/12/09 21:45:00)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/15/09 23:03:48)

Message:

Implement owl_text_expand_tabs, and tests.

Files:

• tester.c (modified) (1 diff)
• text.c (modified) (1 diff)
• util.c (modified) (1 diff)

tester.c

@@ -7 +7 @@
 owl_global g;
 
-#define OWL_UTIL_NTESTS  6
+#define OWL_UTIL_NTESTS  9
 #define OWL_DICT_NTESTS  19
 #define OWL_OBARRAY_NTESTS  6

text.c

@@ -125 +125 @@
 
   return(out2);
+}
+
+#define OWL_TAB_WIDTH 8
+
+/* Caller must free return */
+char *owl_text_expand_tabs(char *in)
+{
+  int ntabs = 0;
+  char *p = in;
+  char *ret, *out;
+  int col;
+
+  while(*p) {
+    if (*(p++) == '\t') ntabs++;
+  }
+
+  ret = owl_malloc(strlen(in) + 1 + OWL_TAB_WIDTH * ntabs);
+
+  p = in;
+  out = ret;
+
+  col = 0;
+  while(*p) {
+    switch(*p) {
+    case '\t':
+      do {*(out++) = ' '; col++; } while (col % OWL_TAB_WIDTH);
+      break;
+    case '\n':
+      col = -1;
+    default:
+      col++;
+      *(out++) = *p;
+    }
+    p++;
+  }
+
+  *out = 0;
+
+  return ret;
 }
 

util.c

@@ -789 +789 @@
               !strcmp("meep", skiptokens("foo 'bar quux' meep", 2)));
 
+  FAIL_UNLESS("expand_tabs 1",
+              !strcmp("        hi", owl_text_expand_tabs("\thi")));
+
+  FAIL_UNLESS("expand_tabs 2",
+              !strcmp("        hi\nword    tab", owl_text_expand_tabs("\thi\nword\ttab")));
+
+  FAIL_UNLESS("expand_tabs 3",
+              !strcmp("                2 tabs", owl_text_expand_tabs("\t\t2 tabs")));
+
   /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */
   printf("# END testing owl_util (%d failures)\n", numfailed);