Skip to content

Commit d67bb05

Browse files
ubaidskubaidsk
committed
Add all
1 parent 9dd1bae commit d67bb05

File tree

8 files changed

+29
-27
lines changed

8 files changed

+29
-27
lines changed

‎.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ CPackConfig.cmake
4040
CPackSourceConfig.cmake
4141
_CPack_Packages
4242
/CMakeSettings.json
43-
libasr/src/libasr/libasr.a.*
43+
src/libasr/src/libasr/libasr.a.*
4444

4545
## libraries
4646
*.a
@@ -56,10 +56,10 @@ lpython/ast/ast.py
5656
lpython/asr/asr.py
5757
src/lpython/ast.h
5858
src/lpython/asr.h
59-
libasr/src/libasr/asr.h
60-
libasr/src/libasr/wasm_visitor.h
61-
libasr/src/libasr/pass/intrinsic_function_registry_util.h
62-
libasr/src/libasr/config.h
59+
src/libasr/src/libasr/asr.h
60+
src/libasr/src/libasr/wasm_visitor.h
61+
src/libasr/src/libasr/pass/intrinsic_function_registry_util.h
62+
src/libasr/src/libasr/config.h
6363
share/jupyter/kernels/fortran/kernel.json
6464
share/jupyter/kernels/lpython/kernel.json
6565
src/runtime/*.o.empty.c

‎build0.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ ci/version.sh
88
# Generate a Python AST from Python.asdl (Python)
99
python grammar/asdl_py.py
1010
# Generate a Python AST from Python.asdl (C++)
11-
python libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
11+
python src/libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
1212
# Generate a Fortran ASR from ASR.asdl (C++)
13-
python libasr/src/libasr/asdl_cpp.py libasr/src/libasr/ASR.asdl libasr/src/libasr/asr.h
14-
# Generate a wasm_visitor.h from libasr/src/libasr/wasm_instructions.txt (C++)
15-
python libasr/src/libasr/wasm_instructions_visitor.py
13+
python src/libasr/src/libasr/asdl_cpp.py src/libasr/src/libasr/ASR.asdl src/libasr/src/libasr/asr.h
14+
# Generate a wasm_visitor.h from src/libasr/src/libasr/wasm_instructions.txt (C++)
15+
python src/libasr/src/libasr/wasm_instructions_visitor.py
1616
# Generate the intrinsic_function_registry_util.h (C++)
17-
python libasr/src/libasr/intrinsic_func_registry_util_gen.py
17+
python src/libasr/src/libasr/intrinsic_func_registry_util_gen.py
1818

1919
# Generate the tokenizer and parser
2020
(cd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp)

‎build0_win.xsh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ echo @(version) > version
77
# Generate a Python AST from Python.asdl (Python)
88
python grammar/asdl_py.py
99
# Generate a Python AST from Python.asdl (C++)
10-
python libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
10+
python src/libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
1111
# Generate a Fortran ASR from ASR.asdl (C++)
12-
python libasr/src/libasr/asdl_cpp.py libasr/src/libasr/ASR.asdl libasr/src/libasr/asr.h
13-
# Generate a wasm_visitor.h from libasr/src/libasr/wasm_instructions.txt (C++)
14-
python libasr/src/libasr/wasm_instructions_visitor.py
12+
python src/libasr/src/libasr/asdl_cpp.py src/libasr/src/libasr/ASR.asdl src/libasr/src/libasr/asr.h
13+
# Generate a wasm_visitor.h from src/libasr/src/libasr/wasm_instructions.txt (C++)
14+
python src/libasr/src/libasr/wasm_instructions_visitor.py
1515
# Generate the intrinsic_function_registry_util.h (C++)
16-
python libasr/src/libasr/intrinsic_func_registry_util_gen.py
16+
python src/libasr/src/libasr/intrinsic_func_registry_util_gen.py
1717

1818
# Generate the tokenizer and parser
1919
pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd

‎ci/build.xsh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ llvm-config --components
2727
bash ci/version.sh
2828

2929
# Generate a Fortran ASR from ASR.asdl (C++)
30-
python libasr/src/libasr/asdl_cpp.py libasr/src/libasr/ASR.asdl libasr/src/libasr/asr.h
30+
python src/libasr/src/libasr/asdl_cpp.py src/libasr/src/libasr/ASR.asdl src/libasr/src/libasr/asr.h
3131
# Generate a Python AST from Python.asdl (C++)
32-
python libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
32+
python src/libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
3333
# Generate a Python AST from Python.asdl (Python)
3434
python grammar/asdl_py.py
35-
# Generate a wasm_visitor.h from libasr/src/libasr/wasm_instructions.txt (C++)
36-
python libasr/src/libasr/wasm_instructions_visitor.py
35+
# Generate a wasm_visitor.h from src/libasr/src/libasr/wasm_instructions.txt (C++)
36+
python src/libasr/src/libasr/wasm_instructions_visitor.py
3737
# Generate the intrinsic_function_registry_util.h (C++)
38-
python libasr/src/libasr/intrinsic_func_registry_util_gen.py
38+
python src/libasr/src/libasr/intrinsic_func_registry_util_gen.py
3939

4040
# Generate the tokenizer and parser
4141
pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd

‎run_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__)))
7-
sys.path.append(os.path.join(ROOT_DIR, "src", "libasr"))
7+
sys.path.append(os.path.join(ROOT_DIR, "src", "libasr", "src", "libasr"))
88

99
from compiler_tester.tester import color, fg, log, run_test, style, tester_main
1010

‎src/bin/lpython.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -856,9 +856,9 @@ int interactive_python_repl(
856856
std::cout << " - History (Keys: Up, Down)" << std::endl;
857857

858858
std::vector<std::string> history;
859-
859+
860860
std::function<bool(std::string)> iscomplete = determine_completeness;
861-
861+
862862
std::string code_string;
863863
size_t cell_count = 0;
864864
while (true) {
@@ -1013,8 +1013,8 @@ int interactive_python_repl(
10131013
}
10141014
case (LCompilers::PythonCompiler::EvalResult::struct_type) : {
10151015
if (verbose) {
1016-
std::cout << "Return type: "
1017-
<< LCompilers::ASRUtils::get_type_code(r.structure.ttype)
1016+
std::cout << "Return type: "
1017+
<< LCompilers::ASRUtils::get_type_code(r.structure.ttype)
10181018
<< std::endl;
10191019
}
10201020
if (verbose) section("Result:");
@@ -2261,7 +2261,7 @@ int main(int argc, char *argv[])
22612261
#else
22622262
cmd += "llvm-dwarfdump --debug-line " + basename + ".out > ";
22632263
#endif
2264-
cmd += basename + "_ldd.txt && (cd src/libasr; ./dwarf_convert.py ../../"
2264+
cmd += basename + "_ldd.txt && (cd src/libasr/src/libasr; ./dwarf_convert.py ../../"
22652265
+ basename + "_ldd.txt ../../" + basename + "_lines.txt ../../"
22662266
+ basename + "_lines.dat && ./dat_convert.py ../../"
22672267
+ basename + "_lines.dat)";

‎src/libasr/src/libasr/compiler_tester/tester.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626

2727
TESTER_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__)))
28+
if "src/libasr/src/libasr" in TESTER_DIR:
29+
TESTER_DIR = TESTER_DIR.replace("src/libasr", "", 1)
2830
LIBASR_DIR = os.path.dirname(TESTER_DIR)
2931
SRC_DIR = os.path.dirname(LIBASR_DIR)
3032
ROOT_DIR = os.path.dirname(SRC_DIR)

‎src/libasr/src/libasr/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#define WITH_LFORTRAN_ASSERT
66

77
/* LFortran version */
8-
#define LFORTRAN_VERSION "0.22.0-63-ga7154aedb"
8+
#define LFORTRAN_VERSION "0.22.0-64-g9dd1bae37-dirty"
99
#define LFORTRAN_MAJOR
1010
#define LFORTRAN_MINOR
1111
#define LFORTRAN_PATCHLEVEL

0 commit comments

Comments
 (0)