Merge branch 'master' into py

.gitignore

@@ -42,6 +42,7 @@ Testing/Temporary
 CPackConfig.cmake
 CPackSourceConfig.cmake
 _CPack_Packages
+/CMakeSettings.json
 
 ## libraries
 *.a
@@ -68,6 +69,7 @@ src/lfortran/parser/tokenizer.cpp
 src/lfortran/parser/preprocessor.cpp
 src/lfortran/ast.h
 src/lfortran/asr.h
+src/libasr/asr.h
 src/lfortran/config.h
 share/jupyter/kernels/fortran/kernel.json
 src/runtime/*.o.empty.c 
@@ -141,6 +143,7 @@ MANIFEST
 
 ## Editor Files
 .vscode/
+.vs/
 
 ## Build Files
 */bin/lfortran

.gitlab-ci.yml

@@ -73,6 +73,26 @@ cxx:
     - ctest --output-on-failure
     - ./src/bin/parse
 
+# Test the C++ version
+libasr:
+  stage: build
+  image: registry.gitlab.com/lfortran/ci-images:full-1.7.0
+  script:
+    - export PATH="$HOME/conda_root/bin:$PATH"
+    - conda install -c conda-forge rapidjson
+    - tar xzf dist/lfortran-*.tar.gz
+    - cd lfortran-*
+    - mkdir build
+    - cd build
+    - mv ../src/libasr .
+    - cd libasr
+    - CXXFLAGS="-Werror" cmake
+         -DCMAKE_PREFIX_PATH=$HOME/conda_root
+         -DCMAKE_INSTALL_PREFIX=`pwd`
+         -DCMAKE_BUILD_TYPE=Debug
+         .
+    - cmake --build .
+
 # Create a binary tarball with the C++ based LFortran
 cxx_binary:
   stage: build

bench.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Compile the latest master and a given MR in Release mode from scratch.
 #

build0.bat

@@ -0,0 +1,2 @@
+
+xonsh ./build1_win.sh

build0.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -x
@@ -13,7 +13,7 @@ python grammar/asdl_py.py
 # Generate a Python AST from Python.asdl (C++)
 python grammar/asdl_cpp.py grammar/Python.asdl src/lfortran/python_ast.h
 # Generate a Fortran ASR from ASR.asdl (C++)
-python grammar/asdl_cpp.py grammar/ASR.asdl src/lfortran/asr.h
+python grammar/asdl_cpp.py grammar/ASR.asdl src/libasr/asr.h
 
 # Generate the tokenizer and parser
 (cd src/lfortran/parser && re2c -W -b tokenizer.re -o tokenizer.cpp)

build1.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -x

build1_win.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+bash ci/version.sh
+python grammar/asdl_cpp.py
+python grammar/asdl_cpp.py grammar/ASR.asdl src/libasr/asr.h
+pushd src/lfortran/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd
+pushd src/lfortran/parser && re2c -W -b preprocessor.re -o preprocessor.cpp && popd
+pushd src/lfortran/parser && bison -Wall -d -r all parser.yy && popd

ci/azure_install_macos.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 

ci/azure_mirror.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -x

ci/azure_status.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 

ci/build.xsh

@@ -32,7 +32,7 @@ bash ci/version.sh
 # Generate a Fortran AST from AST.asdl (C++)
 python grammar/asdl_cpp.py
 # Generate a Fortran ASR from ASR.asdl (C++)
-python grammar/asdl_cpp.py grammar/ASR.asdl src/lfortran/asr.h
+python grammar/asdl_cpp.py grammar/ASR.asdl src/libasr/asr.h
 
 # Generate the tokenizer and parser
 pushd src/lfortran/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd

ci/create_source_tarball.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 

ci/create_source_tarball0.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 

ci/github_mirror.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -x

ci/grammar_conflicts.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 

ci/upload_docs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -x

ci/upload_tarball.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -x

ci/version.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script extracts the project's current version from git using
 # `git describe`, which determines the version based on the latest tag, such as:

doc/src/installation.md

@@ -99,6 +99,29 @@ Run an interactive prompt:
 ./src/bin/lfortran
 ```
 
+## Build on Windows with Visual Studio
+
+Install Conda for example by installing the Miniconda installation by following instructions there for your platform. If not already done, activate the Conda-Installation (cf. Conda installation instructions).
+
+First, clone the repo to a local folder.
+
+Launch a Conda command interpreter and run the following commands:
+```bash
+conda update -q conda
+conda install -c conda-forge python=3.7 re2c m2-bison xonsh llvmdev=11.1.0 jupyter xeus=1.0.1 xtl nlohmann_json cppzmq jupyter_kernel_test pytest
+```
+Next, `cd` to the root of the repository and run
+```bash
+.\build0.bat
+```
+
+Now, you can launch Visual Studio and open the LFortran folder.
+Before the first build you have to set up the `ZLib`-pathes: Go to the CMake-Settings (Project -> CMake Setttings for lfortran) and check `Show advanced variables`. Scroll to the `ZLIB_...` variables and set:
+- `ZLIB_INCLUDE_DIR` = \<Conda-Installation-Path\>\Library\include
+- `ZLIB_LIBRARY_[DEBUG|RELEASE]` = \<Conda-Installation-Path\>\Library\lib\zlib.lib
+
+Then you can generate the CMake-Cache and build the project.
+
 ## Enabling the Jupyter Kernel
 
 To install the Jupyter kernel, install the following Conda packages also:

grammar/ASR.asdl

@@ -187,6 +187,7 @@ stmt
     | SubroutineCall(symbol name, symbol? original_name, expr* args, expr? dt)
     | Where(expr test, stmt* body, stmt* orelse)
     | WhileLoop(expr test, stmt* body)
+    | Nullify(symbol* vars)
 
 
 expr
@@ -231,7 +232,7 @@ ttype
     | Class(symbol class_type, dimension* dims)
     | Pointer(ttype type)
 
-boolop = And | Or | NEqv | Eqv
+boolop = And | Or | Xor | NEqv | Eqv
 
 binop = Add | Sub | Mul | Div | Pow
 

grammar/AST.asdl

@@ -231,7 +231,7 @@ trivia_node
     | EndOfLine()
     | Semicolon()
 
-boolop = And | Or | Eqv | NEqv
+boolop = And | Or | Xor | Eqv | NEqv
 
 operator = Add | Sub | Mul | Div | Pow
 
@@ -242,7 +242,7 @@ unaryop = Invert | Not | UAdd | USub
 cmpop = Eq | NotEq | Lt | LtE | Gt | GtE
 
 intrinsicop
-    = AND | OR | EQV | NEQV
+    = AND | OR | XOR | EQV | NEQV
     | PLUS | MINUS | STAR | DIV | POW
     | NOT
     | EQ | NOTEQ | LT | LTE | GT | GTE

grammar/asdl_cpp.py

@@ -1207,12 +1207,12 @@ def add_masks(fields, node):
 
 // Generated by grammar/asdl_cpp.py
 
-#include <lfortran/parser/alloc.h>
-#include <lfortran/parser/location.h>
-#include <lfortran/colors.h>
-#include <lfortran/containers.h>
-#include <lfortran/exception.h>
-#include <lfortran/semantics/asr_scopes.h>
+#include <libasr/alloc.h>
+#include <libasr/location.h>
+#include <libasr/colors.h>
+#include <libasr/containers.h>
+#include <libasr/exception.h>
+#include <libasr/asr_scopes.h>
 
 
 namespace LFortran::%(MOD)s {

integration_tests/CMakeLists.txt

@@ -125,6 +125,7 @@ RUN(NAME subroutines_01 LABELS gfortran llvm cpp x86)
 RUN(NAME subroutines_02 LABELS gfortran llvm cpp x86)
 RUN(NAME subroutines_04 LABELS gfortran llvm)
 RUN(NAME subroutines_06 LABELS gfortran)
+RUN(NAME subroutines_07 LABELS gfortran)
 
 RUN(NAME functions_01 LABELS gfortran llvm cpp x86)
 RUN(NAME functions_02 LABELS gfortran llvm)
@@ -186,6 +187,7 @@ RUN(NAME modulo_01 LABELS gfortran llvm)
 
 RUN(NAME int_01 LABELS gfortran llvm) # int body
 RUN(NAME int_02 LABELS gfortran) # int symboltable
+RUN(NAME int_03 LABELS gfortran llvm) # large int
 
 RUN(NAME intrinsics_01 LABELS gfortran) # sqrt, abs, log
 RUN(NAME intrinsics_02 LABELS gfortran llvm) # sin
@@ -218,6 +220,12 @@ RUN(NAME intrinsics_25 LABELS gfortran llvm) # ishft
 RUN(NAME intrinsics_26 LABELS gfortran llvm)
 RUN(NAME intrinsics_27 LABELS gfortran)
 RUN(NAME intrinsics_28 LABELS gfortran llvm)
+RUN(NAME intrinsics_29 LABELS gfortran llvm) # random_number
+RUN(NAME intrinsics_30 LABELS gfortran llvm)
+RUN(NAME intrinsics_31 LABELS gfortran llvm)
+RUN(NAME intrinsics_32 LABELS gfortran)
+RUN(NAME intrinsics_33 LABELS gfortran llvm)
+RUN(NAME intrinsics_34 LABELS gfortran llvm)
 RUN(NAME intrinsics_open_close_read_write LABELS gfortran)
 
 RUN(NAME parameter_01 LABELS gfortran)
@@ -284,6 +292,7 @@ RUN(NAME interface_05 LABELS gfortran llvm)
 RUN(NAME interface_06 LABELS gfortran)
 RUN(NAME interface_07 LABELS gfortran llvm)
 RUN(NAME interface_09 LABELS gfortran)
+RUN(NAME interface_10 LABELS gfortran llvm)
 
 RUN(NAME generic_name_01 LABELS gfortran llvm)
 
@@ -323,6 +332,9 @@ RUN(NAME derived_types_01 LABELS gfortran llvm)
 RUN(NAME derived_types_02 LABELS gfortran)
 RUN(NAME derived_types_03 LABELS gfortran)
 RUN(NAME derived_types_04 LABELS gfortran)
+RUN(NAME derived_types_06 LABELS gfortran llvm)
+RUN(NAME derived_types_05 LABELS gfortran)
+RUN(NAME derived_types_07 LABELS gfortran)
 
 RUN(NAME line_continuation_01 LABELS gfortran llvm)
 RUN(NAME line_continuation_02 LABELS gfortran llvm)
@@ -368,6 +380,7 @@ RUN(NAME string_10 LABELS gfortran llvm)
 RUN(NAME string_11 LABELS gfortran llvm)
 RUN(NAME string_12 LABELS gfortran)
 RUN(NAME string_13 LABELS gfortran llvm)
+RUN(NAME string_14 LABELS gfortran)
 
 RUN(NAME nested_01 LABELS gfortran llvm)
 RUN(NAME nested_02 LABELS gfortran llvm)
@@ -414,5 +427,8 @@ RUN(NAME sin_03 LABELS gfortran llvm)
 RUN(NAME sin_04 LABELS gfortran llvm)
 RUN(NAME bits_01 LABELS gfortran llvm)
 RUN(NAME bits_02 LABELS gfortran llvm)
+RUN(NAME bits_03 LABELS gfortran llvm)
+RUN(NAME bits_04 LABELS gfortran llvm)
+RUN(NAME bits_05 LABELS gfortran llvm)
 RUN(NAME cpu_time_01 LABELS gfortran llvm)
 RUN(NAME boz_01 LABELS gfortran llvm)

integration_tests/arrays_05.f90

@@ -1,9 +1,9 @@
 program arrays_05
 implicit none
-real, dimension(5) :: numbers
+real, dimension(5) :: numbers = [1.5, 3.2, 4.5, 0.9, 7.2]
 integer :: i
 do i = 1, 5
    numbers(i) = i * 2.0
 end do
-numbers = (/ 1.5, 3.2, 4.5, 0.9, 7.2 /)
+numbers = [1.5, 3.2, 4.5, 0.9, 7.2]
 end program

integration_tests/bits_03.f90

@@ -0,0 +1,37 @@
+program bits_03
+    implicit none
+    integer(4) :: from, to
+    integer(8) :: from8, to8
+    from = 10
+    to = 4
+    from8 = 10_8
+    to8 = 4_8
+    call mvbits(from, 2, 2, to, 0)
+    if (from /= 10) error stop
+    if (to /= 6) error stop
+    call mvbits(from8, 2, 2, to8, 0)
+    if (from8 /= 10) error stop
+    if (to8 /= 6_8) error stop
+    call mvbits(from, 0, 2, to, 2)
+    if (from /= 10) error stop
+    if (to /= 10) error stop
+    call mvbits(from8, 0, 2, to8, 2)
+    if (from8 /= 10) error stop
+    if (to8 /= 10_8) error stop
+    from  = -20
+    to = 4
+    from8 = -20_8
+    to8 = 4_8
+    call mvbits(from, 29, 2, to, 2)
+    if (from /= -20) error stop
+    if (to /= 12) error stop
+    call mvbits(from8, 29, 2, to8, 2)
+    if (from8 /= -20) error stop
+    if (to8 /= 12_8) error stop
+    call mvbits(from, 2, 2, to, 29)
+    if (from /= -20) error stop
+    if (to /= 1610612748) error stop
+    call mvbits(from8, 2, 2, to8, 29)
+    if (from8 /= -20) error stop
+    if (to8 /= 1610612748_8) error stop
+end program