diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:08 +0200 |
| commit | 9c04223086bf606eaac6dc2848af80518210d823 (patch) | |
| tree | e455703d75ac36f88d95cb712f5ea3bc4fc0d96e /engine/SCons/Tool/FortranCommon.py | |
| parent | 19712e5025e3cf6a33fccd0738f04e018d55025f (diff) | |
New upstream version 3.1.0upstream/3.1.0
Diffstat (limited to 'engine/SCons/Tool/FortranCommon.py')
| -rw-r--r-- | engine/SCons/Tool/FortranCommon.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/SCons/Tool/FortranCommon.py b/engine/SCons/Tool/FortranCommon.py index 9287396..11f1eb7 100644 --- a/engine/SCons/Tool/FortranCommon.py +++ b/engine/SCons/Tool/FortranCommon.py @@ -28,7 +28,7 @@ Stuff for processing Fortran, common to all fortran dialects. # from __future__ import print_function -__revision__ = "src/engine/SCons/Tool/FortranCommon.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" +__revision__ = "src/engine/SCons/Tool/FortranCommon.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" import re import os.path @@ -64,7 +64,8 @@ def _fortranEmitter(target, source, env): if not node.exists() and not node.is_derived(): print("Could not locate " + str(node.name)) return ([], []) - mod_regex = """(?i)^\s*MODULE\s+(?!PROCEDURE)(\w+)""" + # This has to match the def_regex in the Fortran scanner + mod_regex = r"""(?i)^\s*MODULE\s+(?!PROCEDURE|SUBROUTINE|FUNCTION|PURE|ELEMENTAL)(\w+)""" cre = re.compile(mod_regex,re.M) # Retrieve all USE'd module names modules = cre.findall(node.get_text_contents()) |