Merge pull request #211 from shaoxc/dev

jameskermode · Mar 23, 2024 · c98885a · c98885a
2 parents 6297818 + 8454c5a
commit c98885a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/examples/derivedtypes_procedure/library.f90 b/examples/derivedtypes_procedure/library.f90
@@ -2,7 +2,7 @@ module test
   implicit none
 
   private
-  public :: atype, btype
+  public atype, btype
   public :: create, asum
   public :: asum_class
 

diff --git a/f90wrap/parser.py b/f90wrap/parser.py
@@ -142,8 +142,8 @@
 
 valid_dim_re = re.compile(r'^(([-0-9.e]+)|(size\([_a-zA-Z0-9\+\-\*\/]*\))|(len\(.*\)))$', re.IGNORECASE)
 
-public = re.compile('(^public$)|(^public\s*(\w+)\s*$)|(^public\s*::\s*(\w+)(\s*,\s*\w+)*$)', re.IGNORECASE)
-private = re.compile('(^private$)|(^private\s*(\w+)\s*$)|(^private\s*::\s*(\w+)(\s*,\s*\w+)*$)', re.IGNORECASE)
+public = re.compile('(^public$)|(^public\s*(::)?\s*(\w+)(\s*,\s*\w+)*$)', re.IGNORECASE)
+private = re.compile('(^private$)|(^private\s*(::)?\s*(\w+)(\s*,\s*\w+)*$)', re.IGNORECASE)
 
 rmspace = re.compile(r'(\w+)\s+\(', re.IGNORECASE)
 def remove_delimited(line, d1, d2):