Changeset aa4d31 in git for ppcc/adlib

Timestamp:

Feb 7, 2019, 1:18:27 PM (5 years ago)

Author:

Reimer Behrends <behrends@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

098784114c00a08a4d18cf392c0f2411aa0d007ed669f7b103e531e130535f2141dd1d77cfa31a81

Parents:

54b24c79febc0e79ee3f9c6a86b7c4d505c69a43

Message:

parallel preprocessor-related fixes.

Location:

ppcc/adlib

Files:

• config-defs.h (added)
• md5.cc (added)
• md5.h (added)
• md5block.h (added)
• os.cc (modified) (3 diffs)
• os.h (modified) (2 diffs)
• str.cc (modified) (2 diffs)
• test1.cc (modified) (1 diff)
• test2.cc (modified) (1 diff)
• test7.cc (added)

ppcc/adlib/os.cc

@@ -11 +11 @@
   if (fp == NULL)
     return NULL;
-  Str *result = new Str(1024);
+  StrArr *result = new StrArr();
   for (;;) {
     size_t nbytes = fread(buffer, 1, sizeof(buffer), fp);
     if (nbytes == 0)
       break;
-    result->add(buffer, nbytes);
-  }
-  return result;
+    result->add(new Str(buffer, nbytes));
+  }
+  return StrJoin(result, "");
 }
 
@@ -197 +197 @@
 }
 
-Str *Pwd() {
+Str *CurrentDir() {
 #ifdef PATH_MAX
   char *path = getcwd(NULL, PATH_MAX);
@@ -389 +389 @@
 }
 
+Str *AbsolutePath(Str *path) {
+  if (path->starts_with(PathSeparator)) {
+    return path->clone();
+  }
+  Str *result = CurrentDir();
+  return result->add(PathSeparator)->add(path);
+}
+
+Str *NormalizePath(Str *path) {
+  bool abs = path->starts_with(PathSeparator);
+  StrArr *parts = path->split(PathSeparator);
+  StrArr *result = new StrArr();
+  for (Int i = 0; i < parts->len(); i++) {
+    Str *part = parts->at(i);
+    if (part->eq("") || part->eq(".")) {
+      // do nothing
+    } else if (part->eq("..")) {
+      if (result->len() > 0)
+        result->pop();
+      else if (!abs)
+        result->add(part);
+    } else {
+      result->add(part);
+    }
+  }
+  if (abs)
+    return S(PathSeparator)->add(StrJoin(result, PathSeparator));
+  else
+    return StrJoin(result, PathSeparator);
+}
+
+Str *GetEnv(const char *name) {
+  char *result = getenv(name);
+  if (result)
+    return new Str(result);
+  else
+    return NULL;
+}
+
+Str *GetEnv(Str *name) {
+  return GetEnv(name->c_str());
+}
+
+Str *ProgramPath() {
+  Str *arg0 = new Str(ArgV[0]);
+  Str *result = arg0;
+  if (arg0) {
+    if (FileStat(result, true)) {
+      return NormalizePath(AbsolutePath(result));
+    }
+    if (!arg0->starts_with(PathSeparator)) {
+      Str *path = GetEnv("PATH");
+      StrArr *paths = path ? path->split(':') : A();
+      for (Int i = 0; i < paths->len(); i++) {
+        Str *p = paths->at(i)->clone();
+        p->add(PathSeparator);
+        p->add(arg0);
+        if (FileStat(p, true)) {
+          result = p;
+          break;
+        }
+      }
+    }
+  }
+  return result ? NormalizePath(AbsolutePath(result)) : result;
+}
+
 bool MakeDir(const char *path, bool recursive) {
   if (!recursive)

ppcc/adlib/os.h

@@ -32 +32 @@
 };
 
-Str *Pwd();
+Str *CurrentDir();
 bool ChDir(Str *path);
 bool ChDir(const char *path);
@@ -65 +65 @@
 Str *BaseName(Str *path);
 Str *FileExtension(Str *path);
+Str *AbsolutePath(Str *path);
+Str *NormalizePath(Str *path);
+Str *GetEnv(Str *name);
+Str *GetEnv(const char *name);
+
+Str *ProgramPath();
+
 bool MakeDir(Str *path, bool recursive = false);
 bool MakeDir(const char *path, bool recursive = false);

ppcc/adlib/str.cc

@@ -11 +11 @@
 
 StrArr *Str::split(const char *s, Int n) {
+  if (n == 1)
+    return split(s[0]);
   Arr<Int> *parts = new Arr<Int>();
   parts->add(-n);
@@ -96 +98 @@
   if (arr->len() == 0)
     return new Str();
-  Str *result = new Str(arr->len() * (n + 1));
+  Int len = (arr->len() - 1) * n;
+  for (Int i = 0; i < arr->len(); i++) {
+    len += arr->at(i)->len();
+  }
+  Str *result = new Str(len);
   result->add(arr->first());
   for (Int i = 1; i < arr->len(); i++) {
-    result->add(sep, n);
+    if (n >= 0)
+      result->add(sep, n);
     result->add(arr->at(i));
   }

ppcc/adlib/test1.cc

@@ -58 +58 @@
   Check(sum_tree(tree) * 2 == counter * (counter - 1),
       "stress test memory allocation");
+  Check(NormalizePath(S("/foo/x/../bar/./"))->eq("/foo/bar"), "normalize path");
+  Check(BaseName(ProgramPath())->eq("test1"), "program path");
 }

ppcc/adlib/test2.cc

@@ -22 +22 @@
   Check(ListFiles(".")->len() > 0, "reading directories");
   StrSet *files = new StrSet(ListFiles("adlib"));
-  files = new StrSet(ListFileTree(Pwd(), ListFilesRelative));
+  files = new StrSet(ListFileTree(CurrentDir(), ListFilesRelative));
   Check(files->contains(S(__FILE__)), "reading directories recursively");
 }