Merge pull request lcompilers#291 from Thirumalai-Shaktivel/lf_rename

Rename LFortran to LPython in CMakeList, NameSpace

.gitignore

@@ -1,4 +1,4 @@
-# LFortran
+# LPython
 
 src/bin/lpython
 src/bin/parse
@@ -13,7 +13,7 @@ src/lpython/tests/test_stacktrace*
 src/lpython/tests/test_serialization*
 src/lpython/tests/test_cwrapper
 src/lpython/tests/test_serialization
-src/lpython/tests/test_lfortran
+src/lpython/tests/test_lpython
 src/lpython/tests/write32
 src/lpython/tests/write32.asm
 src/lpython/tests/subroutines32
@@ -24,11 +24,6 @@ src/lpython/tests/cmp32
 src/lpython/tests/x
 src/lpython/tests/ref_pickle.txt.new
 
-# fortran_parser
-
-build-gfortran
-build-lfort
-
 ## CMake
 CMakeCache.txt
 CMakeFiles/

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_SOURCE_DIR}/cmake/UserOverride.cmake)
 
 # We don't execute this if we have a tarball
-if (LFORTRAN_BUILD_ALL)
+if (LPYTHON_BUILD_ALL)
   execute_process(COMMAND "build0.sh")
 endif()
 
@@ -24,11 +24,11 @@ if (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR
 endif ()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set(LFORTRAN_CXX_NO_RTTI_FLAG "-fno-rtti")
+    set(LPYTHON_CXX_NO_RTTI_FLAG "-fno-rtti")
 elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
-    set(LFORTRAN_CXX_NO_RTTI_FLAG "-fno-rtti")
+    set(LPYTHON_CXX_NO_RTTI_FLAG "-fno-rtti")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    set(LFORTRAN_CXX_NO_RTTI_FLAG "/GR-")
+    set(LPYTHON_CXX_NO_RTTI_FLAG "/GR-")
 endif ()
 
 
@@ -70,8 +70,8 @@ endif()
 set(WITH_LFORTRAN_ASSERT ${WITH_LFORTRAN_ASSERT_DEFAULT}
     CACHE BOOL "Enable LFORTRAN_ASSERT macro")
 
-# LFORTRAN_STATIC_BIN
-set(LFORTRAN_STATIC_BIN no CACHE BOOL "Build LFortran as a static binary")
+# LPYTHON_STATIC_BIN
+set(LPYTHON_STATIC_BIN no CACHE BOOL "Build LPython as a static binary")
 
 # WITH_LFORTRAN_BINARY_MODFILES
 set(WITH_LFORTRAN_BINARY_MODFILES YES
@@ -89,7 +89,7 @@ set(WITH_LLVM no CACHE BOOL "Build with LLVM support")
 set(WITH_TARGET_AARCH64 no CACHE BOOL "Enable target AARCH64")
 set(WITH_TARGET_X86 no CACHE BOOL "Enable target X86")
 if (WITH_LLVM)
-    set(LFORTRAN_LLVM_COMPONENTS core support mcjit orcjit native asmparser asmprinter)
+    set(LPYTHON_LLVM_COMPONENTS core support mcjit orcjit native asmparser asmprinter)
     find_package(LLVM REQUIRED)
     message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
     message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
@@ -108,7 +108,7 @@ if (WITH_LLVM)
             message(FATAL_ERROR "The selected LLVM library doesn't have support for AArch64 targets")
         endif()
 
-        list(APPEND LFORTRAN_LLVM_COMPONENTS aarch64info aarch64utils aarch64desc aarch64asmparser aarch64codegen aarch64disassembler)
+        list(APPEND LPYTHON_LLVM_COMPONENTS aarch64info aarch64utils aarch64desc aarch64asmparser aarch64codegen aarch64disassembler)
         add_definitions("-DHAVE_TARGET_AARCH64=1")
     endif()
 
@@ -117,12 +117,12 @@ if (WITH_LLVM)
             message(FATAL_ERROR "The selected LLVM library doesn't have support for X86 targets")
         endif()
 
-        list(APPEND LFORTRAN_LLVM_COMPONENTS x86info x86desc x86codegen x86asmparser x86disassembler)
+        list(APPEND LPYTHON_LLVM_COMPONENTS x86info x86desc x86codegen x86asmparser x86disassembler)
         add_definitions("-DHAVE_TARGET_X86=1")
     endif()
 
-    llvm_map_components_to_libnames(llvm_libs ${LFORTRAN_LLVM_COMPONENTS})
-    unset(LFORTRAN_LLVM_COMPONENTS)
+    llvm_map_components_to_libnames(llvm_libs ${LPYTHON_LLVM_COMPONENTS})
+    unset(LPYTHON_LLVM_COMPONENTS)
 
     add_library(p::llvm INTERFACE IMPORTED)
     set_property(TARGET p::llvm PROPERTY INTERFACE_INCLUDE_DIRECTORIES
@@ -132,7 +132,7 @@ if (WITH_LLVM)
     #set_property(TARGET p::llvm PROPERTY INTERFACE_COMPILE_OPTIONS
     #    ${LLVM_DEFINITIONS})
     set_property(TARGET p::llvm PROPERTY INTERFACE_COMPILE_OPTIONS
-        $<$<COMPILE_LANGUAGE:CXX>:${LFORTRAN_CXX_NO_RTTI_FLAG}>)
+        $<$<COMPILE_LANGUAGE:CXX>:${LPYTHON_CXX_NO_RTTI_FLAG}>)
     set_property(TARGET p::llvm PROPERTY INTERFACE_LINK_LIBRARIES
         ${llvm_libs})
     if (MSVC)
@@ -237,7 +237,7 @@ enable_testing()
 message("\n")
 message("Configuration results")
 message("---------------------")
-message("LFORTRAN_VERSION: ${LFORTRAN_VERSION}")
+message("LPYTHON_VERSION: ${LFORTRAN_VERSION}")
 message("CPACK_PACKAGE_FILE_NAME: ${CPACK_PACKAGE_FILE_NAME}")
 message("C compiler      : ${CMAKE_C_COMPILER}")
 message("C++ compiler    : ${CMAKE_CXX_COMPILER}")
@@ -251,7 +251,7 @@ else ()
 endif ()
 message("Installation prefix: ${CMAKE_INSTALL_PREFIX}")
 message("WITH_LFORTRAN_ASSERT: ${WITH_LFORTRAN_ASSERT}")
-message("LFORTRAN_STATIC_BIN: ${LFORTRAN_STATIC_BIN}")
+message("LPYTHON_STATIC_BIN: ${LPYTHON_STATIC_BIN}")
 message("WITH_STACKTRACE: ${WITH_STACKTRACE}")
 message("WITH_UNWIND: ${WITH_UNWIND}")
 message("WITH_BFD: ${WITH_BFD}")

build1.sh

@@ -6,10 +6,10 @@ set -x
 cmake \
     -DCMAKE_BUILD_TYPE=Debug \
     -DWITH_LLVM=yes \
-    -DLFORTRAN_BUILD_ALL=yes \
+    -DLPYTHON_BUILD_ALL=yes \
     -DWITH_STACKTRACE=yes \
     -DWITH_LFORTRAN_BINARY_MODFILES=no \
-    -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH_LFORTRAN;$CONDA_PREFIX" \
+    -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH_LPYTHON;$CONDA_PREFIX" \
     -DCMAKE_INSTALL_PREFIX=`pwd`/inst \
     .
 cmake --build . -j16 --target install

ci/build.xsh

@@ -47,7 +47,7 @@ cd test-bld
 BUILD_TYPE = "Release"
 cmake -G $LFORTRAN_CMAKE_GENERATOR -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_LLVM=yes -DWITH_XEUS=yes -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DWITH_LFORTRAN_BINARY_MODFILES=no -DCMAKE_BUILD_TYPE=@(BUILD_TYPE) ..
 cmake --build . --target install
-./src/lpython/tests/test_lfortran
+./src/lpython/tests/test_lpython
 #./src/bin/lpython < ../src/bin/example_input.txt
 ctest --output-on-failure
 cpack -V
@@ -57,6 +57,6 @@ jupyter kernelspec list --json
 
 cp lpython-$lpython_version/test-bld/src/bin/lpython src/bin
 if $WIN == "1":
-    cp lpython-$lpython_version/test-bld/src/runtime/lfortran_runtime* src/runtime/
+    cp lpython-$lpython_version/test-bld/src/runtime/lpython_runtime* src/runtime/
 else:
-    cp lpython-$lpython_version/test-bld/src/runtime/liblfortran_runtime* src/runtime/
+    cp lpython-$lpython_version/test-bld/src/runtime/liblpython_runtime* src/runtime/

grammar/Python.asdl

@@ -1,7 +1,7 @@
 -- ASDL's 4 builtin types are:
 -- identifier, int, string, constant
 
-module Python
+module LPython
 {
     mod = Module(stmt* body, type_ignore* type_ignores)
         | Interactive(stmt* body)

grammar/asdl_cpp.py

@@ -1681,7 +1681,7 @@ def add_masks(fields, node):
 
 FOOT = r"""} // namespace LFortran::%(MOD)s
 
-#endif // LFORTRAN_%(MOD)s_H
+#endif // LFORTRAN_%(MOD2)s_H
 """
 
 visitors = [ASTNodeVisitor0, ASTNodeVisitor1, ASTNodeVisitor,
@@ -1712,8 +1712,8 @@ def main(argv):
         "mod": mod.name.lower(),
         "types": types_,
     }
-    if subs["MOD"] == "PYTHON":
-        subs["MOD"] = "Python::AST"
+    if subs["MOD"] == "LPYTHON":
+        subs["MOD"] = "LPython::AST"
         subs["mod"] = "ast"
     is_asr = (mod.name.upper() == "ASR")
     fp = open(out_file, "w", encoding="utf-8")

src/bin/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_executable(lpython lpython.cpp)
 target_include_directories(lpython PRIVATE "tpl")
-target_link_libraries(lpython lfortran_lib)
-if (LFORTRAN_STATIC_BIN)
+target_link_libraries(lpython lpython_lib)
+if (LPYTHON_STATIC_BIN)
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
         # Link statically on Linux with gcc or clang
         if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR