make API consistent with INDEX

Author: perazz

project/fortran-regex.depend

@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1671299845 source:/Users/federico/code/fortran-regex/src/regex.f90
+1671301959 source:/Users/federico/code/fortran-regex/src/regex.f90
 
 1671276031 source:/Users/federico/code/fortran-regex/test/test_1.f90
 

project/regex_module.mod

@@ -370,27 +370,27 @@ logical function matchplus(p, pattern, text, it0, matchlength)
  end function matchplus
 
  ! Find matches of the given pattern in the string
- integer function re_match(text, pattern, length) result(index)
+ integer function re_match(string, pattern, length) result(index)
  character(*,kind=RCK), intent(in) :: pattern
- character(*,kind=RCK), intent(in) :: text
+ character(*,kind=RCK), intent(in) :: string
  integer, intent(out) :: length
  type (regex_op) :: command
 
  command = parse_pattern(pattern)
- index = re_matchp(text,command,length)
+ index = re_matchp(string,command,length)
 
  end function re_match
 
  ! Find matches of the given pattern in the string
- integer function re_match_nolength(text, pattern) result(index)
+ integer function re_match_nolength(string, pattern) result(index)
  character(*,kind=RCK), intent(in) :: pattern
- character(*,kind=RCK), intent(in) :: text
+ character(*,kind=RCK), intent(in) :: string
 
  type (regex_op) :: command
  integer :: length
 
  command = parse_pattern(pattern)
- index = re_matchp(text,command,length)
+ index = re_matchp(string,command,length)
 
  end function re_match_nolength
 
@@ -575,17 +575,17 @@ logical function pat_match(p, c) result(match)
 
  end function pat_match
 
- integer function re_matchp_nolength(text, pattern) result(index)
+ integer function re_matchp_nolength(string, pattern) result(index)
  type(regex_op), intent(in) :: pattern
- character(len=*,kind=RCK), intent(in) :: text
+ character(len=*,kind=RCK), intent(in) :: string
  integer :: matchlength
- index = re_matchp(text, pattern, matchlength)
+ index = re_matchp(string, pattern, matchlength)
  end function re_matchp_nolength
 
 
- integer function re_matchp(text, pattern, matchlength) result(index)
+ integer function re_matchp(string, pattern, matchlength) result(index)
  type(regex_op), intent(in) :: pattern
- character(len=*,kind=RCK), intent(in) :: text
+ character(len=*,kind=RCK), intent(in) :: string
  integer, intent(out) :: matchlength
 
  matchlength = 0
@@ -595,12 +595,12 @@ integer function re_matchp(text, pattern, matchlength) result(index)
  if (pattern%pattern(1)%type == BEGIN_WITH) then
 
  ! String must begin with this pattern
- index = merge(1,0,matchpattern(pattern%pattern(2:), text, matchlength))
+ index = merge(1,0,matchpattern(pattern%pattern(2:), string, matchlength))
 
  else
 
- do index=1,len(text)
- if (matchpattern(pattern%pattern,text(index:),matchlength)) return
+ do index=1,len(string)
+ if (matchpattern(pattern%pattern,string(index:),matchlength)) return
  end do
 
  index = 0
@@ -617,11 +617,6 @@ integer function re_matchp(text, pattern, matchlength) result(index)
  end function re_matchp
 
 
-
-
-
-
-
  ! Iterative matching
  logical function matchpattern(pattern, text, matchlength) result(match)
  class(regex_pattern), intent(in) :: pattern(:)

project/regex_test_1.mod

@@ -24,6 +24,7 @@ program tests
 
  ! Test #3
  call add_test(test_invalid())
+ call add_test(test_main())
 
  if (nfailed<=0) then
  print *, 'SUCCESS! all tests passed.'
@@ -62,6 +63,19 @@ logical function test_invalid() result(success)
 
  end function test_invalid
 
+ logical function test_main() result(success)
+ use regex_module
+ implicit none
+
+ integer :: idx,ln
+ character(*), parameter :: text = 'table football'
+
+ idx = REGEX(string=text,pattern='foo*',length=ln);
+
+ ! Prints "football"
+ success = text(idx:idx+ln-1) == "foo"
+
+ end function test_main