Skip to content

Commit

Permalink
Renamed from .f03 to .f90 to facilitate use (from Beliavsky recommend…
Browse files Browse the repository at this point in the history
…ation in ffadrique/XFunit)
  • Loading branch information
Fran Martinez Fadrique committed Feb 5, 2022
1 parent 6eed74a commit d83ffda
Show file tree
Hide file tree
Showing 37 changed files with 5,214 additions and 5,213 deletions.
16 changes: 8 additions & 8 deletions FTL.vfproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
<File RelativePath=".\src\makefile.deps"/>
<File RelativePath=".\README.md"/></Filter>
<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
<File RelativePath=".\src\list.f03"/>
<File RelativePath=".\src\m_object.f03"/>
<File RelativePath=".\src\queue.f03"/>
<File RelativePath=".\src\slist.f03"/>
<File RelativePath=".\src\stack.f03"/>
<File RelativePath=".\src\tree.f03"/>
<File RelativePath=".\src\Use.f03"/>
<File RelativePath=".\src\vector.f03"/></Filter></Files>
<File RelativePath=".\src\list.f90"/>
<File RelativePath=".\src\m_object.f90"/>
<File RelativePath=".\src\queue.f90"/>
<File RelativePath=".\src\slist.f90"/>
<File RelativePath=".\src\stack.f90"/>
<File RelativePath=".\src\tree.f90"/>
<File RelativePath=".\src\Use.f90"/>
<File RelativePath=".\src\vector.f90"/></Filter></Files>
<Globals/></VisualStudioProject>
4 changes: 2 additions & 2 deletions fxx/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Container(object):
names = ['list', 'slist', 'vector', 'queue', 'stack', 'tree']

# Template default extension
templates_extension = '.f03'
templates_extension = '.f90'

# Default consturctor
def __init__(self):
Expand Down Expand Up @@ -90,4 +90,4 @@ def is_in_array(self, array):
if res: break

# Return match status
return res
return res
4 changes: 2 additions & 2 deletions fxx/fxx-container-only.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Folder Include="utest\" />
</ItemGroup>
<ItemGroup>
<Content Include="utest\m_eop_queue_ftl.f03" />
<Content Include="utest\m_eop_queue_ftl.f90" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
</Project>
</Project>
8 changes: 4 additions & 4 deletions fxx/fxx.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
<Folder Include="utest\" />
</ItemGroup>
<ItemGroup>
<Content Include="utest\m_eop_list.f03" />
<Content Include="utest\m_eop_list.f90" />
<Content Include="utest\m_eop_list.t03" />
<Content Include="utest\m_eop_vector_ftl.f03" />
<Content Include="utest\m_leap_list_ftl.f03" />
<Content Include="utest\m_eop_vector_ftl.f90" />
<Content Include="utest\m_leap_list_ftl.f90" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
</Project>
</Project>
97 changes: 49 additions & 48 deletions fxx/utest/m_eop_list.f03 → fxx/utest/m_eop_list.f90
Original file line number Diff line number Diff line change
@@ -1,48 +1,49 @@
module m_eop_list

! Use statements
use m_eop_vector_ftl
use m_leap_list_ftl


! Container object declarations
type(t_eop_vector_ftl) :: eop_object
type(t_leap_list_ftl) :: leap_object

! Contained object declarations wit the intent attribute
class(t_eop_vector_ftl), pointer, intent(in) :: eop_object
class(t_leap_list_ftl), allocatable, dimension(:), intent(out) :: leap_object


! Iterator decalrations
type(t_eop_vector_ftl_iterator) :: eop_object
type(t_leap_list_ftl_iterator) :: leap_object


! Inheritance of a container
type, extends(eop_vector_ftl) :: t_eop_list
type, extends(leap_list_ftl), abstract :: t_leap_list


! Type selection (class or type)
select type( x )
type is(t_eop_vector_ftl)

class is(t_leap_list_ftl)

end select


! Reference to the parent in a type derived by inheritance
x = object%t_eop_vector_ftl%get_param()
y = object%t_leap_list_ftl%get_param()


! Constructor
x = eop_vector_ftl()
y = leap_list_ftl( a, b )


end module m_eop_list

! 2022-02-01T00:46:47
module m_eop_list

! Use statements
use m_eop_vector_ftl
use m_leap_list_ftl


! Container object declarations
type(t_eop_vector_ftl) :: eop_object
type(t_leap_list_ftl) :: leap_object


! Contained object declarations wit the intent attribute
class(t_eop_vector_ftl), pointer, intent(in) :: eop_object
class(t_leap_list_ftl), allocatable, dimension(:), intent(out) :: leap_object


! Iterator declarations
type(t_eop_vector_ftl_iterator) :: eop_object
type(t_leap_list_ftl_iterator) :: leap_object


! Inheritance of a container
type, extends(t_eop_vector_ftl) :: t_eop_list
type, extends(t_leap_list_ftl), abstract :: t_leap_list


! Type selection (class or type)
select type( x )
type is(t_eop_vector_ftl)

class is(t_leap_list_ftl)

end select


! Reference to the parent in a type derived by inheritance
x = object%t_eop_vector_ftl%get_param()
y = object%t_leap_list_ftl%get_param()


! Constructor
x = eop_vector_ftl()
y = leap_list_ftl( a, b )


end module m_eop_list

! 2022-02-05T22:12:26
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d83ffda

Please sign in to comment.