From 8b6a22e9a360e7ba9ffab14bbedcdb81dddaea4e Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 2 Feb 2015 10:36:14 +0100 Subject: [PATCH 1/3] Output message made clearer --- src/irpf90.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/irpf90.py b/src/irpf90.py index c0b3937..528289c 100644 --- a/src/irpf90.py +++ b/src/irpf90.py @@ -68,7 +68,7 @@ def main(): if var not in variables: print "%s is not an IRP entity"%(var,) else: - print "%s touches the following entities:"%(var,) + print "Touching %s invalidates the following entities:"%(var,) parents = variables[var].parents parents.sort() for x in parents: From 700387e56e1c0489ffc61d5204ef99a93b55e80b Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 2 Feb 2015 10:58:05 +0100 Subject: [PATCH 2/3] Removed --unused broken option --- src/command_line.py | 1 - src/variable.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/command_line.py b/src/command_line.py index 94fbbbd..68b5c46 100644 --- a/src/command_line.py +++ b/src/command_line.py @@ -48,7 +48,6 @@ options['p'] = [ 'preprocess' , 'Prints a preprocessed file to standard output options['r'] = [ 'no_directives', 'Ignore all compiler directives !DEC$ and !DIR$', 0 ] options['s'] = [ 'substitute' , 'Substitute values in do loops for generating specific optimized code.', 1 ] options['t'] = [ 'touch' , 'Display which entities are touched when touching the variable given as an argument.', 1 ] -options['u'] = [ 'unused' , 'Print unused providers', 0 ] options['v'] = [ 'version' , 'Prints version of irpf90', 0 ] options['z'] = [ 'openmp' , 'Activate for OpenMP code', 0 ] diff --git a/src/variable.py b/src/variable.py index 9266876..bf462b2 100644 --- a/src/variable.py +++ b/src/variable.py @@ -674,8 +674,6 @@ class Variable(object): from variables import variables if '_needed_by' not in self.__dict__: import parsed_text - if command_line.do_unused and self.needed_by == []: - error.warn(None, "Provider %s is not used"%self.name) result = [] for x in self.needed_by: result.append(x) From fa74b0bae2c6fff1b164192db39c2686ee14df19 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Sat, 7 Feb 2015 15:49:29 +0100 Subject: [PATCH 3/3] Changed PROVIDE behavior. Now forces call_provide_* where the PROVIDE statement is. --- src/command_line.py | 2 +- src/parsed_text.py | 3 ++- src/version.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/command_line.py b/src/command_line.py index 68b5c46..d55515d 100644 --- a/src/command_line.py +++ b/src/command_line.py @@ -42,7 +42,7 @@ options['I'] = [ 'include' , 'Include directory', 1 ] options['i'] = [ 'init' , 'Initialize current directory. Creates a default Makefile and the temporary working directories.', 0 ] options['l'] = [ 'align' , 'Align arrays using compiler directives and sets the $IRP_ALIGN variable. For example, --align=32 aligns all arrays on a 32 byte boundary.', 1 ] options['m'] = [ 'memory' , 'Print memory allocations/deallocations.', 0 ] -options['n'] = [ 'inline' , 'all|providers|builders : Force inlining of providers or builders', 1 ] +options['n'] = [ 'inline' , ' : Force inlining of providers or builders', 1 ] options['o'] = [ 'checkopt' , 'Shows where optimization may be required', 0 ] options['p'] = [ 'preprocess' , 'Prints a preprocessed file to standard output. Useful for debugging files containing shell scripts.', 1 ] options['r'] = [ 'no_directives', 'Ignore all compiler directives !DEC$ and !DIR$', 0 ] diff --git a/src/parsed_text.py b/src/parsed_text.py index 4b6dc47..d2cbbdb 100644 --- a/src/parsed_text.py +++ b/src/parsed_text.py @@ -168,6 +168,7 @@ def get_parsed_text(): for v in l: if v not in variables: error.fail(line,"Variable %s is unknown"%(v)) + append( (l,Provide(line.i,"",line.filename)) ) append( (l,Simple_line(line.i,"!%s"%(line.text),line.filename)) ) elif type(line) == NoDep: l = line.lower.split()[1:] @@ -376,7 +377,7 @@ def move_variables(): or old_elsevars != []: error.fail(line,"End if missing") varlist = [] - elif type(line) == Provide_all: + elif type(line) in (Provide,Provide_all): append( (vars,line) ) else: varlist += vars diff --git a/src/version.py b/src/version.py index 98da246..e3a0f01 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.4.4" +version = "1.5.0"