Merge lp:~nickpapior/siesta/4.0-fdf into lp:siesta/4.0

[Nick Papior]

Fixed bug, however, I am mainly concerned whether anything will be broken by this.

I can't see why, but good to get a new view on this.

[Alberto Garcia (albertog)]

I cannot see any downsides.

For the next iteration, we might make the 'line' component of the parsed-line object into
an allocatable character variable, and the token markers into allocatable arrays.

review: Approve

[Nick Papior (nickpapior)]

Exactly my thought, it does however require some restructuring due to array vs. string sub-indexing.

But would be nice to have!

I will merge.

=== modified file 'Src/fdf/fdf.F90'
--- Src/fdf/fdf.F90	2017-09-27 11:54:09 +0000
+++ Src/fdf/fdf.F90	2017-10-29 13:48:37 +0000
@@ -827,7 +827,8 @@
       logical                    :: dump
       logical, allocatable       :: found(:)
       character(80)              :: msg
-      character(len=MAX_LENGTH)  :: line, label, inc_file
+      character(len=MAX_LENGTH)  :: label, inc_file
+      character(len=MAX_LENGTH*2):: line
       integer(ip)                :: i, ierr, ntok, ind_less, nlstart
       type(parsed_line), pointer :: pline
 
@@ -1044,7 +1045,8 @@
       logical                    :: dump, found_elem
       logical, pointer           :: found_loc(:)
       character(80)              :: msg
-      character(len=MAX_LENGTH)  :: line, inc_file, label
+      character(len=MAX_LENGTH*2):: line
+      character(len=MAX_LENGTH)  :: label, inc_file
       integer(ip)                :: i, ierr, ntok, ind_less, nlstart
       integer(ip)                :: elem, nelem_loc
       integer(ip), pointer       :: found_index(:)
 
=== modified file 'Src/fdf/parse.F90'
--- Src/fdf/parse.F90	2013-12-11 14:01:58 +0000
+++ Src/fdf/parse.F90	2017-10-29 13:48:37 +0000
@@ -686,6 +686,7 @@
                  ! grab the seperator
                  sep = names(lpline,1,after=ti)
                  if ( leqi(sep,'to') .or. &
+                      leqi(sep,':') .or. &
                       leqi(sep,'--') .or. &
                       leqi(sep,'---') ) then
 
@@ -1088,7 +1089,7 @@
     SUBROUTINE parses(ntokens, line, first, last)
       implicit none
 !------------------------------------------------- Input Variables
-      character(len=MAX_LENGTH)    :: line
+      character(len=*)             :: line
       
 !------------------------------------------------ Output Variables
       integer(ip)                  :: ntokens
@@ -1097,7 +1098,7 @@
 !------------------------------------------------- Local Variables
       logical                      :: intoken, instring, completed
       logical                      :: inlist
-      integer(ip)                  :: i, c, stringdel
+      integer(ip)                  :: i, c, stringdel, length
 
 !     Character statement functions
       logical :: is_digit, is_upper, is_lower, is_alpha,                &
@@ -1138,9 +1139,12 @@
       inlist   = .FALSE.
       stringdel = 0
 
+      ! Trim space at the end (not from the left)
+      length = len_trim(line)
+      
       i = 1
       completed = .FALSE.
-      do while((i .le. len(line)) .and. (.not. completed))
+      do while((i <= length) .and. (.not. completed))
         c = ichar(line(i:i))
 
 !       Possible comment...
@@ -1219,9 +1223,21 @@
         endif
 
         i = i + 1
-      enddo
-
-      if (parse_debug) then
+
+        ! Check whether the parsing is correctly handled
+        if ( i > MAX_LENGTH ) then
+           ! Because we will limit search to the len_trim length,
+           ! then this should only be found when the line has "content" too long.
+           ! Note that this will *never* be executed if a comment is too
+           ! long because it is checked as the first requirement and then
+           ! completes parsing the line.
+           call die('PARSE module: parses', 'Too long line (132 char): ' // &
+                trim(line), THIS_FILE, __LINE__)
+        end if
+        
+     enddo
+
+     if (parse_debug) then
         write(parse_log,*) 'PARSER:', ntokens, 'token(s)'
         do i= 1, ntokens
           write(parse_log,*) '   Token:', '|',line(first(i):last(i)),'|'
@@ -1237,7 +1253,7 @@
     SUBROUTINE morphol(ntokens, line, first, last, token_id)
       implicit none
 !------------------------------------------------- Input Variables
-      character(len=MAX_LENGTH) :: line
+      character(len=*)          :: line
       integer(ip)               :: ntokens
       integer(ip)               :: first(MAX_NTOKENS), last(MAX_NTOKENS)
 
 
=== modified file 'version.info'
--- version.info	2017-10-18 16:14:45 +0000
+++ version.info	2017-10-29 13:48:37 +0000
@@ -1,1 +1,1 @@
-siesta-4.0--543
+siesta-4.0--543--fdf-1