LPython changes for new libasr directory

Author: ubaidsk

grammar/asdl_py.py

@@ -5,7 +5,7 @@
 import sys
 import os
 
-sys.path.append("src/libasr")
+sys.path.append("src/libasr/src/libasr")
 import asdl
 
 products = []

src/bin/lpython.cpp

@@ -2261,9 +2261,9 @@ int main(int argc, char *argv[])
 #else
                     cmd += "llvm-dwarfdump --debug-line " + basename + ".out > ";
 #endif
-                    cmd += basename + "_ldd.txt && (cd src/libasr/src/libasr; ./dwarf_convert.py ../../"
-                        + basename + "_ldd.txt ../../" + basename + "_lines.txt ../../"
-                        + basename + "_lines.dat && ./dat_convert.py ../../"
+                    cmd += basename + "_ldd.txt && (cd src/libasr/src/libasr; ./dwarf_convert.py ../../../../"
+                        + basename + "_ldd.txt ../../../../" + basename + "_lines.txt ../../../../"
+                        + basename + "_lines.dat && ./dat_convert.py ../../../../"
                         + basename + "_lines.dat)";
                     int status = system(cmd.c_str());
                     if ( status != 0 ) {

src/lpython/utils.cpp

@@ -94,11 +94,11 @@ std::string get_runtime_library_header_dir()
         || endswith(dirname, "src\\bin")
         || endswith(dirname, "SRC\\BIN")) {
         // Development version
-        return dirname + "/../libasr/runtime";
+        return dirname + "/../libasr/src/libasr/runtime";
     } else if (endswith(dirname, "src/lpython/tests") ||
                endswith(to_lower(dirname), "src\\lpython\\tests")) {
         // CTest Tests
-        return dirname + "/../../libasr/runtime";
+        return dirname + "/../../libasr/src/libasr/runtime";
     } else {
         // Installed version
         return dirname + "/../share/lpython/lib/impure";