diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-06-20 16:27:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 16:27:21 -0700 |
| commit | 1df2f5e9da1750fe68b0a1b9b75d2f6e9170f5ca (patch) | |
| tree | ec37a72608e59979fe2b583d31fb0ec7cc2bc499 /test cases | |
| parent | 2106a6020cf0ac3b172177a9719ca78bb79b9748 (diff) | |
| parent | 927ce94d9984c106de3cd23d8292ca39c81da67d (diff) | |
| download | meson-1df2f5e9da1750fe68b0a1b9b75d2f6e9170f5ca.zip meson-1df2f5e9da1750fe68b0a1b9b75d2f6e9170f5ca.tar.gz meson-1df2f5e9da1750fe68b0a1b9b75d2f6e9170f5ca.tar.bz2 | |
Merge pull request #5516 from scivision/fortran_module_find
BUGFIX: Fortran: use, module, submodule with inline comment
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/fortran/12 submodule/a3.f90 | 2 | ||||
| -rw-r--r-- | test cases/fortran/15 include/inc1.f90 | 2 | ||||
| -rw-r--r-- | test cases/fortran/2 modules/comment_mod.f90 | 6 | ||||
| -rw-r--r-- | test cases/fortran/2 modules/meson.build | 5 | ||||
| -rw-r--r-- | test cases/fortran/2 modules/mymod.f90 | 6 | ||||
| -rw-r--r-- | test cases/fortran/2 modules/prog.f90 | 12 | ||||
| -rw-r--r-- | test cases/fortran/2 modules/stuff.f90 | 5 | ||||
| -rw-r--r-- | test cases/fortran/8 module names/test.f90 | 2 |
8 files changed, 27 insertions, 13 deletions
diff --git a/test cases/fortran/12 submodule/a3.f90 b/test cases/fortran/12 submodule/a3.f90 index d6929b0..21aa355 100644 --- a/test cases/fortran/12 submodule/a3.f90 +++ b/test cases/fortran/12 submodule/a3.f90 @@ -1,4 +1,4 @@ -submodule (a1:a2) a3 +submodule (a1:a2) a3 ! testing inline comment contains diff --git a/test cases/fortran/15 include/inc1.f90 b/test cases/fortran/15 include/inc1.f90 index 0aec9ba..163f586 100644 --- a/test cases/fortran/15 include/inc1.f90 +++ b/test cases/fortran/15 include/inc1.f90 @@ -2,4 +2,4 @@ real :: pi = 4.*atan(1.) real :: tau -include "inc2.f90" +include "inc2.f90" ! testing inline comment diff --git a/test cases/fortran/2 modules/comment_mod.f90 b/test cases/fortran/2 modules/comment_mod.f90 new file mode 100644 index 0000000..917f6be --- /dev/null +++ b/test cases/fortran/2 modules/comment_mod.f90 @@ -0,0 +1,6 @@ +module line ! inline comment +implicit none + +real :: length + +end module line diff --git a/test cases/fortran/2 modules/meson.build b/test cases/fortran/2 modules/meson.build index 030f255..fb58b9d 100644 --- a/test cases/fortran/2 modules/meson.build +++ b/test cases/fortran/2 modules/meson.build @@ -1,4 +1,7 @@ project('modules', 'fortran') -e = executable('modprog', 'stuff.f90', 'prog.f90') +commented = library('commented', 'comment_mod.f90') + +e = executable('modprog', 'mymod.f90', 'prog.f90', + link_with: commented) test('moduletest', e) diff --git a/test cases/fortran/2 modules/mymod.f90 b/test cases/fortran/2 modules/mymod.f90 new file mode 100644 index 0000000..f8e7929 --- /dev/null +++ b/test cases/fortran/2 modules/mymod.f90 @@ -0,0 +1,6 @@ +module circle +implicit none + +real, parameter :: pi = 4.*atan(1.) +real :: radius +end module circle diff --git a/test cases/fortran/2 modules/prog.f90 b/test cases/fortran/2 modules/prog.f90 index c3998cc..93b310f 100644 --- a/test cases/fortran/2 modules/prog.f90 +++ b/test cases/fortran/2 modules/prog.f90 @@ -1,7 +1,11 @@ -PROGRAM prog +use circle, only: pi +use line, only: length +implicit none -use Circle -IMPLICIT NONE +print *,'pi=',pi -END PROGRAM prog +length = pi +print *, length + +end program diff --git a/test cases/fortran/2 modules/stuff.f90 b/test cases/fortran/2 modules/stuff.f90 deleted file mode 100644 index 4a6399b..0000000 --- a/test cases/fortran/2 modules/stuff.f90 +++ /dev/null @@ -1,5 +0,0 @@ -MODULE Circle - REAL, PARAMETER :: Pi = 3.1415927 - REAL :: radius -END MODULE Circle - diff --git a/test cases/fortran/8 module names/test.f90 b/test cases/fortran/8 module names/test.f90 index 28847fb..756a163 100644 --- a/test cases/fortran/8 module names/test.f90 +++ b/test cases/fortran/8 module names/test.f90 @@ -1,5 +1,5 @@ use mymod1 -use MyMod2 +use MyMod2 ! test inline comment implicit none |