aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-03-25 21:19:38 -0400
committerMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-03-25 21:19:38 -0400
commit6e06ad1c1f3a0e02d70de2e5b66657ed08380c8f (patch)
treed29d7183b17cf97fcd745f3a25f60a185e04c5fd
parent8763d1a584a6087ff6007843dde32d4b1f58e918 (diff)
downloadmeson-6e06ad1c1f3a0e02d70de2e5b66657ed08380c8f.zip
meson-6e06ad1c1f3a0e02d70de2e5b66657ed08380c8f.tar.gz
meson-6e06ad1c1f3a0e02d70de2e5b66657ed08380c8f.tar.bz2
add test case for same-name module+submodule
-rw-r--r--test cases/fortran/12 submodule/child.f904
-rw-r--r--test cases/fortran/12 submodule/meson.build2
-rw-r--r--test cases/fortran/12 submodule/parent.f909
3 files changed, 6 insertions, 9 deletions
diff --git a/test cases/fortran/12 submodule/child.f90 b/test cases/fortran/12 submodule/child.f90
index aa5bb5e..45b5b41 100644
--- a/test cases/fortran/12 submodule/child.f90
+++ b/test cases/fortran/12 submodule/child.f90
@@ -1,4 +1,4 @@
-submodule (mother) daughter
+submodule (parent) parent
contains
@@ -6,5 +6,5 @@ module procedure pi2tau
pi2tau = 2*pi
end procedure pi2tau
-end submodule daughter
+end submodule parent
diff --git a/test cases/fortran/12 submodule/meson.build b/test cases/fortran/12 submodule/meson.build
index cd62a30..b3ed9de 100644
--- a/test cases/fortran/12 submodule/meson.build
+++ b/test cases/fortran/12 submodule/meson.build
@@ -1,6 +1,6 @@
project('submodule single level', 'fortran')
-hier2 = executable('single', 'parent.f90','child.f90')
+hier2 = executable('single', 'parent.f90', 'child.f90')
test('single-level hierarchy', hier2)
hierN = executable('multi', 'a1.f90', 'a2.f90', 'a3.f90')
diff --git a/test cases/fortran/12 submodule/parent.f90 b/test cases/fortran/12 submodule/parent.f90
index 05fe431..9d087d0 100644
--- a/test cases/fortran/12 submodule/parent.f90
+++ b/test cases/fortran/12 submodule/parent.f90
@@ -1,4 +1,4 @@
-module mother
+module parent
real, parameter :: pi = 4.*atan(1.)
real :: tau
@@ -8,13 +8,10 @@ module elemental real function pi2tau(pi)
end function pi2tau
end interface
-contains
+end module parent
-end module mother
-
-program hier1
-use mother
+use parent
tau = pi2tau(pi)