update idlpp

ADLINK-IST · Mar 5, 2019 · ee3ea69 · ee3ea69
1 parent d057c8b
commit ee3ea69
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/src/cpp/code/include.c b/src/cpp/code/include.c
@@ -212,12 +212,12 @@ static void read_include_file (char * name, int dohere, int sharp)
    w = os_malloc(strlen(n) + +strlen(name) + 4);
    sprintf(w, "%s\" \"%s", n, name);
    out_at(!sharp, w);
-   os_free(w);
    autodef_file(n);
    autodef_line(1);
    Push('\n');
    Get();
-   push_new_file(n, f);
+   push_new_file(w, f);
+   os_free(w);
    cp = strrchr(n, CPP_FILESEPCHAR_1);
    if (!cp) {
        cp = strrchr(n, CPP_FILESEPCHAR_2);

diff --git a/src/tools/cppgen/code/idl.ll b/src/tools/cppgen/code/idl.ll
@@ -427,13 +427,17 @@ static void idl_parse_line_and_file (char *buf)
     if (idl_global->maintain_include_namespace())
     {
       for (r++; *r != '\0' && (*r == ' ' || *r == '\t'); r++);
-      l = ++r;
-      for (; *r != '"'; r++);
-      *r = '\0';
-      if (*l != '\0') {
+      if (*r == '"') {
+        l = ++r;
+        for (; (*r != '\0') && (*r != '"'); r++);
+        *r = '\0';
+        if (*l != '\0') {
           nm = new UTL_String (l);
-      } else {
+        } else {
           nm = new UTL_String(stripped_name (idl_global->filename ()));
+        }
+      } else {
+        nm = new UTL_String(stripped_name (idl_global->filename ()));
       }
     }
     else

diff --git a/src/tools/cppgen/code/lex_yy.cpp b/src/tools/cppgen/code/lex_yy.cpp
@@ -2808,13 +2808,17 @@ static void idl_parse_line_and_file (char *buf)
     if (idl_global->maintain_include_namespace())
     {
       for (r++; *r != '\0' && (*r == ' ' || *r == '\t'); r++);
-      l = ++r;
-      for (; *r != '"'; r++);
-      *r = '\0';
-      if (*l != '\0') {
+      if (*r == '"') {
+        l = ++r;
+        for (; (*r != '\0') && (*r != '"'); r++);
+        *r = '\0';
+        if (*l != '\0') {
           nm = new UTL_String (l);
-      } else {
+        } else {
           nm = new UTL_String(stripped_name (idl_global->filename ()));
+        }
+      } else {
+        nm = new UTL_String(stripped_name (idl_global->filename ()));
       }
     }
     else