Merge branch 'master' of github.com:scemama/irpf90

src/command_line.py

@@ -42,13 +42,12 @@ 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'       , '<all|providers|builders> : 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 ]
 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 ]
 

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:

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

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)

src/version.py

@@ -1 +1 @@
-version = "1.4.4"
+version = "1.5.0"