From numpy-svn at scipy.org  Sun Oct  1 07:49:52 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun,  1 Oct 2006 06:49:52 -0500 (CDT)
Subject: [Numpy-svn] r3238 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061001114952.6AEB439C00E@new.scipy.org>

Author: pearu
Date: 2006-10-01 06:49:23 -0500 (Sun, 01 Oct 2006)
New Revision: 3238

Added:
   trunk/numpy/f2py/lib/parser/
   trunk/numpy/f2py/lib/parser/__init__.py
   trunk/numpy/f2py/lib/parser/api.py
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/block_statements.py
   trunk/numpy/f2py/lib/parser/doc.txt
   trunk/numpy/f2py/lib/parser/parsefortran.py
   trunk/numpy/f2py/lib/parser/readfortran.py
   trunk/numpy/f2py/lib/parser/sourceinfo.py
   trunk/numpy/f2py/lib/parser/splitline.py
   trunk/numpy/f2py/lib/parser/statements.py
   trunk/numpy/f2py/lib/parser/test_parser.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/parser/utils.py
Removed:
   trunk/numpy/f2py/lib/analyzefortran.py
   trunk/numpy/f2py/lib/base_classes.py
   trunk/numpy/f2py/lib/block_statements.py
   trunk/numpy/f2py/lib/doc.txt
   trunk/numpy/f2py/lib/parsefortran.py
   trunk/numpy/f2py/lib/readfortran.py
   trunk/numpy/f2py/lib/sourceinfo.py
   trunk/numpy/f2py/lib/splitline.py
   trunk/numpy/f2py/lib/statements.py
   trunk/numpy/f2py/lib/test_parser.py
   trunk/numpy/f2py/lib/typedecl_statements.py
   trunk/numpy/f2py/lib/utils.py
Modified:
   trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
   trunk/numpy/f2py/lib/python_wrapper.py
Log:
F2PY G3: Moved Fortran parser related code to subpackage parser.

Deleted: trunk/numpy/f2py/lib/analyzefortran.py
===================================================================
--- trunk/numpy/f2py/lib/analyzefortran.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/analyzefortran.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,138 +0,0 @@
-#!/usr/bin/env python
-"""
-Defines FortranAnalyzer.
-
-Permission to use, modify, and distribute this software is given under the
-terms of the NumPy License. See http://scipy.org.
-NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
-
-Author: Pearu Peterson <pearu at cens.ioc.ee>
-Created: June 2006
-"""
-
-from numpy.distutils.misc_util import yellow_text, red_text
-
-class FortranAnalyzer:
-
-    def __init__(self, block):
-        """
-        block is a BeginSource instance with relevant attributes:
-          name - reader name
-          content - a list of statements
-
-        Statements are either block statements or simple statements.
-
-        Block statements have the following relevant attributes:
-          name - block name
-          blocktype - statement name (equal to lowered statement class name)
-          content - a list of statements
-
-        Block statements may have additional attributes:
-          BeginSource: top
-          Module:
-          PythonModule:
-          Program:
-          BlockData:
-          Interface: isabstract, generic_spec
-          Subroutine: prefix, args, suffix
-          Function: prefix, typedecl, args, suffix
-          Select: expr
-          Where: expr
-          Forall: specs
-          IfThen: expr
-          If: expr
-          Do: endlabel, loopcontrol
-          Associate: associations
-          Type: specs, params
-          Enum:
-
-        Simple statements have various attributes:
-          Assignment: variable, expr
-          PointerAssignment: variable, expr
-          Assign: items
-          Call: designator, items
-          Goto: label
-          ComputedGoto: items, expr
-          AssignedGoto: varname, items
-          Continue: label
-          Return: expr
-          Stop: code
-          Print: format, items
-          Read0: specs, items
-          Read1: format, items
-          Write: specs, items
-          Flush: specs
-          Wait: specs
-          Contains:
-          Allocate: spec, items
-          Deallocate: items
-          ModuleProcedure: items
-          Public | Private: items
-          Close: specs
-          Cycle: name
-          Rewind | Backspace | Endfile: specs
-          Open: specs
-          Format: specs
-          Save: items
-          Data: stmts
-          Nullify: items
-          Use: nature, name, isonly, items
-          Exit: name
-          Parameter: items
-          Equivalence: items
-          Dimension: items
-          Target: items
-          Pointer: items
-          Protected | Volatile | Value | Intrinsic | External | Optional: items
-          ArithmeticIf: expr, labels
-          Inquire: specs, items
-          Sequence:
-          Common: items
-          Intent: specs, items
-          Entry: name, items, result, binds
-          Import: items
-          Forall: specs, content
-          SpecificBinding: iname, attrs, name, bname
-          GenericBinding: aspec, spec, items
-          FinalBinding: items
-          Allocatable: items
-          Asynchronous: items
-          Bind: specs, items
-          Else: name
-          ElseIf: name, expr
-          Case: name, items
-          Else: name
-          ElseIf: name, expr
-          Case: name, items
-          Where: name, expr
-          ElseWhere: name, expr
-          Enumerator: items
-          FortranName: value
-          Threadsafe:
-          Depend: depends, items
-          Check: expr, value
-          CallStatement: expr
-          CallProtoArgument: specs
-          Pause: value
-        """
-        self.block = block
-        print block.item
-    def analyze(self):
-        
-        pass
-
-def simple_main():
-    import sys
-    from parsefortran import FortranParser
-    from readfortran import FortranFileReader
-    for filename in sys.argv[1:]:
-        reader = FortranFileReader(filename)
-        print yellow_text('Processing '+filename+' (mode=%r)' % (reader.mode))
-        parser = FortranParser(reader)
-        block = parser.parse()
-        analyzer = FortranAnalyzer(block)
-        r = analyzer.analyze()
-        print r
-
-if __name__ == "__main__":
-    simple_main()

Deleted: trunk/numpy/f2py/lib/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/base_classes.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/base_classes.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,691 +0,0 @@
-
-__all__ = ['Statement','BeginStatement','EndStatement']
-
-import re
-import sys
-import copy
-from readfortran import Line
-from numpy.distutils.misc_util import yellow_text, red_text
-from utils import split_comma, specs_split_comma, is_int_literal_constant
-
-class AttributeHolder:
-    # copied from symbolic.base module
-    """
-    Defines a object with predefined attributes. Only those attributes
-    are allowed that are specified as keyword arguments of a constructor.
-    When an argument is callable then the corresponding attribute will
-    be read-only and set by the value the callable object returns.
-    """
-    def __init__(self, **kws):
-        self._attributes = {}
-        self._readonly = []
-        for k,v in kws.items():
-            self._attributes[k] = v
-            if callable(v):
-                self._readonly.append(k)
-        return
-
-    def __getattr__(self, name):
-        if name not in self._attributes:
-            raise AttributeError,'%s instance has no attribute %r, '\
-                  'expected attributes: %s' \
-                  % (self.__class__.__name__,name,
-                     ','.join(self._attributes.keys()))
-        value = self._attributes[name]
-        if callable(value):
-            value = value()
-            self._attributes[name] = value
-        return value
-
-    def __setattr__(self, name, value):
-        if name in ['_attributes','_readonly']:
-            self.__dict__[name] = value
-            return
-        if name in self._readonly:
-            raise AttributeError,'%s instance attribute %r is readonly' \
-                  % (self.__class__.__name__, name)
-        if name not in self._attributes:
-            raise AttributeError,'%s instance has no attribute %r, '\
-                  'expected attributes: %s' \
-                  % (self.__class__.__name__,name,','.join(self._attributes.keys()))
-        self._attributes[name] = value
-
-    def isempty(self):
-        for k in self._attributes.keys():
-            v = getattr(self,k)
-            if v: return False
-        return True
-
-    def __repr__(self): return self.torepr()
-
-    def torepr(self, depth=-1, tab = ''):
-        if depth==0: return tab + self.__class__.__name__
-        l = [self.__class__.__name__+':']
-        ttab = tab + '    '
-        for k in self._attributes.keys():
-            v = getattr(self,k)
-            if v:
-                if isinstance(v,list):
-                    l.append(ttab + '%s=<%s-list>' % (k,len(v)))
-                elif isinstance(v,dict):
-                    l.append(ttab + '%s=<dict with keys %s>' % (k,v.keys()))
-                else:
-                    l.append(ttab + '%s=<%s>' % (k,type(v)))
-        return '\n'.join(l)
-
-    def todict(self):
-        d = {}
-        for k in self._attributes.keys():
-            v = getattr(self, k)
-            d[k] = v
-        return d
-
-def get_base_classes(cls):
-    bases = ()
-    for c in cls.__bases__:
-        bases += get_base_classes(c)
-    return bases + cls.__bases__ + (cls,) 
-
-class Variable:
-    """
-    Variable instance has attributes:
-      name
-      typedecl
-      dimension
-      attributes
-      intent
-      parent - Statement instances defining the variable
-    """
-    def __init__(self, parent, name):
-        self.parent = parent
-        self.parents = [parent]
-        self.name = name
-        self.typedecl = None
-        self.dimension = None
-        self.bounds = None
-        self.length = None
-        self.attributes = []
-        self.intent = None
-        self.bind = []
-        self.check = []
-        self.init = None
-        return
-
-    def get_bit_size(self):
-        typesize = self.typedecl.get_bit_size()
-        if self.is_pointer():
-            # The size of pointer descriptor is compiler version dependent. Read:
-            #   http://www.nersc.gov/vendor_docs/intel/f_ug1/pgwarray.htm
-            #   https://www.cca-forum.org/pipermail/cca-fortran/2003-February/000123.html
-            #   https://www.cca-forum.org/pipermail/cca-fortran/2003-February/000122.html
-            # On sgi descriptor size may be 128+ bits!
-            if self.is_array():
-                wordsize = 4 # XXX: on a 64-bit system it is 8.
-                rank = len(self.bounds or self.dimension)
-                return 6 * wordsize + 12 * rank
-            return typesize
-        if self.is_array():
-            size = reduce(lambda x,y:x*y,self.bounds or self.dimension,1)
-            if self.length:
-                size *= self.length
-            return size * typesize
-        if self.length:
-            return self.length * typesize
-        return typesize
-
-    def get_typedecl(self):
-        if self.typedecl is None:
-            self.set_type(self.parent.get_type(self.name))
-        return self.typedecl
-
-    def add_parent(self, parent):
-        if id(parent) not in map(id, self.parents):
-            self.parents.append(parent)
-        self.parent = parent
-        return
-
-    def set_type(self, typedecl):
-        if self.typedecl is not None:
-            if not self.typedecl==typedecl:
-                self.parent.warning(\
-                    'variable %r already has type %s,'\
-                    ' resetting to %s' \
-                    % (self.name, self.typedecl.tostr(),typedecl.tostr()))
-        self.typedecl = typedecl
-        return
-
-    def set_init(self, expr):
-        if self.init is not None:
-            if not self.init==expr:
-                self.parent.warning(\
-                    'variable %r already has initialization %r, '\
-                    ' resetting to %r' % (self.name, self.expr, expr))
-        self.init = expr
-        return
-
-    def set_dimension(self, dims):
-        if self.dimension is not None:
-            if not self.dimension==dims:
-                self.parent.warning(\
-                    'variable %r already has dimension %r, '\
-                    ' resetting to %r' % (self.name, self.dimension, dims))
-        self.dimension = dims
-        return
-
-    def set_bounds(self, bounds):
-        if self.bounds is not None:
-            if not self.bounds==bounds:
-                self.parent.warning(\
-                    'variable %r already has bounds %r, '\
-                    ' resetting to %r' % (self.name, self.bounds, bounds))
-        self.bounds = bounds
-        return
-
-    def set_length(self, length):
-        if self.length is not None:
-            if not self.length==length:
-                self.parent.warning(\
-                    'variable %r already has length %r, '\
-                    ' resetting to %r' % (self.name, self.length, length))
-        self.length = length
-        return
-
-    known_intent_specs = ['IN','OUT','INOUT','CACHE','HIDE', 'COPY',
-                          'OVERWRITE', 'CALLBACK', 'AUX', 'C', 'INPLACE',
-                          'OUT=']
-
-    def set_intent(self, intent):
-        if self.intent is None:
-            self.intent = []
-        for i in intent:
-            if i not in self.intent:
-                if i not in self.known_intent_specs:
-                    self.parent.warning('unknown intent-spec %r for %r'\
-                                        % (i, self.name))
-                self.intent.append(i)
-        return
-
-    known_attributes = ['PUBLIC', 'PRIVATE', 'ALLOCATABLE', 'ASYNCHRONOUS',
-                        'EXTERNAL', 'INTRINSIC', 'OPTIONAL', 'PARAMETER',
-                        'POINTER', 'PROTECTED', 'SAVE', 'TARGET', 'VALUE',
-                        'VOLATILE', 'REQUIRED']
-
-    def is_private(self):
-        if 'PUBLIC' in self.attributes: return False
-        if 'PRIVATE' in self.attributes: return True
-        parent_attrs = self.parent.parent.a.attributes
-        if 'PUBLIC' in parent_attrs: return False
-        if 'PRIVATE' in parent_attrs: return True
-        return
-    def is_public(self): return not self.is_private()
-
-    def is_allocatable(self): return 'ALLOCATABLE' in self.attributes
-    def is_external(self): return 'EXTERNAL' in self.attributes
-    def is_intrinsic(self): return 'INTRINSIC' in self.attributes
-    def is_parameter(self): return 'PARAMETER' in self.attributes
-    def is_optional(self): return 'OPTIONAL' in self.attributes
-    def is_required(self): return 'REQUIRED' in self.attributes
-    def is_pointer(self): return 'POINTER' in self.attributes
-
-    def is_array(self): return not not (self.bounds or self.dimension)
-
-    def update(self, *attrs):
-        attributes = self.attributes
-        if len(attrs)==1 and isinstance(attrs[0],(tuple,list)):
-            attrs = attrs[0]
-        for attr in attrs:
-            lattr = attr.lower()
-            uattr = attr.upper()
-            if lattr.startswith('dimension'):
-                assert self.dimension is None, `self.dimension,attr`
-                l = attr[9:].lstrip()
-                assert l[0]+l[-1]=='()',`l`
-                self.set_dimension(split_comma(l[1:-1].strip(), self.parent.item))
-                continue
-            if lattr.startswith('intent'):
-                l = attr[6:].lstrip()
-                assert l[0]+l[-1]=='()',`l`
-                self.set_intent(specs_split_comma(l[1:-1].strip(),
-                                                  self.parent.item, upper=True))
-                continue
-            if lattr.startswith('bind'):
-                l = attr[4:].lstrip()
-                assert l[0]+l[-1]=='()',`l`
-                self.bind = specs_split_comma(l[1:-1].strip(), self.parent.item,
-                                              upper = True)
-                continue
-            if lattr.startswith('check'):
-                l = attr[5:].lstrip()
-                assert l[0]+l[-1]=='()',`l`
-                self.check.extend(split_comma(l[1:-1].strip()), self.parent.item)
-                continue
-            if uattr not in attributes:
-                if uattr not in self.known_attributes:
-                    self.parent.warning('unknown attribute %r' % (attr))
-                attributes.append(uattr)
-        return
-
-    def __str__(self):
-        s = ''
-        typedecl = self.get_typedecl()
-        if typedecl is not None:
-            s += typedecl.tostr() + ' '
-        a = self.attributes[:]
-        if self.dimension is not None:
-            a.append('DIMENSION(%s)' % (', '.join(self.dimension)))
-        if self.intent is not None:
-            a.append('INTENT(%s)' % (', '.join(self.intent)))
-        if self.bind:
-            a.append('BIND(%s)' % (', '.join(self.bind)))
-        if self.check:
-            a.append('CHECK(%s)' % (', '.join(self.check)))
-        if a:
-            s += ', '.join(a) + ' :: '
-        s += self.name
-        if self.bounds:
-            s += '(%s)' % (', '.join(self.bounds))
-        if self.length:
-            if is_int_literal_constant(self.length):
-                s += '*%s' % (self.length)
-            else:
-                s += '*(%s)' % (self.length)
-        if self.init:
-            s += ' = ' + self.init
-        return s
-
-    def analyze(self):
-        typedecl = self.get_typedecl()
-        return
-
-class ProgramBlock:
-    pass
-
-class Statement:
-    """
-    Statement instance has attributes:
-      parent  - Parent BeginStatement or FortranParser instance
-      item    - Line instance containing the statement line
-      isvalid - boolean, when False, the Statement instance will be ignored
-    """
-    modes = ['free90','fix90','fix77','pyf']
-    _repr_attr_names = []
-
-    def __init__(self, parent, item):
-        self.parent = parent
-        if item is not None:
-            self.reader = item.reader
-        else:
-            self.reader = parent.reader
-        self.top = getattr(parent,'top',None) # the top of statement tree
-        self.item = item
-
-        if isinstance(parent, ProgramBlock):
-            self.programblock = parent
-        elif isinstance(self, ProgramBlock):
-            self.programblock = self
-        elif hasattr(parent,'programblock'):
-            self.programblock = parent.programblock
-        else:
-            #self.warning('%s.programblock attribute not set.' % (self.__class__.__name__))
-            pass
-
-        # when a statement instance is constructed by error, set isvalid to False
-        self.isvalid = True
-        # when a statement should be ignored, set ignore to True
-        self.ignore = False
-
-        # attribute a will hold analyze information.
-        a_dict = {}
-        for cls in get_base_classes(self.__class__):
-            if hasattr(cls,'a'):
-                a_dict.update(copy.deepcopy(cls.a.todict()))
-        self.a = AttributeHolder(**a_dict)
-        if hasattr(self.__class__,'a'):
-            assert self.a is not self.__class__.a
-
-        self.process_item()
-
-        return
-
-    def __repr__(self):
-        return self.torepr()
-
-    def torepr(self, depth=-1,incrtab=''):
-        tab = incrtab + self.get_indent_tab()
-        clsname = self.__class__.__name__
-        l = [tab + yellow_text(clsname)]
-        if depth==0:
-            return '\n'.join(l)
-        ttab = tab + '  '
-        for n in self._repr_attr_names:
-            attr = getattr(self, n, None)
-            if not attr: continue
-            if hasattr(attr, 'torepr'):
-                r = attr.torepr(depht-1,incrtab)
-            else:
-                r = repr(attr)
-            l.append(ttab + '%s=%s' % (n, r))
-        if self.item is not None: l.append(ttab + 'item=%r' % (self.item))
-        if not self.isvalid: l.append(ttab + 'isvalid=%r' % (self.isvalid))
-        if self.ignore: l.append(ttab + 'ignore=%r' % (self.ignore))
-        if not self.a.isempty():
-            l.append(ttab + 'a=' + self.a.torepr(depth-1,incrtab+'  ').lstrip())
-        return '\n'.join(l)
-
-    def get_indent_tab(self,colon=None,deindent=False):
-        if self.reader.isfix:
-            tab = ' '*6
-        else:
-            tab = ''
-        p = self.parent
-        while isinstance(p, Statement):
-            tab += '  '
-            p = p.parent
-        if deindent:
-            tab = tab[:-2]
-        if self.item is None:
-            return tab
-        s = self.item.label
-        if colon is None:
-            if self.reader.isfix:
-                colon = ''
-            else:
-                colon = ':'
-        if s:
-            c = ''
-            if self.reader.isfix:
-                c = ' '
-            tab = tab[len(c+s)+len(colon):]
-            if not tab: tab = ' '
-            tab = c + s + colon + tab
-        return tab
-
-    def format_message(self, kind, message):
-        if self.item is not None:
-            message = self.reader.format_message(kind, message,
-                                                 self.item.span[0], self.item.span[1])
-        else:
-            return message
-        return message
-
-    def show_message(self, message, stream=sys.stderr):
-        print >> stream, message
-        stream.flush()
-        return
-
-    def error(self, message):
-        message = self.format_message('ERROR', red_text(message))
-        self.show_message(message)
-        return
-
-    def warning(self, message):
-        message = self.format_message('WARNING', yellow_text(message))
-        self.show_message(message)
-        return
-
-    def info(self, message):
-        message = self.format_message('INFO', message)
-        self.show_message(message)
-        return
-
-    def analyze(self):
-        self.warning('nothing analyzed')
-        return
-
-    def get_variable(self, name):
-        """ Return Variable instance of variable name.
-        """
-        mth = getattr(self,'get_variable_by_name', self.parent.get_variable)
-        return mth(name)
-
-    def get_type(self, name):
-        """ Return type declaration using implicit rules
-        for name.
-        """
-        mth = getattr(self,'get_type_by_name', self.parent.get_type)
-        return mth(name)
-
-    def get_type_decl(self, kind):
-        mth = getattr(self,'get_type_decl_by_kind', self.parent.get_type_decl)
-        return mth(kind)
-
-    def get_provides(self):
-        """ Returns dictonary containing statements that block provides or None when N/A.
-        """
-        return
-
-class BeginStatement(Statement):
-    """ <blocktype> <name>
-
-    BeginStatement instances have additional attributes:
-      name
-      blocktype
-
-    Block instance has attributes:
-      content - list of Line or Statement instances
-      name    - name of the block, unnamed blocks are named
-                with the line label
-      parent  - Block or FortranParser instance
-      item    - Line instance containing the block start statement
-      get_item, put_item - methods to retrive/submit Line instances
-                from/to Fortran reader.
-      isvalid - boolean, when False, the Block instance will be ignored.
-
-      stmt_cls, end_stmt_cls
-
-    """
-    _repr_attr_names = ['blocktype','name'] + Statement._repr_attr_names
-    def __init__(self, parent, item=None):
-
-        self.content = []
-        self.get_item = parent.get_item # get line function
-        self.put_item = parent.put_item # put line function
-        if not hasattr(self, 'blocktype'):
-            self.blocktype = self.__class__.__name__.lower()
-        if not hasattr(self, 'name'):
-            # process_item may change this
-            self.name = '__'+self.blocktype.upper()+'__' 
-        Statement.__init__(self, parent, item)
-        return
-
-    def tostr(self):
-        return self.blocktype.upper() + ' '+ self.name
-    
-    def __str__(self):
-        l=[self.get_indent_tab(colon=':') + self.tostr()]
-        for c in self.content:
-            l.append(str(c))
-        return '\n'.join(l)
-
-    def torepr(self, depth=-1, incrtab=''):
-        tab = incrtab + self.get_indent_tab()
-        ttab = tab + '  '
-        l=[Statement.torepr(self, depth=depth,incrtab=incrtab)]
-        if depth==0 or not self.content:
-            return '\n'.join(l)
-        l.append(ttab+'content:')
-        for c in self.content:
-            if isinstance(c,EndStatement):
-                l.append(c.torepr(depth-1,incrtab))
-            else:
-                l.append(c.torepr(depth-1,incrtab + '  '))
-        return '\n'.join(l)
-
-    def process_item(self):
-        """ Process the line
-        """
-        item = self.item
-        if item is None: return
-        self.fill()
-        return
-
-    def fill(self, end_flag = False):
-        """
-        Fills blocks content until the end of block statement.
-        """
-
-        mode = self.reader.mode
-        classes = self.get_classes()
-        self.classes = [cls for cls in classes if mode in cls.modes]
-        self.pyf_classes = [cls for cls in classes if 'pyf' in cls.modes]
-
-        item = self.get_item()
-        while item is not None:
-            if isinstance(item, Line):
-                if self.process_subitem(item):
-                    end_flag = True
-                    break
-            item = self.get_item()
-
-        if not end_flag:
-            self.warning('failed to find the end of block')
-        return
-
-    def process_subitem(self, item):
-        """
-        Check is item is blocks start statement, if it is, read the block.
-
-        Return True to stop adding items to given block.
-        """
-        line = item.get_line()
-
-        # First check for the end of block
-        cls = self.end_stmt_cls
-        if cls.match(line):
-            stmt = cls(self, item)
-            if stmt.isvalid:
-                self.content.append(stmt)
-                return True
-
-        if item.is_f2py_directive:
-            classes = self.pyf_classes
-        else:
-            classes = self.classes
-
-        # Look for statement match
-        for cls in classes:
-            if cls.match(line):
-                stmt = cls(self, item)
-                if stmt.isvalid:
-                    if not stmt.ignore:
-                        self.content.append(stmt)
-                    return False
-                # item may be cloned that changes the items line:
-                line = item.get_line()
-                
-        # Check if f77 code contains inline comments or other f90
-        # constructs that got undetected by get_source_info.
-        if item.reader.isfix77:
-            i = line.find('!')
-            if i != -1:
-                message = item.reader.format_message(\
-                        'WARNING',
-                        'no parse pattern found for "%s" in %r block'\
-                        ' maybe due to inline comment.'\
-                        ' Trying to remove the comment.'\
-                        % (item.get_line(),self.__class__.__name__),
-                        item.span[0], item.span[1])
-                # .. but at the expense of loosing the comment.
-                self.show_message(message)
-                newitem = item.copy(line[:i].rstrip())
-                return self.process_subitem(newitem)
-
-            # try fix90 statement classes
-            f77_classes = self.classes
-            classes = []
-            for cls in self.get_classes():
-                if 'fix90' in cls.modes and cls not in f77_classes:
-                    classes.append(cls)
-            if classes:
-                message = item.reader.format_message(\
-                        'WARNING',
-                        'no parse pattern found for "%s" in %r block'\
-                        ' maybe due to strict f77 mode.'\
-                        ' Trying f90 fix mode patterns..'\
-                        % (item.get_line(),self.__class__.__name__),
-                        item.span[0], item.span[1])
-                self.show_message(message)
-    
-                item.reader.set_mode(False, False)
-                self.classes = classes
-            
-                r = BeginStatement.process_subitem(self, item)
-                if r is None:
-                    # restore f77 fix mode
-                    self.classes = f77_classes
-                    item.reader.set_mode(False, True)
-                else:
-                    message = item.reader.format_message(\
-                        'INFORMATION',
-                        'The f90 fix mode resolved the parse pattern issue.'\
-                        ' Setting reader to f90 fix mode.',
-                        item.span[0], item.span[1])
-                    self.show_message(message)
-                    # set f90 fix mode
-                    self.classes = f77_classes + classes
-                    self.reader.set_mode(False, False)
-                return r
-
-        self.handle_unknown_item(item)
-        return
-
-    def handle_unknown_item(self, item):
-        message = item.reader.format_message(\
-                        'WARNING',
-                        'no parse pattern found for "%s" in %r block.'\
-                        % (item.get_line(),self.__class__.__name__),
-                        item.span[0], item.span[1])
-        self.show_message(message)
-        self.content.append(item)
-        #sys.exit()
-        return
-
-    def analyze(self):
-        for stmt in self.content:
-            stmt.analyze()
-        return
-
-class EndStatement(Statement):
-    """
-    END [<blocktype> [<name>]]
-
-    EndStatement instances have additional attributes:
-      name
-      blocktype
-    """
-    _repr_attr_names = ['blocktype','name'] + Statement._repr_attr_names
-
-    def __init__(self, parent, item):
-        if not hasattr(self, 'blocktype'):
-            self.blocktype = self.__class__.__name__.lower()[3:]
-        Statement.__init__(self, parent, item)
-
-    def process_item(self):
-        item = self.item
-        line = item.get_line().replace(' ','')[3:]
-        blocktype = self.blocktype
-        if line.startswith(blocktype):
-            line = line[len(blocktype):].strip()
-        else:
-            if line:
-                # not the end of expected block
-                line = ''
-                self.isvalid = False
-        if line:
-            if not line==self.parent.name:
-                self.warning(\
-                    'expected the end of %r block but got the end of %r, skipping.'\
-                    % (self.parent.name, line))
-                self.isvalid = False
-        self.name = self.parent.name
-
-    def analyze(self):
-        return
-
-    def get_indent_tab(self,colon=None,deindent=False):
-        return Statement.get_indent_tab(self, colon=colon, deindent=True)
-
-    def __str__(self):
-        return self.get_indent_tab() + 'END %s %s'\
-               % (self.blocktype.upper(),self.name or '')
-

Deleted: trunk/numpy/f2py/lib/block_statements.py
===================================================================
--- trunk/numpy/f2py/lib/block_statements.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/block_statements.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,1149 +0,0 @@
-"""
-
-"""
-
-import re
-import sys
-
-from base_classes import BeginStatement, EndStatement, Statement,\
-     AttributeHolder, ProgramBlock
-from readfortran import Line
-from utils import filter_stmts, parse_bind, parse_result, AnalyzeError
-
-class HasImplicitStmt:
-
-    a = AttributeHolder(implicit_rules = {})
-
-    def get_type_by_name(self, name):
-        implicit_rules = self.a.implicit_rules
-        if implicit_rules is None:
-            raise AnalyzeError,'Implicit rules mapping is null'
-        l = name[0].lower()
-        if implicit_rules.has_key(l):
-            return implicit_rules[l]
-        # default rules:
-        if l in 'ijklmn':
-            l = 'default_integer'
-        else:
-            l = 'default_real'
-        t = implicit_rules.get(l, None)
-        if t is None:
-            if l[8:]=='real':
-                implicit_rules[l] = t = Real(self, self.item.copy('real'))
-            else:
-                implicit_rules[l] = t = Integer(self, self.item.copy('integer'))
-        return t
-
-    def topyf(self, tab='  '):
-        implicit_rules = self.a.implicit_rules
-        if implicit_rules is None:
-            return tab + 'IMPLICIT NONE\n'
-        items = {}
-        for c,t in implicit_rules.items():
-            if c.startswith('default'):
-                continue
-            st = t.tostr()
-            if items.has_key(st):
-                items[st].append(c)
-            else:
-                items[st] = [c]
-        if not items:
-            return tab + '! default IMPLICIT rules apply\n'
-        s = 'IMPLICIT'
-        ls = []
-        for st,l in items.items():
-            l.sort()
-            ls.append(st + ' (%s)' % (', '.join(l)))
-        s += ' ' + ', '.join(ls)
-        return tab + s + '\n'
-
-class HasUseStmt:
-
-    a = AttributeHolder(use = {},
-                        use_provides = {})
-
-    def get_entity(self, name):
-        for modname, modblock in self.top.a.module.items():
-            for stmt in modblock.content:
-                if getattr(stmt,'name','') == name:
-                    return stmt
-        return
-
-    def topyf(self):
-        pass
-
-class HasVariables:
-
-    a = AttributeHolder(variables = {},
-                        variable_names = [] # defines the order of declarations
-                        )
-
-    def get_variable_by_name(self, name):
-        variables = self.a.variables
-        if variables.has_key(name):
-            var = variables[name]
-        else:
-            var = variables[name] = Variable(self, name)
-            self.a.variable_names.append(name)
-        return var
-
-    def topyf(self,tab=''):
-        s = ''
-        for name, var in self.a.variables.items():
-            s += tab + str(var) + '\n'
-        return s
-
-class HasTypeDecls:
-
-    a = AttributeHolder(type_decls = {})
-
-    def topyf(self, tab=''):
-        s = ''
-        for name, stmt in self.a.type_decls.items():
-            s += stmt.topyf(tab='  '+tab)
-        return s
-
-    def get_type_decl_by_kind(self, kind):
-        type_decls = self.a.type_decls
-        type_decl = type_decls.get(kind, None)
-        if type_decl is None:
-            return self.get_entity(kind)
-            raise NotImplementedError,'get type_decl from use modules'
-        return type_decl
-
-class HasAttributes:
-
-    known_attributes = []
-    a = AttributeHolder(attributes = [])
-
-    def topyf(self, tab=''):
-        s = ''
-        for attr in self.a.attributes:
-            s += tab + attr + '\n'
-        return s
-
-    def is_private(self):
-        attributes = self.a.attributes
-        if 'PUBLIC' in attributes: return False
-        if 'PRIVATE' in attributes: return True
-        return
-    def is_public(self): return not self.is_private()
-
-    def update_attributes(self,*attrs):
-        attributes = self.a.attributes
-        known_attributes = self.known_attributes
-        if len(attrs)==1 and isinstance(attrs[0],(tuple,list)):
-            attrs = attrs[0]
-        for attr in attrs:
-            uattr = attr.upper()
-            if uattr not in attributes:
-                if isinstance(known_attributes,(list, tuple)):
-                    if uattr not in known_attributes:
-                        self.warning('unknown attribute %r' % (attr))
-                elif known_attributes(uattr):
-                    self.warning('unknown attribute %r' % (attr))
-                attributes.append(uattr)
-        return
-
-class HasModuleProcedures:
-
-    a = AttributeHolder(module_procedures = [])
-
-# File block
-
-class EndSource(EndStatement):
-    """
-    Dummy End statement for BeginSource.
-    """
-    match = staticmethod(lambda s: False)
-
-class BeginSource(BeginStatement):
-    """
-    Fortran source content.
-    """
-    match = staticmethod(lambda s: True)
-    end_stmt_cls = EndSource
-    a = AttributeHolder(module = {},
-                        external_subprogram = {},
-                        blockdata = {},
-                        )
-
-    def tostr(self):
-        return '!' + self.blocktype.upper() + ' '+ self.name
-
-    def process_item(self):
-        self.name = self.reader.name
-        self.top = self
-        self.fill(end_flag = True)
-        return
-
-    def analyze(self):
-        for stmt in self.content:
-            if isinstance(stmt, Module):
-                stmt.analyze()
-                self.a.module[stmt.name] = stmt
-            elif isinstance(stmt, SubProgramStatement):
-                stmt.analyze()
-                self.a.external_subprogram[stmt.name] = stmt
-            elif isinstance(stmt, BlockData):
-                stmt.analyze()
-                self.a.blockdata[stmt.name] = stmt
-            else:
-                stmt.analyze()
-        return
-
-    def get_classes(self):
-        return program_unit
-
-    def process_subitem(self, item):
-        # MAIN block does not define start/end line conditions,
-        # so it should never end until all lines are read.
-        # However, sometimes F77 programs lack the PROGRAM statement,
-        # and here we fix that:
-        if self.reader.isfix77:
-            line = item.get_line()
-            if line=='end':
-                message = item.reader.format_message(\
-                        'WARNING',
-                        'assuming the end of undefined PROGRAM statement',
-                        item.span[0],item.span[1])
-                print >> sys.stderr, message
-                p = Program(self)
-                p.content.extend(self.content)
-                p.content.append(EndProgram(p,item))
-                self.content[:] = [p]
-                return
-        return BeginStatement.process_subitem(self, item)
-
-    def topyf(self, tab=''): # XXXX
-        s = ''
-        for name, stmt in self.a.module.items():
-            s += stmt.topyf()
-        for name, stmt in self.a.external_subprogram.items():
-            s += stmt.topyf()
-        for name, stmt in self.a.blockdata.items():
-            s += stmt.topyf()
-        return s
-# Module
-
-class EndModule(EndStatement):
-    match = re.compile(r'end(\s*module\s*\w*|)\Z', re.I).match
-
-class Module(BeginStatement, HasAttributes,
-             HasImplicitStmt, HasUseStmt, HasVariables,
-             HasTypeDecls):
-    """
-    MODULE <name>
-     ..
-    END [MODULE [name]]
-    """
-    match = re.compile(r'module\s*\w+\Z', re.I).match
-    end_stmt_cls = EndModule
-
-    a = AttributeHolder(module_subprogram = {},
-                        module_provides = {}, # all symbols that are public and so
-                                              # can be imported via USE statement
-                                              # by other blocks
-                        )
-
-    known_attributes = ['PUBLIC', 'PRIVATE']
-
-    def get_classes(self):
-        return access_spec + specification_part + module_subprogram_part
-
-    def process_item(self):
-        name = self.item.get_line().replace(' ','')[len(self.blocktype):].strip()
-        self.name = name
-        return BeginStatement.process_item(self)
-
-    def get_provides(self):
-        return self.a.module_provides
-
-    def analyze(self):
-        content = self.content[:]
-
-        while content:
-            stmt = content.pop(0)
-            if isinstance(stmt, Contains):
-                for stmt in filter_stmts(content, SubProgramStatement):
-                    stmt.analyze()
-                    self.a.module_subprogram[stmt.name] = stmt
-                stmt = content.pop(0)
-                assert isinstance(stmt, EndModule),`stmt`
-                continue
-            stmt.analyze()
-
-        if content:
-            self.show_message('Not analyzed content: %s' % content)
-
-        module_provides = self.a.module_provides
-        for name, var in self.a.variables.items():
-            if var.is_public():
-                if module_provides.has_key(name):
-                    self.warning('module data object name conflict with %s, overriding.' % (name))
-                module_provides[name] = var
-
-        return
-
-    def topyf(self, tab=''):
-        s = tab + 'MODULE '+self.name + '\n'
-        s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
-        s +=  HasAttributesStmt.topyf(self, tab=tab+'  ')
-        s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
-        s +=  HasVariables.topyf(self, tab=tab+'  ')
-        s +=  tab + '  CONTAINS\n'
-        for name, stmt in self.a.module_subprogram.items():
-            s += stmt.topyf(tab=tab+'    ')
-        s += tab + 'END MODULE ' + self.name + '\n'
-        return s
-
-# Python Module
-
-class EndPythonModule(EndStatement):
-    match = re.compile(r'end(\s*python\s*module\s*\w*|)\Z', re.I).match
-
-class PythonModule(BeginStatement, HasImplicitStmt, HasUseStmt):
-    """
-    PYTHON MODULE <name>
-     ..
-    END [PYTHON MODULE [name]]
-    """
-    modes = ['pyf']
-    match = re.compile(r'python\s*module\s*\w+\Z', re.I).match
-    end_stmt_cls = EndPythonModule
-
-    def get_classes(self):
-        return [Interface, Function, Subroutine, Module]
-
-    def process_item(self):
-        self.name = self.item.get_line().replace(' ','')\
-                    [len(self.blocktype):].strip()
-        return BeginStatement.process_item(self)
-
-# Program
-
-class EndProgram(EndStatement):
-    """
-    END [PROGRAM [name]]
-    """
-    match = re.compile(r'end(\s*program\s*\w*|)\Z', re.I).match
-
-class Program(BeginStatement, ProgramBlock,
-              HasAttributes, # XXX: why Program needs .attributes?
-              HasImplicitStmt, HasUseStmt):
-    """ PROGRAM [name]
-    """
-    match = re.compile(r'program\s*\w*\Z', re.I).match
-    end_stmt_cls = EndProgram
-
-    def get_classes(self):
-        return specification_part + execution_part + internal_subprogram_part
-
-    def process_item(self):
-        if self.item is not None:
-            name = self.item.get_line().replace(' ','')\
-                   [len(self.blocktype):].strip()
-            if name:
-                self.name = name
-        return BeginStatement.process_item(self)
-
-# BlockData
-
-class EndBlockData(EndStatement):
-    """
-    END [ BLOCK DATA [ <block-data-name> ] ] 
-    """
-    match = re.compile(r'end(\s*block\s*data\s*\w*|)\Z', re.I).match
-    blocktype = 'blockdata'
-
-class BlockData(BeginStatement, HasImplicitStmt, HasUseStmt,
-                HasVariables):
-    """
-    BLOCK DATA [ <block-data-name> ]
-    """
-    end_stmt_cls = EndBlockData
-    match = re.compile(r'block\s*data\s*\w*\Z', re.I).match
-
-    def process_item(self):
-        self.name = self.item.get_line()[5:].lstrip()[4:].lstrip()
-        return BeginStatement.process_item(self)
-
-    def get_classes(self):
-        return specification_part
-        
-# Interface
-
-class EndInterface(EndStatement):
-    match = re.compile(r'end\s*interface\s*\w*\Z', re.I).match
-    blocktype = 'interface'
-
-class Interface(BeginStatement, HasImplicitStmt, HasUseStmt,
-                HasModuleProcedures
-                ):
-    """
-    INTERFACE [<generic-spec>] | ABSTRACT INTERFACE
-    END INTERFACE [<generic-spec>]
-
-    <generic-spec> = <generic-name>
-                   | OPERATOR ( <defined-operator> )
-                   | ASSIGNMENT ( = )
-                   | <dtio-generic-spec>
-    <dtio-generic-spec> = READ ( FORMATTED )
-                        | READ ( UNFORMATTED )
-                        | WRITE ( FORMATTED )
-                        | WRITE ( UNFORMATTED )
-    
-    """
-    modes = ['free90', 'fix90', 'pyf']
-    match = re.compile(r'(interface\s*(\w+\s*\(.*\)|\w*)|abstract\s*interface)\Z',re.I).match
-    end_stmt_cls = EndInterface
-    blocktype = 'interface'
-
-    a = AttributeHolder(interface_provides = {})
-
-    def get_classes(self):
-        return intrinsic_type_spec + interface_specification
-
-    def process_item(self):
-        line = self.item.get_line()
-        self.isabstract = line.startswith('abstract')
-        if self.isabstract:
-            self.generic_spec = ''
-        else:
-            self.generic_spec = line[len(self.blocktype):].strip()
-        self.name = self.generic_spec # XXX
-        return BeginStatement.process_item(self)
-
-    def tostr(self):
-        if self.isabstract:
-            return 'ABSTRACT INTERFACE'
-        return 'INTERFACE '+ str(self.generic_spec)
-
-    def get_provides(self):
-        return self.a.interface_provides
-
-    def analyze(self):
-        content = self.content[:]
-
-        while content:
-            stmt = content.pop(0)
-            if isinstance(stmt, self.end_stmt_cls):
-                break
-            stmt.analyze()
-            assert isinstance(stmt, SubProgramStatement),`stmt.__class__.__name__`
-        if content:
-            self.show_message('Not analyzed content: %s' % content)
-
-        parent_provides = self.parent.get_provides()
-        if parent_provides is not None:
-            if self.is_public():
-                if parent_provides.has_key(self.name):
-                    self.warning('interface name conflict with %s, overriding.' % (self.name))
-                parent_provides[self.name] = self
-    
-        return
-
-# Subroutine
-
-class SubProgramStatement(BeginStatement, ProgramBlock,
-                          HasImplicitStmt, HasAttributes,
-                          HasUseStmt,
-                          HasVariables, HasTypeDecls
-                          ):
-    """
-    [ <prefix> ] <FUNCTION|SUBROUTINE> <name> [ ( <args> ) ] [ <suffix> ]
-    """
-    known_attributes = ['PUBLIC', 'PRIVATE']
-
-    a = AttributeHolder(internal_subprogram = {})
-
-    def process_item(self):
-        clsname = self.__class__.__name__.lower()
-        item = self.item
-        line = item.get_line()
-        m = self.match(line)
-        i = line.find(clsname)
-        assert i!=-1,`line`
-        self.prefix = line[:i].rstrip()
-        self.name = line[i:m.end()].lstrip()[len(clsname):].strip()
-        line = line[m.end():].lstrip()
-        args = []
-        if line.startswith('('):
-            i = line.find(')')
-            assert i!=-1,`line`
-            line2 = item.apply_map(line[:i+1])
-            for a in line2[1:-1].split(','):
-                a=a.strip()
-                if not a: continue
-                args.append(a)
-            line = line[i+1:].lstrip()
-        suffix = item.apply_map(line)
-        self.bind, suffix = parse_bind(suffix, item)
-        self.result = None
-        if isinstance(self, Function):
-            self.result, suffix = parse_result(suffix, item)
-            if suffix:
-                assert self.bind is None,`self.bind`
-                self.bind, suffix = parse_result(suffix, item)
-            if self.result is None:
-                self.result = self.name
-        assert not suffix,`suffix`
-        self.args = args
-        self.typedecl = None
-        return BeginStatement.process_item(self)
-
-    def tostr(self):
-        clsname = self.__class__.__name__.upper()
-        s = ''
-        if self.prefix:
-            s += self.prefix + ' '
-        if self.typedecl is not None:
-            assert isinstance(self, Function),`self.__class__.__name__`
-            s += self.typedecl.tostr() + ' '
-        s += clsname
-        suf = ''
-        if self.result and self.result!=self.name:
-            suf += ' RESULT ( %s )' % (self.result)
-        if self.bind:
-            suf += ' BIND ( %s )' % (', '.join(self.bind))
-        return '%s %s(%s)%s' % (s, self.name,', '.join(self.args),suf)
-
-    def get_classes(self):
-        return f2py_stmt + specification_part + execution_part \
-               + internal_subprogram_part
-
-    def analyze(self):
-        content = self.content[:]
-
-        if self.prefix:
-            self.update_attributes(prefix.upper().split())
-
-        variables = self.a.variables
-        for a in self.args:
-            assert not variables.has_key(a)
-            assert is_name(a)
-            variables[a] = Variable(self, a)
-
-        if isinstance(self, Function):
-            var = variables[self.result] = Variable(self, self.result)
-            if self.typedecl is not None:
-                var.set_type(self.typedecl)
-
-        while content:
-            stmt = content.pop(0)
-            if isinstance(stmt, Contains):
-                for stmt in filter_stmts(content, SubProgramStatement):
-                    stmt.analyze()
-                    self.a.internal_subprogram[stmt.name] = stmt
-                stmt = content.pop(0)
-                assert isinstance(stmt, self.end_stmt_cls),`stmt`
-            elif isinstance(stmt, self.end_stmt_cls):
-                continue
-            else:
-                stmt.analyze()
-
-        if content:
-            self.show_message('Not analyzed content: %s' % content)
-
-        parent_provides = self.parent.get_provides()
-        if parent_provides is not None:
-            if self.is_public():
-                if parent_provides.has_key(self.name):
-                    self.warning('module subprogram name conflict with %s, overriding.' % (self.name))
-                parent_provides[self.name] = self
-
-        return
-
-    def topyf(self, tab=''):
-        s = tab + self.__class__.__name__.upper()
-        s += ' ' + self.name + ' (%s)' % (', '.join(self.args))
-        if isinstance(self, Function) and self.result != self.name:
-            s += ' RESULT (%s)' % (self.result)
-        s += '\n'
-        s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
-        s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
-        s +=  HasVariables.topyf(self, tab=tab+'  ')
-        s += tab + 'END ' + self.__class__.__name__.upper() + ' ' + self.name + '\n'
-        return s
-
-class EndSubroutine(EndStatement):
-    """
-    END [SUBROUTINE [name]]
-    """
-    match = re.compile(r'end(\s*subroutine\s*\w*|)\Z', re.I).match
-
-
-class Subroutine(SubProgramStatement):
-    """
-    [ <prefix> ] SUBROUTINE <name> [ ( [ <dummy-arg-list> ] ) [ <proc-language-binding-spec> ]]
-    """
-    end_stmt_cls = EndSubroutine
-    match = re.compile(r'(recursive|pure|elemental|\s)*subroutine\s*\w+', re.I).match
-    _repr_attr_names = ['prefix','bind','suffix','args'] + Statement._repr_attr_names
-
-# Function
-
-class EndFunction(EndStatement):
-    """
-    END [FUNCTION [name]]
-    """
-    match = re.compile(r'end(\s*function\s*\w*|)\Z', re.I).match
-
-class Function(SubProgramStatement):
-    """
-    [ <prefix> ] FUNCTION <name> ( [<dummy-arg-list>] ) [<suffix>]
-    <prefix> = <prefix-spec> [ <prefix-spec> ]...
-    <prefix-spec> = <declaration-type-spec>
-                  | RECURSIVE | PURE | ELEMENTAL
-    <suffix> = <proc-language-binding-spec> [ RESULT ( <result-name> ) ]
-             | RESULT ( <result-name> ) [ <proc-language-binding-spec> ]
-    """
-    end_stmt_cls = EndFunction
-    match = re.compile(r'(recursive|pure|elemental|\s)*function\s*\w+', re.I).match
-    _repr_attr_names = ['prefix','bind','suffix','args','typedecl'] + Statement._repr_attr_names
-
-# Handle subprogram prefixes
-
-class SubprogramPrefix(Statement):
-    """
-    <prefix> <declaration-type-spec> <function|subroutine> ...
-    """
-    match = re.compile(r'(pure|elemental|recursive|\s)+\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()
-        m = self.match(line)
-        prefix = line[:m.end()].rstrip()
-        rest = self.item.get_line()[m.end():].lstrip()
-        if rest:
-            self.parent.put_item(self.item.copy(prefix))
-            self.item.clone(rest)
-            self.isvalid = False
-            return
-        if self.parent.__class__ not in [Function, Subroutine]:
-            self.isvalid = False
-            return
-        prefix = prefix + ' ' + self.parent.prefix
-        self.parent.prefix = prefix.strip()
-        self.ignore = True
-        return
-
-# SelectCase
-
-class EndSelect(EndStatement):
-    match = re.compile(r'end\s*select\s*\w*\Z', re.I).match
-    blocktype = 'select'
-
-class Select(BeginStatement):
-    """
-    [ <case-construct-name> : ] SELECT CASE ( <case-expr> )
-    
-    """
-    match = re.compile(r'select\s*case\s*\(.*\)\Z',re.I).match
-    end_stmt_cls = EndSelect
-    name = ''
-    def tostr(self):
-        return 'SELECT CASE ( %s )' % (self.expr)
-    def process_item(self):
-        self.expr = self.item.get_line()[6:].lstrip()[4:].lstrip()[1:-1].strip()
-        self.name = self.item.label                
-        return BeginStatement.process_item(self)
-
-    def get_classes(self):
-        return [Case] + execution_part_construct
-
-# Where
-
-class EndWhere(EndStatement):
-    """
-    END WHERE [ <where-construct-name> ]
-    """
-    match = re.compile(r'end\s*\where\s*\w*\Z',re.I).match
-    
-
-class Where(BeginStatement):
-    """
-    [ <where-construct-name> : ] WHERE ( <mask-expr> )
-    <mask-expr> = <logical-expr>
-    """
-    match = re.compile(r'where\s*\([^)]*\)\Z',re.I).match
-    end_stmt_cls = EndWhere
-    name = ''
-    def tostr(self):
-        return 'WHERE ( %s )' % (self.expr)
-    def process_item(self):
-        self.expr = self.item.get_line()[5:].lstrip()[1:-1].strip()
-        self.name = self.item.label
-        return BeginStatement.process_item(self)
-
-    def get_classes(self):
-        return [Assignment, WhereStmt,
-                WhereConstruct, ElseWhere
-                ]
-
-WhereConstruct = Where
-
-# Forall
-
-class EndForall(EndStatement):
-    """
-    END FORALL [ <forall-construct-name> ]
-    """
-    match = re.compile(r'end\s*forall\s*\w*\Z',re.I).match
-    
-class Forall(BeginStatement):
-    """
-    [ <forall-construct-name> : ] FORALL <forall-header>
-      [ <forall-body-construct> ]...
-    <forall-body-construct> = <forall-assignment-stmt>
-                            | <where-stmt>
-                            | <where-construct>
-                            | <forall-construct>
-                            | <forall-stmt>
-    <forall-header> = ( <forall-triplet-spec-list> [ , <scalar-mask-expr> ] )
-    <forall-triplet-spec> = <index-name> = <subscript> : <subscript> [ : <stride> ]
-    <subscript|stride> = <scalar-int-expr>
-    <forall-assignment-stmt> = <assignment-stmt> | <pointer-assignment-stmt>
-    """
-    end_stmt_cls = EndForall
-    match = re.compile(r'forarr\s*\(.*\)\Z',re.I).match
-    name = ''
-    def process_item(self):
-        self.specs = self.item.get_line()[6:].lstrip()[1:-1].strip()
-        return BeginStatement.process_item(self)
-    def tostr(self):
-        return 'FORALL (%s)' % (self.specs)
-    def get_classes(self):
-        return [GeneralAssignment, WhereStmt, WhereConstruct,
-                ForallConstruct, ForallStmt]
-
-ForallConstruct = Forall
-
-# IfThen
-
-class EndIfThen(EndStatement):
-    """
-    END IF [ <if-construct-name> ]
-    """
-    match = re.compile(r'end\s*if\s*\w*\Z', re.I).match
-    blocktype = 'if'
-
-class IfThen(BeginStatement):
-    """
-    [<if-construct-name> :] IF ( <scalar-logical-expr> ) THEN
-
-    IfThen instance has the following attributes:
-      expr
-    """
-
-    match = re.compile(r'if\s*\(.*\)\s*then\Z',re.I).match
-    end_stmt_cls = EndIfThen
-    name = ''
-
-    def tostr(self):
-        return 'IF (%s) THEN' % (self.expr)
-
-    def process_item(self):
-        item = self.item
-        line = item.get_line()[2:-4].strip()
-        assert line[0]=='(' and line[-1]==')',`line`
-        self.expr = line[1:-1].strip()
-        self.name = item.label
-        return BeginStatement.process_item(self)
-        
-    def get_classes(self):
-        return [Else, ElseIf] + execution_part_construct
-
-class If(BeginStatement):
-    """
-    IF ( <scalar-logical-expr> ) action-stmt
-    """
-
-    match = re.compile(r'if\s*\(').match
-
-    def process_item(self):
-        item = self.item
-        mode = self.reader.mode
-        classes = self.get_classes()
-        classes = [cls for cls in classes if mode in cls.modes]
-
-        line = item.get_line()[2:]
-        i = line.find(')')
-        expr = line[1:i].strip()
-        line = line[i+1:].strip()
-        if line.lower()=='then':
-            self.isvalid = False
-            return
-        self.expr = expr[1:-1]
-
-        if not line:
-            newitem = self.get_item()
-        else:
-            newitem = item.copy(line)
-        newline = newitem.get_line()
-        for cls in classes:
-            if cls.match(newline):
-                stmt = cls(self, newitem)
-                if stmt.isvalid:
-                    self.content.append(stmt)
-                    return
-        if not line:
-            self.put_item(newitem)
-        self.isvalid = False
-        return
-        
-    def tostr(self):
-        assert len(self.content)==1,`self.content`
-        return 'IF (%s) %s' % (self.expr, str(self.content[0]).lstrip())
-
-    def __str__(self):
-        return self.get_indent_tab(colon=':') + self.tostr()
-
-    def get_classes(self):
-        return action_stmt
-
-# Do
-
-class EndDo(EndStatement):
-    """
-    END DO [ <do-construct-name> ]
-    """
-    match = re.compile(r'end\s*do\s*\w*\Z', re.I).match
-    blocktype = 'do'
-
-class Do(BeginStatement):
-    """
-    [ <do-construct-name> : ] DO label [loopcontrol]
-    [ <do-construct-name> : ] DO [loopcontrol]
-
-    """
-
-    match = re.compile(r'do\b\s*\d*',re.I).match
-    item_re = re.compile(r'do\b\s*(?P<label>\d*)\s*,?\s*(?P<loopcontrol>.*)\Z',re.I).match
-    end_stmt_cls = EndDo
-    name = ''
-
-    def tostr(self):
-        return 'DO %s %s' % (self.endlabel, self.loopcontrol)
-
-    def process_item(self):
-        item = self.item
-        line = item.get_line()
-        m = self.item_re(line)
-        self.endlabel = m.group('label').strip()
-        self.name = item.label
-        self.loopcontrol = m.group('loopcontrol').strip()
-        return BeginStatement.process_item(self)
-
-    def process_subitem(self, item):
-        r = False
-        if self.endlabel:
-            label = item.label
-            if label == self.endlabel:
-                r = True
-                if isinstance(self.parent, Do) and label==self.parent.endlabel:
-                    # the same item label may be used for different block ends
-                    self.put_item(item)
-        return BeginStatement.process_subitem(self, item) or r
-
-    def get_classes(self):
-        return execution_part_construct
-
-# Associate
-
-class EndAssociate(EndStatement):
-    """
-    END ASSOCIATE [ <associate-construct-name> ]
-    """
-    match = re.compile(r'end\s*associate\s*\w*\Z',re.I).match
-
-class Associate(BeginStatement):
-    """
-    [ <associate-construct-name> : ] ASSOCIATE ( <association-list> )
-      <block>
-
-    <association> = <associate-name> => <selector>
-    <selector> = <expr> | <variable>
-    """
-    match = re.compile(r'associate\s*\(.*\)\Z',re.I).match
-    end_stmt_cls = EndAssociate
-    
-    def process_item(self):
-        line = self.item.get_line()[9:].lstrip()
-        self.associations = line[1:-1].strip()
-        return BeginStatement.process_item(self)
-    def tostr(self):
-        return 'ASSOCIATE (%s)' % (self.associations)
-    def get_classes(self):
-        return execution_part_construct
-
-# Type
-
-class EndType(EndStatement):
-    """
-    END TYPE [<type-name>]
-    """
-    match = re.compile(r'end\s*type\s*\w*\Z', re.I).match
-    blocktype = 'type'
-
-class Type(BeginStatement, HasVariables, HasAttributes):
-    """
-    TYPE [ [ , <type-attr-spec-list>] :: ] <type-name> [ ( <type-param-name-list> ) ]
-    <type-attr-spec> = <access-spec> | EXTENDS ( <parent-type-name> )
-                       | ABSTRACT | BIND(C)
-    """
-    match = re.compile(r'type\b\s*').match
-    end_stmt_cls = EndType
-
-    a = AttributeHolder(extends = None,
-                        parameters = {},
-                        component_names = [], # specifies component order for sequence types
-                        components = {}
-                        )
-    known_attributes = re.compile(r'\A(PUBLIC|PRIVATE|SEQUENCE|ABSTRACT|BIND\s*\(.*\))\Z').match
-
-    def process_item(self):
-        line = self.item.get_line()[4:].lstrip()
-        if line.startswith('('):
-            self.isvalid = False
-            return
-        specs = []
-        i = line.find('::')
-        if i!=-1:
-            for s in line[:i].split(','):
-                s = s.strip()
-                if s: specs.append(s)
-            line = line[i+2:].lstrip()
-        self.specs = specs
-        i = line.find('(')
-        if i!=-1:
-            self.name = line[:i].rstrip()
-            assert line[-1]==')',`line`
-            self.params = split_comma(line[i+1:-1].lstrip())
-        else:
-            self.name = line
-            self.params = []
-        if not is_name(self.name):
-            self.isvalid = False
-            return
-        return BeginStatement.process_item(self)
-
-    def tostr(self):
-        s = 'TYPE'
-        if self.specs:
-            s += ', '.join(['']+self.specs) + ' ::'
-        s += ' ' + self.name
-        if self.params:
-            s += ' ('+', '.join(self.params)+')'
-        return s
-
-    def get_classes(self):
-        return [Integer] + private_or_sequence + component_part +\
-               type_bound_procedure_part
-
-    def analyze(self):
-        BeginStatement.analyze(self)
-        for spec in self.specs:
-            i = spec.find('(')
-            if i!=-1:
-                assert spec.endswith(')'),`spec`
-                s = spec[:i].rstrip().upper()
-                n = spec[i+1:-1].strip()
-                if s=='EXTENDS':
-                    self.a.extends = n
-                    continue
-                elif s=='BIND':
-                    args,rest = parse_bind(spec)
-                    assert not rest,`rest`
-                    spec = 'BIND(%s)' % (', '.join(args))
-                else:
-                    spec = '%s(%s)' % (s,n)
-            else:
-                spec = spec.upper()
-            self.update_attributes(spec)
-
-        component_names = self.a.component_names
-        content = self.content[:]
-        while content:
-            stmt = content.pop(0)
-            if isinstance(stmt, self.end_stmt_cls):
-                break
-            stmt.analyze()
-
-        if content:
-            self.show_message('Not analyzed content: %s' % content)
-
-        parameters = self.a.parameters
-        components = self.a.components
-        component_names = self.a.component_names
-        for name in self.a.variable_names:
-            var = self.a.variables[name]
-            if name in self.params:
-                parameters[name] = var
-            else:
-                component_names.append(name)
-                components[name] = var
-
-        self.parent.a.type_decls[self.name] = self
-
-        parent_provides = self.parent.get_provides()
-        if parent_provides is not None:
-            if self.is_public():
-                if parent_provides.has_key(self.name):
-                    self.warning('type declaration name conflict with %s, overriding.' % (self.name))
-                parent_provides[self.name] = self
-
-        return
-
-    def topyf(self, tab=''):
-        s = tab + 'TYPE'
-        if self.a.extends is not None:
-            s += ', EXTENDS(%s) ::' % (self.a.extends) 
-        s += ' ' + self.name
-        if self.a.parameters:
-            s += ' (%s)' % (', '.join(self.a.parameters))
-        s += '\n'
-        s += HasAttributes.topyf(self, tab=tab+'  ')
-        s += HasVariables.topyf(self, tab=tab+'  ')
-        s += tab + 'END TYPE ' + self.name + '\n'
-        return s
-
-    # Wrapper methods:
-
-    def get_bit_size(self, _cache={}):
-        try:
-            return _cache[id(self)]
-        except KeyError:
-            s = 0
-            for name,var in self.a.components.items():
-                s += var.get_bit_size()
-            _cache[id(self)] = s
-        return s
-
-    def get_f_type(self):
-        return 'TYPE(%s)' % (self.name)
-
-    def get_c_type(self):
-        return 'f2py_type_%s_%s' % (self.name, self.get_bit_size())
-
-    def get_c_name(self):
-        return 'f2py_type_%s' % (self.name)
-
-    def get_c_struct_name(self):
-        return self.get_c_name() + '_struct'
-
-    def get_c_struct(self):
-        l = []
-        for name, var in self.a.components.items():
-            t = var.get_typedecl()
-            l.append('  %s %s;' % (t.get_c_type(), name))
-        return 'typedef struct {\n%s\n} %s;' % ('\n'.join(l), self.get_c_struct_name())
-
-TypeDecl = Type
-
-# Enum
-
-class EndEnum(EndStatement):
-    """
-    END ENUM
-    """
-    match = re.compile(r'end\s*enum\Z',re.I).match
-    blocktype = 'enum'
-
-class Enum(BeginStatement):
-    """
-    ENUM , BIND(C)
-      <enumerator-def-stmt>
-      [ <enumerator-def-stmt> ]...
-    """
-    blocktype = 'enum'
-    end_stmt_cls = EndEnum
-    match = re.compile(r'enum\s*,\s*bind\s*\(\s*c\s*\)\Z',re.I).match
-    def process_item(self):
-        return BeginStatement.process_item(self)
-    def get_classes(self):
-        return [Enumerator]
-
-###################################################
-
-from statements import *
-from typedecl_statements import *
-
-f2py_stmt = [Threadsafe, FortranName, Depend, Check, CallStatement,
-             CallProtoArgument]
-
-access_spec = [Public, Private]
-
-interface_specification = [Function, Subroutine,
-                           ModuleProcedure
-                           ]
-
-module_subprogram_part = [ Contains, Function, Subroutine ]
-
-specification_stmt = access_spec + [ Allocatable, Asynchronous, Bind,
-    Common, Data, Dimension, Equivalence, External, Intent, Intrinsic,
-    Namelist, Optional, Pointer, Protected, Save, Target, Volatile,
-    Value ]
-
-intrinsic_type_spec = [ SubprogramPrefix, Integer , Real,
-    DoublePrecision, Complex, DoubleComplex, Character, Logical, Byte
-    ]
-
-derived_type_spec = [  ]
-type_spec = intrinsic_type_spec + derived_type_spec
-declaration_type_spec = intrinsic_type_spec + [ TypeStmt, Class ]
-    
-type_declaration_stmt = declaration_type_spec
-
-private_or_sequence = [ Private, Sequence ]
-
-component_part = declaration_type_spec + [ ModuleProcedure ]
-
-proc_binding_stmt = [SpecificBinding, GenericBinding, FinalBinding]
-
-type_bound_procedure_part = [Contains, Private] + proc_binding_stmt
-
-#R214
-action_stmt = [ Allocate, GeneralAssignment, Assign, Backspace, Call, Close,
-    Continue, Cycle, Deallocate, Endfile, Exit, Flush, ForallStmt,
-    Goto, If, Inquire, Nullify, Open, Print, Read, Return, Rewind,
-    Stop, Wait, WhereStmt, Write, ArithmeticIf, ComputedGoto,
-    AssignedGoto, Pause ]
-# GeneralAssignment = Assignment + PointerAssignment
-# EndFunction, EndProgram, EndSubroutine - part of the corresponding blocks
-
-executable_construct = [ Associate, Do, ForallConstruct, IfThen,
-    Select, WhereConstruct ] + action_stmt
-#Case, see Select
-
-execution_part_construct = executable_construct + [ Format, Entry,
-    Data ]
-
-execution_part = execution_part_construct[:]
-
-#C201, R208
-for cls in [EndFunction, EndProgram, EndSubroutine]:
-    try: execution_part.remove(cls)
-    except ValueError: pass
-
-internal_subprogram = [Function, Subroutine]
-
-internal_subprogram_part = [ Contains, ] + internal_subprogram
-
-declaration_construct = [ TypeDecl, Entry, Enum, Format, Interface,
-    Parameter, ModuleProcedure, ] + specification_stmt + \
-    type_declaration_stmt
-# stmt-function-stmt
-
-implicit_part = [ Implicit, Parameter, Format, Entry ]
-
-specification_part = [ Use, Import ] + implicit_part + \
-                     declaration_construct
-
-
-external_subprogram = [Function, Subroutine]
-
-main_program = [Program] + specification_part + execution_part + \
-               internal_subprogram_part
-
-program_unit = main_program + external_subprogram + [Module,
-                                                     BlockData ]

Deleted: trunk/numpy/f2py/lib/doc.txt
===================================================================
--- trunk/numpy/f2py/lib/doc.txt	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/doc.txt	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,311 +0,0 @@
-
-Created: September 2006
-Author: Pearu Peterson <pearu.peterson at gmail.com>
-
-Structure
-=========
-
-numpy.f2py.lib package contains the following files:
-
-readfortran.py
---------------
-
-Tools for reading Fortran codes from file and string objects.
-
-To read Fortran code from a file, use FortranFileReader class.
-
-FortranFileReader class is iterator over Fortran code lines
-as is derived from FortranReaderBase class.
-It automatically handles line continuations and comments as
-well as detects if Fortran file is in free or fixed format.
-
-For example,
-
-::
-  >>> from readfortran import *
-  >>> import os
-  >>> reader = FortranFileReader(os.path.expanduser('~/src/blas/daxpy.f'))
-  >>> reader.next()
-  Line('subroutine daxpy(n,da,dx,incx,dy,incy)',(1, 1),'')
-  >>> reader.next()
-  Comment('c     constant times a vector plus a vector.\nc     uses unrolled loops for increments equal to one.\nc     jack dongarra, linpack, 3/11/78.\nc     modified 12/3/93, array(1) declarations changed to array(*)',(3, 6))
-  >>> reader.next()
-  Line('double precision dx(*),dy(*),da',(8, 8),'')
-  >>> reader.next()
-  Line('integer i,incx,incy,ix,iy,m,mp1,n',(9, 9),'')
-
-FortranReaderBase.next() method may return Line, SyntaxErrorLine, Comment, MultiLine,
-SyntaxErrorMultiLine instances.
-
-Line instance has the following attributes:
-
-  * .line - contains Fortran code line
-  * .span - a 2-tuple containing the span of line numbers containing
-            Fortran code in the original Fortran file
-  * .label - the label of Fortran code line
-  * .reader - the FortranReaderBase class instance
-  * .strline - if not None then contains Fortran code line with parenthesis
-             content and string literal constants saved in .strlinemap dictionary.
-  * .is_f2py_directive - True if line started with f2py directive comment.
-
-and the following methods:
-
-  * .get_line() - returns .strline (also evalutes it if None). Also
-                  handles Hollerith contstants in fixed F77 mode.
-  * .isempty()  - returns True if Fortran line contains no code.
-  * .copy(line=None, apply_map=False) - returns a Line instance
-    with given .span, .label, .reader information but line content
-    replaced with line (when not None) and applying .strlinemap
-    mapping (when apply_map is True).
-  * .apply_map(line) - apply .strlinemap mapping to line.
-  * .has_map() - returns True if .strlinemap mapping exists.
-
-For example,
-
-::
-
-  >>> item = reader.next()
-  >>> item
-  Line('if(n.le.0)return',(11, 11),'')
-  >>> item.line
-  'if(n.le.0)return'
-  >>> item.strline
-  'if(F2PY_EXPR_TUPLE_4)return'
-  >>> item.strlinemap
-  {'F2PY_EXPR_TUPLE_4': 'n.le.0'}
-  >>> item.label
-  ''
-  >>> item.span 
-  (11, 11)
-  >>> item.get_line()
-  'if(F2PY_EXPR_TUPLE_4)return'
-  >>> item.copy('if(F2PY_EXPR_TUPLE_4)pause',True)
-  Line('if(n.le.0)pause',(11, 11),'')
-
-Comment instance has the following attributes:
-
-  * .comment - comment string
-  * .span - a 2-tuple containing the span of line numbers containing
-            Fortran comment in the original Fortran file
-  * .reader - the FortranReaderBase class instance
-
-and .isempty() method.
-
-MultiLine class represents multiline syntax in .pyf files::
-
-  <prefix>'''<lines>'''<suffix>
-
-MultiLine instance has the following attributes:
-
-  * .prefix - the content of <prefix>
-  * .block - a list of lines
-  * .suffix - the content of <suffix>
-  * .span - a 2-tuple containing the span of line numbers containing
-            multiline syntax in the original Fortran file
-  * .reader - the FortranReaderBase class instance
-
-and .isempty() method.
-
-SyntaxErrorLine and SyntaxErrorMultiLine are like Line and MultiLine
-classes, respectively, with a functionality of issuing an error
-message to sys.stdout when constructing an instance of the corresponding
-class.
-
-To read a Fortran code from a string, use FortranStringReader class::
-
-  reader = FortranStringReader(<string>, <isfree>, <isstrict>)
-
-where the second and third arguments are used to specify the format
-of the given <string> content. When <isfree> and <isstrict> are both
-True, the content of a .pyf file is assumed. For example,
-
-::
-
-  >>> code = """                       
-  ... c      comment
-  ...       subroutine foo(a)
-  ...       print*, "a=",a
-  ...       end
-  ... """
-  >>> reader = FortranStringReader(code, False, True)
-  >>> reader.next()
-  Comment('c      comment',(2, 2))
-  >>> reader.next()
-  Line('subroutine foo(a)',(3, 3),'')
-  >>> reader.next()
-  Line('print*, "a=",a',(4, 4),'')
-  >>> reader.next()
-  Line('end',(5, 5),'')
-
-FortranReaderBase has the following attributes:
-
-  * .source - a file-like object with .next() method to retrive 
-              a source code line
-  * .source_lines - a list of read source lines
-  * .reader - a FortranReaderBase instance for reading files
-              from INCLUDE statements.
-  * .include_dirs - a list of directories where INCLUDE files
-              are searched. Default is ['.'].
-
-and the following methods:
-
-  * .set_mode(isfree, isstrict) - set Fortran code format information
-  * .close_source() - called when .next() raises StopIteration exception.
-
-parsefortran.py
----------------
-
-Parse Fortran code from FortranReaderBase iterator.
-
-FortranParser class holds the parser information while
-iterating over items returned by FortranReaderBase iterator.
-The parsing information, collected when calling .parse() method,
-is saved in .block attribute as an instance
-of BeginSource class defined in block_statements.py file.
-
-For example,
-
-::
-
-  >>> reader = FortranStringReader(code, False, True)
-  >>> parser = FortranParser(reader)
-  >>> parser.parse()
-  >>> print parser.block
-        !BEGINSOURCE <cStringIO.StringI object at 0xb751d500> mode=fix77
-          SUBROUTINE foo(a)
-            PRINT *, "a=", a
-          END SUBROUTINE foo
-
-block_statements.py, base_classes.py, typedecl_statements.py, statements.py
----------------------------------------------------------------------------
-
-The model for representing Fortran code statements consists of a tree of Statement
-classes defined in base_classes.py. There are two types of statements: one line
-statements and block statements. Block statements consists of start and end
-statements, and content statements in between that can be of both types again.
-
-Statement instance has the following attributes:
-
-  * .parent  - it is either parent block-type statement or FortranParser instance.
-  * .item    - Line instance containing Fortran statement line information, see above.
-  * .isvalid - when False then processing this Statement instance will be skipped,
-               for example, when the content of .item does not match with
-               the Statement class.
-  * .ignore  - when True then the Statement instance will be ignored.
-  * .modes   - a list of Fortran format modes where the Statement instance is valid.
-
-and the following methods:
-
-  * .info(message), .warning(message), .error(message) - to spit messages to
-               sys.stderr stream.
-  * .get_variable(name) - get Variable instance by name that is defined in
-               current namespace. If name is not defined, then the corresponding
-               Variable instance is created.
-  * .analyze() - calculate various information about the Statement, this information
-               is saved in .a attribute that is AttributeHolder instance.
-
-All statement classes are derived from Statement class. Block statements are
-derived from BeginStatement class and is assumed to end with EndStatement
-instance in .content attribute list. BeginStatement and EndStatement instances
-have the following attributes:
-
-  * .name      - name of the block, blocks without names use line label
-                 as the name.
-  * .blocktype - type of the block (derived from class name)
-  * .content   - a list of Statement (or Line) instances.
-
-and the following methods:
-
-  * .__str__() - returns string representation of Fortran code.
-
-A number of statements may declare a variable that is used in other
-statement expressions. Variables are represented via Variable class
-and its instances have the following attributes:
-
-  * .name      - name of the variable
-  * .typedecl  - type declaration
-  * .dimension - list of dimensions
-  * .bounds    - list of bounds
-  * .length    - length specs
-  * .attributes - list of attributes
-  * .bind      - list of bind information
-  * .intent    - list of intent information
-  * .check     - list of check expressions
-  * .init      - initial value of the variable
-  * .parent    - statement instance declaring the variable
-  * .parents   - list of statements that specify variable information
-
-and the following methods:
-
-  * .is_private()
-  * .is_public()
-  * .is_allocatable()
-  * .is_external()
-  * .is_intrinsic()
-  * .is_parameter()
-  * .is_optional()
-  * .is_required()
-
-The following type declaration statements are defined in typedecl_statements.py:
-
-  Integer, Real, DoublePrecision, Complex, DoubleComplex, Logical, 
-  Character, Byte, Type, Class
-
-and they have the following attributes:
-
-  * .selector           - contains lenght and kind specs
-  * .entity_decls, .attrspec
-
-and methods:
-
-  * .tostr() - return string representation of Fortran type declaration
-  * .astypedecl() - pure type declaration instance, it has no .entity_decls
-                    and .attrspec.
-  * .analyze() - processes .entity_decls and .attsspec attributes and adds
-                 Variable instance to .parent.a.variables dictionary.
-
-The following block statements are defined in block_statements.py:
-
-  BeginSource, Module, PythonModule, Program, BlockData, Interface,
-  Subroutine, Function, Select, Where, Forall, IfThen, If, Do,
-  Associate, TypeDecl (Type), Enum
-
-Block statement classes may have different properties which are declared via
-deriving them from the following classes:
-
-  HasImplicitStmt, HasUseStmt, HasVariables, HasTypeDecls,
-  HasAttributes, HasModuleProcedures, ProgramBlock
-
-In summary, .a attribute may hold different information sets as follows:
-
-  BeginSource - .module, .external_subprogram, .blockdata
-  Module - .attributes, .implicit_rules, .use, .use_provides, .variables,
-           .type_decls, .module_subprogram, .module_data
-  PythonModule - .implicit_rules, .use, .use_provides
-  Program - .attributes, .implicit_rules, .use, .use_provides
-  BlockData - .implicit_rules, .use, .use_provides, .variables
-  Interface - .implicit_rules, .use, .use_provides, .module_procedures
-  Function, Subroutine - .implicit_rules, .attributes, .use, .use_statements,
-              .variables, .type_decls, .internal_subprogram
-  TypeDecl - .variables, .attributes
-
-Block statements have the following methods:
-
-  * .get_classes() - returns a list of Statement classes that are valid
-                     as a content of given block statement.
-
-The following one line statements are defined:
-
-  Implicit, TypeDeclarationStatement derivatives (see above),
-  Assignment, PointerAssignment, Assign, Call, Goto, ComputedGoto,
-  AssignedGoto, Continue, Return, Stop, Print, Read, Write, Flush,
-  Wait, Contains, Allocate, Deallocate, ModuleProcedure, Access,
-  Public, Private, Close, Cycle, Backspace, Endfile, Reeinf, Open,
-  Format, Save, Data, Nullify, Use, Exit, Parameter, Equivalence,
-  Dimension, Target, Pointer, Protected, Volatile, Value, 
-  ArithmeticIf, Intrinsic, Inquire, Sequence, External, Namelist,
-  Common, Optional, Intent, Entry, Import, Forall,
-  SpecificBinding, GenericBinding, FinalBinding, Allocatable,
-  Asynchronous, Bind, Else, ElseIf, Case, Where, ElseWhere,
-  Enumerator, FortranName, Threadsafe, Depend, Check,
-  CallStatement, CallProtoArgument, Pause

Modified: trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
===================================================================
--- trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -6,7 +6,7 @@
 """
 __all__ = ['pyobj_to_npy_scalar','pyobj_to_f2py_string','pyobj_from_npy_scalar']
 
-from utils import CHAR_BIT
+from parser.api import CHAR_BIT
 
 def pyobj_from_npy_int(ctype):
     ctype_bits = int(ctype[7:])

Deleted: trunk/numpy/f2py/lib/parsefortran.py
===================================================================
--- trunk/numpy/f2py/lib/parsefortran.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/parsefortran.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,194 +0,0 @@
-#!/usr/bin/env python
-"""
-Defines FortranParser.
-
-Permission to use, modify, and distribute this software is given under the
-terms of the NumPy License. See http://scipy.org.
-NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
-
-Author: Pearu Peterson <pearu at cens.ioc.ee>
-Created: May 2006
-"""
-
-__all__ = ['FortranParser']
-
-import re
-import sys
-import traceback
-from numpy.distutils.misc_util import yellow_text, red_text
-
-from readfortran import FortranFileReader, FortranStringReader
-from block_statements import BeginSource
-from utils import AnalyzeError
-
-class FortranParser:
-
-    cache = {}
-
-    def __init__(self, reader):
-        """
-        Parser of FortranReader structure.
-        Use .parse() method for parsing, parsing result is saved in .block attribute.
-        """
-        self.reader = reader
-        if self.cache.has_key(reader.id):
-            parser = self.cache[reader.id]
-            self.block = parser.block
-            self.is_analyzed = parser.is_analyzed
-            self.block.show_message('using cached %s' % (reader.id))
-        else:
-            self.cache[reader.id] = self
-            self.block = None
-            self.is_analyzed = False
-        return
-
-    def get_item(self):
-        try:
-            return self.reader.next(ignore_comments = True)
-        except StopIteration:
-            pass
-        return
-
-    def put_item(self, item):
-        self.reader.fifo_item.insert(0, item)
-        return
-
-    def parse(self):
-        if self.block is not None:
-            return
-        try:
-            block = self.block = BeginSource(self)
-        except KeyboardInterrupt:
-            raise
-        except:
-            reader = self.reader
-            while reader is not None:
-                message = reader.format_message('FATAL ERROR',
-                                                'while processing line',
-                                                reader.linecount, reader.linecount)
-                reader.show_message(message, sys.stdout)
-                reader = reader.reader
-            traceback.print_exc(file=sys.stdout)
-            self.reader.show_message(red_text('STOPPED PARSING'), sys.stdout)
-            return
-        return
-
-    def analyze(self):
-        if self.is_analyzed:
-            return
-        if self.block is None:
-            self.reader.show_message('Nothing to analyze.')
-            return
-        
-        try:
-            self.block.analyze()
-        except AnalyzeError:
-            pass
-        except:
-            raise
-        self.is_analyzed = True
-        return
-
-def test_pyf():
-    string = """
-python module foo
-  interface tere
-    subroutine bar
-    real r
-    end subroutine bar
-  end interface tere
-end python module foo
-"""
-    reader = FortranStringReader(string, True, True)
-    parser = FortranParser(reader)
-    block = parser.parse()
-    print block
-
-def test_free90():
-    string = """
-module foo
-
-   subroutine bar
-    real r
-    if ( pc_get_lun() .ne. 6) &
-    write ( pc_get_lun(), '( &
-    & /, a, /, " p=", i4, " stopping c_flag=", a, &
-    & /, " print unit=", i8)') &
-    trim(title), pcpsx_i_pel(), trim(c_flag), pc_get_lun()
-    if (.true.) then
-      call smth
-    end if
-    aaa : if (.false.) then
-    else if (a) then aaa
-    else aaa
-    end if aaa
-    hey = 1
-    end subroutine bar
-    abstract interface
- 
-    end interface
- 
-end module foo
-"""
-    reader = FortranStringReader(string, True, False)
-    parser = FortranParser(reader)
-    block = parser.parse()
-    print block
-
-def test_f77():
-    string = """\
-      program foo
-      a = 3
-      end
-      subroutine bar
-      end
-      pure function foo(a)
-      end
-      pure real*4 recursive function bar()
-      end
-"""
-    reader = FortranStringReader(string, False, True)
-    parser = FortranParser(reader)
-    block = parser.parse()
-    print block
-
-def simple_main():
-    import sys
-    if not sys.argv[1:]:
-        return parse_all_f()
-    for filename in sys.argv[1:]:
-        reader = FortranFileReader(filename)
-        print yellow_text('Processing '+filename+' (mode=%r)' % (reader.mode))
-        parser = FortranParser(reader)
-        parser.parse()
-        parser.analyze()
-        print parser.block.torepr(4)
-        #print parser.block
-
-def profile_main():
-    import hotshot, hotshot.stats
-    prof = hotshot.Profile("_parsefortran.prof")
-    prof.runcall(simple_main)
-    prof.close()
-    stats = hotshot.stats.load("_parsefortran.prof")
-    stats.strip_dirs()
-    stats.sort_stats('time', 'calls')
-    stats.print_stats(30)
-
-def parse_all_f():
-    for filename in open('opt_all_f.txt'):
-        filename = filename.strip()
-        reader = FortranFileReader(filename)
-        print yellow_text('Processing '+filename+' (mode=%r)' % (reader.mode))
-        parser = FortranParser(reader)
-        block = parser.parse()
-        print block
-
-if __name__ == "__main__":
-    #test_f77()
-    #test_free90()
-    #test_pyf()
-    simple_main()
-    #profile_main()
-    #parse_all_f()
-    

Added: trunk/numpy/f2py/lib/parser/__init__.py
===================================================================
--- trunk/numpy/f2py/lib/parser/__init__.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/parser/__init__.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,14 @@
+"""
+Tools for parsing Fortran 60/77/90/2003 codes into Statement tree.
+
+Use api module for importing public symbols.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""

Added: trunk/numpy/f2py/lib/parser/api.py
===================================================================
--- trunk/numpy/f2py/lib/parser/api.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/parser/api.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,53 @@
+"""
+Public API for Fortran parser.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+# import all Statement classes:
+from block_statements import *
+
+# CHAR_BIT is used to convert object bit sizes to byte sizes
+from utils import CHAR_BIT
+
+def parse(input, isfree=None, isstrict=None, include_dirs = None):
+    """ Parse input and return Statement tree.
+
+    input            --- string or filename.
+    isfree, isstrict --- specify input Fortran format.
+                         Defaults are True, False, respectively, or
+                         determined from input.
+    include_dirs     --- list of include directories.
+                         Default contains current working directory
+                         and the directory of file name.
+    """
+    import os
+    from readfortran import FortranFileReader, FortranStringReader
+    from parsefortran import FortranParser
+    if os.path.isfile(input):
+        reader = FortranFileReader(input,
+                                   include_dirs = include_dirs)
+        if isfree is None: reader.isfree
+        if isstrict is None: reader.isstrict
+        reader.set_mode(isfree, isstrict)
+    elif isinstance(input, str):
+        if isfree is None: isfree = True
+        if isstrict is None: isstrict = False
+        reader = FortranStringReader(input,
+                                     isfree, isstrict,
+                                     include_dirs = include_dirs)
+    else:
+        raise TypeError,'Expected string or filename input but got %s' % (type(input))
+    parser = FortranParser(reader)
+    parser.parse()
+    parser.analyze()
+    return parser.block
+
+    

Copied: trunk/numpy/f2py/lib/parser/base_classes.py (from rev 3235, trunk/numpy/f2py/lib/base_classes.py)
===================================================================
--- trunk/numpy/f2py/lib/base_classes.py	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,702 @@
+"""
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['Statement','BeginStatement','EndStatement', 'Variable',
+           'AttributeHolder','ProgramBlock']
+
+import re
+import sys
+import copy
+from readfortran import Line
+from numpy.distutils.misc_util import yellow_text, red_text
+from utils import split_comma, specs_split_comma, is_int_literal_constant
+
+class AttributeHolder:
+    # copied from symbolic.base module
+    """
+    Defines a object with predefined attributes. Only those attributes
+    are allowed that are specified as keyword arguments of a constructor.
+    When an argument is callable then the corresponding attribute will
+    be read-only and set by the value the callable object returns.
+    """
+    def __init__(self, **kws):
+        self._attributes = {}
+        self._readonly = []
+        for k,v in kws.items():
+            self._attributes[k] = v
+            if callable(v):
+                self._readonly.append(k)
+        return
+
+    def __getattr__(self, name):
+        if name not in self._attributes:
+            raise AttributeError,'%s instance has no attribute %r, '\
+                  'expected attributes: %s' \
+                  % (self.__class__.__name__,name,
+                     ','.join(self._attributes.keys()))
+        value = self._attributes[name]
+        if callable(value):
+            value = value()
+            self._attributes[name] = value
+        return value
+
+    def __setattr__(self, name, value):
+        if name in ['_attributes','_readonly']:
+            self.__dict__[name] = value
+            return
+        if name in self._readonly:
+            raise AttributeError,'%s instance attribute %r is readonly' \
+                  % (self.__class__.__name__, name)
+        if name not in self._attributes:
+            raise AttributeError,'%s instance has no attribute %r, '\
+                  'expected attributes: %s' \
+                  % (self.__class__.__name__,name,','.join(self._attributes.keys()))
+        self._attributes[name] = value
+
+    def isempty(self):
+        for k in self._attributes.keys():
+            v = getattr(self,k)
+            if v: return False
+        return True
+
+    def __repr__(self): return self.torepr()
+
+    def torepr(self, depth=-1, tab = ''):
+        if depth==0: return tab + self.__class__.__name__
+        l = [self.__class__.__name__+':']
+        ttab = tab + '    '
+        for k in self._attributes.keys():
+            v = getattr(self,k)
+            if v:
+                if isinstance(v,list):
+                    l.append(ttab + '%s=<%s-list>' % (k,len(v)))
+                elif isinstance(v,dict):
+                    l.append(ttab + '%s=<dict with keys %s>' % (k,v.keys()))
+                else:
+                    l.append(ttab + '%s=<%s>' % (k,type(v)))
+        return '\n'.join(l)
+
+    def todict(self):
+        d = {}
+        for k in self._attributes.keys():
+            v = getattr(self, k)
+            d[k] = v
+        return d
+
+def get_base_classes(cls):
+    bases = ()
+    for c in cls.__bases__:
+        bases += get_base_classes(c)
+    return bases + cls.__bases__ + (cls,) 
+
+class Variable:
+    """
+    Variable instance has attributes:
+      name
+      typedecl
+      dimension
+      attributes
+      intent
+      parent - Statement instances defining the variable
+    """
+    def __init__(self, parent, name):
+        self.parent = parent
+        self.parents = [parent]
+        self.name = name
+        self.typedecl = None
+        self.dimension = None
+        self.bounds = None
+        self.length = None
+        self.attributes = []
+        self.intent = None
+        self.bind = []
+        self.check = []
+        self.init = None
+        return
+
+    def get_bit_size(self):
+        typesize = self.typedecl.get_bit_size()
+        if self.is_pointer():
+            # The size of pointer descriptor is compiler version dependent. Read:
+            #   http://www.nersc.gov/vendor_docs/intel/f_ug1/pgwarray.htm
+            #   https://www.cca-forum.org/pipermail/cca-fortran/2003-February/000123.html
+            #   https://www.cca-forum.org/pipermail/cca-fortran/2003-February/000122.html
+            # On sgi descriptor size may be 128+ bits!
+            if self.is_array():
+                wordsize = 4 # XXX: on a 64-bit system it is 8.
+                rank = len(self.bounds or self.dimension)
+                return 6 * wordsize + 12 * rank
+            return typesize
+        if self.is_array():
+            size = reduce(lambda x,y:x*y,self.bounds or self.dimension,1)
+            if self.length:
+                size *= self.length
+            return size * typesize
+        if self.length:
+            return self.length * typesize
+        return typesize
+
+    def get_typedecl(self):
+        if self.typedecl is None:
+            self.set_type(self.parent.get_type(self.name))
+        return self.typedecl
+
+    def add_parent(self, parent):
+        if id(parent) not in map(id, self.parents):
+            self.parents.append(parent)
+        self.parent = parent
+        return
+
+    def set_type(self, typedecl):
+        if self.typedecl is not None:
+            if not self.typedecl==typedecl:
+                self.parent.warning(\
+                    'variable %r already has type %s,'\
+                    ' resetting to %s' \
+                    % (self.name, self.typedecl.tostr(),typedecl.tostr()))
+        self.typedecl = typedecl
+        return
+
+    def set_init(self, expr):
+        if self.init is not None:
+            if not self.init==expr:
+                self.parent.warning(\
+                    'variable %r already has initialization %r, '\
+                    ' resetting to %r' % (self.name, self.expr, expr))
+        self.init = expr
+        return
+
+    def set_dimension(self, dims):
+        if self.dimension is not None:
+            if not self.dimension==dims:
+                self.parent.warning(\
+                    'variable %r already has dimension %r, '\
+                    ' resetting to %r' % (self.name, self.dimension, dims))
+        self.dimension = dims
+        return
+
+    def set_bounds(self, bounds):
+        if self.bounds is not None:
+            if not self.bounds==bounds:
+                self.parent.warning(\
+                    'variable %r already has bounds %r, '\
+                    ' resetting to %r' % (self.name, self.bounds, bounds))
+        self.bounds = bounds
+        return
+
+    def set_length(self, length):
+        if self.length is not None:
+            if not self.length==length:
+                self.parent.warning(\
+                    'variable %r already has length %r, '\
+                    ' resetting to %r' % (self.name, self.length, length))
+        self.length = length
+        return
+
+    known_intent_specs = ['IN','OUT','INOUT','CACHE','HIDE', 'COPY',
+                          'OVERWRITE', 'CALLBACK', 'AUX', 'C', 'INPLACE',
+                          'OUT=']
+
+    def set_intent(self, intent):
+        if self.intent is None:
+            self.intent = []
+        for i in intent:
+            if i not in self.intent:
+                if i not in self.known_intent_specs:
+                    self.parent.warning('unknown intent-spec %r for %r'\
+                                        % (i, self.name))
+                self.intent.append(i)
+        return
+
+    known_attributes = ['PUBLIC', 'PRIVATE', 'ALLOCATABLE', 'ASYNCHRONOUS',
+                        'EXTERNAL', 'INTRINSIC', 'OPTIONAL', 'PARAMETER',
+                        'POINTER', 'PROTECTED', 'SAVE', 'TARGET', 'VALUE',
+                        'VOLATILE', 'REQUIRED']
+
+    def is_private(self):
+        if 'PUBLIC' in self.attributes: return False
+        if 'PRIVATE' in self.attributes: return True
+        parent_attrs = self.parent.parent.a.attributes
+        if 'PUBLIC' in parent_attrs: return False
+        if 'PRIVATE' in parent_attrs: return True
+        return
+    def is_public(self): return not self.is_private()
+
+    def is_allocatable(self): return 'ALLOCATABLE' in self.attributes
+    def is_external(self): return 'EXTERNAL' in self.attributes
+    def is_intrinsic(self): return 'INTRINSIC' in self.attributes
+    def is_parameter(self): return 'PARAMETER' in self.attributes
+    def is_optional(self): return 'OPTIONAL' in self.attributes
+    def is_required(self): return 'REQUIRED' in self.attributes
+    def is_pointer(self): return 'POINTER' in self.attributes
+
+    def is_array(self): return not not (self.bounds or self.dimension)
+
+    def update(self, *attrs):
+        attributes = self.attributes
+        if len(attrs)==1 and isinstance(attrs[0],(tuple,list)):
+            attrs = attrs[0]
+        for attr in attrs:
+            lattr = attr.lower()
+            uattr = attr.upper()
+            if lattr.startswith('dimension'):
+                assert self.dimension is None, `self.dimension,attr`
+                l = attr[9:].lstrip()
+                assert l[0]+l[-1]=='()',`l`
+                self.set_dimension(split_comma(l[1:-1].strip(), self.parent.item))
+                continue
+            if lattr.startswith('intent'):
+                l = attr[6:].lstrip()
+                assert l[0]+l[-1]=='()',`l`
+                self.set_intent(specs_split_comma(l[1:-1].strip(),
+                                                  self.parent.item, upper=True))
+                continue
+            if lattr.startswith('bind'):
+                l = attr[4:].lstrip()
+                assert l[0]+l[-1]=='()',`l`
+                self.bind = specs_split_comma(l[1:-1].strip(), self.parent.item,
+                                              upper = True)
+                continue
+            if lattr.startswith('check'):
+                l = attr[5:].lstrip()
+                assert l[0]+l[-1]=='()',`l`
+                self.check.extend(split_comma(l[1:-1].strip()), self.parent.item)
+                continue
+            if uattr not in attributes:
+                if uattr not in self.known_attributes:
+                    self.parent.warning('unknown attribute %r' % (attr))
+                attributes.append(uattr)
+        return
+
+    def __str__(self):
+        s = ''
+        typedecl = self.get_typedecl()
+        if typedecl is not None:
+            s += typedecl.tostr() + ' '
+        a = self.attributes[:]
+        if self.dimension is not None:
+            a.append('DIMENSION(%s)' % (', '.join(self.dimension)))
+        if self.intent is not None:
+            a.append('INTENT(%s)' % (', '.join(self.intent)))
+        if self.bind:
+            a.append('BIND(%s)' % (', '.join(self.bind)))
+        if self.check:
+            a.append('CHECK(%s)' % (', '.join(self.check)))
+        if a:
+            s += ', '.join(a) + ' :: '
+        s += self.name
+        if self.bounds:
+            s += '(%s)' % (', '.join(self.bounds))
+        if self.length:
+            if is_int_literal_constant(self.length):
+                s += '*%s' % (self.length)
+            else:
+                s += '*(%s)' % (self.length)
+        if self.init:
+            s += ' = ' + self.init
+        return s
+
+    def analyze(self):
+        typedecl = self.get_typedecl()
+        return
+
+class ProgramBlock:
+    pass
+
+class Statement:
+    """
+    Statement instance has attributes:
+      parent  - Parent BeginStatement or FortranParser instance
+      item    - Line instance containing the statement line
+      isvalid - boolean, when False, the Statement instance will be ignored
+    """
+    modes = ['free90','fix90','fix77','pyf']
+    _repr_attr_names = []
+
+    def __init__(self, parent, item):
+        self.parent = parent
+        if item is not None:
+            self.reader = item.reader
+        else:
+            self.reader = parent.reader
+        self.top = getattr(parent,'top',None) # the top of statement tree
+        self.item = item
+
+        if isinstance(parent, ProgramBlock):
+            self.programblock = parent
+        elif isinstance(self, ProgramBlock):
+            self.programblock = self
+        elif hasattr(parent,'programblock'):
+            self.programblock = parent.programblock
+        else:
+            #self.warning('%s.programblock attribute not set.' % (self.__class__.__name__))
+            pass
+
+        # when a statement instance is constructed by error, set isvalid to False
+        self.isvalid = True
+        # when a statement should be ignored, set ignore to True
+        self.ignore = False
+
+        # attribute a will hold analyze information.
+        a_dict = {}
+        for cls in get_base_classes(self.__class__):
+            if hasattr(cls,'a'):
+                a_dict.update(copy.deepcopy(cls.a.todict()))
+        self.a = AttributeHolder(**a_dict)
+        if hasattr(self.__class__,'a'):
+            assert self.a is not self.__class__.a
+
+        self.process_item()
+
+        return
+
+    def __repr__(self):
+        return self.torepr()
+
+    def torepr(self, depth=-1,incrtab=''):
+        tab = incrtab + self.get_indent_tab()
+        clsname = self.__class__.__name__
+        l = [tab + yellow_text(clsname)]
+        if depth==0:
+            return '\n'.join(l)
+        ttab = tab + '  '
+        for n in self._repr_attr_names:
+            attr = getattr(self, n, None)
+            if not attr: continue
+            if hasattr(attr, 'torepr'):
+                r = attr.torepr(depht-1,incrtab)
+            else:
+                r = repr(attr)
+            l.append(ttab + '%s=%s' % (n, r))
+        if self.item is not None: l.append(ttab + 'item=%r' % (self.item))
+        if not self.isvalid: l.append(ttab + 'isvalid=%r' % (self.isvalid))
+        if self.ignore: l.append(ttab + 'ignore=%r' % (self.ignore))
+        if not self.a.isempty():
+            l.append(ttab + 'a=' + self.a.torepr(depth-1,incrtab+'  ').lstrip())
+        return '\n'.join(l)
+
+    def get_indent_tab(self,colon=None,deindent=False):
+        if self.reader.isfix:
+            tab = ' '*6
+        else:
+            tab = ''
+        p = self.parent
+        while isinstance(p, Statement):
+            tab += '  '
+            p = p.parent
+        if deindent:
+            tab = tab[:-2]
+        if self.item is None:
+            return tab
+        s = self.item.label
+        if colon is None:
+            if self.reader.isfix:
+                colon = ''
+            else:
+                colon = ':'
+        if s:
+            c = ''
+            if self.reader.isfix:
+                c = ' '
+            tab = tab[len(c+s)+len(colon):]
+            if not tab: tab = ' '
+            tab = c + s + colon + tab
+        return tab
+
+    def format_message(self, kind, message):
+        if self.item is not None:
+            message = self.reader.format_message(kind, message,
+                                                 self.item.span[0], self.item.span[1])
+        else:
+            return message
+        return message
+
+    def show_message(self, message, stream=sys.stderr):
+        print >> stream, message
+        stream.flush()
+        return
+
+    def error(self, message):
+        message = self.format_message('ERROR', red_text(message))
+        self.show_message(message)
+        return
+
+    def warning(self, message):
+        message = self.format_message('WARNING', yellow_text(message))
+        self.show_message(message)
+        return
+
+    def info(self, message):
+        message = self.format_message('INFO', message)
+        self.show_message(message)
+        return
+
+    def analyze(self):
+        self.warning('nothing analyzed')
+        return
+
+    def get_variable(self, name):
+        """ Return Variable instance of variable name.
+        """
+        mth = getattr(self,'get_variable_by_name', self.parent.get_variable)
+        return mth(name)
+
+    def get_type(self, name):
+        """ Return type declaration using implicit rules
+        for name.
+        """
+        mth = getattr(self,'get_type_by_name', self.parent.get_type)
+        return mth(name)
+
+    def get_type_decl(self, kind):
+        mth = getattr(self,'get_type_decl_by_kind', self.parent.get_type_decl)
+        return mth(kind)
+
+    def get_provides(self):
+        """ Returns dictonary containing statements that block provides or None when N/A.
+        """
+        return
+
+class BeginStatement(Statement):
+    """ <blocktype> <name>
+
+    BeginStatement instances have additional attributes:
+      name
+      blocktype
+
+    Block instance has attributes:
+      content - list of Line or Statement instances
+      name    - name of the block, unnamed blocks are named
+                with the line label
+      parent  - Block or FortranParser instance
+      item    - Line instance containing the block start statement
+      get_item, put_item - methods to retrive/submit Line instances
+                from/to Fortran reader.
+      isvalid - boolean, when False, the Block instance will be ignored.
+
+      stmt_cls, end_stmt_cls
+
+    """
+    _repr_attr_names = ['blocktype','name'] + Statement._repr_attr_names
+    def __init__(self, parent, item=None):
+
+        self.content = []
+        self.get_item = parent.get_item # get line function
+        self.put_item = parent.put_item # put line function
+        if not hasattr(self, 'blocktype'):
+            self.blocktype = self.__class__.__name__.lower()
+        if not hasattr(self, 'name'):
+            # process_item may change this
+            self.name = '__'+self.blocktype.upper()+'__' 
+        Statement.__init__(self, parent, item)
+        return
+
+    def tostr(self):
+        return self.blocktype.upper() + ' '+ self.name
+    
+    def __str__(self):
+        l=[self.get_indent_tab(colon=':') + self.tostr()]
+        for c in self.content:
+            l.append(str(c))
+        return '\n'.join(l)
+
+    def torepr(self, depth=-1, incrtab=''):
+        tab = incrtab + self.get_indent_tab()
+        ttab = tab + '  '
+        l=[Statement.torepr(self, depth=depth,incrtab=incrtab)]
+        if depth==0 or not self.content:
+            return '\n'.join(l)
+        l.append(ttab+'content:')
+        for c in self.content:
+            if isinstance(c,EndStatement):
+                l.append(c.torepr(depth-1,incrtab))
+            else:
+                l.append(c.torepr(depth-1,incrtab + '  '))
+        return '\n'.join(l)
+
+    def process_item(self):
+        """ Process the line
+        """
+        item = self.item
+        if item is None: return
+        self.fill()
+        return
+
+    def fill(self, end_flag = False):
+        """
+        Fills blocks content until the end of block statement.
+        """
+
+        mode = self.reader.mode
+        classes = self.get_classes()
+        self.classes = [cls for cls in classes if mode in cls.modes]
+        self.pyf_classes = [cls for cls in classes if 'pyf' in cls.modes]
+
+        item = self.get_item()
+        while item is not None:
+            if isinstance(item, Line):
+                if self.process_subitem(item):
+                    end_flag = True
+                    break
+            item = self.get_item()
+
+        if not end_flag:
+            self.warning('failed to find the end of block')
+        return
+
+    def process_subitem(self, item):
+        """
+        Check is item is blocks start statement, if it is, read the block.
+
+        Return True to stop adding items to given block.
+        """
+        line = item.get_line()
+
+        # First check for the end of block
+        cls = self.end_stmt_cls
+        if cls.match(line):
+            stmt = cls(self, item)
+            if stmt.isvalid:
+                self.content.append(stmt)
+                return True
+
+        if item.is_f2py_directive:
+            classes = self.pyf_classes
+        else:
+            classes = self.classes
+
+        # Look for statement match
+        for cls in classes:
+            if cls.match(line):
+                stmt = cls(self, item)
+                if stmt.isvalid:
+                    if not stmt.ignore:
+                        self.content.append(stmt)
+                    return False
+                # item may be cloned that changes the items line:
+                line = item.get_line()
+                
+        # Check if f77 code contains inline comments or other f90
+        # constructs that got undetected by get_source_info.
+        if item.reader.isfix77:
+            i = line.find('!')
+            if i != -1:
+                message = item.reader.format_message(\
+                        'WARNING',
+                        'no parse pattern found for "%s" in %r block'\
+                        ' maybe due to inline comment.'\
+                        ' Trying to remove the comment.'\
+                        % (item.get_line(),self.__class__.__name__),
+                        item.span[0], item.span[1])
+                # .. but at the expense of loosing the comment.
+                self.show_message(message)
+                newitem = item.copy(line[:i].rstrip())
+                return self.process_subitem(newitem)
+
+            # try fix90 statement classes
+            f77_classes = self.classes
+            classes = []
+            for cls in self.get_classes():
+                if 'fix90' in cls.modes and cls not in f77_classes:
+                    classes.append(cls)
+            if classes:
+                message = item.reader.format_message(\
+                        'WARNING',
+                        'no parse pattern found for "%s" in %r block'\
+                        ' maybe due to strict f77 mode.'\
+                        ' Trying f90 fix mode patterns..'\
+                        % (item.get_line(),self.__class__.__name__),
+                        item.span[0], item.span[1])
+                self.show_message(message)
+    
+                item.reader.set_mode(False, False)
+                self.classes = classes
+            
+                r = BeginStatement.process_subitem(self, item)
+                if r is None:
+                    # restore f77 fix mode
+                    self.classes = f77_classes
+                    item.reader.set_mode(False, True)
+                else:
+                    message = item.reader.format_message(\
+                        'INFORMATION',
+                        'The f90 fix mode resolved the parse pattern issue.'\
+                        ' Setting reader to f90 fix mode.',
+                        item.span[0], item.span[1])
+                    self.show_message(message)
+                    # set f90 fix mode
+                    self.classes = f77_classes + classes
+                    self.reader.set_mode(False, False)
+                return r
+
+        self.handle_unknown_item(item)
+        return
+
+    def handle_unknown_item(self, item):
+        message = item.reader.format_message(\
+                        'WARNING',
+                        'no parse pattern found for "%s" in %r block.'\
+                        % (item.get_line(),self.__class__.__name__),
+                        item.span[0], item.span[1])
+        self.show_message(message)
+        self.content.append(item)
+        #sys.exit()
+        return
+
+    def analyze(self):
+        for stmt in self.content:
+            stmt.analyze()
+        return
+
+class EndStatement(Statement):
+    """
+    END [<blocktype> [<name>]]
+
+    EndStatement instances have additional attributes:
+      name
+      blocktype
+    """
+    _repr_attr_names = ['blocktype','name'] + Statement._repr_attr_names
+
+    def __init__(self, parent, item):
+        if not hasattr(self, 'blocktype'):
+            self.blocktype = self.__class__.__name__.lower()[3:]
+        Statement.__init__(self, parent, item)
+
+    def process_item(self):
+        item = self.item
+        line = item.get_line().replace(' ','')[3:]
+        blocktype = self.blocktype
+        if line.startswith(blocktype):
+            line = line[len(blocktype):].strip()
+        else:
+            if line:
+                # not the end of expected block
+                line = ''
+                self.isvalid = False
+        if line:
+            if not line==self.parent.name:
+                self.warning(\
+                    'expected the end of %r block but got the end of %r, skipping.'\
+                    % (self.parent.name, line))
+                self.isvalid = False
+        self.name = self.parent.name
+
+    def analyze(self):
+        return
+
+    def get_indent_tab(self,colon=None,deindent=False):
+        return Statement.get_indent_tab(self, colon=colon, deindent=True)
+
+    def __str__(self):
+        return self.get_indent_tab() + 'END %s %s'\
+               % (self.blocktype.upper(),self.name or '')
+

Copied: trunk/numpy/f2py/lib/parser/block_statements.py (from rev 3236, trunk/numpy/f2py/lib/block_statements.py)
===================================================================
--- trunk/numpy/f2py/lib/block_statements.py	2006-09-30 21:02:52 UTC (rev 3236)
+++ trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,1167 @@
+"""
+Fortran block statements.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['BeginSource','Module','PythonModule','Program','BlockData','Interface',
+           'Subroutine','Function','Select','EndWhere','WhereConstruct','ForallConstruct',
+           'IfThen','If','Do','Associate','TypeDecl','Enum']
+
+import re
+import sys
+
+from base_classes import BeginStatement, EndStatement, Statement,\
+     AttributeHolder, ProgramBlock, Variable
+from readfortran import Line
+from utils import filter_stmts, parse_bind, parse_result, AnalyzeError, is_name
+
+class HasImplicitStmt:
+
+    a = AttributeHolder(implicit_rules = {})
+
+    def get_type_by_name(self, name):
+        implicit_rules = self.a.implicit_rules
+        if implicit_rules is None:
+            raise AnalyzeError,'Implicit rules mapping is null'
+        l = name[0].lower()
+        if implicit_rules.has_key(l):
+            return implicit_rules[l]
+        # default rules:
+        if l in 'ijklmn':
+            l = 'default_integer'
+        else:
+            l = 'default_real'
+        t = implicit_rules.get(l, None)
+        if t is None:
+            if l[8:]=='real':
+                implicit_rules[l] = t = Real(self, self.item.copy('real'))
+            else:
+                implicit_rules[l] = t = Integer(self, self.item.copy('integer'))
+        return t
+
+    def topyf(self, tab='  '):
+        implicit_rules = self.a.implicit_rules
+        if implicit_rules is None:
+            return tab + 'IMPLICIT NONE\n'
+        items = {}
+        for c,t in implicit_rules.items():
+            if c.startswith('default'):
+                continue
+            st = t.tostr()
+            if items.has_key(st):
+                items[st].append(c)
+            else:
+                items[st] = [c]
+        if not items:
+            return tab + '! default IMPLICIT rules apply\n'
+        s = 'IMPLICIT'
+        ls = []
+        for st,l in items.items():
+            l.sort()
+            ls.append(st + ' (%s)' % (', '.join(l)))
+        s += ' ' + ', '.join(ls)
+        return tab + s + '\n'
+
+class HasUseStmt:
+
+    a = AttributeHolder(use = {},
+                        use_provides = {})
+
+    def get_entity(self, name):
+        for modname, modblock in self.top.a.module.items():
+            for stmt in modblock.content:
+                if getattr(stmt,'name','') == name:
+                    return stmt
+        return
+
+    def topyf(self):
+        pass
+
+class HasVariables:
+
+    a = AttributeHolder(variables = {},
+                        variable_names = [] # defines the order of declarations
+                        )
+
+    def get_variable_by_name(self, name):
+        variables = self.a.variables
+        if variables.has_key(name):
+            var = variables[name]
+        else:
+            var = variables[name] = Variable(self, name)
+            self.a.variable_names.append(name)
+        return var
+
+    def topyf(self,tab=''):
+        s = ''
+        for name, var in self.a.variables.items():
+            s += tab + str(var) + '\n'
+        return s
+
+class HasTypeDecls:
+
+    a = AttributeHolder(type_decls = {})
+
+    def topyf(self, tab=''):
+        s = ''
+        for name, stmt in self.a.type_decls.items():
+            s += stmt.topyf(tab='  '+tab)
+        return s
+
+    def get_type_decl_by_kind(self, kind):
+        type_decls = self.a.type_decls
+        type_decl = type_decls.get(kind, None)
+        if type_decl is None:
+            return self.get_entity(kind)
+            raise NotImplementedError,'get type_decl from use modules'
+        return type_decl
+
+class HasAttributes:
+
+    known_attributes = []
+    a = AttributeHolder(attributes = [])
+
+    def topyf(self, tab=''):
+        s = ''
+        for attr in self.a.attributes:
+            s += tab + attr + '\n'
+        return s
+
+    def is_private(self):
+        attributes = self.a.attributes
+        if 'PUBLIC' in attributes: return False
+        if 'PRIVATE' in attributes: return True
+        return
+    def is_public(self): return not self.is_private()
+
+    def update_attributes(self,*attrs):
+        attributes = self.a.attributes
+        known_attributes = self.known_attributes
+        if len(attrs)==1 and isinstance(attrs[0],(tuple,list)):
+            attrs = attrs[0]
+        for attr in attrs:
+            uattr = attr.upper()
+            if uattr not in attributes:
+                if isinstance(known_attributes,(list, tuple)):
+                    if uattr not in known_attributes:
+                        self.warning('unknown attribute %r' % (attr))
+                elif known_attributes(uattr):
+                    self.warning('unknown attribute %r' % (attr))
+                attributes.append(uattr)
+        return
+
+class HasModuleProcedures:
+
+    a = AttributeHolder(module_procedures = [])
+
+# File block
+
+class EndSource(EndStatement):
+    """
+    Dummy End statement for BeginSource.
+    """
+    match = staticmethod(lambda s: False)
+
+class BeginSource(BeginStatement):
+    """
+    Fortran source content.
+    """
+    match = staticmethod(lambda s: True)
+    end_stmt_cls = EndSource
+    a = AttributeHolder(module = {},
+                        external_subprogram = {},
+                        blockdata = {},
+                        )
+
+    def tostr(self):
+        return '!' + self.blocktype.upper() + ' '+ self.name
+
+    def process_item(self):
+        self.name = self.reader.name
+        self.top = self
+        self.fill(end_flag = True)
+        return
+
+    def analyze(self):
+        for stmt in self.content:
+            if isinstance(stmt, Module):
+                stmt.analyze()
+                self.a.module[stmt.name] = stmt
+            elif isinstance(stmt, SubProgramStatement):
+                stmt.analyze()
+                self.a.external_subprogram[stmt.name] = stmt
+            elif isinstance(stmt, BlockData):
+                stmt.analyze()
+                self.a.blockdata[stmt.name] = stmt
+            else:
+                stmt.analyze()
+        return
+
+    def get_classes(self):
+        return program_unit
+
+    def process_subitem(self, item):
+        # MAIN block does not define start/end line conditions,
+        # so it should never end until all lines are read.
+        # However, sometimes F77 programs lack the PROGRAM statement,
+        # and here we fix that:
+        if self.reader.isfix77:
+            line = item.get_line()
+            if line=='end':
+                message = item.reader.format_message(\
+                        'WARNING',
+                        'assuming the end of undefined PROGRAM statement',
+                        item.span[0],item.span[1])
+                print >> sys.stderr, message
+                p = Program(self)
+                p.content.extend(self.content)
+                p.content.append(EndProgram(p,item))
+                self.content[:] = [p]
+                return
+        return BeginStatement.process_subitem(self, item)
+
+    def topyf(self, tab=''): # XXXX
+        s = ''
+        for name, stmt in self.a.module.items():
+            s += stmt.topyf()
+        for name, stmt in self.a.external_subprogram.items():
+            s += stmt.topyf()
+        for name, stmt in self.a.blockdata.items():
+            s += stmt.topyf()
+        return s
+# Module
+
+class EndModule(EndStatement):
+    match = re.compile(r'end(\s*module\s*\w*|)\Z', re.I).match
+
+class Module(BeginStatement, HasAttributes,
+             HasImplicitStmt, HasUseStmt, HasVariables,
+             HasTypeDecls):
+    """
+    MODULE <name>
+     ..
+    END [MODULE [name]]
+    """
+    match = re.compile(r'module\s*\w+\Z', re.I).match
+    end_stmt_cls = EndModule
+
+    a = AttributeHolder(module_subprogram = {},
+                        module_provides = {}, # all symbols that are public and so
+                                              # can be imported via USE statement
+                                              # by other blocks
+                        )
+
+    known_attributes = ['PUBLIC', 'PRIVATE']
+
+    def get_classes(self):
+        return access_spec + specification_part + module_subprogram_part
+
+    def process_item(self):
+        name = self.item.get_line().replace(' ','')[len(self.blocktype):].strip()
+        self.name = name
+        return BeginStatement.process_item(self)
+
+    def get_provides(self):
+        return self.a.module_provides
+
+    def analyze(self):
+        content = self.content[:]
+
+        while content:
+            stmt = content.pop(0)
+            if isinstance(stmt, Contains):
+                for stmt in filter_stmts(content, SubProgramStatement):
+                    stmt.analyze()
+                    self.a.module_subprogram[stmt.name] = stmt
+                stmt = content.pop(0)
+                assert isinstance(stmt, EndModule),`stmt`
+                continue
+            stmt.analyze()
+
+        if content:
+            self.show_message('Not analyzed content: %s' % content)
+
+        module_provides = self.a.module_provides
+        for name, var in self.a.variables.items():
+            if var.is_public():
+                if module_provides.has_key(name):
+                    self.warning('module data object name conflict with %s, overriding.' % (name))
+                module_provides[name] = var
+
+        return
+
+    def topyf(self, tab=''):
+        s = tab + 'MODULE '+self.name + '\n'
+        s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
+        s +=  HasAttributesStmt.topyf(self, tab=tab+'  ')
+        s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
+        s +=  HasVariables.topyf(self, tab=tab+'  ')
+        s +=  tab + '  CONTAINS\n'
+        for name, stmt in self.a.module_subprogram.items():
+            s += stmt.topyf(tab=tab+'    ')
+        s += tab + 'END MODULE ' + self.name + '\n'
+        return s
+
+# Python Module
+
+class EndPythonModule(EndStatement):
+    match = re.compile(r'end(\s*python\s*module\s*\w*|)\Z', re.I).match
+
+class PythonModule(BeginStatement, HasImplicitStmt, HasUseStmt):
+    """
+    PYTHON MODULE <name>
+     ..
+    END [PYTHON MODULE [name]]
+    """
+    modes = ['pyf']
+    match = re.compile(r'python\s*module\s*\w+\Z', re.I).match
+    end_stmt_cls = EndPythonModule
+
+    def get_classes(self):
+        return [Interface, Function, Subroutine, Module]
+
+    def process_item(self):
+        self.name = self.item.get_line().replace(' ','')\
+                    [len(self.blocktype):].strip()
+        return BeginStatement.process_item(self)
+
+# Program
+
+class EndProgram(EndStatement):
+    """
+    END [PROGRAM [name]]
+    """
+    match = re.compile(r'end(\s*program\s*\w*|)\Z', re.I).match
+
+class Program(BeginStatement, ProgramBlock,
+              HasAttributes, # XXX: why Program needs .attributes?
+              HasImplicitStmt, HasUseStmt):
+    """ PROGRAM [name]
+    """
+    match = re.compile(r'program\s*\w*\Z', re.I).match
+    end_stmt_cls = EndProgram
+
+    def get_classes(self):
+        return specification_part + execution_part + internal_subprogram_part
+
+    def process_item(self):
+        if self.item is not None:
+            name = self.item.get_line().replace(' ','')\
+                   [len(self.blocktype):].strip()
+            if name:
+                self.name = name
+        return BeginStatement.process_item(self)
+
+# BlockData
+
+class EndBlockData(EndStatement):
+    """
+    END [ BLOCK DATA [ <block-data-name> ] ] 
+    """
+    match = re.compile(r'end(\s*block\s*data\s*\w*|)\Z', re.I).match
+    blocktype = 'blockdata'
+
+class BlockData(BeginStatement, HasImplicitStmt, HasUseStmt,
+                HasVariables):
+    """
+    BLOCK DATA [ <block-data-name> ]
+    """
+    end_stmt_cls = EndBlockData
+    match = re.compile(r'block\s*data\s*\w*\Z', re.I).match
+
+    def process_item(self):
+        self.name = self.item.get_line()[5:].lstrip()[4:].lstrip()
+        return BeginStatement.process_item(self)
+
+    def get_classes(self):
+        return specification_part
+        
+# Interface
+
+class EndInterface(EndStatement):
+    match = re.compile(r'end\s*interface\s*\w*\Z', re.I).match
+    blocktype = 'interface'
+
+class Interface(BeginStatement, HasImplicitStmt, HasUseStmt,
+                HasModuleProcedures
+                ):
+    """
+    INTERFACE [<generic-spec>] | ABSTRACT INTERFACE
+    END INTERFACE [<generic-spec>]
+
+    <generic-spec> = <generic-name>
+                   | OPERATOR ( <defined-operator> )
+                   | ASSIGNMENT ( = )
+                   | <dtio-generic-spec>
+    <dtio-generic-spec> = READ ( FORMATTED )
+                        | READ ( UNFORMATTED )
+                        | WRITE ( FORMATTED )
+                        | WRITE ( UNFORMATTED )
+    
+    """
+    modes = ['free90', 'fix90', 'pyf']
+    match = re.compile(r'(interface\s*(\w+\s*\(.*\)|\w*)|abstract\s*interface)\Z',re.I).match
+    end_stmt_cls = EndInterface
+    blocktype = 'interface'
+
+    a = AttributeHolder(interface_provides = {})
+
+    def get_classes(self):
+        return intrinsic_type_spec + interface_specification
+
+    def process_item(self):
+        line = self.item.get_line()
+        self.isabstract = line.startswith('abstract')
+        if self.isabstract:
+            self.generic_spec = ''
+        else:
+            self.generic_spec = line[len(self.blocktype):].strip()
+        self.name = self.generic_spec # XXX
+        return BeginStatement.process_item(self)
+
+    def tostr(self):
+        if self.isabstract:
+            return 'ABSTRACT INTERFACE'
+        return 'INTERFACE '+ str(self.generic_spec)
+
+    def get_provides(self):
+        return self.a.interface_provides
+
+    def analyze(self):
+        content = self.content[:]
+
+        while content:
+            stmt = content.pop(0)
+            if isinstance(stmt, self.end_stmt_cls):
+                break
+            stmt.analyze()
+            assert isinstance(stmt, SubProgramStatement),`stmt.__class__.__name__`
+        if content:
+            self.show_message('Not analyzed content: %s' % content)
+
+        parent_provides = self.parent.get_provides()
+        if parent_provides is not None:
+            if self.is_public():
+                if parent_provides.has_key(self.name):
+                    self.warning('interface name conflict with %s, overriding.' % (self.name))
+                parent_provides[self.name] = self
+    
+        return
+
+# Subroutine
+
+class SubProgramStatement(BeginStatement, ProgramBlock,
+                          HasImplicitStmt, HasAttributes,
+                          HasUseStmt,
+                          HasVariables, HasTypeDecls
+                          ):
+    """
+    [ <prefix> ] <FUNCTION|SUBROUTINE> <name> [ ( <args> ) ] [ <suffix> ]
+    """
+    known_attributes = ['PUBLIC', 'PRIVATE']
+
+    a = AttributeHolder(internal_subprogram = {})
+
+    def process_item(self):
+        clsname = self.__class__.__name__.lower()
+        item = self.item
+        line = item.get_line()
+        m = self.match(line)
+        i = line.find(clsname)
+        assert i!=-1,`line`
+        self.prefix = line[:i].rstrip()
+        self.name = line[i:m.end()].lstrip()[len(clsname):].strip()
+        line = line[m.end():].lstrip()
+        args = []
+        if line.startswith('('):
+            i = line.find(')')
+            assert i!=-1,`line`
+            line2 = item.apply_map(line[:i+1])
+            for a in line2[1:-1].split(','):
+                a=a.strip()
+                if not a: continue
+                args.append(a)
+            line = line[i+1:].lstrip()
+        suffix = item.apply_map(line)
+        self.bind, suffix = parse_bind(suffix, item)
+        self.result = None
+        if isinstance(self, Function):
+            self.result, suffix = parse_result(suffix, item)
+            if suffix:
+                assert self.bind is None,`self.bind`
+                self.bind, suffix = parse_result(suffix, item)
+            if self.result is None:
+                self.result = self.name
+        assert not suffix,`suffix`
+        self.args = args
+        self.typedecl = None
+        return BeginStatement.process_item(self)
+
+    def tostr(self):
+        clsname = self.__class__.__name__.upper()
+        s = ''
+        if self.prefix:
+            s += self.prefix + ' '
+        if self.typedecl is not None:
+            assert isinstance(self, Function),`self.__class__.__name__`
+            s += self.typedecl.tostr() + ' '
+        s += clsname
+        suf = ''
+        if self.result and self.result!=self.name:
+            suf += ' RESULT ( %s )' % (self.result)
+        if self.bind:
+            suf += ' BIND ( %s )' % (', '.join(self.bind))
+        return '%s %s(%s)%s' % (s, self.name,', '.join(self.args),suf)
+
+    def get_classes(self):
+        return f2py_stmt + specification_part + execution_part \
+               + internal_subprogram_part
+
+    def analyze(self):
+        content = self.content[:]
+
+        if self.prefix:
+            self.update_attributes(prefix.upper().split())
+
+        variables = self.a.variables
+        for a in self.args:
+            assert not variables.has_key(a)
+            assert is_name(a)
+            variables[a] = Variable(self, a)
+
+        if isinstance(self, Function):
+            var = variables[self.result] = Variable(self, self.result)
+            if self.typedecl is not None:
+                var.set_type(self.typedecl)
+
+        while content:
+            stmt = content.pop(0)
+            if isinstance(stmt, Contains):
+                for stmt in filter_stmts(content, SubProgramStatement):
+                    stmt.analyze()
+                    self.a.internal_subprogram[stmt.name] = stmt
+                stmt = content.pop(0)
+                assert isinstance(stmt, self.end_stmt_cls),`stmt`
+            elif isinstance(stmt, self.end_stmt_cls):
+                continue
+            else:
+                stmt.analyze()
+
+        if content:
+            self.show_message('Not analyzed content: %s' % content)
+
+        parent_provides = self.parent.get_provides()
+        if parent_provides is not None:
+            if self.is_public():
+                if parent_provides.has_key(self.name):
+                    self.warning('module subprogram name conflict with %s, overriding.' % (self.name))
+                parent_provides[self.name] = self
+
+        return
+
+    def topyf(self, tab=''):
+        s = tab + self.__class__.__name__.upper()
+        s += ' ' + self.name + ' (%s)' % (', '.join(self.args))
+        if isinstance(self, Function) and self.result != self.name:
+            s += ' RESULT (%s)' % (self.result)
+        s += '\n'
+        s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
+        s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
+        s +=  HasVariables.topyf(self, tab=tab+'  ')
+        s += tab + 'END ' + self.__class__.__name__.upper() + ' ' + self.name + '\n'
+        return s
+
+class EndSubroutine(EndStatement):
+    """
+    END [SUBROUTINE [name]]
+    """
+    match = re.compile(r'end(\s*subroutine\s*\w*|)\Z', re.I).match
+
+
+class Subroutine(SubProgramStatement):
+    """
+    [ <prefix> ] SUBROUTINE <name> [ ( [ <dummy-arg-list> ] ) [ <proc-language-binding-spec> ]]
+    """
+    end_stmt_cls = EndSubroutine
+    match = re.compile(r'(recursive|pure|elemental|\s)*subroutine\s*\w+', re.I).match
+    _repr_attr_names = ['prefix','bind','suffix','args'] + Statement._repr_attr_names
+
+# Function
+
+class EndFunction(EndStatement):
+    """
+    END [FUNCTION [name]]
+    """
+    match = re.compile(r'end(\s*function\s*\w*|)\Z', re.I).match
+
+class Function(SubProgramStatement):
+    """
+    [ <prefix> ] FUNCTION <name> ( [<dummy-arg-list>] ) [<suffix>]
+    <prefix> = <prefix-spec> [ <prefix-spec> ]...
+    <prefix-spec> = <declaration-type-spec>
+                  | RECURSIVE | PURE | ELEMENTAL
+    <suffix> = <proc-language-binding-spec> [ RESULT ( <result-name> ) ]
+             | RESULT ( <result-name> ) [ <proc-language-binding-spec> ]
+    """
+    end_stmt_cls = EndFunction
+    match = re.compile(r'(recursive|pure|elemental|\s)*function\s*\w+', re.I).match
+    _repr_attr_names = ['prefix','bind','suffix','args','typedecl'] + Statement._repr_attr_names
+
+# Handle subprogram prefixes
+
+class SubprogramPrefix(Statement):
+    """
+    <prefix> <declaration-type-spec> <function|subroutine> ...
+    """
+    match = re.compile(r'(pure|elemental|recursive|\s)+\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()
+        m = self.match(line)
+        prefix = line[:m.end()].rstrip()
+        rest = self.item.get_line()[m.end():].lstrip()
+        if rest:
+            self.parent.put_item(self.item.copy(prefix))
+            self.item.clone(rest)
+            self.isvalid = False
+            return
+        if self.parent.__class__ not in [Function, Subroutine]:
+            self.isvalid = False
+            return
+        prefix = prefix + ' ' + self.parent.prefix
+        self.parent.prefix = prefix.strip()
+        self.ignore = True
+        return
+
+# SelectCase
+
+class EndSelect(EndStatement):
+    match = re.compile(r'end\s*select\s*\w*\Z', re.I).match
+    blocktype = 'select'
+
+class Select(BeginStatement):
+    """
+    [ <case-construct-name> : ] SELECT CASE ( <case-expr> )
+    
+    """
+    match = re.compile(r'select\s*case\s*\(.*\)\Z',re.I).match
+    end_stmt_cls = EndSelect
+    name = ''
+    def tostr(self):
+        return 'SELECT CASE ( %s )' % (self.expr)
+    def process_item(self):
+        self.expr = self.item.get_line()[6:].lstrip()[4:].lstrip()[1:-1].strip()
+        self.name = self.item.label                
+        return BeginStatement.process_item(self)
+
+    def get_classes(self):
+        return [Case] + execution_part_construct
+
+# Where
+
+class EndWhere(EndStatement):
+    """
+    END WHERE [ <where-construct-name> ]
+    """
+    match = re.compile(r'end\s*\where\s*\w*\Z',re.I).match
+    
+
+class Where(BeginStatement):
+    """
+    [ <where-construct-name> : ] WHERE ( <mask-expr> )
+    <mask-expr> = <logical-expr>
+    """
+    match = re.compile(r'where\s*\([^)]*\)\Z',re.I).match
+    end_stmt_cls = EndWhere
+    name = ''
+    def tostr(self):
+        return 'WHERE ( %s )' % (self.expr)
+    def process_item(self):
+        self.expr = self.item.get_line()[5:].lstrip()[1:-1].strip()
+        self.name = self.item.label
+        return BeginStatement.process_item(self)
+
+    def get_classes(self):
+        return [Assignment, WhereStmt,
+                WhereConstruct, ElseWhere
+                ]
+
+WhereConstruct = Where
+
+# Forall
+
+class EndForall(EndStatement):
+    """
+    END FORALL [ <forall-construct-name> ]
+    """
+    match = re.compile(r'end\s*forall\s*\w*\Z',re.I).match
+    
+class Forall(BeginStatement):
+    """
+    [ <forall-construct-name> : ] FORALL <forall-header>
+      [ <forall-body-construct> ]...
+    <forall-body-construct> = <forall-assignment-stmt>
+                            | <where-stmt>
+                            | <where-construct>
+                            | <forall-construct>
+                            | <forall-stmt>
+    <forall-header> = ( <forall-triplet-spec-list> [ , <scalar-mask-expr> ] )
+    <forall-triplet-spec> = <index-name> = <subscript> : <subscript> [ : <stride> ]
+    <subscript|stride> = <scalar-int-expr>
+    <forall-assignment-stmt> = <assignment-stmt> | <pointer-assignment-stmt>
+    """
+    end_stmt_cls = EndForall
+    match = re.compile(r'forarr\s*\(.*\)\Z',re.I).match
+    name = ''
+    def process_item(self):
+        self.specs = self.item.get_line()[6:].lstrip()[1:-1].strip()
+        return BeginStatement.process_item(self)
+    def tostr(self):
+        return 'FORALL (%s)' % (self.specs)
+    def get_classes(self):
+        return [GeneralAssignment, WhereStmt, WhereConstruct,
+                ForallConstruct, ForallStmt]
+
+ForallConstruct = Forall
+
+# IfThen
+
+class EndIfThen(EndStatement):
+    """
+    END IF [ <if-construct-name> ]
+    """
+    match = re.compile(r'end\s*if\s*\w*\Z', re.I).match
+    blocktype = 'if'
+
+class IfThen(BeginStatement):
+    """
+    [<if-construct-name> :] IF ( <scalar-logical-expr> ) THEN
+
+    IfThen instance has the following attributes:
+      expr
+    """
+
+    match = re.compile(r'if\s*\(.*\)\s*then\Z',re.I).match
+    end_stmt_cls = EndIfThen
+    name = ''
+
+    def tostr(self):
+        return 'IF (%s) THEN' % (self.expr)
+
+    def process_item(self):
+        item = self.item
+        line = item.get_line()[2:-4].strip()
+        assert line[0]=='(' and line[-1]==')',`line`
+        self.expr = line[1:-1].strip()
+        self.name = item.label
+        return BeginStatement.process_item(self)
+        
+    def get_classes(self):
+        return [Else, ElseIf] + execution_part_construct
+
+class If(BeginStatement):
+    """
+    IF ( <scalar-logical-expr> ) action-stmt
+    """
+
+    match = re.compile(r'if\s*\(').match
+
+    def process_item(self):
+        item = self.item
+        mode = self.reader.mode
+        classes = self.get_classes()
+        classes = [cls for cls in classes if mode in cls.modes]
+
+        line = item.get_line()[2:]
+        i = line.find(')')
+        expr = line[1:i].strip()
+        line = line[i+1:].strip()
+        if line.lower()=='then':
+            self.isvalid = False
+            return
+        self.expr = expr[1:-1]
+
+        if not line:
+            newitem = self.get_item()
+        else:
+            newitem = item.copy(line)
+        newline = newitem.get_line()
+        for cls in classes:
+            if cls.match(newline):
+                stmt = cls(self, newitem)
+                if stmt.isvalid:
+                    self.content.append(stmt)
+                    return
+        if not line:
+            self.put_item(newitem)
+        self.isvalid = False
+        return
+        
+    def tostr(self):
+        assert len(self.content)==1,`self.content`
+        return 'IF (%s) %s' % (self.expr, str(self.content[0]).lstrip())
+
+    def __str__(self):
+        return self.get_indent_tab(colon=':') + self.tostr()
+
+    def get_classes(self):
+        return action_stmt
+
+# Do
+
+class EndDo(EndStatement):
+    """
+    END DO [ <do-construct-name> ]
+    """
+    match = re.compile(r'end\s*do\s*\w*\Z', re.I).match
+    blocktype = 'do'
+
+class Do(BeginStatement):
+    """
+    [ <do-construct-name> : ] DO label [loopcontrol]
+    [ <do-construct-name> : ] DO [loopcontrol]
+
+    """
+
+    match = re.compile(r'do\b\s*\d*',re.I).match
+    item_re = re.compile(r'do\b\s*(?P<label>\d*)\s*,?\s*(?P<loopcontrol>.*)\Z',re.I).match
+    end_stmt_cls = EndDo
+    name = ''
+
+    def tostr(self):
+        return 'DO %s %s' % (self.endlabel, self.loopcontrol)
+
+    def process_item(self):
+        item = self.item
+        line = item.get_line()
+        m = self.item_re(line)
+        self.endlabel = m.group('label').strip()
+        self.name = item.label
+        self.loopcontrol = m.group('loopcontrol').strip()
+        return BeginStatement.process_item(self)
+
+    def process_subitem(self, item):
+        r = False
+        if self.endlabel:
+            label = item.label
+            if label == self.endlabel:
+                r = True
+                if isinstance(self.parent, Do) and label==self.parent.endlabel:
+                    # the same item label may be used for different block ends
+                    self.put_item(item)
+        return BeginStatement.process_subitem(self, item) or r
+
+    def get_classes(self):
+        return execution_part_construct
+
+# Associate
+
+class EndAssociate(EndStatement):
+    """
+    END ASSOCIATE [ <associate-construct-name> ]
+    """
+    match = re.compile(r'end\s*associate\s*\w*\Z',re.I).match
+
+class Associate(BeginStatement):
+    """
+    [ <associate-construct-name> : ] ASSOCIATE ( <association-list> )
+      <block>
+
+    <association> = <associate-name> => <selector>
+    <selector> = <expr> | <variable>
+    """
+    match = re.compile(r'associate\s*\(.*\)\Z',re.I).match
+    end_stmt_cls = EndAssociate
+    
+    def process_item(self):
+        line = self.item.get_line()[9:].lstrip()
+        self.associations = line[1:-1].strip()
+        return BeginStatement.process_item(self)
+    def tostr(self):
+        return 'ASSOCIATE (%s)' % (self.associations)
+    def get_classes(self):
+        return execution_part_construct
+
+# Type
+
+class EndType(EndStatement):
+    """
+    END TYPE [<type-name>]
+    """
+    match = re.compile(r'end\s*type\s*\w*\Z', re.I).match
+    blocktype = 'type'
+
+class Type(BeginStatement, HasVariables, HasAttributes):
+    """
+    TYPE [ [ , <type-attr-spec-list>] :: ] <type-name> [ ( <type-param-name-list> ) ]
+    <type-attr-spec> = <access-spec> | EXTENDS ( <parent-type-name> )
+                       | ABSTRACT | BIND(C)
+    """
+    match = re.compile(r'type\b\s*').match
+    end_stmt_cls = EndType
+
+    a = AttributeHolder(extends = None,
+                        parameters = {},
+                        component_names = [], # specifies component order for sequence types
+                        components = {}
+                        )
+    known_attributes = re.compile(r'\A(PUBLIC|PRIVATE|SEQUENCE|ABSTRACT|BIND\s*\(.*\))\Z').match
+
+    def process_item(self):
+        line = self.item.get_line()[4:].lstrip()
+        if line.startswith('('):
+            self.isvalid = False
+            return
+        specs = []
+        i = line.find('::')
+        if i!=-1:
+            for s in line[:i].split(','):
+                s = s.strip()
+                if s: specs.append(s)
+            line = line[i+2:].lstrip()
+        self.specs = specs
+        i = line.find('(')
+        if i!=-1:
+            self.name = line[:i].rstrip()
+            assert line[-1]==')',`line`
+            self.params = split_comma(line[i+1:-1].lstrip())
+        else:
+            self.name = line
+            self.params = []
+        if not is_name(self.name):
+            self.isvalid = False
+            return
+        return BeginStatement.process_item(self)
+
+    def tostr(self):
+        s = 'TYPE'
+        if self.specs:
+            s += ', '.join(['']+self.specs) + ' ::'
+        s += ' ' + self.name
+        if self.params:
+            s += ' ('+', '.join(self.params)+')'
+        return s
+
+    def get_classes(self):
+        return [Integer] + private_or_sequence + component_part +\
+               type_bound_procedure_part
+
+    def analyze(self):
+        BeginStatement.analyze(self)
+        for spec in self.specs:
+            i = spec.find('(')
+            if i!=-1:
+                assert spec.endswith(')'),`spec`
+                s = spec[:i].rstrip().upper()
+                n = spec[i+1:-1].strip()
+                if s=='EXTENDS':
+                    self.a.extends = n
+                    continue
+                elif s=='BIND':
+                    args,rest = parse_bind(spec)
+                    assert not rest,`rest`
+                    spec = 'BIND(%s)' % (', '.join(args))
+                else:
+                    spec = '%s(%s)' % (s,n)
+            else:
+                spec = spec.upper()
+            self.update_attributes(spec)
+
+        component_names = self.a.component_names
+        content = self.content[:]
+        while content:
+            stmt = content.pop(0)
+            if isinstance(stmt, self.end_stmt_cls):
+                break
+            stmt.analyze()
+
+        if content:
+            self.show_message('Not analyzed content: %s' % content)
+
+        parameters = self.a.parameters
+        components = self.a.components
+        component_names = self.a.component_names
+        for name in self.a.variable_names:
+            var = self.a.variables[name]
+            if name in self.params:
+                parameters[name] = var
+            else:
+                component_names.append(name)
+                components[name] = var
+
+        self.parent.a.type_decls[self.name] = self
+
+        parent_provides = self.parent.get_provides()
+        if parent_provides is not None:
+            if self.is_public():
+                if parent_provides.has_key(self.name):
+                    self.warning('type declaration name conflict with %s, overriding.' % (self.name))
+                parent_provides[self.name] = self
+
+        return
+
+    def topyf(self, tab=''):
+        s = tab + 'TYPE'
+        if self.a.extends is not None:
+            s += ', EXTENDS(%s) ::' % (self.a.extends) 
+        s += ' ' + self.name
+        if self.a.parameters:
+            s += ' (%s)' % (', '.join(self.a.parameters))
+        s += '\n'
+        s += HasAttributes.topyf(self, tab=tab+'  ')
+        s += HasVariables.topyf(self, tab=tab+'  ')
+        s += tab + 'END TYPE ' + self.name + '\n'
+        return s
+
+    # Wrapper methods:
+
+    def get_bit_size(self, _cache={}):
+        try:
+            return _cache[id(self)]
+        except KeyError:
+            s = 0
+            for name,var in self.a.components.items():
+                s += var.get_bit_size()
+            _cache[id(self)] = s
+        return s
+
+    def get_f_type(self):
+        return 'TYPE(%s)' % (self.name)
+
+    def get_c_type(self):
+        return 'f2py_type_%s_%s' % (self.name, self.get_bit_size())
+    
+    def get_c_name(self):
+        return 'f2py_type_%s' % (self.name)
+
+    def get_c_struct_name(self):
+        return self.get_c_name() + '_struct'
+
+    def get_c_struct(self):
+        l = []
+        for name, var in self.a.components.items():
+            t = var.get_typedecl()
+            l.append('  %s %s;' % (t.get_c_type(), name))
+        return 'typedef struct {\n%s\n} %s;' % ('\n'.join(l), self.get_c_struct_name())
+
+TypeDecl = Type
+
+# Enum
+
+class EndEnum(EndStatement):
+    """
+    END ENUM
+    """
+    match = re.compile(r'end\s*enum\Z',re.I).match
+    blocktype = 'enum'
+
+class Enum(BeginStatement):
+    """
+    ENUM , BIND(C)
+      <enumerator-def-stmt>
+      [ <enumerator-def-stmt> ]...
+    """
+    blocktype = 'enum'
+    end_stmt_cls = EndEnum
+    match = re.compile(r'enum\s*,\s*bind\s*\(\s*c\s*\)\Z',re.I).match
+    def process_item(self):
+        return BeginStatement.process_item(self)
+    def get_classes(self):
+        return [Enumerator]
+
+###################################################
+
+import statements
+import typedecl_statements
+__all__.extend(statements.__all__)
+__all__.extend(typedecl_statements.__all__)
+
+from statements import *
+from typedecl_statements import *
+
+f2py_stmt = [Threadsafe, FortranName, Depend, Check, CallStatement,
+             CallProtoArgument]
+
+access_spec = [Public, Private]
+
+interface_specification = [Function, Subroutine,
+                           ModuleProcedure
+                           ]
+
+module_subprogram_part = [ Contains, Function, Subroutine ]
+
+specification_stmt = access_spec + [ Allocatable, Asynchronous, Bind,
+    Common, Data, Dimension, Equivalence, External, Intent, Intrinsic,
+    Namelist, Optional, Pointer, Protected, Save, Target, Volatile,
+    Value ]
+
+intrinsic_type_spec = [ SubprogramPrefix, Integer , Real,
+    DoublePrecision, Complex, DoubleComplex, Character, Logical, Byte
+    ]
+
+derived_type_spec = [  ]
+type_spec = intrinsic_type_spec + derived_type_spec
+declaration_type_spec = intrinsic_type_spec + [ TypeStmt, Class ]
+    
+type_declaration_stmt = declaration_type_spec
+
+private_or_sequence = [ Private, Sequence ]
+
+component_part = declaration_type_spec + [ ModuleProcedure ]
+
+proc_binding_stmt = [SpecificBinding, GenericBinding, FinalBinding]
+
+type_bound_procedure_part = [Contains, Private] + proc_binding_stmt
+
+#R214
+action_stmt = [ Allocate, GeneralAssignment, Assign, Backspace, Call, Close,
+    Continue, Cycle, Deallocate, Endfile, Exit, Flush, ForallStmt,
+    Goto, If, Inquire, Nullify, Open, Print, Read, Return, Rewind,
+    Stop, Wait, WhereStmt, Write, ArithmeticIf, ComputedGoto,
+    AssignedGoto, Pause ]
+# GeneralAssignment = Assignment + PointerAssignment
+# EndFunction, EndProgram, EndSubroutine - part of the corresponding blocks
+
+executable_construct = [ Associate, Do, ForallConstruct, IfThen,
+    Select, WhereConstruct ] + action_stmt
+#Case, see Select
+
+execution_part_construct = executable_construct + [ Format, Entry,
+    Data ]
+
+execution_part = execution_part_construct[:]
+
+#C201, R208
+for cls in [EndFunction, EndProgram, EndSubroutine]:
+    try: execution_part.remove(cls)
+    except ValueError: pass
+
+internal_subprogram = [Function, Subroutine]
+
+internal_subprogram_part = [ Contains, ] + internal_subprogram
+
+declaration_construct = [ TypeDecl, Entry, Enum, Format, Interface,
+    Parameter, ModuleProcedure, ] + specification_stmt + \
+    type_declaration_stmt
+# stmt-function-stmt
+
+implicit_part = [ Implicit, Parameter, Format, Entry ]
+
+specification_part = [ Use, Import ] + implicit_part + \
+                     declaration_construct
+
+
+external_subprogram = [Function, Subroutine]
+
+main_program = [Program] + specification_part + execution_part + \
+               internal_subprogram_part
+
+program_unit = main_program + external_subprogram + [Module,
+                                                     BlockData ]

Copied: trunk/numpy/f2py/lib/parser/doc.txt (from rev 3235, trunk/numpy/f2py/lib/doc.txt)
===================================================================
--- trunk/numpy/f2py/lib/doc.txt	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/doc.txt	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,362 @@
+
+Created: September 2006
+Author: Pearu Peterson <pearu.peterson at gmail.com>
+
+Fortran parser package structure
+================================
+
+numpy.f2py.lib.parser package contains the following files:
+
+api.py
+------
+
+Public API for Fortran parser.
+
+It exposes Statement classes, CHAR_BIT constant, and parse function.
+
+Function parse(<input>, ..) parses, analyzes and returns Statement
+tree of Fortran input. For example,
+
+::
+  >>> from api import parse
+  >>> code = """
+  ... c comment
+  ...       subroutine foo(a)
+  ...       integer a
+  ...       print*,"a=",a
+  ...       end
+  ... """
+  >>> tree = parse(code,isfree=False)
+  >>> print tree
+        !BEGINSOURCE <cStringIO.StringI object at 0xb75ac410> mode=fix90
+          SUBROUTINE foo(a)
+            INTEGER a
+            PRINT *, "a=", a
+          END SUBROUTINE foo
+  >>>
+  >>> tree
+        BeginSource
+          blocktype='beginsource'
+          name='<cStringIO.StringI object at 0xb75ac410> mode=fix90'
+          a=AttributeHolder:
+        external_subprogram=<dict with keys ['foo']>
+          content:
+            Subroutine
+              args=['a']
+              item=Line('subroutine foo(a)',(3, 3),'')
+              a=AttributeHolder:
+          variables=<dict with keys ['a']>
+              content:
+                Integer
+                  selector=('', '')
+                  entity_decls=['a']
+                  item=Line('integer a',(4, 4),'')
+                Print
+                  item=Line('print*,"a=",a',(5, 5),'')
+            EndSubroutine
+              blocktype='subroutine'
+              name='foo'
+              item=Line('end',(6, 6),'')
+
+readfortran.py
+--------------
+
+Tools for reading Fortran codes from file and string objects.
+
+To read Fortran code from a file, use FortranFileReader class.
+
+FortranFileReader class is iterator over Fortran code lines
+as is derived from FortranReaderBase class.
+It automatically handles line continuations and comments as
+well as detects if Fortran file is in free or fixed format.
+
+For example,
+
+::
+  >>> from readfortran import *
+  >>> import os
+  >>> reader = FortranFileReader(os.path.expanduser('~/src/blas/daxpy.f'))
+  >>> reader.next()
+  Line('subroutine daxpy(n,da,dx,incx,dy,incy)',(1, 1),'')
+  >>> reader.next()
+  Comment('c     constant times a vector plus a vector.\nc     uses unrolled loops for increments equal to one.\nc     jack dongarra, linpack, 3/11/78.\nc     modified 12/3/93, array(1) declarations changed to array(*)',(3, 6))
+  >>> reader.next()
+  Line('double precision dx(*),dy(*),da',(8, 8),'')
+  >>> reader.next()
+  Line('integer i,incx,incy,ix,iy,m,mp1,n',(9, 9),'')
+
+FortranReaderBase.next() method may return Line, SyntaxErrorLine, Comment, MultiLine,
+SyntaxErrorMultiLine instances.
+
+Line instance has the following attributes:
+
+  * .line - contains Fortran code line
+  * .span - a 2-tuple containing the span of line numbers containing
+            Fortran code in the original Fortran file
+  * .label - the label of Fortran code line
+  * .reader - the FortranReaderBase class instance
+  * .strline - if not None then contains Fortran code line with parenthesis
+             content and string literal constants saved in .strlinemap dictionary.
+  * .is_f2py_directive - True if line started with f2py directive comment.
+
+and the following methods:
+
+  * .get_line() - returns .strline (also evalutes it if None). Also
+                  handles Hollerith contstants in fixed F77 mode.
+  * .isempty()  - returns True if Fortran line contains no code.
+  * .copy(line=None, apply_map=False) - returns a Line instance
+    with given .span, .label, .reader information but line content
+    replaced with line (when not None) and applying .strlinemap
+    mapping (when apply_map is True).
+  * .apply_map(line) - apply .strlinemap mapping to line.
+  * .has_map() - returns True if .strlinemap mapping exists.
+
+For example,
+
+::
+
+  >>> item = reader.next()
+  >>> item
+  Line('if(n.le.0)return',(11, 11),'')
+  >>> item.line
+  'if(n.le.0)return'
+  >>> item.strline
+  'if(F2PY_EXPR_TUPLE_4)return'
+  >>> item.strlinemap
+  {'F2PY_EXPR_TUPLE_4': 'n.le.0'}
+  >>> item.label
+  ''
+  >>> item.span 
+  (11, 11)
+  >>> item.get_line()
+  'if(F2PY_EXPR_TUPLE_4)return'
+  >>> item.copy('if(F2PY_EXPR_TUPLE_4)pause',True)
+  Line('if(n.le.0)pause',(11, 11),'')
+
+Comment instance has the following attributes:
+
+  * .comment - comment string
+  * .span - a 2-tuple containing the span of line numbers containing
+            Fortran comment in the original Fortran file
+  * .reader - the FortranReaderBase class instance
+
+and .isempty() method.
+
+MultiLine class represents multiline syntax in .pyf files::
+
+  <prefix>'''<lines>'''<suffix>
+
+MultiLine instance has the following attributes:
+
+  * .prefix - the content of <prefix>
+  * .block - a list of lines
+  * .suffix - the content of <suffix>
+  * .span - a 2-tuple containing the span of line numbers containing
+            multiline syntax in the original Fortran file
+  * .reader - the FortranReaderBase class instance
+
+and .isempty() method.
+
+SyntaxErrorLine and SyntaxErrorMultiLine are like Line and MultiLine
+classes, respectively, with a functionality of issuing an error
+message to sys.stdout when constructing an instance of the corresponding
+class.
+
+To read a Fortran code from a string, use FortranStringReader class::
+
+  reader = FortranStringReader(<string>, <isfree>, <isstrict>)
+
+where the second and third arguments are used to specify the format
+of the given <string> content. When <isfree> and <isstrict> are both
+True, the content of a .pyf file is assumed. For example,
+
+::
+
+  >>> code = """                       
+  ... c      comment
+  ...       subroutine foo(a)
+  ...       print*, "a=",a
+  ...       end
+  ... """
+  >>> reader = FortranStringReader(code, False, True)
+  >>> reader.next()
+  Comment('c      comment',(2, 2))
+  >>> reader.next()
+  Line('subroutine foo(a)',(3, 3),'')
+  >>> reader.next()
+  Line('print*, "a=",a',(4, 4),'')
+  >>> reader.next()
+  Line('end',(5, 5),'')
+
+FortranReaderBase has the following attributes:
+
+  * .source - a file-like object with .next() method to retrive 
+              a source code line
+  * .source_lines - a list of read source lines
+  * .reader - a FortranReaderBase instance for reading files
+              from INCLUDE statements.
+  * .include_dirs - a list of directories where INCLUDE files
+              are searched. Default is ['.'].
+
+and the following methods:
+
+  * .set_mode(isfree, isstrict) - set Fortran code format information
+  * .close_source() - called when .next() raises StopIteration exception.
+
+parsefortran.py
+---------------
+
+Parse Fortran code from FortranReaderBase iterator.
+
+FortranParser class holds the parser information while
+iterating over items returned by FortranReaderBase iterator.
+The parsing information, collected when calling .parse() method,
+is saved in .block attribute as an instance
+of BeginSource class defined in block_statements.py file.
+
+For example,
+
+::
+
+  >>> reader = FortranStringReader(code, False, True)
+  >>> parser = FortranParser(reader)
+  >>> parser.parse()
+  >>> print parser.block
+        !BEGINSOURCE <cStringIO.StringI object at 0xb751d500> mode=fix77
+          SUBROUTINE foo(a)
+            PRINT *, "a=", a
+          END SUBROUTINE foo
+
+block_statements.py, base_classes.py, typedecl_statements.py, statements.py
+---------------------------------------------------------------------------
+
+The model for representing Fortran code statements consists of a tree of Statement
+classes defined in base_classes.py. There are two types of statements: one line
+statements and block statements. Block statements consists of start and end
+statements, and content statements in between that can be of both types again.
+
+Statement instance has the following attributes:
+
+  * .parent  - it is either parent block-type statement or FortranParser instance.
+  * .item    - Line instance containing Fortran statement line information, see above.
+  * .isvalid - when False then processing this Statement instance will be skipped,
+               for example, when the content of .item does not match with
+               the Statement class.
+  * .ignore  - when True then the Statement instance will be ignored.
+  * .modes   - a list of Fortran format modes where the Statement instance is valid.
+
+and the following methods:
+
+  * .info(message), .warning(message), .error(message) - to spit messages to
+               sys.stderr stream.
+  * .get_variable(name) - get Variable instance by name that is defined in
+               current namespace. If name is not defined, then the corresponding
+               Variable instance is created.
+  * .analyze() - calculate various information about the Statement, this information
+               is saved in .a attribute that is AttributeHolder instance.
+
+All statement classes are derived from Statement class. Block statements are
+derived from BeginStatement class and is assumed to end with EndStatement
+instance in .content attribute list. BeginStatement and EndStatement instances
+have the following attributes:
+
+  * .name      - name of the block, blocks without names use line label
+                 as the name.
+  * .blocktype - type of the block (derived from class name)
+  * .content   - a list of Statement (or Line) instances.
+
+and the following methods:
+
+  * .__str__() - returns string representation of Fortran code.
+
+A number of statements may declare a variable that is used in other
+statement expressions. Variables are represented via Variable class
+and its instances have the following attributes:
+
+  * .name      - name of the variable
+  * .typedecl  - type declaration
+  * .dimension - list of dimensions
+  * .bounds    - list of bounds
+  * .length    - length specs
+  * .attributes - list of attributes
+  * .bind      - list of bind information
+  * .intent    - list of intent information
+  * .check     - list of check expressions
+  * .init      - initial value of the variable
+  * .parent    - statement instance declaring the variable
+  * .parents   - list of statements that specify variable information
+
+and the following methods:
+
+  * .is_private()
+  * .is_public()
+  * .is_allocatable()
+  * .is_external()
+  * .is_intrinsic()
+  * .is_parameter()
+  * .is_optional()
+  * .is_required()
+
+The following type declaration statements are defined in typedecl_statements.py:
+
+  Integer, Real, DoublePrecision, Complex, DoubleComplex, Logical, 
+  Character, Byte, Type, Class
+
+and they have the following attributes:
+
+  * .selector           - contains lenght and kind specs
+  * .entity_decls, .attrspec
+
+and methods:
+
+  * .tostr() - return string representation of Fortran type declaration
+  * .astypedecl() - pure type declaration instance, it has no .entity_decls
+                    and .attrspec.
+  * .analyze() - processes .entity_decls and .attsspec attributes and adds
+                 Variable instance to .parent.a.variables dictionary.
+
+The following block statements are defined in block_statements.py:
+
+  BeginSource, Module, PythonModule, Program, BlockData, Interface,
+  Subroutine, Function, Select, Where, Forall, IfThen, If, Do,
+  Associate, TypeDecl (Type), Enum
+
+Block statement classes may have different properties which are declared via
+deriving them from the following classes:
+
+  HasImplicitStmt, HasUseStmt, HasVariables, HasTypeDecls,
+  HasAttributes, HasModuleProcedures, ProgramBlock
+
+In summary, .a attribute may hold different information sets as follows:
+
+  BeginSource - .module, .external_subprogram, .blockdata
+  Module - .attributes, .implicit_rules, .use, .use_provides, .variables,
+           .type_decls, .module_subprogram, .module_data
+  PythonModule - .implicit_rules, .use, .use_provides
+  Program - .attributes, .implicit_rules, .use, .use_provides
+  BlockData - .implicit_rules, .use, .use_provides, .variables
+  Interface - .implicit_rules, .use, .use_provides, .module_procedures
+  Function, Subroutine - .implicit_rules, .attributes, .use, .use_statements,
+              .variables, .type_decls, .internal_subprogram
+  TypeDecl - .variables, .attributes
+
+Block statements have the following methods:
+
+  * .get_classes() - returns a list of Statement classes that are valid
+                     as a content of given block statement.
+
+The following one line statements are defined:
+
+  Implicit, TypeDeclarationStatement derivatives (see above),
+  Assignment, PointerAssignment, Assign, Call, Goto, ComputedGoto,
+  AssignedGoto, Continue, Return, Stop, Print, Read, Write, Flush,
+  Wait, Contains, Allocate, Deallocate, ModuleProcedure, Access,
+  Public, Private, Close, Cycle, Backspace, Endfile, Reeinf, Open,
+  Format, Save, Data, Nullify, Use, Exit, Parameter, Equivalence,
+  Dimension, Target, Pointer, Protected, Volatile, Value, 
+  ArithmeticIf, Intrinsic, Inquire, Sequence, External, Namelist,
+  Common, Optional, Intent, Entry, Import, Forall,
+  SpecificBinding, GenericBinding, FinalBinding, Allocatable,
+  Asynchronous, Bind, Else, ElseIf, Case, Where, ElseWhere,
+  Enumerator, FortranName, Threadsafe, Depend, Check,
+  CallStatement, CallProtoArgument, Pause

Copied: trunk/numpy/f2py/lib/parser/parsefortran.py (from rev 3235, trunk/numpy/f2py/lib/parsefortran.py)

Copied: trunk/numpy/f2py/lib/parser/readfortran.py (from rev 3235, trunk/numpy/f2py/lib/readfortran.py)
===================================================================
--- trunk/numpy/f2py/lib/readfortran.py	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/readfortran.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,829 @@
+#!/usr/bin/env python
+"""
+Defines FortranReader classes for reading Fortran codes from
+files and strings. FortranReader handles comments and line continuations
+of both fix and free format Fortran codes.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['FortranFileReader',
+           'FortranStringReader',
+           'FortranReaderError',
+           'Line', 'SyntaxErrorLine',
+           'Comment',
+           'MultiLine','SyntaxErrorMultiLine',
+           ]
+
+import re
+import os
+import sys
+import tempfile
+import traceback
+from cStringIO import StringIO
+from numpy.distutils.misc_util import yellow_text, red_text, blue_text
+
+from sourceinfo import get_source_info
+from splitline import String, string_replace_map, splitquote
+
+_spacedigits=' 0123456789'
+_cf2py_re = re.compile(r'(?P<indent>\s*)!f2py(?P<rest>.*)',re.I)
+_is_fix_cont = lambda line: line and len(line)>5 and line[5]!=' ' and line[:5]==5*' '
+_is_f90_cont = lambda line: line and '&' in line and line.rstrip()[-1]=='&'
+_f90label_re = re.compile(r'\s*(?P<label>(\w+\s*:|\d+))\s*(\b|(?=&)|\Z)',re.I)
+_is_include_line = re.compile(r'\s*include\s*("[^"]+"|\'[^\']+\')\s*\Z',re.I).match
+_is_fix_comment = lambda line: line and line[0] in '*cC!'
+_hollerith_start_search = re.compile(r'(?P<pre>\A|,\s*)(?P<num>\d+)h',re.I).search
+_is_call_stmt = re.compile(r'call\b', re.I).match
+
+class FortranReaderError: # TODO: may be derive it from Exception
+    def __init__(self, message):
+        self.message = message
+        print >> sys.stderr,message
+        sys.stderr.flush()
+
+class Line:
+    """ Holds a Fortran source line.
+    """
+    
+    f2py_strmap_findall = re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall
+    
+    def __init__(self, line, linenospan, label, reader):
+        self.line = line.strip()
+        self.span = linenospan
+        self.label = label
+        self.reader = reader
+        self.strline = None
+        self.is_f2py_directive = linenospan[0] in reader.f2py_comment_lines
+
+    def has_map(self):
+        return not not (hasattr(self,'strlinemap') and self.strlinemap)
+
+    def apply_map(self, line):
+        if not hasattr(self,'strlinemap') or not self.strlinemap:
+            return line
+        findall = self.f2py_strmap_findall
+        str_map = self.strlinemap
+        keys = findall(line)
+        for k in keys:
+            line = line.replace(k, str_map[k])
+        return line
+
+    def copy(self, line = None, apply_map = False):
+        if line is None:
+            line = self.line
+        if apply_map:
+            line = self.apply_map(line)
+        return Line(line, self.span, self.label, self.reader)
+
+    def clone(self, line):
+        self.line = self.apply_map(line)
+        self.strline = None
+        return
+    
+    def __repr__(self):
+        return self.__class__.__name__+'(%r,%s,%r)' \
+               % (self.line, self.span, self.label)
+
+    def isempty(self, ignore_comments=False):
+        return not (self.line.strip() or self.label)
+
+    def get_line(self):
+        if self.strline is not None:
+            return self.strline
+        line = self.line
+        if self.reader.isfix77:
+            # Handle Hollerith constants by replacing them
+            # with char-literal-constants.
+            # H constants may appear only in DATA statements and
+            # in the argument list of CALL statement.
+            # Holleriht constants were removed from the Fortran 77 standard.
+            # The following handling is not perfect but works for simple
+            # usage cases.
+            # todo: Handle hollerith constants in DATA statement
+            if _is_call_stmt(line):
+                l2 = self.line[4:].lstrip()
+                i = l2.find('(')
+                if i != -1 and l2[-1]==')':
+                    substrings = ['call '+l2[:i+1]]
+                    start_search = _hollerith_start_search
+                    l2 = l2[i+1:-1].strip()
+                    m = start_search(l2)
+                    while m:
+                        substrings.append(l2[:m.start()])
+                        substrings.append(m.group('pre'))
+                        num = int(m.group('num'))
+                        substrings.append("'"+l2[m.end():m.end()+num]+"'")
+                        l2 = l2[m.end()+num:]
+                        m = start_search(l2)
+                    substrings.append(l2)
+                    substrings.append(')')
+                    line = ''.join(substrings)
+
+        line, str_map = string_replace_map(line, lower=not self.reader.ispyf)
+        self.strline = line
+        self.strlinemap = str_map
+        return line
+
+class SyntaxErrorLine(Line, FortranReaderError):
+    def __init__(self, line, linenospan, label, reader, message):
+        Line.__init__(self, line, linenospan, label, reader)
+        FortranReaderError.__init__(self, message)
+
+class Comment:
+    """ Holds Fortran comment.
+    """
+    def __init__(self, comment, linenospan, reader):
+        self.comment = comment
+        self.span = linenospan
+        self.reader = reader
+    def __repr__(self):
+        return self.__class__.__name__+'(%r,%s)' \
+               % (self.comment, self.span)
+    def isempty(self, ignore_comments=False):
+        return ignore_comments or len(self.comment)<2
+
+class MultiLine:
+    """ Holds (prefix, line list, suffix) representing multiline
+    syntax in .pyf files:
+      prefix+'''+lines+'''+suffix.
+    """
+    def __init__(self, prefix, block, suffix, linenospan, reader):
+        self.prefix = prefix
+        self.block  = block
+        self.suffix = suffix
+        self.span = linenospan
+        self.reader = reader
+    def __repr__(self):
+        return self.__class__.__name__+'(%r,%r,%r,%s)' \
+               % (self.prefix,self.block,self.suffix,
+                  self.span)
+    def isempty(self, ignore_comments=False):
+        return not (self.prefix or self.block or self.suffix)
+
+class SyntaxErrorMultiLine(MultiLine, FortranReaderError):
+    def __init__(self, prefix, block, suffix, linenospan, reader, message):
+        MultiLine.__init__(self, prefix, block, suffix, linenospan, reader)
+        FortranReaderError.__init__(self, message)
+
+
+class FortranReaderBase:
+
+    def __init__(self, source, isfree, isstrict):
+        """
+        source - file-like object with .next() method
+                 used to retrive a line.
+        source may contain
+          - Fortran 77 code
+          - fixed format Fortran 90 code          
+          - free format Fortran 90 code
+          - .pyf signatures - extended free format Fortran 90 syntax
+        """
+
+        self.linecount = 0
+        self.source = source
+        self.isclosed = False
+
+        self.filo_line = []
+        self.fifo_item = []
+        self.source_lines = []
+
+        self.f2py_comment_lines = [] # line numbers that contain f2py directives
+
+        self.reader = None
+        self.include_dirs = ['.']
+
+        self.set_mode(isfree, isstrict)
+        return
+
+    def set_mode(self, isfree, isstrict):
+        self.isfree90 = isfree and not isstrict
+        self.isfix90 = not isfree and not isstrict
+        self.isfix77 = not isfree and isstrict
+        self.ispyf   = isfree and isstrict
+        self.isfree  = isfree
+        self.isfix   = not isfree
+        self.isstrict = isstrict
+
+        if self.isfree90: mode = 'free90'
+        elif self.isfix90: mode = 'fix90'
+        elif self.isfix77: mode = 'fix77'
+        else: mode = 'pyf'
+        self.mode = mode
+        self.name = '%s mode=%s' % (self.source, mode)
+        return
+
+    def close_source(self):
+        # called when self.source.next() raises StopIteration.
+        pass
+
+    # For handling raw source lines:
+
+    def put_single_line(self, line):
+        self.filo_line.append(line)
+        self.linecount -= 1
+        return
+
+    def get_single_line(self):
+        try:
+            line = self.filo_line.pop()
+            self.linecount += 1
+            return line
+        except IndexError:
+            pass
+        if self.isclosed:
+            return None
+        try:
+            line = self.source.next()
+        except StopIteration:
+            self.isclosed = True
+            self.close_source()
+            return None
+        self.linecount += 1
+        # expand tabs, replace special symbols, get rid of nl characters
+        line = line.expandtabs().replace('\xa0',' ').rstrip()
+        self.source_lines.append(line)
+        if not line:
+            return self.get_single_line()
+        return line
+
+    def get_next_line(self):
+        line = self.get_single_line()
+        if line is None: return
+        self.put_single_line(line)
+        return line
+
+    # Iterator methods:
+
+    def __iter__(self):
+        return self
+
+    def next(self, ignore_comments = False):
+            
+        try:
+            if self.reader is not None:
+                try:
+                    return self.reader.next()
+                except StopIteration:
+                    self.reader = None
+            item = self._next(ignore_comments)
+            if isinstance(item, Line) and _is_include_line(item.line):
+                reader = item.reader
+                filename = item.line.strip()[7:].lstrip()[1:-1]
+                include_dirs = self.include_dirs[:]
+                path = filename
+                for incl_dir in include_dirs:
+                    path = os.path.join(incl_dir, filename)
+                    if os.path.exists(path):
+                        break
+                if not os.path.isfile(path):
+                    dirs = os.pathsep.join(include_dirs)
+                    message = reader.format_message(\
+                        'WARNING',
+                        'include file %r not found in %r,'\
+                        ' ignoring.' % (filename, dirs),
+                        item.span[0], item.span[1])
+                    reader.show_message(message, sys.stdout)
+                    return self.next(ignore_comments = ignore_comments)
+                message = reader.format_message('INFORMATION',
+                                              'found file %r' % (path),
+                                              item.span[0], item.span[1])
+                reader.show_message(message, sys.stdout)
+                self.reader = FortranFileReader(path, include_dirs = include_dirs)
+                return self.reader.next(ignore_comments = ignore_comments)
+            return item
+        except StopIteration:
+            raise
+        except:
+            message = self.format_message('FATAL ERROR',
+                                          'while processing line',
+                                          self.linecount, self.linecount)
+            self.show_message(message, sys.stdout)
+            traceback.print_exc(file=sys.stdout)
+            self.show_message(red_text('STOPPED READING'), sys.stdout)
+            raise StopIteration
+
+    def _next(self, ignore_comments = False):
+        fifo_item_pop = self.fifo_item.pop
+        while 1:
+            try:
+                item = fifo_item_pop(0)
+            except IndexError:
+                item = self.get_source_item()
+                if item is None:
+                    raise StopIteration
+            if not item.isempty(ignore_comments):
+                break
+            # else ignore empty lines and comments
+        if not isinstance(item, Comment):
+            if not self.ispyf and isinstance(item, Line) \
+                   and not item.is_f2py_directive \
+                   and ';' in item.get_line():
+                # ;-separator not recognized in pyf-mode
+                items = []
+                for line in item.get_line().split(';'):
+                    line = line.strip()
+                    items.append(item.copy(line, apply_map=True))
+                items.reverse()
+                for newitem in items:
+                    self.fifo_item.insert(0, newitem)
+                return fifo_item_pop(0)
+            return item
+        # collect subsequent comments to one comment instance
+        comments = []
+        start = item.span[0]
+        while isinstance(item, Comment):
+            comments.append(item.comment)
+            end = item.span[1]
+            while 1:
+                try:
+                    item = fifo_item_pop(0)
+                except IndexError:
+                    item = self.get_source_item()
+                if item is None or not item.isempty(ignore_comments):
+                    break
+            if item is None:
+                break # hold raising StopIteration for the next call.
+        if item is not None:
+            self.fifo_item.insert(0,item)
+        return self.comment_item('\n'.join(comments), start, end)
+
+    # Interface to returned items:
+
+    def line_item(self, line, startlineno, endlineno, label, errmessage=None):
+        if errmessage is None:
+            return  Line(line, (startlineno, endlineno), label, self)
+        return SyntaxErrorLine(line, (startlineno, endlineno),
+                               label, self, errmessage)
+
+    def multiline_item(self, prefix, lines, suffix,
+                       startlineno, endlineno, errmessage=None):
+        if errmessage is None:
+            return MultiLine(prefix, lines, suffix, (startlineno, endlineno), self)
+        return SyntaxErrorMultiLine(prefix, lines, suffix,
+                                    (startlineno, endlineno), self, errmessage)
+
+    def comment_item(self, comment, startlineno, endlineno):
+        return Comment(comment, (startlineno, endlineno), self)
+
+    # For handling messages:
+
+    def show_message(self, message, stream = sys.stdout):
+        stream.write(message+'\n')
+        stream.flush()
+
+    def format_message(self, kind, message, startlineno, endlineno,
+                       startcolno=0, endcolno=-1):
+        back_index = {'warning':2,'error':3,'info':0}.get(kind.lower(),3)
+        r = ['%s while processing %r (mode=%r)..' % (kind, self.id, self.mode)]
+        for i in range(max(1,startlineno-back_index),startlineno):
+            r.append('%5d:%s' % (i,self.source_lines[i-1]))
+        for i in range(startlineno,min(endlineno+back_index,len(self.source_lines))+1):
+            if i==0 and not self.source_lines:
+                break
+            linenostr = '%5d:' % (i)
+            if i==endlineno:
+                sourceline = self.source_lines[i-1] 
+                l0 = linenostr+sourceline[:startcolno]
+                if endcolno==-1:
+                    l1 = sourceline[startcolno:]
+                    l2 = ''
+                else:
+                    l1 = sourceline[startcolno:endcolno]
+                    l2 = sourceline[endcolno:]
+                r.append('%s%s%s <== %s' % (l0,yellow_text(l1),l2,red_text(message)))
+            else:
+                r.append(linenostr+ self.source_lines[i-1])
+        return '\n'.join(r)
+    
+    def format_error_message(self, message, startlineno, endlineno,
+                             startcolno=0, endcolno=-1):
+        return self.format_message('ERROR',message, startlineno,
+                                   endlineno, startcolno, endcolno)
+
+    def format_warning_message(self, message, startlineno, endlineno,
+                               startcolno=0, endcolno=-1):
+        return self.format_message('WARNING',message, startlineno,
+                                   endlineno, startcolno, endcolno)
+
+    # Auxiliary methods for processing raw source lines:
+
+    def handle_cf2py_start(self, line):
+        """
+        f2py directives can be used only in Fortran codes.
+        They are ignored when used inside .pyf files.
+        """
+        if not line or self.ispyf: return line
+        if self.isfix:
+            if line[0] in '*cC!#':
+                if line[1:5].lower() == 'f2py':
+                    line = 5*' ' + line[5:]
+                    self.f2py_comment_lines.append(self.linecount)
+            if self.isfix77:
+                return line
+        m = _cf2py_re.match(line)
+        if m:
+            newline = m.group('indent')+5*' '+m.group('rest')
+            self.f2py_comment_lines.append(self.linecount)
+            assert len(newline)==len(line),`newlinel,line`
+            return newline
+        return line
+
+    def handle_inline_comment(self, line, lineno, quotechar=None):
+        if quotechar is None and '!' not in line and \
+           '"' not in line and "'" not in line:
+            return line, quotechar
+        i = line.find('!')
+        put_item = self.fifo_item.append
+        if quotechar is None and i!=-1:
+            # first try a quick method
+            newline = line[:i]
+            if '"' not in newline and '\'' not in newline:
+                if self.isfix77 or not line[i:].startswith('!f2py'):
+                    put_item(self.comment_item(line[i:], lineno, lineno))
+                    return newline, quotechar
+        # handle cases where comment char may be a part of a character content
+        #splitter = LineSplitter(line, quotechar)
+        #items = [item for item in splitter]
+        #newquotechar = splitter.quotechar
+        items, newquotechar = splitquote(line, quotechar)
+
+        noncomment_items = []
+        noncomment_items_append = noncomment_items.append
+        n = len(items)
+        commentline = None
+        for k in range(n):
+            item = items[k]
+            if isinstance(item, String) or '!' not in item:
+                noncomment_items_append(item)
+                continue
+            j = item.find('!')
+            noncomment_items_append(item[:j])
+            items[k] = item[j:]
+            commentline = ''.join(items[k:])
+            break
+        if commentline is not None:
+            if commentline.startswith('!f2py'):
+                # go to next iteration:
+                newline = ''.join(noncomment_items) + commentline[5:]
+                self.f2py_comment_lines.append(lineno)
+                return self.handle_inline_comment(newline, lineno, quotechar)
+            put_item(self.comment_item(commentline, lineno, lineno))
+        return ''.join(noncomment_items), newquotechar
+
+    def handle_multilines(self, line, startlineno, mlstr):
+        i = line.find(mlstr)
+        if i != -1:
+            prefix = line[:i]
+            # skip fake multiline starts
+            p,k = prefix,0
+            while p.endswith('\\'):
+                p,k = p[:-1],k+1
+            if k % 2: return
+        if i != -1 and '!' not in prefix:
+            # Note character constans like 'abc"""123',
+            # so multiline prefix should better not contain `'' or `"' not `!'.
+            for quote in '"\'':
+                if prefix.count(quote) % 2:
+                    message = self.format_warning_message(\
+                            'multiline prefix contains odd number of %r characters' \
+                            % (quote), startlineno, startlineno,
+                            0, len(prefix))
+                    self.show_message(message, sys.stderr)
+
+            suffix = None
+            multilines = []
+            line = line[i+3:]
+            while line is not None:
+                j = line.find(mlstr)
+                if j != -1 and '!' not in line[:j]:
+                    multilines.append(line[:j])
+                    suffix = line[j+3:]
+                    break
+                multilines.append(line)
+                line = self.get_single_line()
+            if line is None:
+                message = self.format_error_message(\
+                            'multiline block never ends', startlineno,
+                            startlineno, i)
+                return self.multiline_item(\
+                            prefix,multilines,suffix,\
+                            startlineno, self.linecount, message)
+            suffix,qc = self.handle_inline_comment(suffix, self.linecount)
+            # no line continuation allowed in multiline suffix
+            if qc is not None:
+                message = self.format_message(\
+                            'ASSERTION FAILURE(pyf)',
+                        'following character continuation: %r, expected None.' % (qc),
+                            startlineno, self.linecount)
+                self.show_message(message, sys.stderr)
+            # XXX: should we do line.replace('\\'+mlstr[0],mlstr[0])
+            #      for line in multilines?
+            return self.multiline_item(prefix,multilines,suffix,
+                                       startlineno, self.linecount)        
+
+    # The main method of interpreting raw source lines within
+    # the following contexts: f77, fixed f90, free f90, pyf.
+
+    def get_source_item(self):
+        """
+        a source item is ..
+        - a fortran line
+        - a list of continued fortran lines
+        - a multiline - lines inside triple-qoutes, only when in ispyf mode        
+        """
+        get_single_line = self.get_single_line
+        line = get_single_line()
+        if line is None: return
+        startlineno = self.linecount
+        line = self.handle_cf2py_start(line)
+        is_f2py_directive = startlineno in self.f2py_comment_lines
+
+        label = None
+        if self.ispyf:
+            # handle multilines
+            for mlstr in ['"""',"'''"]:
+                r = self.handle_multilines(line, startlineno, mlstr)
+                if r: return r
+
+        if self.isfix:
+            label = line[:5].strip().lower()
+            if label.endswith(':'): label = label[:-1].strip()
+            if not line.strip():
+                # empty line
+                return self.line_item(line[6:],startlineno,self.linecount,label)
+            if _is_fix_comment(line):
+                return self.comment_item(line, startlineno, startlineno)
+            for i in range(5):
+                if line[i] not in _spacedigits:
+                    message =  'non-space/digit char %r found in column %i'\
+                              ' of fixed Fortran code' % (line[i],i+1)
+                    if self.isfix90:
+                        message = message + ', switching to free format mode'
+                        message = self.format_warning_message(\
+                            message,startlineno, self.linecount)
+                        self.show_message(message, sys.stderr)
+                        self.set_mode(True, False)
+                    else:
+                        return self.line_item(line[6:], startlineno, self.linecount,
+                                           label, self.format_error_message(\
+                            message, startlineno, self.linecount))
+
+        if self.isfix77 and not is_f2py_directive:
+            lines = [line[6:72]]
+            while _is_fix_cont(self.get_next_line()):
+                # handle fix format line continuations for F77 code
+                line = get_single_line()
+                lines.append(line[6:72])
+            return self.line_item(''.join(lines),startlineno,self.linecount,label)
+
+        handle_inline_comment = self.handle_inline_comment
+        
+        if self.isfix90 and not is_f2py_directive:
+            # handle inline comment
+            newline,qc = handle_inline_comment(line[6:], startlineno)
+            lines = [newline]
+            next_line = self.get_next_line()
+            while _is_fix_cont(next_line) or _is_fix_comment(next_line):
+                # handle fix format line continuations for F90 code.
+                # mixing fix format and f90 line continuations is not allowed
+                # nor detected, just eject warnings.
+                line2 = get_single_line()
+                if _is_fix_comment(line2):
+                    # handle fix format comments inside line continuations
+                    citem = self.comment_item(line2,self.linecount,self.linecount)
+                    self.fifo_item.append(citem)
+                else:
+                    newline, qc = self.handle_inline_comment(line2[6:],
+                                                             self.linecount, qc)
+                    lines.append(newline)
+                next_line = self.get_next_line()
+            # no character continuation should follows now
+            if qc is not None:
+                message = self.format_message(\
+                            'ASSERTION FAILURE(fix90)',
+                            'following character continuation: %r, expected None.'\
+                            % (qc), startlineno, self.linecount)
+                self.show_message(message, sys.stderr)
+            if len(lines)>1:
+                for i in range(len(lines)):
+                    l = lines[i]
+                    if l.rstrip().endswith('&'):
+                        message = self.format_warning_message(\
+                        'f90 line continuation character `&\' detected'\
+                        ' in fix format code',
+                        startlineno + i, startlineno + i, l.rfind('&')+5)
+                        self.show_message(message, sys.stderr)
+                return self.line_item(''.join(lines),startlineno,
+                                      self.linecount,label)
+        start_index = 0
+        if self.isfix90:
+            start_index = 6
+
+        lines = []
+        lines_append = lines.append
+        put_item = self.fifo_item.append
+        qc = None
+        while line is not None:
+            if start_index: # fix format code
+                line,qc = handle_inline_comment(line[start_index:],
+                                                self.linecount,qc)
+                is_f2py_directive = self.linecount in self.f2py_comment_lines
+            else:
+                line_lstrip = line.lstrip()
+                if lines:
+                    if line_lstrip.startswith('!'):
+                        # check for comment line within line continuation
+                        put_item(self.comment_item(line_lstrip,
+                                                   self.linecount, self.linecount))
+                        line = get_single_line()
+                        continue
+                else:
+                    # first line, check for a f90 label
+                    m = _f90label_re.match(line)
+                    if m:
+                        assert not label,`label,m.group('label')`
+                        label = m.group('label').strip()
+                        if label.endswith(':'): label = label[:-1].strip()
+                        if not self.ispyf: label = label.lower()
+                        line = line[m.end():]
+                line,qc = handle_inline_comment(line, self.linecount, qc)
+                is_f2py_directive = self.linecount in self.f2py_comment_lines
+
+            i = line.rfind('&')
+            if i!=-1:
+                line_i1_rstrip = line[i+1:].rstrip()
+            if not lines:
+                # first line
+                if i == -1 or line_i1_rstrip:
+                    lines_append(line)
+                    break
+                lines_append(line[:i])
+                line = get_single_line()
+                continue
+            if i == -1 or line_i1_rstrip:
+                # no line continuation follows
+                i = len(line)
+            k = -1
+            if i != -1:
+                # handle the beggining of continued line
+                k = line[:i].find('&')
+                if k != 1 and line[:k].lstrip():
+                    k = -1
+            lines_append(line[k+1:i])
+            if i==len(line):
+                break
+            line = get_single_line()
+
+        if qc is not None:
+            message = self.format_message('ASSERTION FAILURE(free)',
+                'following character continuation: %r, expected None.' % (qc),
+                startlineno, self.linecount)
+            self.show_message(message, sys.stderr)
+        return self.line_item(''.join(lines),startlineno,self.linecount,label)
+
+    ##  FortranReaderBase
+
+# Fortran file and string readers:
+
+class FortranFileReader(FortranReaderBase):
+
+    def __init__(self, filename,
+                 include_dirs = None):
+        isfree, isstrict = get_source_info(filename)
+        self.id = filename
+        self.file = open(filename,'r')
+        FortranReaderBase.__init__(self, self.file, isfree, isstrict)
+        if include_dirs is None:
+            self.include_dirs.insert(0, os.path.dirname(filename))
+        else:
+            self.include_dirs = include_dirs[:]
+        return
+
+    def close_source(self):
+        self.file.close()
+
+class FortranStringReader(FortranReaderBase):
+    
+    def __init__(self, string, isfree, isstrict, include_dirs = None):
+        self.id = 'string-'+str(id(string))
+        source = StringIO(string)
+        FortranReaderBase.__init__(self, source, isfree, isstrict)
+        if include_dirs is not None:
+            self.include_dirs = include_dirs[:]
+        return
+
+# Testing:
+
+def test_f77():
+    string_f77 = """
+c12346 comment
+      subroutine foo
+      call foo
+     'bar
+a    'g
+      abc=2
+cf2py call me ! hey
+      call you ! hi
+      end
+     '"""
+    reader = FortranStringReader(string_f77,False,True)
+    for item in reader:
+        print item
+    
+    filename = tempfile.mktemp()+'.f'
+    f = open(filename,'w')
+    f.write(string_f77)
+    f.close()
+
+    reader = FortranFileReader(filename)
+    for item in reader:
+        print item
+
+def test_pyf():
+    string_pyf = """\
+python module foo
+  interface
+  beginml '''1st line
+  2nd line
+  end line'''endml='tere!fake comment'!should be a comment
+  a = 2
+  'charc\"onstant' ''' single line mline '''a='hi!fake comment'!should be a comment
+  a=\\\\\\\\\\'''not a multiline'''
+  !blah='''never ending multiline
+  b=3! hey, fake line continuation:&
+  c=4& !line cont
+  &45
+  thisis_label_2 : c = 3
+   xxif_isotropic_2 :     if ( string_upper_compare ( o%opt_aniso, 'ISOTROPIC' ) ) then
+   g=3
+   endif
+  end interface
+  if ( pc_get_lun() .ne. 6) &
+
+    write ( pc_get_lun(), '( &
+    & /, a, /, " p=", i4, " stopping c_flag=", a, &
+    & /, " print unit=", i8)') &
+    trim(title), pcpsx_i_pel(), trim(c_flag), pc_get_lun()
+end python module foo
+! end of file
+"""
+    reader = FortranStringReader(string_pyf,True, True)
+    for item in reader:
+        print item
+
+def test_fix90():
+    string_fix90 = """\
+      subroutine foo
+cComment
+ 1234 a = 3 !inline comment
+      b = 3
+!
+     !4!line cont. with comment symbol
+     &5
+      a = 3!f2py.14 ! pi!
+!   KDMO
+      write (obj%print_lun, *) ' KDMO : '
+      write (obj%print_lun, *) '  COORD = ',coord, '  BIN_WID = ',             &
+       obj%bin_wid,'  VEL_DMO = ', obj%vel_dmo
+      end subroutine foo
+      subroutine
+ 
+     & foo
+      end
+"""
+    reader = FortranStringReader(string_fix90,False, False)
+    for item in reader:
+        print item
+
+def simple_main():
+    for filename in sys.argv[1:]:
+        print 'Processing',filename
+        reader = FortranFileReader(filename)
+        for item in reader:
+            print >> sys.stdout, item
+            sys.stdout.flush()
+            pass
+
+def profile_main():
+    import hotshot, hotshot.stats
+    prof = hotshot.Profile("readfortran.prof")
+    prof.runcall(simple_main)
+    prof.close()
+    stats = hotshot.stats.load("readfortran.prof")
+    stats.strip_dirs()
+    stats.sort_stats('time', 'calls')
+    stats.print_stats(30)
+
+if __name__ == "__main__":
+    #test_pyf()
+    #test_fix90()
+    #profile_main()
+    simple_main()

Copied: trunk/numpy/f2py/lib/parser/sourceinfo.py (from rev 3235, trunk/numpy/f2py/lib/sourceinfo.py)
===================================================================
--- trunk/numpy/f2py/lib/sourceinfo.py	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/sourceinfo.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,81 @@
+"""
+Provides get_source_info(<filename>) function to determine the format
+(free|fixed|strict|pyf) of a Fortran file.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['get_source_info']
+
+import re
+import os
+import sys
+
+_has_f_extension = re.compile(r'.*[.](for|ftn|f77|f)\Z',re.I).match
+_has_f_header = re.compile(r'-[*]-\s*fortran\s*-[*]-',re.I).search
+_has_f90_header = re.compile(r'-[*]-\s*f90\s*-[*]-',re.I).search
+_has_fix_header = re.compile(r'-[*]-\s*fix\s*-[*]-',re.I).search
+_free_f90_start = re.compile(r'[^c*!]\s*[^\s\d\t]',re.I).match
+
+def get_source_info(filename):
+    """
+    Determine if fortran file is
+      - in fix format and contains Fortran 77 code    -> return False, True
+      - in fix format and contains Fortran 90 code    -> return False, False
+      - in free format and contains Fortran 90 code   -> return True, False
+      - in free format and contains signatures (.pyf) -> return True, True
+    """
+    base,ext = os.path.splitext(filename)
+    if ext=='.pyf':
+        return True, True
+    isfree = False
+    isstrict = False
+    f = open(filename,'r')
+    firstline = f.readline()
+    f.close()
+    if _has_f_extension(filename) and \
+       not (_has_f90_header(firstline) or _has_fix_header(firstline)):
+        isstrict = True
+    elif is_free_format(filename) and not _has_fix_header(firstline):
+        isfree = True
+    return isfree,isstrict
+
+def is_free_format(file):
+    """Check if file is in free format Fortran."""
+    # f90 allows both fixed and free format, assuming fixed unless
+    # signs of free format are detected.
+    isfree = False
+    f = open(file,'r')
+    line = f.readline()
+    n = 10000 # the number of non-comment lines to scan for hints
+    if _has_f_header(line):
+        n = 0
+    elif _has_f90_header(line):
+        n = 0
+        isfree = True
+    contline = False
+    while n>0 and line:
+        line = line.rstrip()
+        if line and line[0]!='!':
+            n -= 1
+            if line[0]!='\t' and _free_f90_start(line[:5]) or line[-1:]=='&':
+                isfree = True
+                break
+        line = f.readline()
+    f.close()
+    return isfree
+
+def simple_main():
+    for filename in sys.argv[1:]:
+        isfree, isstrict = get_source_info(filename)
+        print '%s: isfree=%s, isstrict=%s'  % (filename, isfree, isstrict)
+    
+if __name__ == '__main__':
+    simple_main()

Copied: trunk/numpy/f2py/lib/parser/splitline.py (from rev 3235, trunk/numpy/f2py/lib/splitline.py)
===================================================================
--- trunk/numpy/f2py/lib/splitline.py	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/splitline.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,416 @@
+#!/usr/bin/env python
+"""
+Defines LineSplitter and helper functions.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['String','string_replace_map','splitquote','splitparen']
+
+import re
+
+class String(str): pass
+class ParenString(str): pass
+
+def split2(line, lower=False):
+    """
+    Split line into non-string part and into a start of a string part.
+    Returns 2-tuple. The second item either is empty string or start
+    of a string part.
+    """
+    return LineSplitter(line,lower=lower).split2()
+
+_f2py_str_findall = re.compile(r"_F2PY_STRING_CONSTANT_\d+_").findall
+_is_name = re.compile(r'\w*\Z',re.I).match
+_is_simple_str = re.compile(r'\w*\Z',re.I).match
+
+def string_replace_map(line, lower=False,
+                       _cache={'index':0,'pindex':0}):
+    """
+    1) Replaces string constants with symbol `'_F2PY_STRING_CONSTANT_<index>_'`
+    2) Replaces (expression) with symbol `(F2PY_EXPR_TUPLE_<index>)`
+    Returns a new line and the replacement map.
+    """
+    items = []
+    string_map = {}
+    rev_string_map = {}
+    for item in splitquote(line, lower=lower)[0]:
+        if isinstance(item, String) and not _is_simple_str(item[1:-1]):
+            key = rev_string_map.get(item)
+            if key is None:
+                _cache['index'] += 1
+                index = _cache['index']
+                key = "_F2PY_STRING_CONSTANT_%s_" % (index)
+                it = item[1:-1]
+                string_map[key] = it
+                rev_string_map[it] = key
+            items.append(item[0]+key+item[-1])
+        else:
+            items.append(item)
+    newline = ''.join(items)
+    items = []
+    expr_keys = []
+    for item in splitparen(newline):
+        if isinstance(item, ParenString) and not _is_name(item[1:-1]):
+            key = rev_string_map.get(item)
+            if key is None:
+                _cache['pindex'] += 1
+                index = _cache['pindex']
+                key = 'F2PY_EXPR_TUPLE_%s' % (index)
+                it = item[1:-1].strip()
+                string_map[key] = it
+                rev_string_map[it] = key
+                expr_keys.append(key)
+            items.append(item[0]+key+item[-1])
+        else:
+            items.append(item)
+    found_keys = set()
+    for k in expr_keys:
+        v = string_map[k]
+        l = _f2py_str_findall(v)
+        if l:
+            found_keys = found_keys.union(l)
+            for k1 in l:
+                v = v.replace(k1, string_map[k1])
+            string_map[k] = v
+    for k in found_keys:
+        del string_map[k]
+    return ''.join(items), string_map
+
+def splitquote(line, stopchar=None, lower=False, quotechars = '"\''):
+    """
+    Fast LineSplitter
+    """
+    items = []
+    i = 0
+    while 1:
+        try:
+            char = line[i]; i += 1
+        except IndexError:
+            break
+        l = []
+        l_append = l.append
+        nofslashes = 0
+        if stopchar is None:
+            # search for string start
+            while 1:
+                if char in quotechars and not nofslashes % 2:
+                    stopchar = char
+                    i -= 1
+                    break
+                if char=='\\':
+                    nofslashes += 1
+                else:
+                    nofslashes = 0
+                l_append(char)
+                try:
+                    char = line[i]; i += 1
+                except IndexError:
+                    break
+            if not l: continue
+            item = ''.join(l)
+            if lower: item = item.lower()
+            items.append(item)
+            continue
+        if char==stopchar:
+            # string starts with quotechar
+            l_append(char)
+            try:
+                char = line[i]; i += 1
+            except IndexError:
+                if l:
+                    item = String(''.join(l))
+                    items.append(item)
+                break
+        # else continued string
+        while 1:
+            if char==stopchar and not nofslashes % 2:
+                l_append(char)
+                stopchar = None
+                break
+            if char=='\\':
+                nofslashes += 1
+            else:
+                nofslashes = 0
+            l_append(char)
+            try:
+                char = line[i]; i += 1
+            except IndexError:
+                break
+        if l:
+            item = String(''.join(l))
+            items.append(item)
+    return items, stopchar
+
+class LineSplitterBase:
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        item = ''
+        while not item:
+            item = self.get_item() # get_item raises StopIteration
+        return item
+
+class LineSplitter(LineSplitterBase):
+    """ Splits a line into non strings and strings. E.g.
+    abc=\"123\" -> ['abc=','\"123\"']
+    Handles splitting lines with incomplete string blocks.
+    """
+    def __init__(self, line,
+                 quotechar = None,
+                 lower=False,
+                 ):
+        self.fifo_line = [c for c in line]
+        self.fifo_line.reverse()
+        self.quotechar = quotechar
+        self.lower = lower
+
+    def split2(self):
+        """
+        Split line until the first start of a string.
+        """
+        try:
+            item1 = self.get_item()
+        except StopIteration:
+            return '',''
+        i = len(item1)
+        l = self.fifo_line[:]
+        l.reverse()
+        item2 = ''.join(l)
+        return item1,item2
+
+    def get_item(self):
+        fifo_pop = self.fifo_line.pop
+        try:
+            char = fifo_pop()
+        except IndexError:
+            raise StopIteration
+        fifo_append = self.fifo_line.append
+        quotechar = self.quotechar
+        l = []
+        l_append = l.append
+        
+        nofslashes = 0
+        if quotechar is None:
+            # search for string start
+            while 1:
+                if char in '"\'' and not nofslashes % 2:
+                    self.quotechar = char
+                    fifo_append(char)
+                    break
+                if char=='\\':
+                    nofslashes += 1
+                else:
+                    nofslashes = 0
+                l_append(char)
+                try:
+                    char = fifo_pop()
+                except IndexError:
+                    break
+            item = ''.join(l)
+            if self.lower: item = item.lower()
+            return item
+
+        if char==quotechar:
+            # string starts with quotechar
+            l_append(char)
+            try:
+                char = fifo_pop()
+            except IndexError:
+                return String(''.join(l))
+        # else continued string
+        while 1:
+            if char==quotechar and not nofslashes % 2:
+                l_append(char)
+                self.quotechar = None
+                break
+            if char=='\\':
+                nofslashes += 1
+            else:
+                nofslashes = 0
+            l_append(char)
+            try:
+                char = fifo_pop()
+            except IndexError:
+                break
+        return String(''.join(l))
+
+def splitparen(line,paren='()'):
+    """
+    Fast LineSplitterParen.
+    """
+    stopchar = None
+    startchar, endchar = paren[0],paren[1]
+
+    items = []
+    i = 0
+    while 1:
+        try:
+            char = line[i]; i += 1
+        except IndexError:
+            break
+        nofslashes = 0
+        l = []
+        l_append = l.append
+        if stopchar is None:
+            # search for parenthesis start
+            while 1:
+                if char==startchar and not nofslashes % 2:
+                    stopchar = endchar
+                    i -= 1
+                    break
+                if char=='\\':
+                    nofslashes += 1
+                else:
+                    nofslashes = 0
+                l_append(char)
+                try:
+                    char = line[i]; i += 1
+                except IndexError:
+                    break
+            item = ''.join(l)
+        else:
+            nofstarts = 0
+            while 1:
+                if char==stopchar and not nofslashes % 2 and nofstarts==1:
+                    l_append(char)
+                    stopchar = None
+                    break
+                if char=='\\':
+                    nofslashes += 1
+                else:
+                    nofslashes = 0
+                if char==startchar:
+                    nofstarts += 1
+                elif char==endchar:
+                    nofstarts -= 1
+                l_append(char)
+                try:
+                    char = line[i]; i += 1
+                except IndexError:
+                    break
+            item = ParenString(''.join(l))
+        items.append(item)
+    return items
+
+class LineSplitterParen(LineSplitterBase):
+    """ Splits a line into strings and strings with parenthesis. E.g.
+    a(x) = b(c,d) -> ['a','(x)',' = b','(c,d)']
+    """
+    def __init__(self, line, paren = '()'):
+        self.fifo_line = [c for c in line]
+        self.fifo_line.reverse()
+        self.startchar = paren[0]
+        self.endchar = paren[1]
+        self.stopchar = None
+        
+    def get_item(self):
+        fifo_pop = self.fifo_line.pop
+        try:
+            char = fifo_pop()
+        except IndexError:
+            raise StopIteration
+        fifo_append = self.fifo_line.append
+        startchar = self.startchar
+        endchar = self.endchar
+        stopchar = self.stopchar
+        l = []
+        l_append = l.append
+        
+        nofslashes = 0
+        if stopchar is None:
+            # search for parenthesis start
+            while 1:
+                if char==startchar and not nofslashes % 2:
+                    self.stopchar = endchar
+                    fifo_append(char)
+                    break
+                if char=='\\':
+                    nofslashes += 1
+                else:
+                    nofslashes = 0
+                l_append(char)
+                try:
+                    char = fifo_pop()
+                except IndexError:
+                    break
+            item = ''.join(l)
+            return item
+
+        nofstarts = 0
+        while 1:
+            if char==stopchar and not nofslashes % 2 and nofstarts==1:
+                l_append(char)
+                self.stopchar = None
+                break
+            if char=='\\':
+                nofslashes += 1
+            else:
+                nofslashes = 0
+            if char==startchar:
+                nofstarts += 1
+            elif char==endchar:
+                nofstarts -= 1
+            l_append(char)
+            try:
+                char = fifo_pop()
+            except IndexError:
+                break
+        return ParenString(''.join(l))
+                
+def test():
+    splitter = LineSplitter('abc\\\' def"12\\"3""56"dfad\'a d\'')
+    l = [item for item in splitter]
+    assert l==['abc\\\' def','"12\\"3"','"56"','dfad','\'a d\''],`l`
+    assert splitter.quotechar is None
+    l,stopchar=splitquote('abc\\\' def"12\\"3""56"dfad\'a d\'')
+    assert l==['abc\\\' def','"12\\"3"','"56"','dfad','\'a d\''],`l`
+    assert stopchar is None
+
+    splitter = LineSplitter('"abc123&')
+    l = [item for item in splitter]
+    assert l==['"abc123&'],`l`
+    assert splitter.quotechar=='"'
+    l,stopchar = splitquote('"abc123&')
+    assert l==['"abc123&'],`l`
+    assert stopchar=='"'
+    
+    splitter = LineSplitter(' &abc"123','"')
+    l = [item for item in splitter]
+    assert l==[' &abc"','123']
+    assert splitter.quotechar is None
+    l,stopchar = splitquote(' &abc"123','"')
+    assert l==[' &abc"','123']
+    assert stopchar is None
+        
+    l = split2('')
+    assert l==('',''),`l`
+    l = split2('12')
+    assert l==('12',''),`l`
+    l = split2('1"a"//"b"')
+    assert l==('1','"a"//"b"'),`l`
+    l = split2('"ab"')
+    assert l==('','"ab"'),`l`
+
+    splitter = LineSplitterParen('a(b) = b(x,y(1)) b\((a)\)')
+    l = [item for item in splitter]
+    assert l==['a', '(b)', ' = b', '(x,y(1))', ' b\\(', '(a)', '\\)'],`l`
+    l = splitparen('a(b) = b(x,y(1)) b\((a)\)')
+    assert l==['a', '(b)', ' = b', '(x,y(1))', ' b\\(', '(a)', '\\)'],`l`
+
+    l = string_replace_map('a()')
+    print l
+    print 'ok'
+
+if __name__ == '__main__':
+    test()
+

Copied: trunk/numpy/f2py/lib/parser/statements.py (from rev 3235, trunk/numpy/f2py/lib/statements.py)
===================================================================
--- trunk/numpy/f2py/lib/statements.py	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/statements.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,1856 @@
+"""
+Fortran single line statements.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['GeneralAssignment',
+           'Assignment','PointerAssignment','Assign','Call','Goto','ComputedGoto','AssignedGoto',
+           'Continue','Return','Stop','Print','Read','Read0','Read1','Write','Flush','Wait',
+           'Contains','Allocate','Deallocate','ModuleProcedure','Access','Public','Private',
+           'Close','Cycle','Backspace','Endfile','Rewind','Open','Format','Save',
+           'Data','Nullify','Use','Exit','Parameter','Equivalence','Dimension','Target',
+           'Pointer','Protected','Volatile','Value','ArithmeticIf','Intrinsic',
+           'Inquire','Sequence','External','Namelist','Common','Optional','Intent',
+           'Entry','Import','ForallStmt','SpecificBinding','GenericBinding',
+           'FinalBinding','Allocatable','Asynchronous','Bind','Else','ElseIf',
+           'Case','WhereStmt','ElseWhere','Enumerator','FortranName','Threadsafe',
+           'Depend','Check','CallStatement','CallProtoArgument','Pause']
+
+import re
+import sys
+
+from base_classes import Statement, Variable
+
+# Auxiliary tools
+
+from utils import split_comma, specs_split_comma, AnalyzeError, ParseError,\
+     get_module_file, parse_bind, parse_result, is_name
+
+class StatementWithNamelist(Statement):
+    """
+    <statement> [ :: ] <name-list>
+    """
+    def process_item(self):
+        if self.item.has_map():
+            self.isvalid = False
+            return
+        if hasattr(self,'stmtname'):
+            clsname = self.stmtname
+        else:
+            clsname = self.__class__.__name__
+        line = self.item.get_line()[len(clsname):].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = items = []
+        for item in split_comma(line):
+            if not is_name(item):
+                self.isvalid = False
+                return
+            items.append(item)
+        return
+    def __str__(self):
+        if hasattr(self,'stmtname'):
+            clsname = self.stmtname.upper()
+        else:
+            clsname = self.__class__.__name__.upper()
+        s = ', '.join(self.items)
+        if s:
+            s = ' ' + s
+        return self.get_indent_tab() + clsname + s
+
+# Execution statements
+
+class GeneralAssignment(Statement):
+    """
+    <variable> = <expr>
+    <pointer variable> => <expr>
+    """
+
+    match = re.compile(r'\w[^=]*\s*=\>?').match
+    item_re = re.compile(r'(?P<variable>\w[^=]*)\s*(?P<sign>=\>?)\s*(?P<expr>.*)\Z',re.I).match
+    _repr_attr_names = ['variable','sign','expr'] + Statement._repr_attr_names
+
+    def process_item(self):
+        m = self.item_re(self.item.get_line())
+        if not m:
+            self.isvalid = False
+            return
+        self.sign = sign = m.group('sign')
+        if isinstance(self, Assignment) and sign != '=':
+            self.isvalid = False
+            return
+        elif isinstance(self, PointerAssignment) and sign != '=>':
+            self.isvalid = False
+            return
+        else:
+            if sign=='=>':
+                self.__class__ = PointerAssignment
+            else:
+                self.__class__ = Assignment            
+        apply_map = self.item.apply_map
+        self.variable = apply_map(m.group('variable').replace(' ',''))
+        self.expr = apply_map(m.group('expr'))
+        return
+
+    def __str__(self):
+        return self.get_indent_tab() + '%s %s %s' \
+               % (self.variable, self.sign, self.expr)
+
+    def analyze(self): return
+
+class Assignment(GeneralAssignment):
+    pass
+
+class PointerAssignment(GeneralAssignment):
+    pass
+
+class Assign(Statement):
+    """
+    ASSIGN <label> TO <int-variable-name>
+    """
+    modes = ['fix77']
+    match = re.compile(r'assign\s*\d+\s*to\s*\w+\s*\Z',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[6:].lstrip()
+        i = line.lower().find('to')
+        assert not self.item.has_map()
+        self.items = [line[:i].rstrip(),line[i+2:].lstrip()]
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'ASSIGN %s TO %s' \
+               % (self.items[0], self.items[1])
+    def analyze(self): return
+
+class Call(Statement):
+    """Call statement class
+    CALL <procedure-designator> [ ( [ <actual-arg-spec-list> ] ) ]
+
+    <procedure-designator> = <procedure-name>
+                           | <proc-component-ref>
+                           | <data-ref> % <binding-name>
+
+    <actual-arg-spec> = [ <keyword> = ] <actual-arg>
+    <actual-arg> = <expr>
+                 | <variable>
+                 | <procedure-name>
+                 | <proc-component-ref>
+                 | <alt-return-spec>
+    <alt-return-spec> = * <label>
+
+    <proc-component-ref> = <variable> % <procedure-component-name>
+
+    <variable> = <designator>
+
+    Call instance has attributes:
+      designator
+      arg_list
+    """
+    match = re.compile(r'call\b', re.I).match
+
+    def process_item(self):
+        item = self.item
+        apply_map = item.apply_map
+        line = item.get_line()[4:].strip()
+        i = line.find('(')
+        items = []
+        if i==-1:
+            self.designator = apply_map(line).strip()
+        else:
+            j = line.find(')')
+            if j == -1 or len(line)-1 != j:
+                self.isvalid = False
+                return
+            self.designator = apply_map(line[:i]).strip()
+            items = split_comma(line[i+1:-1], item)
+        self.items = items
+        return
+
+    def __str__(self):
+        s = self.get_indent_tab() + 'CALL '+str(self.designator)
+        if self.items:
+            s += '('+', '.join(map(str,self.items))+ ')'
+        return s
+
+    def analyze(self):
+        a = self.programblock.a
+        variables = a.variables
+        if hasattr(a, 'external'):
+            external = a.external
+            if self.designator in external:
+                print 'Need to analyze:',self
+        print self
+        return
+
+class Goto(Statement):
+    """
+    GO TO <label>
+    """
+    match = re.compile(r'go\s*to\s*\d+\s*\Z', re.I).match
+
+    def process_item(self):
+        assert not self.item.has_map()
+        self.label = self.item.get_line()[2:].lstrip()[2:].lstrip()
+        return
+
+    def __str__(self):
+        return self.get_indent_tab() + 'GO TO %s' % (self.label)
+    def analyze(self): return
+
+class ComputedGoto(Statement):
+    """
+    GO TO ( <label-list> ) [ , ] <scalar-int-expr>
+    """
+    match = re.compile(r'go\s*to\s*\(',re.I).match
+    def process_item(self):
+        apply_map = self.item.apply_map
+        line = self.item.get_line()[2:].lstrip()[2:].lstrip()
+        i = line.index(')')
+        self.items = split_comma(line[1:i], self.item)
+        line = line[i+1:].lstrip()
+        if line.startswith(','):
+            line = line[1:].lstrip()
+        self.expr = apply_map(line)
+        return
+    def __str__(self):
+        return  self.get_indent_tab() + 'GO TO (%s) %s' \
+               % (', '.join(self.items), self.expr)
+    def analyze(self): return
+
+class AssignedGoto(Statement):
+    """
+    GO TO <int-variable-name> [ ( <label> [ , <label> ]... ) ]
+    """
+    modes = ['fix77']
+    match = re.compile(r'go\s*to\s*\w+\s*\(?',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[2:].lstrip()[2:].lstrip()
+        i = line.find('(')
+        if i==-1:
+            self.varname = line
+            self.items = []
+            return
+        self.varname = line[:i].rstrip()
+        assert line[-1]==')',`line`
+        self
+        self.items = split_comma(line[i+1:-1], self.item)
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        if self.items:
+            return tab + 'GO TO %s (%s)' \
+                   % (self.varname, ', '.join(self.items)) 
+        return tab + 'GO TO %s' % (self.varname)
+    def analyze(self): return
+
+class Continue(Statement):
+    """
+    CONTINUE
+    """
+    match = re.compile(r'continue\Z',re.I).match
+
+    def process_item(self):
+        self.label = self.item.label
+        return
+
+    def __str__(self):
+        return self.get_indent_tab(deindent=True) + 'CONTINUE'
+
+    def analyze(self): return
+
+class Return(Statement):
+    """
+    RETURN [ <scalar-int-expr> ]
+    """
+    match = re.compile(r'return\b',re.I).match
+
+    def process_item(self):
+        self.expr = self.item.apply_map(self.item.get_line()[6:].lstrip())
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        if self.expr:
+            return tab + 'RETURN %s' % (self.expr)
+        return tab + 'RETURN'
+
+    def analyze(self): return
+
+class Stop(Statement):
+    """
+    STOP [ <stop-code> ]
+    <stop-code> = <scalar-char-constant> | <1-5-digit>
+    """
+    match = re.compile(r'stop\s*(\'\w*\'|"\w*"|\d+|)\Z',re.I).match
+
+    def process_item(self):
+        self.code = self.item.apply_map(self.item.get_line()[4:].lstrip())
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        if self.code:
+            return tab + 'STOP %s' % (self.code)
+        return tab + 'STOP'
+
+    def analyze(self): return
+
+class Print(Statement):
+    """
+    PRINT <format> [, <output-item-list>]
+    <format> = <default-char-expr> | <label> | *
+
+    <output-item> = <expr> | <io-implied-do>
+    <io-implied-do> = ( <io-implied-do-object-list> , <implied-do-control> )
+    <io-implied-do-object> = <input-item> | <output-item>
+    <implied-do-control> = <do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]
+    <input-item> = <variable> | <io-implied-do>
+    """
+    match = re.compile(r'print\s*(\'\w*\'|\"\w*\"|\d+|[*]|\b\w)', re.I).match
+
+    def process_item(self):
+        item = self.item
+        apply_map = item.apply_map
+        line = item.get_line()[5:].lstrip()
+        items = split_comma(line, item)
+        self.format = items[0]
+        self.items = items[1:]
+        return
+
+    def __str__(self):
+        return self.get_indent_tab() + 'PRINT %s' \
+               % (', '.join([self.format]+self.items))
+    def analyze(self): return
+
+class Read(Statement):
+    """
+Read0:    READ ( <io-control-spec-list> ) [ <input-item-list> ]
+
+    <io-control-spec-list> = [ UNIT = ] <io-unit>
+                             | [ FORMAT = ] <format>
+                             | [ NML = ] <namelist-group-name>
+                             | ADVANCE = <scalar-default-char-expr>
+                             ...
+    
+Read1:    READ <format> [, <input-item-list>]
+    <format> == <default-char-expr> | <label> | *
+    """
+    match = re.compile(r'read\b\s*[\w(*\'"]', re.I).match
+
+    def process_item(self):
+        item = self.item
+        line = item.get_line()[4:].lstrip()
+        if line.startswith('('):
+            self.__class__ = Read0
+        else:
+            self.__class__ = Read1
+        self.process_item()
+        return
+    def analyze(self): return
+
+class Read0(Read):
+
+    def process_item(self):
+        item = self.item
+        line = item.get_line()[4:].lstrip()
+        i = line.find(')')
+        self.specs = specs_split_comma(line[1:i], item)
+        self.items = split_comma(line[i+1:], item)
+        return
+
+    def __str__(self):
+        s = self.get_indent_tab() + 'READ (%s)' % (', '.join(self.specs))
+        if self.items:
+            return s + ' ' + ', '.join(self.items)
+        return s
+
+class Read1(Read):
+
+    def process_item(self):
+        item = self.item
+        line = item.get_line()[4:].lstrip()
+        items = split_comma(line, item)
+        self.format = items[0]
+        self.items = items[1:]
+        return
+
+    def __str__(self):
+        return self.get_indent_tab() + 'READ ' \
+               + ', '.join([self.format]+self.items)
+
+class Write(Statement):
+    """
+    WRITE ( io-control-spec-list ) [<output-item-list>]
+    """
+    match = re.compile(r'write\s*\(', re.I).match
+    def process_item(self):
+        item = self.item
+        line = item.get_line()[5:].lstrip()
+        i = line.find(')')
+        assert i != -1, `line`
+        self.specs = specs_split_comma(line[1:i], item)
+        self.items = split_comma(line[i+1:], item)
+        return
+
+    def __str__(self):
+        s = self.get_indent_tab() + 'WRITE (%s)' % ', '.join(self.specs)
+        if self.items:
+            s += ' ' + ', '.join(self.items)
+        return s
+    def analyze(self): return
+
+
+class Flush(Statement):
+    """
+    FLUSH <file-unit-number>
+    FLUSH ( <flush-spec-list> )
+    <flush-spec> = [ UNIT = ] <file-unit-number>
+                 | IOSTAT = <scalar-int-variable>
+                 | IOMSG = <iomsg-variable>
+                 | ERR = <label>
+    """
+    match = re.compile(r'flush\b',re.I).match
+
+    def process_item(self):
+        line = self.item.get_line()[5:].lstrip()
+        if not line:
+            self.isvalid = False
+            return
+        if line.startswith('('):
+            assert line[-1] == ')', `line`
+            self.specs = specs_split_comma(line[1:-1],self.item)
+        else:
+            self.specs = specs_split_comma(line,self.item)
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        return tab + 'FLUSH (%s)' % (', '.join(self.specs))
+    def analyze(self): return
+
+class Wait(Statement):
+    """
+    WAIT ( <wait-spec-list> )
+    <wait-spec> = [ UNIT = ] <file-unit-number>
+                | END = <label>
+                | EOR = <label>
+                | ERR = <label>
+                | ID = <scalar-int-expr>
+                | IOMSG = <iomsg-variable>
+                | IOSTAT = <scalar-int-variable>
+
+    """
+    match = re.compile(r'wait\s*\(.*\)\Z',re.I).match
+    def process_item(self):
+        self.specs = specs_split_comma(\
+            self.item.get_line()[4:].lstrip()[1:-1], self.item)
+        return
+    def __str__(self):
+        tab = self.get_indent_tab()
+        return tab + 'WAIT (%s)' % (', '.join(self.specs))
+    def analyze(self): return
+
+class Contains(Statement):
+    """
+    CONTAINS
+    """
+    match = re.compile(r'contains\Z',re.I).match
+    def process_item(self): return
+    def __str__(self): return self.get_indent_tab() + 'CONTAINS'
+
+class Allocate(Statement):
+    """
+    ALLOCATE ( [ <type-spec> :: ] <allocation-list> [ , <alloc-opt-list> ] )
+    <alloc-opt> = STAT = <stat-variable>
+                | ERRMSG = <errmsg-variable>
+                | SOURCE = <source-expr>
+    <allocation> = <allocate-object> [ ( <allocate-shape-spec-list> ) ]
+    """
+    match = re.compile(r'allocate\s*\(.*\)\Z',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[8:].lstrip()[1:-1].strip()
+        item2 = self.item.copy(line, True)
+        line2 = item2.get_line()
+        i = line2.find('::')
+        if i != -1:
+            spec = item2.apply_map(line2[:i].rstrip())
+            from block_statements import type_spec
+            stmt = None
+            for cls in type_spec:
+                if cls.match(spec):
+                    stmt = cls(self, item2.copy(spec))
+                    if stmt.isvalid:
+                        break
+            if stmt is not None and stmt.isvalid:
+                spec = stmt
+            else:
+                self.warning('TODO: unparsed type-spec' + `spec`)
+            line2 = line2[i+2:].lstrip()
+        else:
+            spec = None
+        self.spec = spec
+        self.items = specs_split_comma(line2, item2)
+        return
+
+    def __str__(self):
+        t = ''
+        if self.spec:
+            t = self.spec.tostr() + ' :: '
+        return self.get_indent_tab() \
+               + 'ALLOCATE (%s%s)' % (t,', '.join(self.items))
+    def analyze(self): return
+
+class Deallocate(Statement):
+    """
+    DEALLOCATE ( <allocate-object-list> [ , <dealloc-opt-list> ] )
+    <allocate-object> = <variable-name>
+                      | <structure-component>
+    <structure-component> = <data-ref>
+    <dealloc-opt> = STAT = <stat-variable>
+                    | ERRMSG = <errmsg-variable>
+    """
+    match = re.compile(r'deallocate\s*\(.*\)\Z',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[10:].lstrip()[1:-1].strip()
+        self.items = specs_split_comma(line, self.item)
+        return
+    def __str__(self): return self.get_indent_tab() \
+        + 'DEALLOCATE (%s)' % (', '.join(self.items))
+    def analyze(self): return
+    
+class ModuleProcedure(Statement):
+    """
+    [ MODULE ] PROCEDURE <procedure-name-list>
+    """
+    match = re.compile(r'(module\s*|)procedure\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()
+        m = self.match(line)
+        assert m,`line`
+        items = split_comma(line[m.end():].strip(), self.item)
+        for n in items:
+            if not is_name(n):
+                self.isvalid = False
+                return
+        self.items = items
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        return tab + 'MODULE PROCEDURE %s' % (', '.join(self.items))
+
+    def analyze(self):
+        module_procedures = self.parent.a.module_procedures
+        module_procedures.extend(self.items)
+        # XXX: add names to parent_provides
+        return
+
+class Access(Statement):
+    """
+    <access-spec> [ [::] <access-id-list>]
+    <access-spec> = PUBLIC | PRIVATE
+    <access-id> = <use-name> | <generic-spec>
+    """
+    match = re.compile(r'(public|private)\b',re.I).match
+    def process_item(self):
+        clsname = self.__class__.__name__.lower()
+        line = self.item.get_line()
+        if not line.lower().startswith(clsname):
+            self.isvalid = False
+            return
+        line = line[len(clsname):].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = split_comma(line, self.item)
+        return
+
+    def __str__(self):
+        clsname = self.__class__.__name__.upper()
+        tab = self.get_indent_tab()
+        if self.items:
+            return tab + clsname + ' ' + ', '.join(self.items)
+        return tab + clsname
+
+    def analyze(self):
+        clsname = self.__class__.__name__.upper()
+        if self.items:
+            for name in self.items:
+                var = self.get_variable(name)
+                var.update(clsname)
+        else:
+            self.parent.update_attributes(clsname)
+        return
+
+class Public(Access):
+    is_public = True
+class Private(Access):
+    is_public = False
+
+class Close(Statement):
+    """
+    CLOSE ( <close-spec-list> )
+    <close-spec> = [ UNIT = ] <file-unit-number>
+                   | IOSTAT = <scalar-int-variable>
+                   | IOMSG = <iomsg-variable>
+                   | ERR = <label>
+                   | STATUS = <scalar-default-char-expr>
+    """
+    match = re.compile(r'close\s*\(.*\)\Z',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[5:].lstrip()[1:-1].strip()
+        self.specs = specs_split_comma(line, self.item)
+        return
+    def __str__(self):
+        tab = self.get_indent_tab()
+        return tab + 'CLOSE (%s)' % (', '.join(self.specs))
+    def analyze(self): return
+
+class Cycle(Statement):
+    """
+    CYCLE [ <do-construct-name> ]
+    """
+    match = re.compile(r'cycle\b\s*\w*\s*\Z',re.I).match
+    def process_item(self):
+        self.name = self.item.get_line()[5:].lstrip()
+        return
+    def __str__(self):
+        if self.name:
+            return self.get_indent_tab() + 'CYCLE ' + self.name
+        return self.get_indent_tab() + 'CYCLE'
+    def analyze(self): return
+
+class FilePositioningStatement(Statement):
+    """
+    REWIND <file-unit-number>
+    REWIND ( <position-spec-list> )
+    <position-spec-list> = [ UNIT = ] <file-unit-number>
+                           | IOMSG = <iomsg-variable>
+                           | IOSTAT = <scalar-int-variable>
+                           | ERR = <label>
+    The same for BACKSPACE, ENDFILE.
+    """
+    match = re.compile(r'(rewind|backspace|endfile)\b',re.I).match
+
+    def process_item(self):
+        clsname = self.__class__.__name__.lower()
+        line = self.item.get_line()
+        if not line.lower().startswith(clsname):
+            self.isvalid = False
+            return
+        line = line[len(clsname):].lstrip()
+        if line.startswith('('):
+            assert line[-1]==')',`line`
+            spec = line[1:-1].strip()
+        else:
+            spec = line
+        self.specs = specs_split_comma(spec, self.item)
+        return
+
+    def __str__(self):
+        clsname = self.__class__.__name__.upper()
+        return self.get_indent_tab() + clsname + ' (%s)' % (', '.join(self.specs))
+    def analyze(self): return
+
+class Backspace(FilePositioningStatement): pass
+
+class Endfile(FilePositioningStatement): pass
+
+class Rewind(FilePositioningStatement): pass
+
+class Open(Statement):
+    """
+    OPEN ( <connect-spec-list> )
+    <connect-spec> = [ UNIT = ] <file-unit-number>
+                     | ACCESS = <scalar-default-char-expr>
+                     | ..
+    """
+    match = re.compile(r'open\s*\(.*\)\Z',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[4:].lstrip()[1:-1].strip()
+        self.specs = specs_split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'OPEN (%s)' % (', '.join(self.specs))
+    def analyze(self): return
+
+class Format(Statement):
+    """
+    FORMAT <format-specification>
+    <format-specification> = ( [ <format-item-list> ] )
+    <format-item> = [ <r> ] <data-edit-descr>
+                    | <control-edit-descr>
+                    | <char-string-edit-descr>
+                    | [ <r> ] ( <format-item-list> )
+    <data-edit-descr> = I <w> [ . <m> ]
+                        | B <w> [ . <m> ]
+                        ...
+    <r|w|m|d|e> = <int-literal-constant>
+    <v> = <signed-int-literal-constant>
+    <control-edit-descr> = <position-edit-descr>
+                         | [ <r> ] /
+                         | :
+                         ...
+    <position-edit-descr> = T <n>
+                            | TL <n>
+                            ...
+    <sign-edit-descr> = SS | SP | S
+    ...
+    
+    """
+    match = re.compile(r'format\s*\(.*\)\Z', re.I).match
+    def process_item(self):
+        item = self.item
+        if not item.label:
+            # R1001:
+            self.warning('R1001: FORMAT statement must be labeled but got %r.' \
+                         % (item.label))
+        line = item.get_line()[6:].lstrip()
+        assert line[0]+line[-1]=='()',`line`
+        self.specs = split_comma(line[1:-1], item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'FORMAT (%s)' % (', '.join(self.specs))
+    def analyze(self): return
+
+class Save(Statement):
+    """
+    SAVE [ [ :: ] <saved-entity-list> ]
+    <saved-entity> = <object-name>
+                     | <proc-pointer-name>
+                     | / <common-block-name> /
+    <proc-pointer-name> = <name>
+    <object-name> = <name>
+    """
+    match = re.compile(r'save\b',re.I).match
+    def process_item(self):
+        assert not self.item.has_map()
+        line = self.item.get_line()[4:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        items = []
+        for s in line.split(','):
+            s = s.strip()
+            if not s: continue
+            if s.startswith('/'):
+                assert s.endswith('/'),`s`
+                n = s[1:-1].strip()
+                assert is_name(n),`n`
+                items.append('/%s/' % (n))
+            elif is_name(s):
+                items.append(s)
+            else:
+                self.isvalid = False
+                return
+        self.items = items
+        return
+    def __str__(self):
+        tab = self.get_indent_tab()
+        if not self.items:
+            return tab + 'SAVE'
+        return tab + 'SAVE %s' % (', '.join(self.items))
+    def analyze(self): return
+
+class Data(Statement):
+    """
+    DATA <data-stmt-set> [ [ , ] <data-stmt-set> ]...
+    <data-stmt-set> = <data-stmt-object-list> / <data-stmt-value-list> /
+    <data-stmt-object> = <variable> | <data-implied-do>
+    <data-implied-do> = ( <data-i-do-object-list> , <data-i-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ] )
+    <data-i-do-object> = <array-element> | <scalar-structure-component> | <data-implied-do>
+    <data-i-do-variable> = <scalar-int-variable>
+    <variable> = <designator>
+    <designator> = <object-name>
+                   | <array-element>
+                   | <array-section>
+                   | <structure-component>
+                   | <substring>
+    <array-element> = <data-ref>
+    <array-section> = <data-ref> [ ( <substring-range> ) ]
+    
+    """
+    match = re.compile(r'data\b',re.I).match
+
+    def process_item(self):
+        line = self.item.get_line()[4:].lstrip()
+        stmts = []
+        self.isvalid = False
+        while line:
+            i = line.find('/')
+            if i==-1: return
+            j = line.find('/',i+1)
+            if j==-1: return
+            l1, l2 = line[:i].rstrip(),line[i+1:j].strip()
+            l1 = split_comma(l1, self.item)
+            l2 = split_comma(l2, self.item)
+            stmts.append((l1,l2))
+            line = line[j+1:].lstrip()
+            if line.startswith(','):
+                line = line[1:].lstrip()
+        self.stmts = stmts
+        self.isvalid = True
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        l = []
+        for o,v in self.stmts:
+            l.append('%s / %s /' %(', '.join(o),', '.join(v)))
+        return tab + 'DATA ' + ' '.join(l)
+    def analyze(self): return
+
+class Nullify(Statement):
+    """
+    NULLIFY ( <pointer-object-list> )
+    <pointer-object> = <variable-name>
+    """
+    match = re.compile(r'nullify\s*\(.*\)\Z',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[7:].lstrip()[1:-1].strip()
+        self.items = split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'NULLIFY (%s)' % (', '.join(self.items))
+    def analyze(self): return
+
+class Use(Statement):
+    """
+    USE [ [ , <module-nature> ] :: ] <module-name> [ , <rename-list> ]
+    USE [ [ , <module-nature> ] :: ] <module-name> , ONLY : [ <only-list> ]
+    <module-nature> = INTRINSIC | NON_INTRINSIC
+    <rename> = <local-name> => <use-name>
+               | OPERATOR ( <local-defined-operator> ) => OPERATOR ( <use-defined-operator> )
+    <only> = <generic-spec> | <only-use-name> | <rename>
+    <only-use-name> = <use-name>
+    """
+    match = re.compile(r'use\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[3:].lstrip()
+        nature = ''
+        if line.startswith(','):
+            i = line.find('::')
+            nature = line[1:i].strip().upper()
+            line = line[i+2:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        if nature and not is_name(nature):
+            self.isvalid = False
+            return
+        self.nature = nature
+        i = line.find(',')
+        self.isonly = False
+        if i==-1:
+            self.name = line
+            self.items = []
+        else:
+            self.name = line[:i].rstrip()
+            line = line[i+1:].lstrip()
+            if line.lower().startswith('only') and line[4:].lstrip().startswith(':'):
+                self.isonly = True
+                line = line[4:].lstrip()[1:].lstrip()
+            self.items = split_comma(line, self.item)
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        s = 'USE'
+        if self.nature:
+            s += ' ' + self.nature + ' ::'
+        s += ' ' + self.name
+        if self.isonly:
+            s += ', ONLY:'
+        elif self.items:
+            s += ','
+        if self.items:
+            s += ' ' + ', '.join(self.items)
+        return tab + s
+
+    def analyze(self):
+        use = self.parent.a.use
+        if use.has_key(self.name):
+            return
+
+        modules = self.top.a.module
+        if not modules.has_key(self.name):
+            fn = None
+            for d in self.reader.include_dirs:
+                fn = get_module_file(self.name, d)
+                if fn is not None:
+                    break
+            if fn is not None:
+                from readfortran import FortranFileReader
+                from parsefortran import FortranParser
+                self.info('looking module information from %r' % (fn))
+                reader = FortranFileReader(fn)
+                parser = FortranParser(reader)
+                parser.parse()
+                parser.block.a.module.update(modules)
+                parser.analyze()
+                modules.update(parser.block.a.module)
+
+        if not modules.has_key(self.name):
+            self.warning('no information about the module %r in use statement' % (self.name))
+            return
+
+        module = modules[self.name]
+        use_provides = self.parent.a.use_provides
+        
+        
+        return
+
+class Exit(Statement):
+    """
+    EXIT [ <do-construct-name> ]
+    """
+    match = re.compile(r'exit\b\s*\w*\s*\Z',re.I).match
+    def process_item(self):
+        self.name = self.item.get_line()[4:].lstrip()
+        return
+    def __str__(self):
+        if self.name:
+            return self.get_indent_tab() + 'EXIT ' + self.name
+        return self.get_indent_tab() + 'EXIT'
+    def analyze(self): return
+
+class Parameter(Statement):
+    """
+    PARAMETER ( <named-constant-def-list> )
+    <named-constant-def> = <named-constant> = <initialization-expr>
+    """
+    match = re.compile(r'parameter\s*\(.*\)\Z', re.I).match
+    def process_item(self):
+        line = self.item.get_line()[9:].lstrip()[1:-1].strip()
+        self.items = split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'PARAMETER (%s)' % (', '.join(self.items))
+    def analyze(self):
+        for item in self.items:
+            i = item.find('=')
+            assert i!=-1,`item`
+            name = item[:i].rstrip()
+            value = item[i+1:].lstrip()
+            var = self.get_variable(name)
+            var.update('parameter')
+            var.set_init(value)
+        return
+
+class Equivalence(Statement):
+    """
+    EQUIVALENCE <equivalence-set-list>
+    <equivalence-set> = ( <equivalence-object> , <equivalence-object-list> )
+    <equivalence-object> = <variable-name> | <array-element> | <substring>
+    """
+    match = re.compile(r'equivalence\s*\(.*\)\Z', re.I).match
+    def process_item(self):
+        items = []
+        for s in self.item.get_line()[11:].lstrip().split(','):
+            s = s.strip()
+            assert s[0]+s[-1]=='()',`s,self.item.get_line()`
+            s = ', '.join(split_comma(s[1:-1], self.item))
+            items.append('('+s+')')
+        self.items = items
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'EQUIVALENCE %s' % (', '.join(self.items))
+    def analyze(self): return
+
+class Dimension(Statement):
+    """
+    DIMENSION [ :: ] <array-name> ( <array-spec> ) [ , <array-name> ( <array-spec> ) ]...
+    
+    """
+    match = re.compile(r'dimension\b', re.I).match
+    def process_item(self):
+        line = self.item.get_line()[9:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'DIMENSION %s' % (', '.join(self.items))
+    def analyze(self):
+        for line in self.items:
+            i = line.find('(')
+            assert i!=-1 and line.endswith(')'),`line`
+            name = line[:i].rstrip()
+            array_spec = split_comma(line[i+1:-1].strip(), self.item)
+            var = self.get_variable(name)
+            var.set_bounds(array_spec)
+        return
+
+class Target(Statement):
+    """
+    TARGET [ :: ] <object-name> ( <array-spec> ) [ , <object-name> ( <array-spec> ) ]...
+    
+    """
+    match = re.compile(r'target\b', re.I).match
+    def process_item(self):
+        line = self.item.get_line()[6:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'TARGET %s' % (', '.join(self.items))
+    def analyze(self):
+        for line in self.items:
+            i = line.find('(')
+            assert i!=-1 and line.endswith(')'),`line`
+            name = line[:i].rstrip()
+            array_spec = split_comma(line[i+1:-1].strip(), self.item)
+            var = self.get_variable(name)
+            var.set_bounds(array_spec)
+            var.update('target')
+        return
+
+
+class Pointer(Statement):
+    """
+    POINTER [ :: ] <pointer-decl-list>
+    <pointer-decl> = <object-name> [ ( <deferred-shape-spec-list> ) ]
+                   | <proc-entity-name>
+    
+    """
+    match = re.compile(r'pointer\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[7:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'POINTER %s' % (', '.join(self.items))
+    def analyze(self):
+        for line in self.items:
+            i = line.find('(')
+            if i==-1:
+                name = line
+                array_spec = None
+            else:
+                assert line.endswith(')'),`line`
+                name = line[:i].rstrip()
+                array_spec = split_comma(line[i+1:-1].strip(), self.item)
+            var = self.get_variable(name)
+            var.set_bounds(array_spec)
+            var.update('pointer')
+        return
+
+class Protected(StatementWithNamelist):
+    """
+    PROTECTED [ :: ] <entity-name-list>
+    """
+    match = re.compile(r'protected\b',re.I).match
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.update('protected')
+        return
+
+class Volatile(StatementWithNamelist):
+    """
+    VOLATILE [ :: ] <object-name-list>
+    """
+    match = re.compile(r'volatile\b',re.I).match
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.update('volatile')
+        return
+
+class Value(StatementWithNamelist):
+    """
+    VALUE [ :: ] <dummy-arg-name-list>
+    """
+    match = re.compile(r'value\b',re.I).match
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.update('value')
+        return
+
+class ArithmeticIf(Statement):
+    """
+    IF ( <scalar-numeric-expr> ) <label> , <label> , <label>
+    """
+    match = re.compile(r'if\s*\(.*\)\s*\d+\s*,\s*\d+\s*,\s*\d+\s*\Z', re.I).match
+    def process_item(self):
+        line = self.item.get_line()[2:].lstrip()
+        line,l2,l3 = line.rsplit(',',2)
+        i = line.rindex(')')
+        l1 = line[i+1:]
+        self.expr = self.item.apply_map(line[1:i]).strip()
+        self.labels = [l1.strip(),l2.strip(),l3.strip()]
+        return
+
+    def __str__(self):
+        return self.get_indent_tab() + 'IF (%s) %s' \
+               % (self.expr,', '.join(self.labels))
+    def analyze(self): return
+
+class Intrinsic(StatementWithNamelist):
+    """
+    INTRINSIC [ :: ] <intrinsic-procedure-name-list>
+    """
+    match = re.compile(r'intrinsic\b',re.I).match
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.update('intrinsic')
+        return
+
+class Inquire(Statement):
+    """
+    INQUIRE ( <inquire-spec-list> )
+    INQUIRE ( IOLENGTH = <scalar-int-variable> ) <output-item-list>
+    
+    <inquire-spec> = [ UNIT = ] <file-unit-number>
+                     | FILE = <file-name-expr>
+                     ...
+    <output-item> = <expr>
+                  | <io-implied-do>
+    """
+    match = re.compile(r'inquire\s*\(',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[7:].lstrip()
+        i = line.index(')')
+        self.specs = specs_split_comma(line[1:i].strip(), self.item)
+        self.items = split_comma(line[i+1:].lstrip(), self.item)
+        return
+    def __str__(self):
+        if self.items:
+            return self.get_indent_tab() + 'INQUIRE (%s) %s' \
+                   % (', '.join(self.specs), ', '.join(self.items))
+        return self.get_indent_tab() + 'INQUIRE (%s)' \
+                   % (', '.join(self.specs))
+    def analyze(self): return
+
+class Sequence(Statement):
+    """
+    SEQUENCE
+    """
+    match = re.compile(r'sequence\Z',re.I).match
+    def process_item(self):
+        return
+    def __str__(self): return self.get_indent_tab() + 'SEQUENCE'
+    def analyze(self):
+        self.parent.update_attributes('SEQUENCE')
+        return
+
+class External(StatementWithNamelist):
+    """
+    EXTERNAL [ :: ] <external-name-list>
+    """
+    match = re.compile(r'external\b', re.I).match
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.update('external')
+        return
+
+
+class Namelist(Statement):
+    """
+    NAMELIST / <namelist-group-name> / <namelist-group-object-list> [ [ , ] / <namelist-group-name> / <namelist-group-object-list> ]...
+    <namelist-group-object> = <variable-name>
+    """
+    match = re.compile(r'namelist\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[8:].lstrip()
+        items = []
+        while line:
+            assert line.startswith('/'),`line`
+            i = line.find('/',1)
+            assert i!=-1,`line`
+            name = line[:i+1]
+            line = line[i+1:].lstrip()
+            i = line.find('/')
+            if i==-1:
+                items.append((name,line))
+                line = ''
+                continue
+            s = line[:i].rstrip()
+            if s.endswith(','):
+                s = s[:-1].rstrip()
+            items.append((name,s))
+            line = line[i+1:].lstrip()
+        self.items = items
+        return
+
+    def __str__(self):
+        l = []
+        for name,s in self.items:
+            l.append('%s %s' % (name,s))
+        tab = self.get_indent_tab()
+        return tab + 'NAMELIST ' + ', '.join(l)
+
+class Common(Statement):
+    """
+    COMMON [ / [ <common-block-name> ] / ]  <common-block-object-list> \
+      [ [ , ] / [ <common-block-name> ] /  <common-block-object-list> ]...
+    <common-block-object> = <variable-name> [ ( <explicit-shape-spec-list> ) ]
+                          | <proc-pointer-name>
+    """
+    match = re.compile(r'common\b',re.I).match
+    def process_item(self):
+        item = self.item
+        line = item.get_line()[6:].lstrip()
+        items = []
+        while line:
+            if not line.startswith('/'):
+                name = ''
+                assert not items,`line`
+            else:
+                i = line.find('/',1)
+                assert i!=-1,`line`
+                name = line[1:i].strip()
+                line = line[i+1:].lstrip()
+            i = line.find('/')
+            if i==-1:
+                items.append((name,split_comma(line, item)))
+                line = ''
+                continue
+            s = line[:i].rstrip()
+            if s.endswith(','):
+                s = s[:-1].rstrip()
+            items.append((name,split_comma(s,item)))
+            line = line[i:].lstrip()
+        self.items = items
+        return
+    def __str__(self):
+        l = []
+        for name,s in self.items:
+            s = ', '.join(s)
+            if name:
+                l.append('/ %s / %s' % (name,s))
+            else:
+                l.append(s)
+        tab = self.get_indent_tab()
+        return tab + 'COMMON ' + ' '.join(l)
+    def analyze(self):
+        for cname, items in self.items:
+            for item in items:
+                i = item.find('(')
+                if i!=-1:
+                    assert item.endswith(')'),`item`
+                    name = item[:i].rstrip()
+                    shape = split_comma(item[i+1:-1].strip(), self.item)
+                else:
+                    name = item
+                    shape = None
+                var = self.get_variable(name)
+                if shape is not None:
+                    var.set_bounds(shape)
+            # XXX: add name,var to parent_provides
+        return
+
+class Optional(StatementWithNamelist):
+    """
+    OPTIONAL [ :: ] <dummy-arg-name-list>
+    <dummy-arg-name> = <name>
+    """
+    match = re.compile(r'optional\b',re.I).match
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.update('optional')
+        return
+
+class Intent(Statement):
+    """
+    INTENT ( <intent-spec> ) [ :: ] <dummy-arg-name-list>
+    <intent-spec> = IN | OUT | INOUT
+
+    generalization for pyf-files:
+    INTENT ( <intent-spec-list> ) [ :: ] <dummy-arg-name-list>
+    <intent-spec> = IN | OUT | INOUT | CACHE | HIDE | OUT = <name>
+    """
+    match = re.compile(r'intent\s*\(',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[6:].lstrip()
+        i = line.find(')')
+        self.specs = specs_split_comma(line[1:i], self.item, upper=True)
+        line = line[i+1:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = [s.strip() for s in line.split(',')]
+        for n in self.items:
+            if not is_name(n):
+                self.isvalid = False
+                return
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'INTENT (%s) %s' \
+               % (', '.join(self.specs), ', '.join(self.items))
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.set_intent(self.specs)
+        return
+
+
+class Entry(Statement):
+    """
+    ENTRY <entry-name> [ ( [ <dummy-arg-list> ] ) [ <suffix> ] ]
+    <suffix> = <proc-language-binding-spec> [ RESULT ( <result-name> ) ]
+             | RESULT ( <result-name> ) [ <proc-language-binding-spec> ]
+    <proc-language-binding-spec> = <language-binding-spec>
+    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
+    <dummy-arg> = <dummy-arg-name> | *
+    """
+    match = re.compile(r'entry\b', re.I).match
+    def process_item(self):
+        line = self.item.get_line()[5:].lstrip()
+        m = re.match(r'\w+', line)
+        name = line[:m.end()]
+        line = line[m.end():].lstrip()
+        if line.startswith('('):
+            i = line.find(')')
+            assert i!=-1,`line`
+            items = split_comma(line[1:i], self.item)
+            line = line[i+1:].lstrip()
+        else:
+            items = []
+        self.bind, line = parse_bind(line, self.item)
+        self.result, line = parse_result(line, self.item)
+        if line:
+            assert self.bind is None,`self.bind`
+            self.bind, line = parse_bind(line, self.item)
+        assert not line,`line`
+        self.name = name
+        self.items = items
+        return
+    def __str__(self):
+        tab = self.get_indent_tab()
+        s = tab + 'ENTRY '+self.name
+        if self.items:
+            s += ' (%s)' % (', '.join(self.items))
+        if self.result:
+            s += ' RESULT (%s)' % (self.result)
+        if self.bind:
+            s += ' BIND (%s)' % (', '.join(self.bind))
+        return s
+
+class Import(StatementWithNamelist):
+    """
+    IMPORT [ [ :: ] <import-name-list> ]
+    """
+    match = re.compile(r'import(\b|\Z)',re.I).match
+
+class Forall(Statement):
+    """
+    FORALL <forall-header> <forall-assignment-stmt>
+    <forall-header> = ( <forall-triplet-spec-list> [ , <scalar-mask-expr> ] )
+    <forall-triplet-spec> = <index-name> = <subscript> : <subscript> [ : <stride> ]
+    <subscript|stride> = <scalar-int-expr>
+    <forall-assignment-stmt> = <assignment-stmt> | <pointer-assignment-stmt>
+    """
+    match = re.compile(r'forall\s*\(.*\).*=', re.I).match
+    def process_item(self):
+        line = self.item.get_line()[6:].lstrip()
+        i = line.index(')')
+
+        line0 = line[1:i]
+        line = line[i+1:].lstrip()
+        stmt = GeneralAssignment(self, self.item.copy(line, True))
+        if stmt.isvalid:
+            self.content = [stmt]
+        else:
+            self.isvalid = False
+            return
+
+        specs = []
+        mask = ''
+        for l in split_comma(line0,self.item):
+            j = l.find('=')
+            if j==-1:
+                assert not mask,`mask,l`
+                mask = l
+                continue
+            assert j!=-1,`l`
+            index = l[:j].rstrip()
+            it = self.item.copy(l[j+1:].lstrip())
+            l = it.get_line()
+            k = l.split(':')
+            if len(k)==3:
+                s1, s2, s3 = map(it.apply_map,
+                                 [k[0].strip(),k[1].strip(),k[2].strip()])
+            else:
+                assert len(k)==2,`k`
+                s1, s2 = map(it.apply_map,
+                             [k[0].strip(),k[1].strip()])
+                s3 = '1'
+            specs.append((index,s1,s2,s3))
+
+        self.specs = specs
+        self.mask = mask
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        l = []
+        for index,s1,s2,s3 in self.specs:
+            s = '%s = %s : %s' % (index,s1,s2)
+            if s3!='1':
+                s += ' : %s' % (s3)
+            l.append(s)
+        s = ', '.join(l)
+        if self.mask:
+            s += ', ' + self.mask
+        return tab + 'FORALL (%s) %s' % \
+               (s, str(self.content[0]).lstrip())
+    def analyze(self): return
+
+ForallStmt = Forall
+
+class SpecificBinding(Statement):
+    """
+    PROCEDURE [ ( <interface-name> ) ]  [ [ , <binding-attr-list> ] :: ] <binding-name> [ => <procedure-name> ]
+    <binding-attr> = PASS [ ( <arg-name> ) ]
+                   | NOPASS
+                   | NON_OVERRIDABLE
+                   | DEFERRED
+                   | <access-spec>
+    <access-spec> = PUBLIC | PRIVATE
+    """
+    match = re.compile(r'procedure\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[9:].lstrip()
+        if line.startswith('('):
+            i = line.index(')')
+            name = line[1:i].strip()
+            line = line[i+1:].lstrip()
+        else:
+            name = ''
+        self.iname = name
+        if line.startswith(','):
+            line = line[1:].lstrip()
+        i = line.find('::')
+        if i != -1:
+            attrs = split_comma(line[:i], self.item)
+            line = line[i+2:].lstrip()
+        else:
+            attrs = []
+        attrs1 = []
+        for attr in attrs:
+            if is_name(attr):
+                attr = attr.upper()
+            else:
+                i = attr.find('(')
+                assert i!=-1 and attr.endswith(')'),`attr`
+                attr = '%s (%s)' % (attr[:i].rstrip().upper(), attr[i+1:-1].strip())
+            attrs1.append(attr)
+        self.attrs = attrs1
+        i = line.find('=')
+        if i==-1:
+            self.name = line
+            self.bname = ''
+        else:
+            self.name = line[:i].rstrip()
+            self.bname = line[i+1:].lstrip()[1:].lstrip()
+        return
+    def __str__(self):
+        tab = self.get_indent_tab()
+        s = 'PROCEDURE '
+        if self.iname:
+            s += '(' + self.iname + ') '
+        if self.attrs:
+            s += ', ' + ', '.join(self.attrs) + ' :: '
+        if self.bname:
+            s += '%s => %s' % (self.name, self.bname)
+        else:
+            s += self.name
+        return tab + s
+
+class GenericBinding(Statement):
+    """
+    GENERIC [ , <access-spec> ] :: <generic-spec> => <binding-name-list>
+    """
+    match = re.compile(r'generic\b.*::.*=\>.*\Z', re.I).match
+    def process_item(self):
+        line = self.item.get_line()[7:].lstrip()
+        if line.startswith(','):
+            line = line[1:].lstrip()
+        i = line.index('::')
+        self.aspec = line[:i].rstrip().upper()
+        line = line[i+2:].lstrip()
+        i = line.index('=>')
+        self.spec = self.item.apply_map(line[:i].rstrip())
+        self.items = split_comma(line[i+2:].lstrip())
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        s = 'GENERIC'
+        if self.aspec:
+            s += ', '+self.aspec
+        s += ' :: ' + self.spec + ' => ' + ', '.join(self.items)
+        return tab + s
+
+        
+class FinalBinding(StatementWithNamelist):
+    """
+    FINAL [ :: ] <final-subroutine-name-list>
+    """
+    stmtname = 'final'
+    match = re.compile(r'final\b', re.I).match
+
+class Allocatable(Statement):
+    """
+    ALLOCATABLE [ :: ] <object-name> [ ( <deferred-shape-spec-list> ) ] [ , <object-name> [ ( <deferred-shape-spec-list> ) ] ]...
+    """
+    match = re.compile(r'allocatable\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[11:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'ALLOCATABLE ' + ', '.join(self.items) 
+    def analyze(self):
+        for line in self.items:
+            i = line.find('(')
+            if i==-1:
+                name = line
+                array_spec = None
+            else:
+                assert line.endswith(')')
+                name = line[:i].rstrip()
+                array_spec = split_comma(line[i+1:-1], self.item)
+            var = self.get_variable(name)
+            var.update('allocatable')
+            if array_spec is not None:
+                var.set_bounds(array_spec)
+        return
+
+class Asynchronous(StatementWithNamelist):
+    """
+    ASYNCHRONOUS [ :: ] <object-name-list>
+    """
+    match = re.compile(r'asynchronous\b',re.I).match
+    def analyze(self):
+        for name in self.items:
+            var = self.get_variable(name)
+            var.update('asynchronous')
+        return
+
+
+class Bind(Statement):
+    """
+    <language-binding-spec> [ :: ] <bind-entity-list>
+    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
+    <bind-entity> = <entity-name> | / <common-block-name> /
+    """
+    match = re.compile(r'bind\s*\(.*\)',re.I).match
+    def process_item(self):
+        line = self.item.line
+        self.specs, line = parse_bind(line, self.item)
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        items = []
+        for item in split_comma(line, self.item):
+            if item.startswith('/'):
+                assert item.endswith('/'),`item`
+                item = '/ ' + item[1:-1].strip() + ' /'
+            items.append(item)
+        self.items = items
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'BIND (%s) %s' %\
+               (', '.join(self.specs), ', '.join(self.items))
+
+# IF construct statements
+
+class Else(Statement):
+    """
+    ELSE [<if-construct-name>]
+    """
+    match = re.compile(r'else\b\s*\w*\s*\Z',re.I).match
+
+    def process_item(self):
+        item = self.item
+        self.name = item.get_line()[4:].strip()
+        parent_name = getattr(self.parent,'name','')
+        if self.name and self.name!=parent_name:
+            self.warning('expected if-construct-name %r but got %r, skipping.'\
+                         % (parent_name, self.name))
+            self.isvalid = False        
+        return
+
+    def __str__(self):
+        if self.name:
+            return self.get_indent_tab(deindent=True) + 'ELSE ' + self.name
+        return self.get_indent_tab(deindent=True) + 'ELSE'
+
+    def analyze(self): return
+
+class ElseIf(Statement):
+    """
+    ELSE IF ( <scalar-logical-expr> ) THEN [ <if-construct-name> ]
+    """
+    match = re.compile(r'else\s*if\s*\(.*\)\s*then\s*\w*\s*\Z',re.I).match
+
+    def process_item(self):
+        item = self.item
+        line = item.get_line()[4:].lstrip()[2:].lstrip()
+        i = line.find(')')
+        assert line[0]=='('
+        self.expr = item.apply_map(line[1:i])
+        self.name = line[i+1:].lstrip()[4:].strip()
+        parent_name = getattr(self.parent,'name','')
+        if self.name and self.name!=parent_name:
+            self.warning('expected if-construct-name %r but got %r, skipping.'\
+                         % (parent_name, self.name))
+            self.isvalid = False        
+        return
+        
+    def __str__(self):
+        s = ''
+        if self.name:
+            s = ' ' + self.name
+        return self.get_indent_tab(deindent=True) + 'ELSE IF (%s) THEN%s' \
+               % (self.expr, s)
+
+    def analyze(self): return
+
+# SelectCase construct statements
+
+class Case(Statement):
+    """
+    CASE <case-selector> [ <case-constract-name> ]
+    <case-selector> = ( <case-value-range-list> ) | DEFAULT
+    <case-value-range> = <case-value>
+                         | <case-value> :
+                         | : <case-value>
+                         | <case-value> : <case-value>
+    <case-value> = <scalar-(int|char|logical)-initialization-expr>
+    """
+    match = re.compile(r'case\b\s*(\(.*\)|DEFAULT)\s*\w*\Z',re.I).match
+    def process_item(self):
+        #assert self.parent.__class__.__name__=='Select',`self.parent.__class__`
+        line = self.item.get_line()[4:].lstrip()
+        if line.startswith('('):
+            i = line.find(')')
+            items = split_comma(line[1:i].strip(), self.item)
+            line = line[i+1:].lstrip()
+        else:
+            assert line.lower().startswith('default'),`line`
+            items = []
+            line = line[7:].lstrip()
+        for i in range(len(items)):
+            it = self.item.copy(items[i])
+            rl = []
+            for r in it.get_line().split(':'):
+                rl.append(it.apply_map(r.strip()))
+            items[i] = rl
+        self.items = items
+        self.name = line
+        parent_name = getattr(self.parent, 'name', '')
+        if self.name and self.name!=parent_name:
+            self.warning('expected case-construct-name %r but got %r, skipping.'\
+                         % (parent_name, self.name))
+            self.isvalid = False        
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        s = 'CASE'
+        if self.items:
+            l = []
+            for item in self.items:
+                l.append((' : '.join(item)).strip())
+            s += ' ( %s )' % (', '.join(l))
+        else:
+            s += ' DEFAULT'
+        if self.name:
+            s += ' ' + self.name
+        return s
+    def analyze(self): return
+
+# Where construct statements
+
+class Where(Statement):
+    """
+    WHERE ( <mask-expr> ) <where-assignment-stmt>
+    """
+    match = re.compile(r'where\s*\(.*\)\s*\w.*\Z',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[5:].lstrip()
+        i = line.index(')')
+        self.expr = self.item.apply_map(line[1:i].strip())
+        line = line[i+1:].lstrip()
+        newitem = self.item.copy(line)
+        cls = Assignment
+        if cls.match(line):
+            stmt = cls(self, newitem)
+            if stmt.isvalid:
+                self.content = [stmt]
+                return
+        self.isvalid = False
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        return tab + 'WHERE ( %s ) %s' % (self.expr, str(self.content[0]).lstrip())
+    def analyze(self): return
+
+WhereStmt = Where
+
+class ElseWhere(Statement):
+    """
+    ELSE WHERE ( <mask-expr> ) [ <where-construct-name> ]
+    ELSE WHERE [ <where-construct-name> ]
+    """
+    match = re.compile(r'else\s*where\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[4:].lstrip()[5:].lstrip()
+        self.expr = None
+        if line.startswith('('):
+            i = line.index(')')
+            assert i != -1,`line`
+            self.expr = self.item.apply_map(line[1:i].strip())
+            line = line[i+1:].lstrip()
+        self.name = line
+        parent_name = getattr(self.parent,'name','')
+        if self.name and not self.name==parent_name:
+            self.warning('expected where-construct-name %r but got %r, skipping.'\
+                         % (parent_name, self.name))
+            self.isvalid = False
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        s = 'ELSE WHERE'
+        if self.expr is not None:
+            s += ' ( %s )' % (self.expr)
+        if self.name:
+            s += ' ' + self.name
+        return tab + s
+    def analyze(self): return
+
+# Enum construct statements
+
+class Enumerator(Statement):
+    """
+    ENUMERATOR [ :: ] <enumerator-list>
+    <enumerator> = <named-constant> [ = <scalar-int-initialization-expr> ]
+    """
+    match = re.compile(r'enumerator\b',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[10:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = split_comma(line, self.item)
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'ENUMERATOR ' + ', '.join(self.items)
+
+# F2PY specific statements
+
+class FortranName(Statement):
+    """
+    FORTRANNAME <name>
+    """
+    match = re.compile(r'fortranname\s*\w+\Z',re.I).match
+    def process_item(self):
+        self.value = self.item.get_line()[11:].lstrip()
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'FORTRANNAME ' + self.value
+
+class Threadsafe(Statement):
+    """
+    THREADSAFE
+    """
+    match = re.compile(r'threadsafe\Z',re.I).match
+    def process_item(self):
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'THREADSAFE'
+
+class Depend(Statement):
+    """
+    DEPEND ( <name-list> ) [ :: ] <dummy-arg-name-list>
+
+    """
+    match = re.compile(r'depend\s*\(',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[6:].lstrip()
+        i = line.find(')')
+        self.depends = split_comma(line[1:i].strip(), self.item)
+        line = line[i+1:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.items = split_comma(line)
+        return
+
+    def __str__(self):
+        return self.get_indent_tab() + 'DEPEND ( %s ) %s' \
+               % (', '.join(self.depends), ', '.join(self.items))
+
+class Check(Statement):
+    """
+    CHECK ( <c-int-scalar-expr> ) [ :: ] <name>
+
+    """
+    match = re.compile(r'check\s*\(',re.I).match
+    def process_item(self):
+        line = self.item.get_line()[5:].lstrip()
+        i = line.find(')')
+        assert i!=-1,`line`
+        self.expr = self.item.apply_map(line[1:i].strip())
+        line = line[i+1:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        self.value = line
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'CHECK ( %s ) %s' \
+               % (self.expr, self.value)
+
+class CallStatement(Statement):
+    """
+    CALLSTATEMENT <c-expr>
+    """
+    match = re.compile(r'callstatement\b', re.I).match
+    def process_item(self):
+        self.expr = self.item.apply_map(self.item.get_line()[13:].lstrip())
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'CALLSTATEMENT ' + self.expr
+
+class CallProtoArgument(Statement):
+    """
+    CALLPROTOARGUMENT <c-type-spec-list>
+    """
+    match = re.compile(r'callprotoargument\b', re.I).match
+    def process_item(self):
+        self.specs = self.item.apply_map(self.item.get_line()[17:].lstrip())
+        return
+    def __str__(self):
+        return self.get_indent_tab() + 'CALLPROTOARGUMENT ' + self.specs
+
+# Non-standard statements
+
+class Pause(Statement):
+    """
+    PAUSE [ <char-literal-constant|int-literal-constant> ]
+    """
+    match = re.compile(r'pause\s*(\d+|\'\w*\'|"\w*"|)\Z', re.I).match
+    def process_item(self):
+        self.value = self.item.apply_map(self.item.get_line()[5:].lstrip())
+        return
+    def __str__(self):
+        if self.value:
+            return self.get_indent_tab() + 'PAUSE ' + self.value
+        return self.get_indent_tab() + 'PAUSE'
+    def analyze(self): return
+

Copied: trunk/numpy/f2py/lib/parser/test_parser.py (from rev 3235, trunk/numpy/f2py/lib/test_parser.py)
===================================================================
--- trunk/numpy/f2py/lib/test_parser.py	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/test_parser.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,496 @@
+"""
+Test parsing single Fortran lines.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+from numpy.testing import *
+from block_statements import *
+from readfortran import Line, FortranStringReader
+
+
+def parse(cls, line, label='',
+          isfree=True, isstrict=False):
+    if label:
+        line = label + ' : ' + line
+    reader = FortranStringReader(line, isfree, isstrict)
+    item = reader.next()
+    if not cls.match(item.get_line()):
+        raise ValueError, '%r does not match %s pattern' % (line, cls.__name__)
+    stmt = cls(item, item)
+    if stmt.isvalid:
+        r = str(stmt)
+        if not isstrict:
+            r1 = parse(cls, r, isstrict=True)
+            if r != r1:
+                raise ValueError, 'Failed to parse %r with %s pattern in pyf mode, got %r' % (r, cls.__name__, r1)
+        return r
+    raise ValueError, 'parsing %r with %s pattern failed' % (line, cls.__name__)
+
+class test_Statements(NumpyTestCase):
+
+    def check_assignment(self):
+        assert_equal(parse(Assignment,'a=b'), 'a = b')
+        assert_equal(parse(PointerAssignment,'a=>b'), 'a => b')
+        assert_equal(parse(Assignment,'a (2)=b(n,m)'), 'a(2) = b(n,m)')
+        assert_equal(parse(Assignment,'a % 2(2,4)=b(a(i))'), 'a%2(2,4) = b(a(i))')
+
+    def check_assign(self):
+        assert_equal(parse(Assign,'assign 10 to a'),'ASSIGN 10 TO a')
+
+    def check_call(self):
+        assert_equal(parse(Call,'call a'),'CALL a')
+        assert_equal(parse(Call,'call a()'),'CALL a')
+        assert_equal(parse(Call,'call a(1)'),'CALL a(1)')
+        assert_equal(parse(Call,'call a(1,2)'),'CALL a(1, 2)')
+        assert_equal(parse(Call,'call a % 2 ( n , a+1 )'),'CALL a % 2(n, a+1)')
+
+    def check_goto(self):
+        assert_equal(parse(Goto,'go to 19'),'GO TO 19')
+        assert_equal(parse(Goto,'goto 19'),'GO TO 19')
+        assert_equal(parse(ComputedGoto,'goto (1, 2 ,3) a+b(2)'),
+                     'GO TO (1, 2, 3) a+b(2)')
+        assert_equal(parse(ComputedGoto,'goto (1, 2 ,3) , a+b(2)'),
+                     'GO TO (1, 2, 3) a+b(2)')
+        assert_equal(parse(AssignedGoto,'goto a'),'GO TO a')
+        assert_equal(parse(AssignedGoto,'goto a ( 1 )'),'GO TO a (1)')
+        assert_equal(parse(AssignedGoto,'goto a ( 1 ,2)'),'GO TO a (1, 2)')
+
+    def check_continue(self):
+        assert_equal(parse(Continue,'continue'),'CONTINUE')
+
+    def check_return(self):
+        assert_equal(parse(Return,'return'),'RETURN')
+        assert_equal(parse(Return,'return a'),'RETURN a')
+        assert_equal(parse(Return,'return a+1'),'RETURN a+1')
+        assert_equal(parse(Return,'return a(c, a)'),'RETURN a(c, a)')
+
+    def check_stop(self):
+        assert_equal(parse(Stop,'stop'),'STOP')
+        assert_equal(parse(Stop,'stop 1'),'STOP 1')
+        assert_equal(parse(Stop,'stop "a"'),'STOP "a"')
+        assert_equal(parse(Stop,'stop "a b"'),'STOP "a b"')
+
+    def check_print(self):
+        assert_equal(parse(Print, 'print*'),'PRINT *')
+        assert_equal(parse(Print, 'print "a b( c )"'),'PRINT "a b( c )"')
+        assert_equal(parse(Print, 'print 12, a'),'PRINT 12, a')
+        assert_equal(parse(Print, 'print 12, a , b'),'PRINT 12, a, b')
+        assert_equal(parse(Print, 'print 12, a(c,1) , b'),'PRINT 12, a(c,1), b')
+
+    def check_read(self):
+        assert_equal(parse(Read, 'read ( 10 )'),'READ (10)')
+        assert_equal(parse(Read, 'read ( 10 ) a '),'READ (10) a')
+        assert_equal(parse(Read, 'read ( 10 ) a , b'),'READ (10) a, b')
+        assert_equal(parse(Read, 'read *'),'READ *')
+        assert_equal(parse(Read, 'read 12'),'READ 12')
+        assert_equal(parse(Read, 'read "a b"'),'READ "a b"')
+        assert_equal(parse(Read, 'read "a b",a'),'READ "a b", a')
+        assert_equal(parse(Read, 'read * , a'),'READ *, a')
+        assert_equal(parse(Read, 'read "hey a" , a'),'READ "hey a", a')
+        assert_equal(parse(Read, 'read * , a  , b'),'READ *, a, b')
+        assert_equal(parse(Read, 'read ( unit  =10 )'),'READ (UNIT = 10)')
+        
+    def check_write(self):
+        assert_equal(parse(Write, 'write ( 10 )'),'WRITE (10)')
+        assert_equal(parse(Write, 'write ( 10 , a )'),'WRITE (10, a)')
+        assert_equal(parse(Write, 'write ( 10 ) b'),'WRITE (10) b')
+        assert_equal(parse(Write, 'write ( 10 ) a(1) , b+2'),'WRITE (10) a(1), b+2')
+        assert_equal(parse(Write, 'write ( unit=10 )'),'WRITE (UNIT = 10)')
+
+    def check_flush(self):
+        assert_equal(parse(Flush, 'flush 10'),'FLUSH (10)')
+        assert_equal(parse(Flush, 'flush (10)'),'FLUSH (10)')
+        assert_equal(parse(Flush, 'flush (UNIT = 10)'),'FLUSH (UNIT = 10)')
+        assert_equal(parse(Flush, 'flush (10, err=  23)'),'FLUSH (10, ERR = 23)')
+
+    def check_wait(self):
+        assert_equal(parse(Wait, 'wait(10)'),'WAIT (10)')
+        assert_equal(parse(Wait, 'wait(10,err=129)'),'WAIT (10, ERR = 129)')
+
+    def check_contains(self):
+        assert_equal(parse(Contains, 'contains'),'CONTAINS')
+
+    def check_allocate(self):
+        assert_equal(parse(Allocate, 'allocate (a)'), 'ALLOCATE (a)')
+        assert_equal(parse(Allocate, \
+                           'allocate (a, stat=b)'), 'ALLOCATE (a, STAT = b)')
+        assert_equal(parse(Allocate, 'allocate (a,b(:1))'), 'ALLOCATE (a, b(:1))')
+        assert_equal(parse(Allocate, \
+                           'allocate (real(8)::a)'), 'ALLOCATE (REAL(KIND=8) :: a)')
+    def check_deallocate(self):
+        assert_equal(parse(Deallocate, 'deallocate (a)'), 'DEALLOCATE (a)')
+        assert_equal(parse(Deallocate, 'deallocate (a, stat=b)'), 'DEALLOCATE (a, STAT = b)')
+
+    def check_moduleprocedure(self):
+        assert_equal(parse(ModuleProcedure,\
+                           'ModuleProcedure a'), 'MODULE PROCEDURE a')
+        assert_equal(parse(ModuleProcedure,\
+                           'module procedure a , b'), 'MODULE PROCEDURE a, b')
+
+    def check_access(self):
+        assert_equal(parse(Public,'Public'),'PUBLIC')
+        assert_equal(parse(Public,'public a'),'PUBLIC a')
+        assert_equal(parse(Public,'public :: a'),'PUBLIC a')
+        assert_equal(parse(Public,'public a,b,c'),'PUBLIC a, b, c')
+        assert_equal(parse(Public,'public :: a(:,:)'),'PUBLIC a(:,:)')
+        assert_equal(parse(Private,'private'),'PRIVATE')
+        assert_equal(parse(Private,'private :: a'),'PRIVATE a')
+
+    def check_close(self):
+        assert_equal(parse(Close,'close (12)'),'CLOSE (12)')
+        assert_equal(parse(Close,'close (12, err=99)'),'CLOSE (12, ERR = 99)')
+        assert_equal(parse(Close,'close (12, status = a(1,2))'),'CLOSE (12, STATUS = a(1,2))')
+
+    def check_cycle(self):
+        assert_equal(parse(Cycle,'cycle'),'CYCLE')
+        assert_equal(parse(Cycle,'cycle ab'),'CYCLE ab')
+
+    def check_rewind(self):
+        assert_equal(parse(Rewind,'rewind 1'),'REWIND (1)')
+        assert_equal(parse(Rewind,'rewind (1)'),'REWIND (1)')
+        assert_equal(parse(Rewind,'rewind (1, err =  123)'),'REWIND (1, ERR = 123)')
+
+    def check_backspace(self):
+        assert_equal(parse(Backspace,'backspace 1'),'BACKSPACE (1)')
+        assert_equal(parse(Backspace,'backspace (1)'),'BACKSPACE (1)')
+        assert_equal(parse(Backspace,'backspace (1, err =  123)'),'BACKSPACE (1, ERR = 123)')
+
+    def check_endfile(self):
+        assert_equal(parse(Endfile,'endfile 1'),'ENDFILE (1)')
+        assert_equal(parse(Endfile,'endfile (1)'),'ENDFILE (1)')
+        assert_equal(parse(Endfile,'endfile (1, err =  123)'),'ENDFILE (1, ERR = 123)')
+
+    def check_open(self):
+        assert_equal(parse(Open,'open (1)'),'OPEN (1)')
+        assert_equal(parse(Open,'open (1, err =  123)'),'OPEN (1, ERR = 123)')
+
+    def check_format(self):
+        assert_equal(parse(Format,'1: format ()'),'1: FORMAT ()')
+        assert_equal(parse(Format,'199 format (1)'),'199: FORMAT (1)')
+        assert_equal(parse(Format,'2 format (1 , SS)'),'2: FORMAT (1, ss)')
+
+    def check_save(self):
+        assert_equal(parse(Save,'save'), 'SAVE')
+        assert_equal(parse(Save,'save :: a'), 'SAVE a')
+        assert_equal(parse(Save,'save a,b'), 'SAVE a, b')
+
+    def check_data(self):
+        assert_equal(parse(Data,'data a /b/'), 'DATA a / b /')
+        assert_equal(parse(Data,'data a , c /b/'), 'DATA a, c / b /')
+        assert_equal(parse(Data,'data a /b ,c/'), 'DATA a / b, c /')
+        assert_equal(parse(Data,'data a /b/ c,e /d/'), 'DATA a / b / c, e / d /')
+        assert_equal(parse(Data,'data a(1,2) /b/'), 'DATA a(1,2) / b /')
+        assert_equal(parse(Data,'data a /b, c(1)/'), 'DATA a / b, c(1) /')
+
+    def check_nullify(self):
+        assert_equal(parse(Nullify,'nullify(a)'),'NULLIFY (a)')
+        assert_equal(parse(Nullify,'nullify(a  ,b)'),'NULLIFY (a, b)')
+
+    def check_use(self):
+        assert_equal(parse(Use, 'use a'), 'USE a')
+        assert_equal(parse(Use, 'use :: a'), 'USE a')
+        assert_equal(parse(Use, 'use, intrinsic:: a'), 'USE INTRINSIC :: a')
+        assert_equal(parse(Use, 'use :: a ,only: b'), 'USE a, ONLY: b')
+        assert_equal(parse(Use, 'use :: a , only: b=>c'), 'USE a, ONLY: b=>c')
+        assert_equal(parse(Use, 'use :: a , b=>c'), 'USE a, b=>c')
+        assert_equal(parse(Use,\
+                           'use :: a , only: operator(+) , b'),\
+                     'USE a, ONLY: operator(+), b')
+
+    def check_exit(self):
+        assert_equal(parse(Exit,'exit'),'EXIT')
+        assert_equal(parse(Exit,'exit ab'),'EXIT ab')        
+
+    def check_parameter(self):
+        assert_equal(parse(Parameter,'parameter (a = b(1,2))'),
+                     'PARAMETER (a = b(1,2))')
+        assert_equal(parse(Parameter,'parameter (a = b(1,2) , b=1)'),
+                     'PARAMETER (a = b(1,2), b=1)')
+
+    def check_equivalence(self):
+        assert_equal(parse(Equivalence,'equivalence (a , b)'),'EQUIVALENCE (a, b)')
+        assert_equal(parse(Equivalence,'equivalence (a , b) , ( c, d(1) , g  )'),
+                     'EQUIVALENCE (a, b), (c, d(1), g)')
+
+    def check_dimension(self):
+        assert_equal(parse(Dimension,'dimension a(b)'),'DIMENSION a(b)')
+        assert_equal(parse(Dimension,'dimension::a(b)'),'DIMENSION a(b)')
+        assert_equal(parse(Dimension,'dimension a(b)  , c(d)'),'DIMENSION a(b), c(d)')
+        assert_equal(parse(Dimension,'dimension a(b,c)'),'DIMENSION a(b,c)')
+
+    def check_target(self):
+        assert_equal(parse(Target,'target a(b)'),'TARGET a(b)')
+        assert_equal(parse(Target,'target::a(b)'),'TARGET a(b)')
+        assert_equal(parse(Target,'target a(b)  , c(d)'),'TARGET a(b), c(d)')
+        assert_equal(parse(Target,'target a(b,c)'),'TARGET a(b,c)')
+
+    def check_pointer(self):
+        assert_equal(parse(Pointer,'pointer a=b'),'POINTER a=b')
+        assert_equal(parse(Pointer,'pointer :: a=b'),'POINTER a=b')
+        assert_equal(parse(Pointer,'pointer a=b, c=d(1,2)'),'POINTER a=b, c=d(1,2)')
+
+    def check_protected(self):
+        assert_equal(parse(Protected,'protected a'),'PROTECTED a')
+        assert_equal(parse(Protected,'protected::a'),'PROTECTED a')
+        assert_equal(parse(Protected,'protected a , b'),'PROTECTED a, b')
+
+    def check_volatile(self):
+        assert_equal(parse(Volatile,'volatile a'),'VOLATILE a')
+        assert_equal(parse(Volatile,'volatile::a'),'VOLATILE a')
+        assert_equal(parse(Volatile,'volatile a , b'),'VOLATILE a, b')
+
+    def check_value(self):
+        assert_equal(parse(Value,'value a'),'VALUE a')
+        assert_equal(parse(Value,'value::a'),'VALUE a')
+        assert_equal(parse(Value,'value a , b'),'VALUE a, b')
+
+    def check_arithmeticif(self):
+        assert_equal(parse(ArithmeticIf,'if (a) 1,2,3'),'IF (a) 1, 2, 3')
+        assert_equal(parse(ArithmeticIf,'if (a(1)) 1,2,3'),'IF (a(1)) 1, 2, 3')
+        assert_equal(parse(ArithmeticIf,'if (a(1,2)) 1,2,3'),'IF (a(1,2)) 1, 2, 3')
+
+    def check_intrinsic(self):
+        assert_equal(parse(Intrinsic,'intrinsic a'),'INTRINSIC a')
+        assert_equal(parse(Intrinsic,'intrinsic::a'),'INTRINSIC a')
+        assert_equal(parse(Intrinsic,'intrinsic a , b'),'INTRINSIC a, b')
+
+    def check_inquire(self):
+        assert_equal(parse(Inquire, 'inquire (1)'),'INQUIRE (1)')
+        assert_equal(parse(Inquire, 'inquire (1, err=123)'),'INQUIRE (1, ERR = 123)')
+        assert_equal(parse(Inquire, 'inquire (iolength=a) b'),'INQUIRE (IOLENGTH = a) b')
+        assert_equal(parse(Inquire, 'inquire (iolength=a) b  ,c(1,2)'),
+                     'INQUIRE (IOLENGTH = a) b, c(1,2)')
+
+    def check_sequence(self):
+        assert_equal(parse(Sequence, 'sequence'),'SEQUENCE')
+
+    def check_external(self):
+        assert_equal(parse(External,'external a'),'EXTERNAL a')
+        assert_equal(parse(External,'external::a'),'EXTERNAL a')
+        assert_equal(parse(External,'external a , b'),'EXTERNAL a, b')
+
+    def check_common(self):
+        assert_equal(parse(Common, 'common a'),'COMMON a')
+        assert_equal(parse(Common, 'common a , b'),'COMMON a, b')
+        assert_equal(parse(Common, 'common a , b(1,2)'),'COMMON a, b(1,2)')
+        assert_equal(parse(Common, 'common // a'),'COMMON a')
+        assert_equal(parse(Common, 'common / name/ a'),'COMMON / name / a')
+        assert_equal(parse(Common, 'common / name/ a  , c'),'COMMON / name / a, c')
+        assert_equal(parse(Common, 'common / name/ a /foo/ c(1) ,d'),
+                     'COMMON / name / a / foo / c(1), d')
+        assert_equal(parse(Common, 'common / name/ a, /foo/ c(1) ,d'),
+                     'COMMON / name / a / foo / c(1), d')
+
+    def check_optional(self):
+        assert_equal(parse(Optional,'optional a'),'OPTIONAL a')
+        assert_equal(parse(Optional,'optional::a'),'OPTIONAL a')
+        assert_equal(parse(Optional,'optional a , b'),'OPTIONAL a, b')
+
+    def check_intent(self):
+        assert_equal(parse(Intent,'intent (in) a'),'INTENT (IN) a')
+        assert_equal(parse(Intent,'intent(in)::a'),'INTENT (IN) a')
+        assert_equal(parse(Intent,'intent(in) a , b'),'INTENT (IN) a, b')
+        assert_equal(parse(Intent,'intent (in, out) a'),'INTENT (IN, OUT) a')
+
+    def check_entry(self):
+        assert_equal(parse(Entry,'entry a'), 'ENTRY a')
+        assert_equal(parse(Entry,'entry a()'), 'ENTRY a')
+        assert_equal(parse(Entry,'entry a(b)'), 'ENTRY a (b)')
+        assert_equal(parse(Entry,'entry a(b,*)'), 'ENTRY a (b, *)')
+        assert_equal(parse(Entry,'entry a bind(c , name="a b")'),
+                     'ENTRY a BIND (C, NAME = "a b")')
+        assert_equal(parse(Entry,'entry a result (b)'), 'ENTRY a RESULT (b)')
+        assert_equal(parse(Entry,'entry a bind(d) result (b)'),
+                     'ENTRY a RESULT (b) BIND (D)')
+        assert_equal(parse(Entry,'entry a result (b) bind( c )'),
+                     'ENTRY a RESULT (b) BIND (C)')
+        assert_equal(parse(Entry,'entry a(b,*) result (g)'),
+                     'ENTRY a (b, *) RESULT (g)')
+
+    def check_import(self):
+        assert_equal(parse(Import,'import'),'IMPORT')
+        assert_equal(parse(Import,'import a'),'IMPORT a')
+        assert_equal(parse(Import,'import::a'),'IMPORT a')
+        assert_equal(parse(Import,'import a , b'),'IMPORT a, b')
+
+    def check_forall(self):
+        assert_equal(parse(ForallStmt,'forall (i = 1:n(k,:) : 2) a(i) = i*i*b(i)'),
+                     'FORALL (i = 1 : n(k,:) : 2) a(i) = i*i*b(i)')
+        assert_equal(parse(ForallStmt,'forall (i=1:n,j=2:3) a(i) = b(i,i)'),
+                     'FORALL (i = 1 : n, j = 2 : 3) a(i) = b(i,i)')
+        assert_equal(parse(ForallStmt,'forall (i=1:n,j=2:3, 1+a(1,2)) a(i) = b(i,i)'),
+                     'FORALL (i = 1 : n, j = 2 : 3, 1+a(1,2)) a(i) = b(i,i)')
+
+    def check_specificbinding(self):
+        assert_equal(parse(SpecificBinding,'procedure a'),'PROCEDURE a')
+        assert_equal(parse(SpecificBinding,'procedure :: a'),'PROCEDURE a')
+        assert_equal(parse(SpecificBinding,'procedure , NOPASS :: a'),'PROCEDURE , NOPASS :: a')
+        assert_equal(parse(SpecificBinding,'procedure , public, pass(x ) :: a'),'PROCEDURE , PUBLIC, PASS (x) :: a')
+        assert_equal(parse(SpecificBinding,'procedure(n) a'),'PROCEDURE (n) a')
+        assert_equal(parse(SpecificBinding,'procedure(n),pass :: a'),
+                     'PROCEDURE (n) , PASS :: a')
+        assert_equal(parse(SpecificBinding,'procedure(n) :: a'),
+                     'PROCEDURE (n) a')
+        assert_equal(parse(SpecificBinding,'procedure a= >b'),'PROCEDURE a => b')
+        assert_equal(parse(SpecificBinding,'procedure(n),pass :: a =>c'),
+                     'PROCEDURE (n) , PASS :: a => c')
+
+    def check_genericbinding(self):
+        assert_equal(parse(GenericBinding,'generic :: a=>b'),'GENERIC :: a => b')
+        assert_equal(parse(GenericBinding,'generic, public :: a=>b'),'GENERIC, PUBLIC :: a => b')
+        assert_equal(parse(GenericBinding,'generic, public :: a(1,2)=>b ,c'),
+                     'GENERIC, PUBLIC :: a(1,2) => b, c')
+
+    def check_finalbinding(self):
+        assert_equal(parse(FinalBinding,'final a'),'FINAL a')
+        assert_equal(parse(FinalBinding,'final::a'),'FINAL a')
+        assert_equal(parse(FinalBinding,'final a , b'),'FINAL a, b')
+
+    def check_allocatable(self):
+        assert_equal(parse(Allocatable,'allocatable a'),'ALLOCATABLE a')
+        assert_equal(parse(Allocatable,'allocatable :: a'),'ALLOCATABLE a')
+        assert_equal(parse(Allocatable,'allocatable a (1,2)'),'ALLOCATABLE a (1,2)')
+        assert_equal(parse(Allocatable,'allocatable a (1,2) ,b'),'ALLOCATABLE a (1,2), b')
+
+    def check_asynchronous(self):
+        assert_equal(parse(Asynchronous,'asynchronous a'),'ASYNCHRONOUS a')
+        assert_equal(parse(Asynchronous,'asynchronous::a'),'ASYNCHRONOUS a')
+        assert_equal(parse(Asynchronous,'asynchronous a , b'),'ASYNCHRONOUS a, b')
+
+    def check_bind(self):
+        assert_equal(parse(Bind,'bind(c) a'),'BIND (C) a')
+        assert_equal(parse(Bind,'bind(c) :: a'),'BIND (C) a')
+        assert_equal(parse(Bind,'bind(c) a ,b'),'BIND (C) a, b')
+        assert_equal(parse(Bind,'bind(c) /a/'),'BIND (C) / a /')
+        assert_equal(parse(Bind,'bind(c) /a/ ,b'),'BIND (C) / a /, b')
+        assert_equal(parse(Bind,'bind(c,name="hey") a'),'BIND (C, NAME = "hey") a')
+
+    def check_else(self):
+        assert_equal(parse(Else,'else'),'ELSE')
+        assert_equal(parse(ElseIf,'else if (a) then'),'ELSE IF (a) THEN')
+        assert_equal(parse(ElseIf,'else if (a.eq.b(1,2)) then'),
+                     'ELSE IF (a.eq.b(1,2)) THEN')
+
+    def check_case(self):
+        assert_equal(parse(Case,'case (1)'),'CASE ( 1 )')
+        assert_equal(parse(Case,'case (1:)'),'CASE ( 1 : )')
+        assert_equal(parse(Case,'case (:1)'),'CASE ( : 1 )')
+        assert_equal(parse(Case,'case (1:2)'),'CASE ( 1 : 2 )')
+        assert_equal(parse(Case,'case (a(1,2))'),'CASE ( a(1,2) )')
+        assert_equal(parse(Case,'case ("ab")'),'CASE ( "ab" )')
+        assert_equal(parse(Case,'case default'),'CASE DEFAULT')
+        assert_equal(parse(Case,'case (1:2 ,3:4)'),'CASE ( 1 : 2, 3 : 4 )')
+        assert_equal(parse(Case,'case (a(1,:):)'),'CASE ( a(1,:) : )')
+        assert_equal(parse(Case,'case default'),'CASE DEFAULT')
+
+    def check_where(self):
+        assert_equal(parse(WhereStmt,'where (1) a=1'),'WHERE ( 1 ) a = 1')
+        assert_equal(parse(WhereStmt,'where (a(1,2)) a=1'),'WHERE ( a(1,2) ) a = 1')
+
+    def check_elsewhere(self):
+        assert_equal(parse(ElseWhere,'else where'),'ELSE WHERE')
+        assert_equal(parse(ElseWhere,'elsewhere (1)'),'ELSE WHERE ( 1 )')
+        assert_equal(parse(ElseWhere,'elsewhere(a(1,2))'),'ELSE WHERE ( a(1,2) )')
+
+    def check_enumerator(self):
+        assert_equal(parse(Enumerator,'enumerator a'), 'ENUMERATOR a')
+        assert_equal(parse(Enumerator,'enumerator:: a'), 'ENUMERATOR a')
+        assert_equal(parse(Enumerator,'enumerator a,b'), 'ENUMERATOR a, b')
+        assert_equal(parse(Enumerator,'enumerator a=1'), 'ENUMERATOR a=1')
+        assert_equal(parse(Enumerator,'enumerator a=1 , b=c(1,2)'), 'ENUMERATOR a=1, b=c(1,2)')
+
+    def check_fortranname(self):
+        assert_equal(parse(FortranName,'fortranname a'),'FORTRANNAME a')
+
+    def check_threadsafe(self):
+        assert_equal(parse(Threadsafe,'threadsafe'),'THREADSAFE')
+
+    def check_depend(self):
+        assert_equal(parse(Depend,'depend( a) b'), 'DEPEND ( a ) b')
+        assert_equal(parse(Depend,'depend( a) ::b'), 'DEPEND ( a ) b')
+        assert_equal(parse(Depend,'depend( a,c) b,e'), 'DEPEND ( a, c ) b, e')
+
+    def check_check(self):
+        assert_equal(parse(Check,'check(1) a'), 'CHECK ( 1 ) a')
+        assert_equal(parse(Check,'check(1) :: a'), 'CHECK ( 1 ) a')
+        assert_equal(parse(Check,'check(b(1,2)) a'), 'CHECK ( b(1,2) ) a')
+        assert_equal(parse(Check,'check(a>1) :: a'), 'CHECK ( a>1 ) a')
+
+    def check_callstatement(self):
+        assert_equal(parse(CallStatement,'callstatement (*func)()',isstrict=1),
+                     'CALLSTATEMENT (*func)()')
+        assert_equal(parse(CallStatement,'callstatement i=1;(*func)()',isstrict=1),
+                     'CALLSTATEMENT i=1;(*func)()')
+
+    def check_callprotoargument(self):
+        assert_equal(parse(CallProtoArgument,'callprotoargument int(*), double'),
+                     'CALLPROTOARGUMENT int(*), double')
+
+    def check_pause(self):
+        assert_equal(parse(Pause,'pause'),'PAUSE')
+        assert_equal(parse(Pause,'pause 1'),'PAUSE 1')
+        assert_equal(parse(Pause,'pause "hey"'),'PAUSE "hey"')
+        assert_equal(parse(Pause,'pause "hey pa"'),'PAUSE "hey pa"')
+
+    def check_integer(self):
+        assert_equal(parse(Integer,'integer'),'INTEGER')
+        assert_equal(parse(Integer,'integer*4'),'INTEGER*4')
+        assert_equal(parse(Integer,'integer*4 a'),'INTEGER*4 a')
+        assert_equal(parse(Integer,'integer*4, a'),'INTEGER*4 a')
+        assert_equal(parse(Integer,'integer*4 a ,b'),'INTEGER*4 a, b')
+        assert_equal(parse(Integer,'integer*4 :: a ,b'),'INTEGER*4 a, b')
+        assert_equal(parse(Integer,'integer*4 a(1,2)'),'INTEGER*4 a(1,2)')
+        assert_equal(parse(Integer,'integer*4 :: a(1,2),b'),'INTEGER*4 a(1,2), b')
+        assert_equal(parse(Integer,'integer*4 external :: a'),
+                     'INTEGER*4, external :: a')
+        assert_equal(parse(Integer,'integer*4, external :: a'),
+                     'INTEGER*4, external :: a')
+        assert_equal(parse(Integer,'integer*4 external , intent(in) :: a'),
+                     'INTEGER*4, external, intent(in) :: a')
+        assert_equal(parse(Integer,'integer(kind=4)'),'INTEGER(KIND=4)')
+        assert_equal(parse(Integer,'integer ( kind = 4)'),'INTEGER(KIND=4)')
+        assert_equal(parse(Integer,'integer(kind=2+2)'),'INTEGER(KIND=2+2)')
+        assert_equal(parse(Integer,'integer(kind=f(4,5))'),'INTEGER(KIND=f(4,5))')
+
+    def check_character(self):
+        assert_equal(parse(Character,'character'),'CHARACTER')
+        assert_equal(parse(Character,'character*2'),'CHARACTER(LEN=2)')
+        assert_equal(parse(Character,'character**'),'CHARACTER(LEN=*)')
+        assert_equal(parse(Character,'character*(2)'),'CHARACTER(LEN=2)')
+        assert_equal(parse(Character,'character*(len =2)'),'CHARACTER(LEN=2)')
+        assert_equal(parse(Character,'character*(len =2),'),'CHARACTER(LEN=2)')
+        assert_equal(parse(Character,'character*(len =:)'),'CHARACTER(LEN=:)')
+        assert_equal(parse(Character,'character(len =2)'),'CHARACTER(LEN=2)')
+        assert_equal(parse(Character,'character(2)'),'CHARACTER(LEN=2)')
+        assert_equal(parse(Character,'character(kind=2)'),'CHARACTER(KIND=2)')
+        assert_equal(parse(Character,'character(kind=2,len=3)'),
+                     'CHARACTER(LEN=3, KIND=2)')
+        assert_equal(parse(Character,'character(lEN=3,kind=2)'),
+                     'CHARACTER(LEN=3, KIND=2)')
+        assert_equal(parse(Character,'character(len=3,kind=2)', isstrict=True),
+                     'CHARACTER(LEN=3, KIND=2)')
+        assert_equal(parse(Character,'chaRACTER(len=3,kind=fA(1,2))', isstrict=True),
+                     'CHARACTER(LEN=3, KIND=fA(1,2))')
+        assert_equal(parse(Character,'character(len=3,kind=fA(1,2))'),
+                     'CHARACTER(LEN=3, KIND=fa(1,2))')
+        
+    def check_implicit(self):
+        assert_equal(parse(Implicit,'implicit none'),'IMPLICIT NONE')
+        assert_equal(parse(Implicit,'implicit'),'IMPLICIT NONE')
+        assert_equal(parse(Implicit,'implicit integer (i-m)'),
+                     'IMPLICIT INTEGER ( i-m )')
+        assert_equal(parse(Implicit,'implicit integer (i-m,p,q-r)'),
+                     'IMPLICIT INTEGER ( i-m, p, q-r )')
+        assert_equal(parse(Implicit,'implicit integer (i-m), real (z)'),
+                     'IMPLICIT INTEGER ( i-m ), REAL ( z )')
+
+if __name__ == "__main__":
+    NumpyTest().run()

Copied: trunk/numpy/f2py/lib/parser/typedecl_statements.py (from rev 3236, trunk/numpy/f2py/lib/typedecl_statements.py)
===================================================================
--- trunk/numpy/f2py/lib/typedecl_statements.py	2006-09-30 21:02:52 UTC (rev 3236)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,574 @@
+"""
+Fortran type declaration statements.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['Integer', 'Real', 'DoublePrecision', 'Complex', 'DoubleComplex',
+           'Character', 'Logical', 'Byte', 'TypeStmt','Class',
+           'intrinsic_type_spec', 'declaration_type_spec',
+           'Implicit']
+
+import re
+import string
+from base_classes import Statement, BeginStatement, EndStatement,\
+     AttributeHolder, Variable
+from utils import split_comma, AnalyzeError, name_re, is_entity_decl, is_name, CHAR_BIT
+
+# Intrinsic type specification statements
+
+class TypeDeclarationStatement(Statement):
+    """
+    <declaration-type-spec> [ [, <attr-spec>] :: ] <entity-decl-list>
+    <declaration-type-spec> = <intrinsic-type-spec>
+                              | TYPE ( <derived-type-spec> )
+                              | CLASS ( <derived-type-spec> )
+                              | CLASS ( * )
+
+    <derived-type-spec> = <type-name> [ ( <type-param-spec-list> ) ]
+    <type-param-spec> = [ <keyword> = ] <type-param-value>
+    <type-param-value> = <scalar-int-expr> | * | :
+
+    <intrinsic-type-spec> = INTEGER [<kind-selector>]
+                            | REAL [<kind-selector>]
+                            | DOUBLE PRECISION
+                            | COMPLEX [<kind-selector>]
+                            | CHARACTER [<char-selector>]
+                            | LOGICAL [<kind-selector>]
+
+    <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
+    EXTENSION:
+      <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
+                        | * <length>
+    
+    <char-selector> = <length-selector>
+                      | ( LEN = <type-param-value>, KIND = <scalar-int-initialization-expr> )
+                      | ( <type-param-value>, [ KIND = ] <scalar-int-initialization-expr> )
+                      | ( KIND = <scalar-int-initialization-expr> [, LEN = <type-param-value>] )
+    <length-selector> = ( [ LEN = ] <type-param-value> )
+                        | * <char-length> [ , ]
+    <char-length> = ( <type-param-value> ) | <scalar-int-literal-constant>
+
+    <attr-spec> = <access-spec> | ALLOCATABLE | ASYNCHRONOUS
+                  | DIMENSION ( <array-spec> ) | EXTERNAL
+                  | INTENT ( <intent-spec> ) | INTRINSIC
+                  | <language-binding-spec> | OPTIONAL
+                  | PARAMETER | POINTER | PROTECTED | SAVE
+                  | TARGET | VALUE | VOLATILE
+    <entity-decl> = <object-name> [ ( <array-spec> ) ] [ * <char-length> ] [ <initialization> ]
+                  | <function-name> [ * <char-length> ]
+    <initialization> =  = <initialization-expr>
+                        | => NULL
+    <access-spec> = PUBLIC | PRIVATE
+    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr>] )
+    <array-spec> =   <explicit-shape-spec-list>
+                   | <assumed-shape-spec-list>
+                   | <deferred-shape-spec-list>
+                   | <assumed-size-spec>
+    <explicit-shape-spec> = [ <lower-bound> : ] <upper-bound>
+    <assumed-shape-spec> = [ <lower-bound> ] :
+    <deferred-shape-spec> = :
+    <assumed-size-spec> = [ <explicit-shape-spec-list> , ] [ <lower-bound> : ] *
+    <bound> = <specification-expr>
+
+    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
+    <digit-string> = <digit> [ <digit> ]..
+    <kind-param> = <digit-string> | <scalar-int-constant-name>
+    """
+    _repr_attr_names = ['selector','attrspec','entity_decls'] + Statement._repr_attr_names
+
+    def process_item(self):
+        item = self.item
+        apply_map = item.apply_map
+        clsname = self.__class__.__name__.lower()
+        line = item.get_line()
+        from block_statements import Function
+
+        if not line.lower().startswith(clsname):
+            i = 0
+            j = 0
+            for c in line:
+                i += 1
+                if c==' ': continue
+                j += 1
+                if j==len(clsname):
+                    break
+            line = line[:i].replace(' ','') + line[i:]
+
+        assert line.lower().startswith(clsname),`line,clsname`
+        line = line[len(clsname):].lstrip()
+
+        if line.startswith('('):
+            i = line.find(')')
+            selector = apply_map(line[:i+1].strip())
+            line = line[i+1:].lstrip()
+        elif line.startswith('*'):
+            selector = '*'
+            line = line[1:].lstrip()
+            if line.startswith('('):
+                i = line.find(')')
+                selector += apply_map(line[:i+1].rstrip())
+                line = line[i+1:].lstrip()
+            else:
+                m = re.match(r'\d+(_\w+|)|[*]',line)
+                if not m:
+                    self.isvalid = False
+                    return
+                i = m.end()
+                selector += line[:i].rstrip()
+                line = line[i:].lstrip()
+        else:
+            selector = ''
+
+        fm = Function.match(line)
+        if fm:
+            l2 = line[:fm.end()]
+            m2 = re.match(r'.*?\b(?P<name>\w+)\Z',l2)
+            if not m2:
+                self.isvalid = False
+                return
+            fname = m2.group('name')
+            fitem = item.copy(clsname+selector+' :: '+fname,
+                              apply_map=True)
+            self.parent.put_item(fitem)
+            item.clone(line)
+            self.isvalid = False
+            return
+
+        if line.startswith(','):
+            line = line[1:].lstrip()
+
+        self.raw_selector = selector
+        if isinstance(self, Character):
+            self.selector = self._parse_char_selector(selector)
+        else:
+            self.selector = self._parse_kind_selector(selector)
+
+        i = line.find('::')
+        if i==-1:
+            self.attrspec = []
+            self.entity_decls = split_comma(line, self.item)
+        else:
+            self.attrspec = split_comma(line[:i].rstrip(), self.item)
+            self.entity_decls = split_comma(line[i+2:].lstrip(), self.item)
+        for entity in self.entity_decls:
+            if not is_entity_decl(entity):
+                self.isvalid = False
+                return
+
+        if isinstance(self.parent, Function) \
+               and self.parent.name in self.entity_decls:
+            assert self.parent.typedecl is None,`self.parent.typedecl`
+            self.parent.typedecl = self
+            self.ignore = True
+        if isinstance(self, Type):
+            self.name = self.selector[1].lower()
+            assert is_name(self.name),`self.name`
+        else:
+            self.name = clsname
+        return
+
+    def _parse_kind_selector(self, selector):
+        if not selector:
+            return '',''
+        length,kind = '',''
+        if selector.startswith('*'):
+            length = selector[1:].lstrip()
+        else:
+            assert selector[0]+selector[-1]=='()',`selector`
+            l = selector[1:-1].strip()
+            if l.lower().startswith('kind'):
+                l = l[4:].lstrip()
+                assert l.startswith('='),`l`
+                kind = l[1:].lstrip()
+            else:
+                kind = l
+        return length,kind
+
+    def _parse_char_selector(self, selector):
+        if not selector:
+            return '',''
+        if selector.startswith('*'):
+            l = selector[1:].lstrip()
+            if l.startswith('('):
+                if l.endswith(','): l = l[:-1].rstrip()
+                assert l.endswith(')'),`l`
+                l = l[1:-1].strip()
+                if l.lower().startswith('len'):
+                    l = l[3:].lstrip()[1:].lstrip()
+            kind=''
+        else:
+            assert selector[0]+selector[-1]=='()',`selector`
+            l = split_comma(selector[1:-1].strip(), self.item)
+            if len(l)==1:
+                l = l[0]
+                if l.lower().startswith('len'):
+                    l=l[3:].lstrip()
+                    assert l.startswith('='),`l`
+                    l=l[1:].lstrip()
+                    kind = ''
+                elif l.lower().startswith('kind'):
+                    kind = l[4:].lstrip()[1:].lstrip()
+                    l = ''
+                else:
+                    kind = ''                    
+            else:
+                assert len(l)==2
+                if l[0].lower().startswith('len'):
+                    assert l[1].lower().startswith('kind'),`l`
+                    kind = l[1][4:].lstrip()[1:].lstrip()
+                    l = l[0][3:].lstrip()[1:].lstrip()
+                elif l[0].lower().startswith('kind'):
+                    assert l[1].lower().startswith('len'),`l`
+                    kind = l[0][4:].lstrip()[1:].lstrip()
+                    l = l[1][3:].lstrip()[1:].lstrip()
+                else:
+                    if l[1].lower().startswith('kind'):
+                        kind = l[1][4:].lstrip()[1:].lstrip()
+                        l = l[0]
+                    else:
+                        kind = l[1]
+                        l = l[0]
+        return l,kind
+
+    def tostr(self):
+        clsname = self.__class__.__name__.upper()
+        s = ''
+        length, kind = self.selector
+        if isinstance(self, Character):
+            if length and kind:
+                s += '(LEN=%s, KIND=%s)' % (length,kind)
+            elif length:
+                s += '(LEN=%s)' % (length)
+            elif kind:
+                s += '(KIND=%s)' % (kind)
+        else:
+            if isinstance(self, Type):
+                s += '(%s)' % (kind)
+            else:
+                if length:
+                    s += '*%s' % (length)
+                if kind:
+                    s += '(KIND=%s)' % (kind)
+                
+        return clsname + s
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        s = self.tostr()
+        if self.attrspec:
+            s += ', ' + ', '.join(self.attrspec)
+            if self.entity_decls:
+                s += ' ::'
+        if self.entity_decls:
+            s += ' ' + ', '.join(self.entity_decls)
+        return tab + s
+
+    def __eq__(self, other):
+        if self.__class__ is not other.__class__:
+            return False
+        return self.selector==other.selector
+
+    def astypedecl(self):
+        if self.entity_decls or self.attrspec:
+            return self.__class__(self.parent, self.item.copy(self.tostr()))
+        return self
+
+    def analyze(self):
+        if not self.entity_decls:
+            return
+        variables = self.parent.a.variables
+        typedecl = self.astypedecl()
+        for item in self.entity_decls:
+            name, array_spec, char_length, value = self._parse_entity(item)
+            var = self.parent.get_variable(name)
+            var.add_parent(self)
+            if char_length:
+                var.set_length(char_length)
+            else:
+                var.set_type(typedecl)
+            var.update(self.attrspec)
+            if array_spec:
+                var.set_bounds(array_spec)
+            if value:
+                var.set_init(value)
+            var.analyze()
+        return
+
+    def _parse_entity(self, line):
+        m = name_re(line)
+        assert m,`line,self.item,self.__class__.__name__`
+        name = line[:m.end()]
+        line = line[m.end():].lstrip()
+        array_spec = None
+        item = self.item.copy(line)
+        line = item.get_line()
+        if line.startswith('('):
+            i = line.find(')')
+            assert i!=-1,`line`
+            array_spec = split_comma(line[1:i].strip(), item)
+            line = line[i+1:].lstrip()
+        char_length = None
+        if line.startswith('*'):
+            i = line.find('=')
+            if i==-1:
+                char_length = item.apply_map(line[1:].lstrip())
+                line = ''
+            else:
+                char_length = item.apply_map(line[1:i].strip())
+                line = line[i:]
+        value = None
+        if line.startswith('='):
+            value = item.apply_map(line[1:].lstrip())
+        return name, array_spec, char_length, value
+
+    def get_zero_value(self):
+        raise NotImplementedError,`self.__class__.__name__`
+
+    def assign_expression(self, name, value):
+        return '%s = %s' % (name, value)
+
+    def get_kind(self):
+        return self.selector[1] or self.default_kind
+
+    def get_length(self):
+        return self.selector[0] or 1
+
+    def get_bit_size(self):
+        return CHAR_BIT * int(self.get_kind())
+
+    def get_byte_size(self):
+        return self.get_bit_size() / CHAR_BIT
+
+    def is_intrinsic(self): return not isinstance(self,(Type,Class))
+    def is_derived(self): return isinstance(self,Type)
+
+    def is_numeric(self): return isinstance(self,(Integer,Real, DoublePrecision,Complex,DoubleComplex,Byte))
+    def is_nonnumeric(self): return isinstance(self,(Character,Logical))
+
+
+class Integer(TypeDeclarationStatement):
+    match = re.compile(r'integer\b',re.I).match
+    default_kind = 4
+
+    def get_c_type(self):
+        return 'npy_int%s' % (self.get_bit_size())
+
+    def get_zero_value(self):
+        kind = self.get_kind()
+        if kind==self.default_kind: return '0'
+        return '0_%s' % (kind)
+
+class Real(TypeDeclarationStatement):
+    match = re.compile(r'real\b',re.I).match
+    default_kind = 4
+
+    def get_c_type(self):
+        return 'npy_float%s' % (self.get_bit_size())
+
+    def get_zero_value(self):
+        kind = self.get_kind()
+        if kind==self.default_kind: return '0.0'
+        return '0_%s' % (kind)
+
+class DoublePrecision(TypeDeclarationStatement):
+    match = re.compile(r'double\s*precision\b',re.I).match
+    default_kind = 8
+    
+    def get_zero_value(self):
+        return '0.0D0'
+
+    def get_c_type(self):
+        return 'npy_float%s' % (self.get_bit_size())
+
+class Complex(TypeDeclarationStatement):
+    match = re.compile(r'complex\b',re.I).match
+    default_kind = 4
+
+    def get_kind(self):
+        length, kind = self.selector
+        if kind:
+            return kind
+        if length:
+            return int(length)/2
+        return self.default_kind
+
+    def get_length(self):
+        return 2 * int(self.get_kind())
+
+    def get_bit_size(self):
+        return CHAR_BIT * self.get_length()
+
+    def get_zero_value(self):
+        kind = self.get_kind()
+        if kind==self.default_kind: return '(0.0, 0.0)'
+        return '(0.0_%s, 0.0_%s)' % (kind, kind)
+
+    def get_c_type(self):
+        return 'npy_complex%s' % (self.get_bit_size())
+
+class DoubleComplex(TypeDeclarationStatement):
+    # not in standard
+    match = re.compile(r'double\s*complex\b',re.I).match
+    default_kind = 8
+
+    def get_kind(self): return self.default_kind
+    def get_length(self): return 2 * self.get_kind()
+    def get_bit_size(self):
+        return CHAR_BIT * self.get_length()
+
+    def get_zero_value(self):
+        return '(0.0D0,0.0D0)'
+
+    def get_c_type(self):
+        return 'npy_complex%s' % (self.get_bit_size())
+
+class Logical(TypeDeclarationStatement):
+    match = re.compile(r'logical\b',re.I).match
+    default_kind = 4
+
+    def get_zero_value(self):
+        return ".FALSE."
+
+    def get_c_type(self):
+        return 'npy_int%s' % (self.get_bit_size())
+
+class Character(TypeDeclarationStatement):
+    match = re.compile(r'character\b',re.I).match
+    default_kind = 1
+
+    def get_bit_size(self):
+        return CHAR_BIT * int(self.get_length()) * int(self.get_kind())
+
+    def get_c_type(self):
+        return 'f2py_string%s' % (self.get_bit_size())
+
+    def get_zero_value(self):
+        return "''"
+
+class Byte(TypeDeclarationStatement):
+    # not in standard
+    match = re.compile(r'byte\b',re.I).match
+    default_kind = 1
+
+    def get_zero_value(self):
+        return '0'
+
+    def get_c_type(self):
+        return 'npy_int%s' % (self.get_bit_size())
+
+class Type(TypeDeclarationStatement):
+    match = re.compile(r'type\s*\(', re.I).match
+
+    def get_zero_value(self):
+        type_decl = self.get_type_decl(self.name)
+        component_names = type_decl.a.component_names
+        components = type_decl.a.components
+        l = []
+        for name in component_names:
+            var = components[name]
+            l.append(var.typedecl.get_zero_value())
+        return '%s(%s)' % (type_decl.name, ', '.join(l))
+
+    def get_kind(self):
+        # See 4.5.2, page 48
+        raise NotImplementedError,`self.__class__.__name__`
+
+    def get_bit_size(self):
+        return self.get_type_decl(self.name).get_bit_size()
+
+    def get_c_type(self):
+        return self.get_type_decl(self.name).get_c_type()
+    
+TypeStmt = Type
+
+class Class(TypeDeclarationStatement):
+    match = re.compile(r'class\s*\(', re.I).match
+
+class Implicit(Statement):
+    """
+    IMPLICIT <implicit-spec-list>
+    IMPLICIT NONE
+    <implicit-spec> = <declaration-type-spec> ( <letter-spec-list> )
+    <letter-spec> = <letter> [ - <letter> ]
+    """
+    match = re.compile(r'implicit\b',re.I).match
+
+    letters = string.lowercase
+
+    def process_item(self):
+        line = self.item.get_line()[8:].lstrip()
+        if line.lower()=='none':
+            self.items = []
+            return
+        items = []
+        for item in split_comma(line, self.item):
+            i = item.find('(')
+            assert i!=-1 and item.endswith(')'),`item`
+            specs = []
+            for spec in split_comma(item[i+1:-1].strip(), self.item):
+                if '-' in spec:
+                    s,e = spec.lower().split('-')
+                    assert s in self.letters and e in self.letters
+                else:
+                    e = s = spec.lower()
+                    assert s in self.letters
+                specs.append((s,e))
+            self.specs = specs
+            tspec = item[:i].rstrip()
+            stmt = None
+            for cls in declaration_type_spec:
+                if cls.match(tspec):
+                    stmt = cls(self, self.item.copy(tspec))
+                    if stmt.isvalid:
+                        break
+            assert stmt is not None,`item,line`
+            items.append((stmt,specs))
+        self.items = items
+        return
+
+    def __str__(self):
+        tab = self.get_indent_tab()
+        if not self.items:
+            return tab + 'IMPLICIT NONE'
+        l = []
+        for stmt,specs in self.items:
+            l1 = []
+            for s,e in specs:
+                if s==e:
+                    l1.append(s)
+                else:
+                    l1.append(s + '-' + e)
+            l.append('%s ( %s )' % (stmt.tostr(), ', '.join(l1)))
+        return tab + 'IMPLICIT ' + ', '.join(l)
+
+    def analyze(self):
+        implicit_rules = self.parent.a.implicit_rules
+        if not self.items:
+            if implicit_rules:
+                self.warning('overriding previously set implicit rule mapping'\
+                      ' %r.' % (implicit_rules))
+            self.parent.a.implicit_rules = None
+            return
+        if implicit_rules is None:
+            self.warning('overriding previously set IMPLICIT NONE')
+            self.parent.a.implicit_rules = implicit_rules = {}
+        for stmt,specs in self.items:
+            s,e = specs
+            for l in string.lowercase[string.lowercase.index(s.lower()):\
+                                      string.lowercase.index(e.lower())+1]:
+                implicit_rules[l] = stmt
+        return
+
+intrinsic_type_spec = [ \
+    Integer , Real,
+    DoublePrecision, Complex, DoubleComplex, Character, Logical, Byte
+    ]
+declaration_type_spec = intrinsic_type_spec + [ TypeStmt, Class ]

Copied: trunk/numpy/f2py/lib/parser/utils.py (from rev 3235, trunk/numpy/f2py/lib/utils.py)
===================================================================
--- trunk/numpy/f2py/lib/utils.py	2006-09-29 18:02:25 UTC (rev 3235)
+++ trunk/numpy/f2py/lib/parser/utils.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -0,0 +1,171 @@
+"""
+Various utility functions.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: May 2006
+-----
+"""
+
+__all__ = ['split_comma', 'specs_split_comma',
+           'ParseError','AnalyzeError',
+           'get_module_file','parse_bind','parse_result','is_name',
+           'CHAR_BIT','str2stmt']
+
+import re
+import os, glob
+
+class ParseError(Exception):
+    pass
+
+class AnalyzeError(Exception):
+    pass
+
+is_name = re.compile(r'^[a-z_]\w*$',re.I).match
+name_re = re.compile(r'[a-z_]\w*',re.I).match
+is_entity_decl = re.compile(r'^[a-z_]\w*',re.I).match
+is_int_literal_constant = re.compile(r'^\d+(_\w+|)$').match
+
+def split_comma(line, item = None, comma=','):
+    items = []
+    if item is None:
+        for s in line.split(comma):
+            s = s.strip()
+            if not s: continue
+            items.append(s)
+        return items
+    newitem = item.copy(line, True)
+    apply_map = newitem.apply_map
+    for s in newitem.get_line().split(comma):
+        s = apply_map(s).strip()
+        if not s: continue
+        items.append(s)
+    return items
+
+def specs_split_comma(line, item = None, upper=False):
+    specs0 = split_comma(line, item)
+    specs = []
+    for spec in specs0:
+        i = spec.find('=')
+        if i!=-1:
+            kw = spec[:i].strip().upper()
+            v  = spec[i+1:].strip()
+            specs.append('%s = %s' % (kw, v))
+        else:
+            if upper:
+                spec = spec.upper()
+            specs.append(spec)
+    return specs
+
+def parse_bind(line, item = None):
+    if not line.lower().startswith('bind'):
+        return None, line
+    if item is not None:
+        newitem = item.copy(line, apply_map=True)
+        newline = newitem.get_line()
+    else:
+        newitem = None
+    newline = newline[4:].lstrip()
+    i = newline.find(')')
+    assert i!=-1,`newline`
+    args = []
+    for a in specs_split_comma(newline[1:i].strip(), newitem, upper=True):
+        args.append(a)
+    rest = newline[i+1:].lstrip()
+    if item is not None:
+        rest = newitem.apply_map(rest)
+    return args, rest
+
+def parse_result(line, item = None):
+    if not line.lower().startswith('result'):
+        return None, line
+    line = line[6:].lstrip()
+    i = line.find(')')
+    assert i != -1,`line`
+    name = line[1:i].strip()
+    assert is_name(name),`name`
+    return name, line[i+1:].lstrip()
+
+def filter_stmts(content, classes):
+    """ Pop and return classes instances from content.
+    """
+    stmts = []
+    indices = []
+    for i in range(len(content)):
+        stmt = content[i]
+        if isinstance(stmt, classes):
+            stmts.append(stmt)
+            indices.append(i)
+    indices.reverse()
+    for i in indices:
+        del content[i]
+    return stmts
+
+
+def get_module_files(directory, _cache={}):
+    if _cache.has_key(directory):
+        return _cache[directory]
+    module_line = re.compile(r'(\A|^)module\s+(?P<name>\w+)\s*(!.*|)$',re.I | re.M)
+    d = {}
+    for fn in glob.glob(os.path.join(directory,'*.f90')):
+        f = open(fn,'r')
+        for name in module_line.findall(f.read()):
+            name = name[1]
+            if d.has_key(name):
+                print d[name],'already defines',name
+                continue
+            d[name] = fn
+    _cache[directory] = d
+    return d
+
+def get_module_file(name, directory, _cache={}):
+    fn = _cache.get(name, None)
+    if fn is not None:
+        return fn
+    if name.endswith('_module'):
+        f1 = os.path.join(directory,name[:-7]+'.f90')
+        if os.path.isfile(f1):
+            _cache[name] = fn
+            return f1
+    pattern = re.compile(r'\s*module\s+(?P<name>[a-z]\w*)', re.I).match
+    for fn in glob.glob(os.path.join(directory,'*.f90')):
+        f = open(fn,'r')
+        for line in f:
+            m = pattern(line)
+            if m and m.group('name')==name:
+                _cache[name] = fn
+                f.close()
+                return fn
+        f.close()
+    return
+
+def str2stmt(string, isfree=True, isstrict=False):
+    """ Convert Fortran code to Statement tree.
+    """
+    from readfortran import Line, FortranStringReader
+    from parsefortran import FortranParser
+    reader = FortranStringReader(string, isfree, isstrict)
+    parser = FortranParser(reader)
+    parser.parse()
+    parser.analyze()
+    block = parser.block
+    while len(block.content)==1:
+        block = block.content[0]
+    return block
+
+def get_char_bit():
+    import numpy
+    one = numpy.ubyte(1)
+    two = numpy.ubyte(2)
+    n = numpy.ubyte(2)
+    i = 1
+    while n>=two:
+        n <<= one
+        i += 1
+    return i
+
+CHAR_BIT = get_char_bit()

Modified: trunk/numpy/f2py/lib/python_wrapper.py
===================================================================
--- trunk/numpy/f2py/lib/python_wrapper.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/python_wrapper.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -5,9 +5,11 @@
 import os
 import sys
 
-from block_statements import *
+from parser.api import *
+
+#from block_statements import *
 #from typedecl_statements import intrinsic_type_spec, Character
-from utils import CHAR_BIT
+#from utils import CHAR_BIT
 
 from wrapper_base import *
 
@@ -596,9 +598,9 @@
 
 
 if __name__ == '__main__':
-    from utils import str2stmt, get_char_bit
-
-    stmt = str2stmt("""
+    #from utils import str2stmt, get_char_bit
+    
+    stmt = parse("""
     module rat
       integer :: i
       type info
@@ -641,7 +643,7 @@
 """
 
     wm = PythonWrapperModule('foo')
-    wm.add(str2stmt(foo_code))
+    wm.add(parse(foo_code))
     #wm.add_fortran_code(foo_code)
     #wm.add_subroutine(str2stmt(foo_code))
     #print wm.c_code()

Deleted: trunk/numpy/f2py/lib/readfortran.py
===================================================================
--- trunk/numpy/f2py/lib/readfortran.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/readfortran.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,824 +0,0 @@
-#!/usr/bin/env python
-"""
-Defines FortranReader classes for reading Fortran codes from
-files and strings. FortranReader handles comments and line continuations
-of both fix and free format Fortran codes.
-
-Permission to use, modify, and distribute this software is given under the
-terms of the NumPy License. See http://scipy.org.
-
-NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
-Author: Pearu Peterson <pearu at cens.ioc.ee>
-Created: May 2006
-"""
-
-__all__ = ['FortranFileReader',
-           'FortranStringReader',
-           'FortranReaderError',
-           'Line', 'SyntaxErrorLine',
-           'Comment',
-           'MultiLine','SyntaxErrorMultiLine',
-           ]
-
-import re
-import os
-import sys
-import tempfile
-import traceback
-from cStringIO import StringIO
-from numpy.distutils.misc_util import yellow_text, red_text, blue_text
-
-from sourceinfo import get_source_info
-from splitline import String, string_replace_map, splitquote
-
-_spacedigits=' 0123456789'
-_cf2py_re = re.compile(r'(?P<indent>\s*)!f2py(?P<rest>.*)',re.I)
-_is_fix_cont = lambda line: line and len(line)>5 and line[5]!=' ' and line[:5]==5*' '
-_is_f90_cont = lambda line: line and '&' in line and line.rstrip()[-1]=='&'
-_f90label_re = re.compile(r'\s*(?P<label>(\w+\s*:|\d+))\s*(\b|(?=&)|\Z)',re.I)
-_is_include_line = re.compile(r'\s*include\s*("[^"]+"|\'[^\']+\')\s*\Z',re.I).match
-_is_fix_comment = lambda line: line and line[0] in '*cC!'
-_hollerith_start_search = re.compile(r'(?P<pre>\A|,\s*)(?P<num>\d+)h',re.I).search
-_is_call_stmt = re.compile(r'call\b', re.I).match
-
-class FortranReaderError: # TODO: may be derive it from Exception
-    def __init__(self, message):
-        self.message = message
-        print >> sys.stderr,message
-        sys.stderr.flush()
-
-class Line:
-    """ Holds a Fortran source line.
-    """
-    
-    f2py_strmap_findall = re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall
-    
-    def __init__(self, line, linenospan, label, reader):
-        self.line = line.strip()
-        self.span = linenospan
-        self.label = label
-        self.reader = reader
-        self.strline = None
-        self.is_f2py_directive = linenospan[0] in reader.f2py_comment_lines
-
-    def has_map(self):
-        return not not (hasattr(self,'strlinemap') and self.strlinemap)
-
-    def apply_map(self, line):
-        if not hasattr(self,'strlinemap') or not self.strlinemap:
-            return line
-        findall = self.f2py_strmap_findall
-        str_map = self.strlinemap
-        keys = findall(line)
-        for k in keys:
-            line = line.replace(k, str_map[k])
-        return line
-
-    def copy(self, line = None, apply_map = False):
-        if line is None:
-            line = self.line
-        if apply_map:
-            line = self.apply_map(line)
-        return Line(line, self.span, self.label, self.reader)
-
-    def clone(self, line):
-        self.line = self.apply_map(line)
-        self.strline = None
-        return
-    
-    def __repr__(self):
-        return self.__class__.__name__+'(%r,%s,%r)' \
-               % (self.line, self.span, self.label)
-
-    def isempty(self, ignore_comments=False):
-        return not (self.line.strip() or self.label)
-
-    def get_line(self):
-        if self.strline is not None:
-            return self.strline
-        line = self.line
-        if self.reader.isfix77:
-            # Handle Hollerith constants by replacing them
-            # with char-literal-constants.
-            # H constants may appear only in DATA statements and
-            # in the argument list of CALL statement.
-            # Holleriht constants were removed from the Fortran 77 standard.
-            # The following handling is not perfect but works for simple
-            # usage cases.
-            # todo: Handle hollerith constants in DATA statement
-            if _is_call_stmt(line):
-                l2 = self.line[4:].lstrip()
-                i = l2.find('(')
-                if i != -1 and l2[-1]==')':
-                    substrings = ['call '+l2[:i+1]]
-                    start_search = _hollerith_start_search
-                    l2 = l2[i+1:-1].strip()
-                    m = start_search(l2)
-                    while m:
-                        substrings.append(l2[:m.start()])
-                        substrings.append(m.group('pre'))
-                        num = int(m.group('num'))
-                        substrings.append("'"+l2[m.end():m.end()+num]+"'")
-                        l2 = l2[m.end()+num:]
-                        m = start_search(l2)
-                    substrings.append(l2)
-                    substrings.append(')')
-                    line = ''.join(substrings)
-
-        line, str_map = string_replace_map(line, lower=not self.reader.ispyf)
-        self.strline = line
-        self.strlinemap = str_map
-        return line
-
-class SyntaxErrorLine(Line, FortranReaderError):
-    def __init__(self, line, linenospan, label, reader, message):
-        Line.__init__(self, line, linenospan, label, reader)
-        FortranReaderError.__init__(self, message)
-
-class Comment:
-    """ Holds Fortran comment.
-    """
-    def __init__(self, comment, linenospan, reader):
-        self.comment = comment
-        self.span = linenospan
-        self.reader = reader
-    def __repr__(self):
-        return self.__class__.__name__+'(%r,%s)' \
-               % (self.comment, self.span)
-    def isempty(self, ignore_comments=False):
-        return ignore_comments or len(self.comment)<2
-
-class MultiLine:
-    """ Holds (prefix, line list, suffix) representing multiline
-    syntax in .pyf files:
-      prefix+'''+lines+'''+suffix.
-    """
-    def __init__(self, prefix, block, suffix, linenospan, reader):
-        self.prefix = prefix
-        self.block  = block
-        self.suffix = suffix
-        self.span = linenospan
-        self.reader = reader
-    def __repr__(self):
-        return self.__class__.__name__+'(%r,%r,%r,%s)' \
-               % (self.prefix,self.block,self.suffix,
-                  self.span)
-    def isempty(self, ignore_comments=False):
-        return not (self.prefix or self.block or self.suffix)
-
-class SyntaxErrorMultiLine(MultiLine, FortranReaderError):
-    def __init__(self, prefix, block, suffix, linenospan, reader, message):
-        MultiLine.__init__(self, prefix, block, suffix, linenospan, reader)
-        FortranReaderError.__init__(self, message)
-
-
-class FortranReaderBase:
-
-    def __init__(self, source, isfree, isstrict):
-        """
-        source - file-like object with .next() method
-                 used to retrive a line.
-        source may contain
-          - Fortran 77 code
-          - fixed format Fortran 90 code          
-          - free format Fortran 90 code
-          - .pyf signatures - extended free format Fortran 90 syntax
-        """
-
-        self.linecount = 0
-        self.source = source
-        self.isclosed = False
-
-        self.filo_line = []
-        self.fifo_item = []
-        self.source_lines = []
-
-        self.f2py_comment_lines = [] # line numbers that contain f2py directives
-
-        self.reader = None
-        self.include_dirs = ['.']
-
-        self.set_mode(isfree, isstrict)
-        return
-
-    def set_mode(self, isfree, isstrict):
-        self.isfree90 = isfree and not isstrict
-        self.isfix90 = not isfree and not isstrict
-        self.isfix77 = not isfree and isstrict
-        self.ispyf   = isfree and isstrict
-        self.isfree  = isfree
-        self.isfix   = not isfree
-        self.isstrict = isstrict
-
-        if self.isfree90: mode = 'free90'
-        elif self.isfix90: mode = 'fix90'
-        elif self.isfix77: mode = 'fix77'
-        else: mode = 'pyf'
-        self.mode = mode
-        self.name = '%s mode=%s' % (self.source, mode)
-        return
-
-    def close_source(self):
-        # called when self.source.next() raises StopIteration.
-        pass
-
-    # For handling raw source lines:
-
-    def put_single_line(self, line):
-        self.filo_line.append(line)
-        self.linecount -= 1
-        return
-
-    def get_single_line(self):
-        try:
-            line = self.filo_line.pop()
-            self.linecount += 1
-            return line
-        except IndexError:
-            pass
-        if self.isclosed:
-            return None
-        try:
-            line = self.source.next()
-        except StopIteration:
-            self.isclosed = True
-            self.close_source()
-            return None
-        self.linecount += 1
-        # expand tabs, replace special symbols, get rid of nl characters
-        line = line.expandtabs().replace('\xa0',' ').rstrip()
-        self.source_lines.append(line)
-        if not line:
-            return self.get_single_line()
-        return line
-
-    def get_next_line(self):
-        line = self.get_single_line()
-        if line is None: return
-        self.put_single_line(line)
-        return line
-
-    # Iterator methods:
-
-    def __iter__(self):
-        return self
-
-    def next(self, ignore_comments = False):
-            
-        try:
-            if self.reader is not None:
-                try:
-                    return self.reader.next()
-                except StopIteration:
-                    self.reader = None
-            item = self._next(ignore_comments)
-            if isinstance(item, Line) and _is_include_line(item.line):
-                reader = item.reader
-                filename = item.line.strip()[7:].lstrip()[1:-1]
-                include_dirs = self.include_dirs[:]
-                path = filename
-                for incl_dir in include_dirs:
-                    path = os.path.join(incl_dir, filename)
-                    if os.path.exists(path):
-                        break
-                if not os.path.isfile(path):
-                    dirs = os.pathsep.join(include_dirs)
-                    message = reader.format_message(\
-                        'WARNING',
-                        'include file %r not found in %r,'\
-                        ' ignoring.' % (filename, dirs),
-                        item.span[0], item.span[1])
-                    reader.show_message(message, sys.stdout)
-                    return self.next(ignore_comments = ignore_comments)
-                message = reader.format_message('INFORMATION',
-                                              'found file %r' % (path),
-                                              item.span[0], item.span[1])
-                reader.show_message(message, sys.stdout)
-                self.reader = FortranFileReader(path, include_dirs = include_dirs)
-                return self.reader.next(ignore_comments = ignore_comments)
-            return item
-        except StopIteration:
-            raise
-        except:
-            message = self.format_message('FATAL ERROR',
-                                          'while processing line',
-                                          self.linecount, self.linecount)
-            self.show_message(message, sys.stdout)
-            traceback.print_exc(file=sys.stdout)
-            self.show_message(red_text('STOPPED READING'), sys.stdout)
-            raise StopIteration
-
-    def _next(self, ignore_comments = False):
-        fifo_item_pop = self.fifo_item.pop
-        while 1:
-            try:
-                item = fifo_item_pop(0)
-            except IndexError:
-                item = self.get_source_item()
-                if item is None:
-                    raise StopIteration
-            if not item.isempty(ignore_comments):
-                break
-            # else ignore empty lines and comments
-        if not isinstance(item, Comment):
-            if not self.ispyf and isinstance(item, Line) \
-                   and not item.is_f2py_directive \
-                   and ';' in item.get_line():
-                # ;-separator not recognized in pyf-mode
-                items = []
-                for line in item.get_line().split(';'):
-                    line = line.strip()
-                    items.append(item.copy(line, apply_map=True))
-                items.reverse()
-                for newitem in items:
-                    self.fifo_item.insert(0, newitem)
-                return fifo_item_pop(0)
-            return item
-        # collect subsequent comments to one comment instance
-        comments = []
-        start = item.span[0]
-        while isinstance(item, Comment):
-            comments.append(item.comment)
-            end = item.span[1]
-            while 1:
-                try:
-                    item = fifo_item_pop(0)
-                except IndexError:
-                    item = self.get_source_item()
-                if item is None or not item.isempty(ignore_comments):
-                    break
-            if item is None:
-                break # hold raising StopIteration for the next call.
-        if item is not None:
-            self.fifo_item.insert(0,item)
-        return self.comment_item('\n'.join(comments), start, end)
-
-    # Interface to returned items:
-
-    def line_item(self, line, startlineno, endlineno, label, errmessage=None):
-        if errmessage is None:
-            return  Line(line, (startlineno, endlineno), label, self)
-        return SyntaxErrorLine(line, (startlineno, endlineno),
-                               label, self, errmessage)
-
-    def multiline_item(self, prefix, lines, suffix,
-                       startlineno, endlineno, errmessage=None):
-        if errmessage is None:
-            return MultiLine(prefix, lines, suffix, (startlineno, endlineno), self)
-        return SyntaxErrorMultiLine(prefix, lines, suffix,
-                                    (startlineno, endlineno), self, errmessage)
-
-    def comment_item(self, comment, startlineno, endlineno):
-        return Comment(comment, (startlineno, endlineno), self)
-
-    # For handling messages:
-
-    def show_message(self, message, stream = sys.stdout):
-        stream.write(message+'\n')
-        stream.flush()
-
-    def format_message(self, kind, message, startlineno, endlineno,
-                       startcolno=0, endcolno=-1):
-        back_index = {'warning':2,'error':3,'info':0}.get(kind.lower(),3)
-        r = ['%s while processing %r (mode=%r)..' % (kind, self.id, self.mode)]
-        for i in range(max(1,startlineno-back_index),startlineno):
-            r.append('%5d:%s' % (i,self.source_lines[i-1]))
-        for i in range(startlineno,min(endlineno+back_index,len(self.source_lines))+1):
-            if i==0 and not self.source_lines:
-                break
-            linenostr = '%5d:' % (i)
-            if i==endlineno:
-                sourceline = self.source_lines[i-1] 
-                l0 = linenostr+sourceline[:startcolno]
-                if endcolno==-1:
-                    l1 = sourceline[startcolno:]
-                    l2 = ''
-                else:
-                    l1 = sourceline[startcolno:endcolno]
-                    l2 = sourceline[endcolno:]
-                r.append('%s%s%s <== %s' % (l0,yellow_text(l1),l2,red_text(message)))
-            else:
-                r.append(linenostr+ self.source_lines[i-1])
-        return '\n'.join(r)
-    
-    def format_error_message(self, message, startlineno, endlineno,
-                             startcolno=0, endcolno=-1):
-        return self.format_message('ERROR',message, startlineno,
-                                   endlineno, startcolno, endcolno)
-
-    def format_warning_message(self, message, startlineno, endlineno,
-                               startcolno=0, endcolno=-1):
-        return self.format_message('WARNING',message, startlineno,
-                                   endlineno, startcolno, endcolno)
-
-    # Auxiliary methods for processing raw source lines:
-
-    def handle_cf2py_start(self, line):
-        """
-        f2py directives can be used only in Fortran codes.
-        They are ignored when used inside .pyf files.
-        """
-        if not line or self.ispyf: return line
-        if self.isfix:
-            if line[0] in '*cC!#':
-                if line[1:5].lower() == 'f2py':
-                    line = 5*' ' + line[5:]
-                    self.f2py_comment_lines.append(self.linecount)
-            if self.isfix77:
-                return line
-        m = _cf2py_re.match(line)
-        if m:
-            newline = m.group('indent')+5*' '+m.group('rest')
-            self.f2py_comment_lines.append(self.linecount)
-            assert len(newline)==len(line),`newlinel,line`
-            return newline
-        return line
-
-    def handle_inline_comment(self, line, lineno, quotechar=None):
-        if quotechar is None and '!' not in line and \
-           '"' not in line and "'" not in line:
-            return line, quotechar
-        i = line.find('!')
-        put_item = self.fifo_item.append
-        if quotechar is None and i!=-1:
-            # first try a quick method
-            newline = line[:i]
-            if '"' not in newline and '\'' not in newline:
-                if self.isfix77 or not line[i:].startswith('!f2py'):
-                    put_item(self.comment_item(line[i:], lineno, lineno))
-                    return newline, quotechar
-        # handle cases where comment char may be a part of a character content
-        #splitter = LineSplitter(line, quotechar)
-        #items = [item for item in splitter]
-        #newquotechar = splitter.quotechar
-        items, newquotechar = splitquote(line, quotechar)
-
-        noncomment_items = []
-        noncomment_items_append = noncomment_items.append
-        n = len(items)
-        commentline = None
-        for k in range(n):
-            item = items[k]
-            if isinstance(item, String) or '!' not in item:
-                noncomment_items_append(item)
-                continue
-            j = item.find('!')
-            noncomment_items_append(item[:j])
-            items[k] = item[j:]
-            commentline = ''.join(items[k:])
-            break
-        if commentline is not None:
-            if commentline.startswith('!f2py'):
-                # go to next iteration:
-                newline = ''.join(noncomment_items) + commentline[5:]
-                self.f2py_comment_lines.append(lineno)
-                return self.handle_inline_comment(newline, lineno, quotechar)
-            put_item(self.comment_item(commentline, lineno, lineno))
-        return ''.join(noncomment_items), newquotechar
-
-    def handle_multilines(self, line, startlineno, mlstr):
-        i = line.find(mlstr)
-        if i != -1:
-            prefix = line[:i]
-            # skip fake multiline starts
-            p,k = prefix,0
-            while p.endswith('\\'):
-                p,k = p[:-1],k+1
-            if k % 2: return
-        if i != -1 and '!' not in prefix:
-            # Note character constans like 'abc"""123',
-            # so multiline prefix should better not contain `'' or `"' not `!'.
-            for quote in '"\'':
-                if prefix.count(quote) % 2:
-                    message = self.format_warning_message(\
-                            'multiline prefix contains odd number of %r characters' \
-                            % (quote), startlineno, startlineno,
-                            0, len(prefix))
-                    self.show_message(message, sys.stderr)
-
-            suffix = None
-            multilines = []
-            line = line[i+3:]
-            while line is not None:
-                j = line.find(mlstr)
-                if j != -1 and '!' not in line[:j]:
-                    multilines.append(line[:j])
-                    suffix = line[j+3:]
-                    break
-                multilines.append(line)
-                line = self.get_single_line()
-            if line is None:
-                message = self.format_error_message(\
-                            'multiline block never ends', startlineno,
-                            startlineno, i)
-                return self.multiline_item(\
-                            prefix,multilines,suffix,\
-                            startlineno, self.linecount, message)
-            suffix,qc = self.handle_inline_comment(suffix, self.linecount)
-            # no line continuation allowed in multiline suffix
-            if qc is not None:
-                message = self.format_message(\
-                            'ASSERTION FAILURE(pyf)',
-                        'following character continuation: %r, expected None.' % (qc),
-                            startlineno, self.linecount)
-                self.show_message(message, sys.stderr)
-            # XXX: should we do line.replace('\\'+mlstr[0],mlstr[0])
-            #      for line in multilines?
-            return self.multiline_item(prefix,multilines,suffix,
-                                       startlineno, self.linecount)        
-
-    # The main method of interpreting raw source lines within
-    # the following contexts: f77, fixed f90, free f90, pyf.
-
-    def get_source_item(self):
-        """
-        a source item is ..
-        - a fortran line
-        - a list of continued fortran lines
-        - a multiline - lines inside triple-qoutes, only when in ispyf mode        
-        """
-        get_single_line = self.get_single_line
-        line = get_single_line()
-        if line is None: return
-        startlineno = self.linecount
-        line = self.handle_cf2py_start(line)
-        is_f2py_directive = startlineno in self.f2py_comment_lines
-
-        label = None
-        if self.ispyf:
-            # handle multilines
-            for mlstr in ['"""',"'''"]:
-                r = self.handle_multilines(line, startlineno, mlstr)
-                if r: return r
-
-        if self.isfix:
-            label = line[:5].strip().lower()
-            if label.endswith(':'): label = label[:-1].strip()
-            if not line.strip():
-                # empty line
-                return self.line_item(line[6:],startlineno,self.linecount,label)
-            if _is_fix_comment(line):
-                return self.comment_item(line, startlineno, startlineno)
-            for i in range(5):
-                if line[i] not in _spacedigits:
-                    message =  'non-space/digit char %r found in column %i'\
-                              ' of fixed Fortran code' % (line[i],i+1)
-                    if self.isfix90:
-                        message = message + ', switching to free format mode'
-                        message = self.format_warning_message(\
-                            message,startlineno, self.linecount)
-                        self.show_message(message, sys.stderr)
-                        self.set_mode(True, False)
-                    else:
-                        return self.line_item(line[6:], startlineno, self.linecount,
-                                           label, self.format_error_message(\
-                            message, startlineno, self.linecount))
-
-        if self.isfix77 and not is_f2py_directive:
-            lines = [line[6:72]]
-            while _is_fix_cont(self.get_next_line()):
-                # handle fix format line continuations for F77 code
-                line = get_single_line()
-                lines.append(line[6:72])
-            return self.line_item(''.join(lines),startlineno,self.linecount,label)
-
-        handle_inline_comment = self.handle_inline_comment
-        
-        if self.isfix90 and not is_f2py_directive:
-            # handle inline comment
-            newline,qc = handle_inline_comment(line[6:], startlineno)
-            lines = [newline]
-            next_line = self.get_next_line()
-            while _is_fix_cont(next_line) or _is_fix_comment(next_line):
-                # handle fix format line continuations for F90 code.
-                # mixing fix format and f90 line continuations is not allowed
-                # nor detected, just eject warnings.
-                line2 = get_single_line()
-                if _is_fix_comment(line2):
-                    # handle fix format comments inside line continuations
-                    citem = self.comment_item(line2,self.linecount,self.linecount)
-                    self.fifo_item.append(citem)
-                else:
-                    newline, qc = self.handle_inline_comment(line2[6:],
-                                                             self.linecount, qc)
-                    lines.append(newline)
-                next_line = self.get_next_line()
-            # no character continuation should follows now
-            if qc is not None:
-                message = self.format_message(\
-                            'ASSERTION FAILURE(fix90)',
-                            'following character continuation: %r, expected None.'\
-                            % (qc), startlineno, self.linecount)
-                self.show_message(message, sys.stderr)
-            if len(lines)>1:
-                for i in range(len(lines)):
-                    l = lines[i]
-                    if l.rstrip().endswith('&'):
-                        message = self.format_warning_message(\
-                        'f90 line continuation character `&\' detected'\
-                        ' in fix format code',
-                        startlineno + i, startlineno + i, l.rfind('&')+5)
-                        self.show_message(message, sys.stderr)
-                return self.line_item(''.join(lines),startlineno,
-                                      self.linecount,label)
-        start_index = 0
-        if self.isfix90:
-            start_index = 6
-
-        lines = []
-        lines_append = lines.append
-        put_item = self.fifo_item.append
-        qc = None
-        while line is not None:
-            if start_index: # fix format code
-                line,qc = handle_inline_comment(line[start_index:],
-                                                self.linecount,qc)
-                is_f2py_directive = self.linecount in self.f2py_comment_lines
-            else:
-                line_lstrip = line.lstrip()
-                if lines:
-                    if line_lstrip.startswith('!'):
-                        # check for comment line within line continuation
-                        put_item(self.comment_item(line_lstrip,
-                                                   self.linecount, self.linecount))
-                        line = get_single_line()
-                        continue
-                else:
-                    # first line, check for a f90 label
-                    m = _f90label_re.match(line)
-                    if m:
-                        assert not label,`label,m.group('label')`
-                        label = m.group('label').strip()
-                        if label.endswith(':'): label = label[:-1].strip()
-                        if not self.ispyf: label = label.lower()
-                        line = line[m.end():]
-                line,qc = handle_inline_comment(line, self.linecount, qc)
-                is_f2py_directive = self.linecount in self.f2py_comment_lines
-
-            i = line.rfind('&')
-            if i!=-1:
-                line_i1_rstrip = line[i+1:].rstrip()
-            if not lines:
-                # first line
-                if i == -1 or line_i1_rstrip:
-                    lines_append(line)
-                    break
-                lines_append(line[:i])
-                line = get_single_line()
-                continue
-            if i == -1 or line_i1_rstrip:
-                # no line continuation follows
-                i = len(line)
-            k = -1
-            if i != -1:
-                # handle the beggining of continued line
-                k = line[:i].find('&')
-                if k != 1 and line[:k].lstrip():
-                    k = -1
-            lines_append(line[k+1:i])
-            if i==len(line):
-                break
-            line = get_single_line()
-
-        if qc is not None:
-            message = self.format_message('ASSERTION FAILURE(free)',
-                'following character continuation: %r, expected None.' % (qc),
-                startlineno, self.linecount)
-            self.show_message(message, sys.stderr)
-        return self.line_item(''.join(lines),startlineno,self.linecount,label)
-
-    ##  FortranReaderBase
-
-# Fortran file and string readers:
-
-class FortranFileReader(FortranReaderBase):
-
-    def __init__(self, filename,
-                 include_dirs = None):
-        isfree, isstrict = get_source_info(filename)
-        self.id = filename
-        self.file = open(filename,'r')
-        FortranReaderBase.__init__(self, self.file, isfree, isstrict)
-        if include_dirs is None:
-            self.include_dirs.insert(0, os.path.dirname(filename))
-        else:
-            self.include_dirs = include_dirs[:]
-        return
-
-    def close_source(self):
-        self.file.close()
-
-class FortranStringReader(FortranReaderBase):
-    
-    def __init__(self, string, isfree, isstrict):
-        self.id = 'string-'+str(id(string))
-        source = StringIO(string)
-        FortranReaderBase.__init__(self, source, isfree, isstrict)
-
-# Testing:
-
-def test_f77():
-    string_f77 = """
-c12346 comment
-      subroutine foo
-      call foo
-     'bar
-a    'g
-      abc=2
-cf2py call me ! hey
-      call you ! hi
-      end
-     '"""
-    reader = FortranStringReader(string_f77,False,True)
-    for item in reader:
-        print item
-    
-    filename = tempfile.mktemp()+'.f'
-    f = open(filename,'w')
-    f.write(string_f77)
-    f.close()
-
-    reader = FortranFileReader(filename)
-    for item in reader:
-        print item
-
-def test_pyf():
-    string_pyf = """\
-python module foo
-  interface
-  beginml '''1st line
-  2nd line
-  end line'''endml='tere!fake comment'!should be a comment
-  a = 2
-  'charc\"onstant' ''' single line mline '''a='hi!fake comment'!should be a comment
-  a=\\\\\\\\\\'''not a multiline'''
-  !blah='''never ending multiline
-  b=3! hey, fake line continuation:&
-  c=4& !line cont
-  &45
-  thisis_label_2 : c = 3
-   xxif_isotropic_2 :     if ( string_upper_compare ( o%opt_aniso, 'ISOTROPIC' ) ) then
-   g=3
-   endif
-  end interface
-  if ( pc_get_lun() .ne. 6) &
-
-    write ( pc_get_lun(), '( &
-    & /, a, /, " p=", i4, " stopping c_flag=", a, &
-    & /, " print unit=", i8)') &
-    trim(title), pcpsx_i_pel(), trim(c_flag), pc_get_lun()
-end python module foo
-! end of file
-"""
-    reader = FortranStringReader(string_pyf,True, True)
-    for item in reader:
-        print item
-
-def test_fix90():
-    string_fix90 = """\
-      subroutine foo
-cComment
- 1234 a = 3 !inline comment
-      b = 3
-!
-     !4!line cont. with comment symbol
-     &5
-      a = 3!f2py.14 ! pi!
-!   KDMO
-      write (obj%print_lun, *) ' KDMO : '
-      write (obj%print_lun, *) '  COORD = ',coord, '  BIN_WID = ',             &
-       obj%bin_wid,'  VEL_DMO = ', obj%vel_dmo
-      end subroutine foo
-      subroutine
- 
-     & foo
-      end
-"""
-    reader = FortranStringReader(string_fix90,False, False)
-    for item in reader:
-        print item
-
-def simple_main():
-    for filename in sys.argv[1:]:
-        print 'Processing',filename
-        reader = FortranFileReader(filename)
-        for item in reader:
-            print >> sys.stdout, item
-            sys.stdout.flush()
-            pass
-
-def profile_main():
-    import hotshot, hotshot.stats
-    prof = hotshot.Profile("readfortran.prof")
-    prof.runcall(simple_main)
-    prof.close()
-    stats = hotshot.stats.load("readfortran.prof")
-    stats.strip_dirs()
-    stats.sort_stats('time', 'calls')
-    stats.print_stats(30)
-
-if __name__ == "__main__":
-    #test_pyf()
-    #test_fix90()
-    #profile_main()
-    simple_main()

Deleted: trunk/numpy/f2py/lib/sourceinfo.py
===================================================================
--- trunk/numpy/f2py/lib/sourceinfo.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/sourceinfo.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,71 +0,0 @@
-"""
-Author: Pearu Peterson <pearu at cens.ioc.ee>
-Created: May 2006
-"""
-
-__all__ = ['get_source_info']
-import re
-import os
-import sys
-
-_has_f_extension = re.compile(r'.*[.](for|ftn|f77|f)\Z',re.I).match
-_has_f_header = re.compile(r'-[*]-\s*fortran\s*-[*]-',re.I).search
-_has_f90_header = re.compile(r'-[*]-\s*f90\s*-[*]-',re.I).search
-_has_fix_header = re.compile(r'-[*]-\s*fix\s*-[*]-',re.I).search
-_free_f90_start = re.compile(r'[^c*!]\s*[^\s\d\t]',re.I).match
-
-def get_source_info(filename):
-    """
-    Determine if fortran file is
-      - in fix format and contains Fortran 77 code    -> False, True
-      - in fix format and contains Fortran 90 code    -> False, False
-      - in free format and contains Fortran 90 code   -> True, False
-      - in free format and contains signatures (.pyf) -> True, True
-    """
-    base,ext = os.path.splitext(filename)
-    if ext=='.pyf':
-        return True, True
-    isfree = False
-    isstrict = False
-    f = open(filename,'r')
-    firstline = f.readline()
-    f.close()
-    if _has_f_extension(filename) and \
-       not (_has_f90_header(firstline) or _has_fix_header(firstline)):
-        isstrict = True
-    elif is_free_format(filename) and not _has_fix_header(firstline):
-        isfree = True
-    return isfree,isstrict
-
-def is_free_format(file):
-    """Check if file is in free format Fortran."""
-    # f90 allows both fixed and free format, assuming fixed unless
-    # signs of free format are detected.
-    isfree = False
-    f = open(file,'r')
-    line = f.readline()
-    n = 10000 # the number of non-comment lines to scan for hints
-    if _has_f_header(line):
-        n = 0
-    elif _has_f90_header(line):
-        n = 0
-        isfree = True
-    contline = False
-    while n>0 and line:
-        line = line.rstrip()
-        if line and line[0]!='!':
-            n -= 1
-            if line[0]!='\t' and _free_f90_start(line[:5]) or line[-1:]=='&':
-                isfree = True
-                break
-        line = f.readline()
-    f.close()
-    return isfree
-
-def simple_main():
-    for filename in sys.argv[1:]:
-        isfree, isstrict = get_source_info(filename)
-        print '%s: isfree=%s, isstrict=%s'  % (filename, isfree, isstrict)
-    
-if __name__ == '__main__':
-    simple_main()

Deleted: trunk/numpy/f2py/lib/splitline.py
===================================================================
--- trunk/numpy/f2py/lib/splitline.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/splitline.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,415 +0,0 @@
-#!/usr/bin/env python
-"""
-Defines LineSplitter and helper functions.
-
-Copyright 2006 Pearu Peterson all rights reserved,
-Pearu Peterson <pearu at cens.ioc.ee>          
-Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
-
-NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
-$Revision:$
-$Date: 2000/07/31 07:04:03 $
-Pearu Peterson
-"""
-
-__all__ = ['String','string_replace_map','splitquote','splitparen']
-
-import re
-
-class String(str): pass
-class ParenString(str): pass
-
-def split2(line, lower=False):
-    """
-    Split line into non-string part and into a start of a string part.
-    Returns 2-tuple. The second item either is empty string or start
-    of a string part.
-    """
-    return LineSplitter(line,lower=lower).split2()
-
-_f2py_str_findall = re.compile(r"_F2PY_STRING_CONSTANT_\d+_").findall
-_is_name = re.compile(r'\w*\Z',re.I).match
-_is_simple_str = re.compile(r'\w*\Z',re.I).match
-
-def string_replace_map(line, lower=False,
-                       _cache={'index':0,'pindex':0}):
-    """
-    1) Replaces string constants with symbol `'_F2PY_STRING_CONSTANT_<index>_'`
-    2) Replaces (expression) with symbol `(F2PY_EXPR_TUPLE_<index>)`
-    Returns a new line and the replacement map.
-    """
-    items = []
-    string_map = {}
-    rev_string_map = {}
-    for item in splitquote(line, lower=lower)[0]:
-        if isinstance(item, String) and not _is_simple_str(item[1:-1]):
-            key = rev_string_map.get(item)
-            if key is None:
-                _cache['index'] += 1
-                index = _cache['index']
-                key = "_F2PY_STRING_CONSTANT_%s_" % (index)
-                it = item[1:-1]
-                string_map[key] = it
-                rev_string_map[it] = key
-            items.append(item[0]+key+item[-1])
-        else:
-            items.append(item)
-    newline = ''.join(items)
-    items = []
-    expr_keys = []
-    for item in splitparen(newline):
-        if isinstance(item, ParenString) and not _is_name(item[1:-1]):
-            key = rev_string_map.get(item)
-            if key is None:
-                _cache['pindex'] += 1
-                index = _cache['pindex']
-                key = 'F2PY_EXPR_TUPLE_%s' % (index)
-                it = item[1:-1].strip()
-                string_map[key] = it
-                rev_string_map[it] = key
-                expr_keys.append(key)
-            items.append(item[0]+key+item[-1])
-        else:
-            items.append(item)
-    found_keys = set()
-    for k in expr_keys:
-        v = string_map[k]
-        l = _f2py_str_findall(v)
-        if l:
-            found_keys = found_keys.union(l)
-            for k1 in l:
-                v = v.replace(k1, string_map[k1])
-            string_map[k] = v
-    for k in found_keys:
-        del string_map[k]
-    return ''.join(items), string_map
-
-def splitquote(line, stopchar=None, lower=False, quotechars = '"\''):
-    """
-    Fast LineSplitter
-    """
-    items = []
-    i = 0
-    while 1:
-        try:
-            char = line[i]; i += 1
-        except IndexError:
-            break
-        l = []
-        l_append = l.append
-        nofslashes = 0
-        if stopchar is None:
-            # search for string start
-            while 1:
-                if char in quotechars and not nofslashes % 2:
-                    stopchar = char
-                    i -= 1
-                    break
-                if char=='\\':
-                    nofslashes += 1
-                else:
-                    nofslashes = 0
-                l_append(char)
-                try:
-                    char = line[i]; i += 1
-                except IndexError:
-                    break
-            if not l: continue
-            item = ''.join(l)
-            if lower: item = item.lower()
-            items.append(item)
-            continue
-        if char==stopchar:
-            # string starts with quotechar
-            l_append(char)
-            try:
-                char = line[i]; i += 1
-            except IndexError:
-                if l:
-                    item = String(''.join(l))
-                    items.append(item)
-                break
-        # else continued string
-        while 1:
-            if char==stopchar and not nofslashes % 2:
-                l_append(char)
-                stopchar = None
-                break
-            if char=='\\':
-                nofslashes += 1
-            else:
-                nofslashes = 0
-            l_append(char)
-            try:
-                char = line[i]; i += 1
-            except IndexError:
-                break
-        if l:
-            item = String(''.join(l))
-            items.append(item)
-    return items, stopchar
-
-class LineSplitterBase:
-
-    def __iter__(self):
-        return self
-
-    def next(self):
-        item = ''
-        while not item:
-            item = self.get_item() # get_item raises StopIteration
-        return item
-
-class LineSplitter(LineSplitterBase):
-    """ Splits a line into non strings and strings. E.g.
-    abc=\"123\" -> ['abc=','\"123\"']
-    Handles splitting lines with incomplete string blocks.
-    """
-    def __init__(self, line,
-                 quotechar = None,
-                 lower=False,
-                 ):
-        self.fifo_line = [c for c in line]
-        self.fifo_line.reverse()
-        self.quotechar = quotechar
-        self.lower = lower
-
-    def split2(self):
-        """
-        Split line until the first start of a string.
-        """
-        try:
-            item1 = self.get_item()
-        except StopIteration:
-            return '',''
-        i = len(item1)
-        l = self.fifo_line[:]
-        l.reverse()
-        item2 = ''.join(l)
-        return item1,item2
-
-    def get_item(self):
-        fifo_pop = self.fifo_line.pop
-        try:
-            char = fifo_pop()
-        except IndexError:
-            raise StopIteration
-        fifo_append = self.fifo_line.append
-        quotechar = self.quotechar
-        l = []
-        l_append = l.append
-        
-        nofslashes = 0
-        if quotechar is None:
-            # search for string start
-            while 1:
-                if char in '"\'' and not nofslashes % 2:
-                    self.quotechar = char
-                    fifo_append(char)
-                    break
-                if char=='\\':
-                    nofslashes += 1
-                else:
-                    nofslashes = 0
-                l_append(char)
-                try:
-                    char = fifo_pop()
-                except IndexError:
-                    break
-            item = ''.join(l)
-            if self.lower: item = item.lower()
-            return item
-
-        if char==quotechar:
-            # string starts with quotechar
-            l_append(char)
-            try:
-                char = fifo_pop()
-            except IndexError:
-                return String(''.join(l))
-        # else continued string
-        while 1:
-            if char==quotechar and not nofslashes % 2:
-                l_append(char)
-                self.quotechar = None
-                break
-            if char=='\\':
-                nofslashes += 1
-            else:
-                nofslashes = 0
-            l_append(char)
-            try:
-                char = fifo_pop()
-            except IndexError:
-                break
-        return String(''.join(l))
-
-def splitparen(line,paren='()'):
-    """
-    Fast LineSplitterParen.
-    """
-    stopchar = None
-    startchar, endchar = paren[0],paren[1]
-
-    items = []
-    i = 0
-    while 1:
-        try:
-            char = line[i]; i += 1
-        except IndexError:
-            break
-        nofslashes = 0
-        l = []
-        l_append = l.append
-        if stopchar is None:
-            # search for parenthesis start
-            while 1:
-                if char==startchar and not nofslashes % 2:
-                    stopchar = endchar
-                    i -= 1
-                    break
-                if char=='\\':
-                    nofslashes += 1
-                else:
-                    nofslashes = 0
-                l_append(char)
-                try:
-                    char = line[i]; i += 1
-                except IndexError:
-                    break
-            item = ''.join(l)
-        else:
-            nofstarts = 0
-            while 1:
-                if char==stopchar and not nofslashes % 2 and nofstarts==1:
-                    l_append(char)
-                    stopchar = None
-                    break
-                if char=='\\':
-                    nofslashes += 1
-                else:
-                    nofslashes = 0
-                if char==startchar:
-                    nofstarts += 1
-                elif char==endchar:
-                    nofstarts -= 1
-                l_append(char)
-                try:
-                    char = line[i]; i += 1
-                except IndexError:
-                    break
-            item = ParenString(''.join(l))
-        items.append(item)
-    return items
-
-class LineSplitterParen(LineSplitterBase):
-    """ Splits a line into strings and strings with parenthesis. E.g.
-    a(x) = b(c,d) -> ['a','(x)',' = b','(c,d)']
-    """
-    def __init__(self, line, paren = '()'):
-        self.fifo_line = [c for c in line]
-        self.fifo_line.reverse()
-        self.startchar = paren[0]
-        self.endchar = paren[1]
-        self.stopchar = None
-        
-    def get_item(self):
-        fifo_pop = self.fifo_line.pop
-        try:
-            char = fifo_pop()
-        except IndexError:
-            raise StopIteration
-        fifo_append = self.fifo_line.append
-        startchar = self.startchar
-        endchar = self.endchar
-        stopchar = self.stopchar
-        l = []
-        l_append = l.append
-        
-        nofslashes = 0
-        if stopchar is None:
-            # search for parenthesis start
-            while 1:
-                if char==startchar and not nofslashes % 2:
-                    self.stopchar = endchar
-                    fifo_append(char)
-                    break
-                if char=='\\':
-                    nofslashes += 1
-                else:
-                    nofslashes = 0
-                l_append(char)
-                try:
-                    char = fifo_pop()
-                except IndexError:
-                    break
-            item = ''.join(l)
-            return item
-
-        nofstarts = 0
-        while 1:
-            if char==stopchar and not nofslashes % 2 and nofstarts==1:
-                l_append(char)
-                self.stopchar = None
-                break
-            if char=='\\':
-                nofslashes += 1
-            else:
-                nofslashes = 0
-            if char==startchar:
-                nofstarts += 1
-            elif char==endchar:
-                nofstarts -= 1
-            l_append(char)
-            try:
-                char = fifo_pop()
-            except IndexError:
-                break
-        return ParenString(''.join(l))
-                
-def test():
-    splitter = LineSplitter('abc\\\' def"12\\"3""56"dfad\'a d\'')
-    l = [item for item in splitter]
-    assert l==['abc\\\' def','"12\\"3"','"56"','dfad','\'a d\''],`l`
-    assert splitter.quotechar is None
-    l,stopchar=splitquote('abc\\\' def"12\\"3""56"dfad\'a d\'')
-    assert l==['abc\\\' def','"12\\"3"','"56"','dfad','\'a d\''],`l`
-    assert stopchar is None
-
-    splitter = LineSplitter('"abc123&')
-    l = [item for item in splitter]
-    assert l==['"abc123&'],`l`
-    assert splitter.quotechar=='"'
-    l,stopchar = splitquote('"abc123&')
-    assert l==['"abc123&'],`l`
-    assert stopchar=='"'
-    
-    splitter = LineSplitter(' &abc"123','"')
-    l = [item for item in splitter]
-    assert l==[' &abc"','123']
-    assert splitter.quotechar is None
-    l,stopchar = splitquote(' &abc"123','"')
-    assert l==[' &abc"','123']
-    assert stopchar is None
-        
-    l = split2('')
-    assert l==('',''),`l`
-    l = split2('12')
-    assert l==('12',''),`l`
-    l = split2('1"a"//"b"')
-    assert l==('1','"a"//"b"'),`l`
-    l = split2('"ab"')
-    assert l==('','"ab"'),`l`
-
-    splitter = LineSplitterParen('a(b) = b(x,y(1)) b\((a)\)')
-    l = [item for item in splitter]
-    assert l==['a', '(b)', ' = b', '(x,y(1))', ' b\\(', '(a)', '\\)'],`l`
-    l = splitparen('a(b) = b(x,y(1)) b\((a)\)')
-    assert l==['a', '(b)', ' = b', '(x,y(1))', ' b\\(', '(a)', '\\)'],`l`
-
-    l = string_replace_map('a()')
-    print l
-if __name__ == '__main__':
-    test()
-

Deleted: trunk/numpy/f2py/lib/statements.py
===================================================================
--- trunk/numpy/f2py/lib/statements.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/statements.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,1832 +0,0 @@
-
-import re
-import sys
-
-from base_classes import Statement, Variable
-#from expression import Expression
-
-# Auxiliary tools
-
-from utils import split_comma, specs_split_comma, AnalyzeError, ParseError,\
-     get_module_file, parse_bind, parse_result, is_name
-
-class StatementWithNamelist(Statement):
-    """
-    <statement> [ :: ] <name-list>
-    """
-    def process_item(self):
-        if self.item.has_map():
-            self.isvalid = False
-            return
-        if hasattr(self,'stmtname'):
-            clsname = self.stmtname
-        else:
-            clsname = self.__class__.__name__
-        line = self.item.get_line()[len(clsname):].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = items = []
-        for item in split_comma(line):
-            if not is_name(item):
-                self.isvalid = False
-                return
-            items.append(item)
-        return
-    def __str__(self):
-        if hasattr(self,'stmtname'):
-            clsname = self.stmtname.upper()
-        else:
-            clsname = self.__class__.__name__.upper()
-        s = ', '.join(self.items)
-        if s:
-            s = ' ' + s
-        return self.get_indent_tab() + clsname + s
-
-# Execution statements
-
-class GeneralAssignment(Statement):
-    """
-    <variable> = <expr>
-    <pointer variable> => <expr>
-    """
-
-    match = re.compile(r'\w[^=]*\s*=\>?').match
-    item_re = re.compile(r'(?P<variable>\w[^=]*)\s*(?P<sign>=\>?)\s*(?P<expr>.*)\Z',re.I).match
-    _repr_attr_names = ['variable','sign','expr'] + Statement._repr_attr_names
-
-    def process_item(self):
-        m = self.item_re(self.item.get_line())
-        if not m:
-            self.isvalid = False
-            return
-        self.sign = sign = m.group('sign')
-        if isinstance(self, Assignment) and sign != '=':
-            self.isvalid = False
-            return
-        elif isinstance(self, PointerAssignment) and sign != '=>':
-            self.isvalid = False
-            return
-        else:
-            if sign=='=>':
-                self.__class__ = PointerAssignment
-            else:
-                self.__class__ = Assignment            
-        apply_map = self.item.apply_map
-        self.variable = apply_map(m.group('variable').replace(' ',''))
-        self.expr = apply_map(m.group('expr'))
-        return
-
-    def __str__(self):
-        return self.get_indent_tab() + '%s %s %s' \
-               % (self.variable, self.sign, self.expr)
-
-    def analyze(self): return
-
-class Assignment(GeneralAssignment):
-    pass
-
-class PointerAssignment(GeneralAssignment):
-    pass
-
-class Assign(Statement):
-    """
-    ASSIGN <label> TO <int-variable-name>
-    """
-    modes = ['fix77']
-    match = re.compile(r'assign\s*\d+\s*to\s*\w+\s*\Z',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[6:].lstrip()
-        i = line.lower().find('to')
-        assert not self.item.has_map()
-        self.items = [line[:i].rstrip(),line[i+2:].lstrip()]
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'ASSIGN %s TO %s' \
-               % (self.items[0], self.items[1])
-    def analyze(self): return
-
-class Call(Statement):
-    """Call statement class
-    CALL <procedure-designator> [ ( [ <actual-arg-spec-list> ] ) ]
-
-    <procedure-designator> = <procedure-name>
-                           | <proc-component-ref>
-                           | <data-ref> % <binding-name>
-
-    <actual-arg-spec> = [ <keyword> = ] <actual-arg>
-    <actual-arg> = <expr>
-                 | <variable>
-                 | <procedure-name>
-                 | <proc-component-ref>
-                 | <alt-return-spec>
-    <alt-return-spec> = * <label>
-
-    <proc-component-ref> = <variable> % <procedure-component-name>
-
-    <variable> = <designator>
-
-    Call instance has attributes:
-      designator
-      arg_list
-    """
-    match = re.compile(r'call\b', re.I).match
-
-    def process_item(self):
-        item = self.item
-        apply_map = item.apply_map
-        line = item.get_line()[4:].strip()
-        i = line.find('(')
-        items = []
-        if i==-1:
-            self.designator = apply_map(line).strip()
-        else:
-            j = line.find(')')
-            if j == -1 or len(line)-1 != j:
-                self.isvalid = False
-                return
-            self.designator = apply_map(line[:i]).strip()
-            items = split_comma(line[i+1:-1], item)
-        self.items = items
-        return
-
-    def __str__(self):
-        s = self.get_indent_tab() + 'CALL '+str(self.designator)
-        if self.items:
-            s += '('+', '.join(map(str,self.items))+ ')'
-        return s
-
-    def analyze(self):
-        a = self.programblock.a
-        variables = a.variables
-        if hasattr(a, 'external'):
-            external = a.external
-            if self.designator in external:
-                print 'Need to analyze:',self
-        print self
-        return
-
-class Goto(Statement):
-    """
-    GO TO <label>
-    """
-    match = re.compile(r'go\s*to\s*\d+\s*\Z', re.I).match
-
-    def process_item(self):
-        assert not self.item.has_map()
-        self.label = self.item.get_line()[2:].lstrip()[2:].lstrip()
-        return
-
-    def __str__(self):
-        return self.get_indent_tab() + 'GO TO %s' % (self.label)
-    def analyze(self): return
-
-class ComputedGoto(Statement):
-    """
-    GO TO ( <label-list> ) [ , ] <scalar-int-expr>
-    """
-    match = re.compile(r'go\s*to\s*\(',re.I).match
-    def process_item(self):
-        apply_map = self.item.apply_map
-        line = self.item.get_line()[2:].lstrip()[2:].lstrip()
-        i = line.index(')')
-        self.items = split_comma(line[1:i], self.item)
-        line = line[i+1:].lstrip()
-        if line.startswith(','):
-            line = line[1:].lstrip()
-        self.expr = apply_map(line)
-        return
-    def __str__(self):
-        return  self.get_indent_tab() + 'GO TO (%s) %s' \
-               % (', '.join(self.items), self.expr)
-    def analyze(self): return
-
-class AssignedGoto(Statement):
-    """
-    GO TO <int-variable-name> [ ( <label> [ , <label> ]... ) ]
-    """
-    modes = ['fix77']
-    match = re.compile(r'go\s*to\s*\w+\s*\(?',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[2:].lstrip()[2:].lstrip()
-        i = line.find('(')
-        if i==-1:
-            self.varname = line
-            self.items = []
-            return
-        self.varname = line[:i].rstrip()
-        assert line[-1]==')',`line`
-        self
-        self.items = split_comma(line[i+1:-1], self.item)
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        if self.items:
-            return tab + 'GO TO %s (%s)' \
-                   % (self.varname, ', '.join(self.items)) 
-        return tab + 'GO TO %s' % (self.varname)
-    def analyze(self): return
-
-class Continue(Statement):
-    """
-    CONTINUE
-    """
-    match = re.compile(r'continue\Z',re.I).match
-
-    def process_item(self):
-        self.label = self.item.label
-        return
-
-    def __str__(self):
-        return self.get_indent_tab(deindent=True) + 'CONTINUE'
-
-    def analyze(self): return
-
-class Return(Statement):
-    """
-    RETURN [ <scalar-int-expr> ]
-    """
-    match = re.compile(r'return\b',re.I).match
-
-    def process_item(self):
-        self.expr = self.item.apply_map(self.item.get_line()[6:].lstrip())
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        if self.expr:
-            return tab + 'RETURN %s' % (self.expr)
-        return tab + 'RETURN'
-
-    def analyze(self): return
-
-class Stop(Statement):
-    """
-    STOP [ <stop-code> ]
-    <stop-code> = <scalar-char-constant> | <1-5-digit>
-    """
-    match = re.compile(r'stop\s*(\'\w*\'|"\w*"|\d+|)\Z',re.I).match
-
-    def process_item(self):
-        self.code = self.item.apply_map(self.item.get_line()[4:].lstrip())
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        if self.code:
-            return tab + 'STOP %s' % (self.code)
-        return tab + 'STOP'
-
-    def analyze(self): return
-
-class Print(Statement):
-    """
-    PRINT <format> [, <output-item-list>]
-    <format> = <default-char-expr> | <label> | *
-
-    <output-item> = <expr> | <io-implied-do>
-    <io-implied-do> = ( <io-implied-do-object-list> , <implied-do-control> )
-    <io-implied-do-object> = <input-item> | <output-item>
-    <implied-do-control> = <do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]
-    <input-item> = <variable> | <io-implied-do>
-    """
-    match = re.compile(r'print\s*(\'\w*\'|\"\w*\"|\d+|[*]|\b\w)', re.I).match
-
-    def process_item(self):
-        item = self.item
-        apply_map = item.apply_map
-        line = item.get_line()[5:].lstrip()
-        items = split_comma(line, item)
-        self.format = items[0]
-        self.items = items[1:]
-        return
-
-    def __str__(self):
-        return self.get_indent_tab() + 'PRINT %s' \
-               % (', '.join([self.format]+self.items))
-    def analyze(self): return
-
-class Read(Statement):
-    """
-Read0:    READ ( <io-control-spec-list> ) [ <input-item-list> ]
-
-    <io-control-spec-list> = [ UNIT = ] <io-unit>
-                             | [ FORMAT = ] <format>
-                             | [ NML = ] <namelist-group-name>
-                             | ADVANCE = <scalar-default-char-expr>
-                             ...
-    
-Read1:    READ <format> [, <input-item-list>]
-    <format> == <default-char-expr> | <label> | *
-    """
-    match = re.compile(r'read\b\s*[\w(*\'"]', re.I).match
-
-    def process_item(self):
-        item = self.item
-        line = item.get_line()[4:].lstrip()
-        if line.startswith('('):
-            self.__class__ = Read0
-        else:
-            self.__class__ = Read1
-        self.process_item()
-        return
-    def analyze(self): return
-
-class Read0(Read):
-
-    def process_item(self):
-        item = self.item
-        line = item.get_line()[4:].lstrip()
-        i = line.find(')')
-        self.specs = specs_split_comma(line[1:i], item)
-        self.items = split_comma(line[i+1:], item)
-        return
-
-    def __str__(self):
-        s = self.get_indent_tab() + 'READ (%s)' % (', '.join(self.specs))
-        if self.items:
-            return s + ' ' + ', '.join(self.items)
-        return s
-
-class Read1(Read):
-
-    def process_item(self):
-        item = self.item
-        line = item.get_line()[4:].lstrip()
-        items = split_comma(line, item)
-        self.format = items[0]
-        self.items = items[1:]
-        return
-
-    def __str__(self):
-        return self.get_indent_tab() + 'READ ' \
-               + ', '.join([self.format]+self.items)
-
-class Write(Statement):
-    """
-    WRITE ( io-control-spec-list ) [<output-item-list>]
-    """
-    match = re.compile(r'write\s*\(', re.I).match
-    def process_item(self):
-        item = self.item
-        line = item.get_line()[5:].lstrip()
-        i = line.find(')')
-        assert i != -1, `line`
-        self.specs = specs_split_comma(line[1:i], item)
-        self.items = split_comma(line[i+1:], item)
-        return
-
-    def __str__(self):
-        s = self.get_indent_tab() + 'WRITE (%s)' % ', '.join(self.specs)
-        if self.items:
-            s += ' ' + ', '.join(self.items)
-        return s
-    def analyze(self): return
-
-
-class Flush(Statement):
-    """
-    FLUSH <file-unit-number>
-    FLUSH ( <flush-spec-list> )
-    <flush-spec> = [ UNIT = ] <file-unit-number>
-                 | IOSTAT = <scalar-int-variable>
-                 | IOMSG = <iomsg-variable>
-                 | ERR = <label>
-    """
-    match = re.compile(r'flush\b',re.I).match
-
-    def process_item(self):
-        line = self.item.get_line()[5:].lstrip()
-        if not line:
-            self.isvalid = False
-            return
-        if line.startswith('('):
-            assert line[-1] == ')', `line`
-            self.specs = specs_split_comma(line[1:-1],self.item)
-        else:
-            self.specs = specs_split_comma(line,self.item)
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        return tab + 'FLUSH (%s)' % (', '.join(self.specs))
-    def analyze(self): return
-
-class Wait(Statement):
-    """
-    WAIT ( <wait-spec-list> )
-    <wait-spec> = [ UNIT = ] <file-unit-number>
-                | END = <label>
-                | EOR = <label>
-                | ERR = <label>
-                | ID = <scalar-int-expr>
-                | IOMSG = <iomsg-variable>
-                | IOSTAT = <scalar-int-variable>
-
-    """
-    match = re.compile(r'wait\s*\(.*\)\Z',re.I).match
-    def process_item(self):
-        self.specs = specs_split_comma(\
-            self.item.get_line()[4:].lstrip()[1:-1], self.item)
-        return
-    def __str__(self):
-        tab = self.get_indent_tab()
-        return tab + 'WAIT (%s)' % (', '.join(self.specs))
-    def analyze(self): return
-
-class Contains(Statement):
-    """
-    CONTAINS
-    """
-    match = re.compile(r'contains\Z',re.I).match
-    def process_item(self): return
-    def __str__(self): return self.get_indent_tab() + 'CONTAINS'
-
-class Allocate(Statement):
-    """
-    ALLOCATE ( [ <type-spec> :: ] <allocation-list> [ , <alloc-opt-list> ] )
-    <alloc-opt> = STAT = <stat-variable>
-                | ERRMSG = <errmsg-variable>
-                | SOURCE = <source-expr>
-    <allocation> = <allocate-object> [ ( <allocate-shape-spec-list> ) ]
-    """
-    match = re.compile(r'allocate\s*\(.*\)\Z',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[8:].lstrip()[1:-1].strip()
-        item2 = self.item.copy(line, True)
-        line2 = item2.get_line()
-        i = line2.find('::')
-        if i != -1:
-            spec = item2.apply_map(line2[:i].rstrip())
-            from block_statements import type_spec
-            stmt = None
-            for cls in type_spec:
-                if cls.match(spec):
-                    stmt = cls(self, item2.copy(spec))
-                    if stmt.isvalid:
-                        break
-            if stmt is not None and stmt.isvalid:
-                spec = stmt
-            else:
-                self.warning('TODO: unparsed type-spec' + `spec`)
-            line2 = line2[i+2:].lstrip()
-        else:
-            spec = None
-        self.spec = spec
-        self.items = specs_split_comma(line2, item2)
-        return
-
-    def __str__(self):
-        t = ''
-        if self.spec:
-            t = self.spec.tostr() + ' :: '
-        return self.get_indent_tab() \
-               + 'ALLOCATE (%s%s)' % (t,', '.join(self.items))
-    def analyze(self): return
-
-class Deallocate(Statement):
-    """
-    DEALLOCATE ( <allocate-object-list> [ , <dealloc-opt-list> ] )
-    <allocate-object> = <variable-name>
-                      | <structure-component>
-    <structure-component> = <data-ref>
-    <dealloc-opt> = STAT = <stat-variable>
-                    | ERRMSG = <errmsg-variable>
-    """
-    match = re.compile(r'deallocate\s*\(.*\)\Z',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[10:].lstrip()[1:-1].strip()
-        self.items = specs_split_comma(line, self.item)
-        return
-    def __str__(self): return self.get_indent_tab() \
-        + 'DEALLOCATE (%s)' % (', '.join(self.items))
-    def analyze(self): return
-    
-class ModuleProcedure(Statement):
-    """
-    [ MODULE ] PROCEDURE <procedure-name-list>
-    """
-    match = re.compile(r'(module\s*|)procedure\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()
-        m = self.match(line)
-        assert m,`line`
-        items = split_comma(line[m.end():].strip(), self.item)
-        for n in items:
-            if not is_name(n):
-                self.isvalid = False
-                return
-        self.items = items
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        return tab + 'MODULE PROCEDURE %s' % (', '.join(self.items))
-
-    def analyze(self):
-        module_procedures = self.parent.a.module_procedures
-        module_procedures.extend(self.items)
-        # XXX: add names to parent_provides
-        return
-
-class Access(Statement):
-    """
-    <access-spec> [ [::] <access-id-list>]
-    <access-spec> = PUBLIC | PRIVATE
-    <access-id> = <use-name> | <generic-spec>
-    """
-    match = re.compile(r'(public|private)\b',re.I).match
-    def process_item(self):
-        clsname = self.__class__.__name__.lower()
-        line = self.item.get_line()
-        if not line.lower().startswith(clsname):
-            self.isvalid = False
-            return
-        line = line[len(clsname):].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = split_comma(line, self.item)
-        return
-
-    def __str__(self):
-        clsname = self.__class__.__name__.upper()
-        tab = self.get_indent_tab()
-        if self.items:
-            return tab + clsname + ' ' + ', '.join(self.items)
-        return tab + clsname
-
-    def analyze(self):
-        clsname = self.__class__.__name__.upper()
-        if self.items:
-            for name in self.items:
-                var = self.get_variable(name)
-                var.update(clsname)
-        else:
-            self.parent.update_attributes(clsname)
-        return
-
-class Public(Access):
-    is_public = True
-class Private(Access):
-    is_public = False
-
-class Close(Statement):
-    """
-    CLOSE ( <close-spec-list> )
-    <close-spec> = [ UNIT = ] <file-unit-number>
-                   | IOSTAT = <scalar-int-variable>
-                   | IOMSG = <iomsg-variable>
-                   | ERR = <label>
-                   | STATUS = <scalar-default-char-expr>
-    """
-    match = re.compile(r'close\s*\(.*\)\Z',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[5:].lstrip()[1:-1].strip()
-        self.specs = specs_split_comma(line, self.item)
-        return
-    def __str__(self):
-        tab = self.get_indent_tab()
-        return tab + 'CLOSE (%s)' % (', '.join(self.specs))
-    def analyze(self): return
-
-class Cycle(Statement):
-    """
-    CYCLE [ <do-construct-name> ]
-    """
-    match = re.compile(r'cycle\b\s*\w*\s*\Z',re.I).match
-    def process_item(self):
-        self.name = self.item.get_line()[5:].lstrip()
-        return
-    def __str__(self):
-        if self.name:
-            return self.get_indent_tab() + 'CYCLE ' + self.name
-        return self.get_indent_tab() + 'CYCLE'
-    def analyze(self): return
-
-class FilePositioningStatement(Statement):
-    """
-    REWIND <file-unit-number>
-    REWIND ( <position-spec-list> )
-    <position-spec-list> = [ UNIT = ] <file-unit-number>
-                           | IOMSG = <iomsg-variable>
-                           | IOSTAT = <scalar-int-variable>
-                           | ERR = <label>
-    The same for BACKSPACE, ENDFILE.
-    """
-    match = re.compile(r'(rewind|backspace|endfile)\b',re.I).match
-
-    def process_item(self):
-        clsname = self.__class__.__name__.lower()
-        line = self.item.get_line()
-        if not line.lower().startswith(clsname):
-            self.isvalid = False
-            return
-        line = line[len(clsname):].lstrip()
-        if line.startswith('('):
-            assert line[-1]==')',`line`
-            spec = line[1:-1].strip()
-        else:
-            spec = line
-        self.specs = specs_split_comma(spec, self.item)
-        return
-
-    def __str__(self):
-        clsname = self.__class__.__name__.upper()
-        return self.get_indent_tab() + clsname + ' (%s)' % (', '.join(self.specs))
-    def analyze(self): return
-
-class Backspace(FilePositioningStatement): pass
-
-class Endfile(FilePositioningStatement): pass
-
-class Rewind(FilePositioningStatement): pass
-
-class Open(Statement):
-    """
-    OPEN ( <connect-spec-list> )
-    <connect-spec> = [ UNIT = ] <file-unit-number>
-                     | ACCESS = <scalar-default-char-expr>
-                     | ..
-    """
-    match = re.compile(r'open\s*\(.*\)\Z',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[4:].lstrip()[1:-1].strip()
-        self.specs = specs_split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'OPEN (%s)' % (', '.join(self.specs))
-    def analyze(self): return
-
-class Format(Statement):
-    """
-    FORMAT <format-specification>
-    <format-specification> = ( [ <format-item-list> ] )
-    <format-item> = [ <r> ] <data-edit-descr>
-                    | <control-edit-descr>
-                    | <char-string-edit-descr>
-                    | [ <r> ] ( <format-item-list> )
-    <data-edit-descr> = I <w> [ . <m> ]
-                        | B <w> [ . <m> ]
-                        ...
-    <r|w|m|d|e> = <int-literal-constant>
-    <v> = <signed-int-literal-constant>
-    <control-edit-descr> = <position-edit-descr>
-                         | [ <r> ] /
-                         | :
-                         ...
-    <position-edit-descr> = T <n>
-                            | TL <n>
-                            ...
-    <sign-edit-descr> = SS | SP | S
-    ...
-    
-    """
-    match = re.compile(r'format\s*\(.*\)\Z', re.I).match
-    def process_item(self):
-        item = self.item
-        if not item.label:
-            # R1001:
-            self.warning('R1001: FORMAT statement must be labeled but got %r.' \
-                         % (item.label))
-        line = item.get_line()[6:].lstrip()
-        assert line[0]+line[-1]=='()',`line`
-        self.specs = split_comma(line[1:-1], item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'FORMAT (%s)' % (', '.join(self.specs))
-    def analyze(self): return
-
-class Save(Statement):
-    """
-    SAVE [ [ :: ] <saved-entity-list> ]
-    <saved-entity> = <object-name>
-                     | <proc-pointer-name>
-                     | / <common-block-name> /
-    <proc-pointer-name> = <name>
-    <object-name> = <name>
-    """
-    match = re.compile(r'save\b',re.I).match
-    def process_item(self):
-        assert not self.item.has_map()
-        line = self.item.get_line()[4:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        items = []
-        for s in line.split(','):
-            s = s.strip()
-            if not s: continue
-            if s.startswith('/'):
-                assert s.endswith('/'),`s`
-                n = s[1:-1].strip()
-                assert is_name(n),`n`
-                items.append('/%s/' % (n))
-            elif is_name(s):
-                items.append(s)
-            else:
-                self.isvalid = False
-                return
-        self.items = items
-        return
-    def __str__(self):
-        tab = self.get_indent_tab()
-        if not self.items:
-            return tab + 'SAVE'
-        return tab + 'SAVE %s' % (', '.join(self.items))
-    def analyze(self): return
-
-class Data(Statement):
-    """
-    DATA <data-stmt-set> [ [ , ] <data-stmt-set> ]...
-    <data-stmt-set> = <data-stmt-object-list> / <data-stmt-value-list> /
-    <data-stmt-object> = <variable> | <data-implied-do>
-    <data-implied-do> = ( <data-i-do-object-list> , <data-i-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ] )
-    <data-i-do-object> = <array-element> | <scalar-structure-component> | <data-implied-do>
-    <data-i-do-variable> = <scalar-int-variable>
-    <variable> = <designator>
-    <designator> = <object-name>
-                   | <array-element>
-                   | <array-section>
-                   | <structure-component>
-                   | <substring>
-    <array-element> = <data-ref>
-    <array-section> = <data-ref> [ ( <substring-range> ) ]
-    
-    """
-    match = re.compile(r'data\b',re.I).match
-
-    def process_item(self):
-        line = self.item.get_line()[4:].lstrip()
-        stmts = []
-        self.isvalid = False
-        while line:
-            i = line.find('/')
-            if i==-1: return
-            j = line.find('/',i+1)
-            if j==-1: return
-            l1, l2 = line[:i].rstrip(),line[i+1:j].strip()
-            l1 = split_comma(l1, self.item)
-            l2 = split_comma(l2, self.item)
-            stmts.append((l1,l2))
-            line = line[j+1:].lstrip()
-            if line.startswith(','):
-                line = line[1:].lstrip()
-        self.stmts = stmts
-        self.isvalid = True
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        l = []
-        for o,v in self.stmts:
-            l.append('%s / %s /' %(', '.join(o),', '.join(v)))
-        return tab + 'DATA ' + ' '.join(l)
-    def analyze(self): return
-
-class Nullify(Statement):
-    """
-    NULLIFY ( <pointer-object-list> )
-    <pointer-object> = <variable-name>
-    """
-    match = re.compile(r'nullify\s*\(.*\)\Z',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[7:].lstrip()[1:-1].strip()
-        self.items = split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'NULLIFY (%s)' % (', '.join(self.items))
-    def analyze(self): return
-
-class Use(Statement):
-    """
-    USE [ [ , <module-nature> ] :: ] <module-name> [ , <rename-list> ]
-    USE [ [ , <module-nature> ] :: ] <module-name> , ONLY : [ <only-list> ]
-    <module-nature> = INTRINSIC | NON_INTRINSIC
-    <rename> = <local-name> => <use-name>
-               | OPERATOR ( <local-defined-operator> ) => OPERATOR ( <use-defined-operator> )
-    <only> = <generic-spec> | <only-use-name> | <rename>
-    <only-use-name> = <use-name>
-    """
-    match = re.compile(r'use\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[3:].lstrip()
-        nature = ''
-        if line.startswith(','):
-            i = line.find('::')
-            nature = line[1:i].strip().upper()
-            line = line[i+2:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        if nature and not is_name(nature):
-            self.isvalid = False
-            return
-        self.nature = nature
-        i = line.find(',')
-        self.isonly = False
-        if i==-1:
-            self.name = line
-            self.items = []
-        else:
-            self.name = line[:i].rstrip()
-            line = line[i+1:].lstrip()
-            if line.lower().startswith('only') and line[4:].lstrip().startswith(':'):
-                self.isonly = True
-                line = line[4:].lstrip()[1:].lstrip()
-            self.items = split_comma(line, self.item)
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        s = 'USE'
-        if self.nature:
-            s += ' ' + self.nature + ' ::'
-        s += ' ' + self.name
-        if self.isonly:
-            s += ', ONLY:'
-        elif self.items:
-            s += ','
-        if self.items:
-            s += ' ' + ', '.join(self.items)
-        return tab + s
-
-    def analyze(self):
-        use = self.parent.a.use
-        if use.has_key(self.name):
-            return
-
-        modules = self.top.a.module
-        if not modules.has_key(self.name):
-            fn = None
-            for d in self.reader.include_dirs:
-                fn = get_module_file(self.name, d)
-                if fn is not None:
-                    break
-            if fn is not None:
-                from readfortran import FortranFileReader
-                from parsefortran import FortranParser
-                self.info('looking module information from %r' % (fn))
-                reader = FortranFileReader(fn)
-                parser = FortranParser(reader)
-                parser.parse()
-                parser.block.a.module.update(modules)
-                parser.analyze()
-                modules.update(parser.block.a.module)
-
-        if not modules.has_key(self.name):
-            self.warning('no information about the module %r in use statement' % (self.name))
-            return
-
-        module = modules[self.name]
-        use_provides = self.parent.a.use_provides
-        
-        
-        return
-
-class Exit(Statement):
-    """
-    EXIT [ <do-construct-name> ]
-    """
-    match = re.compile(r'exit\b\s*\w*\s*\Z',re.I).match
-    def process_item(self):
-        self.name = self.item.get_line()[4:].lstrip()
-        return
-    def __str__(self):
-        if self.name:
-            return self.get_indent_tab() + 'EXIT ' + self.name
-        return self.get_indent_tab() + 'EXIT'
-    def analyze(self): return
-
-class Parameter(Statement):
-    """
-    PARAMETER ( <named-constant-def-list> )
-    <named-constant-def> = <named-constant> = <initialization-expr>
-    """
-    match = re.compile(r'parameter\s*\(.*\)\Z', re.I).match
-    def process_item(self):
-        line = self.item.get_line()[9:].lstrip()[1:-1].strip()
-        self.items = split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'PARAMETER (%s)' % (', '.join(self.items))
-    def analyze(self):
-        for item in self.items:
-            i = item.find('=')
-            assert i!=-1,`item`
-            name = item[:i].rstrip()
-            value = item[i+1:].lstrip()
-            var = self.get_variable(name)
-            var.update('parameter')
-            var.set_init(value)
-        return
-
-class Equivalence(Statement):
-    """
-    EQUIVALENCE <equivalence-set-list>
-    <equivalence-set> = ( <equivalence-object> , <equivalence-object-list> )
-    <equivalence-object> = <variable-name> | <array-element> | <substring>
-    """
-    match = re.compile(r'equivalence\s*\(.*\)\Z', re.I).match
-    def process_item(self):
-        items = []
-        for s in self.item.get_line()[11:].lstrip().split(','):
-            s = s.strip()
-            assert s[0]+s[-1]=='()',`s,self.item.get_line()`
-            s = ', '.join(split_comma(s[1:-1], self.item))
-            items.append('('+s+')')
-        self.items = items
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'EQUIVALENCE %s' % (', '.join(self.items))
-    def analyze(self): return
-
-class Dimension(Statement):
-    """
-    DIMENSION [ :: ] <array-name> ( <array-spec> ) [ , <array-name> ( <array-spec> ) ]...
-    
-    """
-    match = re.compile(r'dimension\b', re.I).match
-    def process_item(self):
-        line = self.item.get_line()[9:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'DIMENSION %s' % (', '.join(self.items))
-    def analyze(self):
-        for line in self.items:
-            i = line.find('(')
-            assert i!=-1 and line.endswith(')'),`line`
-            name = line[:i].rstrip()
-            array_spec = split_comma(line[i+1:-1].strip(), self.item)
-            var = self.get_variable(name)
-            var.set_bounds(array_spec)
-        return
-
-class Target(Statement):
-    """
-    TARGET [ :: ] <object-name> ( <array-spec> ) [ , <object-name> ( <array-spec> ) ]...
-    
-    """
-    match = re.compile(r'target\b', re.I).match
-    def process_item(self):
-        line = self.item.get_line()[6:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'TARGET %s' % (', '.join(self.items))
-    def analyze(self):
-        for line in self.items:
-            i = line.find('(')
-            assert i!=-1 and line.endswith(')'),`line`
-            name = line[:i].rstrip()
-            array_spec = split_comma(line[i+1:-1].strip(), self.item)
-            var = self.get_variable(name)
-            var.set_bounds(array_spec)
-            var.update('target')
-        return
-
-
-class Pointer(Statement):
-    """
-    POINTER [ :: ] <pointer-decl-list>
-    <pointer-decl> = <object-name> [ ( <deferred-shape-spec-list> ) ]
-                   | <proc-entity-name>
-    
-    """
-    match = re.compile(r'pointer\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[7:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'POINTER %s' % (', '.join(self.items))
-    def analyze(self):
-        for line in self.items:
-            i = line.find('(')
-            if i==-1:
-                name = line
-                array_spec = None
-            else:
-                assert line.endswith(')'),`line`
-                name = line[:i].rstrip()
-                array_spec = split_comma(line[i+1:-1].strip(), self.item)
-            var = self.get_variable(name)
-            var.set_bounds(array_spec)
-            var.update('pointer')
-        return
-
-class Protected(StatementWithNamelist):
-    """
-    PROTECTED [ :: ] <entity-name-list>
-    """
-    match = re.compile(r'protected\b',re.I).match
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.update('protected')
-        return
-
-class Volatile(StatementWithNamelist):
-    """
-    VOLATILE [ :: ] <object-name-list>
-    """
-    match = re.compile(r'volatile\b',re.I).match
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.update('volatile')
-        return
-
-class Value(StatementWithNamelist):
-    """
-    VALUE [ :: ] <dummy-arg-name-list>
-    """
-    match = re.compile(r'value\b',re.I).match
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.update('value')
-        return
-
-class ArithmeticIf(Statement):
-    """
-    IF ( <scalar-numeric-expr> ) <label> , <label> , <label>
-    """
-    match = re.compile(r'if\s*\(.*\)\s*\d+\s*,\s*\d+\s*,\s*\d+\s*\Z', re.I).match
-    def process_item(self):
-        line = self.item.get_line()[2:].lstrip()
-        line,l2,l3 = line.rsplit(',',2)
-        i = line.rindex(')')
-        l1 = line[i+1:]
-        self.expr = self.item.apply_map(line[1:i]).strip()
-        self.labels = [l1.strip(),l2.strip(),l3.strip()]
-        return
-
-    def __str__(self):
-        return self.get_indent_tab() + 'IF (%s) %s' \
-               % (self.expr,', '.join(self.labels))
-    def analyze(self): return
-
-class Intrinsic(StatementWithNamelist):
-    """
-    INTRINSIC [ :: ] <intrinsic-procedure-name-list>
-    """
-    match = re.compile(r'intrinsic\b',re.I).match
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.update('intrinsic')
-        return
-
-class Inquire(Statement):
-    """
-    INQUIRE ( <inquire-spec-list> )
-    INQUIRE ( IOLENGTH = <scalar-int-variable> ) <output-item-list>
-    
-    <inquire-spec> = [ UNIT = ] <file-unit-number>
-                     | FILE = <file-name-expr>
-                     ...
-    <output-item> = <expr>
-                  | <io-implied-do>
-    """
-    match = re.compile(r'inquire\s*\(',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[7:].lstrip()
-        i = line.index(')')
-        self.specs = specs_split_comma(line[1:i].strip(), self.item)
-        self.items = split_comma(line[i+1:].lstrip(), self.item)
-        return
-    def __str__(self):
-        if self.items:
-            return self.get_indent_tab() + 'INQUIRE (%s) %s' \
-                   % (', '.join(self.specs), ', '.join(self.items))
-        return self.get_indent_tab() + 'INQUIRE (%s)' \
-                   % (', '.join(self.specs))
-    def analyze(self): return
-
-class Sequence(Statement):
-    """
-    SEQUENCE
-    """
-    match = re.compile(r'sequence\Z',re.I).match
-    def process_item(self):
-        return
-    def __str__(self): return self.get_indent_tab() + 'SEQUENCE'
-    def analyze(self):
-        self.parent.update_attributes('SEQUENCE')
-        return
-
-class External(StatementWithNamelist):
-    """
-    EXTERNAL [ :: ] <external-name-list>
-    """
-    match = re.compile(r'external\b', re.I).match
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.update('external')
-        return
-
-
-class Namelist(Statement):
-    """
-    NAMELIST / <namelist-group-name> / <namelist-group-object-list> [ [ , ] / <namelist-group-name> / <namelist-group-object-list> ]...
-    <namelist-group-object> = <variable-name>
-    """
-    match = re.compile(r'namelist\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[8:].lstrip()
-        items = []
-        while line:
-            assert line.startswith('/'),`line`
-            i = line.find('/',1)
-            assert i!=-1,`line`
-            name = line[:i+1]
-            line = line[i+1:].lstrip()
-            i = line.find('/')
-            if i==-1:
-                items.append((name,line))
-                line = ''
-                continue
-            s = line[:i].rstrip()
-            if s.endswith(','):
-                s = s[:-1].rstrip()
-            items.append((name,s))
-            line = line[i+1:].lstrip()
-        self.items = items
-        return
-
-    def __str__(self):
-        l = []
-        for name,s in self.items:
-            l.append('%s %s' % (name,s))
-        tab = self.get_indent_tab()
-        return tab + 'NAMELIST ' + ', '.join(l)
-
-class Common(Statement):
-    """
-    COMMON [ / [ <common-block-name> ] / ]  <common-block-object-list> \
-      [ [ , ] / [ <common-block-name> ] /  <common-block-object-list> ]...
-    <common-block-object> = <variable-name> [ ( <explicit-shape-spec-list> ) ]
-                          | <proc-pointer-name>
-    """
-    match = re.compile(r'common\b',re.I).match
-    def process_item(self):
-        item = self.item
-        line = item.get_line()[6:].lstrip()
-        items = []
-        while line:
-            if not line.startswith('/'):
-                name = ''
-                assert not items,`line`
-            else:
-                i = line.find('/',1)
-                assert i!=-1,`line`
-                name = line[1:i].strip()
-                line = line[i+1:].lstrip()
-            i = line.find('/')
-            if i==-1:
-                items.append((name,split_comma(line, item)))
-                line = ''
-                continue
-            s = line[:i].rstrip()
-            if s.endswith(','):
-                s = s[:-1].rstrip()
-            items.append((name,split_comma(s,item)))
-            line = line[i:].lstrip()
-        self.items = items
-        return
-    def __str__(self):
-        l = []
-        for name,s in self.items:
-            s = ', '.join(s)
-            if name:
-                l.append('/ %s / %s' % (name,s))
-            else:
-                l.append(s)
-        tab = self.get_indent_tab()
-        return tab + 'COMMON ' + ' '.join(l)
-    def analyze(self):
-        for cname, items in self.items:
-            for item in items:
-                i = item.find('(')
-                if i!=-1:
-                    assert item.endswith(')'),`item`
-                    name = item[:i].rstrip()
-                    shape = split_comma(item[i+1:-1].strip(), self.item)
-                else:
-                    name = item
-                    shape = None
-                var = self.get_variable(name)
-                if shape is not None:
-                    var.set_bounds(shape)
-            # XXX: add name,var to parent_provides
-        return
-
-class Optional(StatementWithNamelist):
-    """
-    OPTIONAL [ :: ] <dummy-arg-name-list>
-    <dummy-arg-name> = <name>
-    """
-    match = re.compile(r'optional\b',re.I).match
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.update('optional')
-        return
-
-class Intent(Statement):
-    """
-    INTENT ( <intent-spec> ) [ :: ] <dummy-arg-name-list>
-    <intent-spec> = IN | OUT | INOUT
-
-    generalization for pyf-files:
-    INTENT ( <intent-spec-list> ) [ :: ] <dummy-arg-name-list>
-    <intent-spec> = IN | OUT | INOUT | CACHE | HIDE | OUT = <name>
-    """
-    match = re.compile(r'intent\s*\(',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[6:].lstrip()
-        i = line.find(')')
-        self.specs = specs_split_comma(line[1:i], self.item, upper=True)
-        line = line[i+1:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = [s.strip() for s in line.split(',')]
-        for n in self.items:
-            if not is_name(n):
-                self.isvalid = False
-                return
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'INTENT (%s) %s' \
-               % (', '.join(self.specs), ', '.join(self.items))
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.set_intent(self.specs)
-        return
-
-
-class Entry(Statement):
-    """
-    ENTRY <entry-name> [ ( [ <dummy-arg-list> ] ) [ <suffix> ] ]
-    <suffix> = <proc-language-binding-spec> [ RESULT ( <result-name> ) ]
-             | RESULT ( <result-name> ) [ <proc-language-binding-spec> ]
-    <proc-language-binding-spec> = <language-binding-spec>
-    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
-    <dummy-arg> = <dummy-arg-name> | *
-    """
-    match = re.compile(r'entry\b', re.I).match
-    def process_item(self):
-        line = self.item.get_line()[5:].lstrip()
-        m = re.match(r'\w+', line)
-        name = line[:m.end()]
-        line = line[m.end():].lstrip()
-        if line.startswith('('):
-            i = line.find(')')
-            assert i!=-1,`line`
-            items = split_comma(line[1:i], self.item)
-            line = line[i+1:].lstrip()
-        else:
-            items = []
-        self.bind, line = parse_bind(line, self.item)
-        self.result, line = parse_result(line, self.item)
-        if line:
-            assert self.bind is None,`self.bind`
-            self.bind, line = parse_bind(line, self.item)
-        assert not line,`line`
-        self.name = name
-        self.items = items
-        return
-    def __str__(self):
-        tab = self.get_indent_tab()
-        s = tab + 'ENTRY '+self.name
-        if self.items:
-            s += ' (%s)' % (', '.join(self.items))
-        if self.result:
-            s += ' RESULT (%s)' % (self.result)
-        if self.bind:
-            s += ' BIND (%s)' % (', '.join(self.bind))
-        return s
-
-class Import(StatementWithNamelist):
-    """
-    IMPORT [ [ :: ] <import-name-list> ]
-    """
-    match = re.compile(r'import(\b|\Z)',re.I).match
-
-class Forall(Statement):
-    """
-    FORALL <forall-header> <forall-assignment-stmt>
-    <forall-header> = ( <forall-triplet-spec-list> [ , <scalar-mask-expr> ] )
-    <forall-triplet-spec> = <index-name> = <subscript> : <subscript> [ : <stride> ]
-    <subscript|stride> = <scalar-int-expr>
-    <forall-assignment-stmt> = <assignment-stmt> | <pointer-assignment-stmt>
-    """
-    match = re.compile(r'forall\s*\(.*\).*=', re.I).match
-    def process_item(self):
-        line = self.item.get_line()[6:].lstrip()
-        i = line.index(')')
-
-        line0 = line[1:i]
-        line = line[i+1:].lstrip()
-        stmt = GeneralAssignment(self, self.item.copy(line, True))
-        if stmt.isvalid:
-            self.content = [stmt]
-        else:
-            self.isvalid = False
-            return
-
-        specs = []
-        mask = ''
-        for l in split_comma(line0,self.item):
-            j = l.find('=')
-            if j==-1:
-                assert not mask,`mask,l`
-                mask = l
-                continue
-            assert j!=-1,`l`
-            index = l[:j].rstrip()
-            it = self.item.copy(l[j+1:].lstrip())
-            l = it.get_line()
-            k = l.split(':')
-            if len(k)==3:
-                s1, s2, s3 = map(it.apply_map,
-                                 [k[0].strip(),k[1].strip(),k[2].strip()])
-            else:
-                assert len(k)==2,`k`
-                s1, s2 = map(it.apply_map,
-                             [k[0].strip(),k[1].strip()])
-                s3 = '1'
-            specs.append((index,s1,s2,s3))
-
-        self.specs = specs
-        self.mask = mask
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        l = []
-        for index,s1,s2,s3 in self.specs:
-            s = '%s = %s : %s' % (index,s1,s2)
-            if s3!='1':
-                s += ' : %s' % (s3)
-            l.append(s)
-        s = ', '.join(l)
-        if self.mask:
-            s += ', ' + self.mask
-        return tab + 'FORALL (%s) %s' % \
-               (s, str(self.content[0]).lstrip())
-    def analyze(self): return
-
-ForallStmt = Forall
-
-class SpecificBinding(Statement):
-    """
-    PROCEDURE [ ( <interface-name> ) ]  [ [ , <binding-attr-list> ] :: ] <binding-name> [ => <procedure-name> ]
-    <binding-attr> = PASS [ ( <arg-name> ) ]
-                   | NOPASS
-                   | NON_OVERRIDABLE
-                   | DEFERRED
-                   | <access-spec>
-    <access-spec> = PUBLIC | PRIVATE
-    """
-    match = re.compile(r'procedure\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[9:].lstrip()
-        if line.startswith('('):
-            i = line.index(')')
-            name = line[1:i].strip()
-            line = line[i+1:].lstrip()
-        else:
-            name = ''
-        self.iname = name
-        if line.startswith(','):
-            line = line[1:].lstrip()
-        i = line.find('::')
-        if i != -1:
-            attrs = split_comma(line[:i], self.item)
-            line = line[i+2:].lstrip()
-        else:
-            attrs = []
-        attrs1 = []
-        for attr in attrs:
-            if is_name(attr):
-                attr = attr.upper()
-            else:
-                i = attr.find('(')
-                assert i!=-1 and attr.endswith(')'),`attr`
-                attr = '%s (%s)' % (attr[:i].rstrip().upper(), attr[i+1:-1].strip())
-            attrs1.append(attr)
-        self.attrs = attrs1
-        i = line.find('=')
-        if i==-1:
-            self.name = line
-            self.bname = ''
-        else:
-            self.name = line[:i].rstrip()
-            self.bname = line[i+1:].lstrip()[1:].lstrip()
-        return
-    def __str__(self):
-        tab = self.get_indent_tab()
-        s = 'PROCEDURE '
-        if self.iname:
-            s += '(' + self.iname + ') '
-        if self.attrs:
-            s += ', ' + ', '.join(self.attrs) + ' :: '
-        if self.bname:
-            s += '%s => %s' % (self.name, self.bname)
-        else:
-            s += self.name
-        return tab + s
-
-class GenericBinding(Statement):
-    """
-    GENERIC [ , <access-spec> ] :: <generic-spec> => <binding-name-list>
-    """
-    match = re.compile(r'generic\b.*::.*=\>.*\Z', re.I).match
-    def process_item(self):
-        line = self.item.get_line()[7:].lstrip()
-        if line.startswith(','):
-            line = line[1:].lstrip()
-        i = line.index('::')
-        self.aspec = line[:i].rstrip().upper()
-        line = line[i+2:].lstrip()
-        i = line.index('=>')
-        self.spec = self.item.apply_map(line[:i].rstrip())
-        self.items = split_comma(line[i+2:].lstrip())
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        s = 'GENERIC'
-        if self.aspec:
-            s += ', '+self.aspec
-        s += ' :: ' + self.spec + ' => ' + ', '.join(self.items)
-        return tab + s
-
-        
-class FinalBinding(StatementWithNamelist):
-    """
-    FINAL [ :: ] <final-subroutine-name-list>
-    """
-    stmtname = 'final'
-    match = re.compile(r'final\b', re.I).match
-
-class Allocatable(Statement):
-    """
-    ALLOCATABLE [ :: ] <object-name> [ ( <deferred-shape-spec-list> ) ] [ , <object-name> [ ( <deferred-shape-spec-list> ) ] ]...
-    """
-    match = re.compile(r'allocatable\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[11:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'ALLOCATABLE ' + ', '.join(self.items) 
-    def analyze(self):
-        for line in self.items:
-            i = line.find('(')
-            if i==-1:
-                name = line
-                array_spec = None
-            else:
-                assert line.endswith(')')
-                name = line[:i].rstrip()
-                array_spec = split_comma(line[i+1:-1], self.item)
-            var = self.get_variable(name)
-            var.update('allocatable')
-            if array_spec is not None:
-                var.set_bounds(array_spec)
-        return
-
-class Asynchronous(StatementWithNamelist):
-    """
-    ASYNCHRONOUS [ :: ] <object-name-list>
-    """
-    match = re.compile(r'asynchronous\b',re.I).match
-    def analyze(self):
-        for name in self.items:
-            var = self.get_variable(name)
-            var.update('asynchronous')
-        return
-
-
-class Bind(Statement):
-    """
-    <language-binding-spec> [ :: ] <bind-entity-list>
-    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
-    <bind-entity> = <entity-name> | / <common-block-name> /
-    """
-    match = re.compile(r'bind\s*\(.*\)',re.I).match
-    def process_item(self):
-        line = self.item.line
-        self.specs, line = parse_bind(line, self.item)
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        items = []
-        for item in split_comma(line, self.item):
-            if item.startswith('/'):
-                assert item.endswith('/'),`item`
-                item = '/ ' + item[1:-1].strip() + ' /'
-            items.append(item)
-        self.items = items
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'BIND (%s) %s' %\
-               (', '.join(self.specs), ', '.join(self.items))
-
-# IF construct statements
-
-class Else(Statement):
-    """
-    ELSE [<if-construct-name>]
-    """
-    match = re.compile(r'else\b\s*\w*\s*\Z',re.I).match
-
-    def process_item(self):
-        item = self.item
-        self.name = item.get_line()[4:].strip()
-        parent_name = getattr(self.parent,'name','')
-        if self.name and self.name!=parent_name:
-            self.warning('expected if-construct-name %r but got %r, skipping.'\
-                         % (parent_name, self.name))
-            self.isvalid = False        
-        return
-
-    def __str__(self):
-        if self.name:
-            return self.get_indent_tab(deindent=True) + 'ELSE ' + self.name
-        return self.get_indent_tab(deindent=True) + 'ELSE'
-
-    def analyze(self): return
-
-class ElseIf(Statement):
-    """
-    ELSE IF ( <scalar-logical-expr> ) THEN [ <if-construct-name> ]
-    """
-    match = re.compile(r'else\s*if\s*\(.*\)\s*then\s*\w*\s*\Z',re.I).match
-
-    def process_item(self):
-        item = self.item
-        line = item.get_line()[4:].lstrip()[2:].lstrip()
-        i = line.find(')')
-        assert line[0]=='('
-        self.expr = item.apply_map(line[1:i])
-        self.name = line[i+1:].lstrip()[4:].strip()
-        parent_name = getattr(self.parent,'name','')
-        if self.name and self.name!=parent_name:
-            self.warning('expected if-construct-name %r but got %r, skipping.'\
-                         % (parent_name, self.name))
-            self.isvalid = False        
-        return
-        
-    def __str__(self):
-        s = ''
-        if self.name:
-            s = ' ' + self.name
-        return self.get_indent_tab(deindent=True) + 'ELSE IF (%s) THEN%s' \
-               % (self.expr, s)
-
-    def analyze(self): return
-
-# SelectCase construct statements
-
-class Case(Statement):
-    """
-    CASE <case-selector> [ <case-constract-name> ]
-    <case-selector> = ( <case-value-range-list> ) | DEFAULT
-    <case-value-range> = <case-value>
-                         | <case-value> :
-                         | : <case-value>
-                         | <case-value> : <case-value>
-    <case-value> = <scalar-(int|char|logical)-initialization-expr>
-    """
-    match = re.compile(r'case\b\s*(\(.*\)|DEFAULT)\s*\w*\Z',re.I).match
-    def process_item(self):
-        #assert self.parent.__class__.__name__=='Select',`self.parent.__class__`
-        line = self.item.get_line()[4:].lstrip()
-        if line.startswith('('):
-            i = line.find(')')
-            items = split_comma(line[1:i].strip(), self.item)
-            line = line[i+1:].lstrip()
-        else:
-            assert line.lower().startswith('default'),`line`
-            items = []
-            line = line[7:].lstrip()
-        for i in range(len(items)):
-            it = self.item.copy(items[i])
-            rl = []
-            for r in it.get_line().split(':'):
-                rl.append(it.apply_map(r.strip()))
-            items[i] = rl
-        self.items = items
-        self.name = line
-        parent_name = getattr(self.parent, 'name', '')
-        if self.name and self.name!=parent_name:
-            self.warning('expected case-construct-name %r but got %r, skipping.'\
-                         % (parent_name, self.name))
-            self.isvalid = False        
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        s = 'CASE'
-        if self.items:
-            l = []
-            for item in self.items:
-                l.append((' : '.join(item)).strip())
-            s += ' ( %s )' % (', '.join(l))
-        else:
-            s += ' DEFAULT'
-        if self.name:
-            s += ' ' + self.name
-        return s
-    def analyze(self): return
-
-# Where construct statements
-
-class Where(Statement):
-    """
-    WHERE ( <mask-expr> ) <where-assignment-stmt>
-    """
-    match = re.compile(r'where\s*\(.*\)\s*\w.*\Z',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[5:].lstrip()
-        i = line.index(')')
-        self.expr = self.item.apply_map(line[1:i].strip())
-        line = line[i+1:].lstrip()
-        newitem = self.item.copy(line)
-        cls = Assignment
-        if cls.match(line):
-            stmt = cls(self, newitem)
-            if stmt.isvalid:
-                self.content = [stmt]
-                return
-        self.isvalid = False
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        return tab + 'WHERE ( %s ) %s' % (self.expr, str(self.content[0]).lstrip())
-    def analyze(self): return
-
-WhereStmt = Where
-
-class ElseWhere(Statement):
-    """
-    ELSE WHERE ( <mask-expr> ) [ <where-construct-name> ]
-    ELSE WHERE [ <where-construct-name> ]
-    """
-    match = re.compile(r'else\s*where\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[4:].lstrip()[5:].lstrip()
-        self.expr = None
-        if line.startswith('('):
-            i = line.index(')')
-            assert i != -1,`line`
-            self.expr = self.item.apply_map(line[1:i].strip())
-            line = line[i+1:].lstrip()
-        self.name = line
-        parent_name = getattr(self.parent,'name','')
-        if self.name and not self.name==parent_name:
-            self.warning('expected where-construct-name %r but got %r, skipping.'\
-                         % (parent_name, self.name))
-            self.isvalid = False
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        s = 'ELSE WHERE'
-        if self.expr is not None:
-            s += ' ( %s )' % (self.expr)
-        if self.name:
-            s += ' ' + self.name
-        return tab + s
-    def analyze(self): return
-
-# Enum construct statements
-
-class Enumerator(Statement):
-    """
-    ENUMERATOR [ :: ] <enumerator-list>
-    <enumerator> = <named-constant> [ = <scalar-int-initialization-expr> ]
-    """
-    match = re.compile(r'enumerator\b',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[10:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = split_comma(line, self.item)
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'ENUMERATOR ' + ', '.join(self.items)
-
-# F2PY specific statements
-
-class FortranName(Statement):
-    """
-    FORTRANNAME <name>
-    """
-    match = re.compile(r'fortranname\s*\w+\Z',re.I).match
-    def process_item(self):
-        self.value = self.item.get_line()[11:].lstrip()
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'FORTRANNAME ' + self.value
-
-class Threadsafe(Statement):
-    """
-    THREADSAFE
-    """
-    match = re.compile(r'threadsafe\Z',re.I).match
-    def process_item(self):
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'THREADSAFE'
-
-class Depend(Statement):
-    """
-    DEPEND ( <name-list> ) [ :: ] <dummy-arg-name-list>
-
-    """
-    match = re.compile(r'depend\s*\(',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[6:].lstrip()
-        i = line.find(')')
-        self.depends = split_comma(line[1:i].strip(), self.item)
-        line = line[i+1:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.items = split_comma(line)
-        return
-
-    def __str__(self):
-        return self.get_indent_tab() + 'DEPEND ( %s ) %s' \
-               % (', '.join(self.depends), ', '.join(self.items))
-
-class Check(Statement):
-    """
-    CHECK ( <c-int-scalar-expr> ) [ :: ] <name>
-
-    """
-    match = re.compile(r'check\s*\(',re.I).match
-    def process_item(self):
-        line = self.item.get_line()[5:].lstrip()
-        i = line.find(')')
-        assert i!=-1,`line`
-        self.expr = self.item.apply_map(line[1:i].strip())
-        line = line[i+1:].lstrip()
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        self.value = line
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'CHECK ( %s ) %s' \
-               % (self.expr, self.value)
-
-class CallStatement(Statement):
-    """
-    CALLSTATEMENT <c-expr>
-    """
-    match = re.compile(r'callstatement\b', re.I).match
-    def process_item(self):
-        self.expr = self.item.apply_map(self.item.get_line()[13:].lstrip())
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'CALLSTATEMENT ' + self.expr
-
-class CallProtoArgument(Statement):
-    """
-    CALLPROTOARGUMENT <c-type-spec-list>
-    """
-    match = re.compile(r'callprotoargument\b', re.I).match
-    def process_item(self):
-        self.specs = self.item.apply_map(self.item.get_line()[17:].lstrip())
-        return
-    def __str__(self):
-        return self.get_indent_tab() + 'CALLPROTOARGUMENT ' + self.specs
-
-# Non-standard statements
-
-class Pause(Statement):
-    """
-    PAUSE [ <char-literal-constant|int-literal-constant> ]
-    """
-    match = re.compile(r'pause\s*(\d+|\'\w*\'|"\w*"|)\Z', re.I).match
-    def process_item(self):
-        self.value = self.item.apply_map(self.item.get_line()[5:].lstrip())
-        return
-    def __str__(self):
-        if self.value:
-            return self.get_indent_tab() + 'PAUSE ' + self.value
-        return self.get_indent_tab() + 'PAUSE'
-    def analyze(self): return
-

Deleted: trunk/numpy/f2py/lib/test_parser.py
===================================================================
--- trunk/numpy/f2py/lib/test_parser.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/test_parser.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,483 +0,0 @@
-
-from numpy.testing import *
-from block_statements import *
-from readfortran import Line, FortranStringReader
-
-
-def parse(cls, line, label='',
-          isfree=True, isstrict=False):
-    if label:
-        line = label + ' : ' + line
-    reader = FortranStringReader(line, isfree, isstrict)
-    item = reader.next()
-    if not cls.match(item.get_line()):
-        raise ValueError, '%r does not match %s pattern' % (line, cls.__name__)
-    stmt = cls(item, item)
-    if stmt.isvalid:
-        r = str(stmt)
-        if not isstrict:
-            r1 = parse(cls, r, isstrict=True)
-            if r != r1:
-                raise ValueError, 'Failed to parse %r with %s pattern in pyf mode, got %r' % (r, cls.__name__, r1)
-        return r
-    raise ValueError, 'parsing %r with %s pattern failed' % (line, cls.__name__)
-
-class test_Statements(NumpyTestCase):
-
-    def check_assignment(self):
-        assert_equal(parse(Assignment,'a=b'), 'a = b')
-        assert_equal(parse(PointerAssignment,'a=>b'), 'a => b')
-        assert_equal(parse(Assignment,'a (2)=b(n,m)'), 'a(2) = b(n,m)')
-        assert_equal(parse(Assignment,'a % 2(2,4)=b(a(i))'), 'a%2(2,4) = b(a(i))')
-
-    def check_assign(self):
-        assert_equal(parse(Assign,'assign 10 to a'),'ASSIGN 10 TO a')
-
-    def check_call(self):
-        assert_equal(parse(Call,'call a'),'CALL a')
-        assert_equal(parse(Call,'call a()'),'CALL a')
-        assert_equal(parse(Call,'call a(1)'),'CALL a(1)')
-        assert_equal(parse(Call,'call a(1,2)'),'CALL a(1, 2)')
-        assert_equal(parse(Call,'call a % 2 ( n , a+1 )'),'CALL a % 2(n, a+1)')
-
-    def check_goto(self):
-        assert_equal(parse(Goto,'go to 19'),'GO TO 19')
-        assert_equal(parse(Goto,'goto 19'),'GO TO 19')
-        assert_equal(parse(ComputedGoto,'goto (1, 2 ,3) a+b(2)'),
-                     'GO TO (1, 2, 3) a+b(2)')
-        assert_equal(parse(ComputedGoto,'goto (1, 2 ,3) , a+b(2)'),
-                     'GO TO (1, 2, 3) a+b(2)')
-        assert_equal(parse(AssignedGoto,'goto a'),'GO TO a')
-        assert_equal(parse(AssignedGoto,'goto a ( 1 )'),'GO TO a (1)')
-        assert_equal(parse(AssignedGoto,'goto a ( 1 ,2)'),'GO TO a (1, 2)')
-
-    def check_continue(self):
-        assert_equal(parse(Continue,'continue'),'CONTINUE')
-
-    def check_return(self):
-        assert_equal(parse(Return,'return'),'RETURN')
-        assert_equal(parse(Return,'return a'),'RETURN a')
-        assert_equal(parse(Return,'return a+1'),'RETURN a+1')
-        assert_equal(parse(Return,'return a(c, a)'),'RETURN a(c, a)')
-
-    def check_stop(self):
-        assert_equal(parse(Stop,'stop'),'STOP')
-        assert_equal(parse(Stop,'stop 1'),'STOP 1')
-        assert_equal(parse(Stop,'stop "a"'),'STOP "a"')
-        assert_equal(parse(Stop,'stop "a b"'),'STOP "a b"')
-
-    def check_print(self):
-        assert_equal(parse(Print, 'print*'),'PRINT *')
-        assert_equal(parse(Print, 'print "a b( c )"'),'PRINT "a b( c )"')
-        assert_equal(parse(Print, 'print 12, a'),'PRINT 12, a')
-        assert_equal(parse(Print, 'print 12, a , b'),'PRINT 12, a, b')
-        assert_equal(parse(Print, 'print 12, a(c,1) , b'),'PRINT 12, a(c,1), b')
-
-    def check_read(self):
-        assert_equal(parse(Read, 'read ( 10 )'),'READ (10)')
-        assert_equal(parse(Read, 'read ( 10 ) a '),'READ (10) a')
-        assert_equal(parse(Read, 'read ( 10 ) a , b'),'READ (10) a, b')
-        assert_equal(parse(Read, 'read *'),'READ *')
-        assert_equal(parse(Read, 'read 12'),'READ 12')
-        assert_equal(parse(Read, 'read "a b"'),'READ "a b"')
-        assert_equal(parse(Read, 'read "a b",a'),'READ "a b", a')
-        assert_equal(parse(Read, 'read * , a'),'READ *, a')
-        assert_equal(parse(Read, 'read "hey a" , a'),'READ "hey a", a')
-        assert_equal(parse(Read, 'read * , a  , b'),'READ *, a, b')
-        assert_equal(parse(Read, 'read ( unit  =10 )'),'READ (UNIT = 10)')
-        
-    def check_write(self):
-        assert_equal(parse(Write, 'write ( 10 )'),'WRITE (10)')
-        assert_equal(parse(Write, 'write ( 10 , a )'),'WRITE (10, a)')
-        assert_equal(parse(Write, 'write ( 10 ) b'),'WRITE (10) b')
-        assert_equal(parse(Write, 'write ( 10 ) a(1) , b+2'),'WRITE (10) a(1), b+2')
-        assert_equal(parse(Write, 'write ( unit=10 )'),'WRITE (UNIT = 10)')
-
-    def check_flush(self):
-        assert_equal(parse(Flush, 'flush 10'),'FLUSH (10)')
-        assert_equal(parse(Flush, 'flush (10)'),'FLUSH (10)')
-        assert_equal(parse(Flush, 'flush (UNIT = 10)'),'FLUSH (UNIT = 10)')
-        assert_equal(parse(Flush, 'flush (10, err=  23)'),'FLUSH (10, ERR = 23)')
-
-    def check_wait(self):
-        assert_equal(parse(Wait, 'wait(10)'),'WAIT (10)')
-        assert_equal(parse(Wait, 'wait(10,err=129)'),'WAIT (10, ERR = 129)')
-
-    def check_contains(self):
-        assert_equal(parse(Contains, 'contains'),'CONTAINS')
-
-    def check_allocate(self):
-        assert_equal(parse(Allocate, 'allocate (a)'), 'ALLOCATE (a)')
-        assert_equal(parse(Allocate, \
-                           'allocate (a, stat=b)'), 'ALLOCATE (a, STAT = b)')
-        assert_equal(parse(Allocate, 'allocate (a,b(:1))'), 'ALLOCATE (a, b(:1))')
-        assert_equal(parse(Allocate, \
-                           'allocate (real(8)::a)'), 'ALLOCATE (REAL(KIND=8) :: a)')
-    def check_deallocate(self):
-        assert_equal(parse(Deallocate, 'deallocate (a)'), 'DEALLOCATE (a)')
-        assert_equal(parse(Deallocate, 'deallocate (a, stat=b)'), 'DEALLOCATE (a, STAT = b)')
-
-    def check_moduleprocedure(self):
-        assert_equal(parse(ModuleProcedure,\
-                           'ModuleProcedure a'), 'MODULE PROCEDURE a')
-        assert_equal(parse(ModuleProcedure,\
-                           'module procedure a , b'), 'MODULE PROCEDURE a, b')
-
-    def check_access(self):
-        assert_equal(parse(Public,'Public'),'PUBLIC')
-        assert_equal(parse(Public,'public a'),'PUBLIC a')
-        assert_equal(parse(Public,'public :: a'),'PUBLIC a')
-        assert_equal(parse(Public,'public a,b,c'),'PUBLIC a, b, c')
-        assert_equal(parse(Public,'public :: a(:,:)'),'PUBLIC a(:,:)')
-        assert_equal(parse(Private,'private'),'PRIVATE')
-        assert_equal(parse(Private,'private :: a'),'PRIVATE a')
-
-    def check_close(self):
-        assert_equal(parse(Close,'close (12)'),'CLOSE (12)')
-        assert_equal(parse(Close,'close (12, err=99)'),'CLOSE (12, ERR = 99)')
-        assert_equal(parse(Close,'close (12, status = a(1,2))'),'CLOSE (12, STATUS = a(1,2))')
-
-    def check_cycle(self):
-        assert_equal(parse(Cycle,'cycle'),'CYCLE')
-        assert_equal(parse(Cycle,'cycle ab'),'CYCLE ab')
-
-    def check_rewind(self):
-        assert_equal(parse(Rewind,'rewind 1'),'REWIND (1)')
-        assert_equal(parse(Rewind,'rewind (1)'),'REWIND (1)')
-        assert_equal(parse(Rewind,'rewind (1, err =  123)'),'REWIND (1, ERR = 123)')
-
-    def check_backspace(self):
-        assert_equal(parse(Backspace,'backspace 1'),'BACKSPACE (1)')
-        assert_equal(parse(Backspace,'backspace (1)'),'BACKSPACE (1)')
-        assert_equal(parse(Backspace,'backspace (1, err =  123)'),'BACKSPACE (1, ERR = 123)')
-
-    def check_endfile(self):
-        assert_equal(parse(Endfile,'endfile 1'),'ENDFILE (1)')
-        assert_equal(parse(Endfile,'endfile (1)'),'ENDFILE (1)')
-        assert_equal(parse(Endfile,'endfile (1, err =  123)'),'ENDFILE (1, ERR = 123)')
-
-    def check_open(self):
-        assert_equal(parse(Open,'open (1)'),'OPEN (1)')
-        assert_equal(parse(Open,'open (1, err =  123)'),'OPEN (1, ERR = 123)')
-
-    def check_format(self):
-        assert_equal(parse(Format,'1: format ()'),'1: FORMAT ()')
-        assert_equal(parse(Format,'199 format (1)'),'199: FORMAT (1)')
-        assert_equal(parse(Format,'2 format (1 , SS)'),'2: FORMAT (1, ss)')
-
-    def check_save(self):
-        assert_equal(parse(Save,'save'), 'SAVE')
-        assert_equal(parse(Save,'save :: a'), 'SAVE a')
-        assert_equal(parse(Save,'save a,b'), 'SAVE a, b')
-
-    def check_data(self):
-        assert_equal(parse(Data,'data a /b/'), 'DATA a / b /')
-        assert_equal(parse(Data,'data a , c /b/'), 'DATA a, c / b /')
-        assert_equal(parse(Data,'data a /b ,c/'), 'DATA a / b, c /')
-        assert_equal(parse(Data,'data a /b/ c,e /d/'), 'DATA a / b / c, e / d /')
-        assert_equal(parse(Data,'data a(1,2) /b/'), 'DATA a(1,2) / b /')
-        assert_equal(parse(Data,'data a /b, c(1)/'), 'DATA a / b, c(1) /')
-
-    def check_nullify(self):
-        assert_equal(parse(Nullify,'nullify(a)'),'NULLIFY (a)')
-        assert_equal(parse(Nullify,'nullify(a  ,b)'),'NULLIFY (a, b)')
-
-    def check_use(self):
-        assert_equal(parse(Use, 'use a'), 'USE a')
-        assert_equal(parse(Use, 'use :: a'), 'USE a')
-        assert_equal(parse(Use, 'use, intrinsic:: a'), 'USE INTRINSIC :: a')
-        assert_equal(parse(Use, 'use :: a ,only: b'), 'USE a, ONLY: b')
-        assert_equal(parse(Use, 'use :: a , only: b=>c'), 'USE a, ONLY: b=>c')
-        assert_equal(parse(Use, 'use :: a , b=>c'), 'USE a, b=>c')
-        assert_equal(parse(Use,\
-                           'use :: a , only: operator(+) , b'),\
-                     'USE a, ONLY: operator(+), b')
-
-    def check_exit(self):
-        assert_equal(parse(Exit,'exit'),'EXIT')
-        assert_equal(parse(Exit,'exit ab'),'EXIT ab')        
-
-    def check_parameter(self):
-        assert_equal(parse(Parameter,'parameter (a = b(1,2))'),
-                     'PARAMETER (a = b(1,2))')
-        assert_equal(parse(Parameter,'parameter (a = b(1,2) , b=1)'),
-                     'PARAMETER (a = b(1,2), b=1)')
-
-    def check_equivalence(self):
-        assert_equal(parse(Equivalence,'equivalence (a , b)'),'EQUIVALENCE (a, b)')
-        assert_equal(parse(Equivalence,'equivalence (a , b) , ( c, d(1) , g  )'),
-                     'EQUIVALENCE (a, b), (c, d(1), g)')
-
-    def check_dimension(self):
-        assert_equal(parse(Dimension,'dimension a(b)'),'DIMENSION a(b)')
-        assert_equal(parse(Dimension,'dimension::a(b)'),'DIMENSION a(b)')
-        assert_equal(parse(Dimension,'dimension a(b)  , c(d)'),'DIMENSION a(b), c(d)')
-        assert_equal(parse(Dimension,'dimension a(b,c)'),'DIMENSION a(b,c)')
-
-    def check_target(self):
-        assert_equal(parse(Target,'target a(b)'),'TARGET a(b)')
-        assert_equal(parse(Target,'target::a(b)'),'TARGET a(b)')
-        assert_equal(parse(Target,'target a(b)  , c(d)'),'TARGET a(b), c(d)')
-        assert_equal(parse(Target,'target a(b,c)'),'TARGET a(b,c)')
-
-    def check_pointer(self):
-        assert_equal(parse(Pointer,'pointer a=b'),'POINTER a=b')
-        assert_equal(parse(Pointer,'pointer :: a=b'),'POINTER a=b')
-        assert_equal(parse(Pointer,'pointer a=b, c=d(1,2)'),'POINTER a=b, c=d(1,2)')
-
-    def check_protected(self):
-        assert_equal(parse(Protected,'protected a'),'PROTECTED a')
-        assert_equal(parse(Protected,'protected::a'),'PROTECTED a')
-        assert_equal(parse(Protected,'protected a , b'),'PROTECTED a, b')
-
-    def check_volatile(self):
-        assert_equal(parse(Volatile,'volatile a'),'VOLATILE a')
-        assert_equal(parse(Volatile,'volatile::a'),'VOLATILE a')
-        assert_equal(parse(Volatile,'volatile a , b'),'VOLATILE a, b')
-
-    def check_value(self):
-        assert_equal(parse(Value,'value a'),'VALUE a')
-        assert_equal(parse(Value,'value::a'),'VALUE a')
-        assert_equal(parse(Value,'value a , b'),'VALUE a, b')
-
-    def check_arithmeticif(self):
-        assert_equal(parse(ArithmeticIf,'if (a) 1,2,3'),'IF (a) 1, 2, 3')
-        assert_equal(parse(ArithmeticIf,'if (a(1)) 1,2,3'),'IF (a(1)) 1, 2, 3')
-        assert_equal(parse(ArithmeticIf,'if (a(1,2)) 1,2,3'),'IF (a(1,2)) 1, 2, 3')
-
-    def check_intrinsic(self):
-        assert_equal(parse(Intrinsic,'intrinsic a'),'INTRINSIC a')
-        assert_equal(parse(Intrinsic,'intrinsic::a'),'INTRINSIC a')
-        assert_equal(parse(Intrinsic,'intrinsic a , b'),'INTRINSIC a, b')
-
-    def check_inquire(self):
-        assert_equal(parse(Inquire, 'inquire (1)'),'INQUIRE (1)')
-        assert_equal(parse(Inquire, 'inquire (1, err=123)'),'INQUIRE (1, ERR = 123)')
-        assert_equal(parse(Inquire, 'inquire (iolength=a) b'),'INQUIRE (IOLENGTH = a) b')
-        assert_equal(parse(Inquire, 'inquire (iolength=a) b  ,c(1,2)'),
-                     'INQUIRE (IOLENGTH = a) b, c(1,2)')
-
-    def check_sequence(self):
-        assert_equal(parse(Sequence, 'sequence'),'SEQUENCE')
-
-    def check_external(self):
-        assert_equal(parse(External,'external a'),'EXTERNAL a')
-        assert_equal(parse(External,'external::a'),'EXTERNAL a')
-        assert_equal(parse(External,'external a , b'),'EXTERNAL a, b')
-
-    def check_common(self):
-        assert_equal(parse(Common, 'common a'),'COMMON a')
-        assert_equal(parse(Common, 'common a , b'),'COMMON a, b')
-        assert_equal(parse(Common, 'common a , b(1,2)'),'COMMON a, b(1,2)')
-        assert_equal(parse(Common, 'common // a'),'COMMON a')
-        assert_equal(parse(Common, 'common / name/ a'),'COMMON / name / a')
-        assert_equal(parse(Common, 'common / name/ a  , c'),'COMMON / name / a, c')
-        assert_equal(parse(Common, 'common / name/ a /foo/ c(1) ,d'),
-                     'COMMON / name / a / foo / c(1), d')
-        assert_equal(parse(Common, 'common / name/ a, /foo/ c(1) ,d'),
-                     'COMMON / name / a / foo / c(1), d')
-
-    def check_optional(self):
-        assert_equal(parse(Optional,'optional a'),'OPTIONAL a')
-        assert_equal(parse(Optional,'optional::a'),'OPTIONAL a')
-        assert_equal(parse(Optional,'optional a , b'),'OPTIONAL a, b')
-
-    def check_intent(self):
-        assert_equal(parse(Intent,'intent (in) a'),'INTENT (IN) a')
-        assert_equal(parse(Intent,'intent(in)::a'),'INTENT (IN) a')
-        assert_equal(parse(Intent,'intent(in) a , b'),'INTENT (IN) a, b')
-        assert_equal(parse(Intent,'intent (in, out) a'),'INTENT (IN, OUT) a')
-
-    def check_entry(self):
-        assert_equal(parse(Entry,'entry a'), 'ENTRY a')
-        assert_equal(parse(Entry,'entry a()'), 'ENTRY a')
-        assert_equal(parse(Entry,'entry a(b)'), 'ENTRY a (b)')
-        assert_equal(parse(Entry,'entry a(b,*)'), 'ENTRY a (b, *)')
-        assert_equal(parse(Entry,'entry a bind(c , name="a b")'),
-                     'ENTRY a BIND (C, NAME = "a b")')
-        assert_equal(parse(Entry,'entry a result (b)'), 'ENTRY a RESULT (b)')
-        assert_equal(parse(Entry,'entry a bind(d) result (b)'),
-                     'ENTRY a RESULT (b) BIND (D)')
-        assert_equal(parse(Entry,'entry a result (b) bind( c )'),
-                     'ENTRY a RESULT (b) BIND (C)')
-        assert_equal(parse(Entry,'entry a(b,*) result (g)'),
-                     'ENTRY a (b, *) RESULT (g)')
-
-    def check_import(self):
-        assert_equal(parse(Import,'import'),'IMPORT')
-        assert_equal(parse(Import,'import a'),'IMPORT a')
-        assert_equal(parse(Import,'import::a'),'IMPORT a')
-        assert_equal(parse(Import,'import a , b'),'IMPORT a, b')
-
-    def check_forall(self):
-        assert_equal(parse(ForallStmt,'forall (i = 1:n(k,:) : 2) a(i) = i*i*b(i)'),
-                     'FORALL (i = 1 : n(k,:) : 2) a(i) = i*i*b(i)')
-        assert_equal(parse(ForallStmt,'forall (i=1:n,j=2:3) a(i) = b(i,i)'),
-                     'FORALL (i = 1 : n, j = 2 : 3) a(i) = b(i,i)')
-        assert_equal(parse(ForallStmt,'forall (i=1:n,j=2:3, 1+a(1,2)) a(i) = b(i,i)'),
-                     'FORALL (i = 1 : n, j = 2 : 3, 1+a(1,2)) a(i) = b(i,i)')
-
-    def check_specificbinding(self):
-        assert_equal(parse(SpecificBinding,'procedure a'),'PROCEDURE a')
-        assert_equal(parse(SpecificBinding,'procedure :: a'),'PROCEDURE a')
-        assert_equal(parse(SpecificBinding,'procedure , NOPASS :: a'),'PROCEDURE , NOPASS :: a')
-        assert_equal(parse(SpecificBinding,'procedure , public, pass(x ) :: a'),'PROCEDURE , PUBLIC, PASS (x) :: a')
-        assert_equal(parse(SpecificBinding,'procedure(n) a'),'PROCEDURE (n) a')
-        assert_equal(parse(SpecificBinding,'procedure(n),pass :: a'),
-                     'PROCEDURE (n) , PASS :: a')
-        assert_equal(parse(SpecificBinding,'procedure(n) :: a'),
-                     'PROCEDURE (n) a')
-        assert_equal(parse(SpecificBinding,'procedure a= >b'),'PROCEDURE a => b')
-        assert_equal(parse(SpecificBinding,'procedure(n),pass :: a =>c'),
-                     'PROCEDURE (n) , PASS :: a => c')
-
-    def check_genericbinding(self):
-        assert_equal(parse(GenericBinding,'generic :: a=>b'),'GENERIC :: a => b')
-        assert_equal(parse(GenericBinding,'generic, public :: a=>b'),'GENERIC, PUBLIC :: a => b')
-        assert_equal(parse(GenericBinding,'generic, public :: a(1,2)=>b ,c'),
-                     'GENERIC, PUBLIC :: a(1,2) => b, c')
-
-    def check_finalbinding(self):
-        assert_equal(parse(FinalBinding,'final a'),'FINAL a')
-        assert_equal(parse(FinalBinding,'final::a'),'FINAL a')
-        assert_equal(parse(FinalBinding,'final a , b'),'FINAL a, b')
-
-    def check_allocatable(self):
-        assert_equal(parse(Allocatable,'allocatable a'),'ALLOCATABLE a')
-        assert_equal(parse(Allocatable,'allocatable :: a'),'ALLOCATABLE a')
-        assert_equal(parse(Allocatable,'allocatable a (1,2)'),'ALLOCATABLE a (1,2)')
-        assert_equal(parse(Allocatable,'allocatable a (1,2) ,b'),'ALLOCATABLE a (1,2), b')
-
-    def check_asynchronous(self):
-        assert_equal(parse(Asynchronous,'asynchronous a'),'ASYNCHRONOUS a')
-        assert_equal(parse(Asynchronous,'asynchronous::a'),'ASYNCHRONOUS a')
-        assert_equal(parse(Asynchronous,'asynchronous a , b'),'ASYNCHRONOUS a, b')
-
-    def check_bind(self):
-        assert_equal(parse(Bind,'bind(c) a'),'BIND (C) a')
-        assert_equal(parse(Bind,'bind(c) :: a'),'BIND (C) a')
-        assert_equal(parse(Bind,'bind(c) a ,b'),'BIND (C) a, b')
-        assert_equal(parse(Bind,'bind(c) /a/'),'BIND (C) / a /')
-        assert_equal(parse(Bind,'bind(c) /a/ ,b'),'BIND (C) / a /, b')
-        assert_equal(parse(Bind,'bind(c,name="hey") a'),'BIND (C, NAME = "hey") a')
-
-    def check_else(self):
-        assert_equal(parse(Else,'else'),'ELSE')
-        assert_equal(parse(ElseIf,'else if (a) then'),'ELSE IF (a) THEN')
-        assert_equal(parse(ElseIf,'else if (a.eq.b(1,2)) then'),
-                     'ELSE IF (a.eq.b(1,2)) THEN')
-
-    def check_case(self):
-        assert_equal(parse(Case,'case (1)'),'CASE ( 1 )')
-        assert_equal(parse(Case,'case (1:)'),'CASE ( 1 : )')
-        assert_equal(parse(Case,'case (:1)'),'CASE ( : 1 )')
-        assert_equal(parse(Case,'case (1:2)'),'CASE ( 1 : 2 )')
-        assert_equal(parse(Case,'case (a(1,2))'),'CASE ( a(1,2) )')
-        assert_equal(parse(Case,'case ("ab")'),'CASE ( "ab" )')
-        assert_equal(parse(Case,'case default'),'CASE DEFAULT')
-        assert_equal(parse(Case,'case (1:2 ,3:4)'),'CASE ( 1 : 2, 3 : 4 )')
-        assert_equal(parse(Case,'case (a(1,:):)'),'CASE ( a(1,:) : )')
-        assert_equal(parse(Case,'case default'),'CASE DEFAULT')
-
-    def check_where(self):
-        assert_equal(parse(WhereStmt,'where (1) a=1'),'WHERE ( 1 ) a = 1')
-        assert_equal(parse(WhereStmt,'where (a(1,2)) a=1'),'WHERE ( a(1,2) ) a = 1')
-
-    def check_elsewhere(self):
-        assert_equal(parse(ElseWhere,'else where'),'ELSE WHERE')
-        assert_equal(parse(ElseWhere,'elsewhere (1)'),'ELSE WHERE ( 1 )')
-        assert_equal(parse(ElseWhere,'elsewhere(a(1,2))'),'ELSE WHERE ( a(1,2) )')
-
-    def check_enumerator(self):
-        assert_equal(parse(Enumerator,'enumerator a'), 'ENUMERATOR a')
-        assert_equal(parse(Enumerator,'enumerator:: a'), 'ENUMERATOR a')
-        assert_equal(parse(Enumerator,'enumerator a,b'), 'ENUMERATOR a, b')
-        assert_equal(parse(Enumerator,'enumerator a=1'), 'ENUMERATOR a=1')
-        assert_equal(parse(Enumerator,'enumerator a=1 , b=c(1,2)'), 'ENUMERATOR a=1, b=c(1,2)')
-
-    def check_fortranname(self):
-        assert_equal(parse(FortranName,'fortranname a'),'FORTRANNAME a')
-
-    def check_threadsafe(self):
-        assert_equal(parse(Threadsafe,'threadsafe'),'THREADSAFE')
-
-    def check_depend(self):
-        assert_equal(parse(Depend,'depend( a) b'), 'DEPEND ( a ) b')
-        assert_equal(parse(Depend,'depend( a) ::b'), 'DEPEND ( a ) b')
-        assert_equal(parse(Depend,'depend( a,c) b,e'), 'DEPEND ( a, c ) b, e')
-
-    def check_check(self):
-        assert_equal(parse(Check,'check(1) a'), 'CHECK ( 1 ) a')
-        assert_equal(parse(Check,'check(1) :: a'), 'CHECK ( 1 ) a')
-        assert_equal(parse(Check,'check(b(1,2)) a'), 'CHECK ( b(1,2) ) a')
-        assert_equal(parse(Check,'check(a>1) :: a'), 'CHECK ( a>1 ) a')
-
-    def check_callstatement(self):
-        assert_equal(parse(CallStatement,'callstatement (*func)()',isstrict=1),
-                     'CALLSTATEMENT (*func)()')
-        assert_equal(parse(CallStatement,'callstatement i=1;(*func)()',isstrict=1),
-                     'CALLSTATEMENT i=1;(*func)()')
-
-    def check_callprotoargument(self):
-        assert_equal(parse(CallProtoArgument,'callprotoargument int(*), double'),
-                     'CALLPROTOARGUMENT int(*), double')
-
-    def check_pause(self):
-        assert_equal(parse(Pause,'pause'),'PAUSE')
-        assert_equal(parse(Pause,'pause 1'),'PAUSE 1')
-        assert_equal(parse(Pause,'pause "hey"'),'PAUSE "hey"')
-        assert_equal(parse(Pause,'pause "hey pa"'),'PAUSE "hey pa"')
-
-    def check_integer(self):
-        assert_equal(parse(Integer,'integer'),'INTEGER')
-        assert_equal(parse(Integer,'integer*4'),'INTEGER(KIND=4)')
-        assert_equal(parse(Integer,'integer*4 a'),'INTEGER(KIND=4) a')
-        assert_equal(parse(Integer,'integer*4, a'),'INTEGER(KIND=4) a')
-        assert_equal(parse(Integer,'integer*4 a ,b'),'INTEGER(KIND=4) a, b')
-        assert_equal(parse(Integer,'integer*4 :: a ,b'),'INTEGER(KIND=4) a, b')
-        assert_equal(parse(Integer,'integer*4 a(1,2)'),'INTEGER(KIND=4) a(1,2)')
-        assert_equal(parse(Integer,'integer*4 :: a(1,2),b'),'INTEGER(KIND=4) a(1,2), b')
-        assert_equal(parse(Integer,'integer*4 external :: a'),
-                     'INTEGER(KIND=4), external :: a')
-        assert_equal(parse(Integer,'integer*4, external :: a'),
-                     'INTEGER(KIND=4), external :: a')
-        assert_equal(parse(Integer,'integer*4 external , intent(in) :: a'),
-                     'INTEGER(KIND=4), external, intent(in) :: a')
-        assert_equal(parse(Integer,'integer(kind=4)'),'INTEGER(KIND=4)')
-        assert_equal(parse(Integer,'integer ( kind = 4)'),'INTEGER(KIND=4)')
-        assert_equal(parse(Integer,'integer(kind=2+2)'),'INTEGER(KIND=2+2)')
-        assert_equal(parse(Integer,'integer(kind=f(4,5))'),'INTEGER(KIND=f(4,5))')
-
-    def check_character(self):
-        assert_equal(parse(Character,'character'),'CHARACTER')
-        assert_equal(parse(Character,'character*2'),'CHARACTER(LEN=2)')
-        assert_equal(parse(Character,'character**'),'CHARACTER(LEN=*)')
-        assert_equal(parse(Character,'character*(2)'),'CHARACTER(LEN=2)')
-        assert_equal(parse(Character,'character*(len =2)'),'CHARACTER(LEN=2)')
-        assert_equal(parse(Character,'character*(len =2),'),'CHARACTER(LEN=2)')
-        assert_equal(parse(Character,'character*(len =:)'),'CHARACTER(LEN=:)')
-        assert_equal(parse(Character,'character(len =2)'),'CHARACTER(LEN=2)')
-        assert_equal(parse(Character,'character(2)'),'CHARACTER(LEN=2)')
-        assert_equal(parse(Character,'character(kind=2)'),'CHARACTER(KIND=2)')
-        assert_equal(parse(Character,'character(kind=2,len=3)'),
-                     'CHARACTER(LEN=3, KIND=2)')
-        assert_equal(parse(Character,'character(lEN=3,kind=2)'),
-                     'CHARACTER(LEN=3, KIND=2)')
-        assert_equal(parse(Character,'character(len=3,kind=2)', isstrict=True),
-                     'CHARACTER(LEN=3, KIND=2)')
-        assert_equal(parse(Character,'chaRACTER(len=3,kind=fA(1,2))', isstrict=True),
-                     'CHARACTER(LEN=3, KIND=fA(1,2))')
-        assert_equal(parse(Character,'character(len=3,kind=fA(1,2))'),
-                     'CHARACTER(LEN=3, KIND=fa(1,2))')
-        
-    def check_implicit(self):
-        assert_equal(parse(Implicit,'implicit none'),'IMPLICIT NONE')
-        assert_equal(parse(Implicit,'implicit'),'IMPLICIT NONE')
-        assert_equal(parse(Implicit,'implicit integer (i-m)'),
-                     'IMPLICIT INTEGER ( i-m )')
-        assert_equal(parse(Implicit,'implicit integer (i-m,p,q-r)'),
-                     'IMPLICIT INTEGER ( i-m, p, q-r )')
-        assert_equal(parse(Implicit,'implicit integer (i-m), real (z)'),
-                     'IMPLICIT INTEGER ( i-m ), REAL ( z )')
-if __name__ == "__main__":
-    NumpyTest().run()

Deleted: trunk/numpy/f2py/lib/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/typedecl_statements.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/typedecl_statements.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,562 +0,0 @@
-
-__all__ = ['Integer', 'Real', 'DoublePrecision', 'Complex', 'DoubleComplex',
-           'Character', 'Logical', 'Byte', 'TypeStmt','Class',
-           'intrinsic_type_spec', 'declaration_type_spec',
-           'Implicit']
-
-import re
-import string
-from base_classes import Statement, BeginStatement, EndStatement,\
-     AttributeHolder, Variable
-from utils import split_comma, AnalyzeError, name_re, is_entity_decl, is_name, CHAR_BIT
-
-# Intrinsic type specification statements
-
-class TypeDeclarationStatement(Statement):
-    """
-    <declaration-type-spec> [ [, <attr-spec>] :: ] <entity-decl-list>
-    <declaration-type-spec> = <intrinsic-type-spec>
-                              | TYPE ( <derived-type-spec> )
-                              | CLASS ( <derived-type-spec> )
-                              | CLASS ( * )
-
-    <derived-type-spec> = <type-name> [ ( <type-param-spec-list> ) ]
-    <type-param-spec> = [ <keyword> = ] <type-param-value>
-    <type-param-value> = <scalar-int-expr> | * | :
-
-    <intrinsic-type-spec> = INTEGER [<kind-selector>]
-                            | REAL [<kind-selector>]
-                            | DOUBLE PRECISION
-                            | COMPLEX [<kind-selector>]
-                            | CHARACTER [<char-selector>]
-                            | LOGICAL [<kind-selector>]
-
-    <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
-    EXTENSION:
-      <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
-                        | * <length>
-    
-    <char-selector> = <length-selector>
-                      | ( LEN = <type-param-value>, KIND = <scalar-int-initialization-expr> )
-                      | ( <type-param-value>, [ KIND = ] <scalar-int-initialization-expr> )
-                      | ( KIND = <scalar-int-initialization-expr> [, LEN = <type-param-value>] )
-    <length-selector> = ( [ LEN = ] <type-param-value> )
-                        | * <char-length> [ , ]
-    <char-length> = ( <type-param-value> ) | <scalar-int-literal-constant>
-
-    <attr-spec> = <access-spec> | ALLOCATABLE | ASYNCHRONOUS
-                  | DIMENSION ( <array-spec> ) | EXTERNAL
-                  | INTENT ( <intent-spec> ) | INTRINSIC
-                  | <language-binding-spec> | OPTIONAL
-                  | PARAMETER | POINTER | PROTECTED | SAVE
-                  | TARGET | VALUE | VOLATILE
-    <entity-decl> = <object-name> [ ( <array-spec> ) ] [ * <char-length> ] [ <initialization> ]
-                  | <function-name> [ * <char-length> ]
-    <initialization> =  = <initialization-expr>
-                        | => NULL
-    <access-spec> = PUBLIC | PRIVATE
-    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr>] )
-    <array-spec> =   <explicit-shape-spec-list>
-                   | <assumed-shape-spec-list>
-                   | <deferred-shape-spec-list>
-                   | <assumed-size-spec>
-    <explicit-shape-spec> = [ <lower-bound> : ] <upper-bound>
-    <assumed-shape-spec> = [ <lower-bound> ] :
-    <deferred-shape-spec> = :
-    <assumed-size-spec> = [ <explicit-shape-spec-list> , ] [ <lower-bound> : ] *
-    <bound> = <specification-expr>
-
-    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
-    <digit-string> = <digit> [ <digit> ]..
-    <kind-param> = <digit-string> | <scalar-int-constant-name>
-    """
-    _repr_attr_names = ['selector','attrspec','entity_decls'] + Statement._repr_attr_names
-
-    def process_item(self):
-        item = self.item
-        apply_map = item.apply_map
-        clsname = self.__class__.__name__.lower()
-        line = item.get_line()
-        from block_statements import Function
-
-        if not line.lower().startswith(clsname):
-            i = 0
-            j = 0
-            for c in line:
-                i += 1
-                if c==' ': continue
-                j += 1
-                if j==len(clsname):
-                    break
-            line = line[:i].replace(' ','') + line[i:]
-
-        assert line.lower().startswith(clsname),`line,clsname`
-        line = line[len(clsname):].lstrip()
-
-        if line.startswith('('):
-            i = line.find(')')
-            selector = apply_map(line[:i+1].strip())
-            line = line[i+1:].lstrip()
-        elif line.startswith('*'):
-            selector = '*'
-            line = line[1:].lstrip()
-            if line.startswith('('):
-                i = line.find(')')
-                selector += apply_map(line[:i+1].rstrip())
-                line = line[i+1:].lstrip()
-            else:
-                m = re.match(r'\d+(_\w+|)|[*]',line)
-                if not m:
-                    self.isvalid = False
-                    return
-                i = m.end()
-                selector += line[:i].rstrip()
-                line = line[i:].lstrip()
-        else:
-            selector = ''
-
-        fm = Function.match(line)
-        if fm:
-            l2 = line[:fm.end()]
-            m2 = re.match(r'.*?\b(?P<name>\w+)\Z',l2)
-            if not m2:
-                self.isvalid = False
-                return
-            fname = m2.group('name')
-            fitem = item.copy(clsname+selector+' :: '+fname,
-                              apply_map=True)
-            self.parent.put_item(fitem)
-            item.clone(line)
-            self.isvalid = False
-            return
-
-        if line.startswith(','):
-            line = line[1:].lstrip()
-
-        self.raw_selector = selector
-        if isinstance(self, Character):
-            self.selector = self._parse_char_selector(selector)
-        else:
-            self.selector = self._parse_kind_selector(selector)
-
-        i = line.find('::')
-        if i==-1:
-            self.attrspec = []
-            self.entity_decls = split_comma(line, self.item)
-        else:
-            self.attrspec = split_comma(line[:i].rstrip(), self.item)
-            self.entity_decls = split_comma(line[i+2:].lstrip(), self.item)
-        for entity in self.entity_decls:
-            if not is_entity_decl(entity):
-                self.isvalid = False
-                return
-
-        if isinstance(self.parent, Function) \
-               and self.parent.name in self.entity_decls:
-            assert self.parent.typedecl is None,`self.parent.typedecl`
-            self.parent.typedecl = self
-            self.ignore = True
-        if isinstance(self, Type):
-            self.name = self.selector[1].lower()
-            assert is_name(self.name),`self.name`
-        else:
-            self.name = clsname
-        return
-
-    def _parse_kind_selector(self, selector):
-        if not selector:
-            return '',''
-        length,kind = '',''
-        if selector.startswith('*'):
-            length = selector[1:].lstrip()
-        else:
-            assert selector[0]+selector[-1]=='()',`selector`
-            l = selector[1:-1].strip()
-            if l.lower().startswith('kind'):
-                l = l[4:].lstrip()
-                assert l.startswith('='),`l`
-                kind = l[1:].lstrip()
-            else:
-                kind = l
-        return length,kind
-
-    def _parse_char_selector(self, selector):
-        if not selector:
-            return '',''
-        if selector.startswith('*'):
-            l = selector[1:].lstrip()
-            if l.startswith('('):
-                if l.endswith(','): l = l[:-1].rstrip()
-                assert l.endswith(')'),`l`
-                l = l[1:-1].strip()
-                if l.lower().startswith('len'):
-                    l = l[3:].lstrip()[1:].lstrip()
-            kind=''
-        else:
-            assert selector[0]+selector[-1]=='()',`selector`
-            l = split_comma(selector[1:-1].strip(), self.item)
-            if len(l)==1:
-                l = l[0]
-                if l.lower().startswith('len'):
-                    l=l[3:].lstrip()
-                    assert l.startswith('='),`l`
-                    l=l[1:].lstrip()
-                    kind = ''
-                elif l.lower().startswith('kind'):
-                    kind = l[4:].lstrip()[1:].lstrip()
-                    l = ''
-                else:
-                    kind = ''                    
-            else:
-                assert len(l)==2
-                if l[0].lower().startswith('len'):
-                    assert l[1].lower().startswith('kind'),`l`
-                    kind = l[1][4:].lstrip()[1:].lstrip()
-                    l = l[0][3:].lstrip()[1:].lstrip()
-                elif l[0].lower().startswith('kind'):
-                    assert l[1].lower().startswith('len'),`l`
-                    kind = l[0][4:].lstrip()[1:].lstrip()
-                    l = l[1][3:].lstrip()[1:].lstrip()
-                else:
-                    if l[1].lower().startswith('kind'):
-                        kind = l[1][4:].lstrip()[1:].lstrip()
-                        l = l[0]
-                    else:
-                        kind = l[1]
-                        l = l[0]
-        return l,kind
-
-    def tostr(self):
-        clsname = self.__class__.__name__.upper()
-        s = ''
-        length, kind = self.selector
-        if isinstance(self, Character):
-            if length and kind:
-                s += '(LEN=%s, KIND=%s)' % (length,kind)
-            elif length:
-                s += '(LEN=%s)' % (length)
-            elif kind:
-                s += '(KIND=%s)' % (kind)
-        else:
-            if isinstance(self, Type):
-                s += '(%s)' % (kind)
-            else:
-                if length:
-                    s += '*%s' % (length)
-                if kind:
-                    s += '(KIND=%s)' % (kind)
-                
-        return clsname + s
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        s = self.tostr()
-        if self.attrspec:
-            s += ', ' + ', '.join(self.attrspec)
-            if self.entity_decls:
-                s += ' ::'
-        if self.entity_decls:
-            s += ' ' + ', '.join(self.entity_decls)
-        return tab + s
-
-    def __eq__(self, other):
-        if self.__class__ is not other.__class__:
-            return False
-        return self.selector==other.selector
-
-    def astypedecl(self):
-        if self.entity_decls or self.attrspec:
-            return self.__class__(self.parent, self.item.copy(self.tostr()))
-        return self
-
-    def analyze(self):
-        if not self.entity_decls:
-            return
-        variables = self.parent.a.variables
-        typedecl = self.astypedecl()
-        for item in self.entity_decls:
-            name, array_spec, char_length, value = self._parse_entity(item)
-            var = self.parent.get_variable(name)
-            var.add_parent(self)
-            if char_length:
-                var.set_length(char_length)
-            else:
-                var.set_type(typedecl)
-            var.update(self.attrspec)
-            if array_spec:
-                var.set_bounds(array_spec)
-            if value:
-                var.set_init(value)
-            var.analyze()
-        return
-
-    def _parse_entity(self, line):
-        m = name_re(line)
-        assert m,`line,self.item,self.__class__.__name__`
-        name = line[:m.end()]
-        line = line[m.end():].lstrip()
-        array_spec = None
-        item = self.item.copy(line)
-        line = item.get_line()
-        if line.startswith('('):
-            i = line.find(')')
-            assert i!=-1,`line`
-            array_spec = split_comma(line[1:i].strip(), item)
-            line = line[i+1:].lstrip()
-        char_length = None
-        if line.startswith('*'):
-            i = line.find('=')
-            if i==-1:
-                char_length = item.apply_map(line[1:].lstrip())
-                line = ''
-            else:
-                char_length = item.apply_map(line[1:i].strip())
-                line = line[i:]
-        value = None
-        if line.startswith('='):
-            value = item.apply_map(line[1:].lstrip())
-        return name, array_spec, char_length, value
-
-    def get_zero_value(self):
-        raise NotImplementedError,`self.__class__.__name__`
-
-    def assign_expression(self, name, value):
-        return '%s = %s' % (name, value)
-
-    def get_kind(self):
-        return self.selector[1] or self.default_kind
-
-    def get_length(self):
-        return self.selector[0] or 1
-
-    def get_bit_size(self):
-        return CHAR_BIT * int(self.get_kind())
-
-    def get_byte_size(self):
-        return self.get_bit_size() / CHAR_BIT
-
-    def is_intrinsic(self): return not isinstance(self,(Type,Class))
-    def is_derived(self): return isinstance(self,Type)
-
-    def is_numeric(self): return isinstance(self,(Integer,Real, DoublePrecision,Complex,DoubleComplex,Byte))
-    def is_nonnumeric(self): return isinstance(self,(Character,Logical))
-
-
-class Integer(TypeDeclarationStatement):
-    match = re.compile(r'integer\b',re.I).match
-    default_kind = 4
-
-    def get_c_type(self):
-        return 'npy_int%s' % (self.get_bit_size())
-
-    def get_zero_value(self):
-        kind = self.get_kind()
-        if kind==self.default_kind: return '0'
-        return '0_%s' % (kind)
-
-class Real(TypeDeclarationStatement):
-    match = re.compile(r'real\b',re.I).match
-    default_kind = 4
-
-    def get_c_type(self):
-        return 'npy_float%s' % (self.get_bit_size())
-
-    def get_zero_value(self):
-        kind = self.get_kind()
-        if kind==self.default_kind: return '0.0'
-        return '0_%s' % (kind)
-
-class DoublePrecision(TypeDeclarationStatement):
-    match = re.compile(r'double\s*precision\b',re.I).match
-    default_kind = 8
-    
-    def get_zero_value(self):
-        return '0.0D0'
-
-    def get_c_type(self):
-        return 'npy_float%s' % (self.get_bit_size())
-
-class Complex(TypeDeclarationStatement):
-    match = re.compile(r'complex\b',re.I).match
-    default_kind = 4
-
-    def get_kind(self):
-        length, kind = self.selector
-        if kind:
-            return kind
-        if length:
-            return int(length)/2
-        return self.default_kind
-
-    def get_length(self):
-        return 2 * int(self.get_kind())
-
-    def get_bit_size(self):
-        return CHAR_BIT * self.get_length()
-
-    def get_zero_value(self):
-        kind = self.get_kind()
-        if kind==self.default_kind: return '(0.0, 0.0)'
-        return '(0.0_%s, 0.0_%s)' % (kind, kind)
-
-    def get_c_type(self):
-        return 'npy_complex%s' % (self.get_bit_size())
-
-class DoubleComplex(TypeDeclarationStatement):
-    # not in standard
-    match = re.compile(r'double\s*complex\b',re.I).match
-    default_kind = 8
-
-    def get_kind(self): return self.default_kind
-    def get_length(self): return 2 * self.get_kind()
-    def get_bit_size(self):
-        return CHAR_BIT * self.get_length()
-
-    def get_zero_value(self):
-        return '(0.0D0,0.0D0)'
-
-    def get_c_type(self):
-        return 'npy_complex%s' % (self.get_bit_size())
-
-class Logical(TypeDeclarationStatement):
-    match = re.compile(r'logical\b',re.I).match
-    default_kind = 4
-
-    def get_zero_value(self):
-        return ".FALSE."
-
-    def get_c_type(self):
-        return 'npy_int%s' % (self.get_bit_size())
-
-class Character(TypeDeclarationStatement):
-    match = re.compile(r'character\b',re.I).match
-    default_kind = 1
-
-    def get_bit_size(self):
-        return CHAR_BIT * int(self.get_length()) * int(self.get_kind())
-
-    def get_c_type(self):
-        return 'f2py_string%s' % (self.get_bit_size())
-
-    def get_zero_value(self):
-        return "''"
-
-class Byte(TypeDeclarationStatement):
-    # not in standard
-    match = re.compile(r'byte\b',re.I).match
-    default_kind = 1
-
-    def get_zero_value(self):
-        return '0'
-
-    def get_c_type(self):
-        return 'npy_int%s' % (self.get_bit_size())
-
-class Type(TypeDeclarationStatement):
-    match = re.compile(r'type\s*\(', re.I).match
-
-    def get_zero_value(self):
-        type_decl = self.get_type_decl(self.name)
-        component_names = type_decl.a.component_names
-        components = type_decl.a.components
-        l = []
-        for name in component_names:
-            var = components[name]
-            l.append(var.typedecl.get_zero_value())
-        return '%s(%s)' % (type_decl.name, ', '.join(l))
-
-    def get_kind(self):
-        # See 4.5.2, page 48
-        raise NotImplementedError,`self.__class__.__name__`
-
-    def get_bit_size(self):
-        return self.get_type_decl(self.name).get_bit_size()
-
-    def get_c_type(self):
-        return self.get_type_decl(self.name).get_c_type()
-    
-TypeStmt = Type
-
-class Class(TypeDeclarationStatement):
-    match = re.compile(r'class\s*\(', re.I).match
-
-class Implicit(Statement):
-    """
-    IMPLICIT <implicit-spec-list>
-    IMPLICIT NONE
-    <implicit-spec> = <declaration-type-spec> ( <letter-spec-list> )
-    <letter-spec> = <letter> [ - <letter> ]
-    """
-    match = re.compile(r'implicit\b',re.I).match
-
-    letters = string.lowercase
-
-    def process_item(self):
-        line = self.item.get_line()[8:].lstrip()
-        if line.lower()=='none':
-            self.items = []
-            return
-        items = []
-        for item in split_comma(line, self.item):
-            i = item.find('(')
-            assert i!=-1 and item.endswith(')'),`item`
-            specs = []
-            for spec in split_comma(item[i+1:-1].strip(), self.item):
-                if '-' in spec:
-                    s,e = spec.lower().split('-')
-                    assert s in self.letters and e in self.letters
-                else:
-                    e = s = spec.lower()
-                    assert s in self.letters
-                specs.append((s,e))
-            self.specs = specs
-            tspec = item[:i].rstrip()
-            stmt = None
-            for cls in declaration_type_spec:
-                if cls.match(tspec):
-                    stmt = cls(self, self.item.copy(tspec))
-                    if stmt.isvalid:
-                        break
-            assert stmt is not None,`item,line`
-            items.append((stmt,specs))
-        self.items = items
-        return
-
-    def __str__(self):
-        tab = self.get_indent_tab()
-        if not self.items:
-            return tab + 'IMPLICIT NONE'
-        l = []
-        for stmt,specs in self.items:
-            l1 = []
-            for s,e in specs:
-                if s==e:
-                    l1.append(s)
-                else:
-                    l1.append(s + '-' + e)
-            l.append('%s ( %s )' % (stmt.tostr(), ', '.join(l1)))
-        return tab + 'IMPLICIT ' + ', '.join(l)
-
-    def analyze(self):
-        implicit_rules = self.parent.a.implicit_rules
-        if not self.items:
-            if implicit_rules:
-                self.warning('overriding previously set implicit rule mapping'\
-                      ' %r.' % (implicit_rules))
-            self.parent.a.implicit_rules = None
-            return
-        if implicit_rules is None:
-            self.warning('overriding previously set IMPLICIT NONE')
-            self.parent.a.implicit_rules = implicit_rules = {}
-        for stmt,specs in self.items:
-            s,e = specs
-            for l in string.lowercase[string.lowercase.index(s.lower()):\
-                                      string.lowercase.index(e.lower())+1]:
-                implicit_rules[l] = stmt
-        return
-
-intrinsic_type_spec = [ \
-    Integer , Real,
-    DoublePrecision, Complex, DoubleComplex, Character, Logical, Byte
-    ]
-declaration_type_spec = intrinsic_type_spec + [ TypeStmt, Class ]

Deleted: trunk/numpy/f2py/lib/utils.py
===================================================================
--- trunk/numpy/f2py/lib/utils.py	2006-09-30 23:33:23 UTC (rev 3237)
+++ trunk/numpy/f2py/lib/utils.py	2006-10-01 11:49:23 UTC (rev 3238)
@@ -1,154 +0,0 @@
-
-import re
-import os, glob
-
-class ParseError(Exception):
-    pass
-
-class AnalyzeError(Exception):
-    pass
-
-is_name = re.compile(r'^[a-z_]\w*$',re.I).match
-name_re = re.compile(r'[a-z_]\w*',re.I).match
-is_entity_decl = re.compile(r'^[a-z_]\w*',re.I).match
-is_int_literal_constant = re.compile(r'^\d+(_\w+|)$').match
-
-def split_comma(line, item = None, comma=','):
-    items = []
-    if item is None:
-        for s in line.split(comma):
-            s = s.strip()
-            if not s: continue
-            items.append(s)
-        return items
-    newitem = item.copy(line, True)
-    apply_map = newitem.apply_map
-    for s in newitem.get_line().split(comma):
-        s = apply_map(s).strip()
-        if not s: continue
-        items.append(s)
-    return items
-
-def specs_split_comma(line, item = None, upper=False):
-    specs0 = split_comma(line, item)
-    specs = []
-    for spec in specs0:
-        i = spec.find('=')
-        if i!=-1:
-            kw = spec[:i].strip().upper()
-            v  = spec[i+1:].strip()
-            specs.append('%s = %s' % (kw, v))
-        else:
-            if upper:
-                spec = spec.upper()
-            specs.append(spec)
-    return specs
-
-def parse_bind(line, item = None):
-    if not line.lower().startswith('bind'):
-        return None, line
-    if item is not None:
-        newitem = item.copy(line, apply_map=True)
-        newline = newitem.get_line()
-    else:
-        newitem = None
-    newline = newline[4:].lstrip()
-    i = newline.find(')')
-    assert i!=-1,`newline`
-    args = []
-    for a in specs_split_comma(newline[1:i].strip(), newitem, upper=True):
-        args.append(a)
-    rest = newline[i+1:].lstrip()
-    if item is not None:
-        rest = newitem.apply_map(rest)
-    return args, rest
-
-def parse_result(line, item = None):
-    if not line.lower().startswith('result'):
-        return None, line
-    line = line[6:].lstrip()
-    i = line.find(')')
-    assert i != -1,`line`
-    name = line[1:i].strip()
-    assert is_name(name),`name`
-    return name, line[i+1:].lstrip()
-
-def filter_stmts(content, classes):
-    """ Pop and return classes instances from content.
-    """
-    stmts = []
-    indices = []
-    for i in range(len(content)):
-        stmt = content[i]
-        if isinstance(stmt, classes):
-            stmts.append(stmt)
-            indices.append(i)
-    indices.reverse()
-    for i in indices:
-        del content[i]
-    return stmts
-
-
-def get_module_files(directory, _cache={}):
-    if _cache.has_key(directory):
-        return _cache[directory]
-    module_line = re.compile(r'(\A|^)module\s+(?P<name>\w+)\s*(!.*|)$',re.I | re.M)
-    d = {}
-    for fn in glob.glob(os.path.join(directory,'*.f90')):
-        f = open(fn,'r')
-        for name in module_line.findall(f.read()):
-            name = name[1]
-            if d.has_key(name):
-                print d[name],'already defines',name
-                continue
-            d[name] = fn
-    _cache[directory] = d
-    return d
-
-def get_module_file(name, directory, _cache={}):
-    fn = _cache.get(name, None)
-    if fn is not None:
-        return fn
-    if name.endswith('_module'):
-        f1 = os.path.join(directory,name[:-7]+'.f90')
-        if os.path.isfile(f1):
-            _cache[name] = fn
-            return f1
-    pattern = re.compile(r'\s*module\s+(?P<name>[a-z]\w*)', re.I).match
-    for fn in glob.glob(os.path.join(directory,'*.f90')):
-        f = open(fn,'r')
-        for line in f:
-            m = pattern(line)
-            if m and m.group('name')==name:
-                _cache[name] = fn
-                f.close()
-                return fn
-        f.close()
-    return
-
-def str2stmt(string, isfree=True, isstrict=False):
-    """ Convert Fortran code to Statement tree.
-    """
-    from readfortran import Line, FortranStringReader
-    from parsefortran import FortranParser
-    reader = FortranStringReader(string, isfree, isstrict)
-    parser = FortranParser(reader)
-    parser.parse()
-    parser.analyze()
-    block = parser.block
-    while len(block.content)==1:
-        block = block.content[0]
-    return block
-
-def get_char_bit():
-    import numpy
-    one = numpy.ubyte(1)
-    two = numpy.ubyte(2)
-    n = numpy.ubyte(2)
-    i = 1
-    while n>=two:
-        n <<= one
-        i += 1
-    return i
-
-CHAR_BIT = get_char_bit()



From numpy-svn at scipy.org  Sun Oct  1 16:48:43 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun,  1 Oct 2006 15:48:43 -0500 (CDT)
Subject: [Numpy-svn] r3239 - in trunk/numpy/f2py/lib: . parser src
Message-ID: <20061001204843.008BF39C030@new.scipy.org>

Author: pearu
Date: 2006-10-01 15:48:37 -0500 (Sun, 01 Oct 2006)
New Revision: 3239

Added:
   trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp
Modified:
   trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/python_wrapper.py
Log:
F2PY G3: fixed bugs, added float and complex scalars support.

Modified: trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
===================================================================
--- trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-01 11:49:23 UTC (rev 3238)
+++ trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-01 20:48:37 UTC (rev 3239)
@@ -9,15 +9,44 @@
 from parser.api import CHAR_BIT
 
 def pyobj_from_npy_int(ctype):
-    ctype_bits = int(ctype[7:])
-    itemsize = ctype_bits/CHAR_BIT
     dtype = ctype.upper()
+    cls = 'Int'+ctype[7:]
     return '''\
+/* depends: SCALARS_IN_BITS.cpp */
 static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
-  return PyArray_Return(PyArray_SimpleNewFromData(0, NULL, %(dtype)s, (char*)value));
+  PyObject* obj = PyArrayScalar_New(%(cls)s);
+  if (obj==NULL) /* TODO: set exception */ return NULL;
+  PyArrayScalar_ASSIGN(obj,%(cls)s,*value);
+  return obj;
 }
 ''' % (locals())
 
+def pyobj_from_npy_float(ctype):
+    dtype = ctype.upper()
+    cls = 'Float'+ctype[9:]
+    return '''\
+/* depends: SCALARS_IN_BITS.cpp */
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
+  PyObject* obj = PyArrayScalar_New(%(cls)s);
+  if (obj==NULL) /* TODO: set exception */ return NULL;
+  PyArrayScalar_ASSIGN(obj,%(cls)s,*value);
+  return obj;
+}
+''' % (locals())
+
+def pyobj_from_npy_complex(ctype):
+    dtype = ctype.upper()
+    cls = 'Complex'+ctype[11:]
+    return '''\
+/* depends: SCALARS_IN_BITS.cpp */
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
+  PyObject* obj = PyArrayScalar_New(%(cls)s);
+  if (obj==NULL) /* TODO: set exception */ return NULL;
+  PyArrayScalar_ASSIGN(obj,%(cls)s,*value);
+  return obj;
+}
+''' % (locals())
+
 def pyobj_from_f2py_type(ctype):
     ctype_bits = int(ctype[10:])
     raise NotImplementedError,`ctype`
@@ -125,5 +154,9 @@
 def pyobj_from_npy_scalar(ctype):
     if ctype.startswith('npy_int'):
         return dict(c_code=pyobj_from_npy_int(ctype))
+    elif ctype.startswith('npy_float'):
+        return dict(c_code=pyobj_from_npy_float(ctype))
+    elif ctype.startswith('npy_complex'):
+        return dict(c_code=pyobj_from_npy_complex(ctype))
     raise NotImplementedError,`ctype`
 

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-01 11:49:23 UTC (rev 3238)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-01 20:48:37 UTC (rev 3239)
@@ -341,12 +341,15 @@
     def get_length(self):
         return self.selector[0] or 1
 
-    def get_bit_size(self):
-        return CHAR_BIT * int(self.get_kind())
-
     def get_byte_size(self):
-        return self.get_bit_size() / CHAR_BIT
+        length, kind = self.selector
+        if length: return int(length)
+        if kind: return int(kind)
+        return self.default_kind
 
+    def get_bit_size(self):
+        return CHAR_BIT * int(self.get_byte_size())
+
     def is_intrinsic(self): return not isinstance(self,(Type,Class))
     def is_derived(self): return isinstance(self,Type)
 
@@ -381,7 +384,10 @@
 class DoublePrecision(TypeDeclarationStatement):
     match = re.compile(r'double\s*precision\b',re.I).match
     default_kind = 8
-    
+
+    def get_byte_size(self):
+        return self.default_kind
+
     def get_zero_value(self):
         return '0.0D0'
 
@@ -392,20 +398,12 @@
     match = re.compile(r'complex\b',re.I).match
     default_kind = 4
 
-    def get_kind(self):
+    def get_byte_size(self):
         length, kind = self.selector
-        if kind:
-            return kind
-        if length:
-            return int(length)/2
-        return self.default_kind
+        if length: return 2*int(length)
+        if kind: return 2*int(kind)
+        return 2*self.default_kind
 
-    def get_length(self):
-        return 2 * int(self.get_kind())
-
-    def get_bit_size(self):
-        return CHAR_BIT * self.get_length()
-
     def get_zero_value(self):
         kind = self.get_kind()
         if kind==self.default_kind: return '(0.0, 0.0)'
@@ -419,10 +417,8 @@
     match = re.compile(r'double\s*complex\b',re.I).match
     default_kind = 8
 
-    def get_kind(self): return self.default_kind
-    def get_length(self): return 2 * self.get_kind()
-    def get_bit_size(self):
-        return CHAR_BIT * self.get_length()
+    def get_byte_size(self):
+        return 2 * self.default_kind
 
     def get_zero_value(self):
         return '(0.0D0,0.0D0)'

Modified: trunk/numpy/f2py/lib/python_wrapper.py
===================================================================
--- trunk/numpy/f2py/lib/python_wrapper.py	2006-10-01 11:49:23 UTC (rev 3238)
+++ trunk/numpy/f2py/lib/python_wrapper.py	2006-10-01 20:48:37 UTC (rev 3239)
@@ -23,6 +23,7 @@
 
 #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API
 #include "numpy/arrayobject.h"
+#include "numpy/arrayscalars.h"
 
 %(header_list)s
 
@@ -140,13 +141,7 @@
         self.ctype = ctype = typedecl.get_c_type()
 
         if ctype.startswith('npy_'):
-            from generate_pyobj_tofrom_funcs import pyobj_to_npy_scalar
-            d = pyobj_to_npy_scalar(ctype)
-            for v in d.values():
-                self.resolve_dependencies(parent, v)
-            for k,v in d.items():
-                l = getattr(parent, k+'_list')
-                l.append(v)
+            WrapperCCode(parent, 'pyobj_from_%s' % (ctype))
             return
         
         if not ctype.startswith('f2py_type_'):
@@ -598,38 +593,14 @@
 
 
 if __name__ == '__main__':
-    #from utils import str2stmt, get_char_bit
-    
-    stmt = parse("""
-    module rat
-      integer :: i
-      type info
-        integer flag
-      end type info
-      type rational
-        integer n
-        integer d
-        type(info) i
-      end type rational
-    end module rat
-    subroutine foo(a)
-    use rat
-    type(rational) a
-    end
-    """)
-    #stmt = stmt.content[-1].content[1]
-    #print stmt
-    #wrapgen = TypeWrapper(stmt)
-    #print wrapgen.fortran_code()
-    #print wrapgen.c_code()
 
     foo_code = """! -*- f90 -*-
       module rat
         type info
-          integer flag
+          complex flag
         end type info
         type rational
-          integer n,d
+          !integer n,d
           type(info) i
         end type rational
       end module rat
@@ -685,14 +656,15 @@
     #print foo.info.__doc__
     #print foo.rational.__doc__
     #print dir(foo.rational)
-    i = foo.info(7)
+    i = foo.info(70+3j)
+    print 'i=',i
     #print i #,i.as_tuple()
     #print 'i.flag=',i.flag
-    r = foo.rational(2,3,i)
+    r = foo.rational(i)
     print r
     j = r.i
     print 'r.i.flag=',(r.i).flag
-    print 'j.flag=',j.flag
+    print 'j.flag=',type(j.flag)
     #print 'r=',r
     sys.exit()
     n,d,ii = r.as_tuple()

Added: trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp
===================================================================
--- trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp	2006-10-01 11:49:23 UTC (rev 3238)
+++ trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp	2006-10-01 20:48:37 UTC (rev 3239)
@@ -0,0 +1,279 @@
+#if NPY_BITSOF_LONG == 8
+#  ifndef PyInt8ScalarObject
+#    define PyInt8ScalarObject PyLongScalarObject
+#    define PyInt8ArrType_Type PyLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONG == 16
+#  ifndef PyInt16ScalarObject
+#    define PyInt16ScalarObject PyLongScalarObject
+#    define PyInt16ArrType_Type PyLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONG == 32
+#  ifndef PyInt32ScalarObject
+#    define PyInt32ScalarObject PyLongScalarObject
+#    define PyInt32ArrType_Type PyLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONG == 64
+#  ifndef PyInt64ScalarObject
+#    define PyInt64ScalarObject PyLongScalarObject
+#    define PyInt64ArrType_Type PyLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONG == 128
+#  ifndef PyInt128ScalarObject
+#    define PyInt128ScalarObject PyLongScalarObject
+#    define PyInt128ArrType_Type PyLongArrType_Type
+#  endif
+#endif
+
+#if NPY_BITSOF_LONGLONG == 8
+#  ifndef PyInt8ScalarObject
+#    define PyInt8ScalarObject PyLongLongScalarObject
+#    define PyInt8ArrType_Type PyLongLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGLONG == 16
+#  ifndef PyInt16ScalarObject
+#    define PyInt16ScalarObject PyLongLongScalarObject
+#    define PyInt16ArrType_Type PyLongLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGLONG == 32
+#  ifndef PyInt32ScalarObject
+#    define PyInt32ScalarObject PyLongLongScalarObject
+#    define PyInt32ArrType_Type PyLongLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGLONG == 64
+#  ifndef PyInt64ScalarObject
+#    define PyInt64ScalarObject PyLongLongScalarObject
+#    define PyInt64ArrType_Type PyLongLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGLONG == 128
+#  ifndef PyInt128ScalarObject
+#    define PyInt128ScalarObject PyLongLongScalarObject
+#    define PyInt128ArrType_Type PyLongLongArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGLONG == 256
+#  ifndef PyInt256ScalarObject
+#    define PyInt256ScalarObject PyLongLongScalarObject
+#    define PyInt256ArrType_Type PyLongLongArrType_Type
+#  endif
+#endif
+
+#if NPY_BITSOF_INT == 8
+#  ifndef PyInt8ScalarObject
+#    define PyInt8ScalarObject PyIntScalarObject
+#    define PyInt8ArrType_Type PyIntArrType_Type
+#  endif
+#elif NPY_BITSOF_INT == 16
+#  ifndef PyInt16ScalarObject
+#    define PyInt16ScalarObject PyIntScalarObject
+#    define PyInt16ArrType_Type PyIntArrType_Type
+#  endif
+#elif NPY_BITSOF_INT == 32
+#  ifndef PyInt32ScalarObject
+#    define PyInt32ScalarObject PyIntScalarObject
+#    define PyInt32ArrType_Type PyIntArrType_Type
+#  endif
+#elif NPY_BITSOF_INT == 64
+#  ifndef PyInt64ScalarObject
+#    define PyInt64ScalarObject PyIntScalarObject
+#    define PyInt64ArrType_Type PyIntArrType_Type
+#  endif
+#elif NPY_BITSOF_INT == 128
+#  ifndef PyInt128ScalarObject
+#    define PyInt128ScalarObject PyIntScalarObject
+#    define PyInt128ArrType_Type PyIntArrType_Type
+#  endif
+#endif
+
+#if NPY_BITSOF_SHORT == 8
+#  ifndef PyInt8ScalarObject
+#    define PyInt8ScalarObject PyShortScalarObject
+#    define PyInt8ArrType_Type PyShortArrType_Type
+#  endif
+#elif NPY_BITSOF_SHORT == 16
+#  ifndef PyInt16ScalarObject
+#    define PyInt16ScalarObject PyShortScalarObject
+#    define PyInt16ArrType_Type PyShortArrType_Type
+#  endif
+#elif NPY_BITSOF_SHORT == 32
+#  ifndef PyInt32ScalarObject
+#    define PyInt32ScalarObject PyShortScalarObject
+#    define PyInt32ArrType_Type PyShortArrType_Type
+#  endif
+#elif NPY_BITSOF_SHORT == 64
+#  ifndef PyInt64ScalarObject
+#    define PyInt64ScalarObject PyShortScalarObject
+#    define PyInt64ArrType_Type PyShortArrType_Type
+#  endif
+#elif NPY_BITSOF_SHORT == 128
+#  ifndef PyInt128ScalarObject
+#    define PyInt128ScalarObject PyShortScalarObject
+#    define PyInt128ArrType_Type PyShortArrType_Type
+#  endif
+#endif
+
+#if NPY_BITSOF_CHAR == 8
+#  ifndef PyInt8ScalarObject
+#    define PyInt8ScalarObject PyByteScalarObject
+#    define PyInt8ArrType_Type PyByteArrType_Type
+#  endif
+#elif NPY_BITSOF_CHAR == 16
+#  ifndef PyInt16ScalarObject
+#    define PyInt16ScalarObject PyByteScalarObject
+#    define PyInt16ArrType_Type PyByteArrType_Type
+#  endif
+#elif NPY_BITSOF_CHAR == 32
+#  ifndef PyInt32ScalarObject
+#    define PyInt32ScalarObject PyByteScalarObject
+#    define PyInt32ArrType_Type PyByteArrType_Type
+#  endif
+#elif NPY_BITSOF_CHAR == 64
+#  ifndef PyInt64ScalarObject
+#    define PyInt64ScalarObject PyByteScalarObject
+#    define PyInt64ArrType_Type PyByteArrType_Type
+#  endif
+#elif NPY_BITSOF_CHAR == 128
+#  ifndef PyInt128ScalarObject
+#    define PyInt128ScalarObject PyByteScalarObject
+#    define PyInt128ArrType_Type PyByteArrType_Type
+#  endif
+#endif
+
+#if NPY_BITSOF_DOUBLE == 16
+#  ifndef PyFloat16ScalarObject
+#    define PyFloat16ScalarObject PyDoubleScalarObject
+#    define PyComplex32ScalarObject PyCDoubleScalarObject
+#    define PyFloat16ArrType_Type PyDoubleArrType_Type
+#    define PyComplex32ArrType_Type PyCDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_DOUBLE == 32
+#  ifndef PyFloat32ScalarObject
+#    define PyFloat32ScalarObject PyDoubleScalarObject
+#    define PyComplex64ScalarObject PyCDoubleScalarObject
+#    define PyFloat32ArrType_Type PyDoubleArrType_Type
+#    define PyComplex64ArrType_Type PyCDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_DOUBLE == 64
+#  ifndef PyFloat64ScalarObject
+#    define PyFloat64ScalarObject PyDoubleScalarObject
+#    define PyComplex128ScalarObject PyCDoubleScalarObject
+#    define PyFloat64ArrType_Type PyDoubleArrType_Type
+#    define PyComplex128ArrType_Type PyCDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_DOUBLE == 80
+#  ifndef PyFloat80ScalarObject
+#    define PyFloat80ScalarObject PyDoubleScalarObject
+#    define PyComplex160ScalarObject PyCDoubleScalarObject
+#    define PyFloat80ArrType_Type PyDoubleArrType_Type
+#    define PyComplex160ArrType_Type PyCDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_DOUBLE == 96
+#  ifndef PyFloat96ScalarObject
+#    define PyFloat96ScalarObject PyDoubleScalarObject
+#    define PyComplex192ScalarObject PyCDoubleScalarObject
+#    define PyFloat96ArrType_Type PyDoubleArrType_Type
+#    define PyComplex192ArrType_Type PyCDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_DOUBLE == 128
+#  ifndef PyFloat128ScalarObject
+#    define PyFloat128ScalarObject PyDoubleScalarObject
+#    define PyComplex256ScalarObject PyCDoubleScalarObject
+#    define PyFloat128ArrType_Type PyDoubleArrType_Type
+#    define PyComplex256ArrType_Type PyCDoubleArrType_Type
+#  endif
+#endif
+
+#if NPY_BITSOF_FLOAT == 16
+#  ifndef PyFloat16ScalarObject
+#    define PyFloat16ScalarObject PyFloatScalarObject
+#    define PyComplex32ScalarObject PyCFloatScalarObject
+#    define PyFloat16ArrType_Type PyFloatArrType_Type
+#    define PyComplex32ArrType_Type PyCFloatArrType_Type
+#  endif
+#elif NPY_BITSOF_FLOAT == 32
+#  ifndef PyFloat32ScalarObject
+#    define PyFloat32ScalarObject PyFloatScalarObject
+#    define PyComplex64ScalarObject PyCFloatScalarObject
+#    define PyFloat32ArrType_Type PyFloatArrType_Type
+#    define PyComplex64ArrType_Type PyCFloatArrType_Type
+#  endif
+#elif NPY_BITSOF_FLOAT == 64
+#  ifndef PyFloat64ScalarObject
+#    define PyFloat64ScalarObject PyFloatScalarObject
+#    define PyComplex128ScalarObject PyCFloatScalarObject
+#    define PyFloat64ArrType_Type PyFloatArrType_Type
+#    define PyComplex128ArrType_Type PyCFloatArrType_Type
+#  endif
+#elif NPY_BITSOF_FLOAT == 80
+#  ifndef PyFloat80ScalarObject
+#    define PyFloat80ScalarObject PyFloatScalarObject
+#    define PyComplex160ScalarObject PyCFloatScalarObject
+#    define PyFloat80ArrType_Type PyFloatArrType_Type
+#    define PyComplex160ArrType_Type PyCFloatArrType_Type
+#  endif
+#elif NPY_BITSOF_FLOAT == 96
+#  ifndef PyFloat96ScalarObject
+#    define PyFloat96ScalarObject PyFloatScalarObject
+#    define PyComplex192ScalarObject PyCFloatScalarObject
+#    define PyFloat96ArrType_Type PyFloatArrType_Type
+#    define PyComplex192ArrType_Type PyCFloatArrType_Type
+#  endif
+#elif NPY_BITSOF_FLOAT == 128
+#  ifndef PyFloat128ScalarObject
+#    define PyFloat128ScalarObject PyFloatScalarObject
+#    define PyComplex256ScalarObject PyCFloatScalarObject
+#    define PyFloat128ArrType_Type PyFloatArrType_Type
+#    define PyComplex256ArrType_Type PyCFloatArrType_Type
+#  endif
+#endif
+
+#if NPY_BITSOF_LONGDOUBLE == 16
+#  ifndef PyFloat16ScalarObject
+#    define PyFloat16ScalarObject PyLongDoubleScalarObject
+#    define PyComplex32ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat16ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex32ArrType_Type PyCLongDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGDOUBLE == 32
+#  ifndef PyFloat32ScalarObject
+#    define PyFloat32ScalarObject PyLongDoubleScalarObject
+#    define PyComplex64ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat32ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex64ArrType_Type PyCLongDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGDOUBLE == 64
+#  ifndef PyFloat64ScalarObject
+#    define PyFloat64ScalarObject PyLongDoubleScalarObject
+#    define PyComplex128ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat64ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex128ArrType_Type PyCLongDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGDOUBLE == 80
+#  ifndef PyFloat80ScalarObject
+#    define PyFloat80ScalarObject PyLongDoubleScalarObject
+#    define PyComplex160ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat80ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex160ArrType_Type PyCLongDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGDOUBLE == 96
+#  ifndef PyFloat96ScalarObject
+#    define PyFloat96ScalarObject PyLongDoubleScalarObject
+#    define PyComplex192ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat96ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex192ArrType_Type PyCLongDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGDOUBLE == 128
+#  ifndef PyFloat128ScalarObject
+#    define PyFloat128ScalarObject PyLongDoubleScalarObject
+#    define PyComplex256ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat128ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex256ArrType_Type PyCLongDoubleArrType_Type
+#  endif
+#elif NPY_BITSOF_LONGDOUBLE == 256
+#  ifndef PyFloat256ScalarObject
+#    define PyFloat256ScalarObject PyLongDoubleScalarObject
+#    define PyComplex512ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat256ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex512ArrType_Type PyCLongDoubleArrType_Type
+#  endif
+#endif
+



From numpy-svn at scipy.org  Mon Oct  2 12:41:47 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  2 Oct 2006 11:41:47 -0500 (CDT)
Subject: [Numpy-svn] r3240 - trunk/numpy/distutils
Message-ID: <20061002164147.81BA739C048@new.scipy.org>

Author: rkern
Date: 2006-10-02 11:41:47 -0500 (Mon, 02 Oct 2006)
New Revision: 3240

Modified:
   trunk/numpy/distutils/system_info.py
Log:
Add .dylib as a valid OS X shared library extension.

Modified: trunk/numpy/distutils/system_info.py
===================================================================
--- trunk/numpy/distutils/system_info.py	2006-10-01 20:48:37 UTC (rev 3239)
+++ trunk/numpy/distutils/system_info.py	2006-10-02 16:41:47 UTC (rev 3240)
@@ -502,6 +502,8 @@
             exts = [so_ext] + static_exts
         if sys.platform == 'cygwin':
             exts.append('.dll.a')
+        if sys.platform == 'darwin':
+            exts.append('.dylib')
         return exts
 
     def check_libs(self,lib_dir,libs,opt_libs =[]):



From numpy-svn at scipy.org  Mon Oct  2 16:21:25 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  2 Oct 2006 15:21:25 -0500 (CDT)
Subject: [Numpy-svn] r3241 - in trunk/numpy/f2py: . lib lib/parser lib/src
Message-ID: <20061002202125.9CFD039C01E@new.scipy.org>

Author: pearu
Date: 2006-10-02 15:21:11 -0500 (Mon, 02 Oct 2006)
New Revision: 3241

Added:
   trunk/numpy/f2py/lib/api.py
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/setup.py
Modified:
   trunk/numpy/f2py/f2py2e.py
   trunk/numpy/f2py/lib/__init__.py
   trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
   trunk/numpy/f2py/lib/parser/api.py
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/block_statements.py
   trunk/numpy/f2py/lib/parser/statements.py
   trunk/numpy/f2py/lib/python_wrapper.py
   trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c
   trunk/numpy/f2py/setup.py
Log:
F2PY G3: exposing G3 to f2py script, fixed bugs, wrote source docs.

Modified: trunk/numpy/f2py/f2py2e.py
===================================================================
--- trunk/numpy/f2py/f2py2e.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/f2py2e.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -64,6 +64,12 @@
 
 Options:
 
+  --3g-numpy       Use numpy.f2py.lib tool, the 3rd generation of F2PY,
+                   with NumPy support.
+  --2d-numpy       Use numpy.f2py tool with NumPy support. [DEFAULT]
+  --2d-numeric     Use f2py2e tool with Numeric support.
+  --2d-numarray    Use f2py2e tool with Numarray support.
+
   -h <filename>    Write signatures of the fortran routines to file <filename>
                    and exit. You can then edit <filename> and use it instead
                    of <fortran files>. If <filename>==stdout then the

Modified: trunk/numpy/f2py/lib/__init__.py
===================================================================
--- trunk/numpy/f2py/lib/__init__.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/__init__.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -0,0 +1,14 @@
+"""
+F2PY G3 --- The third generation of Fortran to Python Interface Generator.
+
+Use api module for importing public symbols.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""

Added: trunk/numpy/f2py/lib/api.py
===================================================================
--- trunk/numpy/f2py/lib/api.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/api.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -0,0 +1,14 @@
+"""
+Public API for F2PY G3.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+from main import main

Modified: trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
===================================================================
--- trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -114,13 +114,20 @@
 /* depends: pyobj_to_Py_complex.c */
 #if NPY_BITSOF_DOUBLE >= %(cfloat_bits)s
 static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
+  int return_value = 0;
   Py_complex c;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
   if (pyobj_to_Py_complex(obj,&c)) {
     (*value).real = (npy_float%(cfloat_bits)s)c.real;
-    (*value).imag = (npy_float%(cfloat_bits)s)c.imag; 
-    return 1;
+    (*value).imag = (npy_float%(cfloat_bits)s)c.imag;
+    return_value = 1;
   }
-  return 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
 }
 #else
 #error, "NOTIMPLEMENTED pyobj_to_%(ctype)s"

Added: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/main.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -0,0 +1,143 @@
+"""
+Tools for building F2PY generated extension modules.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+import os
+import sys
+
+try:
+    from numpy import __version__ as numpy_version
+except ImportError:
+    numpy_version = 'N/A'
+
+__all__ = ['main']
+
+__usage__ = """
+F2PY G3 --- The third generation of Fortran to Python Interface Generator
+=========================================================================
+
+Description
+-----------
+
+f2py program generates a Python C/API file (<modulename>module.c) that
+contains wrappers for given Fortran functions and data so that they
+can be accessed from Python. With the -c option the corresponding
+extension modules are built.
+
+Options
+-------
+
+  --3g-numpy       Use numpy.f2py.lib tool, the 3rd generation of F2PY,
+                   with NumPy support.
+  --2d-numpy       Use numpy.f2py tool with NumPy support. [DEFAULT]
+  --2d-numeric     Use f2py2e tool with Numeric support.
+  --2d-numarray    Use f2py2e tool with Numarray support.
+
+"""
+
+from parser.api import parse, PythonModule, EndStatement
+
+def dump_signature():
+    """ Read Fortran files and dump the signatures to file or stdout.
+    """
+    # get signature output
+    i = sys.argv.index('-h')
+    if len(sys.argv)-1==i:
+        signature_output = 'stdout'
+    else:
+        signature_output = sys.argv[i+1]
+        del sys.argv[i+1]
+    del sys.argv[i]
+
+    # get module name
+    try:
+        i = sys.argv.index('-m')
+    except ValueError:
+        i = None
+        module_name = 'unknown'
+    if i is not None:
+        if len(sys.argv)-1==i:
+            module_name = 'unspecified'
+        else:
+            module_name = sys.argv[i+1]
+            del sys.argv[i+1]
+        del sys.argv[i]
+
+    # initialize output stream
+    if signature_output in ['stdout','stderr']:
+        output_stream = getattr(sys, signature_output)
+    else:
+        if os.path.isfile(signature_output):
+            try:
+                i = sys.argv.index('--overwrite-signature')
+                del sys.argv[i]
+            except ValueError:
+                print >> sys.stderr, 'Signature file %r exists. Use --overwrite-signature to overwrite.' % (signature_output)
+                sys.exit()
+        output_stream = open(signature_output,'w')
+
+    flag = 'file'
+    file_names = []
+    only_names = []
+    skip_names = []
+    options = []
+    for word in sys.argv[1:]:
+        if word=='': pass
+        elif word=='only:': flag = 'only'
+        elif word=='skip:': flag = 'skip'
+        elif word==':': flag = 'file'
+        elif word.startswith('--'): options.append(word)
+        else:
+            {'file': file_names,'only': only_names, 'skip': skip_names}[flag].append(word)
+
+    output_stream.write('''!    -*- f90 -*-
+! Note: the context of this file is case sensitive.
+''')
+    output_stream.write('PYTHON MODULE %s\n' % (module_name))
+    output_stream.write('  INTERFACE\n\n')
+    for filename in file_names:
+        block = parse(filename)
+        output_stream.write('! File: %s, source mode = %s\n' % (filename, block.reader.mode))
+        if isinstance(block.content[0],PythonModule):
+            for subblock in block.content[0].content[0].content:
+                if isinstance(subblock, EndStatement):
+                    break
+                output_stream.write(subblock.topyf('    ')+'\n')
+        else:
+            output_stream.write(block.topyf('    ')+'\n')
+    output_stream.write('  END INTERFACE\n')
+    output_stream.write('END PYTHON MODULE %s\n' % (module_name))
+    
+    if signature_output not in ['stdout','stderr']:
+        output_stream.close()
+    return
+
+def build_extension():
+    raise NotImplementedError,'build_extension'
+
+def main():
+    """ Main function of f2py script.
+    """
+    if '--help-link' in sys.argv[1:]:
+        sys.argv.remove('--help-link')
+        from numpy.distutils.system_info import show_all
+        show_all()
+        return
+    if '-c' in sys.argv[1:]:
+        i = sys.argv.index('-c')
+        del sys.argv[i]
+        build_extension()
+        return
+    if '-h' in sys.argv[1:]:
+        dump_signature()
+        return
+    print >> sys.stdout, __usage__

Modified: trunk/numpy/f2py/lib/parser/api.py
===================================================================
--- trunk/numpy/f2py/lib/parser/api.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/parser/api.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -12,6 +12,7 @@
 """
 
 # import all Statement classes:
+from base_classes import EndStatement
 from block_statements import *
 
 # CHAR_BIT is used to convert object bit sizes to byte sizes
@@ -34,8 +35,8 @@
     if os.path.isfile(input):
         reader = FortranFileReader(input,
                                    include_dirs = include_dirs)
-        if isfree is None: reader.isfree
-        if isstrict is None: reader.isstrict
+        if isfree is None: isfree = reader.isfree
+        if isstrict is None: isstrict = reader.isstrict
         reader.set_mode(isfree, isstrict)
     elif isinstance(input, str):
         if isfree is None: isfree = True

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -675,7 +675,7 @@
         item = self.item
         line = item.get_line().replace(' ','')[3:]
         blocktype = self.blocktype
-        if line.startswith(blocktype):
+        if line.lower().startswith(blocktype):
             line = line[len(blocktype):].strip()
         else:
             if line:

Modified: trunk/numpy/f2py/lib/parser/block_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -12,8 +12,12 @@
 """
 
 __all__ = ['BeginSource','Module','PythonModule','Program','BlockData','Interface',
-           'Subroutine','Function','Select','EndWhere','WhereConstruct','ForallConstruct',
-           'IfThen','If','Do','Associate','TypeDecl','Enum']
+           'Subroutine','Function','Select','WhereConstruct','ForallConstruct',
+           'IfThen','If','Do','Associate','TypeDecl','Enum',
+           'EndSource','EndModule','EndPythonModule','EndProgram','EndBlockData','EndInterface',
+           'EndSubroutine','EndFunction','EndSelect','EndWhere','EndForall',
+           'EndIfThen','EndDo','EndAssociate','EndType','EndEnum',
+           ]
 
 import re
 import sys
@@ -100,9 +104,12 @@
             self.a.variable_names.append(name)
         return var
 
-    def topyf(self,tab=''):
+    def topyf(self,tab='', only_variables = None):
         s = ''
-        for name, var in self.a.variables.items():
+        if only_variables is None:
+            only_variables = self.a.variables.keys()
+        for name in only_variables:
+            var = self.a.variables[name]
             s += tab + str(var) + '\n'
         return s
 
@@ -206,6 +213,8 @@
         return
 
     def get_classes(self):
+        if self.reader.ispyf:
+            return [PythonModule] + program_unit
         return program_unit
 
     def process_subitem(self, item):
@@ -231,11 +240,11 @@
     def topyf(self, tab=''): # XXXX
         s = ''
         for name, stmt in self.a.module.items():
-            s += stmt.topyf()
+            s += stmt.topyf(tab=tab)
         for name, stmt in self.a.external_subprogram.items():
-            s += stmt.topyf()
+            s += stmt.topyf(tab=tab)
         for name, stmt in self.a.blockdata.items():
-            s += stmt.topyf()
+            s += stmt.topyf(tab=tab)
         return s
 # Module
 
@@ -415,7 +424,10 @@
     a = AttributeHolder(interface_provides = {})
 
     def get_classes(self):
-        return intrinsic_type_spec + interface_specification
+        l = intrinsic_type_spec + interface_specification
+        if self.reader.mode=='pyf':
+            return [Subroutine, Function] + l 
+        return l
 
     def process_item(self):
         line = self.item.get_line()
@@ -456,6 +468,9 @@
     
         return
 
+    def is_public(self):
+        return True # TODO: need review.
+
 # Subroutine
 
 class SubProgramStatement(BeginStatement, ProgramBlock,
@@ -475,8 +490,8 @@
         item = self.item
         line = item.get_line()
         m = self.match(line)
-        i = line.find(clsname)
-        assert i!=-1,`line`
+        i = line.lower().find(clsname)
+        assert i!=-1,`clsname, line`
         self.prefix = line[:i].rstrip()
         self.name = line[i:m.end()].lstrip()[len(clsname):].strip()
         line = line[m.end():].lstrip()
@@ -575,7 +590,7 @@
         s += '\n'
         s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
         s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
-        s +=  HasVariables.topyf(self, tab=tab+'  ')
+        s +=  HasVariables.topyf(self, tab=tab+'  ', only_variables = self.args)
         s += tab + 'END ' + self.__class__.__name__.upper() + ' ' + self.name + '\n'
         return s
 
@@ -771,7 +786,7 @@
     IF ( <scalar-logical-expr> ) action-stmt
     """
 
-    match = re.compile(r'if\s*\(').match
+    match = re.compile(r'if\s*\(',re.I).match
 
     def process_item(self):
         item = self.item
@@ -779,14 +794,14 @@
         classes = self.get_classes()
         classes = [cls for cls in classes if mode in cls.modes]
 
-        line = item.get_line()[2:]
+        line = item.get_line()[2:].lstrip()
         i = line.find(')')
         expr = line[1:i].strip()
         line = line[i+1:].strip()
         if line.lower()=='then':
             self.isvalid = False
             return
-        self.expr = expr[1:-1]
+        self.expr = item.apply_map(expr)
 
         if not line:
             newitem = self.get_item()

Modified: trunk/numpy/f2py/lib/parser/statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/statements.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/parser/statements.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -185,8 +185,7 @@
         if hasattr(a, 'external'):
             external = a.external
             if self.designator in external:
-                print 'Need to analyze:',self
-        print self
+                print >> sys.stderr, 'Need to analyze:',self
         return
 
 class Goto(Statement):

Modified: trunk/numpy/f2py/lib/python_wrapper.py
===================================================================
--- trunk/numpy/f2py/lib/python_wrapper.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/python_wrapper.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -248,20 +248,29 @@
 
     capi_code_template = '''\
 static void %(oname)s_dealloc(%(oname)sObject* self) {
-  PyMem_Free(self->data);
+  if (self->data)
+    PyMem_Free(self->data);
   self->ob_type->tp_free((PyObject*)self);
 }
 
 static int pyobj_to_%(ctype)s(PyObject *obj,
                               %(ctype)s* value_ptr) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
   if (%(oname)sObject_Check(obj)) {
     if (!memcpy(value_ptr,((%(oname)sObject *)obj)->data, %(byte_size)s)) {
       PyErr_SetString(PyExc_MemoryError,
          "failed to copy %(name)s instance memory to %(ctype)s object.");
+    } else {
+      return_value = 1;
     }
-    return 1;
   }
-  return 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
 }
 
 static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value_ptr) {
@@ -292,8 +301,17 @@
 static int %(oname)s_init(%(oname)sObject *self,
                           PyObject *capi_args, PyObject *capi_kwds)
 {
-   return !PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
-                                      %(attr_init_clist)s);
+   int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"%(oname)s_init()\\n");
+#endif
+   if (!PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
+                                   %(attr_init_clist)s))
+      return_value = -1;                             
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"%(oname)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+   return return_value;
 }
 
 static PyObject * %(oname)s_as_tuple(%(oname)sObject * self) {
@@ -597,7 +615,7 @@
     foo_code = """! -*- f90 -*-
       module rat
         type info
-          complex flag
+          complex*8 flag
         end type info
         type rational
           !integer n,d
@@ -641,6 +659,7 @@
     config.add_extension('foo',
                          sources=['foomodule.c'],
                          libraries = ['foolib'],
+                         define_macros = [('F2PY_DEBUG_PYOBJ_TOFROM',None)]
                          )
     return config
 if __name__ == '__main__':
@@ -656,11 +675,11 @@
     #print foo.info.__doc__
     #print foo.rational.__doc__
     #print dir(foo.rational)
-    i = foo.info(70+3j)
+    i = foo.info(2)
     print 'i=',i
     #print i #,i.as_tuple()
     #print 'i.flag=',i.flag
-    r = foo.rational(i)
+    r = foo.rational(2)
     print r
     j = r.i
     print 'r.i.flag=',(r.i).flag

Added: trunk/numpy/f2py/lib/setup.py
===================================================================
--- trunk/numpy/f2py/lib/setup.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/setup.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('lib',parent_package,top_path)
+    config.add_subpackage('parser')
+    config.add_data_files('*.txt','parser/*.txt')
+    config.add_data_dir('src')
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    setup(configuration=configuration)

Modified: trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c	2006-10-02 20:21:11 UTC (rev 3241)
@@ -1,40 +1,54 @@
 int pyobj_to_Py_complex(PyObject* obj, Py_complex* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_Py_complex(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
   if (PyComplex_Check(obj)) {
     *value =PyComplex_AsCComplex(obj);
-    return 1;
+    return_value = 1;
+    goto capi_done;
   }
   /* Python does not provide PyNumber_Complex function :-( */
   (*value).imag=0.0;
   if (PyFloat_Check(obj)) {
 #ifdef __sgi
     (*value).real = PyFloat_AsDouble(obj);
-    return (!PyErr_Occurred());
+    return_value = !PyErr_Occurred()
 #else
     (*value).real = PyFloat_AS_DOUBLE(obj);
-    return 1;
+    return_value = 1;
 #endif
+    goto capi_done;
   }
   if (PyInt_Check(obj)) {
     (*value).real = (double)PyInt_AS_LONG(obj);
-    return 1;
+    return_value = 1;
+    goto capi_done;
   }
   if (PyLong_Check(obj)) {
     (*value).real = PyLong_AsDouble(obj);
-    return (!PyErr_Occurred());
+    return_value = !PyErr_Occurred();;
+    goto capi_done;
   }
   if (PySequence_Check(obj) && (!PyString_Check(obj))) {
     PyObject *tmp = PySequence_GetItem(obj,0);
     if (tmp) {
       if (pyobj_to_Py_complex(tmp,value)) {
         Py_DECREF(tmp);
-        return 1;
+	return_value = 1;
+	goto capi_done;
       }
       Py_DECREF(tmp);
     }
   }
+
   if (!PyErr_Occurred()) {
     PyErr_SetString(PyExc_TypeError,
 		    "Failed to convert python object to C Py_complex.");
   }
-  return 0;
+ capi_done:
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_Py_complex: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
 }

Modified: trunk/numpy/f2py/setup.py
===================================================================
--- trunk/numpy/f2py/setup.py	2006-10-02 16:41:47 UTC (rev 3240)
+++ trunk/numpy/f2py/setup.py	2006-10-02 20:21:11 UTC (rev 3241)
@@ -29,6 +29,8 @@
 def configuration(parent_package='',top_path=None):
     config = Configuration('f2py', parent_package, top_path)
 
+    config.add_subpackage('lib')
+
     config.add_data_dir('docs')
 
     config.add_data_files('src/fortranobject.c',
@@ -51,10 +53,30 @@
             f.write('''\
 #!/usr/bin/env %s
 # See http://cens.ioc.ee/projects/f2py2e/
-import os
+import os, sys
+for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
+    try:
+        i=sys.argv.index("--"+mode)
+        del sys.argv[i]
+        break
+    except ValueError: pass
 os.environ["NO_SCIPY_IMPORT"]="f2py"
-import numpy.f2py as f2py
-f2py.main()
+if mode=="g3-numpy":
+    try:
+        from main import main
+    except ImportError:
+        from numpy.f2py.lib.api import main
+elif mode=="2e-numeric":
+    from f2py2e import main
+elif mode=="2e-numarray":
+    sys.argv.append("-DNUMARRAY")
+    from f2py2e import main
+elif mode=="2e-numpy":
+    from numpy.f2py import main
+else:
+    print >> sys.stderr, "Unknown mode:",`mode`
+    sys.exit(1)
+main()
 '''%(os.path.basename(sys.executable)))
             f.close()
         return target



From numpy-svn at scipy.org  Mon Oct  2 17:21:26 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  2 Oct 2006 16:21:26 -0500 (CDT)
Subject: [Numpy-svn] r3242 - trunk/numpy/core/src
Message-ID: <20061002212126.1277D39C01E@new.scipy.org>

Author: oliphant
Date: 2006-10-02 16:21:22 -0500 (Mon, 02 Oct 2006)
New Revision: 3242

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Fix #302 by being careful about situations where the index method is defined but the object is a sequence.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-02 20:21:11 UTC (rev 3241)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-02 21:21:22 UTC (rev 3242)
@@ -2812,7 +2812,8 @@
         }
 
         if (PyInt_Check(index) || PyArray_IsScalar(index, Integer) ||
-            PyLong_Check(index) || PyIndex_Check(index)) {
+            PyLong_Check(index) || (PyIndex_Check(index) && 
+                                    !PySequence_Check(index))) {
                 intp value;
                 value = PyArray_PyIntAsIntp(index);
                 if (PyErr_Occurred())
@@ -2920,7 +2921,8 @@
         intp vals[MAX_DIMS];
 
         if (PyInt_Check(op) || PyArray_IsScalar(op, Integer) || \
-            PyLong_Check(op) || PyIndex_Check(op)) {
+            PyLong_Check(op) || (PyIndex_Check(op) && 
+                                 !PySequence_Check(op))) {
                 intp value;
                 value = PyArray_PyIntAsIntp(op);
                 if (PyErr_Occurred())
@@ -3844,8 +3846,8 @@
 static PyObject *
 array_index(PyArrayObject *v)
 {
-        if (PyArray_SIZE(v) != 1 || !PyArray_ISINTEGER(v)) {
-                PyErr_SetString(PyExc_TypeError, "only length-1 integer " \
+        if (v->nd != 0 || !PyArray_ISINTEGER(v)) {
+                PyErr_SetString(PyExc_TypeError, "only 0-d integer"     \
                                 "arrays can be converted to an index");
                 return NULL;
         }



From numpy-svn at scipy.org  Mon Oct  2 18:17:59 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  2 Oct 2006 17:17:59 -0500 (CDT)
Subject: [Numpy-svn] r3243 - in trunk/numpy/core: . src
Message-ID: <20061002221759.57E7639C1AA@new.scipy.org>

Author: oliphant
Date: 2006-10-02 17:17:56 -0500 (Mon, 02 Oct 2006)
New Revision: 3243

Modified:
   trunk/numpy/core/records.py
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix ticket #308 by sending more than just ndarray to fromarray.  Also, allow conversion of array-interfacing object to recarray.  Also add the asbuffer function to multiarray (but don't expose it) which allows creating buffer objects from memory locations.  User must be sure the object holding the memory is not deallocated before the new buffer.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-02 21:21:22 UTC (rev 3242)
+++ trunk/numpy/core/records.py	2006-10-02 22:17:56 UTC (rev 3243)
@@ -270,6 +270,8 @@
     if isinstance(shape, int):
         shape = (shape,)
 
+    arrayList = [sb.asarray(x) for x in arrayList]
+
     if formats is None and dtype is None:
         # go through each object in the list to see if it is an ndarray
         # and determine the formats.
@@ -494,10 +496,10 @@
         return fromstring(obj, dtype, shape=shape, offset=offset, **kwds)
 
     elif isinstance(obj, (list, tuple)):
-        if isinstance(obj[0], sb.ndarray):
+        if isinstance(obj[0], tuple):
+            return fromrecords(obj, dtype=dtype, shape=shape, **kwds)
+        else:
             return fromarrays(obj, dtype=dtype, shape=shape, **kwds)
-        else:
-            return fromrecords(obj, dtype=dtype, shape=shape, **kwds)
 
     elif isinstance(obj, recarray):
         new = obj.copy()
@@ -517,4 +519,12 @@
         return res
 
     else:
-        raise ValueError("Unknown input type")
+        interface = getattr(obj, "__array_interface__", None)
+        if interface is None or not isinstance(interface, dict):
+            raise ValueError("Unknown input type")
+        dtype = interface.get("descr", None) or interface.get("typestr")
+        shape = interface.get("shape")
+        strides = interface.get("strides", None)
+        return recarray(shape, dtype, buf=obj, offset=offset, strides=strides)
+        
+                

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-02 21:21:22 UTC (rev 3242)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-02 22:17:56 UTC (rev 3243)
@@ -6523,6 +6523,26 @@
 }
 
 static PyObject *
+as_buffer(PyObject *dummy, PyObject *args, PyObject *kwds)
+{
+        PyObject *mem;
+        Py_ssize_t size;
+        Bool ro=FALSE;
+        void *memptr;
+        static char *kwlist[] = {"mem", "size", "readonly", NULL};
+        if (!PyArg_ParseTupleAndKeywords(args, kwds, "O" \
+                                         NPY_SSIZE_T_PYFMT "|O&", 
+                                         &mem, &size, PyArray_BoolConverter,
+                                         &ro)) return NULL;
+        memptr = PyLong_AsVoidPtr(mem);
+        if (memptr == NULL) return NULL;
+        if (ro) {
+                return PyBuffer_FromMemory(memptr, size);
+        }
+        return PyBuffer_FromReadWriteMemory(memptr, size);
+}
+
+static PyObject *
 format_longfloat(PyObject *dummy, PyObject *args, PyObject *kwds)
 {
     PyObject *obj;
@@ -6731,6 +6751,8 @@
 	 METH_VARARGS, NULL},
 	{"getbuffer", (PyCFunction)buffer_buffer,
 	 METH_VARARGS | METH_KEYWORDS, NULL},
+        {"asbuffer", (PyCFunction)as_buffer,
+         METH_VARARGS, NULL},
         {"format_longfloat", (PyCFunction)format_longfloat,
          METH_VARARGS | METH_KEYWORDS, NULL},
         {"compare_chararrays", (PyCFunction)compare_chararrays,



From numpy-svn at scipy.org  Mon Oct  2 18:48:20 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  2 Oct 2006 17:48:20 -0500 (CDT)
Subject: [Numpy-svn] r3244 - in trunk/numpy/core: . src
Message-ID: <20061002224820.50FC839C092@new.scipy.org>

Author: oliphant
Date: 2006-10-02 17:48:14 -0500 (Mon, 02 Oct 2006)
New Revision: 3244

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix bugs: uncaught error, way record data-types print, asbuffer function fixed.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-02 22:17:56 UTC (rev 3243)
+++ trunk/numpy/core/numeric.py	2006-10-02 22:48:14 UTC (rev 3244)
@@ -425,7 +425,10 @@
         typename=arr.dtype.name
         lf = ''
         if issubclass(arr.dtype.type, flexible):
-            typename = "'%s'" % str(arr.dtype)
+            if arr.dtype.names:
+                typename = "%s" % str(arr.dtype)
+            else:
+                typename = "'%s'" % str(arr.dtype)
             lf = '\n'+' '*len("array(")
         return cName + "(%s, %sdtype=%s)" % (lst, lf, typename)
 

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-02 22:17:56 UTC (rev 3243)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-02 22:48:14 UTC (rev 3244)
@@ -7519,7 +7519,7 @@
         }
         _pya_free(buffers[0]);
         _pya_free(buffers[1]);
-        if (!PyArray_ISNUMBER(in) && PyErr_Occurred()) return -1;
+        if (PyErr_Occurred()) return -1;
         return 0;
 }
 
@@ -8282,28 +8282,26 @@
                         isobject = 1;
                 }
                 if (PySequence_Check(op)) {
-                        PyObject *thiserr;
+                        PyObject *thiserr=NULL;
                         /* necessary but not sufficient */
                         Py_INCREF(newtype);
                         r = Array_FromSequence(op, newtype, flags & FORTRAN,
                                                min_depth, max_depth);
-                        if (r == NULL && (thiserr=PyErr_Occurred()) && \
-                            !PyErr_GivenExceptionMatches(thiserr, 
-                                                         PyExc_MemoryError)) {
+                        if (r == NULL && (thiserr=PyErr_Occurred())) {
+                                if (PyErr_GivenExceptionMatches(thiserr, 
+                                                                PyExc_MemoryError))
+                                        return NULL;
                                 /* If object was explicitly requested, 
                                    then try nested list object array creation
                                 */
+                                PyErr_Clear();
                                 if (isobject) {
-                                        PyErr_Clear();
                                         Py_INCREF(newtype);
                                         r = ObjectArray_FromNestedList  \
                                                 (op, newtype, flags & FORTRAN);
                                         seq = TRUE;
                                         Py_DECREF(newtype);
                                 }
-                                else {
-                                        PyErr_Clear();
-                                }
                         }
                         else {
                                 seq = TRUE;

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-02 22:17:56 UTC (rev 3243)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-02 22:48:14 UTC (rev 3244)
@@ -6531,7 +6531,7 @@
         void *memptr;
         static char *kwlist[] = {"mem", "size", "readonly", NULL};
         if (!PyArg_ParseTupleAndKeywords(args, kwds, "O" \
-                                         NPY_SSIZE_T_PYFMT "|O&", 
+                                         NPY_SSIZE_T_PYFMT "|O&", kwlist,
                                          &mem, &size, PyArray_BoolConverter,
                                          &ro)) return NULL;
         memptr = PyLong_AsVoidPtr(mem);



From numpy-svn at scipy.org  Mon Oct  2 18:51:09 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  2 Oct 2006 17:51:09 -0500 (CDT)
Subject: [Numpy-svn] r3245 - trunk/numpy/core
Message-ID: <20061002225109.E47C539C092@new.scipy.org>

Author: oliphant
Date: 2006-10-02 17:51:07 -0500 (Mon, 02 Oct 2006)
New Revision: 3245

Modified:
   trunk/numpy/core/records.py
Log:
Use sb.array to handle the array interface.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-02 22:48:14 UTC (rev 3244)
+++ trunk/numpy/core/records.py	2006-10-02 22:51:07 UTC (rev 3245)
@@ -522,9 +522,10 @@
         interface = getattr(obj, "__array_interface__", None)
         if interface is None or not isinstance(interface, dict):
             raise ValueError("Unknown input type")
-        dtype = interface.get("descr", None) or interface.get("typestr")
-        shape = interface.get("shape")
-        strides = interface.get("strides", None)
-        return recarray(shape, dtype, buf=obj, offset=offset, strides=strides)
-        
-                
+        obj = sb.array(obj)
+        if dtype is not None and (obj.dtype != dtype):
+            obj = obj.view(dtype)
+        res  = obj.view(recarray)
+        if issubclass(res.dtype.type, nt.void):
+            res.dtype = sb.dtype((record, res.dtype))
+        return res



From numpy-svn at scipy.org  Mon Oct  2 21:44:51 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  2 Oct 2006 20:44:51 -0500 (CDT)
Subject: [Numpy-svn] r3246 - trunk/numpy/core/include/numpy
Message-ID: <20061003014451.0BDC239C035@new.scipy.org>

Author: oliphant
Date: 2006-10-02 20:44:48 -0500 (Mon, 02 Oct 2006)
New Revision: 3246

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
Log:
experiment with iterator speed up.

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-02 22:51:07 UTC (rev 3245)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-03 01:44:48 UTC (rev 3246)
@@ -1070,14 +1070,35 @@
                 }                                                       \
         }
 
-#define PyArray_ITER_NEXT(it) {                                         \
-        (it)->index++;                                          \
-        if ((it)->nd_m1 == 0) {                                         \
-                _PyArray_ITER_NEXT1(it);                                \
+#define _PyArray_ITER_NEXT3(it) {                                       \
+                if ((it)->coordinates[2] < (it)->dims_m1[2]) {          \
+                        (it)->coordinates[2]++;                         \
+                        (it)->dataptr += (it)->strides[2];              \
+                }                                                       \
+                else {                                                  \
+                        (it)->coordinates[2] = 0;                       \
+                        (it)->dataptr -= (it)->backstrides[2];          \
+                        if ((it)->coordinates[1] < (it)->dims_m1[1]) {  \
+                                (it)->coordinates[1]++;                 \
+                                (it)->dataptr += (it)->strides[1];      \
+                        }                                               \
+                        else {                                          \
+                                (it)->coordinates[1] = 0;               \
+                                (it)->coordinates[0]++;                 \
+                                (it)->dataptr += (it)->strides[0] -     \
+                                        (it)->backstrides[1];           \
+                        }                                               \
+                }                                                       \
+        }
+                                
+#define PyArray_ITER_NEXT(it) {                                     \
+        (it)->index++;                                            \
+        if ((it)->nd_m1 == 0) {                                   \
+                _PyArray_ITER_NEXT1(it);                          \
         }                                                               \
         else if ((it)->contiguous)  (it)->dataptr += (it)->ao->descr->elsize; \
-        else if ((it)->nd_m1 == 1) {                                    \
-                _PyArray_ITER_NEXT2(it);                                \
+        else if ((it)->nd_m1 == 1) {                              \
+                _PyArray_ITER_NEXT2(it);                          \
         }                                                               \
         else {                                                          \
                 int __npy_i;                                            \



From numpy-svn at scipy.org  Tue Oct  3 11:08:06 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue,  3 Oct 2006 10:08:06 -0500 (CDT)
Subject: [Numpy-svn] r3247 - trunk/numpy/core
Message-ID: <20061003150806.D00FA39C00C@new.scipy.org>

Author: oliphant
Date: 2006-10-03 10:08:04 -0500 (Tue, 03 Oct 2006)
New Revision: 3247

Modified:
   trunk/numpy/core/records.py
Log:
Convert to arrays earlier.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-03 01:44:48 UTC (rev 3246)
+++ trunk/numpy/core/records.py	2006-10-03 15:08:04 UTC (rev 3247)
@@ -263,15 +263,15 @@
     >>> r.a
     array([1, 2, 3, 4])
     """
-        
+    
+    arrayList = [sb.asarray(x) for x in arrayList]
+    
     if shape is None or shape == 0:
         shape = arrayList[0].shape
 
     if isinstance(shape, int):
         shape = (shape,)
 
-    arrayList = [sb.asarray(x) for x in arrayList]
-
     if formats is None and dtype is None:
         # go through each object in the list to see if it is an ndarray
         # and determine the formats.



From numpy-svn at scipy.org  Tue Oct  3 11:15:57 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue,  3 Oct 2006 10:15:57 -0500 (CDT)
Subject: [Numpy-svn] r3248 - in trunk/numpy/core: . tests
Message-ID: <20061003151557.ACC8339C00C@new.scipy.org>

Author: oliphant
Date: 2006-10-03 10:15:54 -0500 (Tue, 03 Oct 2006)
New Revision: 3248

Modified:
   trunk/numpy/core/records.py
   trunk/numpy/core/tests/test_regression.py
Log:
Allow lists to work with rec.array using fromrecords.py.  But, tuples are the standard for records as the ndarray only allows tuples to be used for records.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-03 15:08:04 UTC (rev 3247)
+++ trunk/numpy/core/records.py	2006-10-03 15:15:54 UTC (rev 3248)
@@ -496,7 +496,7 @@
         return fromstring(obj, dtype, shape=shape, offset=offset, **kwds)
 
     elif isinstance(obj, (list, tuple)):
-        if isinstance(obj[0], tuple):
+        if isinstance(obj[0], (tuple, list)):
             return fromrecords(obj, dtype=dtype, shape=shape, **kwds)
         else:
             return fromarrays(obj, dtype=dtype, shape=shape, **kwds)

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-03 15:08:04 UTC (rev 3247)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-03 15:15:54 UTC (rev 3248)
@@ -263,8 +263,8 @@
     def check_rec_iterate(self,level=rlevel):
         """Ticket #160"""
         descr = N.dtype([('i',int),('f',float),('s','|S3')])
-        x = N.rec.array([[1,1.1,'1.0'],
-                         [2,2.2,'2.0']],dtype=descr)
+        x = N.rec.array([(1,1.1,'1.0'),
+                         (2,2.2,'2.0')],dtype=descr)
         x[0].tolist()
         [i for i in x[0]]
 



From numpy-svn at scipy.org  Tue Oct  3 11:52:46 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue,  3 Oct 2006 10:52:46 -0500 (CDT)
Subject: [Numpy-svn] r3249 - trunk/numpy/core
Message-ID: <20061003155246.24CEB39C022@new.scipy.org>

Author: oliphant
Date: 2006-10-03 10:52:44 -0500 (Tue, 03 Oct 2006)
New Revision: 3249

Modified:
   trunk/numpy/core/records.py
Log:
Fix typo.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-03 15:15:54 UTC (rev 3248)
+++ trunk/numpy/core/records.py	2006-10-03 15:52:44 UTC (rev 3249)
@@ -291,7 +291,7 @@
 
     if dtype is not None:
         descr = sb.dtype(dtype)
-        _names = dtype.names
+        _names = descr.names
     else:
         parsed = format_parser(formats, names, titles, aligned, byteorder)
         _names = parsed._names



From numpy-svn at scipy.org  Wed Oct  4 05:50:04 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed,  4 Oct 2006 04:50:04 -0500 (CDT)
Subject: [Numpy-svn] r3250 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061004095004.08D5939C03E@new.scipy.org>

Author: pearu
Date: 2006-10-04 04:49:54 -0500 (Wed, 04 Oct 2006)
New Revision: 3250

Added:
   trunk/numpy/f2py/lib/py_wrap.py
Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/parser/api.py
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/block_statements.py
   trunk/numpy/f2py/lib/parser/parsefortran.py
   trunk/numpy/f2py/lib/parser/statements.py
   trunk/numpy/f2py/lib/python_wrapper.py
Log:
F2PY G3: exposed wrappers via f2py script. A working example: wrap F90 module containing derived type with scalar components.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/main.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -12,7 +12,9 @@
 """
 
 import os
+import re
 import sys
+import tempfile
 
 try:
     from numpy import __version__ as numpy_version
@@ -44,53 +46,92 @@
 
 """
 
-from parser.api import parse, PythonModule, EndStatement
+import re
+import shutil
+from parser.api import parse, PythonModule, EndStatement, Module, Subroutine, Function
 
-def dump_signature():
-    """ Read Fortran files and dump the signatures to file or stdout.
+def get_values(sys_argv, prefix='', suffix='', strip_prefix=False, strip_suffix=False):
     """
-    # get signature output
-    i = sys.argv.index('-h')
-    if len(sys.argv)-1==i:
-        signature_output = 'stdout'
-    else:
-        signature_output = sys.argv[i+1]
-        del sys.argv[i+1]
-    del sys.argv[i]
+    Return a list of values with pattern
+      <prefix><value><suffix>.
+    The corresponding items will be removed from sys_argv.
+    """
+    match = re.compile(prefix + r'.*' + suffix + '\Z').match
+    ret = [item for item in sys_argv if match(item)]
+    [sys_argv.remove(item) for item in ret]
+    if strip_prefix and prefix:
+        i = len(prefix)
+        ret = [item[i:] for item in ret]
+    if strip_suffix and suffix:
+        i = len(suffix)
+        ret = [item[:-i] for item in ret]
+    return ret
 
-    # get module name
+def get_option(sys_argv, option, default_return = None):
+    """
+    Return True if sys_argv has <option>.
+    If <option> is not in sys_argv, return default_return.
+    <option> (when present) will be removed from sys_argv.
+    """
     try:
-        i = sys.argv.index('-m')
+        i = sys_argv.index(option)
     except ValueError:
-        i = None
-        module_name = 'unknown'
-    if i is not None:
-        if len(sys.argv)-1==i:
-            module_name = 'unspecified'
-        else:
-            module_name = sys.argv[i+1]
-            del sys.argv[i+1]
-        del sys.argv[i]
+        return default_return
+    del sys_argv[i]
+    return True
 
+def get_option_value(sys_argv, option, default_value = None, default_return = None):
+    """
+    Return <value> from
+      sys_argv = [...,<option>,<value>,...]
+    list.
+    If <option> is the last element, return default_value.
+    If <option> is not in sys_argv, return default_return.
+    Both <option> and <value> (when present) will be removed from sys_argv.
+    """
+    try:
+        i = sys_argv.index(option)
+    except ValueError:
+        return default_return
+    if len(sys_argv)-1==i:
+        del sys_argv[i]
+        return default_value
+    value = sys_argv[i+1]
+    del sys_argv[i+1]
+    del sys_argv[i]
+    return value
+
+def get_signature_output(sys_argv):
+    return get_option_value(sys_argv,'-h','stdout')
+
+def dump_signature(sys_argv):
+    """ Read Fortran files and dump the signatures to file or stdout.
+    XXX: Not well tested.
+    """
+    signature_output = get_signature_output(sys_argv)
+
     # initialize output stream
     if signature_output in ['stdout','stderr']:
         output_stream = getattr(sys, signature_output)
+        modulename = get_option_value(sys_argv,'-m','untitled','unknown')
     else:
+        name,ext = os.path.splitext(signature_output)
+        if ext != '.pyf':
+            signature_output += '.pyf'
         if os.path.isfile(signature_output):
-            try:
-                i = sys.argv.index('--overwrite-signature')
-                del sys.argv[i]
-            except ValueError:
+            overwrite = get_option(sys_argv, '--overwrite-signature', False)
+            if not overwrite:
                 print >> sys.stderr, 'Signature file %r exists. Use --overwrite-signature to overwrite.' % (signature_output)
                 sys.exit()
+        modulename = get_option_value(sys_argv,'-m',os.path.basename(name),os.path.basename(name))
         output_stream = open(signature_output,'w')
 
     flag = 'file'
-    file_names = []
+    file_names = [] 
     only_names = []
     skip_names = []
     options = []
-    for word in sys.argv[1:]:
+    for word in sys_argv[1:]:
         if word=='': pass
         elif word=='only:': flag = 'only'
         elif word=='skip:': flag = 'skip'
@@ -99,15 +140,22 @@
         else:
             {'file': file_names,'only': only_names, 'skip': skip_names}[flag].append(word)
 
+    if options:
+        sys.stderr.write('Unused options: %s\n' % (', '.join(options)))
+
     output_stream.write('''!    -*- f90 -*-
 ! Note: the context of this file is case sensitive.
 ''')
     output_stream.write('PYTHON MODULE %s\n' % (module_name))
     output_stream.write('  INTERFACE\n\n')
     for filename in file_names:
+        if not os.path.isfile(filename):
+            sys.stderr.write('No or not a file %r. Skipping.\n' % (filename))
+            continue
+        sys.stderr.write('Parsing %r..\n' % (filename))
         block = parse(filename)
-        output_stream.write('! File: %s, source mode = %s\n' % (filename, block.reader.mode))
-        if isinstance(block.content[0],PythonModule):
+        output_stream.write('! File: %s, source mode = %r\n' % (filename, block.reader.mode))
+        if block.content and isinstance(block.content[0],PythonModule):
             for subblock in block.content[0].content[0].content:
                 if isinstance(subblock, EndStatement):
                     break
@@ -121,23 +169,165 @@
         output_stream.close()
     return
 
-def build_extension():
-    raise NotImplementedError,'build_extension'
+def build_extension(sys_argv):
+    """
+    Build wrappers to Fortran 90 modules and external subprograms.
+    """
+    modulename = get_option_value(sys_argv,'-m','untitled','unknown')
 
-def main():
+    build_dir = get_option_value('--build-dir','.',None)
+    if build_dir is None:
+        build_dir = tempfile.mktemp()
+        clean_build_dir = True
+    else:
+        clean_build_dir = False
+    if not os.path.exists(build_dir): os.makedirs(build_dir)
+
+    include_dirs = get_values(sys_argv,'-I',strip_prefix=True)
+    library_dirs = get_values(sys_argv,'-L',strip_prefix=True)
+    libraries = get_values(sys_argv,'-l',strip_prefix=True)
+    _define_macros = get_values(sys_argv,'-D',strip_prefix=True)
+    undef_macros = get_values(sys_argv,'-U',strip_prefix=True)
+    extra_objects = get_values(sys_argv,'','[.](o|a|so|dll|dynlib|sl)')
+
+    define_macros = []
+    for item in _define_macros:
+        name_value = item.split('=',1)
+        if len(name_value)==1:
+            name_value.append(None)
+        if len(name_value)==2:
+            define_macros.append(tuple(name_value))
+        else:
+            print 'Invalid use of -D:',name_value
+
+    pyf_files = get_values(sys_argv,'','[.]pyf')
+    fortran_files = get_values(sys_argv,'','[.](f|f90|F90|F)')
+    c_files = get_values(sys_argv,'','[.](c|cpp|C|CPP|c[+][+])')
+
+    fc_flags = get_values(sys_argv,'--fcompiler=')
+
+    options = get_values(sys_argv,'-')
+    if options:
+        sys.stderr.write('Unused options: %s\n' % (', '.join(options)))
+
+    if pyf_files:
+        parse_files = pyf_files
+    else:
+        parse_files = fortran_files + c_files
+
+    f90_modules = []
+    external_subprograms = []
+
+    for filename in parse_files:
+        if not os.path.isfile(filename):
+            sys.stderr.write('No or not a file %r. Skipping.\n' % (filename))
+            continue
+        sys.stderr.write('Parsing %r..\n' % (filename))
+        for block in parse(filename, include_dirs=include_dirs).content:
+            if isinstance(block, Module):
+                f90_modules.append(block)
+            elif isinstance(block, (Subroutine, Function)):
+                external_subprograms.append(block)
+            else:
+                sys.stderr.write("Unhandled structure: %r\n" % (block.__class__))
+
+    from py_wrap import PythonWrapperModule
+    def configuration(parent_package='', top_path=None):
+        from numpy.distutils.misc_util import Configuration
+        config = Configuration('',parent_package,top_path)
+        flibname = modulename + '_fortran_f2py'
+        if fortran_files:
+            config.add_library(flibname,
+                               sources = fortran_files)
+            libraries.insert(0,flibname)
+
+        for block in f90_modules:
+            wrapper = PythonWrapperModule(block.name)
+            wrapper.add(block)
+            c_code = wrapper.c_code()
+            f_code = wrapper.fortran_code()
+            c_fn = os.path.join(build_dir,'%smodule.c' % (block.name))
+            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py.f' % (block.name))
+            f = open(c_fn,'w')
+            f.write(c_code)
+            f.close()
+            f = open(f_fn,'w')
+            f.write(f_code)
+            f.close()
+            f_lib = '%s_f_wrappers_f2py' % (block.name)
+            config.add_library(f_lib,
+                               sources = [f_fn])
+            config.add_extension(block.name,
+                                 sources=[c_fn] + c_files,
+                                 libraries = [f_lib] + libraries,
+                                 define_macros = define_macros,
+                                 undef_macros = undef_macros,
+                                 include_dirs = include_dirs,
+                                 extra_objects = extra_objects,
+                                 )
+        if external_subprograms:
+            wrapper = PythonWrapper(modulename)
+            for block in external_subprograms:
+                wrapper.add(block)
+            c_code = wrapper.c_code()
+            f_code = wrapper.fortran_code()
+            c_fn = os.path.join(temp_dir,'%smodule.c' % (modulename))
+            f_fn = os.path.join(temp_dir,'%s_f_wrappers_f2py.f' % (modulename))
+            f = open(c_fn,'w')
+            f.write(c_code)
+            f.close()
+            f = open(f_fn,'w')
+            f.write(f_code)
+            f.close()
+            f_lib = '%s_f_wrappers_f2py' % (modulename)
+            config.add_library(f_lib,
+                               sources = [f_fn])
+            config.add_extension(modulename,
+                                 sources=[c_fn] + c_files,
+                                 libraries = [f_lib] + libraries,
+                                 define_macros = define_macros,
+                                 undef_macros = undef_macros,
+                                 include_dirs = include_dirs,
+                                 extra_objects = extra_objects,
+                                 )
+        return config
+
+    old_sys_argv = sys.argv[:]
+    new_sys_argv = [sys.argv[0]] + ['build',
+                                   '--build-temp',build_dir,
+                                   '--build-base',build_dir,
+                                   '--build-platlib','.']
+    if fc_flags:
+        new_sys_argv += ['config_fc'] + fc_flags
+    sys.argv[:] = new_sys_argv
+
+    sys.stderr.write('setup arguments: %r' % (' '.join(sys.argv)))
+
+    from numpy.distutils.core import setup
+    setup(configuration=configuration)
+
+    sys.argv[:] = old_sys_argv
+
+    if clean_build_dir and os.path.exists(build_dir):
+        sys.stderr.write('Removing build directory %s\n'%(build_dir))
+        shutil.rmtree(build_dir)
+    return
+
+def main(sys_argv = None):
     """ Main function of f2py script.
     """
-    if '--help-link' in sys.argv[1:]:
-        sys.argv.remove('--help-link')
+    if sys_argv is None:
+        sys_argv = sys.argv[1:]
+    if '--help-link' in sys_argv:
+        sys_argv.remove('--help-link')
         from numpy.distutils.system_info import show_all
         show_all()
         return
-    if '-c' in sys.argv[1:]:
-        i = sys.argv.index('-c')
-        del sys.argv[i]
-        build_extension()
+    if '-c' in sys_argv:
+        sys_argv.remove('-c')
+        build_extension(sys_argv)
         return
-    if '-h' in sys.argv[1:]:
-        dump_signature()
+    if '-h' in sys_argv:
+        dump_signature(sys_argv)
         return
     print >> sys.stdout, __usage__

Modified: trunk/numpy/f2py/lib/parser/api.py
===================================================================
--- trunk/numpy/f2py/lib/parser/api.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/parser/api.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -30,9 +30,24 @@
                          and the directory of file name.
     """
     import os
+    import re
     from readfortran import FortranFileReader, FortranStringReader
     from parsefortran import FortranParser
     if os.path.isfile(input):
+        name,ext = os.path.splitext(input)
+        if ext.lower() in ['.c']:
+            # get signatures from C file comments starting with `/*f2py` and ending with `*/`.
+            # TODO: improve parser to take line number offset making line numbers in
+            #       parser messages correct.
+            f2py_c_comments = re.compile('/[*]\s*f2py\s.*[*]/',re.I | re.M)
+            f = open(filename,'r')
+            c_input = ''
+            for s1 in f2py_c_comments.findall(f.read()):
+                c_input += s1[2:-2].lstrip()[4:] + '\n'
+            f.close()
+            if isfree is None: isfree = True
+            if isstrict is None: isstrict = True
+            return parse(c_input, isfree, isstrict, include_dirs)
         reader = FortranFileReader(input,
                                    include_dirs = include_dirs)
         if isfree is None: isfree = reader.isfree

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -122,6 +122,14 @@
         self.init = None
         return
 
+    def __repr__(self):
+        l = []
+        for a in ['name','typedecl','dimension','bounds','length','attributes','intent','bind','check','init']:
+            v = getattr(self,a)
+            if v:
+                l.append('%s=%r' % (a,v))
+        return 'Variable: ' + ', '.join(l)
+
     def get_bit_size(self):
         typesize = self.typedecl.get_bit_size()
         if self.is_pointer():
@@ -372,7 +380,7 @@
             attr = getattr(self, n, None)
             if not attr: continue
             if hasattr(attr, 'torepr'):
-                r = attr.torepr(depht-1,incrtab)
+                r = attr.torepr(depth-1,incrtab)
             else:
                 r = repr(attr)
             l.append(ttab + '%s=%s' % (n, r))

Modified: trunk/numpy/f2py/lib/parser/block_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -34,7 +34,7 @@
     def get_type_by_name(self, name):
         implicit_rules = self.a.implicit_rules
         if implicit_rules is None:
-            raise AnalyzeError,'Implicit rules mapping is null'
+            raise AnalyzeError,'Implicit rules mapping is null while getting %r type' % (name)
         l = name[0].lower()
         if implicit_rules.has_key(l):
             return implicit_rules[l]
@@ -86,8 +86,9 @@
                     return stmt
         return
 
-    def topyf(self):
-        pass
+    def topyf(self, tab='  '):
+        sys.stderr.write('HasUseStmt.topyf not implemented\n')
+        return ''
 
 class HasVariables:
 
@@ -160,7 +161,7 @@
                 if isinstance(known_attributes,(list, tuple)):
                     if uattr not in known_attributes:
                         self.warning('unknown attribute %r' % (attr))
-                elif known_attributes(uattr):
+                elif not known_attributes(uattr):
                     self.warning('unknown attribute %r' % (attr))
                 attributes.append(uattr)
         return
@@ -266,6 +267,7 @@
                         module_provides = {}, # all symbols that are public and so
                                               # can be imported via USE statement
                                               # by other blocks
+                        module_interface = {}
                         )
 
     known_attributes = ['PUBLIC', 'PRIVATE']
@@ -281,6 +283,9 @@
     def get_provides(self):
         return self.a.module_provides
 
+    def get_interface(self):
+        return self.a.module_interface
+
     def analyze(self):
         content = self.content[:]
 
@@ -310,9 +315,11 @@
     def topyf(self, tab=''):
         s = tab + 'MODULE '+self.name + '\n'
         s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
-        s +=  HasAttributesStmt.topyf(self, tab=tab+'  ')
+        s +=  HasAttributes.topyf(self, tab=tab+'  ')
         s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
         s +=  HasVariables.topyf(self, tab=tab+'  ')
+        for name, stmt in self.a.module_interface.items():
+            s += stmt.topyf(tab=tab+'    ')
         s +=  tab + '  CONTAINS\n'
         for name, stmt in self.a.module_subprogram.items():
             s += stmt.topyf(tab=tab+'    ')
@@ -400,7 +407,7 @@
     blocktype = 'interface'
 
 class Interface(BeginStatement, HasImplicitStmt, HasUseStmt,
-                HasModuleProcedures
+                HasModuleProcedures, HasAttributes
                 ):
     """
     INTERFACE [<generic-spec>] | ABSTRACT INTERFACE
@@ -423,6 +430,8 @@
 
     a = AttributeHolder(interface_provides = {})
 
+    known_attributes = ['PUBLIC','PRIVATE']
+
     def get_classes(self):
         l = intrinsic_type_spec + interface_specification
         if self.reader.mode=='pyf':
@@ -455,22 +464,36 @@
             if isinstance(stmt, self.end_stmt_cls):
                 break
             stmt.analyze()
-            assert isinstance(stmt, SubProgramStatement),`stmt.__class__.__name__`
+            #assert isinstance(stmt, SubProgramStatement),`stmt.__class__.__name__`
         if content:
             self.show_message('Not analyzed content: %s' % content)
 
-        parent_provides = self.parent.get_provides()
-        if parent_provides is not None:
-            if self.is_public():
-                if parent_provides.has_key(self.name):
-                    self.warning('interface name conflict with %s, overriding.' % (self.name))
-                parent_provides[self.name] = self
-    
+        if self.parent.a.variables.has_key(self.name):
+            var = self.parent.a.variables.pop(self.name)
+            self.update_attributes(var.attributes)
+
+        parent_interface = self.parent.get_interface()
+        if parent_interface.has_key(self.name):
+            p = parent_interface[self.name]
+            last = p.content.pop()
+            assert isinstance(last,EndInterface),`last.__class__`
+            p.content += self.content
+            p.update_attributes(self.a.attributes)
+        else:
+            parent_interface[self.name] = self
         return
 
     def is_public(self):
-        return True # TODO: need review.
+        return 'PUBLIC' in self.a.attributes
 
+    def topyf(self, tab=''):
+        s = tab + self.tostr() + '\n'
+        s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
+        s +=  HasAttributes.topyf(self, tab=tab+'  ')
+        s +=  HasUseStmt.topyf(self, tab=tab+'  ')
+        s += tab + 'END' + self.tostr() + '\n'
+        return s        
+
 # Subroutine
 
 class SubProgramStatement(BeginStatement, ProgramBlock,
@@ -927,7 +950,7 @@
                         component_names = [], # specifies component order for sequence types
                         components = {}
                         )
-    known_attributes = re.compile(r'\A(PUBLIC|PRIVATE|SEQUENCE|ABSTRACT|BIND\s*\(.*\))\Z').match
+    known_attributes = re.compile(r'\A(PUBLIC|PRIVATE|SEQUENCE|ABSTRACT|BIND\s*\(.*\))\Z',re.I).match
 
     def process_item(self):
         line = self.item.get_line()[4:].lstrip()

Modified: trunk/numpy/f2py/lib/parser/parsefortran.py
===================================================================
--- trunk/numpy/f2py/lib/parser/parsefortran.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/parser/parsefortran.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -66,10 +66,10 @@
                 message = reader.format_message('FATAL ERROR',
                                                 'while processing line',
                                                 reader.linecount, reader.linecount)
-                reader.show_message(message, sys.stdout)
+                reader.show_message(message, sys.stderr)
                 reader = reader.reader
-            traceback.print_exc(file=sys.stdout)
-            self.reader.show_message(red_text('STOPPED PARSING'), sys.stdout)
+            traceback.print_exc(file=sys.stderr)
+            self.reader.show_message(red_text('STOPPED PARSING'), sys.stderr)
             return
         return
 
@@ -84,8 +84,12 @@
             self.block.analyze()
         except AnalyzeError:
             pass
-        except:
-            raise
+        except Exception, msg:
+            if str(msg) != '123454321':
+                traceback.print_exc(file=sys.stderr)
+                self.reader.show_message(red_text('FATAL ERROR: STOPPED ANALYSING %r CONTENT' % (self.reader.source) ), sys.stderr)
+                sys.exit(123454321)
+            return
         self.is_analyzed = True
         return
 

Modified: trunk/numpy/f2py/lib/parser/statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/statements.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/parser/statements.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -900,8 +900,8 @@
 
         module = modules[self.name]
         use_provides = self.parent.a.use_provides
+        print use
         
-        
         return
 
 class Exit(Statement):

Added: trunk/numpy/f2py/lib/py_wrap.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/py_wrap.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -0,0 +1,410 @@
+__all__ = ['PythonWrapperModule']
+
+import re
+import os
+import sys
+
+from parser.api import *
+from wrapper_base import *
+
+class PythonWrapperModule(WrapperBase):
+
+    main_template = '''\
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+#include "Python.h"
+
+#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API
+#include "numpy/arrayobject.h"
+#include "numpy/arrayscalars.h"
+
+%(header_list)s
+
+%(typedef_list)s
+
+%(extern_list)s
+
+%(c_code_list)s
+
+%(capi_code_list)s
+
+%(objdecl_list)s
+
+static PyObject *f2py_module;
+
+static PyMethodDef f2py_module_methods[] = {
+  %(module_method_list)s
+  {NULL,NULL,0,NULL}
+};
+
+PyMODINIT_FUNC init%(modulename)s(void) {
+  f2py_module = Py_InitModule("%(modulename)s", f2py_module_methods);
+  import_array();
+  %(module_init_list)s
+  if (PyErr_Occurred()) {
+    PyErr_SetString(PyExc_ImportError, "can\'t initialize module %(modulename)s");
+    return;
+  }
+}
+#ifdef __cplusplus
+}
+#endif
+'''
+
+    main_fortran_template = '''\
+! -*- f90 -*-
+%(fortran_code_list)s
+'''
+    def __init__(self, modulename):
+        WrapperBase.__init__(self)
+        self.modulename = modulename
+        
+        self.header_list = []
+        self.typedef_list = []
+        self.extern_list = []
+        self.objdecl_list = []
+        self.c_code_list = []
+        self.capi_code_list = []
+
+        self.module_method_list = []
+        self.module_init_list = []
+
+        self.fortran_code_list = []
+
+        self.list_names = ['header', 'typedef', 'extern', 'objdecl',
+                           'c_code','capi_code','module_method','module_init',
+                           'fortran_code']
+
+        return
+
+    def add(self, block):
+        if isinstance(block, BeginSource):
+            for name, moduleblock in block.a.module.items():
+                self.add(moduleblock)
+            #for name, subblock in block.a.external_subprogram.items():
+            #    self.add(subblock)
+        elif isinstance(block, (Subroutine, Function)):
+            self.info('Generating interface for %s' % (block.name))
+            f = PythonCAPIFunction(self, block)
+            f.fill()
+        elif isinstance(block, Module):
+            for name,declblock in block.a.type_decls.items():
+                self.add(declblock)
+        elif isinstance(block, TypeDecl):
+            self.info('Generating interface for %s' % (block.name))
+            PythonCAPIDerivedType(self, block)
+        elif isinstance(block, tuple(declaration_type_spec)):
+            self.info('Generating interface for %s' % (block.name))
+            PythonCAPIIntrinsicType(self, block)
+        else:
+            raise NotImplementedError,`block.__class__.__name__`
+        return
+    
+    def c_code(self):
+        return self.apply_attributes(self.main_template)
+    def fortran_code(self):
+        return self.apply_attributes(self.main_fortran_template)
+
+class PythonCAPIIntrinsicType(WrapperBase):
+    """
+    Fortran intrinsic type hooks.
+    """
+    _defined_types = []
+    def __init__(self, parent, typedecl):
+        WrapperBase.__init__(self)
+        self.name = name = typedecl.name
+        if name in self._defined_types:
+            return
+        self._defined_types.append(name)
+
+        self.ctype = ctype = typedecl.get_c_type()
+
+        if ctype.startswith('npy_'):
+            WrapperCCode(parent, 'pyobj_from_%s' % (ctype))
+            return
+        
+        if not ctype.startswith('f2py_type_'):
+            raise NotImplementedError,`name,ctype`
+
+        for n in parent.list_names:
+            l = getattr(parent,n + '_list')
+            l.append(self.apply_attributes(getattr(self, n+'_template','')))
+
+        return
+
+class PythonCAPIDerivedType(WrapperBase):
+    """
+    Fortran 90 derived type hooks.
+    """
+
+    header_template = '''\
+#define %(oname)sObject_Check(obj) \\
+    PyObject_TypeCheck((PyObject*)obj, &%(oname)sType)
+#define %(init_func)s_f \\
+    F_FUNC(%(init_func)s,%(INIT_FUNC)s)
+'''
+
+    typedef_template = '''\
+typedef void * %(ctype)s;
+typedef struct {
+  PyObject_HEAD
+  %(ptrstruct_list)s
+  %(ctype)s data;
+} %(oname)sObject;
+'''
+
+    extern_template = '''\
+static PyTypeObject %(oname)sType;
+'''
+
+    objdecl_template = '''\
+static PyMethodDef %(oname)s_methods[] = {
+    %(type_method_list)s
+    {NULL}  /* Sentinel */
+};
+
+static PyGetSetDef %(oname)s_getseters[] = {
+    %(type_getseters_list)s
+    {NULL}  /* Sentinel */
+};
+
+static PyTypeObject %(oname)sType = {
+    PyObject_HEAD_INIT(NULL)
+    0,                         /*ob_size*/
+    "%(name)s",                /*tp_name*/
+    sizeof(%(oname)sObject),    /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    (destructor)%(oname)s_dealloc, /*tp_dealloc*/
+    0,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    %(oname)s_repr,            /*tp_repr*/
+    0,                         /*tp_as_number*/
+    0,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    0,                         /*tp_call*/
+    0,                         /*tp_str*/
+    0,                         /*tp_getattro*/
+    0,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
+    "Fortran derived type %(name)s objects",        /* tp_doc */
+    0,		               /* tp_traverse */
+    0,		               /* tp_clear */
+    0,		               /* tp_richcompare */
+    0,		               /* tp_weaklistoffset */
+    0,		               /* tp_iter */
+    0,		               /* tp_iternext */
+    %(oname)s_methods,          /* tp_methods */
+    0 /*%(oname)s_members*/,    /* tp_members */
+    %(oname)s_getseters,       /* tp_getset */
+    0,                         /* tp_base */
+    0,                         /* tp_dict */
+    0,                         /* tp_descr_get */
+    0,                         /* tp_descr_set */
+    0,                         /* tp_dictoffset */
+    (initproc)%(oname)s_init,      /* tp_init */
+    0,                         /* tp_alloc */
+    %(oname)s_new,                 /* tp_new */
+};
+'''
+
+    module_init_template = '''\
+if (PyType_Ready(&%(oname)sType) < 0)
+  return;
+PyModule_AddObject(f2py_module, "%(name)s",
+                                (PyObject *)&%(oname)sType);
+'''
+
+    c_code_template = '''\
+static void %(init_func)s_c(
+               %(init_func_c_arg_clist)s) {
+  %(init_func_c_body_list)s
+}
+'''
+
+    capi_code_template = '''\
+static void %(oname)s_dealloc(%(oname)sObject* self) {
+  if (self->data)
+    PyMem_Free(self->data);
+  self->ob_type->tp_free((PyObject*)self);
+}
+
+static int pyobj_to_%(ctype)s(PyObject *obj,
+                              %(ctype)s* value_ptr) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (%(oname)sObject_Check(obj)) {
+    if (!memcpy(value_ptr,((%(oname)sObject *)obj)->data, %(byte_size)s)) {
+      PyErr_SetString(PyExc_MemoryError,
+         "failed to copy %(name)s instance memory to %(ctype)s object.");
+    } else {
+      return_value = 1;
+    }
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
+}
+
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value_ptr) {
+  %(oname)sObject* obj = (%(oname)sObject*)(%(oname)sType.tp_alloc(&%(oname)sType, 0));
+  if (obj == NULL)
+    return NULL;
+  obj->data = PyMem_Malloc(%(byte_size)s);
+  if (obj->data == NULL) {
+    Py_DECREF(obj);
+    return PyErr_NoMemory();
+  }
+  if (value_ptr) {
+    if (!memcpy(obj->data, value_ptr, %(byte_size)s)) {
+      PyErr_SetString(PyExc_MemoryError,
+         "failed to copy %(ctype)s object memory to %(name)s instance.");
+    }
+  }
+  %(init_func)s_f(%(init_func)s_c, obj, obj->data);
+  return (PyObject*)obj;
+}
+
+static PyObject * %(oname)s_new(PyTypeObject *type,
+                                PyObject *args, PyObject *kwds)
+{
+  return pyobj_from_%(ctype)s(NULL);
+}
+
+static int %(oname)s_init(%(oname)sObject *self,
+                          PyObject *capi_args, PyObject *capi_kwds)
+{
+   int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"%(oname)s_init()\\n");
+#endif
+   if (!PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
+                                   %(attr_init_clist)s))
+      return_value = -1;                             
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"%(oname)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+   return return_value;
+}
+
+static PyObject * %(oname)s_as_tuple(%(oname)sObject * self) {
+  return Py_BuildValue("%(as_tuple_format_elist)s"
+                        %(as_tuple_arg_clist)s);
+}
+
+static PyObject * %(oname)s_repr(PyObject * self) {
+  PyObject* r = PyString_FromString("%(name)s(");
+  PyString_ConcatAndDel(&r, PyObject_Repr(%(oname)s_as_tuple((%(oname)sObject*)self)));
+  PyString_ConcatAndDel(&r, PyString_FromString(")"));
+  return r;
+}
+
+%(getset_func_list)s
+'''
+
+    fortran_code_template = '''\
+      subroutine %(init_func)s(init_func_c, self, obj)
+      %(use_stmt_list)s
+      external init_func_c
+!     self is %(oname)sObject
+      external self
+      %(ftype)s obj
+      call init_func_c(%(init_func_f_arg_clist)s)
+      end
+'''
+
+    #module_method_template = ''''''
+
+    _defined_types = []
+    def __init__(self, parent, typedecl):
+        WrapperBase.__init__(self)
+        name = typedecl.name
+        if name in self._defined_types:
+            return
+        self._defined_types.append(name)
+
+        self.name = name
+        self.oname = oname = 'f2py_' + name
+        self.ctype = typedecl.get_c_type()
+        self.ctype_ptrs = self.ctype + '_ptrs'
+        self.ftype = typedecl.get_f_type()
+        self.byte_size = byte_size = typedecl.get_bit_size() / CHAR_BIT
+        WrapperCPPMacro(parent, 'F_FUNC')
+
+        self.init_func_f_arg_list = ['self']
+        self.init_func_c_arg_list = ['%sObject *self' % (self.oname)]
+        self.init_func_c_body_list = []
+        self.ptrstruct_list = []
+        self.attr_decl_list = []
+        self.attr_format_list = []
+        self.attr_init_list = []
+        self.as_tuple_format_list = []
+        self.as_tuple_arg_list = []
+        self.getset_func_list = []
+        self.type_getseters_list = []
+        for n in typedecl.a.component_names:
+            v = typedecl.a.components[n]
+            t = v.get_typedecl()
+            ct = t.get_c_type()
+            on = 'f2py_' + t.name
+            parent.add(t)
+            self.ptrstruct_list.append('%s* %s_ptr;' % (ct, n))
+            self.init_func_f_arg_list.append('obj %% %s' % (n))
+            self.init_func_c_arg_list.append('\n%s * %s_ptr' % (ct, n))
+            self.init_func_c_body_list.append('''\
+if (!((void*)%(n)s_ptr >= self->data
+      && (void*)%(n)s_ptr < self->data + %(byte_size)s ))
+  fprintf(stderr,"INCONSISTENCY IN %(name)s WRAPPER: "
+                 "self->data=%%p <= %(n)s_ptr=%%p < self->data+%(byte_size)s=%%p\\n",
+                 self->data, %(n)s_ptr, self->data + %(byte_size)s);
+self->%(n)s_ptr = %(n)s_ptr;
+''' % (locals()))
+            self.attr_format_list.append('O&')
+            WrapperCCode(parent, 'pyobj_to_%s' % (ct))
+            self.attr_init_list.append('\npyobj_to_%s, self->%s_ptr' % (ct,n))
+            WrapperCCode(parent, 'pyobj_from_%s' % (ct))
+            self.as_tuple_format_list.append('O&')
+            self.as_tuple_arg_list.append('\npyobj_from_%s, self->%s_ptr' % (ct, n))
+            self.getset_func_list.append('''\
+static PyObject * %(oname)s_get_%(n)s(%(oname)sObject *self,
+                                      void *closure) {
+  return pyobj_from_%(ct)s(self->%(n)s_ptr);
+}
+static int %(oname)s_set_%(n)s(%(oname)sObject *self,
+                               PyObject *value, void *closure)
+{
+  if (value == NULL) {
+    PyErr_SetString(PyExc_TypeError,
+                    "Cannot delete %(name)s attribute %(n)s");
+    return -1;
+  }
+  if (pyobj_to_%(ct)s(value, self->%(n)s_ptr))
+    return 0;
+  return -1;
+}
+''' % (locals()))
+            self.type_getseters_list.append('{"%(n)s",(getter)%(oname)s_get_%(n)s, (setter)%(oname)s_set_%(n)s,\n "component %(n)s",NULL},' % (locals()))
+        if self.attr_init_list: self.attr_init_list.insert(0,'')
+        if self.as_tuple_arg_list: self.as_tuple_arg_list.insert(0,'')
+        self.init_func = self.ctype + '_init'
+        self.INIT_FUNC = self.init_func.upper()
+
+        self.type_method_list = []
+        self.type_method_list.append('{"as_tuple",(PyCFunction)%(oname)s_as_tuple,METH_NOARGS,\n "Return %(name)s components as tuple."},' % (self.__dict__))
+        self.cname = typedecl.get_c_name()
+
+        self.use_stmt_list = []
+        if isinstance(typedecl.parent, Module):
+            self.use_stmt_list.append('use %s' % (typedecl.parent.name))
+
+        for n in parent.list_names:
+            l = getattr(parent,n + '_list')
+            l.append(self.apply_attributes(getattr(self, n+'_template','')))
+        return

Modified: trunk/numpy/f2py/lib/python_wrapper.py
===================================================================
--- trunk/numpy/f2py/lib/python_wrapper.py	2006-10-03 15:52:44 UTC (rev 3249)
+++ trunk/numpy/f2py/lib/python_wrapper.py	2006-10-04 09:49:54 UTC (rev 3250)
@@ -7,10 +7,6 @@
 
 from parser.api import *
 
-#from block_statements import *
-#from typedecl_statements import intrinsic_type_spec, Character
-#from utils import CHAR_BIT
-
 from wrapper_base import *
 
 class PythonWrapperModule(WrapperBase):
@@ -65,8 +61,6 @@
     def __init__(self, modulename):
         WrapperBase.__init__(self)
         self.modulename = modulename
-        #self.include_list = []
-        #self.cppmacro_list = []
         
         self.header_list = []
         self.typedef_list = []
@@ -80,11 +74,6 @@
 
         self.fortran_code_list = []
 
-        #self.defined_types = []
-        #self.defined_macros = []
-        #self.defined_c_functions = []
-        #self.defined_typedefs = []
-
         self.list_names = ['header', 'typedef', 'extern', 'objdecl',
                            'c_code','capi_code','module_method','module_init',
                            'fortran_code']



From numpy-svn at scipy.org  Thu Oct  5 01:49:12 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 00:49:12 -0500 (CDT)
Subject: [Numpy-svn] r3251 - in trunk/numpy: core/src lib
Message-ID: <20061005054912.744F739C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 00:49:08 -0500 (Thu, 05 Oct 2006)
New Revision: 3251

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
   trunk/numpy/lib/function_base.py
Log:
Fix up __array_interface__ getting and depth discovery for scalars.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-04 09:49:54 UTC (rev 3250)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-05 05:49:08 UTC (rev 3251)
@@ -6702,7 +6702,8 @@
         }
         if (PyArray_Check(s))
                 return PyArray_NDIM(s);
-        if(PyString_Check(s) || PyBuffer_Check(s) || PyUnicode_Check(s))
+        if (PyArray_IsScalar(s, Generic)) return 0;
+        if (PyString_Check(s) || PyBuffer_Check(s) || PyUnicode_Check(s))
                 return stop_at_string ? 0:1;
         if (stop_at_tuple && PyTuple_Check(s)) return 0;
         if ((e=PyObject_GetAttrString(s, "__array_interface__")) != NULL) {

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-04 09:49:54 UTC (rev 3250)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-05 05:49:08 UTC (rev 3251)
@@ -749,84 +749,28 @@
 }
 
 static PyObject *
-gentype_typestr_get(PyObject *self)
+gentype_shape_get(PyObject *self)
 {
-        PyArrayObject *arr;
-        PyObject *ret;
-
-        arr = (PyArrayObject *)PyArray_FromScalar(self, NULL);
-        ret = PyObject_GetAttrString((PyObject *)arr->descr, "str");
-        Py_DECREF(arr);
-        return ret;
+        return PyTuple_New(0);
 }
 
+
 static PyObject *
-gentype_descr_get(PyObject *self)
+gentype_interface_get(PyObject *self)
 {
         PyArrayObject *arr;
         PyObject *inter;
-        PyObject *ret;
 
         arr = (PyArrayObject *)PyArray_FromScalar(self, NULL);
+        if (arr == NULL) return NULL;
         inter = PyObject_GetAttrString((PyObject *)arr, "__array_interface__");
         Py_DECREF(arr);
-        if (inter == NULL) return NULL;
-        ret = PyDict_GetItemString(inter, "descr");
-        Py_DECREF(inter);
-        Py_XINCREF(ret);
-        return ret;
+        return inter;
 }
 
-static PyObject *
-gentype_shape_get(PyObject *self)
-{
-        return PyTuple_New(0);
-}
 
-static PyObject *
-gentype_dataptr_get(PyObject *self)
-{
-        return Py_BuildValue("NO",PyString_FromString(""),Py_True);
-}
 
-
 static PyObject *
-gentype_interface_get(PyObject *self)
-{
-        PyObject *obj, *dict;
-        dict = PyDict_New();
-        if (dict == NULL) return NULL;
-        obj = gentype_typestr_get(self);
-        if (obj == NULL) goto fail;
-        PyDict_SetItemString(dict, "typestr", obj);
-        Py_DECREF(obj);
-
-        obj = gentype_shape_get(self);
-        if (obj == NULL) goto fail;
-        PyDict_SetItemString(dict, "shape", obj);
-        PyDict_SetItemString(dict, "strides", obj);
-        Py_DECREF(obj);
-
-        obj = gentype_dataptr_get(self);
-        if (obj == NULL) goto fail;
-        PyDict_SetItemString(dict, "data", obj);
-        Py_DECREF(obj);
-
-        obj = gentype_descr_get(self);
-        if (obj == NULL) goto fail;
-        PyDict_SetItemString(dict, "descr", obj);
-        Py_DECREF(obj);
-
-        return dict;
-
- fail:
-        Py_DECREF(dict);
-        return NULL;
-}
-
-
-
-static PyObject *
 gentype_typedescr_get(PyObject *self)
 {
         return (PyObject *)PyArray_DescrFromScalar(self);

Modified: trunk/numpy/lib/function_base.py
===================================================================
--- trunk/numpy/lib/function_base.py	2006-10-04 09:49:54 UTC (rev 3250)
+++ trunk/numpy/lib/function_base.py	2006-10-05 05:49:08 UTC (rev 3251)
@@ -1023,8 +1023,7 @@
 
 def kaiser(M,beta):
     """kaiser(M, beta) returns a Kaiser window of length M with shape parameter
-    beta. It depends on numpy.special (in full numpy) for the modified bessel
-    function i0.
+    beta. 
     """
     from numpy.dual import i0
     n = arange(0,M)



From numpy-svn at scipy.org  Thu Oct  5 02:40:44 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 01:40:44 -0500 (CDT)
Subject: [Numpy-svn] r3252 - in trunk/numpy/core: . src
Message-ID: <20061005064044.E497F39C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 01:40:42 -0500 (Thu, 05 Oct 2006)
New Revision: 3252

Modified:
   trunk/numpy/core/records.py
   trunk/numpy/core/src/arrayobject.c
Log:
Fix issue #313.  Also make sure shape attribute of dtype object always returns a tuple.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-05 05:49:08 UTC (rev 3251)
+++ trunk/numpy/core/records.py	2006-10-05 06:40:42 UTC (rev 3252)
@@ -285,10 +285,6 @@
             formats += ','
         formats=formats[:-1]
 
-    for obj in arrayList:
-        if obj.shape != shape:
-            raise ValueError, "array has different shape"
-
     if dtype is not None:
         descr = sb.dtype(dtype)
         _names = descr.names
@@ -296,7 +292,22 @@
         parsed = format_parser(formats, names, titles, aligned, byteorder)
         _names = parsed._names
         descr = parsed._descr
+
+    # Determine shape from data-type.
+    if len(descr) != len(arrayList):
+        raise ValueError, "mismatch between the number of fields "\
+              "and the number of arrays"
+    
+    d0 = descr[0].shape
+    nn = len(d0)
+    if nn > 0:
+        shape = shape[nn:]
         
+    for k, obj in enumerate(arrayList):
+        nn = len(descr[k].shape)
+        if obj.shape[nn:] != shape:
+            raise ValueError, "array-shape mismatch in array", k
+        
     _array = recarray(shape, descr)
 
     # populate the record array (makes a copy)

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-05 05:49:08 UTC (rev 3251)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-05 06:40:42 UTC (rev 3252)
@@ -10634,8 +10634,11 @@
         if (self->subarray == NULL) {
                 return PyTuple_New(0);
         }
-        Py_INCREF(self->subarray->shape);
-        return (PyObject *)(self->subarray->shape);
+        if (PyTuple_Check(self->subarray->shape)) {
+                Py_INCREF(self->subarray->shape);
+                return (PyObject *)(self->subarray->shape);
+        }
+        return Py_BuildValue("(O)", self->subarray->shape);
 }
 
 static PyObject *



From numpy-svn at scipy.org  Thu Oct  5 02:52:47 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 01:52:47 -0500 (CDT)
Subject: [Numpy-svn] r3253 - trunk/numpy/core
Message-ID: <20061005065247.101D839C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 01:52:38 -0500 (Thu, 05 Oct 2006)
New Revision: 3253

Modified:
   trunk/numpy/core/records.py
Log:
Fix so that rec.array copies by default.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-05 06:40:42 UTC (rev 3252)
+++ trunk/numpy/core/records.py	2006-10-05 06:52:38 UTC (rev 3253)
@@ -476,7 +476,7 @@
     return _array
 
 def array(obj, dtype=None, shape=None, offset=0, strides=None, formats=None,
-          names=None, titles=None, aligned=False, byteorder=None):
+          names=None, titles=None, aligned=False, byteorder=None, copy=True):
     """Construct a record array from a wide-variety of objects.
     """
 
@@ -513,18 +513,29 @@
             return fromarrays(obj, dtype=dtype, shape=shape, **kwds)
 
     elif isinstance(obj, recarray):
-        new = obj.copy()
-        if dtype is not None:
-            new.dtype = dtype
+        copied = 0
+        if dtype is not None and (new.dtype != dtype):
+            new = obj.astype(dtype)
+            copied = 1
+        else:
+            new = obj
+        if copy and not copied:
+            new = new.copy()
         return new
 
     elif isinstance(obj, file):
         return fromfile(obj, dtype=dtype, shape=shape, offset=offset)
 
     elif isinstance(obj, sb.ndarray):
+        copied = 0
         if dtype is not None and (obj.dtype != dtype):
-            obj = obj.view(dtype)
-        res = obj.view(recarray)
+            new = obj.astype(dtype)
+            copied = 1
+        else:
+            new = obj
+        if copy and not copied:
+            new = new.copy()
+        res = new.view(recarray)
         if issubclass(res.dtype.type, nt.void):
             res.dtype = sb.dtype((record, res.dtype))
         return res



From numpy-svn at scipy.org  Thu Oct  5 03:23:56 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 02:23:56 -0500 (CDT)
Subject: [Numpy-svn] r3254 - trunk/numpy/f2py/lib
Message-ID: <20061005072356.9C0DD39C087@new.scipy.org>

Author: pearu
Date: 2006-10-05 02:23:48 -0500 (Thu, 05 Oct 2006)
New Revision: 3254

Added:
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/py_wrap.py
   trunk/numpy/f2py/lib/wrapper_base.py
Log:
F2PY G3: started subprogram support addition.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-05 06:52:38 UTC (rev 3253)
+++ trunk/numpy/f2py/lib/main.py	2006-10-05 07:23:48 UTC (rev 3254)
@@ -266,7 +266,7 @@
                                  extra_objects = extra_objects,
                                  )
         if external_subprograms:
-            wrapper = PythonWrapper(modulename)
+            wrapper = PythonWrapperModule(modulename)
             for block in external_subprograms:
                 wrapper.add(block)
             c_code = wrapper.c_code()
@@ -301,7 +301,7 @@
         new_sys_argv += ['config_fc'] + fc_flags
     sys.argv[:] = new_sys_argv
 
-    sys.stderr.write('setup arguments: %r' % (' '.join(sys.argv)))
+    sys.stderr.write('setup arguments: %r\n' % (' '.join(sys.argv)))
 
     from numpy.distutils.core import setup
     setup(configuration=configuration)

Modified: trunk/numpy/f2py/lib/py_wrap.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap.py	2006-10-05 06:52:38 UTC (rev 3253)
+++ trunk/numpy/f2py/lib/py_wrap.py	2006-10-05 07:23:48 UTC (rev 3254)
@@ -6,6 +6,8 @@
 
 from parser.api import *
 from wrapper_base import *
+from py_wrap_type import *
+from py_wrap_subprogram import *
 
 class PythonWrapperModule(WrapperBase):
 
@@ -85,17 +87,13 @@
             #for name, subblock in block.a.external_subprogram.items():
             #    self.add(subblock)
         elif isinstance(block, (Subroutine, Function)):
-            self.info('Generating interface for %s' % (block.name))
-            f = PythonCAPIFunction(self, block)
-            f.fill()
+            PythonCAPISubProgram(self, block)
         elif isinstance(block, Module):
             for name,declblock in block.a.type_decls.items():
                 self.add(declblock)
         elif isinstance(block, TypeDecl):
-            self.info('Generating interface for %s' % (block.name))
             PythonCAPIDerivedType(self, block)
         elif isinstance(block, tuple(declaration_type_spec)):
-            self.info('Generating interface for %s' % (block.name))
             PythonCAPIIntrinsicType(self, block)
         else:
             raise NotImplementedError,`block.__class__.__name__`
@@ -105,306 +103,3 @@
         return self.apply_attributes(self.main_template)
     def fortran_code(self):
         return self.apply_attributes(self.main_fortran_template)
-
-class PythonCAPIIntrinsicType(WrapperBase):
-    """
-    Fortran intrinsic type hooks.
-    """
-    _defined_types = []
-    def __init__(self, parent, typedecl):
-        WrapperBase.__init__(self)
-        self.name = name = typedecl.name
-        if name in self._defined_types:
-            return
-        self._defined_types.append(name)
-
-        self.ctype = ctype = typedecl.get_c_type()
-
-        if ctype.startswith('npy_'):
-            WrapperCCode(parent, 'pyobj_from_%s' % (ctype))
-            return
-        
-        if not ctype.startswith('f2py_type_'):
-            raise NotImplementedError,`name,ctype`
-
-        for n in parent.list_names:
-            l = getattr(parent,n + '_list')
-            l.append(self.apply_attributes(getattr(self, n+'_template','')))
-
-        return
-
-class PythonCAPIDerivedType(WrapperBase):
-    """
-    Fortran 90 derived type hooks.
-    """
-
-    header_template = '''\
-#define %(oname)sObject_Check(obj) \\
-    PyObject_TypeCheck((PyObject*)obj, &%(oname)sType)
-#define %(init_func)s_f \\
-    F_FUNC(%(init_func)s,%(INIT_FUNC)s)
-'''
-
-    typedef_template = '''\
-typedef void * %(ctype)s;
-typedef struct {
-  PyObject_HEAD
-  %(ptrstruct_list)s
-  %(ctype)s data;
-} %(oname)sObject;
-'''
-
-    extern_template = '''\
-static PyTypeObject %(oname)sType;
-'''
-
-    objdecl_template = '''\
-static PyMethodDef %(oname)s_methods[] = {
-    %(type_method_list)s
-    {NULL}  /* Sentinel */
-};
-
-static PyGetSetDef %(oname)s_getseters[] = {
-    %(type_getseters_list)s
-    {NULL}  /* Sentinel */
-};
-
-static PyTypeObject %(oname)sType = {
-    PyObject_HEAD_INIT(NULL)
-    0,                         /*ob_size*/
-    "%(name)s",                /*tp_name*/
-    sizeof(%(oname)sObject),    /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    (destructor)%(oname)s_dealloc, /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    %(oname)s_repr,            /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
-    "Fortran derived type %(name)s objects",        /* tp_doc */
-    0,		               /* tp_traverse */
-    0,		               /* tp_clear */
-    0,		               /* tp_richcompare */
-    0,		               /* tp_weaklistoffset */
-    0,		               /* tp_iter */
-    0,		               /* tp_iternext */
-    %(oname)s_methods,          /* tp_methods */
-    0 /*%(oname)s_members*/,    /* tp_members */
-    %(oname)s_getseters,       /* tp_getset */
-    0,                         /* tp_base */
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
-    0,                         /* tp_descr_set */
-    0,                         /* tp_dictoffset */
-    (initproc)%(oname)s_init,      /* tp_init */
-    0,                         /* tp_alloc */
-    %(oname)s_new,                 /* tp_new */
-};
-'''
-
-    module_init_template = '''\
-if (PyType_Ready(&%(oname)sType) < 0)
-  return;
-PyModule_AddObject(f2py_module, "%(name)s",
-                                (PyObject *)&%(oname)sType);
-'''
-
-    c_code_template = '''\
-static void %(init_func)s_c(
-               %(init_func_c_arg_clist)s) {
-  %(init_func_c_body_list)s
-}
-'''
-
-    capi_code_template = '''\
-static void %(oname)s_dealloc(%(oname)sObject* self) {
-  if (self->data)
-    PyMem_Free(self->data);
-  self->ob_type->tp_free((PyObject*)self);
-}
-
-static int pyobj_to_%(ctype)s(PyObject *obj,
-                              %(ctype)s* value_ptr) {
-  int return_value = 0;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
-#endif
-  if (%(oname)sObject_Check(obj)) {
-    if (!memcpy(value_ptr,((%(oname)sObject *)obj)->data, %(byte_size)s)) {
-      PyErr_SetString(PyExc_MemoryError,
-         "failed to copy %(name)s instance memory to %(ctype)s object.");
-    } else {
-      return_value = 1;
-    }
-  }
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
-#endif
-  return return_value;
-}
-
-static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value_ptr) {
-  %(oname)sObject* obj = (%(oname)sObject*)(%(oname)sType.tp_alloc(&%(oname)sType, 0));
-  if (obj == NULL)
-    return NULL;
-  obj->data = PyMem_Malloc(%(byte_size)s);
-  if (obj->data == NULL) {
-    Py_DECREF(obj);
-    return PyErr_NoMemory();
-  }
-  if (value_ptr) {
-    if (!memcpy(obj->data, value_ptr, %(byte_size)s)) {
-      PyErr_SetString(PyExc_MemoryError,
-         "failed to copy %(ctype)s object memory to %(name)s instance.");
-    }
-  }
-  %(init_func)s_f(%(init_func)s_c, obj, obj->data);
-  return (PyObject*)obj;
-}
-
-static PyObject * %(oname)s_new(PyTypeObject *type,
-                                PyObject *args, PyObject *kwds)
-{
-  return pyobj_from_%(ctype)s(NULL);
-}
-
-static int %(oname)s_init(%(oname)sObject *self,
-                          PyObject *capi_args, PyObject *capi_kwds)
-{
-   int return_value = 0;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"%(oname)s_init()\\n");
-#endif
-   if (!PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
-                                   %(attr_init_clist)s))
-      return_value = -1;                             
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"%(oname)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
-#endif
-   return return_value;
-}
-
-static PyObject * %(oname)s_as_tuple(%(oname)sObject * self) {
-  return Py_BuildValue("%(as_tuple_format_elist)s"
-                        %(as_tuple_arg_clist)s);
-}
-
-static PyObject * %(oname)s_repr(PyObject * self) {
-  PyObject* r = PyString_FromString("%(name)s(");
-  PyString_ConcatAndDel(&r, PyObject_Repr(%(oname)s_as_tuple((%(oname)sObject*)self)));
-  PyString_ConcatAndDel(&r, PyString_FromString(")"));
-  return r;
-}
-
-%(getset_func_list)s
-'''
-
-    fortran_code_template = '''\
-      subroutine %(init_func)s(init_func_c, self, obj)
-      %(use_stmt_list)s
-      external init_func_c
-!     self is %(oname)sObject
-      external self
-      %(ftype)s obj
-      call init_func_c(%(init_func_f_arg_clist)s)
-      end
-'''
-
-    #module_method_template = ''''''
-
-    _defined_types = []
-    def __init__(self, parent, typedecl):
-        WrapperBase.__init__(self)
-        name = typedecl.name
-        if name in self._defined_types:
-            return
-        self._defined_types.append(name)
-
-        self.name = name
-        self.oname = oname = 'f2py_' + name
-        self.ctype = typedecl.get_c_type()
-        self.ctype_ptrs = self.ctype + '_ptrs'
-        self.ftype = typedecl.get_f_type()
-        self.byte_size = byte_size = typedecl.get_bit_size() / CHAR_BIT
-        WrapperCPPMacro(parent, 'F_FUNC')
-
-        self.init_func_f_arg_list = ['self']
-        self.init_func_c_arg_list = ['%sObject *self' % (self.oname)]
-        self.init_func_c_body_list = []
-        self.ptrstruct_list = []
-        self.attr_decl_list = []
-        self.attr_format_list = []
-        self.attr_init_list = []
-        self.as_tuple_format_list = []
-        self.as_tuple_arg_list = []
-        self.getset_func_list = []
-        self.type_getseters_list = []
-        for n in typedecl.a.component_names:
-            v = typedecl.a.components[n]
-            t = v.get_typedecl()
-            ct = t.get_c_type()
-            on = 'f2py_' + t.name
-            parent.add(t)
-            self.ptrstruct_list.append('%s* %s_ptr;' % (ct, n))
-            self.init_func_f_arg_list.append('obj %% %s' % (n))
-            self.init_func_c_arg_list.append('\n%s * %s_ptr' % (ct, n))
-            self.init_func_c_body_list.append('''\
-if (!((void*)%(n)s_ptr >= self->data
-      && (void*)%(n)s_ptr < self->data + %(byte_size)s ))
-  fprintf(stderr,"INCONSISTENCY IN %(name)s WRAPPER: "
-                 "self->data=%%p <= %(n)s_ptr=%%p < self->data+%(byte_size)s=%%p\\n",
-                 self->data, %(n)s_ptr, self->data + %(byte_size)s);
-self->%(n)s_ptr = %(n)s_ptr;
-''' % (locals()))
-            self.attr_format_list.append('O&')
-            WrapperCCode(parent, 'pyobj_to_%s' % (ct))
-            self.attr_init_list.append('\npyobj_to_%s, self->%s_ptr' % (ct,n))
-            WrapperCCode(parent, 'pyobj_from_%s' % (ct))
-            self.as_tuple_format_list.append('O&')
-            self.as_tuple_arg_list.append('\npyobj_from_%s, self->%s_ptr' % (ct, n))
-            self.getset_func_list.append('''\
-static PyObject * %(oname)s_get_%(n)s(%(oname)sObject *self,
-                                      void *closure) {
-  return pyobj_from_%(ct)s(self->%(n)s_ptr);
-}
-static int %(oname)s_set_%(n)s(%(oname)sObject *self,
-                               PyObject *value, void *closure)
-{
-  if (value == NULL) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Cannot delete %(name)s attribute %(n)s");
-    return -1;
-  }
-  if (pyobj_to_%(ct)s(value, self->%(n)s_ptr))
-    return 0;
-  return -1;
-}
-''' % (locals()))
-            self.type_getseters_list.append('{"%(n)s",(getter)%(oname)s_get_%(n)s, (setter)%(oname)s_set_%(n)s,\n "component %(n)s",NULL},' % (locals()))
-        if self.attr_init_list: self.attr_init_list.insert(0,'')
-        if self.as_tuple_arg_list: self.as_tuple_arg_list.insert(0,'')
-        self.init_func = self.ctype + '_init'
-        self.INIT_FUNC = self.init_func.upper()
-
-        self.type_method_list = []
-        self.type_method_list.append('{"as_tuple",(PyCFunction)%(oname)s_as_tuple,METH_NOARGS,\n "Return %(name)s components as tuple."},' % (self.__dict__))
-        self.cname = typedecl.get_c_name()
-
-        self.use_stmt_list = []
-        if isinstance(typedecl.parent, Module):
-            self.use_stmt_list.append('use %s' % (typedecl.parent.name))
-
-        for n in parent.list_names:
-            l = getattr(parent,n + '_list')
-            l.append(self.apply_attributes(getattr(self, n+'_template','')))
-        return

Added: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-05 06:52:38 UTC (rev 3253)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-05 07:23:48 UTC (rev 3254)
@@ -0,0 +1,23 @@
+
+__all__ = ['PythonCAPISubProgram']
+
+import sys
+
+from wrapper_base import *
+
+class PythonCAPISubProgram(WrapperBase):
+    """
+    Fortran subprogram hooks.
+    """
+    _defined = []
+    def __init__(self, parent, block):
+        WrapperBase.__init__(self)
+        self.name = name = block.name
+        if name in self._defined:
+            return
+        self._defined.append(name)
+        self.info('Generating interface for %s: %s' % (block.__class__, name))
+
+
+        raise NotImplementedError,`name,block.__class__`
+        return

Added: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-05 06:52:38 UTC (rev 3253)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-05 07:23:48 UTC (rev 3254)
@@ -0,0 +1,305 @@
+
+__all__ = ['PythonCAPIIntrinsicType', 'PythonCAPIDerivedType']
+
+from wrapper_base import *
+from parser.api import CHAR_BIT, Module
+
+class PythonCAPIIntrinsicType(WrapperBase):
+    """
+    Fortran intrinsic type hooks.
+    """
+    _defined = []
+    def __init__(self, parent, typedecl):
+        WrapperBase.__init__(self)
+        self.name = name = typedecl.name
+        if name in self._defined:
+            return
+        self._defined.append(name)
+        self.info('Generating interface for %s: %s' % (typedecl.__class__, name))
+
+        ctype = typedecl.get_c_type()
+
+        if ctype.startswith('npy_'):
+            WrapperCCode(parent, 'pyobj_from_%s' % (ctype))
+            return
+        
+        if not ctype.startswith('f2py_type_'):
+            raise NotImplementedError,`name,ctype`
+        return
+
+class PythonCAPIDerivedType(WrapperBase):
+    """
+    Fortran 90 derived type hooks.
+    """
+
+    header_template = '''\
+#define %(oname)sObject_Check(obj) \\
+    PyObject_TypeCheck((PyObject*)obj, &%(oname)sType)
+#define %(init_func)s_f \\
+    F_FUNC(%(init_func)s,%(INIT_FUNC)s)
+'''
+
+    typedef_template = '''\
+typedef void * %(ctype)s;
+typedef struct {
+  PyObject_HEAD
+  %(ptrstruct_list)s
+  %(ctype)s data;
+} %(oname)sObject;
+'''
+
+    extern_template = '''\
+static PyTypeObject %(oname)sType;
+'''
+
+    objdecl_template = '''\
+static PyMethodDef %(oname)s_methods[] = {
+    %(type_method_list)s
+    {NULL}  /* Sentinel */
+};
+
+static PyGetSetDef %(oname)s_getseters[] = {
+    %(type_getseters_list)s
+    {NULL}  /* Sentinel */
+};
+
+static PyTypeObject %(oname)sType = {
+    PyObject_HEAD_INIT(NULL)
+    0,                         /*ob_size*/
+    "%(name)s",                /*tp_name*/
+    sizeof(%(oname)sObject),    /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    (destructor)%(oname)s_dealloc, /*tp_dealloc*/
+    0,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    %(oname)s_repr,            /*tp_repr*/
+    0,                         /*tp_as_number*/
+    0,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    0,                         /*tp_call*/
+    0,                         /*tp_str*/
+    0,                         /*tp_getattro*/
+    0,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
+    "Fortran derived type %(name)s objects",        /* tp_doc */
+    0,		               /* tp_traverse */
+    0,		               /* tp_clear */
+    0,		               /* tp_richcompare */
+    0,		               /* tp_weaklistoffset */
+    0,		               /* tp_iter */
+    0,		               /* tp_iternext */
+    %(oname)s_methods,          /* tp_methods */
+    0 /*%(oname)s_members*/,    /* tp_members */
+    %(oname)s_getseters,       /* tp_getset */
+    0,                         /* tp_base */
+    0,                         /* tp_dict */
+    0,                         /* tp_descr_get */
+    0,                         /* tp_descr_set */
+    0,                         /* tp_dictoffset */
+    (initproc)%(oname)s_init,      /* tp_init */
+    0,                         /* tp_alloc */
+    %(oname)s_new,                 /* tp_new */
+};
+'''
+
+    module_init_template = '''\
+if (PyType_Ready(&%(oname)sType) < 0)
+  return;
+PyModule_AddObject(f2py_module, "%(name)s",
+                                (PyObject *)&%(oname)sType);
+'''
+
+    c_code_template = '''\
+static void %(init_func)s_c(
+               %(init_func_c_arg_clist)s) {
+  %(init_func_c_body_list)s
+}
+'''
+
+    capi_code_template = '''\
+static void %(oname)s_dealloc(%(oname)sObject* self) {
+  if (self->data)
+    PyMem_Free(self->data);
+  self->ob_type->tp_free((PyObject*)self);
+}
+
+static int pyobj_to_%(ctype)s(PyObject *obj,
+                              %(ctype)s* value_ptr) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (%(oname)sObject_Check(obj)) {
+    if (!memcpy(value_ptr,((%(oname)sObject *)obj)->data, %(byte_size)s)) {
+      PyErr_SetString(PyExc_MemoryError,
+         "failed to copy %(name)s instance memory to %(ctype)s object.");
+    } else {
+      return_value = 1;
+    }
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
+}
+
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value_ptr) {
+  %(oname)sObject* obj = (%(oname)sObject*)(%(oname)sType.tp_alloc(&%(oname)sType, 0));
+  if (obj == NULL)
+    return NULL;
+  obj->data = PyMem_Malloc(%(byte_size)s);
+  if (obj->data == NULL) {
+    Py_DECREF(obj);
+    return PyErr_NoMemory();
+  }
+  if (value_ptr) {
+    if (!memcpy(obj->data, value_ptr, %(byte_size)s)) {
+      PyErr_SetString(PyExc_MemoryError,
+         "failed to copy %(ctype)s object memory to %(name)s instance.");
+    }
+  }
+  %(init_func)s_f(%(init_func)s_c, obj, obj->data);
+  return (PyObject*)obj;
+}
+
+static PyObject * %(oname)s_new(PyTypeObject *type,
+                                PyObject *args, PyObject *kwds)
+{
+  return pyobj_from_%(ctype)s(NULL);
+}
+
+static int %(oname)s_init(%(oname)sObject *self,
+                          PyObject *capi_args, PyObject *capi_kwds)
+{
+   int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"%(oname)s_init()\\n");
+#endif
+   if (!PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
+                                   %(attr_init_clist)s))
+      return_value = -1;                             
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"%(oname)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+   return return_value;
+}
+
+static PyObject * %(oname)s_as_tuple(%(oname)sObject * self) {
+  return Py_BuildValue("%(as_tuple_format_elist)s"
+                        %(as_tuple_arg_clist)s);
+}
+
+static PyObject * %(oname)s_repr(PyObject * self) {
+  PyObject* r = PyString_FromString("%(name)s(");
+  PyString_ConcatAndDel(&r, PyObject_Repr(%(oname)s_as_tuple((%(oname)sObject*)self)));
+  PyString_ConcatAndDel(&r, PyString_FromString(")"));
+  return r;
+}
+
+%(getset_func_list)s
+'''
+
+    fortran_code_template = '''\
+      subroutine %(init_func)s(init_func_c, self, obj)
+      %(use_stmt_list)s
+      external init_func_c
+!     self is %(oname)sObject
+      external self
+      %(ftype)s obj
+      call init_func_c(%(init_func_f_arg_clist)s)
+      end
+'''
+
+    #module_method_template = ''''''
+
+    _defined = []
+    def __init__(self, parent, typedecl):
+        WrapperBase.__init__(self)
+        name = typedecl.name
+        if name in self._defined:
+            return
+        self._defined.append(name)
+        self.info('Generating interface for %s: %s' % (typedecl.__class__, name))
+
+        self.name = name
+        self.oname = oname = 'f2py_' + name
+        self.ctype = typedecl.get_c_type()
+        self.ctype_ptrs = self.ctype + '_ptrs'
+        self.ftype = typedecl.get_f_type()
+        self.byte_size = byte_size = typedecl.get_bit_size() / CHAR_BIT
+        WrapperCPPMacro(parent, 'F_FUNC')
+
+        self.init_func_f_arg_list = ['self']
+        self.init_func_c_arg_list = ['%sObject *self' % (self.oname)]
+        self.init_func_c_body_list = []
+        self.ptrstruct_list = []
+        self.attr_decl_list = []
+        self.attr_format_list = []
+        self.attr_init_list = []
+        self.as_tuple_format_list = []
+        self.as_tuple_arg_list = []
+        self.getset_func_list = []
+        self.type_getseters_list = []
+        for n in typedecl.a.component_names:
+            v = typedecl.a.components[n]
+            t = v.get_typedecl()
+            ct = t.get_c_type()
+            on = 'f2py_' + t.name
+            parent.add(t)
+            self.ptrstruct_list.append('%s* %s_ptr;' % (ct, n))
+            self.init_func_f_arg_list.append('obj %% %s' % (n))
+            self.init_func_c_arg_list.append('\n%s * %s_ptr' % (ct, n))
+            self.init_func_c_body_list.append('''\
+if (!((void*)%(n)s_ptr >= self->data
+      && (void*)%(n)s_ptr < self->data + %(byte_size)s ))
+  fprintf(stderr,"INCONSISTENCY IN %(name)s WRAPPER: "
+                 "self->data=%%p <= %(n)s_ptr=%%p < self->data+%(byte_size)s=%%p\\n",
+                 self->data, %(n)s_ptr, self->data + %(byte_size)s);
+self->%(n)s_ptr = %(n)s_ptr;
+''' % (locals()))
+            self.attr_format_list.append('O&')
+            WrapperCCode(parent, 'pyobj_to_%s' % (ct))
+            self.attr_init_list.append('\npyobj_to_%s, self->%s_ptr' % (ct,n))
+            WrapperCCode(parent, 'pyobj_from_%s' % (ct))
+            self.as_tuple_format_list.append('O&')
+            self.as_tuple_arg_list.append('\npyobj_from_%s, self->%s_ptr' % (ct, n))
+            self.getset_func_list.append('''\
+static PyObject * %(oname)s_get_%(n)s(%(oname)sObject *self,
+                                      void *closure) {
+  return pyobj_from_%(ct)s(self->%(n)s_ptr);
+}
+static int %(oname)s_set_%(n)s(%(oname)sObject *self,
+                               PyObject *value, void *closure)
+{
+  if (value == NULL) {
+    PyErr_SetString(PyExc_TypeError,
+                    "Cannot delete %(name)s attribute %(n)s");
+    return -1;
+  }
+  if (pyobj_to_%(ct)s(value, self->%(n)s_ptr))
+    return 0;
+  return -1;
+}
+''' % (locals()))
+            self.type_getseters_list.append('{"%(n)s",(getter)%(oname)s_get_%(n)s, (setter)%(oname)s_set_%(n)s,\n "component %(n)s",NULL},' % (locals()))
+        if self.attr_init_list: self.attr_init_list.insert(0,'')
+        if self.as_tuple_arg_list: self.as_tuple_arg_list.insert(0,'')
+        self.init_func = self.ctype + '_init'
+        self.INIT_FUNC = self.init_func.upper()
+
+        self.type_method_list = []
+        self.type_method_list.append('{"as_tuple",(PyCFunction)%(oname)s_as_tuple,METH_NOARGS,\n "Return %(name)s components as tuple."},' % (self.__dict__))
+        self.cname = typedecl.get_c_name()
+
+        self.use_stmt_list = []
+        if isinstance(typedecl.parent, Module):
+            self.use_stmt_list.append('use %s' % (typedecl.parent.name))
+
+        for n in parent.list_names:
+            l = getattr(parent,n + '_list')
+            l.append(self.apply_attributes(getattr(self, n+'_template','')))
+        return

Modified: trunk/numpy/f2py/lib/wrapper_base.py
===================================================================
--- trunk/numpy/f2py/lib/wrapper_base.py	2006-10-05 06:52:38 UTC (rev 3253)
+++ trunk/numpy/f2py/lib/wrapper_base.py	2006-10-05 07:23:48 UTC (rev 3254)
@@ -2,6 +2,7 @@
 import os
 import sys
 import re
+
 __all__ = ['WrapperBase','WrapperCPPMacro','WrapperCCode']
 
 class WrapperBase:
@@ -102,6 +103,12 @@
             d[name] = str(attrs).replace('\n','\n'+tab)
         return template % d
 
+    def apply_templates(self, child):
+        for n in parent.list_names:
+            l = getattr(parent,n + '_list')
+            l.append(child.apply_attributes(getattr(child, n+'_template','')))
+        return
+
 class WrapperCPPMacro(WrapperBase):
     """
     CPP macros



From numpy-svn at scipy.org  Thu Oct  5 07:37:58 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 06:37:58 -0500 (CDT)
Subject: [Numpy-svn] r3255 - trunk/numpy/core
Message-ID: <20061005113758.D013739C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 06:37:56 -0500 (Thu, 05 Oct 2006)
New Revision: 3255

Modified:
   trunk/numpy/core/records.py
Log:
Fix #317 typo.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-05 07:23:48 UTC (rev 3254)
+++ trunk/numpy/core/records.py	2006-10-05 11:37:56 UTC (rev 3255)
@@ -514,7 +514,7 @@
 
     elif isinstance(obj, recarray):
         copied = 0
-        if dtype is not None and (new.dtype != dtype):
+        if dtype is not None and (obj.dtype != dtype):
             new = obj.astype(dtype)
             copied = 1
         else:



From numpy-svn at scipy.org  Thu Oct  5 07:45:29 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 06:45:29 -0500 (CDT)
Subject: [Numpy-svn] r3256 - trunk/numpy/core
Message-ID: <20061005114529.DBC4539C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 06:45:28 -0500 (Thu, 05 Oct 2006)
New Revision: 3256

Modified:
   trunk/numpy/core/records.py
Log:
Use .view in-place of astype in rec.array when new dtype is given.

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-05 11:37:56 UTC (rev 3255)
+++ trunk/numpy/core/records.py	2006-10-05 11:45:28 UTC (rev 3256)
@@ -513,13 +513,11 @@
             return fromarrays(obj, dtype=dtype, shape=shape, **kwds)
 
     elif isinstance(obj, recarray):
-        copied = 0
         if dtype is not None and (obj.dtype != dtype):
-            new = obj.astype(dtype)
-            copied = 1
+            new = obj.view(dtype)
         else:
             new = obj
-        if copy and not copied:
+        if copy:
             new = new.copy()
         return new
 
@@ -527,13 +525,11 @@
         return fromfile(obj, dtype=dtype, shape=shape, offset=offset)
 
     elif isinstance(obj, sb.ndarray):
-        copied = 0
         if dtype is not None and (obj.dtype != dtype):
-            new = obj.astype(dtype)
-            copied = 1
+            new = obj.view(dtype)
         else:
             new = obj
-        if copy and not copied:
+        if copy:
             new = new.copy()
         res = new.view(recarray)
         if issubclass(res.dtype.type, nt.void):



From numpy-svn at scipy.org  Thu Oct  5 09:35:11 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 08:35:11 -0500 (CDT)
Subject: [Numpy-svn] r3257 - trunk/numpy/f2py/lib
Message-ID: <20061005133511.76A8439C08E@new.scipy.org>

Author: pearu
Date: 2006-10-05 08:35:06 -0500 (Thu, 05 Oct 2006)
New Revision: 3257

Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/wrapper_base.py
Log:
Fixed typos.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-05 11:45:28 UTC (rev 3256)
+++ trunk/numpy/f2py/lib/main.py	2006-10-05 13:35:06 UTC (rev 3257)
@@ -173,7 +173,7 @@
     """
     Build wrappers to Fortran 90 modules and external subprograms.
     """
-    modulename = get_option_value(sys_argv,'-m','untitled','unknown')
+    modulename = get_option_value(sys_argv,'-m','untitled','unspecified')
 
     build_dir = get_option_value('--build-dir','.',None)
     if build_dir is None:

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-05 11:45:28 UTC (rev 3256)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-05 13:35:06 UTC (rev 3257)
@@ -299,7 +299,7 @@
         if isinstance(typedecl.parent, Module):
             self.use_stmt_list.append('use %s' % (typedecl.parent.name))
 
-        for n in parent.list_names:
-            l = getattr(parent,n + '_list')
-            l.append(self.apply_attributes(getattr(self, n+'_template','')))
+        parent.apply_templates(self)
+
+
         return

Modified: trunk/numpy/f2py/lib/wrapper_base.py
===================================================================
--- trunk/numpy/f2py/lib/wrapper_base.py	2006-10-05 11:45:28 UTC (rev 3256)
+++ trunk/numpy/f2py/lib/wrapper_base.py	2006-10-05 13:35:06 UTC (rev 3257)
@@ -104,8 +104,8 @@
         return template % d
 
     def apply_templates(self, child):
-        for n in parent.list_names:
-            l = getattr(parent,n + '_list')
+        for n in self.list_names:
+            l = getattr(self,n + '_list')
             l.append(child.apply_attributes(getattr(child, n+'_template','')))
         return
 



From numpy-svn at scipy.org  Thu Oct  5 09:37:23 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 08:37:23 -0500 (CDT)
Subject: [Numpy-svn] r3258 - in trunk/numpy/core: code_generators
	include/numpy src
Message-ID: <20061005133723.7846039C08E@new.scipy.org>

Author: oliphant
Date: 2006-10-05 08:37:20 -0500 (Thu, 05 Oct 2006)
New Revision: 3258

Modified:
   trunk/numpy/core/code_generators/array_api_order.txt
   trunk/numpy/core/include/numpy/old_defines.h
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/ufuncobject.c
Log:
Speed up broadcasting ufuncs by making sure the loop axis is the one with the smallest strides.

Modified: trunk/numpy/core/code_generators/array_api_order.txt
===================================================================
--- trunk/numpy/core/code_generators/array_api_order.txt	2006-10-05 13:35:06 UTC (rev 3257)
+++ trunk/numpy/core/code_generators/array_api_order.txt	2006-10-05 13:37:20 UTC (rev 3258)
@@ -78,7 +78,7 @@
 PyArray_NewFlagsObject
 PyArray_CanCastScalar
 PyArray_CompareUCS4
-PyArray_RemoveLargest
+PyArray_RemoveSmallest
 PyArray_ElementStrides
 PyArray_Item_INCREF
 PyArray_Item_XDECREF

Modified: trunk/numpy/core/include/numpy/old_defines.h
===================================================================
--- trunk/numpy/core/include/numpy/old_defines.h	2006-10-05 13:35:06 UTC (rev 3257)
+++ trunk/numpy/core/include/numpy/old_defines.h	2006-10-05 13:37:20 UTC (rev 3258)
@@ -165,3 +165,5 @@
 #define PyArray_MAX_ELSIZE NPY_MAX_ELSIZE
 
 #define PyArray_USE_PYMEM NPY_USE_PYMEM
+
+#define PyArray_RemoveLargest PyArray_RemoveSmallest

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-05 13:35:06 UTC (rev 3257)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-05 13:37:20 UTC (rev 3258)
@@ -950,7 +950,7 @@
                 return -1;
         }
 
-        maxaxis = PyArray_RemoveLargest(multi);
+        maxaxis = PyArray_RemoveSmallest(multi);
         if (maxaxis < 0) { /* copy 1 0-d array to another */
                 PyArray_XDECREF(dest);
                 memcpy(dest->data, src->data, elsize);
@@ -7455,7 +7455,7 @@
 
         icopyfunc = in->descr->f->copyswapn;
         ocopyfunc = out->descr->f->copyswapn;
-        maxaxis = PyArray_RemoveLargest(multi);
+        maxaxis = PyArray_RemoveSmallest(multi);
         if (maxaxis < 0) { /* cast 1 0-d array to another */
                 N = 1;
                 maxdim = 1;
@@ -8765,7 +8765,8 @@
 
 /*OBJECT_API
  Get Iterator that iterates over all but one axis (don't use this with
- PyArray_ITER_GOTO1D).  The axis will be over-written if negative.
+ PyArray_ITER_GOTO1D).  The axis will be over-written if negative
+ with the axis having the smallest stride. 
 */
 static PyObject *
 PyArray_IterAllButAxis(PyObject *obj, int *inaxis)
@@ -8778,15 +8779,21 @@
         if (PyArray_NDIM(obj)==0)
                 return (PyObject *)it;
         if (*inaxis < 0) {
-                int i, maxaxis=0;
-                intp maxdim=PyArray_DIM(obj,0);
+                int i, minaxis=0;
+                intp minstride=0;
+                i = 0;
+                while (minstride==0 && i<PyArray_NDIM(obj)) {
+                        minstride = PyArray_STRIDE(obj,i);
+                        i++;
+                }
                 for (i=1; i<PyArray_NDIM(obj); i++) {
-                        if (PyArray_DIM(obj,i) > maxdim) {
-                                maxaxis = i;
-                                maxdim = PyArray_DIM(obj,i);
+                        if (PyArray_STRIDE(obj,i) > 0 && 
+                            PyArray_STRIDE(obj, i) < minstride) {
+                                minaxis = i;
+                                minstride = PyArray_STRIDE(obj,i);
                         }
                 }
-                *inaxis = maxaxis;
+                *inaxis = minaxis;
         }
         axis = *inaxis;
         /* adjust so that will not iterate over axis */
@@ -8807,27 +8814,36 @@
    adjusted */
 
 /*OBJECT_API
-  Adjusts previously broadcasted iterators so that the largest axis
-  is not iterated over.
-  Returns dimension which is largest in the range [0,multi->nd).
+  Adjusts previously broadcasted iterators so that the axis with 
+  the smallest sum of iterator strides is not iterated over.
+  Returns dimension which is smallest in the range [0,multi->nd).
   A -1 is returned if multi->nd == 0.
  */
 static int
-PyArray_RemoveLargest(PyArrayMultiIterObject *multi)
+PyArray_RemoveSmallest(PyArrayMultiIterObject *multi)
 {
         PyArrayIterObject *it;
-        int i;
-        int axis=0;
-        intp longest;
+        int i, j;
+        int axis;
+        intp smallest;
+        intp sumstrides[NPY_MAXDIMS];
 
         if (multi->nd == 0) return -1;
 
-        longest = multi->dimensions[0];
+
+        for (i=0; i<multi->nd; i++) {
+                sumstrides[i] = 0;
+                for (j=0; j<multi->numiter; j++) {
+                        sumstrides[i] = multi->iters[j]->strides[i];
+                }
+        }
+        axis=0;
+        smallest = sumstrides[0];
         /* Find longest dimension */
         for (i=1; i<multi->nd; i++) {
-                if (multi->dimensions[i] > longest) {
+                if (sumstrides[i] < smallest) {
                         axis = i;
-                        longest = multi->dimensions[i];
+                        smallest = sumstrides[i];
                 }
         }
 

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-05 13:35:06 UTC (rev 3257)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-05 13:37:20 UTC (rev 3258)
@@ -1144,37 +1144,60 @@
 
         loop->numiter = self->nargs;
 
-        /* Fill in steps */
-        if (loop->meth != ONE_UFUNCLOOP) {
-		int ldim = 0;
-		intp maxdim=-1;
+	/* Fill in steps */
+	if (loop->meth != ONE_UFUNCLOOP) {
+		int ldim;
+		intp minsum;
+		intp maxdim;
 		PyArrayIterObject *it;
+		intp stride_sum[NPY_MAXDIMS];
+		int j;
 
-                /* Fix iterators */
+		/* Fix iterators */
 
-                /* Find the **largest** dimension */
+		/* Optimize axis the iteration takes place over
 
-		maxdim = -1;
-		for (i=loop->nd - 1; i>=0; i--) {
-			if (loop->dimensions[i] > maxdim) {
+		The first thought was to have the loop go 
+		over the largest dimension to minimize the number of loops
+		
+		However, on processors with slow memory bus and cache,
+		the slowest loops occur when the memory access occurs for
+		large strides. 
+		
+		Thus, choose the axis for which strides of the last iterator is 
+		smallest but non-zero.
+		 */
+
+		for (i=0; i<loop->nd-1; i++) {
+			stride_sum[i] = 0;
+			for (j=0; j<loop->numiter; j++) {
+				stride_sum[i] += loop->iters[j]->strides[i];
+			}
+		}
+
+		ldim = loop->nd - 1;
+		minsum = stride_sum[loop->nd-1];
+		for (i=loop->nd - 2; i>=0; i--) {
+			if (stride_sum[i] < minsum ) {
 				ldim = i;
-				maxdim = loop->dimensions[i];
+				minsum = stride_sum[i];
 			}
 		}
 
+		maxdim = loop->dimensions[ldim];
 		loop->size /= maxdim;
-                loop->bufcnt = maxdim;
+		loop->bufcnt = maxdim;
 		loop->lastdim = ldim;
 
-                /* Fix the iterators so the inner loop occurs over the
+		/* Fix the iterators so the inner loop occurs over the
 		   largest dimensions -- This can be done by
 		   setting the size to 1 in that dimension
 		   (just in the iterators)
-                 */
+		 */
 
 		for (i=0; i<loop->numiter; i++) {
 			it = loop->iters[i];
-                        it->contiguous = 0;
+			it->contiguous = 0;
 			it->size /= (it->dims_m1[ldim]+1);
 			it->dims_m1[ldim] = 0;
 			it->backstrides[ldim] = 0;
@@ -1184,7 +1207,7 @@
 			   so don't change them) */
 
 			/* Set the steps to the strides in that dimension */
-                        loop->steps[i] = it->strides[ldim];
+			loop->steps[i] = it->strides[ldim];
 		}
 
 		/* fix up steps where we will be copying data to
@@ -1201,8 +1224,8 @@
 				/* These are changed later if casting is needed */
 			}
 		}
-        }
-        else { /* uniformly-strided case ONE_UFUNCLOOP */
+	}
+	else { /* uniformly-strided case ONE_UFUNCLOOP */
 		for (i=0; i<self->nargs; i++) {
 			if (PyArray_SIZE(mps[i]) == 1)
 				loop->steps[i] = 0;
@@ -1466,19 +1489,21 @@
 			       loop->steps, loop->funcdata);
 		UFUNC_CHECK_ERROR(loop);
 		break;
-	case NOBUFFER_UFUNCLOOP:
+	case NOBUFFER_UFUNCLOOP: 
 		/* Everything is notswapped, aligned and of the
 		   right type but not contiguous. -- Almost as fast.
 		*/
-                /*fprintf(stderr, "NOBUFFER...%d\n", loop->size);*/
+		/*fprintf(stderr, "NOBUFFER...%d\n", loop->size);*/
 		while (loop->index < loop->size) {
 			for (i=0; i<self->nargs; i++)
 				loop->bufptr[i] = loop->iters[i]->dataptr;
-
+			
 			loop->function((char **)loop->bufptr, &(loop->bufcnt),
 				       loop->steps, loop->funcdata);
 			UFUNC_CHECK_ERROR(loop);
 
+			/* Adjust loop pointers */
+			
 			for (i=0; i<self->nargs; i++) {
 				PyArray_ITER_NEXT(loop->iters[i]);
 			}
@@ -1506,7 +1531,7 @@
 		int ninnerloops = loop->ninnerloops;
 		Bool pyobject[NPY_MAXARGS];
 		int datasize[NPY_MAXARGS];
-                int i, j, k, stopcondition;
+                int j, k, stopcondition;
 		char *myptr1, *myptr2;
 
 



From numpy-svn at scipy.org  Thu Oct  5 12:05:06 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 11:05:06 -0500 (CDT)
Subject: [Numpy-svn] r3259 - trunk/numpy/core/include/numpy
Message-ID: <20061005160506.A04F639C00F@new.scipy.org>

Author: pearu
Date: 2006-10-05 11:05:00 -0500 (Thu, 05 Oct 2006)
New Revision: 3259

Modified:
   trunk/numpy/core/include/numpy/arrayscalars.h
   trunk/numpy/core/include/numpy/ndarrayobject.h
Log:
Defined Py<Cls><bitsize>ScalarObject and Py<Cls><bitsize>ArrType_Type CPP macros

Modified: trunk/numpy/core/include/numpy/arrayscalars.h
===================================================================
--- trunk/numpy/core/include/numpy/arrayscalars.h	2006-10-05 13:37:20 UTC (rev 3258)
+++ trunk/numpy/core/include/numpy/arrayscalars.h	2006-10-05 16:05:00 UTC (rev 3259)
@@ -124,6 +124,11 @@
 	PyObject *base;
 } PyVoidScalarObject;
 
+/* Macros
+     Py<Cls><bitsize>ScalarObject
+     Py<Cls><bitsize>ArrType_Type
+   are defined in ndarrayobject.h 
+*/
 
 #define PyArrayScalar_False ((PyObject *)(&(_PyArrayScalar_BoolValues[0])))
 #define PyArrayScalar_True ((PyObject *)(&(_PyArrayScalar_BoolValues[1])))

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-05 13:37:20 UTC (rev 3258)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-05 16:05:00 UTC (rev 3259)
@@ -289,27 +289,47 @@
 #define NPY_UINT8 NPY_ULONG
         typedef long npy_int8;
         typedef unsigned long npy_uint8;
+#define PyInt8ScalarObject PyLongScalarObject
+#define PyInt8ArrType_Type PyLongArrType_Type
+#define PyUInt8ScalarObject PyULongScalarObject
+#define PyUInt8ArrType_Type PyULongArrType_Type
 #elif NPY_BITSOF_LONG == 16
 #define NPY_INT16 NPY_LONG
 #define NPY_UINT16 NPY_ULONG
         typedef long npy_int16;
         typedef unsigned long npy_uint16;
+#define PyInt16ScalarObject PyLongScalarObject
+#define PyInt16ArrType_Type PyLongArrType_Type
+#define PyUInt16ScalarObject PyULongScalarObject
+#define PyUInt16ArrType_Type PyULongArrType_Type
 #elif NPY_BITSOF_LONG == 32
 #define NPY_INT32 NPY_LONG
 #define NPY_UINT32 NPY_ULONG
         typedef long npy_int32;
         typedef unsigned long npy_uint32;
         typedef unsigned long npy_ucs4;
+#define PyInt32ScalarObject PyLongScalarObject
+#define PyInt32ArrType_Type PyLongArrType_Type
+#define PyUInt32ScalarObject PyULongScalarObject
+#define PyUInt32ArrType_Type PyULongArrType_Type
 #elif NPY_BITSOF_LONG == 64
 #define NPY_INT64 NPY_LONG
 #define NPY_UINT64 NPY_ULONG
         typedef long npy_int64;
         typedef unsigned long npy_uint64;
+#define PyInt64ScalarObject PyLongScalarObject
+#define PyInt64ArrType_Type PyLongArrType_Type
+#define PyUInt64ScalarObject PyULongScalarObject
+#define PyUInt64ArrType_Type PyULongArrType_Type
 #elif NPY_BITSOF_LONG == 128
 #define NPY_INT128 NPY_LONG
 #define NPY_UINT128 NPY_ULONG
         typedef long npy_int128;
         typedef unsigned long npy_uint128;
+#define PyInt128ScalarObject PyLongScalarObject
+#define PyInt128ArrType_Type PyLongArrType_Type
+#define PyUInt128ScalarObject PyULongScalarObject
+#define PyUInt128ArrType_Type PyULongArrType_Type
 #endif
 
 #if NPY_BITSOF_LONGLONG == 8
@@ -318,6 +338,10 @@
 #    define NPY_UINT8 NPY_ULONGLONG
         typedef npy_longlong npy_int8;
         typedef npy_ulonglong npy_uint8;
+#    define PyInt8ScalarObject PyLongLongScalarObject
+#    define PyInt8ArrType_Type PyLongLongArrType_Type
+#    define PyUInt8ScalarObject PyULongLongScalarObject
+#    define PyUInt8ArrType_Type PyULongLongArrType_Type
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT8
 #  define NPY_MIN_LONGLONG NPY_MIN_INT8
@@ -328,6 +352,10 @@
 #    define NPY_UINT16 NPY_ULONGLONG
         typedef npy_longlong npy_int16;
         typedef npy_ulonglong npy_uint16;
+#    define PyInt16ScalarObject PyLongLongScalarObject
+#    define PyInt16ArrType_Type PyLongLongArrType_Type
+#    define PyUInt16ScalarObject PyULongLongScalarObject
+#    define PyUInt16ArrType_Type PyULongLongArrType_Type
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT16
 #  define NPY_MIN_LONGLONG NPY_MIN_INT16
@@ -339,6 +367,10 @@
         typedef npy_longlong npy_int32;
         typedef npy_ulonglong npy_uint32;
         typedef npy_ulonglong npy_ucs4;
+#    define PyInt32ScalarObject PyLongLongScalarObject
+#    define PyInt32ArrType_Type PyLongLongArrType_Type
+#    define PyUInt32ScalarObject PyULongLongScalarObject
+#    define PyUInt32ArrType_Type PyULongLongArrType_Type
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT32
 #  define NPY_MIN_LONGLONG NPY_MIN_INT32
@@ -349,6 +381,10 @@
 #    define NPY_UINT64 NPY_ULONGLONG
         typedef npy_longlong npy_int64;
         typedef npy_ulonglong npy_uint64;
+#    define PyInt64ScalarObject PyLongLongScalarObject
+#    define PyInt64ArrType_Type PyLongLongArrType_Type
+#    define PyUInt64ScalarObject PyULongLongScalarObject
+#    define PyUInt64ArrType_Type PyULongLongArrType_Type
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT64
 #  define NPY_MIN_LONGLONG NPY_MIN_INT64
@@ -359,6 +395,10 @@
 #    define NPY_UINT128 NPY_ULONGLONG
         typedef npy_longlong npy_int128;
         typedef npy_ulonglong npy_uint128;
+#    define PyInt128ScalarObject PyLongLongScalarObject
+#    define PyInt128ArrType_Type PyLongLongArrType_Type
+#    define PyUInt128ScalarObject PyULongLongScalarObject
+#    define PyUInt128ArrType_Type PyULongLongArrType_Type
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT128
 #  define NPY_MIN_LONGLONG NPY_MIN_INT128
@@ -368,6 +408,10 @@
 #  define NPY_UINT256 NPY_ULONGLONG
         typedef npy_longlong npy_int256;
         typedef npy_ulonglong npy_uint256;
+#  define PyInt256ScalarObject PyLongLongScalarObject
+#  define PyInt256ArrType_Type PyLongLongArrType_Type
+#  define PyUInt256ScalarObject PyULongLongScalarObject
+#  define PyUInt256ArrType_Type PyULongLongArrType_Type
 #  define NPY_MAX_LONGLONG NPY_MAX_INT256
 #  define NPY_MIN_LONGLONG NPY_MIN_INT256
 #  define NPY_MAX_ULONGLONG NPY_MAX_UINT256
@@ -379,6 +423,10 @@
 #define NPY_UINT8 NPY_UINT
         typedef int npy_int8;
         typedef unsigned int npy_uint8;
+#    define PyInt8ScalarObject PyIntScalarObject
+#    define PyInt8ArrType_Type PyIntArrType_Type
+#    define PyUInt8ScalarObject PyUIntScalarObject
+#    define PyUInt8ArrType_Type PyUIntArrType_Type
 #endif
 #elif NPY_BITSOF_INT == 16
 #ifndef NPY_INT16
@@ -386,6 +434,10 @@
 #define NPY_UINT16 NPY_UINT
         typedef int npy_int16;
         typedef unsigned int npy_uint16;
+#    define PyInt16ScalarObject PyIntScalarObject
+#    define PyInt16ArrType_Type PyIntArrType_Type
+#    define PyUInt16ScalarObject PyIntUScalarObject
+#    define PyUInt16ArrType_Type PyIntUArrType_Type
 #endif
 #elif NPY_BITSOF_INT == 32
 #ifndef NPY_INT32
@@ -394,6 +446,10 @@
         typedef int npy_int32;
         typedef unsigned int npy_uint32;
         typedef unsigned int npy_ucs4;
+#    define PyInt32ScalarObject PyIntScalarObject
+#    define PyInt32ArrType_Type PyIntArrType_Type
+#    define PyUInt32ScalarObject PyUIntScalarObject
+#    define PyUInt32ArrType_Type PyUIntArrType_Type
 #endif
 #elif NPY_BITSOF_INT == 64
 #ifndef NPY_INT64
@@ -401,6 +457,10 @@
 #define NPY_UINT64 NPY_UINT
         typedef int npy_int64;
         typedef unsigned int npy_uint64;
+#    define PyInt64ScalarObject PyIntScalarObject
+#    define PyInt64ArrType_Type PyIntArrType_Type
+#    define PyUInt64ScalarObject PyUIntScalarObject
+#    define PyUInt64ArrType_Type PyUIntArrType_Type
 #endif
 #elif NPY_BITSOF_INT == 128
 #ifndef NPY_INT128
@@ -408,6 +468,10 @@
 #define NPY_UINT128 NPY_UINT
         typedef int npy_int128;
         typedef unsigned int npy_uint128;
+#    define PyInt128ScalarObject PyIntScalarObject
+#    define PyInt128ArrType_Type PyIntArrType_Type
+#    define PyUInt128ScalarObject PyUIntScalarObject
+#    define PyUInt128ArrType_Type PyUIntArrType_Type
 #endif
 #endif
 
@@ -417,6 +481,10 @@
 #define NPY_UINT8 NPY_USHORT
         typedef short npy_int8;
         typedef unsigned short npy_uint8;
+#    define PyInt8ScalarObject PyShortScalarObject
+#    define PyInt8ArrType_Type PyShortArrType_Type
+#    define PyUInt8ScalarObject PyUShortScalarObject
+#    define PyUInt8ArrType_Type PyUShortArrType_Type
 #endif
 #elif NPY_BITSOF_SHORT == 16
 #ifndef NPY_INT16
@@ -424,6 +492,10 @@
 #define NPY_UINT16 NPY_USHORT
         typedef short npy_int16;
         typedef unsigned short npy_uint16;
+#    define PyInt16ScalarObject PyShortScalarObject
+#    define PyInt16ArrType_Type PyShortArrType_Type
+#    define PyUInt16ScalarObject PyUShortScalarObject
+#    define PyUInt16ArrType_Type PyUShortArrType_Type
 #endif
 #elif NPY_BITSOF_SHORT == 32
 #ifndef NPY_INT32
@@ -432,6 +504,10 @@
         typedef short npy_int32;
         typedef unsigned short npy_uint32;
         typedef unsigned short npy_ucs4;
+#    define PyInt32ScalarObject PyShortScalarObject
+#    define PyInt32ArrType_Type PyShortArrType_Type
+#    define PyUInt32ScalarObject PyUShortScalarObject
+#    define PyUInt32ArrType_Type PyUShortArrType_Type
 #endif
 #elif NPY_BITSOF_SHORT == 64
 #ifndef NPY_INT64
@@ -439,6 +515,10 @@
 #define NPY_UINT64 NPY_USHORT
         typedef short npy_int64;
         typedef unsigned short npy_uint64;
+#    define PyInt64ScalarObject PyShortScalarObject
+#    define PyInt64ArrType_Type PyShortArrType_Type
+#    define PyUInt64ScalarObject PyUShortScalarObject
+#    define PyUInt64ArrType_Type PyUShortArrType_Type
 #endif
 #elif NPY_BITSOF_SHORT == 128
 #ifndef NPY_INT128
@@ -446,6 +526,10 @@
 #define NPY_UINT128 NPY_USHORT
         typedef short npy_int128;
         typedef unsigned short npy_uint128;
+#    define PyInt128ScalarObject PyShortScalarObject
+#    define PyInt128ArrType_Type PyShortArrType_Type
+#    define PyUInt128ScalarObject PyUShortScalarObject
+#    define PyUInt128ArrType_Type PyUShortArrType_Type
 #endif
 #endif
 
@@ -456,6 +540,10 @@
 #define NPY_UINT8 NPY_UBYTE
         typedef signed char npy_int8;
         typedef unsigned char npy_uint8;
+#    define PyInt8ScalarObject PyByteScalarObject
+#    define PyInt8ArrType_Type PyByteArrType_Type
+#    define PyUInt8ScalarObject PyUByteScalarObject
+#    define PyUInt8ArrType_Type PyUByteArrType_Type
 #endif
 #elif NPY_BITSOF_CHAR == 16
 #ifndef NPY_INT16
@@ -463,6 +551,10 @@
 #define NPY_UINT16 NPY_UBYTE
         typedef signed char npy_int16;
         typedef unsigned char npy_uint16;
+#    define PyInt16ScalarObject PyByteScalarObject
+#    define PyInt16ArrType_Type PyByteArrType_Type
+#    define PyUInt16ScalarObject PyUByteScalarObject
+#    define PyUInt16ArrType_Type PyUByteArrType_Type
 #endif
 #elif NPY_BITSOF_CHAR == 32
 #ifndef NPY_INT32
@@ -471,6 +563,10 @@
         typedef signed char npy_int32;
         typedef unsigned char npy_uint32;
         typedef unsigned char npy_ucs4;
+#    define PyInt32ScalarObject PyByteScalarObject
+#    define PyInt32ArrType_Type PyByteArrType_Type
+#    define PyUInt32ScalarObject PyUByteScalarObject
+#    define PyUInt32ArrType_Type PyUByteArrType_Type
 #endif
 #elif NPY_BITSOF_CHAR == 64
 #ifndef NPY_INT64
@@ -478,6 +574,10 @@
 #define NPY_UINT64 NPY_UBYTE
         typedef signed char npy_int64;
         typedef unsigned char npy_uint64;
+#    define PyInt64ScalarObject PyByteScalarObject
+#    define PyInt64ArrType_Type PyByteArrType_Type
+#    define PyUInt64ScalarObject PyUByteScalarObject
+#    define PyUInt64ArrType_Type PyUByteArrType_Type
 #endif
 #elif NPY_BITSOF_CHAR == 128
 #ifndef NPY_INT128
@@ -485,6 +585,10 @@
 #define NPY_UINT128 NPY_UBYTE
         typedef signed char npy_int128;
         typedef unsigned char npy_uint128;
+#    define PyInt128ScalarObject PyByteScalarObject
+#    define PyInt128ArrType_Type PyByteArrType_Type
+#    define PyUInt128ScalarObject PyUByteScalarObject
+#    define PyUInt128ArrType_Type PyUByteArrType_Type
 #endif
 #endif
 
@@ -496,6 +600,10 @@
 #define NPY_COMPLEX32 NPY_CDOUBLE
         typedef  double npy_float16;
         typedef npy_cdouble npy_complex32;
+#    define PyFloat16ScalarObject PyDoubleScalarObject
+#    define PyComplex32ScalarObject PyCDoubleScalarObject
+#    define PyFloat16ArrType_Type PyDoubleArrType_Type
+#    define PyComplex32ArrType_Type PyCDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_DOUBLE == 32
 #ifndef NPY_FLOAT32
@@ -503,6 +611,10 @@
 #define NPY_COMPLEX64 NPY_CDOUBLE
         typedef double npy_float32;
         typedef npy_cdouble npy_complex64;
+#    define PyFloat32ScalarObject PyDoubleScalarObject
+#    define PyComplex64ScalarObject PyCDoubleScalarObject
+#    define PyFloat32ArrType_Type PyDoubleArrType_Type
+#    define PyComplex64ArrType_Type PyCDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_DOUBLE == 64
 #ifndef NPY_FLOAT64
@@ -510,6 +622,10 @@
 #define NPY_COMPLEX128 NPY_CDOUBLE
         typedef double npy_float64;
         typedef npy_cdouble npy_complex128;
+#    define PyFloat64ScalarObject PyDoubleScalarObject
+#    define PyComplex128ScalarObject PyCDoubleScalarObject
+#    define PyFloat64ArrType_Type PyDoubleArrType_Type
+#    define PyComplex128ArrType_Type PyCDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_DOUBLE == 80
 #ifndef NPY_FLOAT80
@@ -517,6 +633,10 @@
 #define NPY_COMPLEX160 NPY_CDOUBLE
         typedef double npy_float80;
         typedef npy_cdouble npy_complex160;
+#    define PyFloat80ScalarObject PyDoubleScalarObject
+#    define PyComplex160ScalarObject PyCDoubleScalarObject
+#    define PyFloat80ArrType_Type PyDoubleArrType_Type
+#    define PyComplex160ArrType_Type PyCDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_DOUBLE == 96
 #ifndef NPY_FLOAT96
@@ -524,6 +644,10 @@
 #define NPY_COMPLEX192 NPY_CDOUBLE
         typedef double npy_float96;
         typedef npy_cdouble npy_complex192;
+#    define PyFloat96ScalarObject PyDoubleScalarObject
+#    define PyComplex192ScalarObject PyCDoubleScalarObject
+#    define PyFloat96ArrType_Type PyDoubleArrType_Type
+#    define PyComplex192ArrType_Type PyCDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_DOUBLE == 128
 #ifndef NPY_FLOAT128
@@ -531,6 +655,10 @@
 #define NPY_COMPLEX256 NPY_CDOUBLE
         typedef double npy_float128;
         typedef npy_cdouble npy_complex256;
+#    define PyFloat128ScalarObject PyDoubleScalarObject
+#    define PyComplex256ScalarObject PyCDoubleScalarObject
+#    define PyFloat128ArrType_Type PyDoubleArrType_Type
+#    define PyComplex256ArrType_Type PyCDoubleArrType_Type
 #endif
 #endif
 
@@ -542,6 +670,10 @@
 #define NPY_COMPLEX32 NPY_CFLOAT
         typedef float npy_float16;
         typedef npy_cfloat npy_complex32;
+#    define PyFloat16ScalarObject PyFloatScalarObject
+#    define PyComplex32ScalarObject PyCFloatScalarObject
+#    define PyFloat16ArrType_Type PyFloatArrType_Type
+#    define PyComplex32ArrType_Type PyCFloatArrType_Type
 #endif
 #elif NPY_BITSOF_FLOAT == 32
 #ifndef NPY_FLOAT32
@@ -549,6 +681,10 @@
 #define NPY_COMPLEX64 NPY_CFLOAT
         typedef float npy_float32;
         typedef npy_cfloat npy_complex64;
+#    define PyFloat32ScalarObject PyFloatScalarObject
+#    define PyComplex64ScalarObject PyCFloatScalarObject
+#    define PyFloat32ArrType_Type PyFloatArrType_Type
+#    define PyComplex64ArrType_Type PyCFloatArrType_Type
 #endif
 #elif NPY_BITSOF_FLOAT == 64
 #ifndef NPY_FLOAT64
@@ -556,6 +692,10 @@
 #define NPY_COMPLEX128 NPY_CFLOAT
         typedef float npy_float64;
         typedef npy_cfloat npy_complex128;
+#    define PyFloat64ScalarObject PyFloatScalarObject
+#    define PyComplex128ScalarObject PyCFloatScalarObject
+#    define PyFloat64ArrType_Type PyFloatArrType_Type
+#    define PyComplex128ArrType_Type PyCFloatArrType_Type
 #endif
 #elif NPY_BITSOF_FLOAT == 80
 #ifndef NPY_FLOAT80
@@ -563,6 +703,10 @@
 #define NPY_COMPLEX160 NPY_CFLOAT
         typedef float npy_float80;
         typedef npy_cfloat npy_complex160;
+#    define PyFloat80ScalarObject PyFloatScalarObject
+#    define PyComplex160ScalarObject PyCFloatScalarObject
+#    define PyFloat80ArrType_Type PyFloatArrType_Type
+#    define PyComplex160ArrType_Type PyCFloatArrType_Type
 #endif
 #elif NPY_BITSOF_FLOAT == 96
 #ifndef NPY_FLOAT96
@@ -570,6 +714,10 @@
 #define NPY_COMPLEX192 NPY_CFLOAT
         typedef float npy_float96;
         typedef npy_cfloat npy_complex192;
+#    define PyFloat96ScalarObject PyFloatScalarObject
+#    define PyComplex192ScalarObject PyCFloatScalarObject
+#    define PyFloat96ArrType_Type PyFloatArrType_Type
+#    define PyComplex192ArrType_Type PyCFloatArrType_Type
 #endif
 #elif NPY_BITSOF_FLOAT == 128
 #ifndef NPY_FLOAT128
@@ -577,6 +725,10 @@
 #define NPY_COMPLEX256 NPY_CFLOAT
         typedef float npy_float128;
         typedef npy_cfloat npy_complex256;
+#    define PyFloat128ScalarObject PyFloatScalarObject
+#    define PyComplex256ScalarObject PyCFloatScalarObject
+#    define PyFloat128ArrType_Type PyFloatArrType_Type
+#    define PyComplex256ArrType_Type PyCFloatArrType_Type
 #endif
 #endif
 
@@ -587,6 +739,10 @@
 #define NPY_COMPLEX32 NPY_CLONGDOUBLE
         typedef npy_longdouble npy_float16;
         typedef npy_clongdouble npy_complex32;
+#    define PyFloat16ScalarObject PyLongDoubleScalarObject
+#    define PyComplex32ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat16ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex32ArrType_Type PyCLongDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 32
 #ifndef NPY_FLOAT32
@@ -594,6 +750,10 @@
 #define NPY_COMPLEX64 NPY_CLONGDOUBLE
         typedef npy_longdouble npy_float32;
         typedef npy_clongdouble npy_complex64;
+#    define PyFloat32ScalarObject PyLongDoubleScalarObject
+#    define PyComplex64ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat32ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex64ArrType_Type PyCLongDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 64
 #ifndef NPY_FLOAT64
@@ -601,6 +761,10 @@
 #define NPY_COMPLEX128 NPY_CLONGDOUBLE
         typedef npy_longdouble npy_float64;
         typedef npy_clongdouble npy_complex128;
+#    define PyFloat64ScalarObject PyLongDoubleScalarObject
+#    define PyComplex128ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat64ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex128ArrType_Type PyCLongDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 80
 #ifndef NPY_FLOAT80
@@ -608,6 +772,10 @@
 #define NPY_COMPLEX160 NPY_CLONGDOUBLE
         typedef npy_longdouble npy_float80;
         typedef npy_clongdouble npy_complex160;
+#    define PyFloat80ScalarObject PyLongDoubleScalarObject
+#    define PyComplex160ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat80ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex160ArrType_Type PyCLongDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 96
 #ifndef NPY_FLOAT96
@@ -615,6 +783,10 @@
 #define NPY_COMPLEX192 NPY_CLONGDOUBLE
         typedef npy_longdouble npy_float96;
         typedef npy_clongdouble npy_complex192;
+#    define PyFloat96ScalarObject PyLongDoubleScalarObject
+#    define PyComplex192ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat96ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex192ArrType_Type PyCLongDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 128
 #ifndef NPY_FLOAT128
@@ -622,12 +794,20 @@
 #define NPY_COMPLEX256 NPY_CLONGDOUBLE
         typedef npy_longdouble npy_float128;
         typedef npy_clongdouble npy_complex256;
+#    define PyFloat128ScalarObject PyLongDoubleScalarObject
+#    define PyComplex256ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat128ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex256ArrType_Type PyCLongDoubleArrType_Type
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 256
 #define NPY_FLOAT256 NPY_LONGDOUBLE
 #define NPY_COMPLEX512 NPY_CLONGDOUBLE
         typedef npy_longdouble npy_float256;
         typedef npy_clongdouble npy_complex512;
+#    define PyFloat256ScalarObject PyLongDoubleScalarObject
+#    define PyComplex512ScalarObject PyCLongDoubleScalarObject
+#    define PyFloat256ArrType_Type PyLongDoubleArrType_Type
+#    define PyComplex512ArrType_Type PyCLongDoubleArrType_Type
 #endif
 
         /* End of typedefs for numarray style bit-width names */



From numpy-svn at scipy.org  Thu Oct  5 12:45:04 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 11:45:04 -0500 (CDT)
Subject: [Numpy-svn] r3260 - trunk/numpy/f2py/lib
Message-ID: <20061005164504.934A839C00F@new.scipy.org>

Author: pearu
Date: 2006-10-05 11:44:52 -0500 (Thu, 05 Oct 2006)
New Revision: 3260

Modified:
   trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/py_wrap.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/wrapper_base.py
Log:
F2PY G3: added basic support for wrapping Fortran subprograms, scalar input only.

Modified: trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
===================================================================
--- trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-05 16:05:00 UTC (rev 3259)
+++ trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-05 16:44:52 UTC (rev 3260)
@@ -12,7 +12,7 @@
     dtype = ctype.upper()
     cls = 'Int'+ctype[7:]
     return '''\
-/* depends: SCALARS_IN_BITS.cpp */
+/* depends: SCALARS_IN_BITS2.cpp */
 static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
   PyObject* obj = PyArrayScalar_New(%(cls)s);
   if (obj==NULL) /* TODO: set exception */ return NULL;
@@ -25,7 +25,7 @@
     dtype = ctype.upper()
     cls = 'Float'+ctype[9:]
     return '''\
-/* depends: SCALARS_IN_BITS.cpp */
+/* depends: SCALARS_IN_BITS2.cpp */
 static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
   PyObject* obj = PyArrayScalar_New(%(cls)s);
   if (obj==NULL) /* TODO: set exception */ return NULL;
@@ -38,7 +38,7 @@
     dtype = ctype.upper()
     cls = 'Complex'+ctype[11:]
     return '''\
-/* depends: SCALARS_IN_BITS.cpp */
+/* depends: SCALARS_IN_BITS2.cpp */
 static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
   PyObject* obj = PyArrayScalar_New(%(cls)s);
   if (obj==NULL) /* TODO: set exception */ return NULL;

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-05 16:05:00 UTC (rev 3259)
+++ trunk/numpy/f2py/lib/main.py	2006-10-05 16:44:52 UTC (rev 3260)
@@ -175,7 +175,7 @@
     """
     modulename = get_option_value(sys_argv,'-m','untitled','unspecified')
 
-    build_dir = get_option_value('--build-dir','.',None)
+    build_dir = get_option_value(sys_argv,'--build-dir','.',None)
     if build_dir is None:
         build_dir = tempfile.mktemp()
         clean_build_dir = True
@@ -271,8 +271,8 @@
                 wrapper.add(block)
             c_code = wrapper.c_code()
             f_code = wrapper.fortran_code()
-            c_fn = os.path.join(temp_dir,'%smodule.c' % (modulename))
-            f_fn = os.path.join(temp_dir,'%s_f_wrappers_f2py.f' % (modulename))
+            c_fn = os.path.join(build_dir,'%smodule.c' % (modulename))
+            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py.f' % (modulename))
             f = open(c_fn,'w')
             f.write(c_code)
             f.close()

Modified: trunk/numpy/f2py/lib/py_wrap.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap.py	2006-10-05 16:05:00 UTC (rev 3259)
+++ trunk/numpy/f2py/lib/py_wrap.py	2006-10-05 16:44:52 UTC (rev 3260)
@@ -55,12 +55,13 @@
 '''
 
     main_fortran_template = '''\
-! -*- f90 -*-
 %(fortran_code_list)s
 '''
     def __init__(self, modulename):
         WrapperBase.__init__(self)
         self.modulename = modulename
+        self.cname = 'f2py_' + modulename
+
         
         self.header_list = []
         self.typedef_list = []
@@ -91,10 +92,8 @@
         elif isinstance(block, Module):
             for name,declblock in block.a.type_decls.items():
                 self.add(declblock)
-        elif isinstance(block, TypeDecl):
-            PythonCAPIDerivedType(self, block)
-        elif isinstance(block, tuple(declaration_type_spec)):
-            PythonCAPIIntrinsicType(self, block)
+        elif isinstance(block, tuple([TypeDecl]+declaration_type_spec)):
+            PythonCAPIType(self, block)
         else:
             raise NotImplementedError,`block.__class__.__name__`
         return

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-05 16:05:00 UTC (rev 3259)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-05 16:44:52 UTC (rev 3260)
@@ -4,20 +4,101 @@
 import sys
 
 from wrapper_base import *
+from py_wrap_type import *
 
 class PythonCAPISubProgram(WrapperBase):
     """
     Fortran subprogram hooks.
     """
+
+    header_template = '''\
+#define %(name)s_f F_FUNC(%(name)s, %(NAME)s)
+'''
+    typedef_template = ''
+    extern_template = '''\
+extern void %(name)s_f();
+'''
+    objdecl_template = '''\
+static char %(cname)s__doc[] = "";
+'''
+    module_init_template = ''
+    module_method_template = '''\
+{"%(name)s", (PyCFunction)%(cname)s, METH_VARARGS | METH_KEYWORDS, %(cname)s__doc},'''
+    c_code_template = ''
+    capi_code_template = '''\
+static PyObject* %(cname)s(PyObject *capi_self, PyObject *capi_args, PyObject *capi_keywds) {
+  PyObject * volatile capi_buildvalue = NULL;
+  volatile int f2py_success = 1;
+  %(decl_list)s
+  static char *capi_kwlist[] = {%(kw_clist+optkw_clist+extrakw_clist+["NULL"])s};
+  if (!PyArg_ParseTupleAndKeywords(capi_args,capi_keywds,
+                                   "%(pyarg_format_elist)s",
+                                   %(["capi_kwlist"]+pyarg_obj_clist)s))
+     return NULL;
+  %(frompyobj_list)s
+  %(call_list)s
+  f2py_success = !PyErr_Occurred();
+  if (f2py_success) {
+    %(pyobjfrom_list)s
+    capi_buildvalue = Py_BuildValue("%(return_format_elist)s"
+                                    %(return_obj_list)s);
+    %(clean_pyobjfrom_list)s
+  }
+  %(clean_call_list)s
+  %(clean_frompyobj_list)s
+  return capi_buildvalue;
+}
+'''
+    fortran_code_template = ''
+    
     _defined = []
     def __init__(self, parent, block):
         WrapperBase.__init__(self)
         self.name = name = block.name
-        if name in self._defined:
+        self.cname = cname = '%s_%s' % (parent.cname,name)
+        if cname in self._defined:
             return
-        self._defined.append(name)
-        self.info('Generating interface for %s: %s' % (block.__class__, name))
+        self._defined.append(cname)
+        self.info('Generating interface for %s: %s' % (block.__class__, cname))
 
 
-        raise NotImplementedError,`name,block.__class__`
+        self.decl_list = []
+        self.kw_list = []
+        self.optkw_list = []
+        self.extrakw_list = []
+        self.pyarg_format_list = []
+        self.pyarg_obj_list = []
+        self.frompyobj_list = []
+        self.call_list = []
+        self.pyobjfrom_list = []
+        self.return_format_list = []
+        self.return_obj_list = []
+        self.buildvalue_list = []
+        self.clean_pyobjfrom_list = []
+        self.clean_call_list = []
+        self.clean_frompyobj_list = []
+
+        args_f = []
+        for argname in block.args:
+            var = block.a.variables[argname]
+            typedecl = var.get_typedecl()
+            PythonCAPIType(parent, typedecl)
+            ctype = typedecl.get_c_type()
+            self.decl_list.append('%s %s;' % (ctype, argname))
+            self.kw_list.append('"%s"' % (argname))
+            self.pyarg_format_list.append('O&')
+            self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ctype, argname))
+            if 1: # is_scalar
+                args_f.append('&'+argname)
+            else:
+                args_f.append(argname)
+
+        WrapperCPPMacro(parent, 'F_FUNC')
+        self.call_list.append('%s_f(%s);' % (name,', '.join(args_f)))
+
+        self.clean_pyobjfrom_list.reverse()
+        self.clean_call_list.reverse()
+        self.clean_frompyobj_list.reverse()
+        if self.return_obj_list: self.return_obj_list.insert(0,'')
+        parent.apply_templates(self)
         return

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-05 16:05:00 UTC (rev 3259)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-05 16:44:52 UTC (rev 3260)
@@ -1,9 +1,23 @@
 
-__all__ = ['PythonCAPIIntrinsicType', 'PythonCAPIDerivedType']
+__all__ = ['PythonCAPIType']
 
 from wrapper_base import *
-from parser.api import CHAR_BIT, Module
+from parser.api import CHAR_BIT, Module, declaration_type_spec, TypeDecl
 
+class PythonCAPIType(WrapperBase):
+    """
+    Fortran type hooks.
+    """
+    def __init__(self, parent, typedecl):
+        WrapperBase.__init__(self)
+        if isinstance(typedecl, tuple(declaration_type_spec)):
+            PythonCAPIIntrinsicType(parent, typedecl)
+        elif isinstance(typedecl, TypeDecl):
+            PythonCAPIDerivedType(parent, typedecl)
+        else:
+            raise NotImplementedError,`self.__class__,typedecl.__class__`
+        return
+
 class PythonCAPIIntrinsicType(WrapperBase):
     """
     Fortran intrinsic type hooks.
@@ -21,6 +35,7 @@
 
         if ctype.startswith('npy_'):
             WrapperCCode(parent, 'pyobj_from_%s' % (ctype))
+            WrapperCCode(parent, 'pyobj_to_%s' % (ctype))
             return
         
         if not ctype.startswith('f2py_type_'):
@@ -247,6 +262,7 @@
         for n in typedecl.a.component_names:
             v = typedecl.a.components[n]
             t = v.get_typedecl()
+            PythonCAPIType(t)
             ct = t.get_c_type()
             on = 'f2py_' + t.name
             parent.add(t)
@@ -262,9 +278,7 @@
 self->%(n)s_ptr = %(n)s_ptr;
 ''' % (locals()))
             self.attr_format_list.append('O&')
-            WrapperCCode(parent, 'pyobj_to_%s' % (ct))
             self.attr_init_list.append('\npyobj_to_%s, self->%s_ptr' % (ct,n))
-            WrapperCCode(parent, 'pyobj_from_%s' % (ct))
             self.as_tuple_format_list.append('O&')
             self.as_tuple_arg_list.append('\npyobj_from_%s, self->%s_ptr' % (ct, n))
             self.getset_func_list.append('''\

Modified: trunk/numpy/f2py/lib/wrapper_base.py
===================================================================
--- trunk/numpy/f2py/lib/wrapper_base.py	2006-10-05 16:05:00 UTC (rev 3259)
+++ trunk/numpy/f2py/lib/wrapper_base.py	2006-10-05 16:44:52 UTC (rev 3260)
@@ -87,8 +87,11 @@
                 elif n.endswith('_elist'):
                     joinsymbol = ''
                     realname = realname[:-6] + '_list'
+                realname_lower = realname.lower()
                 if hasattr(self, realname):
                     attr = getattr(self, realname)
+                elif hasattr(self, realname_lower):
+                    attr = getattr(self, realname_lower).upper()
                 elif realname.startswith('['):
                     attr = eval(realname)
                 else:



From numpy-svn at scipy.org  Thu Oct  5 12:59:20 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 11:59:20 -0500 (CDT)
Subject: [Numpy-svn] r3261 - trunk/numpy/f2py
Message-ID: <20061005165920.4694F39C050@new.scipy.org>

Author: pearu
Date: 2006-10-05 11:59:15 -0500 (Thu, 05 Oct 2006)
New Revision: 3261

Modified:
   trunk/numpy/f2py/crackfortran.py
Log:
Bug fix for DATA statement with components containing subexpressions.

Modified: trunk/numpy/f2py/crackfortran.py
===================================================================
--- trunk/numpy/f2py/crackfortran.py	2006-10-05 16:44:52 UTC (rev 3260)
+++ trunk/numpy/f2py/crackfortran.py	2006-10-05 16:59:15 UTC (rev 3261)
@@ -999,10 +999,13 @@
             groupcache[groupcounter]['implicit']=impl
     elif case=='data':
         ll=[]
-        dl='';il='';f=0;fc=1
+        dl='';il='';f=0;fc=1;inp=0
         for c in m.group('after'):
-            if c=="'": fc=not fc
-            if c=='/' and fc: f=f+1;continue
+            if not inp:
+                if c=="'": fc=not fc
+                if c=='/' and fc: f=f+1;continue
+            if c=='(': inp = inp + 1
+            elif c==')': inp = inp - 1
             if f==0: dl=dl+c
             elif f==1: il=il+c
             elif f==2:



From numpy-svn at scipy.org  Thu Oct  5 14:51:39 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 13:51:39 -0500 (CDT)
Subject: [Numpy-svn] r3262 - trunk/numpy/core/src
Message-ID: <20061005185139.65ED939C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 13:51:37 -0500 (Thu, 05 Oct 2006)
New Revision: 3262

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix ticket #319.  There may still be a problem in casting from one data-type with nested fields to another.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-05 16:59:15 UTC (rev 3261)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-05 18:51:37 UTC (rev 3262)
@@ -5067,7 +5067,6 @@
 	if (typenum1 == PyArray_VOID || \
 	    typenum2 == PyArray_VOID) {
 		return ((typenum1 == typenum2) &&
-			(typ1->typeobj == typ2->typeobj) &&
 			_equivalent_fields(typ1->fields, typ2->fields));
 	}
 	return (typ1->kind == typ2->kind);



From numpy-svn at scipy.org  Thu Oct  5 14:53:07 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 13:53:07 -0500 (CDT)
Subject: [Numpy-svn] r3263 - trunk/numpy/core
Message-ID: <20061005185307.7AC2739C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 13:53:05 -0500 (Thu, 05 Oct 2006)
New Revision: 3263

Modified:
   trunk/numpy/core/records.py
Log:
Fix ticket #320

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-05 18:51:37 UTC (rev 3262)
+++ trunk/numpy/core/records.py	2006-10-05 18:53:05 UTC (rev 3263)
@@ -306,7 +306,7 @@
     for k, obj in enumerate(arrayList):
         nn = len(descr[k].shape)
         if obj.shape[nn:] != shape:
-            raise ValueError, "array-shape mismatch in array", k
+            raise ValueError, "array-shape mismatch in array %d" % k
         
     _array = recarray(shape, descr)
 



From numpy-svn at scipy.org  Thu Oct  5 15:02:35 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 14:02:35 -0500 (CDT)
Subject: [Numpy-svn] r3264 - trunk/numpy/core
Message-ID: <20061005190235.B8B2339C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 14:02:34 -0500 (Thu, 05 Oct 2006)
New Revision: 3264

Modified:
   trunk/numpy/core/records.py
Log:
Fix ticket #322

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-05 18:53:05 UTC (rev 3263)
+++ trunk/numpy/core/records.py	2006-10-05 19:02:34 UTC (rev 3264)
@@ -301,11 +301,12 @@
     d0 = descr[0].shape
     nn = len(d0)
     if nn > 0:
-        shape = shape[nn:]
+        shape = shape[:-nn]
         
     for k, obj in enumerate(arrayList):
         nn = len(descr[k].shape)
-        if obj.shape[nn:] != shape:
+        testshape = obj.shape[:len(obj.shape)-nn]
+        if testshape != shape:
             raise ValueError, "array-shape mismatch in array %d" % k
         
     _array = recarray(shape, descr)



From numpy-svn at scipy.org  Thu Oct  5 15:05:49 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 14:05:49 -0500 (CDT)
Subject: [Numpy-svn] r3265 - trunk/numpy/lib
Message-ID: <20061005190549.3642939C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-05 14:05:47 -0500 (Thu, 05 Oct 2006)
New Revision: 3265

Modified:
   trunk/numpy/lib/polynomial.py
Log:
Fix ticket #323 --- problem with roots all zeros and all zero coefficients.

Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-05 19:02:34 UTC (rev 3264)
+++ trunk/numpy/lib/polynomial.py	2006-10-05 19:05:47 UTC (rev 3265)
@@ -92,6 +92,10 @@
     # find non-zero array entries
     non_zero = NX.nonzero(NX.ravel(p))[0]
 
+    # Return an empty array if polynomial is all zeros
+    if len(non_zero) == 0:
+        return NX.array([])
+
     # find the number of trailing zeros -- this is the number of roots at 0.
     trailing_zeros = len(p) - non_zero[-1] - 1
 
@@ -109,7 +113,7 @@
         A[0, :] = -p[1:] / p[0]
         roots = _eigvals(A)
     else:
-        return NX.array([])
+        roots = NX.array([])
 
     # tack any zeros onto the back of the array
     roots = hstack((roots, NX.zeros(trailing_zeros, roots.dtype)))



From numpy-svn at scipy.org  Thu Oct  5 19:36:50 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 18:36:50 -0500 (CDT)
Subject: [Numpy-svn] r3266 - trunk/numpy/core/src
Message-ID: <20061005233650.3460939C00D@new.scipy.org>

Author: oliphant
Date: 2006-10-05 18:36:47 -0500 (Thu, 05 Oct 2006)
New Revision: 3266

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Re-work flat index setting to handle integer case better for objects arrays.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-05 19:05:47 UTC (rev 3265)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-05 23:36:47 UTC (rev 3266)
@@ -9244,7 +9244,6 @@
         PyArray_Descr *type;
         PyArray_Descr *indtype=NULL;
         int swap, retval=-1;
-        int itemsize;
         intp start, step_size;
         intp n_steps;
         PyObject *obj=NULL;
@@ -9266,8 +9265,33 @@
         }
 
         type = self->ao->descr;
-        itemsize = type->elsize;
 
+        /* Check for Boolean -- this is first becasue
+           Bool is a subclass of Int */
+
+        if (PyBool_Check(ind)) {
+                retval = 0;
+                if (PyObject_IsTrue(ind)) {
+                        retval = type->f->setitem(val, self->dataptr, self->ao);
+                }
+                goto finish;
+        }
+
+        start = PyArray_PyIntAsIntp(ind);
+        if (start==-1 && PyErr_Occurred()) PyErr_Clear();
+        else {
+                if (start < -self->size || start >= self->size) {
+                        PyErr_Format(PyExc_ValueError,
+                                     "index (%d) out of range", start);
+                        goto finish;
+                }
+                retval = 0;
+                PyArray_ITER_GOTO1D(self, start);
+                retval = type->f->setitem(val, self->dataptr, self->ao);
+                PyArray_ITER_RESET(self);
+                goto finish;
+        }
+
         Py_INCREF(type);
         arrval = PyArray_FromAny(val, type, 0, 0, 0, NULL);
         if (arrval==NULL) return -1;
@@ -9275,23 +9299,12 @@
         if (val_it==NULL) goto finish;
         if (val_it->size == 0) {retval = 0; goto finish;}
 
-        /* Check for Boolean -- this is first becasue
-           Bool is a subclass of Int */
-
         copyswap = PyArray_DESCR(arrval)->f->copyswap;
         swap = (PyArray_ISNOTSWAPPED(self->ao)!=PyArray_ISNOTSWAPPED(arrval));
-        if (PyBool_Check(ind)) {
-                if (PyObject_IsTrue(ind)) {
-                        copyswap(self->dataptr, PyArray_DATA(arrval),
-                                  swap, arrval);
-                }
-                retval=0;
-                goto finish;
-        }
+        
+        /* Check Slice */
 
-        /* Check for Integer or Slice */
-
-        if (PyLong_Check(ind) || PyInt_Check(ind) || PySlice_Check(ind)) {
+        if (PySlice_Check(ind)) {
                 start = parse_subindex(ind, &step_size, &n_steps,
                                        self->size);
                 if (start == -1) goto finish;
@@ -9325,12 +9338,8 @@
         /* convert to INTP array if Integer array scalar or List */
 
         indtype = PyArray_DescrFromType(PyArray_INTP);
-        if (PyArray_IsScalar(ind, Integer)) {
+        if (PyList_Check(ind)) {
                 Py_INCREF(indtype);
-                obj = PyArray_FromScalar(ind, indtype);
-        }
-        else if (PyList_Check(ind)) {
-                Py_INCREF(indtype);
                 obj = PyArray_FromAny(ind, indtype, 0, 0, FORCECAST, NULL);
         }
         else {



From numpy-svn at scipy.org  Fri Oct  6 00:57:24 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu,  5 Oct 2006 23:57:24 -0500 (CDT)
Subject: [Numpy-svn] r3267 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061006045724.BE17039C05C@new.scipy.org>

Author: pearu
Date: 2006-10-05 23:57:17 -0500 (Thu, 05 Oct 2006)
New Revision: 3267

Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
Log:
F2PY G3: fixed bugs, started adding features.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-05 23:36:47 UTC (rev 3266)
+++ trunk/numpy/f2py/lib/main.py	2006-10-06 04:57:17 UTC (rev 3267)
@@ -131,7 +131,7 @@
     only_names = []
     skip_names = []
     options = []
-    for word in sys_argv[1:]:
+    for word in sys_argv:
         if word=='': pass
         elif word=='only:': flag = 'only'
         elif word=='skip:': flag = 'skip'
@@ -146,7 +146,7 @@
     output_stream.write('''!    -*- f90 -*-
 ! Note: the context of this file is case sensitive.
 ''')
-    output_stream.write('PYTHON MODULE %s\n' % (module_name))
+    output_stream.write('PYTHON MODULE %s\n' % (modulename))
     output_stream.write('  INTERFACE\n\n')
     for filename in file_names:
         if not os.path.isfile(filename):
@@ -154,6 +154,8 @@
             continue
         sys.stderr.write('Parsing %r..\n' % (filename))
         block = parse(filename)
+        if block is None:
+            sys.exit(1)
         output_stream.write('! File: %s, source mode = %r\n' % (filename, block.reader.mode))
         if block.content and isinstance(block.content[0],PythonModule):
             for subblock in block.content[0].content[0].content:
@@ -163,7 +165,7 @@
         else:
             output_stream.write(block.topyf('    ')+'\n')
     output_stream.write('  END INTERFACE\n')
-    output_stream.write('END PYTHON MODULE %s\n' % (module_name))
+    output_stream.write('END PYTHON MODULE %s\n' % (modulename))
     
     if signature_output not in ['stdout','stderr']:
         output_stream.close()

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-05 23:36:47 UTC (rev 3266)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-06 04:57:17 UTC (rev 3267)
@@ -229,6 +229,39 @@
                         'POINTER', 'PROTECTED', 'SAVE', 'TARGET', 'VALUE',
                         'VOLATILE', 'REQUIRED']
 
+    def is_intent_in(self):
+        if not self.intent: return True
+        if 'HIDE' in self.intent: return False
+        if 'INPLACE' in self.intent: return False
+        if 'IN' in self.intent: return True
+        if 'OUT' in self.intent: return False
+        if 'INOUT' in self.intent: return False
+        if 'OUTIN' in self.intent: return False
+        return True
+
+    def is_intent_inout(self):
+        if 'INOUT' in self.intent:
+            if 'IN' in self.intent or 'HIDE' in self.intent or 'INPLACE' in self.intent:
+                self.warning('INOUT ignored in INPUT(%s)' % (', '.join(self.intent)))
+                return False
+            return True
+        return False
+
+    def is_intent_hide(self):
+        if 'HIDE' in self.intent: return True
+        if 'OUT' in self.intent:
+            return 'IN' not in self.intent and 'INPLACE' not in self.intent and 'INOUT' not in self.intent
+        return False
+
+    def is_intent_inplace(self): return 'INPLACE' in self.intent
+    def is_intent_out(self): return 'OUT' in self.intent
+    def is_intent_c(self): return 'C' in self.intent
+    def is_intent_cache(self): return 'CACHE' in self.intent
+    def is_intent_copy(self): return 'COPY' in self.intent
+    def is_intent_overwrite(self): return 'OVERWRITE' in self.intent
+    def is_intent_callback(self): return 'CALLBACK' in self.intent
+    def is_intent_aux(self): return 'AUX' in self.intent
+
     def is_private(self):
         if 'PUBLIC' in self.attributes: return False
         if 'PRIVATE' in self.attributes: return True
@@ -242,8 +275,8 @@
     def is_external(self): return 'EXTERNAL' in self.attributes
     def is_intrinsic(self): return 'INTRINSIC' in self.attributes
     def is_parameter(self): return 'PARAMETER' in self.attributes
-    def is_optional(self): return 'OPTIONAL' in self.attributes
-    def is_required(self): return 'REQUIRED' in self.attributes
+    def is_optional(self): return 'OPTIONAL' in self.attributes and 'REQUIRED' not in self.attributes and not self.is_intent_hide()
+    def is_required(self): return self.is_optional() and not self.is_intent_hide()
     def is_pointer(self): return 'POINTER' in self.attributes
 
     def is_array(self): return not not (self.bounds or self.dimension)

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-05 23:36:47 UTC (rev 3266)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-06 04:57:17 UTC (rev 3267)
@@ -512,12 +512,13 @@
             for spec in split_comma(item[i+1:-1].strip(), self.item):
                 if '-' in spec:
                     s,e = spec.lower().split('-')
-                    assert s in self.letters and e in self.letters
+                    s = s.strip()
+                    e = e.strip()
+                    assert s in self.letters and e in self.letters,`s,e`
                 else:
-                    e = s = spec.lower()
-                    assert s in self.letters
+                    e = s = spec.lower().strip()
+                    assert s in self.letters,`s,e`
                 specs.append((s,e))
-            self.specs = specs
             tspec = item[:i].rstrip()
             stmt = None
             for cls in declaration_type_spec:
@@ -557,10 +558,10 @@
             self.warning('overriding previously set IMPLICIT NONE')
             self.parent.a.implicit_rules = implicit_rules = {}
         for stmt,specs in self.items:
-            s,e = specs
-            for l in string.lowercase[string.lowercase.index(s.lower()):\
-                                      string.lowercase.index(e.lower())+1]:
-                implicit_rules[l] = stmt
+            for s,e in specs:
+                for l in string.lowercase[string.lowercase.index(s.lower()):\
+                                          string.lowercase.index(e.lower())+1]:
+                    implicit_rules[l] = stmt
         return
 
 intrinsic_type_spec = [ \

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-05 23:36:47 UTC (rev 3266)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-06 04:57:17 UTC (rev 3267)
@@ -41,7 +41,7 @@
   if (f2py_success) {
     %(pyobjfrom_list)s
     capi_buildvalue = Py_BuildValue("%(return_format_elist)s"
-                                    %(return_obj_list)s);
+                                    %(return_obj_clist)s);
     %(clean_pyobjfrom_list)s
   }
   %(clean_call_list)s
@@ -92,6 +92,9 @@
                 args_f.append('&'+argname)
             else:
                 args_f.append(argname)
+            if var.is_intent_out(): # and is_scalar
+                self.return_format_list.append('O&')
+                self.return_obj_list.append('\npyobj_from_%s, &%s' % (ctype, argname))
 
         WrapperCPPMacro(parent, 'F_FUNC')
         self.call_list.append('%s_f(%s);' % (name,', '.join(args_f)))
@@ -99,6 +102,8 @@
         self.clean_pyobjfrom_list.reverse()
         self.clean_call_list.reverse()
         self.clean_frompyobj_list.reverse()
+
         if self.return_obj_list: self.return_obj_list.insert(0,'')
+
         parent.apply_templates(self)
         return



From numpy-svn at scipy.org  Fri Oct  6 14:56:52 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 13:56:52 -0500 (CDT)
Subject: [Numpy-svn] r3268 - in trunk/numpy: core/tests lib/tests
Message-ID: <20061006185652.B9A0539C10E@new.scipy.org>

Author: stefan
Date: 2006-10-06 13:56:24 -0500 (Fri, 06 Oct 2006)
New Revision: 3268

Modified:
   trunk/numpy/core/tests/test_regression.py
   trunk/numpy/lib/tests/test_polynomial.py
Log:
Add tests for tickets #312, #322, for polynomial roots and for setting
elements in object arrays.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-06 04:57:17 UTC (rev 3267)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-06 18:56:24 UTC (rev 3268)
@@ -456,5 +456,25 @@
         lst = ['abc','cde','fgh']
         N.lexsort((lst,))
         
+    def check_recarray_copy(self, level=rlevel):
+        """Ticket #312"""
+        dt = [('x',N.int16),('y',N.float64)]
+        ra = N.array([(1,2.3)], dtype=dt)
+        rb = N.rec.array(ra, dtype=dt)
+        rb['x'] = 2.
+        assert ra['x'] != rb['x']
+        
+    def check_rec_fromarray(self, level=rlevel):
+        """Ticket #322"""
+        x1 = N.array([[1,2],[3,4],[5,6]])
+        x2 = N.array(['a','dd','xyz'])
+        x3 = N.array([1.1,2,3])
+        N.rec.fromarrays([x1,x2,x3], formats="(2,)i4,a3,f8")
+        
+    def check_object_array_assign(self, level=rlevel):
+        x = N.empty((2,2),object)
+        x.flat[2] = (1,2,3)
+        assert_equal(x.flat[2],(1,2,3))
+        
 if __name__ == "__main__":
     NumpyTest().run()

Modified: trunk/numpy/lib/tests/test_polynomial.py
===================================================================
--- trunk/numpy/lib/tests/test_polynomial.py	2006-10-06 04:57:17 UTC (rev 3267)
+++ trunk/numpy/lib/tests/test_polynomial.py	2006-10-06 18:56:24 UTC (rev 3268)
@@ -74,9 +74,13 @@
 """
 
 from numpy.testing import *
+import numpy as N
 
 class test_docs(NumpyTestCase):
     def check_doctests(self): return self.rundocs()
+    
+    def check_roots(self):
+        assert_array_equal(N.roots([1,0,0]), [0,0])
 
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Fri Oct  6 20:09:04 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 19:09:04 -0500 (CDT)
Subject: [Numpy-svn] r3269 - trunk/numpy/core/src
Message-ID: <20061007000904.6019D39C033@new.scipy.org>

Author: oliphant
Date: 2006-10-06 19:09:02 -0500 (Fri, 06 Oct 2006)
New Revision: 3269

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix ticket #324: not returning minimum array.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-06 18:56:24 UTC (rev 3268)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-07 00:09:02 UTC (rev 3269)
@@ -5180,7 +5180,7 @@
 			else {
 				ret = PyArray_NewCopy((PyArrayObject*)op,
 						      order);
-				if (oldtype == type) return ret;
+				if (oldtype == type) goto finish;
 				Py_INCREF(oldtype);
 				Py_DECREF(PyArray_DESCR(ret));
 				PyArray_DESCR(ret) = oldtype;



From numpy-svn at scipy.org  Fri Oct  6 21:04:14 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:04:14 -0500 (CDT)
Subject: [Numpy-svn] r3270 - trunk/numpy/core/tests
Message-ID: <20061007010414.0B5C839C184@new.scipy.org>

Author: stefan
Date: 2006-10-06 20:04:00 -0500 (Fri, 06 Oct 2006)
New Revision: 3270

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Add test for ticket #324.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-07 00:09:02 UTC (rev 3269)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-07 01:04:00 UTC (rev 3270)
@@ -476,5 +476,11 @@
         x.flat[2] = (1,2,3)
         assert_equal(x.flat[2],(1,2,3))
         
+    def check_ndmin_float64(self, level=rlevel):
+        """Ticket #324"""
+        x = N.array([1,2,3],dtype=N.float64)        
+        assert_equal(N.array(x,dtype=N.float32,ndmin=2).ndim,2)        
+        assert_equal(N.array(x,dtype=N.float64,ndmin=2).ndim,2)
+        
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Fri Oct  6 21:09:49 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:09:49 -0500 (CDT)
Subject: [Numpy-svn] r3271 - trunk/numpy/core/tests
Message-ID: <20061007010949.78D3839C030@new.scipy.org>

Author: stefan
Date: 2006-10-06 20:09:36 -0500 (Fri, 06 Oct 2006)
New Revision: 3271

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Add test for ticket #302.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-07 01:04:00 UTC (rev 3270)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-07 01:09:36 UTC (rev 3271)
@@ -456,6 +456,11 @@
         lst = ['abc','cde','fgh']
         N.lexsort((lst,))
         
+    def check_fancy_index(self, level=rlevel):
+        """Ticket #302"""
+        x = N.array([1,2])[N.array([0])]
+        assert_equal(x.shape,(1,))
+        
     def check_recarray_copy(self, level=rlevel):
         """Ticket #312"""
         dt = [('x',N.int16),('y',N.float64)]



From numpy-svn at scipy.org  Fri Oct  6 21:34:37 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:34:37 -0500 (CDT)
Subject: [Numpy-svn] r3272 - trunk/numpy/core/src
Message-ID: <20061007013437.76C0F39C133@new.scipy.org>

Author: stefan
Date: 2006-10-06 20:34:24 -0500 (Fri, 06 Oct 2006)
New Revision: 3272

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Fix ticket #327.


Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-07 01:09:36 UTC (rev 3271)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-07 01:34:24 UTC (rev 3272)
@@ -1168,7 +1168,7 @@
 		smallest but non-zero.
 		 */
 
-		for (i=0; i<loop->nd-1; i++) {
+		for (i=0; i<loop->nd; i++) {
 			stride_sum[i] = 0;
 			for (j=0; j<loop->numiter; j++) {
 				stride_sum[i] += loop->iters[j]->strides[i];



From numpy-svn at scipy.org  Fri Oct  6 21:35:20 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:35:20 -0500 (CDT)
Subject: [Numpy-svn] r3273 - in trunk/numpy: core/src lib
Message-ID: <20061007013520.3B2A039C184@new.scipy.org>

Author: oliphant
Date: 2006-10-06 20:35:17 -0500 (Fri, 06 Oct 2006)
New Revision: 3273

Modified:
   trunk/numpy/core/src/arraytypes.inc.src
   trunk/numpy/lib/function_base.py
Log:
Fix ticket #325

Modified: trunk/numpy/core/src/arraytypes.inc.src
===================================================================
--- trunk/numpy/core/src/arraytypes.inc.src	2006-10-07 01:34:24 UTC (rev 3272)
+++ trunk/numpy/core/src/arraytypes.inc.src	2006-10-07 01:35:17 UTC (rev 3273)
@@ -404,6 +404,10 @@
 static PyObject *
 OBJECT_getitem(char *ip, PyArrayObject *ap)
 {
+        if (*(PyObject **)ip == NULL) {
+                Py_INCREF(Py_None);
+                return Py_None;
+        }
         if (!ap || PyArray_ISALIGNED(ap)) {
                 Py_INCREF(*(PyObject **)ip);
                 return *(PyObject **)ip;
@@ -771,7 +775,12 @@
         register intp i;
         int skip=@skip@;
         for(i=0;i<n;i++,ip++,op+=skip) {
-                @to at _setitem(*ip, (char *)op, aop);
+                if (*ip == NULL) {
+                        @to at _setitem(Py_False, (char *)op, aop);
+                }
+                else {
+                        @to at _setitem(*ip, (char *)op, aop);
+                }
         }
 }
 /**end repeat**/
@@ -1222,7 +1231,7 @@
                 sstride /= sizeof(PyObject **);
                 if (__ALIGNED(dst,sizeof(PyObject **)) && __ALIGNED(src, sizeof(PyObject **))) {
                         for (i=0; i<n; i++) {
-                                Py_INCREF(*src);
+                                Py_XINCREF(*src);
                                 Py_XDECREF(*dst);
                                 *dst = *src;
                                 dst += dstride;
@@ -1234,7 +1243,7 @@
                         for (i=0; i<n; i++) {
                                 dp = dst;
                                 sp = src;
-                                Py_INCREF(*sp);
+                                Py_XINCREF(*sp);
                                 Py_XDECREF(*dp);
                                 memcpy(dst, src, sizeof(PyObject *));
                                 dst += dstride;
@@ -1252,13 +1261,13 @@
 
         if (src != NULL) {
                 if (__ALIGNED(dst,sizeof(PyObject **)) && __ALIGNED(src,sizeof(PyObject **))) {
-                        Py_INCREF(*src);
+                        Py_XINCREF(*src);
                         Py_XDECREF(*dst);
                         *dst = *src;
                 }
                 else {
                         PyObject **dp=dst, **sp=src;
-                        Py_INCREF(*sp);
+                        Py_XINCREF(*sp);
                         Py_XDECREF(*dp);
                         memcpy(dst, src, sizeof(PyObject *));
                 }
@@ -1523,6 +1532,7 @@
 OBJECT_nonzero (PyObject **ip, PyArrayObject *ap)
 {
 
+        if (*ip == NULL) return FALSE;
         if (PyArray_ISALIGNED(ap)) {
                 return (Bool) PyObject_IsTrue(*ip);
         }
@@ -1623,6 +1633,11 @@
 static int
 OBJECT_compare(PyObject **ip1, PyObject **ip2, PyArrayObject *ap)
 {
+        if ((*ip1 == NULL) || (*ip2 == NULL)) {
+                if (ip1 == ip2) return 1;
+                if (ip1 == NULL) return -1;
+                return 1;
+        }                
         return PyObject_Compare(*ip1, *ip2);
 }
 
@@ -1698,9 +1713,15 @@
 {
         register intp i;
         PyObject *mp=ip[0]; *max_ind=0;
-        for(i=1; i<n; i++) {
+        i = 1;
+        while(i<n && mp==NULL) {
+                mp=ip[i];
+                i++;
+        }
+        if (i==n) return 0;
+        for(i=n; i<n; i++) {
                 ip++;
-                if (PyObject_Compare(*ip,mp) > 0) {
+                if (*ip != NULL && PyObject_Compare(*ip,mp) > 0) {
                         mp = *ip;
                         *max_ind=i;
                 }

Modified: trunk/numpy/lib/function_base.py
===================================================================
--- trunk/numpy/lib/function_base.py	2006-10-07 01:34:24 UTC (rev 3272)
+++ trunk/numpy/lib/function_base.py	2006-10-07 01:35:17 UTC (rev 3273)
@@ -822,6 +822,12 @@
             if (nargs > self.nin) or (nargs < self.nin_wo_defaults):
                 raise ValueError, "mismatch between python function inputs"\
                       " and received arguments"
+
+        if (self.lastcallargs != nargs):
+            self.lastcallargs = nargs
+            self.ufunc = None
+            self.nout = None
+
         if self.nout is None or self.otypes == '':
             newargs = []
             for arg in args:
@@ -832,21 +838,20 @@
             else:
                 self.nout = 1
                 theout = (theout,)
-            if self.otypes == '':
-                otypes = []
-                for k in range(self.nout):
-                    otypes.append(asarray(theout[k]).dtype.char)
-                self.otypes = ''.join(otypes)
+            otypes = []
+            for k in range(self.nout):
+                otypes.append(asarray(theout[k]).dtype.char)
+            self.otypes = ''.join(otypes)
 
-        if (self.ufunc is None) or (self.lastcallargs != nargs):
+        if (self.ufunc is None):
             self.ufunc = frompyfunc(self.thefunc, nargs, self.nout)
-            self.lastcallargs = nargs
 
         if self.nout == 1:
-            return array(self.ufunc(*args),copy=False).astype(self.otypes[0])
+            _res = array(self.ufunc(*args),copy=False).astype(self.otypes[0])
         else:
-            return tuple([array(x,copy=False).astype(c) \
+            _res = tuple([array(x,copy=False).astype(c) \
                           for x, c in zip(self.ufunc(*args), self.otypes)])
+        return _res
 
 def cov(m,y=None, rowvar=1, bias=0):
     """Estimate the covariance matrix.



From numpy-svn at scipy.org  Fri Oct  6 21:36:51 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:36:51 -0500 (CDT)
Subject: [Numpy-svn] r3274 - trunk/numpy/core/tests
Message-ID: <20061007013651.83A3339C185@new.scipy.org>

Author: stefan
Date: 2006-10-06 20:36:39 -0500 (Fri, 06 Oct 2006)
New Revision: 3274

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Test for ticket #327.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-07 01:35:17 UTC (rev 3273)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-07 01:36:39 UTC (rev 3274)
@@ -487,5 +487,10 @@
         assert_equal(N.array(x,dtype=N.float32,ndmin=2).ndim,2)        
         assert_equal(N.array(x,dtype=N.float64,ndmin=2).ndim,2)
         
+    def check_mem_axis_minimization(self, level=rlevel):
+        """Ticket #327"""
+        data = N.arange(5)
+        data = N.add.outer(data,data)
+        
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Fri Oct  6 21:42:41 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:42:41 -0500 (CDT)
Subject: [Numpy-svn] r3275 - trunk/numpy/core/src
Message-ID: <20061007014241.1809539C184@new.scipy.org>

Author: oliphant
Date: 2006-10-06 20:42:39 -0500 (Fri, 06 Oct 2006)
New Revision: 3275

Modified:
   trunk/numpy/core/src/arraytypes.inc.src
Log:
Fix last OBJECT function to handle NULLS.

Modified: trunk/numpy/core/src/arraytypes.inc.src
===================================================================
--- trunk/numpy/core/src/arraytypes.inc.src	2006-10-07 01:36:39 UTC (rev 3274)
+++ trunk/numpy/core/src/arraytypes.inc.src	2006-10-07 01:42:39 UTC (rev 3275)
@@ -1821,11 +1821,18 @@
 {
         intp i;
         PyObject *tmp1, *tmp2, *tmp=NULL;
+        PyObject *in1, *in2;
         PyObject **tmp3;
         for(i=0;i<n;i++,ip1+=is1,ip2+=is2) {
-                tmp1 = PyNumber_Multiply(*((PyObject **)ip1),
-                                         *((PyObject **)ip2));
-                if (!tmp1) { Py_XDECREF(tmp); return;}
+                if ((*((PyObject **)ip1) == NULL) || (*((PyObject **)ip2) == NULL)) {
+                        tmp1 = Py_False;
+                        Py_INCREF(Py_False);
+                }
+                else {
+                        tmp1 = PyNumber_Multiply(*((PyObject **)ip1),
+                                                 *((PyObject **)ip2));
+                        if (!tmp1) { Py_XDECREF(tmp); return;}
+                }
                 if (i == 0) {
                         tmp = tmp1;
                 } else {



From numpy-svn at scipy.org  Fri Oct  6 21:43:12 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:43:12 -0500 (CDT)
Subject: [Numpy-svn] r3276 - trunk/numpy/core/tests
Message-ID: <20061007014312.D014D39C184@new.scipy.org>

Author: stefan
Date: 2006-10-06 20:42:57 -0500 (Fri, 06 Oct 2006)
New Revision: 3276

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Add test for ticket #325.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-07 01:42:39 UTC (rev 3275)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-07 01:42:57 UTC (rev 3276)
@@ -487,6 +487,12 @@
         assert_equal(N.array(x,dtype=N.float32,ndmin=2).ndim,2)        
         assert_equal(N.array(x,dtype=N.float64,ndmin=2).ndim,2)
         
+    def check_mem_vectorise(self, level=rlevel):
+        """Ticket #325"""
+        vt = N.vectorize(lambda *args: args)
+        vt(N.zeros((1,2,1)), N.zeros((2,1,1)), N.zeros((1,1,2)))
+        vt(N.zeros((1,2,1)), N.zeros((2,1,1)), N.zeros((1,1,2)), N.zeros((2,2)))                
+        
     def check_mem_axis_minimization(self, level=rlevel):
         """Ticket #327"""
         data = N.arange(5)



From numpy-svn at scipy.org  Fri Oct  6 21:45:34 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 20:45:34 -0500 (CDT)
Subject: [Numpy-svn] r3277 - trunk/numpy/core/src
Message-ID: <20061007014534.26F3339C184@new.scipy.org>

Author: oliphant
Date: 2006-10-06 20:45:32 -0500 (Fri, 06 Oct 2006)
New Revision: 3277

Modified:
   trunk/numpy/core/src/arraytypes.inc.src
Log:
Get rid of unused variables.

Modified: trunk/numpy/core/src/arraytypes.inc.src
===================================================================
--- trunk/numpy/core/src/arraytypes.inc.src	2006-10-07 01:42:57 UTC (rev 3276)
+++ trunk/numpy/core/src/arraytypes.inc.src	2006-10-07 01:45:32 UTC (rev 3277)
@@ -1821,7 +1821,6 @@
 {
         intp i;
         PyObject *tmp1, *tmp2, *tmp=NULL;
-        PyObject *in1, *in2;
         PyObject **tmp3;
         for(i=0;i<n;i++,ip1+=is1,ip2+=is2) {
                 if ((*((PyObject **)ip1) == NULL) || (*((PyObject **)ip2) == NULL)) {



From numpy-svn at scipy.org  Fri Oct  6 22:12:11 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 21:12:11 -0500 (CDT)
Subject: [Numpy-svn] r3278 - in trunk/numpy: . lib
Message-ID: <20061007021211.E0DB539C01D@new.scipy.org>

Author: oliphant
Date: 2006-10-06 21:12:09 -0500 (Fri, 06 Oct 2006)
New Revision: 3278

Modified:
   trunk/numpy/lib/shape_base.py
   trunk/numpy/matlib.py
Log:
Add tile to numpy and move repmat to matlib.py

Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-10-07 01:45:32 UTC (rev 3277)
+++ trunk/numpy/lib/shape_base.py	2006-10-07 02:12:09 UTC (rev 3278)
@@ -1,7 +1,7 @@
 __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack',
            'column_stack','row_stack', 'dstack','array_split','split','hsplit',
            'vsplit','dsplit','apply_over_axes','expand_dims',
-           'apply_along_axis', 'repmat', 'kron']
+           'apply_along_axis', 'tile', 'kron']
 
 import numpy.core.numeric as _nx
 from numpy.core.numeric import asarray, zeros, newaxis, outer, \
@@ -526,24 +526,6 @@
         raise ValueError, 'vsplit only works on arrays of 3 or more dimensions'
     return split(ary,indices_or_sections,2)
 
-# should figure out how to generalize this one.
-def repmat(a, m, n):
-    """Repeat a 0-d to 2-d array mxn times
-    """
-    a = asanyarray(a)
-    ndim = a.ndim
-    if ndim == 0:
-        origrows, origcols = (1,1)
-    elif ndim == 1:
-        origrows, origcols = (1, a.shape[0])
-    else:
-        origrows, origcols = a.shape
-    rows = origrows * m
-    cols = origcols * n
-    c = a.reshape(1,a.size).repeat(m, 0).reshape(rows, origcols).repeat(n,0)
-    return c.reshape(rows, cols)
-
-
 def _getwrapper(*args):
     """Find the wrapper for the array with the highest priority.
 
@@ -580,3 +562,56 @@
     if wrapper is not None:
         result = wrapper(result)
     return result
+
+def tile(A, reps):
+    """Repeat an array the number of times given in the integer tuple, tup.
+
+    If reps has length d, the result will have dimension of max(d, A.ndim).
+    If reps is scalar it is treated as a 1-tuple.
+
+    If A.ndim < d, A is promoted to be d-dimensional by prepending new axes.
+    So a shape (3,) array is promoted to (1,3) for 2-D replication,
+    or shape (1,1,3) for 3-D replication.
+    If this is not the desired behavior, promote A to d-dimensions manually
+    before calling this function.
+
+    If d < A.ndim, tup is promoted to A.ndim by pre-pending 1's to it.  Thus
+    for an A.shape of (2,3,4,5), a tup of (2,2) is treated as (1,1,2,2)
+
+
+    Examples:
+    >>> a = array([0,1,2])
+    >>> tile(a,2)
+    array([0, 1, 2, 0, 1, 2])
+    >>> tile(a,(1,2))
+    array([[0, 1, 2, 0, 1, 2]])
+    >>> tile(a,(2,2))
+    array([[0, 1, 2, 0, 1, 2],
+           [0, 1, 2, 0, 1, 2]])
+    >>> tile(a,(2,1,2))
+    array([[[0, 1, 2, 0, 1, 2]],
+
+           [[0, 1, 2, 0, 1, 2]]])
+
+    See Also:
+       repeat
+    """
+    try:
+        tup = tuple(reps)
+    except TypeError:
+        tup = (reps,)
+    d = len(tup)
+    c = _nx.array(A,copy=False,subok=True,ndmin=d)
+    shape = list(c.shape)
+    n = c.size
+    if (d < A.ndim):
+        tup = (1,)*(A.ndim-d) + tup
+    for i, nrep in enumerate(tup):
+        if nrep!=1:
+            c = c.reshape(-1,n).repeat(nrep,0)
+        dim_in = shape[i]
+        dim_out = dim_in*nrep
+        shape[i] = dim_out
+        n /= dim_in
+    return c.reshape(shape)
+

Modified: trunk/numpy/matlib.py
===================================================================
--- trunk/numpy/matlib.py	2006-10-07 01:45:32 UTC (rev 3277)
+++ trunk/numpy/matlib.py	2006-10-07 02:12:09 UTC (rev 3278)
@@ -6,7 +6,7 @@
 __version__ = N.__version__
 
 __all__ = N.__all__[:] # copy numpy namespace
-__all__ += ['rand', 'randn']
+__all__ += ['rand', 'randn', 'repmat']
 
 def empty(shape, dtype=None, order='C'):
     """return an empty matrix of the given shape
@@ -48,4 +48,18 @@
        args = args[0]
     return asmatrix(N.random.randn(*args))
 
-    
+def repmat(a, m, n):
+    """Repeat a 0-d to 2-d array mxn times
+    """
+    a = asanyarray(a)
+    ndim = a.ndim
+    if ndim == 0:
+        origrows, origcols = (1,1)
+    elif ndim == 1:
+        origrows, origcols = (1, a.shape[0])
+    else:
+        origrows, origcols = a.shape
+    rows = origrows * m
+    cols = origcols * n
+    c = a.reshape(1,a.size).repeat(m, 0).reshape(rows, origcols).repeat(n,0)
+    return c.reshape(rows, cols)



From numpy-svn at scipy.org  Fri Oct  6 22:23:37 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 21:23:37 -0500 (CDT)
Subject: [Numpy-svn] r3279 - in trunk/numpy/lib: . tests
Message-ID: <20061007022337.ABF1F39C01D@new.scipy.org>

Author: oliphant
Date: 2006-10-06 21:23:35 -0500 (Fri, 06 Oct 2006)
New Revision: 3279

Modified:
   trunk/numpy/lib/shape_base.py
   trunk/numpy/lib/tests/test_shape_base.py
Log:
Add tests for tile and fix error.

Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-10-07 02:12:09 UTC (rev 3278)
+++ trunk/numpy/lib/shape_base.py	2006-10-07 02:23:35 UTC (rev 3279)
@@ -604,8 +604,8 @@
     c = _nx.array(A,copy=False,subok=True,ndmin=d)
     shape = list(c.shape)
     n = c.size
-    if (d < A.ndim):
-        tup = (1,)*(A.ndim-d) + tup
+    if (d < c.ndim):
+        tup = (1,)*(c.ndim-d) + tup
     for i, nrep in enumerate(tup):
         if nrep!=1:
             c = c.reshape(-1,n).repeat(nrep,0)

Modified: trunk/numpy/lib/tests/test_shape_base.py
===================================================================
--- trunk/numpy/lib/tests/test_shape_base.py	2006-10-07 02:12:09 UTC (rev 3278)
+++ trunk/numpy/lib/tests/test_shape_base.py	2006-10-07 02:23:35 UTC (rev 3279)
@@ -386,6 +386,17 @@
                 assert False, "ValueError expected"
 
 
+class test_tile(NumpyTestCase):
+    def check_basic(self):
+        a = array([0,1,2])
+        b = [[1,2],[3,4]]
+        assert_equal(tile(a,2), [0,1,2,0,1,2])
+        assert_equal(tile(a,(2,2)), [[0,1,2,0,1,2],[0,1,2,0,1,2]])
+        assert_equal(tile(a,(1,2)), [[0,1,2,0,1,2]])
+        assert_equal(tile(b, 2), [[1,2,1,2],[3,4,3,4]])
+        assert_equal(tile(b,(2,1)),[[1,2],[3,4],[1,2],[3,4]])
+        assert_equal(tile(b,(2,2)),[[1,2,1,2],[3,4,3,4],[1,2,1,2],[3,4,3,4]])
+        
 # Utility
 
 def compare_results(res,desired):



From numpy-svn at scipy.org  Fri Oct  6 22:44:54 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 21:44:54 -0500 (CDT)
Subject: [Numpy-svn] r3280 - trunk/numpy/lib
Message-ID: <20061007024454.22AC039C01D@new.scipy.org>

Author: stefan
Date: 2006-10-06 21:44:41 -0500 (Fri, 06 Oct 2006)
New Revision: 3280

Modified:
   trunk/numpy/lib/shape_base.py
Log:
Fix typo in tile.


Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-10-07 02:23:35 UTC (rev 3279)
+++ trunk/numpy/lib/shape_base.py	2006-10-07 02:44:41 UTC (rev 3280)
@@ -564,7 +564,7 @@
     return result
 
 def tile(A, reps):
-    """Repeat an array the number of times given in the integer tuple, tup.
+    """Repeat an array the number of times given in the integer tuple, reps.
 
     If reps has length d, the result will have dimension of max(d, A.ndim).
     If reps is scalar it is treated as a 1-tuple.



From numpy-svn at scipy.org  Fri Oct  6 22:59:35 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri,  6 Oct 2006 21:59:35 -0500 (CDT)
Subject: [Numpy-svn] r3281 - trunk/numpy/lib
Message-ID: <20061007025935.36A3D39C01D@new.scipy.org>

Author: oliphant
Date: 2006-10-06 21:59:33 -0500 (Fri, 06 Oct 2006)
New Revision: 3281

Modified:
   trunk/numpy/lib/shape_base.py
Log:
Fix kron to be N-dimensional.

Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-10-07 02:44:41 UTC (rev 3280)
+++ trunk/numpy/lib/shape_base.py	2006-10-07 02:59:33 UTC (rev 3281)
@@ -1,7 +1,7 @@
 __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack',
            'column_stack','row_stack', 'dstack','array_split','split','hsplit',
            'vsplit','dsplit','apply_over_axes','expand_dims',
-           'apply_along_axis', 'tile', 'kron']
+           'apply_along_axis', 'kron', 'tile']
 
 import numpy.core.numeric as _nx
 from numpy.core.numeric import asarray, zeros, newaxis, outer, \
@@ -542,27 +542,30 @@
 def kron(a,b):
     """kronecker product of a and b
 
-    Kronecker product of two matrices is block matrix
+    Kronecker product of two arrays is block array
     [[ a[ 0 ,0]*b, a[ 0 ,1]*b, ... , a[ 0 ,n-1]*b  ],
      [ ...                                   ...   ],
      [ a[m-1,0]*b, a[m-1,1]*b, ... , a[m-1,n-1]*b  ]]
     """
     wrapper = _getwrapper(a, b)
-    a = asanyarray(a)
-    b = asanyarray(b)
-    if not (len(a.shape) == len(b.shape) == 2):
-        raise ValueError("a and b must both be two dimensional")
+    b = asanyarray(b)    
+    a = array(a,copy=False,subok=True,ndmin=b.ndim)
+    as = a.shape
+    bs = b.shape
     if not a.flags.contiguous:
-        a = reshape(a, a.shape)
+        a = reshape(a, as)
     if not b.flags.contiguous:
-        b = reshape(b, b.shape)
+        b = reshape(b, bs)
     o = outer(a,b)
-    o=o.reshape(a.shape + b.shape)
-    result = concatenate(concatenate(o, axis=1), axis=1)
+    result = o.reshape(as + bs)
+    axis = a.ndim-1
+    for k in xrange(b.ndim):
+        result = concatenate(result, axis=axis)
     if wrapper is not None:
         result = wrapper(result)
     return result
 
+
 def tile(A, reps):
     """Repeat an array the number of times given in the integer tuple, reps.
 



From numpy-svn at scipy.org  Sat Oct  7 04:00:24 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat,  7 Oct 2006 03:00:24 -0500 (CDT)
Subject: [Numpy-svn] r3282 - trunk/numpy/core/include/numpy
Message-ID: <20061007080024.0C95239C1D9@new.scipy.org>

Author: pearu
Date: 2006-10-07 03:00:20 -0500 (Sat, 07 Oct 2006)
New Revision: 3282

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
Log:
Added NPY_<CLS><BITS>_FMT macros.

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-07 02:59:33 UTC (rev 3281)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-07 08:00:20 UTC (rev 3282)
@@ -36,6 +36,17 @@
            Handle that here.
          */
 
+#define NPY_BYTE_FMT "hhd"
+#define NPY_UBYTE_FMT "hhu"
+#define NPY_SHORT_FMT "hd"
+#define NPY_USHORT_FMT "hu"
+#define NPY_INT_FMT "d"
+#define NPY_UINT_FMT "u"
+#define NPY_LONG_FMT "ld"
+#define NPY_ULONG_FMT "lu"
+#define NPY_FLOAT_FMT "g"
+#define NPY_DOUBLE_FMT "g"
+
 #ifdef PY_LONG_LONG
 typedef PY_LONG_LONG npy_longlong;
 typedef unsigned PY_LONG_LONG npy_ulonglong;
@@ -293,6 +304,8 @@
 #define PyInt8ArrType_Type PyLongArrType_Type
 #define PyUInt8ScalarObject PyULongScalarObject
 #define PyUInt8ArrType_Type PyULongArrType_Type
+#define NPY_INT8_FMT NPY_LONG_FMT
+#define NPY_UINT8_FMT NPY_ULONG_FMT
 #elif NPY_BITSOF_LONG == 16
 #define NPY_INT16 NPY_LONG
 #define NPY_UINT16 NPY_ULONG
@@ -302,6 +315,8 @@
 #define PyInt16ArrType_Type PyLongArrType_Type
 #define PyUInt16ScalarObject PyULongScalarObject
 #define PyUInt16ArrType_Type PyULongArrType_Type
+#define NPY_INT16_FMT NPY_LONG_FMT
+#define NPY_UINT16_FMT NPY_ULONG_FMT
 #elif NPY_BITSOF_LONG == 32
 #define NPY_INT32 NPY_LONG
 #define NPY_UINT32 NPY_ULONG
@@ -312,6 +327,8 @@
 #define PyInt32ArrType_Type PyLongArrType_Type
 #define PyUInt32ScalarObject PyULongScalarObject
 #define PyUInt32ArrType_Type PyULongArrType_Type
+#define NPY_INT32_FMT NPY_LONG_FMT
+#define NPY_UINT32_FMT NPY_ULONG_FMT
 #elif NPY_BITSOF_LONG == 64
 #define NPY_INT64 NPY_LONG
 #define NPY_UINT64 NPY_ULONG
@@ -321,6 +338,8 @@
 #define PyInt64ArrType_Type PyLongArrType_Type
 #define PyUInt64ScalarObject PyULongScalarObject
 #define PyUInt64ArrType_Type PyULongArrType_Type
+#define NPY_INT64_FMT NPY_LONG_FMT
+#define NPY_UINT64_FMT NPY_ULONG_FMT
 #elif NPY_BITSOF_LONG == 128
 #define NPY_INT128 NPY_LONG
 #define NPY_UINT128 NPY_ULONG
@@ -330,6 +349,8 @@
 #define PyInt128ArrType_Type PyLongArrType_Type
 #define PyUInt128ScalarObject PyULongScalarObject
 #define PyUInt128ArrType_Type PyULongArrType_Type
+#define NPY_INT128_FMT NPY_LONG_FMT
+#define NPY_UINT128_FMT NPY_ULONG_FMT
 #endif
 
 #if NPY_BITSOF_LONGLONG == 8
@@ -342,6 +363,8 @@
 #    define PyInt8ArrType_Type PyLongLongArrType_Type
 #    define PyUInt8ScalarObject PyULongLongScalarObject
 #    define PyUInt8ArrType_Type PyULongLongArrType_Type
+#define NPY_INT8_FMT NPY_LONGLONG_FMT
+#define NPY_UINT8_FMT NPY_ULONGLONG_FMT
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT8
 #  define NPY_MIN_LONGLONG NPY_MIN_INT8
@@ -356,6 +379,8 @@
 #    define PyInt16ArrType_Type PyLongLongArrType_Type
 #    define PyUInt16ScalarObject PyULongLongScalarObject
 #    define PyUInt16ArrType_Type PyULongLongArrType_Type
+#define NPY_INT16_FMT NPY_LONGLONG_FMT
+#define NPY_UINT16_FMT NPY_ULONGLONG_FMT
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT16
 #  define NPY_MIN_LONGLONG NPY_MIN_INT16
@@ -371,6 +396,8 @@
 #    define PyInt32ArrType_Type PyLongLongArrType_Type
 #    define PyUInt32ScalarObject PyULongLongScalarObject
 #    define PyUInt32ArrType_Type PyULongLongArrType_Type
+#define NPY_INT32_FMT NPY_LONGLONG_FMT
+#define NPY_UINT32_FMT NPY_ULONGLONG_FMT
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT32
 #  define NPY_MIN_LONGLONG NPY_MIN_INT32
@@ -385,6 +412,8 @@
 #    define PyInt64ArrType_Type PyLongLongArrType_Type
 #    define PyUInt64ScalarObject PyULongLongScalarObject
 #    define PyUInt64ArrType_Type PyULongLongArrType_Type
+#define NPY_INT64_FMT NPY_LONGLONG_FMT
+#define NPY_UINT64_FMT NPY_ULONGLONG_FMT
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT64
 #  define NPY_MIN_LONGLONG NPY_MIN_INT64
@@ -399,6 +428,8 @@
 #    define PyInt128ArrType_Type PyLongLongArrType_Type
 #    define PyUInt128ScalarObject PyULongLongScalarObject
 #    define PyUInt128ArrType_Type PyULongLongArrType_Type
+#define NPY_INT128_FMT NPY_LONGLONG_FMT
+#define NPY_UINT128_FMT NPY_ULONGLONG_FMT
 #  endif
 #  define NPY_MAX_LONGLONG NPY_MAX_INT128
 #  define NPY_MIN_LONGLONG NPY_MIN_INT128
@@ -412,6 +443,8 @@
 #  define PyInt256ArrType_Type PyLongLongArrType_Type
 #  define PyUInt256ScalarObject PyULongLongScalarObject
 #  define PyUInt256ArrType_Type PyULongLongArrType_Type
+#define NPY_INT256_FMT NPY_LONGLONG_FMT
+#define NPY_UINT256_FMT NPY_ULONGLONG_FMT
 #  define NPY_MAX_LONGLONG NPY_MAX_INT256
 #  define NPY_MIN_LONGLONG NPY_MIN_INT256
 #  define NPY_MAX_ULONGLONG NPY_MAX_UINT256
@@ -427,6 +460,8 @@
 #    define PyInt8ArrType_Type PyIntArrType_Type
 #    define PyUInt8ScalarObject PyUIntScalarObject
 #    define PyUInt8ArrType_Type PyUIntArrType_Type
+#define NPY_INT8_FMT NPY_INT_FMT
+#define NPY_UINT8_FMT NPY_UINT_FMT
 #endif
 #elif NPY_BITSOF_INT == 16
 #ifndef NPY_INT16
@@ -438,6 +473,8 @@
 #    define PyInt16ArrType_Type PyIntArrType_Type
 #    define PyUInt16ScalarObject PyIntUScalarObject
 #    define PyUInt16ArrType_Type PyIntUArrType_Type
+#define NPY_INT16_FMT NPY_INT_FMT
+#define NPY_UINT16_FMT NPY_UINT_FMT
 #endif
 #elif NPY_BITSOF_INT == 32
 #ifndef NPY_INT32
@@ -450,6 +487,8 @@
 #    define PyInt32ArrType_Type PyIntArrType_Type
 #    define PyUInt32ScalarObject PyUIntScalarObject
 #    define PyUInt32ArrType_Type PyUIntArrType_Type
+#define NPY_INT32_FMT NPY_INT_FMT
+#define NPY_UINT32_FMT NPY_UINT_FMT
 #endif
 #elif NPY_BITSOF_INT == 64
 #ifndef NPY_INT64
@@ -461,6 +500,8 @@
 #    define PyInt64ArrType_Type PyIntArrType_Type
 #    define PyUInt64ScalarObject PyUIntScalarObject
 #    define PyUInt64ArrType_Type PyUIntArrType_Type
+#define NPY_INT64_FMT NPY_INT_FMT
+#define NPY_UINT64_FMT NPY_UINT_FMT
 #endif
 #elif NPY_BITSOF_INT == 128
 #ifndef NPY_INT128
@@ -472,6 +513,8 @@
 #    define PyInt128ArrType_Type PyIntArrType_Type
 #    define PyUInt128ScalarObject PyUIntScalarObject
 #    define PyUInt128ArrType_Type PyUIntArrType_Type
+#define NPY_INT128_FMT NPY_INT_FMT
+#define NPY_UINT128_FMT NPY_UINT_FMT
 #endif
 #endif
 
@@ -485,6 +528,8 @@
 #    define PyInt8ArrType_Type PyShortArrType_Type
 #    define PyUInt8ScalarObject PyUShortScalarObject
 #    define PyUInt8ArrType_Type PyUShortArrType_Type
+#define NPY_INT8_FMT NPY_SHORT_FMT
+#define NPY_UINT8_FMT NPY_USHORT_FMT
 #endif
 #elif NPY_BITSOF_SHORT == 16
 #ifndef NPY_INT16
@@ -496,6 +541,8 @@
 #    define PyInt16ArrType_Type PyShortArrType_Type
 #    define PyUInt16ScalarObject PyUShortScalarObject
 #    define PyUInt16ArrType_Type PyUShortArrType_Type
+#define NPY_INT16_FMT NPY_SHORT_FMT
+#define NPY_UINT16_FMT NPY_USHORT_FMT
 #endif
 #elif NPY_BITSOF_SHORT == 32
 #ifndef NPY_INT32
@@ -508,6 +555,8 @@
 #    define PyInt32ArrType_Type PyShortArrType_Type
 #    define PyUInt32ScalarObject PyUShortScalarObject
 #    define PyUInt32ArrType_Type PyUShortArrType_Type
+#define NPY_INT32_FMT NPY_SHORT_FMT
+#define NPY_UINT32_FMT NPY_USHORT_FMT
 #endif
 #elif NPY_BITSOF_SHORT == 64
 #ifndef NPY_INT64
@@ -519,6 +568,8 @@
 #    define PyInt64ArrType_Type PyShortArrType_Type
 #    define PyUInt64ScalarObject PyUShortScalarObject
 #    define PyUInt64ArrType_Type PyUShortArrType_Type
+#define NPY_INT64_FMT NPY_SHORT_FMT
+#define NPY_UINT64_FMT NPY_USHORT_FMT
 #endif
 #elif NPY_BITSOF_SHORT == 128
 #ifndef NPY_INT128
@@ -530,6 +581,8 @@
 #    define PyInt128ArrType_Type PyShortArrType_Type
 #    define PyUInt128ScalarObject PyUShortScalarObject
 #    define PyUInt128ArrType_Type PyUShortArrType_Type
+#define NPY_INT128_FMT NPY_SHORT_FMT
+#define NPY_UINT128_FMT NPY_USHORT_FMT
 #endif
 #endif
 
@@ -544,6 +597,8 @@
 #    define PyInt8ArrType_Type PyByteArrType_Type
 #    define PyUInt8ScalarObject PyUByteScalarObject
 #    define PyUInt8ArrType_Type PyUByteArrType_Type
+#define NPY_INT8_FMT NPY_BYTE_FMT
+#define NPY_UINT8_FMT NPY_UBYTE_FMT
 #endif
 #elif NPY_BITSOF_CHAR == 16
 #ifndef NPY_INT16
@@ -555,6 +610,8 @@
 #    define PyInt16ArrType_Type PyByteArrType_Type
 #    define PyUInt16ScalarObject PyUByteScalarObject
 #    define PyUInt16ArrType_Type PyUByteArrType_Type
+#define NPY_INT16_FMT NPY_BYTE_FMT
+#define NPY_UINT16_FMT NPY_UBYTE_FMT
 #endif
 #elif NPY_BITSOF_CHAR == 32
 #ifndef NPY_INT32
@@ -567,6 +624,8 @@
 #    define PyInt32ArrType_Type PyByteArrType_Type
 #    define PyUInt32ScalarObject PyUByteScalarObject
 #    define PyUInt32ArrType_Type PyUByteArrType_Type
+#define NPY_INT32_FMT NPY_BYTE_FMT
+#define NPY_UINT32_FMT NPY_UBYTE_FMT
 #endif
 #elif NPY_BITSOF_CHAR == 64
 #ifndef NPY_INT64
@@ -578,6 +637,8 @@
 #    define PyInt64ArrType_Type PyByteArrType_Type
 #    define PyUInt64ScalarObject PyUByteScalarObject
 #    define PyUInt64ArrType_Type PyUByteArrType_Type
+#define NPY_INT64_FMT NPY_BYTE_FMT
+#define NPY_UINT64_FMT NPY_UBYTE_FMT
 #endif
 #elif NPY_BITSOF_CHAR == 128
 #ifndef NPY_INT128
@@ -589,6 +650,8 @@
 #    define PyInt128ArrType_Type PyByteArrType_Type
 #    define PyUInt128ScalarObject PyUByteScalarObject
 #    define PyUInt128ArrType_Type PyUByteArrType_Type
+#define NPY_INT128_FMT NPY_BYTE_FMT
+#define NPY_UINT128_FMT NPY_UBYTE_FMT
 #endif
 #endif
 
@@ -604,6 +667,8 @@
 #    define PyComplex32ScalarObject PyCDoubleScalarObject
 #    define PyFloat16ArrType_Type PyDoubleArrType_Type
 #    define PyComplex32ArrType_Type PyCDoubleArrType_Type
+#define NPY_FLOAT16_FMT NPY_DOUBLE_FMT
+#define NPY_COMPLEX32_FMT NPY_CDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_DOUBLE == 32
 #ifndef NPY_FLOAT32
@@ -615,6 +680,8 @@
 #    define PyComplex64ScalarObject PyCDoubleScalarObject
 #    define PyFloat32ArrType_Type PyDoubleArrType_Type
 #    define PyComplex64ArrType_Type PyCDoubleArrType_Type
+#define NPY_FLOAT32_FMT NPY_DOUBLE_FMT
+#define NPY_COMPLEX64_FMT NPY_CDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_DOUBLE == 64
 #ifndef NPY_FLOAT64
@@ -626,6 +693,8 @@
 #    define PyComplex128ScalarObject PyCDoubleScalarObject
 #    define PyFloat64ArrType_Type PyDoubleArrType_Type
 #    define PyComplex128ArrType_Type PyCDoubleArrType_Type
+#define NPY_FLOAT64_FMT NPY_DOUBLE_FMT
+#define NPY_COMPLEX128_FMT NPY_CDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_DOUBLE == 80
 #ifndef NPY_FLOAT80
@@ -637,6 +706,8 @@
 #    define PyComplex160ScalarObject PyCDoubleScalarObject
 #    define PyFloat80ArrType_Type PyDoubleArrType_Type
 #    define PyComplex160ArrType_Type PyCDoubleArrType_Type
+#define NPY_FLOAT80_FMT NPY_DOUBLE_FMT
+#define NPY_COMPLEX160_FMT NPY_CDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_DOUBLE == 96
 #ifndef NPY_FLOAT96
@@ -648,6 +719,8 @@
 #    define PyComplex192ScalarObject PyCDoubleScalarObject
 #    define PyFloat96ArrType_Type PyDoubleArrType_Type
 #    define PyComplex192ArrType_Type PyCDoubleArrType_Type
+#define NPY_FLOAT96_FMT NPY_DOUBLE_FMT
+#define NPY_COMPLEX192_FMT NPY_CDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_DOUBLE == 128
 #ifndef NPY_FLOAT128
@@ -659,6 +732,8 @@
 #    define PyComplex256ScalarObject PyCDoubleScalarObject
 #    define PyFloat128ArrType_Type PyDoubleArrType_Type
 #    define PyComplex256ArrType_Type PyCDoubleArrType_Type
+#define NPY_FLOAT128_FMT NPY_DOUBLE_FMT
+#define NPY_COMPLEX256_FMT NPY_CDOUBLE_FMT
 #endif
 #endif
 
@@ -674,6 +749,8 @@
 #    define PyComplex32ScalarObject PyCFloatScalarObject
 #    define PyFloat16ArrType_Type PyFloatArrType_Type
 #    define PyComplex32ArrType_Type PyCFloatArrType_Type
+#define NPY_FLOAT16_FMT NPY_FLOAT_FMT
+#define NPY_COMPLEX32_FMT NPY_CFLOAT_FMT
 #endif
 #elif NPY_BITSOF_FLOAT == 32
 #ifndef NPY_FLOAT32
@@ -685,6 +762,8 @@
 #    define PyComplex64ScalarObject PyCFloatScalarObject
 #    define PyFloat32ArrType_Type PyFloatArrType_Type
 #    define PyComplex64ArrType_Type PyCFloatArrType_Type
+#define NPY_FLOAT32_FMT NPY_FLOAT_FMT
+#define NPY_COMPLEX64_FMT NPY_CFLOAT_FMT
 #endif
 #elif NPY_BITSOF_FLOAT == 64
 #ifndef NPY_FLOAT64
@@ -696,6 +775,8 @@
 #    define PyComplex128ScalarObject PyCFloatScalarObject
 #    define PyFloat64ArrType_Type PyFloatArrType_Type
 #    define PyComplex128ArrType_Type PyCFloatArrType_Type
+#define NPY_FLOAT64_FMT NPY_FLOAT_FMT
+#define NPY_COMPLEX128_FMT NPY_CFLOAT_FMT
 #endif
 #elif NPY_BITSOF_FLOAT == 80
 #ifndef NPY_FLOAT80
@@ -707,6 +788,8 @@
 #    define PyComplex160ScalarObject PyCFloatScalarObject
 #    define PyFloat80ArrType_Type PyFloatArrType_Type
 #    define PyComplex160ArrType_Type PyCFloatArrType_Type
+#define NPY_FLOAT80_FMT NPY_FLOAT_FMT
+#define NPY_COMPLEX160_FMT NPY_CFLOAT_FMT
 #endif
 #elif NPY_BITSOF_FLOAT == 96
 #ifndef NPY_FLOAT96
@@ -718,6 +801,8 @@
 #    define PyComplex192ScalarObject PyCFloatScalarObject
 #    define PyFloat96ArrType_Type PyFloatArrType_Type
 #    define PyComplex192ArrType_Type PyCFloatArrType_Type
+#define NPY_FLOAT96_FMT NPY_FLOAT_FMT
+#define NPY_COMPLEX192_FMT NPY_CFLOAT_FMT
 #endif
 #elif NPY_BITSOF_FLOAT == 128
 #ifndef NPY_FLOAT128
@@ -729,6 +814,8 @@
 #    define PyComplex256ScalarObject PyCFloatScalarObject
 #    define PyFloat128ArrType_Type PyFloatArrType_Type
 #    define PyComplex256ArrType_Type PyCFloatArrType_Type
+#define NPY_FLOAT128_FMT NPY_FLOAT_FMT
+#define NPY_COMPLEX256_FMT NPY_CFLOAT_FMT
 #endif
 #endif
 
@@ -743,6 +830,8 @@
 #    define PyComplex32ScalarObject PyCLongDoubleScalarObject
 #    define PyFloat16ArrType_Type PyLongDoubleArrType_Type
 #    define PyComplex32ArrType_Type PyCLongDoubleArrType_Type
+#define NPY_FLOAT16_FMT NPY_LONGDOUBLE_FMT
+#define NPY_COMPLEX32_FMT NPY_CLONGDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 32
 #ifndef NPY_FLOAT32
@@ -754,6 +843,8 @@
 #    define PyComplex64ScalarObject PyCLongDoubleScalarObject
 #    define PyFloat32ArrType_Type PyLongDoubleArrType_Type
 #    define PyComplex64ArrType_Type PyCLongDoubleArrType_Type
+#define NPY_FLOAT32_FMT NPY_LONGDOUBLE_FMT
+#define NPY_COMPLEX64_FMT NPY_CLONGDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 64
 #ifndef NPY_FLOAT64
@@ -765,6 +856,8 @@
 #    define PyComplex128ScalarObject PyCLongDoubleScalarObject
 #    define PyFloat64ArrType_Type PyLongDoubleArrType_Type
 #    define PyComplex128ArrType_Type PyCLongDoubleArrType_Type
+#define NPY_FLOAT64_FMT NPY_LONGDOUBLE_FMT
+#define NPY_COMPLEX128_FMT NPY_CLONGDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 80
 #ifndef NPY_FLOAT80
@@ -776,6 +869,8 @@
 #    define PyComplex160ScalarObject PyCLongDoubleScalarObject
 #    define PyFloat80ArrType_Type PyLongDoubleArrType_Type
 #    define PyComplex160ArrType_Type PyCLongDoubleArrType_Type
+#define NPY_FLOAT80_FMT NPY_LONGDOUBLE_FMT
+#define NPY_COMPLEX160_FMT NPY_CLONGDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 96
 #ifndef NPY_FLOAT96
@@ -787,6 +882,8 @@
 #    define PyComplex192ScalarObject PyCLongDoubleScalarObject
 #    define PyFloat96ArrType_Type PyLongDoubleArrType_Type
 #    define PyComplex192ArrType_Type PyCLongDoubleArrType_Type
+#define NPY_FLOAT96_FMT NPY_LONGDOUBLE_FMT
+#define NPY_COMPLEX192_FMT NPY_CLONGDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 128
 #ifndef NPY_FLOAT128
@@ -798,6 +895,8 @@
 #    define PyComplex256ScalarObject PyCLongDoubleScalarObject
 #    define PyFloat128ArrType_Type PyLongDoubleArrType_Type
 #    define PyComplex256ArrType_Type PyCLongDoubleArrType_Type
+#define NPY_FLOAT128_FMT NPY_LONGDOUBLE_FMT
+#define NPY_COMPLEX256_FMT NPY_CLONGDOUBLE_FMT
 #endif
 #elif NPY_BITSOF_LONGDOUBLE == 256
 #define NPY_FLOAT256 NPY_LONGDOUBLE
@@ -808,6 +907,8 @@
 #    define PyComplex512ScalarObject PyCLongDoubleScalarObject
 #    define PyFloat256ArrType_Type PyLongDoubleArrType_Type
 #    define PyComplex512ArrType_Type PyCLongDoubleArrType_Type
+#define NPY_FLOAT256_FMT NPY_LONGDOUBLE_FMT
+#define NPY_COMPLEX512_FMT NPY_CLONGDOUBLE_FMT
 #endif
 
         /* End of typedefs for numarray style bit-width names */



From numpy-svn at scipy.org  Sat Oct  7 04:49:20 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat,  7 Oct 2006 03:49:20 -0500 (CDT)
Subject: [Numpy-svn] r3283 - in trunk/numpy/f2py/lib: . parser src
Message-ID: <20061007084920.7ACF539C13F@new.scipy.org>

Author: pearu
Date: 2006-10-07 03:49:08 -0500 (Sat, 07 Oct 2006)
New Revision: 3283

Added:
   trunk/numpy/f2py/lib/test_scalar_in_out.py
Removed:
   trunk/numpy/f2py/lib/python_wrapper.py
Modified:
   trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c
   trunk/numpy/f2py/lib/src/pyobj_to_double.c
   trunk/numpy/f2py/lib/src/pyobj_to_long.c
   trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c
Log:
F2PY G3: completed test site for int,float,complex scalar support. Fixed bugs.

Modified: trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
===================================================================
--- trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-07 08:49:08 UTC (rev 3283)
@@ -12,7 +12,6 @@
     dtype = ctype.upper()
     cls = 'Int'+ctype[7:]
     return '''\
-/* depends: SCALARS_IN_BITS2.cpp */
 static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
   PyObject* obj = PyArrayScalar_New(%(cls)s);
   if (obj==NULL) /* TODO: set exception */ return NULL;
@@ -56,56 +55,19 @@
 }
 '''
 
+
+
 def pyobj_to_npy_int(ctype):
+    Cls = ctype[4].upper()+ctype[5:]
     ctype_bits = int(ctype[7:])
-    return '''
-/* depends: pyobj_to_long.c, pyobj_to_npy_longlong.c */
-#if NPY_BITSOF_LONG == %(ctype_bits)s
-#define pyobj_to_%(ctype)s pyobj_to_long
-#else
-#if NPY_BITSOF_LONG > %(ctype_bits)s
-static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
-  long tmp;
-  if (pyobj_to_long(obj,&tmp)) {
-    *value = (%(ctype)s)tmp;
-    return 1;
-  }
-  return 0;
-}
-#else
-static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
-  npy_longlong tmp;
-  if (pyobj_to_npy_longlong(obj,&tmp)) {
-    *value = (%(ctype)s)tmp;
-    return 1;
-  }
-  return 0;
-}
-#endif
-#endif
-''' % (locals())
+    CTYPE = ctype.upper()
+    return capi_code_template_scalar % (locals())
 
 def pyobj_to_npy_float(ctype):
+    Cls = ctype[4].upper()+ctype[5:]
     ctype_bits = int(ctype[9:])
-    return '''
-/* depends: pyobj_to_double.c */
-#if NPY_BITSOF_DOUBLE == %(ctype_bits)s
-#define pyobj_to_%(ctype)s pyobj_to_double
-#else
-#if NPY_BITSOF_DOUBLE > %(ctype_bits)s
-static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
-  double tmp;
-  if (pyobj_to_double(obj,&tmp)) {
-    *value = (%(ctype)s)tmp;
-    return 1;
-  }
-  return 0;
-}
-#else
-#error, "NOTIMPLEMENTED pyobj_to_%(ctype)s"
-#endif
-#endif
-''' % (locals())
+    CTYPE = ctype.upper()
+    return capi_code_template_scalar % (locals())
 
 def pyobj_to_npy_complex(ctype):
     ctype_bits = int(ctype[11:])

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-07 08:49:08 UTC (rev 3283)
@@ -240,6 +240,7 @@
         return True
 
     def is_intent_inout(self):
+        if not self.intent: return False
         if 'INOUT' in self.intent:
             if 'IN' in self.intent or 'HIDE' in self.intent or 'INPLACE' in self.intent:
                 self.warning('INOUT ignored in INPUT(%s)' % (', '.join(self.intent)))
@@ -248,19 +249,20 @@
         return False
 
     def is_intent_hide(self):
+        if not self.intent: return False
         if 'HIDE' in self.intent: return True
         if 'OUT' in self.intent:
             return 'IN' not in self.intent and 'INPLACE' not in self.intent and 'INOUT' not in self.intent
         return False
 
-    def is_intent_inplace(self): return 'INPLACE' in self.intent
-    def is_intent_out(self): return 'OUT' in self.intent
-    def is_intent_c(self): return 'C' in self.intent
-    def is_intent_cache(self): return 'CACHE' in self.intent
-    def is_intent_copy(self): return 'COPY' in self.intent
-    def is_intent_overwrite(self): return 'OVERWRITE' in self.intent
-    def is_intent_callback(self): return 'CALLBACK' in self.intent
-    def is_intent_aux(self): return 'AUX' in self.intent
+    def is_intent_inplace(self): return self.intent and 'INPLACE' in self.intent
+    def is_intent_out(self): return  self.intent and 'OUT' in self.intent
+    def is_intent_c(self): return  self.intent and 'C' in self.intent
+    def is_intent_cache(self): return  self.intent and 'CACHE' in self.intent
+    def is_intent_copy(self): return  self.intent and 'COPY' in self.intent
+    def is_intent_overwrite(self): return  self.intent and 'OVERWRITE' in self.intent
+    def is_intent_callback(self): return  self.intent and 'CALLBACK' in self.intent
+    def is_intent_aux(self): return  self.intent and 'AUX' in self.intent
 
     def is_private(self):
         if 'PUBLIC' in self.attributes: return False

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-07 08:49:08 UTC (rev 3283)
@@ -400,7 +400,7 @@
 
     def get_byte_size(self):
         length, kind = self.selector
-        if length: return 2*int(length)
+        if length: return int(length)
         if kind: return 2*int(kind)
         return 2*self.default_kind
 
@@ -412,13 +412,17 @@
     def get_c_type(self):
         return 'npy_complex%s' % (self.get_bit_size())
 
+    def get_part_typedecl(self):
+        bz = self.get_byte_size()/2
+        return Real(self.parent, self.item.copy('REAL*%s' % (bz)))
+        
 class DoubleComplex(TypeDeclarationStatement):
     # not in standard
     match = re.compile(r'double\s*complex\b',re.I).match
     default_kind = 8
 
     def get_byte_size(self):
-        return 2 * self.default_kind
+        return 2*self.default_kind
 
     def get_zero_value(self):
         return '(0.0D0,0.0D0)'

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-07 08:49:08 UTC (rev 3283)
@@ -22,25 +22,147 @@
     """
     Fortran intrinsic type hooks.
     """
+
+    capi_code_template_scalar = '''
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
+  PyObject* obj = PyArrayScalar_New(%(Cls)s);
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_from_%(ctype)s(value=%%"%(CTYPE)s_FMT")\\n",*value);
+#endif
+  if (obj==NULL) /* TODO: set exception */ return NULL;
+  PyArrayScalar_ASSIGN(obj,%(Cls)s,*value);
+  return obj;
+}
+
+static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (obj==NULL) ;
+  else if (PyArray_IsScalar(obj,%(Cls)s)) {
+    *value = PyArrayScalar_VAL(obj,%(Cls)s);
+    return_value = 1;
+  }
+  else if (PySequence_Check(obj)) {
+    if (PySequence_Size(obj)==1)
+      return_value = pyobj_to_%(ctype)s(PySequence_GetItem(obj,0),value);
+  } else {
+    PyObject* sc = Py%(Cls)sArrType_Type.tp_new(
+      &Py%(Cls)sArrType_Type,Py_BuildValue("(O)",obj),NULL);
+    if (sc==NULL) ;
+    else if (PyArray_IsScalar(sc, Generic))
+      return_value = pyobj_to_%(ctype)s(sc,value);
+    else
+      return_value = pyobj_to_%(ctype)s(PyArray_ScalarFromObject(sc),value);
+  }
+  if (!return_value && !PyErr_Occurred()) {
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C %(ctype)s"));
+    PyErr_SetObject(PyExc_TypeError,r);
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  if (PyErr_Occurred()) {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s: PyErr_Occurred()=%%p\\n", PyErr_Occurred());
+  } else {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s: value=%%"%(CTYPE)s_FMT"\\n", *value);
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+  }
+#endif
+  return return_value;
+}
+'''
+
+    capi_code_template_complex_scalar = '''
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
+  PyObject* obj = PyArrayScalar_New(%(Cls)s);
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_from_%(ctype)s(value=(%%"%(FCTYPE)s_FMT",%%"%(FCTYPE)s_FMT"))\\n",value->real, value->imag);
+#endif
+  if (obj==NULL) /* TODO: set exception */ return NULL;
+  PyArrayScalar_ASSIGN(obj,%(Cls)s,*value);
+  return obj;
+}
+
+static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (obj==NULL) ;
+  else if (PyArray_IsScalar(obj,%(Cls)s)) {
+    value->real = PyArrayScalar_VAL(obj,%(Cls)s).real;
+    value->imag = PyArrayScalar_VAL(obj,%(Cls)s).imag;
+    return_value = 1;
+  }
+  else if (PySequence_Check(obj)) {
+    if (PySequence_Size(obj)==1)
+      return_value = pyobj_to_%(ctype)s(PySequence_GetItem(obj,0),value);
+    else if (PySequence_Size(obj)==2) {
+      return_value = pyobj_to_%(fctype)s(PySequence_GetItem(obj,0),&(value->real))
+                     && pyobj_to_%(fctype)s(PySequence_GetItem(obj,1),&(value->imag));
+    }
+  } else {
+    PyObject* sc = Py%(Cls)sArrType_Type.tp_new(
+      &Py%(Cls)sArrType_Type,Py_BuildValue("(O)",obj),NULL);
+    if (sc==NULL) ;
+    else if (PyArray_IsScalar(sc, Generic))
+      return_value = pyobj_to_%(ctype)s(sc,value);
+    else
+      return_value = pyobj_to_%(ctype)s(PyArray_ScalarFromObject(sc),value);
+  }
+  if (!return_value && !PyErr_Occurred()) {
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C %(ctype)s"));
+    PyErr_SetObject(PyExc_TypeError,r);
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  if (PyErr_Occurred()) {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s: PyErr_Occurred()=%%p\\n", PyErr_Occurred());
+  } else {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s: value=(%%"%(FCTYPE)s_FMT",%%"%(FCTYPE)s_FMT")\\n",
+      value->real, value->imag);
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+  }
+#endif
+  return return_value;
+}
+'''
+ 
     _defined = []
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
         self.name = name = typedecl.name
-        if name in self._defined:
+        self.ctype = ctype = typedecl.get_c_type()
+        if ctype in self._defined:
             return
-        self._defined.append(name)
-        self.info('Generating interface for %s: %s' % (typedecl.__class__, name))
+        self._defined.append(ctype)
+        self.info('Generating interface for %s: %s' % (typedecl.__class__, ctype))
 
-        ctype = typedecl.get_c_type()
-
         if ctype.startswith('npy_'):
-            WrapperCCode(parent, 'pyobj_from_%s' % (ctype))
-            WrapperCCode(parent, 'pyobj_to_%s' % (ctype))
+            self.Cls = ctype[4].upper() + ctype[5:] 
+            if ctype.startswith('npy_int') or ctype.startswith('npy_float'):
+                self.capi_code_template = self.capi_code_template_scalar
+            elif ctype.startswith('npy_complex'):
+                PythonCAPIIntrinsicType(parent, typedecl.get_part_typedecl())
+                bits = int(ctype[11:])
+                self.fctype = 'npy_float%s' % (bits/2)
+                self.capi_code_template = self.capi_code_template_complex_scalar
+            parent.apply_templates(self)
             return
-        
-        if not ctype.startswith('f2py_type_'):
-            raise NotImplementedError,`name,ctype`
-        return
+        raise NotImplementedError,`name,ctype`
 
 class PythonCAPIDerivedType(WrapperBase):
     """
@@ -314,6 +436,4 @@
             self.use_stmt_list.append('use %s' % (typedecl.parent.name))
 
         parent.apply_templates(self)
-
-
         return

Deleted: trunk/numpy/f2py/lib/python_wrapper.py
===================================================================
--- trunk/numpy/f2py/lib/python_wrapper.py	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/python_wrapper.py	2006-10-07 08:49:08 UTC (rev 3283)
@@ -1,687 +0,0 @@
-
-__all__ = ['TypeWrapper']
-
-import re
-import os
-import sys
-
-from parser.api import *
-
-from wrapper_base import *
-
-class PythonWrapperModule(WrapperBase):
-
-    main_template = '''\
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-#include "Python.h"
-
-#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API
-#include "numpy/arrayobject.h"
-#include "numpy/arrayscalars.h"
-
-%(header_list)s
-
-%(typedef_list)s
-
-%(extern_list)s
-
-%(c_code_list)s
-
-%(capi_code_list)s
-
-%(objdecl_list)s
-
-static PyObject *f2py_module;
-
-static PyMethodDef f2py_module_methods[] = {
-  %(module_method_list)s
-  {NULL,NULL,0,NULL}
-};
-
-PyMODINIT_FUNC init%(modulename)s(void) {
-  f2py_module = Py_InitModule("%(modulename)s", f2py_module_methods);
-  import_array();
-  %(module_init_list)s
-  if (PyErr_Occurred()) {
-    PyErr_SetString(PyExc_ImportError, "can\'t initialize module %(modulename)s");
-    return;
-  }
-}
-#ifdef __cplusplus
-}
-#endif
-'''
-
-    main_fortran_template = '''\
-! -*- f90 -*-
-%(fortran_code_list)s
-'''
-    def __init__(self, modulename):
-        WrapperBase.__init__(self)
-        self.modulename = modulename
-        
-        self.header_list = []
-        self.typedef_list = []
-        self.extern_list = []
-        self.objdecl_list = []
-        self.c_code_list = []
-        self.capi_code_list = []
-
-        self.module_method_list = []
-        self.module_init_list = []
-
-        self.fortran_code_list = []
-
-        self.list_names = ['header', 'typedef', 'extern', 'objdecl',
-                           'c_code','capi_code','module_method','module_init',
-                           'fortran_code']
-
-        return
-
-    def add(self, block):
-        if isinstance(block, BeginSource):
-            for name, moduleblock in block.a.module.items():
-                self.add(moduleblock)
-            #for name, subblock in block.a.external_subprogram.items():
-            #    self.add(subblock)
-        elif isinstance(block, (Subroutine, Function)):
-            self.info('Generating interface for %s' % (block.name))
-            f = PythonCAPIFunction(self, block)
-            f.fill()
-        elif isinstance(block, Module):
-            for name,declblock in block.a.type_decls.items():
-                self.add(declblock)
-        elif isinstance(block, TypeDecl):
-            PythonCAPIDerivedType(self, block)
-        elif isinstance(block, tuple(declaration_type_spec)):
-            PythonCAPIIntrinsicType(self, block)
-        else:
-            raise NotImplementedError,`block.__class__.__name__`
-        return
-    
-    def c_code(self):
-        return self.apply_attributes(self.main_template)
-    def fortran_code(self):
-        return self.apply_attributes(self.main_fortran_template)
-
-    def add_subroutine(self, block):
-        raise
-        f = PythonCAPIFunction(self, block)
-        f.fill()
-        return
-
-
-
-        
-class PythonCAPIIntrinsicType(WrapperBase):
-    """
-    Fortran intrinsic type hooks.
-    """
-    _defined_types = []
-    def __init__(self, parent, typedecl):
-        WrapperBase.__init__(self)
-        self.name = name = typedecl.name
-        if name in self._defined_types:
-            return
-        self._defined_types.append(name)
-
-        self.ctype = ctype = typedecl.get_c_type()
-
-        if ctype.startswith('npy_'):
-            WrapperCCode(parent, 'pyobj_from_%s' % (ctype))
-            return
-        
-        if not ctype.startswith('f2py_type_'):
-            raise NotImplementedError,`name,ctype`
-
-        for n in parent.list_names:
-            l = getattr(parent,n + '_list')
-            l.append(self.apply_attributes(getattr(self, n+'_template','')))
-
-        return
-
-class PythonCAPIDerivedType(WrapperBase):
-    """
-    Fortran 90 derived type hooks.
-    """
-
-    header_template = '''\
-#define %(oname)sObject_Check(obj) \\
-    PyObject_TypeCheck((PyObject*)obj, &%(oname)sType)
-#define %(init_func)s_f \\
-    F_FUNC(%(init_func)s,%(INIT_FUNC)s)
-'''
-
-    typedef_template = '''\
-typedef void * %(ctype)s;
-typedef struct {
-  PyObject_HEAD
-  %(ptrstruct_list)s
-  %(ctype)s data;
-} %(oname)sObject;
-'''
-
-    extern_template = '''\
-static PyTypeObject %(oname)sType;
-'''
-
-    objdecl_template = '''\
-static PyMethodDef %(oname)s_methods[] = {
-    %(type_method_list)s
-    {NULL}  /* Sentinel */
-};
-
-static PyGetSetDef %(oname)s_getseters[] = {
-    %(type_getseters_list)s
-    {NULL}  /* Sentinel */
-};
-
-static PyTypeObject %(oname)sType = {
-    PyObject_HEAD_INIT(NULL)
-    0,                         /*ob_size*/
-    "%(name)s",                /*tp_name*/
-    sizeof(%(oname)sObject),    /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    (destructor)%(oname)s_dealloc, /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    %(oname)s_repr,            /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
-    "Fortran derived type %(name)s objects",        /* tp_doc */
-    0,		               /* tp_traverse */
-    0,		               /* tp_clear */
-    0,		               /* tp_richcompare */
-    0,		               /* tp_weaklistoffset */
-    0,		               /* tp_iter */
-    0,		               /* tp_iternext */
-    %(oname)s_methods,          /* tp_methods */
-    0 /*%(oname)s_members*/,    /* tp_members */
-    %(oname)s_getseters,       /* tp_getset */
-    0,                         /* tp_base */
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
-    0,                         /* tp_descr_set */
-    0,                         /* tp_dictoffset */
-    (initproc)%(oname)s_init,      /* tp_init */
-    0,                         /* tp_alloc */
-    %(oname)s_new,                 /* tp_new */
-};
-'''
-
-    module_init_template = '''\
-if (PyType_Ready(&%(oname)sType) < 0)
-  return;
-PyModule_AddObject(f2py_module, "%(name)s",
-                                (PyObject *)&%(oname)sType);
-'''
-
-    c_code_template = '''\
-static void %(init_func)s_c(
-               %(init_func_c_arg_clist)s) {
-  %(init_func_c_body_list)s
-}
-'''
-
-    capi_code_template = '''\
-static void %(oname)s_dealloc(%(oname)sObject* self) {
-  if (self->data)
-    PyMem_Free(self->data);
-  self->ob_type->tp_free((PyObject*)self);
-}
-
-static int pyobj_to_%(ctype)s(PyObject *obj,
-                              %(ctype)s* value_ptr) {
-  int return_value = 0;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
-#endif
-  if (%(oname)sObject_Check(obj)) {
-    if (!memcpy(value_ptr,((%(oname)sObject *)obj)->data, %(byte_size)s)) {
-      PyErr_SetString(PyExc_MemoryError,
-         "failed to copy %(name)s instance memory to %(ctype)s object.");
-    } else {
-      return_value = 1;
-    }
-  }
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
-#endif
-  return return_value;
-}
-
-static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value_ptr) {
-  %(oname)sObject* obj = (%(oname)sObject*)(%(oname)sType.tp_alloc(&%(oname)sType, 0));
-  if (obj == NULL)
-    return NULL;
-  obj->data = PyMem_Malloc(%(byte_size)s);
-  if (obj->data == NULL) {
-    Py_DECREF(obj);
-    return PyErr_NoMemory();
-  }
-  if (value_ptr) {
-    if (!memcpy(obj->data, value_ptr, %(byte_size)s)) {
-      PyErr_SetString(PyExc_MemoryError,
-         "failed to copy %(ctype)s object memory to %(name)s instance.");
-    }
-  }
-  %(init_func)s_f(%(init_func)s_c, obj, obj->data);
-  return (PyObject*)obj;
-}
-
-static PyObject * %(oname)s_new(PyTypeObject *type,
-                                PyObject *args, PyObject *kwds)
-{
-  return pyobj_from_%(ctype)s(NULL);
-}
-
-static int %(oname)s_init(%(oname)sObject *self,
-                          PyObject *capi_args, PyObject *capi_kwds)
-{
-   int return_value = 0;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"%(oname)s_init()\\n");
-#endif
-   if (!PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
-                                   %(attr_init_clist)s))
-      return_value = -1;                             
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"%(oname)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
-#endif
-   return return_value;
-}
-
-static PyObject * %(oname)s_as_tuple(%(oname)sObject * self) {
-  return Py_BuildValue("%(as_tuple_format_elist)s"
-                        %(as_tuple_arg_clist)s);
-}
-
-static PyObject * %(oname)s_repr(PyObject * self) {
-  PyObject* r = PyString_FromString("%(name)s(");
-  PyString_ConcatAndDel(&r, PyObject_Repr(%(oname)s_as_tuple((%(oname)sObject*)self)));
-  PyString_ConcatAndDel(&r, PyString_FromString(")"));
-  return r;
-}
-
-%(getset_func_list)s
-'''
-
-    fortran_code_template = '''\
-      subroutine %(init_func)s(init_func_c, self, obj)
-      %(use_stmt_list)s
-      external init_func_c
-!     self is %(oname)sObject
-      external self
-      %(ftype)s obj
-      call init_func_c(%(init_func_f_arg_clist)s)
-      end
-'''
-
-    #module_method_template = ''''''
-
-    _defined_types = []
-    def __init__(self, parent, typedecl):
-        WrapperBase.__init__(self)
-        name = typedecl.name
-        if name in self._defined_types:
-            return
-        self._defined_types.append(name)
-
-        self.name = name
-        self.oname = oname = 'f2py_' + name
-        self.ctype = typedecl.get_c_type()
-        self.ctype_ptrs = self.ctype + '_ptrs'
-        self.ftype = typedecl.get_f_type()
-        self.byte_size = byte_size = typedecl.get_bit_size() / CHAR_BIT
-        WrapperCPPMacro(parent, 'F_FUNC')
-
-        self.init_func_f_arg_list = ['self']
-        self.init_func_c_arg_list = ['%sObject *self' % (self.oname)]
-        self.init_func_c_body_list = []
-        self.ptrstruct_list = []
-        self.attr_decl_list = []
-        self.attr_format_list = []
-        self.attr_init_list = []
-        self.as_tuple_format_list = []
-        self.as_tuple_arg_list = []
-        self.getset_func_list = []
-        self.type_getseters_list = []
-        for n in typedecl.a.component_names:
-            v = typedecl.a.components[n]
-            t = v.get_typedecl()
-            ct = t.get_c_type()
-            on = 'f2py_' + t.name
-            parent.add(t)
-            self.ptrstruct_list.append('%s* %s_ptr;' % (ct, n))
-            self.init_func_f_arg_list.append('obj %% %s' % (n))
-            self.init_func_c_arg_list.append('\n%s * %s_ptr' % (ct, n))
-            self.init_func_c_body_list.append('''\
-if (!((void*)%(n)s_ptr >= self->data
-      && (void*)%(n)s_ptr < self->data + %(byte_size)s ))
-  fprintf(stderr,"INCONSISTENCY IN %(name)s WRAPPER: "
-                 "self->data=%%p <= %(n)s_ptr=%%p < self->data+%(byte_size)s=%%p\\n",
-                 self->data, %(n)s_ptr, self->data + %(byte_size)s);
-self->%(n)s_ptr = %(n)s_ptr;
-''' % (locals()))
-            self.attr_format_list.append('O&')
-            WrapperCCode(parent, 'pyobj_to_%s' % (ct))
-            self.attr_init_list.append('\npyobj_to_%s, self->%s_ptr' % (ct,n))
-            WrapperCCode(parent, 'pyobj_from_%s' % (ct))
-            self.as_tuple_format_list.append('O&')
-            self.as_tuple_arg_list.append('\npyobj_from_%s, self->%s_ptr' % (ct, n))
-            self.getset_func_list.append('''\
-static PyObject * %(oname)s_get_%(n)s(%(oname)sObject *self,
-                                      void *closure) {
-  return pyobj_from_%(ct)s(self->%(n)s_ptr);
-}
-static int %(oname)s_set_%(n)s(%(oname)sObject *self,
-                               PyObject *value, void *closure)
-{
-  if (value == NULL) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Cannot delete %(name)s attribute %(n)s");
-    return -1;
-  }
-  if (pyobj_to_%(ct)s(value, self->%(n)s_ptr))
-    return 0;
-  return -1;
-}
-''' % (locals()))
-            self.type_getseters_list.append('{"%(n)s",(getter)%(oname)s_get_%(n)s, (setter)%(oname)s_set_%(n)s,\n "component %(n)s",NULL},' % (locals()))
-        if self.attr_init_list: self.attr_init_list.insert(0,'')
-        if self.as_tuple_arg_list: self.as_tuple_arg_list.insert(0,'')
-        self.init_func = self.ctype + '_init'
-        self.INIT_FUNC = self.init_func.upper()
-
-        self.type_method_list = []
-        self.type_method_list.append('{"as_tuple",(PyCFunction)%(oname)s_as_tuple,METH_NOARGS,\n "Return %(name)s components as tuple."},' % (self.__dict__))
-        self.cname = typedecl.get_c_name()
-
-        self.use_stmt_list = []
-        if isinstance(typedecl.parent, Module):
-            self.use_stmt_list.append('use %s' % (typedecl.parent.name))
-
-        for n in parent.list_names:
-            l = getattr(parent,n + '_list')
-            l.append(self.apply_attributes(getattr(self, n+'_template','')))
-        return
-
-class PythonCAPIFunction(WrapperBase):
-    capi_function_template = '''
-static char f2py_doc_%(function_name)s[] = "%(function_doc)s";
-static PyObject* f2py_%(function_name)s(PyObject *capi_self, PyObject *capi_args, PyObject *capi_keywds) {
-  PyObject * volatile capi_buildvalue = NULL;
-  volatile int f2py_success = 1;
-  %(decl_list)s
-  static char *capi_kwlist[] = {%(keyword_clist+optkw_clist+extrakw_clist+["NULL"])s};
-  if (!PyArg_ParseTupleAndKeywords(capi_args,capi_keywds,
-                                   "%(pyarg_format_elist)s",
-                                   %(["capi_kwlist"]+pyarg_obj_clist)s))
-     return NULL;
-  %(frompyobj_list)s
-  %(call_list)s
-  f2py_success = !PyErr_Occurred();
-  if (f2py_success) {
-    %(pyobjfrom_list)s
-    capi_buildvalue = Py_BuildValue(%(buildvalue_clist)s);
-    %(clean_pyobjfrom_list)s
-  }
-  %(clean_frompyobj_list)s
-  return capi_buildvalue;
-}
-'''    
-
-    pymethoddef_template = '''\
-{"%(function_name)s", (PyCFunction)f2py_%(function_name)s, METH_VARARGS | METH_KEYWORDS, f2py_doc_%(function_name)s},\
-'''
-
-    cppmacro_template = '''\
-#define %(function_name)s_f F_FUNC(%(function_name)s,%(FUNCTION_NAME)s)
-'''
-
-    extdef_template = '''\
-extern void %(function_name)s_f();\
-'''
-
-    def __init__(self, parent, block):
-        WrapperBase.__init__(self)
-        self.parent = parent
-        self.block = block
-        self.function_name = block.name
-        self.FUNCTION_NAME = self.function_name.upper()
-        self.function_doc = ''
-        self.args_list = block.args
-        self.decl_list = []
-        self.keyword_list = []
-        self.optkw_list = []
-        self.extrakw_list = []
-        self.frompyobj_list = []
-        self.call_list = []
-        self.pyobjfrom_list = []
-        self.buildvalue_list = []
-        self.clean_pyobjfrom_list = []
-        self.clean_frompyobj_list = []
-        self.pyarg_format_list = []
-        self.pyarg_obj_list = []
-        return
-
-    def fill(self):
-        for argname in self.args_list:
-            var = self.block.a.variables[argname]
-            argwrap = ArgumentWrapper(self, var)
-            argwrap.fill()
-        self.call_list.append('%s_f(%s);' % (self.function_name, ', '.join(['&'+a for a in self.args_list])))
-        if not self.buildvalue_list:
-            self.buildvalue_list.append('""')
-        self.parent.capi_function_list.append(self.apply_attributes(self.capi_function_template))
-        self.parent.module_method_list.append(self.apply_attributes(self.pymethoddef_template))
-        self.parent.extern_list.append(self.apply_attributes(self.extdef_template))
-        self.parent.add_cppmacro('F_FUNC')
-        self.parent.cppmacro_list.append(self.apply_attributes(self.cppmacro_template))
-        return
-
-class ArgumentWrapper(WrapperBase):
-
-    objdecl_template = '%(ctype)s %(name)s;'
-    pyarg_obj_template = '\npyobj_to_%(ctype)s, &%(name)s'
-
-    def __init__(self, parent, variable):
-        WrapperBase.__init__(self)
-        self.parent = parent
-        self.grand_parent = parent.parent
-        self.variable = variable
-        self.typedecl = variable.typedecl
-        self.name = variable.name
-        self.ctype = self.typedecl.get_c_type()
-        
-    def fill(self):
-        typename = self.grand_parent.add_type(self.typedecl)
-        self.parent.decl_list.append(self.apply_attributes(self.objdecl_template))
-        
-        self.parent.pyarg_obj_list.append(self.apply_attributes(self.pyarg_obj_template))
-        self.parent.pyarg_format_list.append('O&')
-        self.parent.keyword_list.append('"%s"' % (self.name))
-
-        return
-
-
-class TypeDecl2(WrapperBase):
-    cppmacro_template = '''\
-#define initialize_%(typename)s_interface F_FUNC(initialize_%(typename)s_interface_f,INITIALIZE_%(TYPENAME)s_INTERFACE_F)\
-'''
-    typedef_template = '''\
-typedef struct { char data[%(byte_size)s]; } %(ctype)s;
-typedef %(ctype)s (*create_%(typename)s_functype)(void);
-typedef void (*initialize_%(typename)s_interface_functype)(create_%(typename)s_functype);\
-'''
-    objdecl_template = '''\
-static create_%(typename)s_functype create_%(typename)s_object;
-'''
-    funcdef_template = '''\
-static void initialize_%(typename)s_interface_c(create_%(typename)s_functype create_object_f) {
-  create_%(typename)s_object = create_object_f;
-}
-'''
-    extdef_template = '''\
-extern void initialize_%(typename)s_interface(initialize_%(typename)s_interface_functype);\
-'''
-    initcall_template = '''\
-initialize_%(typename)s_interface(initialize_%(typename)s_interface_c);\
-'''
-    fortran_code_template = '''\
-       function create_%(typename)s_object_f() result (obj)
-         %(typedecl_list)s
-         %(typedecl)s obj
-!        %(initexpr)s
-       end
-       subroutine initialize_%(typename)s_interface_f(init_c)
-         external create_%(typename)s_object_f
-         call init_c(create_%(typename)s_object_f)
-       end
-'''
-    pyobj_to_type_template = '''
-    static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
-      if (PyTuple_Check(obj)) {
-        return 0;
-      }
-    return 0;
-    }
-'''
-
-    def __init__(self, parent, typedecl):
-        WrapperBase.__init__(self)
-        self.parent = parent
-        self.typedecl = typedecl.astypedecl()
-        self.typedecl_list = []
-        self.ctype = self.typedecl.get_c_type()
-        self.byte_size = self.typedecl.get_byte_size()
-        self.typename = self.typedecl.name.lower()
-        self.TYPENAME = self.typedecl.name.upper()
-        self.initexpr = self.typedecl.assign_expression('obj',self.typedecl.get_zero_value())
-        return
-
-    def fill(self):
-        ctype =self.typedecl.get_c_type()
-        if ctype.startswith('npy_') or ctype.startswith('f2py_string'):
-            # wrappers are defined via pyobj_to_* functions
-            self.parent.add_c_function('pyobj_to_%s' % (self.ctype))
-            return
-        if ctype.startswith('f2py_type'):
-            return
-            self.parent.add_typedef(ctype,
-                                    self.apply_attributes('typedef struct { char data[%(byte_size)s]; } %(ctype)s;'))
-            self.parent.add_c_function(self.apply_attributes('pyobj_to_%(ctype)s'),
-                                       self.apply_attributes(self.pyobj_to_type_template)
-                                       )
-        else:
-            self.parent.typedef_list.append(self.apply_attributes(self.typedef_template))
-            self.parent.objdecl_list.append(self.apply_attributes(self.objdecl_template))
-            self.parent.c_function_list.append(self.apply_attributes(self.funcdef_template))
-            self.parent.extern_list.append(self.apply_attributes(self.extdef_template))
-            self.parent.initialize_interface_list.append(self.apply_attributes(self.initcall_template))
-            self.parent.fortran_code_list.append(self.apply_attributes(self.fortran_code_template))
-            self.parent.add_cppmacro('F_FUNC')
-            self.parent.cppmacro_list.append(self.apply_attributes(self.cppmacro_template))
-        return
-
-
-
-
-if __name__ == '__main__':
-
-    foo_code = """! -*- f90 -*-
-      module rat
-        type info
-          complex*8 flag
-        end type info
-        type rational
-          !integer n,d
-          type(info) i
-        end type rational
-      end module rat
-      subroutine foo(a,b)
-        use rat
-        integer a
-        !character*5 b
-        type(rational) b
-        print*,'a=',a,b
-      end
-"""
-
-    wm = PythonWrapperModule('foo')
-    wm.add(parse(foo_code))
-    #wm.add_fortran_code(foo_code)
-    #wm.add_subroutine(str2stmt(foo_code))
-    #print wm.c_code()
-
-    c_code = wm.c_code()
-    f_code = wm.fortran_code()
-
-    f = open('foomodule.c','w')
-    f.write(c_code)
-    f.close()
-    f = open('foo.f','w')
-    f.write(foo_code)
-    f.close()
-    f = open('foo_wrap.f','w')
-    f.write(f_code)
-    f.close()
-    f = open('foo_setup.py','w')
-    f.write('''\
-def configuration(parent_package='',top_path=None):
-    from numpy.distutils.misc_util import Configuration
-    config = Configuration('foopack',parent_package,top_path)
-    config.add_library('foolib',
-                       sources = ['foo.f','foo_wrap.f'])
-    config.add_extension('foo',
-                         sources=['foomodule.c'],
-                         libraries = ['foolib'],
-                         define_macros = [('F2PY_DEBUG_PYOBJ_TOFROM',None)]
-                         )
-    return config
-if __name__ == '__main__':
-    from numpy.distutils.core import setup
-    setup(configuration=configuration)
-''')
-    f.close()
-    #print get_char_bit()
-    os.system('python foo_setup.py config_fc --fcompiler=gnu95 build build_ext --inplace')
-    import foo
-    #print foo.__doc__
-    #print dir(foo)
-    #print foo.info.__doc__
-    #print foo.rational.__doc__
-    #print dir(foo.rational)
-    i = foo.info(2)
-    print 'i=',i
-    #print i #,i.as_tuple()
-    #print 'i.flag=',i.flag
-    r = foo.rational(2)
-    print r
-    j = r.i
-    print 'r.i.flag=',(r.i).flag
-    print 'j.flag=',type(j.flag)
-    #print 'r=',r
-    sys.exit()
-    n,d,ii = r.as_tuple()
-    n += 1
-    print n,d
-    print r
-    #foo.foo(2,r)
-    print r.n, r.d
-    r.n = 5
-    print r
-    r.n -= 1
-    print r

Modified: trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c	2006-10-07 08:49:08 UTC (rev 3283)
@@ -3,34 +3,52 @@
 #if defined(F2PY_DEBUG_PYOBJ_TOFROM)
   fprintf(stderr,"pyobj_to_Py_complex(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
 #endif
+  if (PyArray_CheckScalar(obj)) {
+    if (PyArray_IsScalar(obj, CDouble)) {
+      npy_cdouble obval = PyArrayScalar_VAL(obj, CDouble);
+      value->real = obval.real;
+      value->imag = obval.imag;
+      return_value = 1;
+      goto capi_done;
+    }
+    else if (PyArray_IsScalar(obj, CFloat)) {
+      npy_cfloat obval = PyArrayScalar_VAL(obj, CFloat);
+      value->real = obval.real;
+      value->imag = obval.imag;
+      return_value = 1;
+      goto capi_done;
+    }
+  }
   if (PyComplex_Check(obj)) {
-    *value =PyComplex_AsCComplex(obj);
+    *value = PyComplex_AsCComplex(obj);
     return_value = 1;
     goto capi_done;
   }
   /* Python does not provide PyNumber_Complex function :-( */
-  (*value).imag=0.0;
+  value->imag=0.0;
   if (PyFloat_Check(obj)) {
 #ifdef __sgi
-    (*value).real = PyFloat_AsDouble(obj);
+    value->real = PyFloat_AsDouble(obj);
     return_value = !PyErr_Occurred()
 #else
-    (*value).real = PyFloat_AS_DOUBLE(obj);
+    value->real = PyFloat_AS_DOUBLE(obj);
     return_value = 1;
 #endif
     goto capi_done;
   }
   if (PyInt_Check(obj)) {
-    (*value).real = (double)PyInt_AS_LONG(obj);
+    value->real = (double)PyInt_AS_LONG(obj);
     return_value = 1;
     goto capi_done;
   }
   if (PyLong_Check(obj)) {
-    (*value).real = PyLong_AsDouble(obj);
+    value->real = PyLong_AsDouble(obj);
     return_value = !PyErr_Occurred();;
     goto capi_done;
   }
-  if (PySequence_Check(obj) && (!PyString_Check(obj))) {
+  if (PyString_Check(obj))
+    /*pass*/;
+  else if (PySequence_Check(obj) && PySequence_Size(obj)==1) {
     PyObject *tmp = PySequence_GetItem(obj,0);
     if (tmp) {
       if (pyobj_to_Py_complex(tmp,value)) {
@@ -41,10 +59,11 @@
       Py_DECREF(tmp);
     }
   }
-
   if (!PyErr_Occurred()) {
-    PyErr_SetString(PyExc_TypeError,
-		    "Failed to convert python object to C Py_complex.");
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C Py_complex"));
+    PyErr_SetObject(PyExc_TypeError,r);
   }
  capi_done:
 #if defined(F2PY_DEBUG_PYOBJ_TOFROM)

Modified: trunk/numpy/f2py/lib/src/pyobj_to_double.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_double.c	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/src/pyobj_to_double.c	2006-10-07 08:49:08 UTC (rev 3283)
@@ -1,12 +1,18 @@
 int pyobj_to_double(PyObject* obj, double* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_double(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
   PyObject* tmp = NULL;
   if (PyFloat_Check(obj)) {
 #ifdef __sgi
     *value = PyFloat_AsDouble(obj);
-    return (!PyErr_Occurred());
+    return_value = !PyErr_Occurred();
+    goto capi_done;
 #else
     *value = PyFloat_AS_DOUBLE(obj);
-    return 1;
+    return_value = 1;
+    goto capi_done;
 #endif
   }
   tmp = PyNumber_Float(obj);
@@ -14,26 +20,42 @@
 #ifdef __sgi
     *value = PyFloat_AsDouble(tmp);
     Py_DECREF(tmp);
-    return (!PyErr_Occurred());
+    return_value = !PyErr_Occurred();
+    goto capi_done;
 #else
     *value = PyFloat_AS_DOUBLE(tmp);
     Py_DECREF(tmp);
-    return 1;
+    return_value = 1;
+    goto capi_done;
 #endif
   }
+  /*
   if (PyComplex_Check(obj))
     tmp = PyObject_GetAttrString(obj,"real");
-  else if (PyString_Check(obj))
+  else 
+  */
+  if (PyString_Check(obj))
     /*pass*/;
-  else if (PySequence_Check(obj))
+  else if (PySequence_Check(obj) && PySequence_Size(obj)==1)
     tmp = PySequence_GetItem(obj,0);
   if (tmp) {
     PyErr_Clear();
-    if (pyobj_to_double(tmp, value)) {Py_DECREF(tmp); return 1;}
+    if (pyobj_to_double(tmp, value)) {
+      Py_DECREF(tmp); 
+      return_value = 1;
+      goto capi_done;
+    }
     Py_DECREF(tmp);
   }
   if (!PyErr_Occurred()) {
-    PyErr_SetString(PyExc_TypeError, "Failed to convert python object to C double.");
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C double"));
+    PyErr_SetObject(PyExc_TypeError,r);
   }
-  return 0;
+ capi_done:
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_double: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
 }

Modified: trunk/numpy/f2py/lib/src/pyobj_to_long.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_long.c	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/src/pyobj_to_long.c	2006-10-07 08:49:08 UTC (rev 3283)
@@ -1,32 +1,48 @@
 int pyobj_to_long(PyObject *obj, long* value) {
+  int return_value = 0;
   PyObject* tmp = NULL;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_long(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
   if (PyInt_Check(obj)) {
     *value = PyInt_AS_LONG(obj);
-    return 1;
+    return_value = 1;
+    goto capi_done;
   }
   tmp = PyNumber_Int(obj);
   if (tmp) {
     *value = PyInt_AS_LONG(tmp);
     Py_DECREF(tmp);
-    return 1;
+    return_value = 1;
+    goto capi_done;
   }
+  /*
   if (PyComplex_Check(obj))
     tmp = PyObject_GetAttrString(obj,"real");
-  else if (PyString_Check(obj))
+  else
+  */ 
+  if (PyString_Check(obj))
     /*pass*/;
-  else if (PySequence_Check(obj))
+  else if (PySequence_Check(obj) && PySequence_Size(obj)==1)
     tmp = PySequence_GetItem(obj,0);
   if (tmp) {
     PyErr_Clear();
     if (pyobj_to_long(tmp, value)) {
       Py_DECREF(tmp);
-      return 1;
+      return_value = 1;
+      goto capi_done;
     }
     Py_DECREF(tmp);
   }
   if (!PyErr_Occurred()) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Failed to convert python object to C long.");
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C long"));
+    PyErr_SetObject(PyExc_TypeError,r);
   }
-  return 0;
+ capi_done:
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_long: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
 }

Modified: trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c	2006-10-07 08:49:08 UTC (rev 3283)
@@ -1,37 +1,54 @@
 int pyobj_to_npy_longlong(PyObject *obj, npy_longlong* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_npy_longlong(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
   PyObject* tmp = NULL;
   if (PyLong_Check(obj)) {
     *value = PyLong_AsLongLong(obj);
-    return (!PyErr_Occurred());
+    return_value = !PyErr_Occurred();
+    goto capi_done;
   }
   if (PyInt_Check(obj)) {
     *value = (npy_longlong)PyInt_AS_LONG(obj);
-    return 1;
+    return_value = 1;
+    goto capi_done;
   }
   tmp = PyNumber_Long(obj);
   if (tmp) {
     *value = PyLong_AsLongLong(tmp);
     Py_DECREF(tmp);
-    return (!PyErr_Occurred());
+    return_value = !PyErr_Occurred();
+    goto capi_done;
   }
+  /*
   if (PyComplex_Check(obj))
     tmp = PyObject_GetAttrString(obj,"real");
-  else if (PyString_Check(obj))
+  else
+  */
+  if (PyString_Check(obj))
     /*pass*/;
-  else if (PySequence_Check(obj))
+  else if (PySequence_Check(obj) && PySequence_Size(obj)==1)
     tmp = PySequence_GetItem(obj,0);
   if (tmp) {
     PyErr_Clear();
     if (pyobj_to_npy_longlong(tmp, value)) {
       Py_DECREF(tmp);
-      return 1;
+      return_value = 1;
+      goto capi_done;
     }
     Py_DECREF(tmp);
   }
   if (!PyErr_Occurred()) {
-    PyErr_SetString(PyExc_TypeError,
-		    "Failed to convert python object to C npy_longlong.");
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C npy_longlong"));
+    PyErr_SetObject(PyExc_TypeError,r);
   }
-  return 0;
+ capi_done:
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_npy_longlong: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
 }
 

Added: trunk/numpy/f2py/lib/test_scalar_in_out.py
===================================================================
--- trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-07 08:00:20 UTC (rev 3282)
+++ trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-07 08:49:08 UTC (rev 3283)
@@ -0,0 +1,373 @@
+#!/usr/bin/env python
+
+import os
+import sys
+from numpy.testing import *
+
+def build(fortran_code, rebuild=True):
+    modulename = os.path.splitext(os.path.basename(__file__))[0]+'_ext'
+    try:
+        exec ('import %s as m' % (modulename))
+        if rebuild and os.stat(m.__file__)[8] < os.stat(__file__)[8]:
+            del sys.modules[m.__name__] # soft unload extension module
+            os.remove(m.__file__)
+            raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
+    except ImportError,msg:
+        print msg, ', recompiling %s.' % (modulename)
+        import tempfile
+        fname = tempfile.mktemp() + '.f'
+        f = open(fname,'w')
+        f.write(fortran_code)
+        f.close()
+        sys_argv = ['--build-dir','foo']
+        #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
+        from main import build_extension
+        sys_argv.extend(['-m',modulename, fname])
+        build_extension(sys_argv)
+        os.remove(fname)
+        os.system(' '.join([sys.executable] + sys.argv))
+        sys.exit(0)
+    return m
+
+fortran_code = '''
+      subroutine fooint1(a)
+      integer*1 a
+!f2py intent(in,out) a
+      a = a + 1
+      end
+      subroutine fooint2(a)
+      integer*2 a
+!f2py intent(in,out) a
+      a = a + 1
+      end
+      subroutine fooint4(a)
+      integer*4 a
+!f2py intent(in,out) a
+      a = a + 1
+      end
+      subroutine fooint8(a)
+      integer*8 a
+!f2py intent(in,out) a
+      a = a + 1
+      end
+      subroutine foofloat4(a)
+      real*4 a
+!f2py intent(in,out) a
+      a = a + 1.0e0
+      end
+      subroutine foofloat8(a)
+      real*8 a
+!f2py intent(in,out) a
+      a = a + 1.0d0
+      end
+      subroutine foocomplex8(a)
+      complex*8 a
+!f2py intent(in,out) a
+      a = a + 1.0e0
+      end
+      subroutine foocomplex16(a)
+      complex*16 a
+!f2py intent(in,out) a
+      a = a + 1.0d0
+      end
+'''
+
+# tester note: set rebuild=True when changing fortan_code and for SVN
+m = build(fortran_code, rebuild=True)
+
+from numpy import *
+
+class test_m(NumpyTestCase):
+
+    def check_foo_integer1(self, level=1):
+        i = int8(2)
+        e = int8(3)
+        func = m.fooint1
+        assert isinstance(i,int8),`type(i)`
+        r = func(i)
+        assert isinstance(r,int8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int64,int16,int32]:
+            r = func(intx(2))
+            assert isinstance(r,int8),`type(r)`
+            assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_integer2(self, level=1):
+        i = int16(2)
+        e = int16(3)
+        func = m.fooint2
+        assert isinstance(i,int16),`type(i)`
+        r = func(i)
+        assert isinstance(r,int16),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int8,int64,int32]:
+            r = func(intx(2))
+            assert isinstance(r,int16),`type(r)`
+            assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_integer4(self, level=1):
+        i = int32(2)
+        e = int32(3)
+        func = m.fooint4
+        assert isinstance(i,int32),`type(i)`
+        r = func(i)
+        assert isinstance(r,int32),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int8,int16,int64]:
+            r = func(intx(2))
+            assert isinstance(r,int32),`type(r)`
+            assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_integer8(self, level=1):
+        i = int64(2)
+        e = int64(3)
+        func = m.fooint8
+        assert isinstance(i,int64),`type(i)`
+        r = func(i)
+        assert isinstance(r,int64),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int8,int16,int32]:
+            r = func(intx(2))
+            assert isinstance(r,int64),`type(r)`
+            assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_real4(self, level=1):
+        i = float32(2)
+        e = float32(3)
+        func = m.foofloat4
+        assert isinstance(i,float32),`type(i)`
+        r = func(i)
+        assert isinstance(r,float32),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e+float32(0.2))
+
+        r = func(float64(2.0))
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_real8(self, level=1):
+        i = float64(2)
+        e = float64(3)
+        func = m.foofloat8
+        assert isinstance(i,float64),`type(i)`
+        r = func(i)
+        assert isinstance(r,float64),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e+float64(0.2))
+
+        r = func(float32(2.0))
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_complex8(self, level=1):
+        i = complex64(2)
+        e = complex64(3)
+        func = m.foocomplex8
+        assert isinstance(i,complex64),`type(i)`
+        r = func(i)
+        assert isinstance(r,complex64),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e+complex64(0.2))
+
+        r = func(2+1j)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e+complex64(1j))
+
+        r = func(complex128(2.0))
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2,3])
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e+complex64(3j))
+
+        self.assertRaises(TypeError,lambda :func([2,1,3]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_complex16(self, level=1):
+        i = complex128(2)
+        e = complex128(3)
+        func = m.foocomplex16
+        assert isinstance(i,complex128),`type(i)`
+        r = func(i)
+        assert isinstance(r,complex128),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e+complex128(0.2))
+
+        r = func(2+1j)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e+complex128(1j))
+
+        r = func([2])
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2,3])
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e+complex128(3j))
+
+        r = func(complex64(2.0))
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func([2,1,3]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+if __name__ == "__main__":
+    NumpyTest().run()



From numpy-svn at scipy.org  Sat Oct  7 04:50:30 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat,  7 Oct 2006 03:50:30 -0500 (CDT)
Subject: [Numpy-svn] r3284 - trunk/numpy/f2py/lib/src
Message-ID: <20061007085030.49AF639C13F@new.scipy.org>

Author: pearu
Date: 2006-10-07 03:50:25 -0500 (Sat, 07 Oct 2006)
New Revision: 3284

Removed:
   trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp
   trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c
   trunk/numpy/f2py/lib/src/pyobj_to_double.c
   trunk/numpy/f2py/lib/src/pyobj_to_long.c
   trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c
Log:
F2PY G3: clean up.

Deleted: trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp
===================================================================
--- trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp	2006-10-07 08:49:08 UTC (rev 3283)
+++ trunk/numpy/f2py/lib/src/SCALARS_IN_BITS.cpp	2006-10-07 08:50:25 UTC (rev 3284)
@@ -1,279 +0,0 @@
-#if NPY_BITSOF_LONG == 8
-#  ifndef PyInt8ScalarObject
-#    define PyInt8ScalarObject PyLongScalarObject
-#    define PyInt8ArrType_Type PyLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONG == 16
-#  ifndef PyInt16ScalarObject
-#    define PyInt16ScalarObject PyLongScalarObject
-#    define PyInt16ArrType_Type PyLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONG == 32
-#  ifndef PyInt32ScalarObject
-#    define PyInt32ScalarObject PyLongScalarObject
-#    define PyInt32ArrType_Type PyLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONG == 64
-#  ifndef PyInt64ScalarObject
-#    define PyInt64ScalarObject PyLongScalarObject
-#    define PyInt64ArrType_Type PyLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONG == 128
-#  ifndef PyInt128ScalarObject
-#    define PyInt128ScalarObject PyLongScalarObject
-#    define PyInt128ArrType_Type PyLongArrType_Type
-#  endif
-#endif
-
-#if NPY_BITSOF_LONGLONG == 8
-#  ifndef PyInt8ScalarObject
-#    define PyInt8ScalarObject PyLongLongScalarObject
-#    define PyInt8ArrType_Type PyLongLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGLONG == 16
-#  ifndef PyInt16ScalarObject
-#    define PyInt16ScalarObject PyLongLongScalarObject
-#    define PyInt16ArrType_Type PyLongLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGLONG == 32
-#  ifndef PyInt32ScalarObject
-#    define PyInt32ScalarObject PyLongLongScalarObject
-#    define PyInt32ArrType_Type PyLongLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGLONG == 64
-#  ifndef PyInt64ScalarObject
-#    define PyInt64ScalarObject PyLongLongScalarObject
-#    define PyInt64ArrType_Type PyLongLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGLONG == 128
-#  ifndef PyInt128ScalarObject
-#    define PyInt128ScalarObject PyLongLongScalarObject
-#    define PyInt128ArrType_Type PyLongLongArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGLONG == 256
-#  ifndef PyInt256ScalarObject
-#    define PyInt256ScalarObject PyLongLongScalarObject
-#    define PyInt256ArrType_Type PyLongLongArrType_Type
-#  endif
-#endif
-
-#if NPY_BITSOF_INT == 8
-#  ifndef PyInt8ScalarObject
-#    define PyInt8ScalarObject PyIntScalarObject
-#    define PyInt8ArrType_Type PyIntArrType_Type
-#  endif
-#elif NPY_BITSOF_INT == 16
-#  ifndef PyInt16ScalarObject
-#    define PyInt16ScalarObject PyIntScalarObject
-#    define PyInt16ArrType_Type PyIntArrType_Type
-#  endif
-#elif NPY_BITSOF_INT == 32
-#  ifndef PyInt32ScalarObject
-#    define PyInt32ScalarObject PyIntScalarObject
-#    define PyInt32ArrType_Type PyIntArrType_Type
-#  endif
-#elif NPY_BITSOF_INT == 64
-#  ifndef PyInt64ScalarObject
-#    define PyInt64ScalarObject PyIntScalarObject
-#    define PyInt64ArrType_Type PyIntArrType_Type
-#  endif
-#elif NPY_BITSOF_INT == 128
-#  ifndef PyInt128ScalarObject
-#    define PyInt128ScalarObject PyIntScalarObject
-#    define PyInt128ArrType_Type PyIntArrType_Type
-#  endif
-#endif
-
-#if NPY_BITSOF_SHORT == 8
-#  ifndef PyInt8ScalarObject
-#    define PyInt8ScalarObject PyShortScalarObject
-#    define PyInt8ArrType_Type PyShortArrType_Type
-#  endif
-#elif NPY_BITSOF_SHORT == 16
-#  ifndef PyInt16ScalarObject
-#    define PyInt16ScalarObject PyShortScalarObject
-#    define PyInt16ArrType_Type PyShortArrType_Type
-#  endif
-#elif NPY_BITSOF_SHORT == 32
-#  ifndef PyInt32ScalarObject
-#    define PyInt32ScalarObject PyShortScalarObject
-#    define PyInt32ArrType_Type PyShortArrType_Type
-#  endif
-#elif NPY_BITSOF_SHORT == 64
-#  ifndef PyInt64ScalarObject
-#    define PyInt64ScalarObject PyShortScalarObject
-#    define PyInt64ArrType_Type PyShortArrType_Type
-#  endif
-#elif NPY_BITSOF_SHORT == 128
-#  ifndef PyInt128ScalarObject
-#    define PyInt128ScalarObject PyShortScalarObject
-#    define PyInt128ArrType_Type PyShortArrType_Type
-#  endif
-#endif
-
-#if NPY_BITSOF_CHAR == 8
-#  ifndef PyInt8ScalarObject
-#    define PyInt8ScalarObject PyByteScalarObject
-#    define PyInt8ArrType_Type PyByteArrType_Type
-#  endif
-#elif NPY_BITSOF_CHAR == 16
-#  ifndef PyInt16ScalarObject
-#    define PyInt16ScalarObject PyByteScalarObject
-#    define PyInt16ArrType_Type PyByteArrType_Type
-#  endif
-#elif NPY_BITSOF_CHAR == 32
-#  ifndef PyInt32ScalarObject
-#    define PyInt32ScalarObject PyByteScalarObject
-#    define PyInt32ArrType_Type PyByteArrType_Type
-#  endif
-#elif NPY_BITSOF_CHAR == 64
-#  ifndef PyInt64ScalarObject
-#    define PyInt64ScalarObject PyByteScalarObject
-#    define PyInt64ArrType_Type PyByteArrType_Type
-#  endif
-#elif NPY_BITSOF_CHAR == 128
-#  ifndef PyInt128ScalarObject
-#    define PyInt128ScalarObject PyByteScalarObject
-#    define PyInt128ArrType_Type PyByteArrType_Type
-#  endif
-#endif
-
-#if NPY_BITSOF_DOUBLE == 16
-#  ifndef PyFloat16ScalarObject
-#    define PyFloat16ScalarObject PyDoubleScalarObject
-#    define PyComplex32ScalarObject PyCDoubleScalarObject
-#    define PyFloat16ArrType_Type PyDoubleArrType_Type
-#    define PyComplex32ArrType_Type PyCDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_DOUBLE == 32
-#  ifndef PyFloat32ScalarObject
-#    define PyFloat32ScalarObject PyDoubleScalarObject
-#    define PyComplex64ScalarObject PyCDoubleScalarObject
-#    define PyFloat32ArrType_Type PyDoubleArrType_Type
-#    define PyComplex64ArrType_Type PyCDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_DOUBLE == 64
-#  ifndef PyFloat64ScalarObject
-#    define PyFloat64ScalarObject PyDoubleScalarObject
-#    define PyComplex128ScalarObject PyCDoubleScalarObject
-#    define PyFloat64ArrType_Type PyDoubleArrType_Type
-#    define PyComplex128ArrType_Type PyCDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_DOUBLE == 80
-#  ifndef PyFloat80ScalarObject
-#    define PyFloat80ScalarObject PyDoubleScalarObject
-#    define PyComplex160ScalarObject PyCDoubleScalarObject
-#    define PyFloat80ArrType_Type PyDoubleArrType_Type
-#    define PyComplex160ArrType_Type PyCDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_DOUBLE == 96
-#  ifndef PyFloat96ScalarObject
-#    define PyFloat96ScalarObject PyDoubleScalarObject
-#    define PyComplex192ScalarObject PyCDoubleScalarObject
-#    define PyFloat96ArrType_Type PyDoubleArrType_Type
-#    define PyComplex192ArrType_Type PyCDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_DOUBLE == 128
-#  ifndef PyFloat128ScalarObject
-#    define PyFloat128ScalarObject PyDoubleScalarObject
-#    define PyComplex256ScalarObject PyCDoubleScalarObject
-#    define PyFloat128ArrType_Type PyDoubleArrType_Type
-#    define PyComplex256ArrType_Type PyCDoubleArrType_Type
-#  endif
-#endif
-
-#if NPY_BITSOF_FLOAT == 16
-#  ifndef PyFloat16ScalarObject
-#    define PyFloat16ScalarObject PyFloatScalarObject
-#    define PyComplex32ScalarObject PyCFloatScalarObject
-#    define PyFloat16ArrType_Type PyFloatArrType_Type
-#    define PyComplex32ArrType_Type PyCFloatArrType_Type
-#  endif
-#elif NPY_BITSOF_FLOAT == 32
-#  ifndef PyFloat32ScalarObject
-#    define PyFloat32ScalarObject PyFloatScalarObject
-#    define PyComplex64ScalarObject PyCFloatScalarObject
-#    define PyFloat32ArrType_Type PyFloatArrType_Type
-#    define PyComplex64ArrType_Type PyCFloatArrType_Type
-#  endif
-#elif NPY_BITSOF_FLOAT == 64
-#  ifndef PyFloat64ScalarObject
-#    define PyFloat64ScalarObject PyFloatScalarObject
-#    define PyComplex128ScalarObject PyCFloatScalarObject
-#    define PyFloat64ArrType_Type PyFloatArrType_Type
-#    define PyComplex128ArrType_Type PyCFloatArrType_Type
-#  endif
-#elif NPY_BITSOF_FLOAT == 80
-#  ifndef PyFloat80ScalarObject
-#    define PyFloat80ScalarObject PyFloatScalarObject
-#    define PyComplex160ScalarObject PyCFloatScalarObject
-#    define PyFloat80ArrType_Type PyFloatArrType_Type
-#    define PyComplex160ArrType_Type PyCFloatArrType_Type
-#  endif
-#elif NPY_BITSOF_FLOAT == 96
-#  ifndef PyFloat96ScalarObject
-#    define PyFloat96ScalarObject PyFloatScalarObject
-#    define PyComplex192ScalarObject PyCFloatScalarObject
-#    define PyFloat96ArrType_Type PyFloatArrType_Type
-#    define PyComplex192ArrType_Type PyCFloatArrType_Type
-#  endif
-#elif NPY_BITSOF_FLOAT == 128
-#  ifndef PyFloat128ScalarObject
-#    define PyFloat128ScalarObject PyFloatScalarObject
-#    define PyComplex256ScalarObject PyCFloatScalarObject
-#    define PyFloat128ArrType_Type PyFloatArrType_Type
-#    define PyComplex256ArrType_Type PyCFloatArrType_Type
-#  endif
-#endif
-
-#if NPY_BITSOF_LONGDOUBLE == 16
-#  ifndef PyFloat16ScalarObject
-#    define PyFloat16ScalarObject PyLongDoubleScalarObject
-#    define PyComplex32ScalarObject PyCLongDoubleScalarObject
-#    define PyFloat16ArrType_Type PyLongDoubleArrType_Type
-#    define PyComplex32ArrType_Type PyCLongDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGDOUBLE == 32
-#  ifndef PyFloat32ScalarObject
-#    define PyFloat32ScalarObject PyLongDoubleScalarObject
-#    define PyComplex64ScalarObject PyCLongDoubleScalarObject
-#    define PyFloat32ArrType_Type PyLongDoubleArrType_Type
-#    define PyComplex64ArrType_Type PyCLongDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGDOUBLE == 64
-#  ifndef PyFloat64ScalarObject
-#    define PyFloat64ScalarObject PyLongDoubleScalarObject
-#    define PyComplex128ScalarObject PyCLongDoubleScalarObject
-#    define PyFloat64ArrType_Type PyLongDoubleArrType_Type
-#    define PyComplex128ArrType_Type PyCLongDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGDOUBLE == 80
-#  ifndef PyFloat80ScalarObject
-#    define PyFloat80ScalarObject PyLongDoubleScalarObject
-#    define PyComplex160ScalarObject PyCLongDoubleScalarObject
-#    define PyFloat80ArrType_Type PyLongDoubleArrType_Type
-#    define PyComplex160ArrType_Type PyCLongDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGDOUBLE == 96
-#  ifndef PyFloat96ScalarObject
-#    define PyFloat96ScalarObject PyLongDoubleScalarObject
-#    define PyComplex192ScalarObject PyCLongDoubleScalarObject
-#    define PyFloat96ArrType_Type PyLongDoubleArrType_Type
-#    define PyComplex192ArrType_Type PyCLongDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGDOUBLE == 128
-#  ifndef PyFloat128ScalarObject
-#    define PyFloat128ScalarObject PyLongDoubleScalarObject
-#    define PyComplex256ScalarObject PyCLongDoubleScalarObject
-#    define PyFloat128ArrType_Type PyLongDoubleArrType_Type
-#    define PyComplex256ArrType_Type PyCLongDoubleArrType_Type
-#  endif
-#elif NPY_BITSOF_LONGDOUBLE == 256
-#  ifndef PyFloat256ScalarObject
-#    define PyFloat256ScalarObject PyLongDoubleScalarObject
-#    define PyComplex512ScalarObject PyCLongDoubleScalarObject
-#    define PyFloat256ArrType_Type PyLongDoubleArrType_Type
-#    define PyComplex512ArrType_Type PyCLongDoubleArrType_Type
-#  endif
-#endif
-

Deleted: trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c	2006-10-07 08:49:08 UTC (rev 3283)
+++ trunk/numpy/f2py/lib/src/pyobj_to_Py_complex.c	2006-10-07 08:50:25 UTC (rev 3284)
@@ -1,73 +0,0 @@
-int pyobj_to_Py_complex(PyObject* obj, Py_complex* value) {
-  int return_value = 0;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_Py_complex(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
-#endif
-  if (PyArray_CheckScalar(obj)) {
-    if (PyArray_IsScalar(obj, CDouble)) {
-      npy_cdouble obval = PyArrayScalar_VAL(obj, CDouble);
-      value->real = obval.real;
-      value->imag = obval.imag;
-      return_value = 1;
-      goto capi_done;
-    }
-    else if (PyArray_IsScalar(obj, CFloat)) {
-      npy_cfloat obval = PyArrayScalar_VAL(obj, CFloat);
-      value->real = obval.real;
-      value->imag = obval.imag;
-      return_value = 1;
-      goto capi_done;
-    }
-  }
-  if (PyComplex_Check(obj)) {
-    *value = PyComplex_AsCComplex(obj);
-    return_value = 1;
-    goto capi_done;
-  }
-  /* Python does not provide PyNumber_Complex function :-( */
-  value->imag=0.0;
-  if (PyFloat_Check(obj)) {
-#ifdef __sgi
-    value->real = PyFloat_AsDouble(obj);
-    return_value = !PyErr_Occurred()
-#else
-    value->real = PyFloat_AS_DOUBLE(obj);
-    return_value = 1;
-#endif
-    goto capi_done;
-  }
-  if (PyInt_Check(obj)) {
-    value->real = (double)PyInt_AS_LONG(obj);
-    return_value = 1;
-    goto capi_done;
-  }
-  if (PyLong_Check(obj)) {
-    value->real = PyLong_AsDouble(obj);
-    return_value = !PyErr_Occurred();;
-    goto capi_done;
-  }
-  if (PyString_Check(obj))
-    /*pass*/;
-  else if (PySequence_Check(obj) && PySequence_Size(obj)==1) {
-    PyObject *tmp = PySequence_GetItem(obj,0);
-    if (tmp) {
-      if (pyobj_to_Py_complex(tmp,value)) {
-        Py_DECREF(tmp);
-	return_value = 1;
-	goto capi_done;
-      }
-      Py_DECREF(tmp);
-    }
-  }
-  if (!PyErr_Occurred()) {
-    PyObject* r = PyString_FromString("Failed to convert ");
-    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
-    PyString_ConcatAndDel(&r, PyString_FromString(" to C Py_complex"));
-    PyErr_SetObject(PyExc_TypeError,r);
-  }
- capi_done:
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_Py_complex: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
-#endif
-  return return_value;
-}

Deleted: trunk/numpy/f2py/lib/src/pyobj_to_double.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_double.c	2006-10-07 08:49:08 UTC (rev 3283)
+++ trunk/numpy/f2py/lib/src/pyobj_to_double.c	2006-10-07 08:50:25 UTC (rev 3284)
@@ -1,61 +0,0 @@
-int pyobj_to_double(PyObject* obj, double* value) {
-  int return_value = 0;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_double(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
-#endif
-  PyObject* tmp = NULL;
-  if (PyFloat_Check(obj)) {
-#ifdef __sgi
-    *value = PyFloat_AsDouble(obj);
-    return_value = !PyErr_Occurred();
-    goto capi_done;
-#else
-    *value = PyFloat_AS_DOUBLE(obj);
-    return_value = 1;
-    goto capi_done;
-#endif
-  }
-  tmp = PyNumber_Float(obj);
-  if (tmp) {
-#ifdef __sgi
-    *value = PyFloat_AsDouble(tmp);
-    Py_DECREF(tmp);
-    return_value = !PyErr_Occurred();
-    goto capi_done;
-#else
-    *value = PyFloat_AS_DOUBLE(tmp);
-    Py_DECREF(tmp);
-    return_value = 1;
-    goto capi_done;
-#endif
-  }
-  /*
-  if (PyComplex_Check(obj))
-    tmp = PyObject_GetAttrString(obj,"real");
-  else 
-  */
-  if (PyString_Check(obj))
-    /*pass*/;
-  else if (PySequence_Check(obj) && PySequence_Size(obj)==1)
-    tmp = PySequence_GetItem(obj,0);
-  if (tmp) {
-    PyErr_Clear();
-    if (pyobj_to_double(tmp, value)) {
-      Py_DECREF(tmp); 
-      return_value = 1;
-      goto capi_done;
-    }
-    Py_DECREF(tmp);
-  }
-  if (!PyErr_Occurred()) {
-    PyObject* r = PyString_FromString("Failed to convert ");
-    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
-    PyString_ConcatAndDel(&r, PyString_FromString(" to C double"));
-    PyErr_SetObject(PyExc_TypeError,r);
-  }
- capi_done:
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_double: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
-#endif
-  return return_value;
-}

Deleted: trunk/numpy/f2py/lib/src/pyobj_to_long.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_long.c	2006-10-07 08:49:08 UTC (rev 3283)
+++ trunk/numpy/f2py/lib/src/pyobj_to_long.c	2006-10-07 08:50:25 UTC (rev 3284)
@@ -1,48 +0,0 @@
-int pyobj_to_long(PyObject *obj, long* value) {
-  int return_value = 0;
-  PyObject* tmp = NULL;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_long(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
-#endif
-  if (PyInt_Check(obj)) {
-    *value = PyInt_AS_LONG(obj);
-    return_value = 1;
-    goto capi_done;
-  }
-  tmp = PyNumber_Int(obj);
-  if (tmp) {
-    *value = PyInt_AS_LONG(tmp);
-    Py_DECREF(tmp);
-    return_value = 1;
-    goto capi_done;
-  }
-  /*
-  if (PyComplex_Check(obj))
-    tmp = PyObject_GetAttrString(obj,"real");
-  else
-  */ 
-  if (PyString_Check(obj))
-    /*pass*/;
-  else if (PySequence_Check(obj) && PySequence_Size(obj)==1)
-    tmp = PySequence_GetItem(obj,0);
-  if (tmp) {
-    PyErr_Clear();
-    if (pyobj_to_long(tmp, value)) {
-      Py_DECREF(tmp);
-      return_value = 1;
-      goto capi_done;
-    }
-    Py_DECREF(tmp);
-  }
-  if (!PyErr_Occurred()) {
-    PyObject* r = PyString_FromString("Failed to convert ");
-    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
-    PyString_ConcatAndDel(&r, PyString_FromString(" to C long"));
-    PyErr_SetObject(PyExc_TypeError,r);
-  }
- capi_done:
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_long: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
-#endif
-  return return_value;
-}

Deleted: trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c
===================================================================
--- trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c	2006-10-07 08:49:08 UTC (rev 3283)
+++ trunk/numpy/f2py/lib/src/pyobj_to_npy_longlong.c	2006-10-07 08:50:25 UTC (rev 3284)
@@ -1,54 +0,0 @@
-int pyobj_to_npy_longlong(PyObject *obj, npy_longlong* value) {
-  int return_value = 0;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_npy_longlong(type=%s)\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
-#endif
-  PyObject* tmp = NULL;
-  if (PyLong_Check(obj)) {
-    *value = PyLong_AsLongLong(obj);
-    return_value = !PyErr_Occurred();
-    goto capi_done;
-  }
-  if (PyInt_Check(obj)) {
-    *value = (npy_longlong)PyInt_AS_LONG(obj);
-    return_value = 1;
-    goto capi_done;
-  }
-  tmp = PyNumber_Long(obj);
-  if (tmp) {
-    *value = PyLong_AsLongLong(tmp);
-    Py_DECREF(tmp);
-    return_value = !PyErr_Occurred();
-    goto capi_done;
-  }
-  /*
-  if (PyComplex_Check(obj))
-    tmp = PyObject_GetAttrString(obj,"real");
-  else
-  */
-  if (PyString_Check(obj))
-    /*pass*/;
-  else if (PySequence_Check(obj) && PySequence_Size(obj)==1)
-    tmp = PySequence_GetItem(obj,0);
-  if (tmp) {
-    PyErr_Clear();
-    if (pyobj_to_npy_longlong(tmp, value)) {
-      Py_DECREF(tmp);
-      return_value = 1;
-      goto capi_done;
-    }
-    Py_DECREF(tmp);
-  }
-  if (!PyErr_Occurred()) {
-    PyObject* r = PyString_FromString("Failed to convert ");
-    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
-    PyString_ConcatAndDel(&r, PyString_FromString(" to C npy_longlong"));
-    PyErr_SetObject(PyExc_TypeError,r);
-  }
- capi_done:
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_npy_longlong: return_value=%d, PyErr_Occurred()=%p\n", return_value, PyErr_Occurred());
-#endif
-  return return_value;
-}
-



From numpy-svn at scipy.org  Sat Oct  7 10:52:24 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat,  7 Oct 2006 09:52:24 -0500 (CDT)
Subject: [Numpy-svn] r3285 - trunk/numpy/lib
Message-ID: <20061007145224.2CFFB39C248@new.scipy.org>

Author: stefan
Date: 2006-10-07 09:52:08 -0500 (Sat, 07 Oct 2006)
New Revision: 3285

Modified:
   trunk/numpy/lib/function_base.py
Log:
Close ticket #328.


Modified: trunk/numpy/lib/function_base.py
===================================================================
--- trunk/numpy/lib/function_base.py	2006-10-07 08:50:25 UTC (rev 3284)
+++ trunk/numpy/lib/function_base.py	2006-10-07 14:52:08 UTC (rev 3285)
@@ -1289,7 +1289,7 @@
     newshape = list(arr.shape)
     if isinstance(obj, (int, long, integer)):
         if (obj < 0): obj += N
-        if (obj < 0 or obj > N or (obj == N and N != 0)):
+        if obj < 0 or obj > N:
             raise ValueError, "index (%d) out of range (0<=index<=%d) "\
                   "in dimension %d" % (obj, N, axis)
         newshape[axis] += 1;



From numpy-svn at scipy.org  Sat Oct  7 11:05:10 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat,  7 Oct 2006 10:05:10 -0500 (CDT)
Subject: [Numpy-svn] r3286 - trunk/numpy/lib/tests
Message-ID: <20061007150510.99E4D39C086@new.scipy.org>

Author: stefan
Date: 2006-10-07 10:04:51 -0500 (Sat, 07 Oct 2006)
New Revision: 3286

Modified:
   trunk/numpy/lib/tests/test_function_base.py
Log:
Add test for insert.


Modified: trunk/numpy/lib/tests/test_function_base.py
===================================================================
--- trunk/numpy/lib/tests/test_function_base.py	2006-10-07 14:52:08 UTC (rev 3285)
+++ trunk/numpy/lib/tests/test_function_base.py	2006-10-07 15:04:51 UTC (rev 3286)
@@ -93,6 +93,13 @@
         t3 = linspace(0,1,2).dtype
         assert_equal(t1, t2)
         assert_equal(t2, t3)
+        
+class test_insert(NumpyTestCase):
+    def check_basic(self):
+        a = [1,2,3]
+        assert_equal(insert(a,0,1), [1,1,2,3])
+        assert_equal(insert(a,3,1), [1,2,3,1])
+        assert_equal(insert(a,[1,1,1],[1,2,3]), [1,1,2,3,2,3])
 
 class test_amax(NumpyTestCase):
     def check_basic(self):



From numpy-svn at scipy.org  Sat Oct  7 11:13:18 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat,  7 Oct 2006 10:13:18 -0500 (CDT)
Subject: [Numpy-svn] r3287 - trunk/numpy/lib/tests
Message-ID: <20061007151318.D795139C195@new.scipy.org>

Author: stefan
Date: 2006-10-07 10:13:03 -0500 (Sat, 07 Oct 2006)
New Revision: 3287

Modified:
   trunk/numpy/lib/tests/test_shape_base.py
Log:
Kron is now N-dimensional, so remove rank check.


Modified: trunk/numpy/lib/tests/test_shape_base.py
===================================================================
--- trunk/numpy/lib/tests/test_shape_base.py	2006-10-07 15:04:51 UTC (rev 3286)
+++ trunk/numpy/lib/tests/test_shape_base.py	2006-10-07 15:13:03 UTC (rev 3287)
@@ -369,23 +369,7 @@
         assert_equal(type(kron(ma,ma)), myarray) 
         assert_equal(type(kron(a,ma)), ndarray) 
         assert_equal(type(kron(ma,a)), myarray) 
-    def check_rank_checking(self):
-        one = ones([2])
-        two = ones([2,2])
-        three = ones([2,2,2])
-        for a in [one, two, three]:
-            for b in [one, two, three]:
-                if a is b is two:
-                    continue
-                try:
-                    kron(a, b)
-                except ValueError:
-                    continue
-                except:
-                    pass
-                assert False, "ValueError expected"
 
-
 class test_tile(NumpyTestCase):
     def check_basic(self):
         a = array([0,1,2])



From numpy-svn at scipy.org  Sat Oct  7 14:05:24 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat,  7 Oct 2006 13:05:24 -0500 (CDT)
Subject: [Numpy-svn] r3288 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061007180524.0E85339C29F@new.scipy.org>

Author: pearu
Date: 2006-10-07 13:05:18 -0500 (Sat, 07 Oct 2006)
New Revision: 3288

Modified:
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_scalar_in_out.py
Log:
F2PY G3: Impl. support and tests for scalar logical and character*<len> types.

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-07 15:13:03 UTC (rev 3287)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-07 18:05:18 UTC (rev 3288)
@@ -438,7 +438,7 @@
         return ".FALSE."
 
     def get_c_type(self):
-        return 'npy_int%s' % (self.get_bit_size())
+        return 'f2py_bool%s' % (self.get_bit_size())
 
 class Character(TypeDeclarationStatement):
     match = re.compile(r'character\b',re.I).match

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-07 15:13:03 UTC (rev 3287)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-07 18:05:18 UTC (rev 3288)
@@ -140,7 +140,105 @@
   return return_value;
 }
 '''
- 
+
+    capi_code_template_logical_scalar = '''
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_from_%(ctype)s(value=%%"%(ICTYPE)s_FMT")\\n",*value);
+#endif
+  if (*value) {
+    PyArrayScalar_RETURN_TRUE;
+  } else {
+    PyArrayScalar_RETURN_FALSE;
+  }
+}
+static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (obj==NULL) ;
+  else if (PyArray_IsScalar(obj,Bool)) {
+    *value = PyArrayScalar_VAL(obj,Bool);
+    return_value = 1;
+  } else {
+    switch (PyObject_IsTrue(obj)) {
+      case 0: *value = 0; return_value = 1; break;
+      case -1: break;
+      default: *value = 1; return_value = 1;
+    }
+  }
+  if (!return_value && !PyErr_Occurred()) {
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C %(ctype)s"));
+    PyErr_SetObject(PyExc_TypeError,r);
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  if (PyErr_Occurred()) {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s: PyErr_Occurred()=%%p\\n", PyErr_Occurred());
+  } else {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s: value=%%"%(ICTYPE)s_FMT"\\n", *value);
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+  }
+#endif
+  return return_value;
+}
+'''
+    capi_code_template_string_scalar = '''
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_from_%(ctype)s(value->data=\'%%s\')\\n",value->data);
+#endif
+  PyArray_Descr* descr = PyArray_DescrNewFromType(NPY_STRING);
+  descr->elsize = %(bytes)s;
+  PyObject* obj = PyArray_Scalar(value->data, descr, NULL);
+  if (obj==NULL) /* TODO: set exception */ return NULL;
+  return obj;
+}
+
+static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (PyString_Check(obj)) {
+    int s = PyString_GET_SIZE(obj);
+    memset(value->data, (int)\' \',%(bytes)s);
+    return_value = !! strncpy(value->data,PyString_AS_STRING(obj),%(bytes)s);
+    if (return_value && s<%(bytes)s) {
+      memset(value->data + s, (int)\' \',%(bytes)s-s);
+    }
+  } else {
+    return_value = pyobj_to_%(ctype)s(PyObject_Str(obj), value);
+  }
+  if (!return_value && !PyErr_Occurred()) {
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C %(ctype)s"));
+    PyErr_SetObject(PyExc_TypeError,r);
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  if (PyErr_Occurred()) {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s: PyErr_Occurred()=%%p\\n", PyErr_Occurred());
+  } else {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s: value->data=\'%%s\'\\n", value->data);
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+  }
+#endif
+  return return_value;
+}
+''' 
     _defined = []
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
@@ -160,8 +258,28 @@
                 bits = int(ctype[11:])
                 self.fctype = 'npy_float%s' % (bits/2)
                 self.capi_code_template = self.capi_code_template_complex_scalar
+            else:
+                raise NotImplementedError,`name,ctype`
             parent.apply_templates(self)
             return
+        if ctype.startswith('f2py_'):
+            if ctype.startswith('f2py_bool'):
+                bits = int(ctype[9:])
+                self.ictype = 'npy_int%s' % (bits)
+                self.header_template = '#define %(ctype)s %(ictype)s'
+                self.capi_code_template = self.capi_code_template_logical_scalar
+                parent.apply_templates(self)
+                return
+            if ctype.startswith('f2py_string'):
+                self.bits = bits = int(ctype[11:])
+                self.bytes = bits/CHAR_BIT
+                self.header_template = '''
+#include <string.h>
+typedef struct { char data[%(bytes)s] } %(ctype)s;
+'''
+                self.capi_code_template = self.capi_code_template_string_scalar
+                parent.apply_templates(self)
+                return
         raise NotImplementedError,`name,ctype`
 
 class PythonCAPIDerivedType(WrapperBase):

Modified: trunk/numpy/f2py/lib/test_scalar_in_out.py
===================================================================
--- trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-07 15:13:03 UTC (rev 3287)
+++ trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-07 18:05:18 UTC (rev 3288)
@@ -70,6 +70,36 @@
 !f2py intent(in,out) a
       a = a + 1.0d0
       end
+      subroutine foobool1(a)
+      logical*1 a
+!f2py intent(in,out) a
+      a = .not. a
+      end
+      subroutine foobool2(a)
+      logical*2 a
+!f2py intent(in,out) a
+      a = .not. a
+      end
+      subroutine foobool4(a)
+      logical*4 a
+!f2py intent(in,out) a
+      a = .not. a
+      end
+      subroutine foobool8(a)
+      logical*8 a
+!f2py intent(in,out) a
+      a = .not. a
+      end
+      subroutine foostring1(a)
+      character*1 a
+!f2py intent(in,out) a
+      a = "1"
+      end
+      subroutine foostring5(a)
+      character*5 a
+!f2py intent(in,out) a
+      a(1:2) = "12"
+      end
 '''
 
 # tester note: set rebuild=True when changing fortan_code and for SVN
@@ -369,5 +399,125 @@
         self.assertRaises(TypeError,lambda :func([2,1,3]))
         self.assertRaises(TypeError,lambda :func({}))
 
+    def check_foo_bool1(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool1
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_bool2(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool2
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_bool4(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool4
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_bool8(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool8
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_string1(self, level=1):
+        i = string0('a')
+        e = string0('1')
+        func = m.foostring1
+        assert isinstance(i,string0),`type(i)`
+        r = func(i)
+        assert isinstance(r,string0),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func('ab')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,e)
+
+        r = func('')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,e)
+
+    def check_foo_string5(self, level=1):
+        i = string0('abcde')
+        e = string0('12cde')
+        func = m.foostring5
+        assert isinstance(i,string0),`type(i)`
+        r = func(i)
+        assert isinstance(r,string0),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func('abc')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,'12c  ')
+
+        r = func('abcdefghi')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,'12cde')
+
+        r = func([1])
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,'12]  ')
+        
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Sun Oct  8 02:38:06 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun,  8 Oct 2006 01:38:06 -0500 (CDT)
Subject: [Numpy-svn] r3289 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061008063806.6B7A839C018@new.scipy.org>

Author: pearu
Date: 2006-10-08 01:37:50 -0500 (Sun, 08 Oct 2006)
New Revision: 3289

Removed:
   trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
Modified:
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_scalar_in_out.py
   trunk/numpy/f2py/lib/wrapper_base.py
Log:
F2PY G3: added support and tests for character*(*) types.

Deleted: trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py
===================================================================
--- trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-07 18:05:18 UTC (rev 3288)
+++ trunk/numpy/f2py/lib/generate_pyobj_tofrom_funcs.py	2006-10-08 06:37:50 UTC (rev 3289)
@@ -1,131 +0,0 @@
-"""
-Generate
-  int pyobj_to_<ctype>(PyObject* obj, <ctype>* value)
-  PyObject* pyobj_from_<stype>(<ctype>* value)
-functions.
-"""
-__all__ = ['pyobj_to_npy_scalar','pyobj_to_f2py_string','pyobj_from_npy_scalar']
-
-from parser.api import CHAR_BIT
-
-def pyobj_from_npy_int(ctype):
-    dtype = ctype.upper()
-    cls = 'Int'+ctype[7:]
-    return '''\
-static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
-  PyObject* obj = PyArrayScalar_New(%(cls)s);
-  if (obj==NULL) /* TODO: set exception */ return NULL;
-  PyArrayScalar_ASSIGN(obj,%(cls)s,*value);
-  return obj;
-}
-''' % (locals())
-
-def pyobj_from_npy_float(ctype):
-    dtype = ctype.upper()
-    cls = 'Float'+ctype[9:]
-    return '''\
-/* depends: SCALARS_IN_BITS2.cpp */
-static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
-  PyObject* obj = PyArrayScalar_New(%(cls)s);
-  if (obj==NULL) /* TODO: set exception */ return NULL;
-  PyArrayScalar_ASSIGN(obj,%(cls)s,*value);
-  return obj;
-}
-''' % (locals())
-
-def pyobj_from_npy_complex(ctype):
-    dtype = ctype.upper()
-    cls = 'Complex'+ctype[11:]
-    return '''\
-/* depends: SCALARS_IN_BITS2.cpp */
-static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
-  PyObject* obj = PyArrayScalar_New(%(cls)s);
-  if (obj==NULL) /* TODO: set exception */ return NULL;
-  PyArrayScalar_ASSIGN(obj,%(cls)s,*value);
-  return obj;
-}
-''' % (locals())
-
-def pyobj_from_f2py_type(ctype):
-    ctype_bits = int(ctype[10:])
-    raise NotImplementedError,`ctype`
-    return '''\
-static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
-  fprintf(stderr,"In pyobj_from_%(ctype)s (%%p)\\n", value);
-}
-'''
-
-
-
-def pyobj_to_npy_int(ctype):
-    Cls = ctype[4].upper()+ctype[5:]
-    ctype_bits = int(ctype[7:])
-    CTYPE = ctype.upper()
-    return capi_code_template_scalar % (locals())
-
-def pyobj_to_npy_float(ctype):
-    Cls = ctype[4].upper()+ctype[5:]
-    ctype_bits = int(ctype[9:])
-    CTYPE = ctype.upper()
-    return capi_code_template_scalar % (locals())
-
-def pyobj_to_npy_complex(ctype):
-    ctype_bits = int(ctype[11:])
-    cfloat_bits = ctype_bits/2
-    return '''
-/* depends: pyobj_to_Py_complex.c */
-#if NPY_BITSOF_DOUBLE >= %(cfloat_bits)s
-static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
-  int return_value = 0;
-  Py_complex c;
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
-#endif
-  if (pyobj_to_Py_complex(obj,&c)) {
-    (*value).real = (npy_float%(cfloat_bits)s)c.real;
-    (*value).imag = (npy_float%(cfloat_bits)s)c.imag;
-    return_value = 1;
-  }
-#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
-#endif
-  return return_value;
-}
-#else
-#error, "NOTIMPLEMENTED pyobj_to_%(ctype)s"
-#endif
-''' % (locals())
-
-def pyobj_to_npy_scalar(ctype):
-    if ctype.startswith('npy_int'):
-        return dict(c_code=pyobj_to_npy_int(ctype))
-    elif ctype.startswith('npy_float'):
-        return dict(c_code=pyobj_to_npy_float(ctype))
-    elif ctype.startswith('npy_complex'):
-        return dict(c_code=pyobj_to_npy_complex(ctype))
-    raise NotImplementedError,`ctype`
-
-def pyobj_to_f2py_string(ctype):
-    ctype_bits = int(ctype[11:])
-    ctype_bytes = ctype_bits / CHAR_BIT
-    return dict(
-        c_code = '''
-/* depends: pyobj_to_string_len.c */
-static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
-  return pyobj_to_string_len(obj, (f2py_string*)value, %(ctype_bytes)s);
-}
-''' % (locals()),
-        typedef = ['typedef char * f2py_string;',
-                         'typedef struct { char data[%(ctype_bytes)s]; } %(ctype); ' % (locals())],
-        header = ['#include <string.h>'],
-        )
-
-def pyobj_from_npy_scalar(ctype):
-    if ctype.startswith('npy_int'):
-        return dict(c_code=pyobj_from_npy_int(ctype))
-    elif ctype.startswith('npy_float'):
-        return dict(c_code=pyobj_from_npy_float(ctype))
-    elif ctype.startswith('npy_complex'):
-        return dict(c_code=pyobj_from_npy_complex(ctype))
-    raise NotImplementedError,`ctype`
-

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-07 18:05:18 UTC (rev 3288)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-08 06:37:50 UTC (rev 3289)
@@ -445,7 +445,10 @@
     default_kind = 1
 
     def get_bit_size(self):
-        return CHAR_BIT * int(self.get_length()) * int(self.get_kind())
+        length = self.get_length()
+        if length=='*':
+            return 0  # model for character*(*)
+        return CHAR_BIT * int(length) * int(self.get_kind())
 
     def get_c_type(self):
         return 'f2py_string%s' % (self.get_bit_size())

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-07 18:05:18 UTC (rev 3288)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-08 06:37:50 UTC (rev 3289)
@@ -31,10 +31,9 @@
   volatile int f2py_success = 1;
   %(decl_list)s
   static char *capi_kwlist[] = {%(kw_clist+optkw_clist+extrakw_clist+["NULL"])s};
-  if (!PyArg_ParseTupleAndKeywords(capi_args,capi_keywds,
-                                   "%(pyarg_format_elist)s",
-                                   %(["capi_kwlist"]+pyarg_obj_clist)s))
-     return NULL;
+  if (PyArg_ParseTupleAndKeywords(capi_args,capi_keywds,
+                                  "%(pyarg_format_elist)s",
+                                   %(["capi_kwlist"]+pyarg_obj_clist)s)) {
   %(frompyobj_list)s
   %(call_list)s
   f2py_success = !PyErr_Occurred();
@@ -46,6 +45,7 @@
   }
   %(clean_call_list)s
   %(clean_frompyobj_list)s
+  }
   return capi_buildvalue;
 }
 '''
@@ -79,17 +79,28 @@
         self.clean_frompyobj_list = []
 
         args_f = []
+        extra_args_f = []
         for argname in block.args:
             var = block.a.variables[argname]
             typedecl = var.get_typedecl()
             PythonCAPIType(parent, typedecl)
             ctype = typedecl.get_c_type()
-            self.decl_list.append('%s %s;' % (ctype, argname))
+            if ctype=='f2py_string0':
+                self.decl_list.append('%s %s = {NULL,0};' % (ctype, argname))
+            else:
+                self.decl_list.append('%s %s;' % (ctype, argname))
             self.kw_list.append('"%s"' % (argname))
             self.pyarg_format_list.append('O&')
             self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ctype, argname))
             if 1: # is_scalar
-                args_f.append('&'+argname)
+                if ctype=='f2py_string0':
+                    args_f.append('%s.data' % argname)
+                    extra_args_f.append('%s.len' % argname)
+                    self.clean_frompyobj_list.append(\
+                        'if (%s.len) free(%s.data);' % (argname,argname))
+                else:
+                    args_f.append('&'+argname)
+                
             else:
                 args_f.append(argname)
             if var.is_intent_out(): # and is_scalar
@@ -97,7 +108,7 @@
                 self.return_obj_list.append('\npyobj_from_%s, &%s' % (ctype, argname))
 
         WrapperCPPMacro(parent, 'F_FUNC')
-        self.call_list.append('%s_f(%s);' % (name,', '.join(args_f)))
+        self.call_list.append('%s_f(%s);' % (name,', '.join(args_f+extra_args_f)))
 
         self.clean_pyobjfrom_list.reverse()
         self.clean_call_list.reverse()

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-07 18:05:18 UTC (rev 3288)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-08 06:37:50 UTC (rev 3289)
@@ -238,6 +238,52 @@
 #endif
   return return_value;
 }
+'''
+    capi_code_template_string0_scalar = '''
+static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value) {
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_from_%(ctype)s(value->len=%%d, value->data=\'%%s\')\\n",value->len, value->data);
+#endif
+  PyArray_Descr* descr = PyArray_DescrNewFromType(NPY_STRING);
+  descr->elsize = value->len;
+  PyObject* obj = PyArray_Scalar(value->data, descr, NULL);
+  if (obj==NULL) /* TODO: set exception */ return NULL;
+  return obj;
+}
+
+static int pyobj_to_%(ctype)s(PyObject *obj, %(ctype)s* value) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (PyString_Check(obj)) {
+    value->len = PyString_GET_SIZE(obj);
+    value->data = malloc(value->len*sizeof(char));
+    return_value = !! strncpy(value->data,PyString_AS_STRING(obj),value->len);
+  } else {
+    return_value = pyobj_to_%(ctype)s(PyObject_Str(obj), value);
+  }
+  if (!return_value && !PyErr_Occurred()) {
+    PyObject* r = PyString_FromString("Failed to convert ");
+    PyString_ConcatAndDel(&r, PyObject_Repr(PyObject_Type(obj)));
+    PyString_ConcatAndDel(&r, PyString_FromString(" to C %(ctype)s"));
+    PyErr_SetObject(PyExc_TypeError,r);
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  if (PyErr_Occurred()) {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s: PyErr_Occurred()=%%p\\n", PyErr_Occurred());
+  } else {
+    if (return_value)
+      fprintf(stderr,"pyobj_to_%(ctype)s: value->len=%%d, value->data=\'%%s\'\\n", value->len, value->data);
+    else
+      fprintf(stderr,"pyobj_to_%(ctype)s:INCONSISTENCY with return_value=%%d and PyErr_Occurred()=%%p\\n",return_value, PyErr_Occurred());
+  }
+#endif
+  return return_value;
+}
 ''' 
     _defined = []
     def __init__(self, parent, typedecl):
@@ -270,12 +316,21 @@
                 self.capi_code_template = self.capi_code_template_logical_scalar
                 parent.apply_templates(self)
                 return
+            if ctype == 'f2py_string0':
+                self.header_template = '''
+#include <string.h>
+typedef struct { char* data; size_t len; } %(ctype)s;
+'''
+                self.capi_code_template = self.capi_code_template_string0_scalar
+                parent.apply_templates(self)
+                return
+                raise NotImplementedError,`name,ctype`
             if ctype.startswith('f2py_string'):
                 self.bits = bits = int(ctype[11:])
                 self.bytes = bits/CHAR_BIT
                 self.header_template = '''
 #include <string.h>
-typedef struct { char data[%(bytes)s] } %(ctype)s;
+typedef struct { char data[%(bytes)s]; } %(ctype)s;
 '''
                 self.capi_code_template = self.capi_code_template_string_scalar
                 parent.apply_templates(self)

Modified: trunk/numpy/f2py/lib/test_scalar_in_out.py
===================================================================
--- trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-07 18:05:18 UTC (rev 3288)
+++ trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-08 06:37:50 UTC (rev 3289)
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
+"""
 
+"""
+
 import os
 import sys
 from numpy.testing import *
@@ -100,6 +103,13 @@
 !f2py intent(in,out) a
       a(1:2) = "12"
       end
+      subroutine foostringstar(a)
+      character*(*) a
+!f2py intent(in,out) a
+      if (len(a).gt.0) then
+        a(1:1) = "1"
+      endif
+      end
 '''
 
 # tester note: set rebuild=True when changing fortan_code and for SVN
@@ -518,6 +528,15 @@
         r = func([1])
         assert isinstance(r,string0),`type(r)`
         assert_equal(r,'12]  ')
+
+    def check_foo_string0(self, level=1):
+        i = string0('abcde')
+        e = string0('12cde')
+        func = m.foostringstar
+        r = func('abcde')
+        assert_equal(r,'1bcde')
+        r = func('')
+        assert_equal(r,'')
         
 if __name__ == "__main__":
     NumpyTest().run()

Modified: trunk/numpy/f2py/lib/wrapper_base.py
===================================================================
--- trunk/numpy/f2py/lib/wrapper_base.py	2006-10-07 18:05:18 UTC (rev 3288)
+++ trunk/numpy/f2py/lib/wrapper_base.py	2006-10-08 06:37:50 UTC (rev 3289)
@@ -109,7 +109,9 @@
     def apply_templates(self, child):
         for n in self.list_names:
             l = getattr(self,n + '_list')
-            l.append(child.apply_attributes(getattr(child, n+'_template','')))
+            c = child.apply_attributes(getattr(child, n+'_template',''))
+            if c:
+                l.append(c)
         return
 
 class WrapperCPPMacro(WrapperBase):



From numpy-svn at scipy.org  Sun Oct  8 05:30:26 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun,  8 Oct 2006 04:30:26 -0500 (CDT)
Subject: [Numpy-svn] r3290 - in trunk/numpy/distutils: . command fcompiler
Message-ID: <20061008093026.D70F039C018@new.scipy.org>

Author: pearu
Date: 2006-10-08 04:30:17 -0500 (Sun, 08 Oct 2006)
New Revision: 3290

Modified:
   trunk/numpy/distutils/command/build_clib.py
   trunk/numpy/distutils/command/build_ext.py
   trunk/numpy/distutils/fcompiler/__init__.py
   trunk/numpy/distutils/fcompiler/gnu.py
   trunk/numpy/distutils/misc_util.py
Log:
numpy.distutils: use language flag or source file extension to select default f77 or f90 compiler.

Modified: trunk/numpy/distutils/command/build_clib.py
===================================================================
--- trunk/numpy/distutils/command/build_clib.py	2006-10-08 06:37:50 UTC (rev 3289)
+++ trunk/numpy/distutils/command/build_clib.py	2006-10-08 09:30:17 UTC (rev 3290)
@@ -46,9 +46,12 @@
             return
 
         # Make sure that library sources are complete.
+        languages = []
         for (lib_name, build_info) in self.libraries:
             if not all_strings(build_info.get('sources',[])):
                 self.run_command('build_src')
+            l = build_info.get('language',None)
+            if l and l not in languages: languages.append(l)
 
         from distutils.ccompiler import new_compiler
         self.compiler = new_compiler(compiler=self.compiler,
@@ -69,7 +72,8 @@
             self.fcompiler = new_fcompiler(compiler=self.fcompiler,
                                            verbose=self.verbose,
                                            dry_run=self.dry_run,
-                                           force=self.force)
+                                           force=self.force,
+                                           requiref90='f90' in languages)
             self.fcompiler.customize(self.distribution)
 
             libraries = self.libraries
@@ -124,12 +128,14 @@
                          'for fortran compiler: %s' \
                          % (config_fc))
                 from numpy.distutils.fcompiler import new_fcompiler
+                requiref90 = build_info.get('language','c')=='f90'
                 fcompiler = new_fcompiler(compiler=self.fcompiler.compiler_type,
                                           verbose=self.verbose,
                                           dry_run=self.dry_run,
-                                          force=self.force)
+                                          force=self.force,
+                                          requiref90=requiref90)
                 fcompiler.customize(config_fc)
-
+            
             macros = build_info.get('macros')
             include_dirs = build_info.get('include_dirs')
             extra_postargs = build_info.get('extra_compiler_args') or []

Modified: trunk/numpy/distutils/command/build_ext.py
===================================================================
--- trunk/numpy/distutils/command/build_ext.py	2006-10-08 06:37:50 UTC (rev 3289)
+++ trunk/numpy/distutils/command/build_ext.py	2006-10-08 09:30:17 UTC (rev 3290)
@@ -75,6 +75,13 @@
                     need_f_compiler = 1
                     break
 
+        requiref90 = 0
+        if need_f_compiler:
+            for ext in self.extensions:
+                if getattr(ext,'language','c')=='f90':
+                    requiref90 = 1
+                    break
+
         # Determine if C++ compiler is needed.
         need_cxx_compiler = 0
         for ext in self.extensions:
@@ -100,7 +107,8 @@
             self.fcompiler = new_fcompiler(compiler=self.fcompiler,
                                            verbose=self.verbose,
                                            dry_run=self.dry_run,
-                                           force=self.force)
+                                           force=self.force,
+                                           requiref90=requiref90)
             if self.fcompiler.get_version():
                 self.fcompiler.customize(self.distribution)
                 self.fcompiler.customize_cmd(self)

Modified: trunk/numpy/distutils/fcompiler/__init__.py
===================================================================
--- trunk/numpy/distutils/fcompiler/__init__.py	2006-10-08 06:37:50 UTC (rev 3289)
+++ trunk/numpy/distutils/fcompiler/__init__.py	2006-10-08 09:30:17 UTC (rev 3290)
@@ -104,6 +104,11 @@
     shared_lib_format = "%s%s"
     exe_extension = ""
 
+    # If compiler does not support compiling Fortran 90 then it can
+    # suggest using another compiler. For example, gnu would suggest
+    # gnu95 compiler type when there are F90 sources.
+    suggested_f90_compiler = None
+
     ######################################################################
     ## Methods that subclasses may redefine. But don't call these methods!
     ## They are private to FCompiler class and may return unexpected
@@ -589,13 +594,23 @@
     ('mac',('gnu','gnu95',)),
     )
 
-def _find_existing_fcompiler(compilers, osname=None, platform=None):
+def _find_existing_fcompiler(compilers, osname=None, platform=None, requiref90=None):
     for compiler in compilers:
         v = None
         try:
             c = new_fcompiler(plat=platform, compiler=compiler)
             c.customize()
             v = c.get_version()
+            if requiref90 and c.compiler_f90 is None:
+                v = None
+                new_compiler = c.suggested_f90_compiler
+                if new_compiler:
+                    c = new_fcompiler(plat=platform, compiler=new_compiler)
+                    c.customize()
+                    v = c.get_version()
+            if requiref90 and c.compiler_f90 is None:
+                raise ValueError,'%s does not support compiling f90 codes, skipping.' \
+                      % (c.__class__.__name__)
         except DistutilsModuleError:
             pass
         except Exception, msg:
@@ -604,7 +619,7 @@
             return compiler
     return
 
-def get_default_fcompiler(osname=None, platform=None):
+def get_default_fcompiler(osname=None, platform=None, requiref90=None):
     """ Determine the default Fortran compiler to use for the given platform. """
     if osname is None:
         osname = os.name
@@ -622,7 +637,8 @@
         matching_compilers.append('gnu')
     compiler =  _find_existing_fcompiler(matching_compilers,
                                          osname=osname,
-                                         platform=platform)
+                                         platform=platform,
+                                         requiref90=requiref90)
     if compiler is not None:
         return compiler
     return matching_compilers[0]
@@ -631,7 +647,8 @@
                   compiler=None,
                   verbose=0,
                   dry_run=0,
-                  force=0):
+                  force=0,
+                  requiref90=0):
     """ Generate an instance of some FCompiler subclass for the supplied
     platform/compiler combination.
     """
@@ -639,7 +656,7 @@
         plat = os.name
     try:
         if compiler is None:
-            compiler = get_default_fcompiler(plat)
+            compiler = get_default_fcompiler(plat,requiref90=requiref90)
         (module_name, class_name, long_description) = fcompiler_class[compiler]
     except KeyError:
         msg = "don't know how to compile Fortran code on platform '%s'" % plat

Modified: trunk/numpy/distutils/fcompiler/gnu.py
===================================================================
--- trunk/numpy/distutils/fcompiler/gnu.py	2006-10-08 06:37:50 UTC (rev 3289)
+++ trunk/numpy/distutils/fcompiler/gnu.py	2006-10-08 09:30:17 UTC (rev 3290)
@@ -28,7 +28,7 @@
     executables = {
         'version_cmd'  : [fc_exe,"--version"],
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
-        'compiler_f90' : None,
+        'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
         'linker_so'    : [fc_exe, "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
@@ -50,6 +50,8 @@
 
     g2c = 'g2c'
 
+    suggested_f90_compiler = 'gnu95'
+
     #def get_linker_so(self):
     #    # win32 linking should be handled by standard linker
     #    # Darwin g77 cannot be used as a linker.

Modified: trunk/numpy/distutils/misc_util.py
===================================================================
--- trunk/numpy/distutils/misc_util.py	2006-10-08 06:37:50 UTC (rev 3289)
+++ trunk/numpy/distutils/misc_util.py	2006-10-08 09:30:17 UTC (rev 3290)
@@ -19,7 +19,7 @@
            'get_dependencies', 'is_local_src_dir', 'get_ext_source_files',
            'get_script_files', 'get_lib_source_files', 'get_data_files',
            'dot_join', 'get_frame', 'minrelpath','njoin',
-           'is_sequence', 'is_string', 'as_list', 'gpaths']
+           'is_sequence', 'is_string', 'as_list', 'gpaths', 'get_language']
 
 def allpath(name):
     "Convert a /-separated pathname to one using the OS's path separator."
@@ -308,6 +308,18 @@
     else:
         return [seq]
 
+def get_language(sources):
+    """ Determine language value (c,f77,f90) from sources """
+    language = 'c'
+    for source in sources:
+        if isinstance(source, str):
+            if f90_ext_match(source):
+                language = 'f90'
+                break
+            elif fortran_ext_match(source):
+                language = 'f77'
+    return language
+
 def has_f_sources(sources):
     """ Return True if sources contains Fortran files """
     for source in sources:
@@ -1018,6 +1030,10 @@
         ext_args['name'] = dot_join(self.name,name)
         ext_args['sources'] = sources
 
+        language = ext_args.get('language',None)
+        if language is None:
+            ext_args['language'] = get_language(sources)
+
         if ext_args.has_key('extra_info'):
             extra_info = ext_args['extra_info']
             del ext_args['extra_info']
@@ -1076,11 +1092,16 @@
           include_dirs
           extra_compiler_args
           f2py_options
+          language
         """
         build_info = copy.copy(build_info)
         name = name #+ '__OF__' + self.name
         build_info['sources'] = sources
 
+        language = build_info.get('language',None)
+        if language is None:
+            build_info['language'] = get_language(sources)
+
         self._fix_paths_dict(build_info)
 
         self.libraries.append((name,build_info))
@@ -1379,7 +1400,11 @@
 def dict_append(d, **kws):
     for k, v in kws.items():
         if d.has_key(k):
-            d[k].extend(v)
+            ov = d[k]
+            if isinstance(ov,str):
+                d[k] = v
+            else:
+                d[k].extend(v)
         else:
             d[k] = v
 



From numpy-svn at scipy.org  Sun Oct  8 05:38:15 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun,  8 Oct 2006 04:38:15 -0500 (CDT)
Subject: [Numpy-svn] r3291 - trunk/numpy/distutils/fcompiler
Message-ID: <20061008093815.9541839C018@new.scipy.org>

Author: pearu
Date: 2006-10-08 04:38:12 -0500 (Sun, 08 Oct 2006)
New Revision: 3291

Modified:
   trunk/numpy/distutils/fcompiler/__init__.py
Log:
numpy.distutils: fixed bug.

Modified: trunk/numpy/distutils/fcompiler/__init__.py
===================================================================
--- trunk/numpy/distutils/fcompiler/__init__.py	2006-10-08 09:30:17 UTC (rev 3290)
+++ trunk/numpy/distutils/fcompiler/__init__.py	2006-10-08 09:38:12 UTC (rev 3291)
@@ -605,9 +605,12 @@
                 v = None
                 new_compiler = c.suggested_f90_compiler
                 if new_compiler:
+                    log.warn('Trying %r compiler as suggested by %r compiler for f90 support.' % (compiler, new_compiler))
                     c = new_fcompiler(plat=platform, compiler=new_compiler)
                     c.customize()
                     v = c.get_version()
+                    if v is not None:
+                        compiler = new_compiler
             if requiref90 and c.compiler_f90 is None:
                 raise ValueError,'%s does not support compiling f90 codes, skipping.' \
                       % (c.__class__.__name__)



From numpy-svn at scipy.org  Sun Oct  8 09:16:24 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun,  8 Oct 2006 08:16:24 -0500 (CDT)
Subject: [Numpy-svn] r3292 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061008131624.67FEF39C013@new.scipy.org>

Author: pearu
Date: 2006-10-08 08:16:13 -0500 (Sun, 08 Oct 2006)
New Revision: 3292

Added:
   trunk/numpy/f2py/lib/test_derived_scalar.py
Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/block_statements.py
   trunk/numpy/f2py/lib/parser/statements.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_scalar_in_out.py
Log:
F2PY G3: added simple test for subroutine with derived type intent(in,out) argument. Fixed bugs.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/main.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -44,6 +44,56 @@
   --2d-numeric     Use f2py2e tool with Numeric support.
   --2d-numarray    Use f2py2e tool with Numarray support.
 
+  -m <modulename>  Name of the module; f2py generates a Python/C API
+                   file <modulename>module.c or extension module <modulename>.
+                   For wrapping Fortran 90 modules, f2py will use Fortran
+                   module names.
+
+
+Options effective only with -h
+------------------------------
+
+  -h <filename>    Write signatures of the fortran routines to file <filename>
+                   and exit. You can then edit <filename> and use it instead
+                   of <fortran files> for generating extension module source.
+                   If <filename> is stdout or stderr then the signatures are
+                   printed to the corresponding stream.
+
+  --overwrite-signature  Overwrite existing signature file.
+
+Options effective only with -c
+------------------------------
+
+  -c               Compile fortran sources and build extension module.
+
+  --build-dir <dirname>  All f2py generated files are created in <dirname>.
+                   Default is tempfile.mktemp() and it will be removed after
+                   f2py stops unless <dirname> is specified via --build-dir
+                   option.
+
+numpy.distutils options effective only with -c
+----------------------------------------------
+
+  --fcompiler=<name>      Specify Fortran compiler type by vendor
+
+
+
+Extra options effective only with -c
+------------------------------------
+
+  -L/path/to/lib/ -l<libname>
+  -D<name[=define]> -U<name>
+  -I/path/to/include/
+  <filename>.o <filename>.(so|dynlib|dll) <filename>.a
+
+  Using the following macros may be required with non-gcc Fortran
+  compilers:
+    -DPREPEND_FORTRAN -DNO_APPEND_FORTRAN -DUPPERCASE_FORTRAN
+    -DUNDERSCORE_G77
+
+  -DF2PY_DEBUG_PYOBJ_TOFROM  --- pyobj_(to|from)_<ctype> functions will
+  print debugging messages to stderr.
+
 """
 
 import re
@@ -266,6 +316,7 @@
                                  undef_macros = undef_macros,
                                  include_dirs = include_dirs,
                                  extra_objects = extra_objects,
+                                 language = 'f90',
                                  )
         if external_subprograms:
             wrapper = PythonWrapperModule(modulename)

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -426,8 +426,9 @@
             l.append(ttab + 'a=' + self.a.torepr(depth-1,incrtab+'  ').lstrip())
         return '\n'.join(l)
 
-    def get_indent_tab(self,colon=None,deindent=False):
-        if self.reader.isfix:
+    def get_indent_tab(self,colon=None,deindent=False,isfix=None):
+        if isfix is None: isfix = self.reader.isfix
+        if isfix:
             tab = ' '*6
         else:
             tab = ''
@@ -441,19 +442,35 @@
             return tab
         s = self.item.label
         if colon is None:
-            if self.reader.isfix:
+            if isfix:
                 colon = ''
             else:
                 colon = ':'
         if s:
             c = ''
-            if self.reader.isfix:
+            if isfix:
                 c = ' '
             tab = tab[len(c+s)+len(colon):]
             if not tab: tab = ' '
             tab = c + s + colon + tab
         return tab
 
+    def __str__(self):
+        return self.tofortran()
+
+    def asfix(self):
+        lines = []
+        for line in self.tofortran(isfix=True).split('\n'):
+            if len(line)>72 and line[0]==' ':
+                lines.append(line[:72]+'&\n     &')
+                line = line[72:]
+                while len(line)>66:
+                    lines.append(line[:66]+'&\n     &')
+                    line = line[66:]
+                lines.append(line+'\n')
+            else: lines.append(line+'\n')
+        return ''.join(lines).replace('\n     &\n','\n')
+        
     def format_message(self, kind, message):
         if self.item is not None:
             message = self.reader.format_message(kind, message,
@@ -544,11 +561,11 @@
 
     def tostr(self):
         return self.blocktype.upper() + ' '+ self.name
-    
-    def __str__(self):
-        l=[self.get_indent_tab(colon=':') + self.tostr()]
+
+    def tofortran(self, isfix=None):
+        l=[self.get_indent_tab(colon=':', isfix=isfix) + self.tostr()]
         for c in self.content:
-            l.append(str(c))
+            l.append(c.tofortran(isfix=isfix))
         return '\n'.join(l)
 
     def torepr(self, depth=-1, incrtab=''):
@@ -736,10 +753,10 @@
     def analyze(self):
         return
 
-    def get_indent_tab(self,colon=None,deindent=False):
-        return Statement.get_indent_tab(self, colon=colon, deindent=True)
+    def get_indent_tab(self,colon=None,deindent=False,isfix=None):
+        return Statement.get_indent_tab(self, colon=colon, deindent=True,isfix=isfix)
 
-    def __str__(self):
-        return self.get_indent_tab() + 'END %s %s'\
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'END %s %s'\
                % (self.blocktype.upper(),self.name or '')
 

Modified: trunk/numpy/f2py/lib/parser/block_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -846,8 +846,8 @@
         assert len(self.content)==1,`self.content`
         return 'IF (%s) %s' % (self.expr, str(self.content[0]).lstrip())
 
-    def __str__(self):
-        return self.get_indent_tab(colon=':') + self.tostr()
+    def tofortran(self,isfix=None):
+        return self.get_indent_tab(colon=':',isfix=isfix) + self.tostr()
 
     def get_classes(self):
         return action_stmt

Modified: trunk/numpy/f2py/lib/parser/statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/statements.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/parser/statements.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -56,7 +56,8 @@
                 return
             items.append(item)
         return
-    def __str__(self):
+
+    def tofortran(self,isfix=None):
         if hasattr(self,'stmtname'):
             clsname = self.stmtname.upper()
         else:
@@ -64,7 +65,7 @@
         s = ', '.join(self.items)
         if s:
             s = ' ' + s
-        return self.get_indent_tab() + clsname + s
+        return self.get_indent_tab(isfix=isfix) + clsname + s
 
 # Execution statements
 
@@ -100,8 +101,8 @@
         self.expr = apply_map(m.group('expr'))
         return
 
-    def __str__(self):
-        return self.get_indent_tab() + '%s %s %s' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + '%s %s %s' \
                % (self.variable, self.sign, self.expr)
 
     def analyze(self): return
@@ -124,8 +125,8 @@
         assert not self.item.has_map()
         self.items = [line[:i].rstrip(),line[i+2:].lstrip()]
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'ASSIGN %s TO %s' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'ASSIGN %s TO %s' \
                % (self.items[0], self.items[1])
     def analyze(self): return
 
@@ -173,8 +174,8 @@
         self.items = items
         return
 
-    def __str__(self):
-        s = self.get_indent_tab() + 'CALL '+str(self.designator)
+    def tofortran(self, isfix=None):
+        s = self.get_indent_tab(isfix=isfix) + 'CALL '+str(self.designator)
         if self.items:
             s += '('+', '.join(map(str,self.items))+ ')'
         return s
@@ -199,8 +200,8 @@
         self.label = self.item.get_line()[2:].lstrip()[2:].lstrip()
         return
 
-    def __str__(self):
-        return self.get_indent_tab() + 'GO TO %s' % (self.label)
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'GO TO %s' % (self.label)
     def analyze(self): return
 
 class ComputedGoto(Statement):
@@ -218,8 +219,8 @@
             line = line[1:].lstrip()
         self.expr = apply_map(line)
         return
-    def __str__(self):
-        return  self.get_indent_tab() + 'GO TO (%s) %s' \
+    def tofortran(self, isfix=None):
+        return  self.get_indent_tab(isfix=isfix) + 'GO TO (%s) %s' \
                % (', '.join(self.items), self.expr)
     def analyze(self): return
 
@@ -242,8 +243,8 @@
         self.items = split_comma(line[i+1:-1], self.item)
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         if self.items:
             return tab + 'GO TO %s (%s)' \
                    % (self.varname, ', '.join(self.items)) 
@@ -260,7 +261,7 @@
         self.label = self.item.label
         return
 
-    def __str__(self):
+    def tofortran(self, isfix=None):
         return self.get_indent_tab(deindent=True) + 'CONTINUE'
 
     def analyze(self): return
@@ -275,8 +276,8 @@
         self.expr = self.item.apply_map(self.item.get_line()[6:].lstrip())
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         if self.expr:
             return tab + 'RETURN %s' % (self.expr)
         return tab + 'RETURN'
@@ -294,8 +295,8 @@
         self.code = self.item.apply_map(self.item.get_line()[4:].lstrip())
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         if self.code:
             return tab + 'STOP %s' % (self.code)
         return tab + 'STOP'
@@ -324,8 +325,8 @@
         self.items = items[1:]
         return
 
-    def __str__(self):
-        return self.get_indent_tab() + 'PRINT %s' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'PRINT %s' \
                % (', '.join([self.format]+self.items))
     def analyze(self): return
 
@@ -365,8 +366,8 @@
         self.items = split_comma(line[i+1:], item)
         return
 
-    def __str__(self):
-        s = self.get_indent_tab() + 'READ (%s)' % (', '.join(self.specs))
+    def tofortran(self, isfix=None):
+        s = self.get_indent_tab(isfix=isfix) + 'READ (%s)' % (', '.join(self.specs))
         if self.items:
             return s + ' ' + ', '.join(self.items)
         return s
@@ -381,8 +382,8 @@
         self.items = items[1:]
         return
 
-    def __str__(self):
-        return self.get_indent_tab() + 'READ ' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'READ ' \
                + ', '.join([self.format]+self.items)
 
 class Write(Statement):
@@ -399,8 +400,8 @@
         self.items = split_comma(line[i+1:], item)
         return
 
-    def __str__(self):
-        s = self.get_indent_tab() + 'WRITE (%s)' % ', '.join(self.specs)
+    def tofortran(self, isfix=None):
+        s = self.get_indent_tab(isfix=isfix) + 'WRITE (%s)' % ', '.join(self.specs)
         if self.items:
             s += ' ' + ', '.join(self.items)
         return s
@@ -430,8 +431,8 @@
             self.specs = specs_split_comma(line,self.item)
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         return tab + 'FLUSH (%s)' % (', '.join(self.specs))
     def analyze(self): return
 
@@ -452,8 +453,8 @@
         self.specs = specs_split_comma(\
             self.item.get_line()[4:].lstrip()[1:-1], self.item)
         return
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         return tab + 'WAIT (%s)' % (', '.join(self.specs))
     def analyze(self): return
 
@@ -463,7 +464,7 @@
     """
     match = re.compile(r'contains\Z',re.I).match
     def process_item(self): return
-    def __str__(self): return self.get_indent_tab() + 'CONTAINS'
+    def tofortran(self, isfix=None): return self.get_indent_tab(isfix=isfix) + 'CONTAINS'
 
 class Allocate(Statement):
     """
@@ -499,11 +500,11 @@
         self.items = specs_split_comma(line2, item2)
         return
 
-    def __str__(self):
+    def tofortran(self, isfix=None):
         t = ''
         if self.spec:
             t = self.spec.tostr() + ' :: '
-        return self.get_indent_tab() \
+        return self.get_indent_tab(isfix=isfix) \
                + 'ALLOCATE (%s%s)' % (t,', '.join(self.items))
     def analyze(self): return
 
@@ -521,7 +522,7 @@
         line = self.item.get_line()[10:].lstrip()[1:-1].strip()
         self.items = specs_split_comma(line, self.item)
         return
-    def __str__(self): return self.get_indent_tab() \
+    def tofortran(self, isfix=None): return self.get_indent_tab(isfix=isfix) \
         + 'DEALLOCATE (%s)' % (', '.join(self.items))
     def analyze(self): return
     
@@ -542,8 +543,8 @@
         self.items = items
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         return tab + 'MODULE PROCEDURE %s' % (', '.join(self.items))
 
     def analyze(self):
@@ -571,9 +572,9 @@
         self.items = split_comma(line, self.item)
         return
 
-    def __str__(self):
+    def tofortran(self, isfix=None):
         clsname = self.__class__.__name__.upper()
-        tab = self.get_indent_tab()
+        tab = self.get_indent_tab(isfix=isfix)
         if self.items:
             return tab + clsname + ' ' + ', '.join(self.items)
         return tab + clsname
@@ -607,8 +608,8 @@
         line = self.item.get_line()[5:].lstrip()[1:-1].strip()
         self.specs = specs_split_comma(line, self.item)
         return
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         return tab + 'CLOSE (%s)' % (', '.join(self.specs))
     def analyze(self): return
 
@@ -620,10 +621,10 @@
     def process_item(self):
         self.name = self.item.get_line()[5:].lstrip()
         return
-    def __str__(self):
+    def tofortran(self, isfix=None):
         if self.name:
-            return self.get_indent_tab() + 'CYCLE ' + self.name
-        return self.get_indent_tab() + 'CYCLE'
+            return self.get_indent_tab(isfix=isfix) + 'CYCLE ' + self.name
+        return self.get_indent_tab(isfix=isfix) + 'CYCLE'
     def analyze(self): return
 
 class FilePositioningStatement(Statement):
@@ -653,9 +654,9 @@
         self.specs = specs_split_comma(spec, self.item)
         return
 
-    def __str__(self):
+    def tofortran(self, isfix=None):
         clsname = self.__class__.__name__.upper()
-        return self.get_indent_tab() + clsname + ' (%s)' % (', '.join(self.specs))
+        return self.get_indent_tab(isfix=isfix) + clsname + ' (%s)' % (', '.join(self.specs))
     def analyze(self): return
 
 class Backspace(FilePositioningStatement): pass
@@ -676,8 +677,8 @@
         line = self.item.get_line()[4:].lstrip()[1:-1].strip()
         self.specs = specs_split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'OPEN (%s)' % (', '.join(self.specs))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'OPEN (%s)' % (', '.join(self.specs))
     def analyze(self): return
 
 class Format(Statement):
@@ -715,8 +716,8 @@
         assert line[0]+line[-1]=='()',`line`
         self.specs = split_comma(line[1:-1], item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'FORMAT (%s)' % (', '.join(self.specs))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'FORMAT (%s)' % (', '.join(self.specs))
     def analyze(self): return
 
 class Save(Statement):
@@ -750,8 +751,8 @@
                 return
         self.items = items
         return
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         if not self.items:
             return tab + 'SAVE'
         return tab + 'SAVE %s' % (', '.join(self.items))
@@ -797,8 +798,8 @@
         self.isvalid = True
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         l = []
         for o,v in self.stmts:
             l.append('%s / %s /' %(', '.join(o),', '.join(v)))
@@ -815,8 +816,8 @@
         line = self.item.get_line()[7:].lstrip()[1:-1].strip()
         self.items = split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'NULLIFY (%s)' % (', '.join(self.items))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'NULLIFY (%s)' % (', '.join(self.items))
     def analyze(self): return
 
 class Use(Statement):
@@ -857,8 +858,8 @@
             self.items = split_comma(line, self.item)
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         s = 'USE'
         if self.nature:
             s += ' ' + self.nature + ' ::'
@@ -912,10 +913,10 @@
     def process_item(self):
         self.name = self.item.get_line()[4:].lstrip()
         return
-    def __str__(self):
+    def tofortran(self, isfix=None):
         if self.name:
-            return self.get_indent_tab() + 'EXIT ' + self.name
-        return self.get_indent_tab() + 'EXIT'
+            return self.get_indent_tab(isfix=isfix) + 'EXIT ' + self.name
+        return self.get_indent_tab(isfix=isfix) + 'EXIT'
     def analyze(self): return
 
 class Parameter(Statement):
@@ -928,8 +929,8 @@
         line = self.item.get_line()[9:].lstrip()[1:-1].strip()
         self.items = split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'PARAMETER (%s)' % (', '.join(self.items))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'PARAMETER (%s)' % (', '.join(self.items))
     def analyze(self):
         for item in self.items:
             i = item.find('=')
@@ -957,8 +958,8 @@
             items.append('('+s+')')
         self.items = items
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'EQUIVALENCE %s' % (', '.join(self.items))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'EQUIVALENCE %s' % (', '.join(self.items))
     def analyze(self): return
 
 class Dimension(Statement):
@@ -973,8 +974,8 @@
             line = line[2:].lstrip()
         self.items = split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'DIMENSION %s' % (', '.join(self.items))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'DIMENSION %s' % (', '.join(self.items))
     def analyze(self):
         for line in self.items:
             i = line.find('(')
@@ -997,8 +998,8 @@
             line = line[2:].lstrip()
         self.items = split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'TARGET %s' % (', '.join(self.items))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'TARGET %s' % (', '.join(self.items))
     def analyze(self):
         for line in self.items:
             i = line.find('(')
@@ -1025,8 +1026,8 @@
             line = line[2:].lstrip()
         self.items = split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'POINTER %s' % (', '.join(self.items))
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'POINTER %s' % (', '.join(self.items))
     def analyze(self):
         for line in self.items:
             i = line.find('(')
@@ -1089,8 +1090,8 @@
         self.labels = [l1.strip(),l2.strip(),l3.strip()]
         return
 
-    def __str__(self):
-        return self.get_indent_tab() + 'IF (%s) %s' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'IF (%s) %s' \
                % (self.expr,', '.join(self.labels))
     def analyze(self): return
 
@@ -1123,11 +1124,11 @@
         self.specs = specs_split_comma(line[1:i].strip(), self.item)
         self.items = split_comma(line[i+1:].lstrip(), self.item)
         return
-    def __str__(self):
+    def tofortran(self, isfix=None):
         if self.items:
-            return self.get_indent_tab() + 'INQUIRE (%s) %s' \
+            return self.get_indent_tab(isfix=isfix) + 'INQUIRE (%s) %s' \
                    % (', '.join(self.specs), ', '.join(self.items))
-        return self.get_indent_tab() + 'INQUIRE (%s)' \
+        return self.get_indent_tab(isfix=isfix) + 'INQUIRE (%s)' \
                    % (', '.join(self.specs))
     def analyze(self): return
 
@@ -1138,7 +1139,7 @@
     match = re.compile(r'sequence\Z',re.I).match
     def process_item(self):
         return
-    def __str__(self): return self.get_indent_tab() + 'SEQUENCE'
+    def tofortran(self, isfix=None): return self.get_indent_tab(isfix=isfix) + 'SEQUENCE'
     def analyze(self):
         self.parent.update_attributes('SEQUENCE')
         return
@@ -1183,11 +1184,11 @@
         self.items = items
         return
 
-    def __str__(self):
+    def tofortran(self, isfix=None):
         l = []
         for name,s in self.items:
             l.append('%s %s' % (name,s))
-        tab = self.get_indent_tab()
+        tab = self.get_indent_tab(isfix=isfix)
         return tab + 'NAMELIST ' + ', '.join(l)
 
 class Common(Statement):
@@ -1223,7 +1224,7 @@
             line = line[i:].lstrip()
         self.items = items
         return
-    def __str__(self):
+    def tofortran(self, isfix=None):
         l = []
         for name,s in self.items:
             s = ', '.join(s)
@@ -1231,7 +1232,7 @@
                 l.append('/ %s / %s' % (name,s))
             else:
                 l.append(s)
-        tab = self.get_indent_tab()
+        tab = self.get_indent_tab(isfix=isfix)
         return tab + 'COMMON ' + ' '.join(l)
     def analyze(self):
         for cname, items in self.items:
@@ -1285,8 +1286,8 @@
                 self.isvalid = False
                 return
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'INTENT (%s) %s' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'INTENT (%s) %s' \
                % (', '.join(self.specs), ', '.join(self.items))
     def analyze(self):
         for name in self.items:
@@ -1326,8 +1327,8 @@
         self.name = name
         self.items = items
         return
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         s = tab + 'ENTRY '+self.name
         if self.items:
             s += ' (%s)' % (', '.join(self.items))
@@ -1392,8 +1393,8 @@
         self.mask = mask
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         l = []
         for index,s1,s2,s3 in self.specs:
             s = '%s = %s : %s' % (index,s1,s2)
@@ -1455,8 +1456,8 @@
             self.name = line[:i].rstrip()
             self.bname = line[i+1:].lstrip()[1:].lstrip()
         return
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         s = 'PROCEDURE '
         if self.iname:
             s += '(' + self.iname + ') '
@@ -1485,8 +1486,8 @@
         self.items = split_comma(line[i+2:].lstrip())
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         s = 'GENERIC'
         if self.aspec:
             s += ', '+self.aspec
@@ -1512,8 +1513,8 @@
             line = line[2:].lstrip()
         self.items = split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'ALLOCATABLE ' + ', '.join(self.items) 
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'ALLOCATABLE ' + ', '.join(self.items) 
     def analyze(self):
         for line in self.items:
             i = line.find('(')
@@ -1562,8 +1563,8 @@
             items.append(item)
         self.items = items
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'BIND (%s) %s' %\
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'BIND (%s) %s' %\
                (', '.join(self.specs), ', '.join(self.items))
 
 # IF construct statements
@@ -1584,7 +1585,7 @@
             self.isvalid = False        
         return
 
-    def __str__(self):
+    def tofortran(self, isfix=None):
         if self.name:
             return self.get_indent_tab(deindent=True) + 'ELSE ' + self.name
         return self.get_indent_tab(deindent=True) + 'ELSE'
@@ -1611,7 +1612,7 @@
             self.isvalid = False        
         return
         
-    def __str__(self):
+    def tofortran(self, isfix=None):
         s = ''
         if self.name:
             s = ' ' + self.name
@@ -1659,8 +1660,8 @@
             self.isvalid = False        
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         s = 'CASE'
         if self.items:
             l = []
@@ -1696,8 +1697,8 @@
         self.isvalid = False
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         return tab + 'WHERE ( %s ) %s' % (self.expr, str(self.content[0]).lstrip())
     def analyze(self): return
 
@@ -1725,8 +1726,8 @@
             self.isvalid = False
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         s = 'ELSE WHERE'
         if self.expr is not None:
             s += ' ( %s )' % (self.expr)
@@ -1749,8 +1750,8 @@
             line = line[2:].lstrip()
         self.items = split_comma(line, self.item)
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'ENUMERATOR ' + ', '.join(self.items)
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'ENUMERATOR ' + ', '.join(self.items)
 
 # F2PY specific statements
 
@@ -1762,8 +1763,8 @@
     def process_item(self):
         self.value = self.item.get_line()[11:].lstrip()
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'FORTRANNAME ' + self.value
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'FORTRANNAME ' + self.value
 
 class Threadsafe(Statement):
     """
@@ -1772,8 +1773,8 @@
     match = re.compile(r'threadsafe\Z',re.I).match
     def process_item(self):
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'THREADSAFE'
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'THREADSAFE'
 
 class Depend(Statement):
     """
@@ -1791,8 +1792,8 @@
         self.items = split_comma(line)
         return
 
-    def __str__(self):
-        return self.get_indent_tab() + 'DEPEND ( %s ) %s' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'DEPEND ( %s ) %s' \
                % (', '.join(self.depends), ', '.join(self.items))
 
 class Check(Statement):
@@ -1811,8 +1812,8 @@
             line = line[2:].lstrip()
         self.value = line
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'CHECK ( %s ) %s' \
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'CHECK ( %s ) %s' \
                % (self.expr, self.value)
 
 class CallStatement(Statement):
@@ -1823,8 +1824,8 @@
     def process_item(self):
         self.expr = self.item.apply_map(self.item.get_line()[13:].lstrip())
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'CALLSTATEMENT ' + self.expr
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'CALLSTATEMENT ' + self.expr
 
 class CallProtoArgument(Statement):
     """
@@ -1834,8 +1835,8 @@
     def process_item(self):
         self.specs = self.item.apply_map(self.item.get_line()[17:].lstrip())
         return
-    def __str__(self):
-        return self.get_indent_tab() + 'CALLPROTOARGUMENT ' + self.specs
+    def tofortran(self, isfix=None):
+        return self.get_indent_tab(isfix=isfix) + 'CALLPROTOARGUMENT ' + self.specs
 
 # Non-standard statements
 
@@ -1847,9 +1848,9 @@
     def process_item(self):
         self.value = self.item.apply_map(self.item.get_line()[5:].lstrip())
         return
-    def __str__(self):
+    def tofortran(self, isfix=None):
         if self.value:
-            return self.get_indent_tab() + 'PAUSE ' + self.value
-        return self.get_indent_tab() + 'PAUSE'
+            return self.get_indent_tab(isfix=isfix) + 'PAUSE ' + self.value
+        return self.get_indent_tab(isfix=isfix) + 'PAUSE'
     def analyze(self): return
 

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -260,8 +260,8 @@
                 
         return clsname + s
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self,isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         s = self.tostr()
         if self.attrspec:
             s += ', ' + ', '.join(self.attrspec)
@@ -270,6 +270,9 @@
         if self.entity_decls:
             s += ' ' + ', '.join(self.entity_decls)
         return tab + s
+    
+    def __str__(self):
+        return self.tofortran()
 
     def __eq__(self, other):
         if self.__class__ is not other.__class__:
@@ -538,8 +541,8 @@
         self.items = items
         return
 
-    def __str__(self):
-        tab = self.get_indent_tab()
+    def tofortran(self, isfix=None):
+        tab = self.get_indent_tab(isfix=isfix)
         if not self.items:
             return tab + 'IMPLICIT NONE'
         l = []

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -2,7 +2,8 @@
 __all__ = ['PythonCAPIType']
 
 from wrapper_base import *
-from parser.api import CHAR_BIT, Module, declaration_type_spec, TypeDecl
+from parser.api import CHAR_BIT, Module, declaration_type_spec, \
+     TypeDecl, TypeStmt, Subroutine, Function
 
 class PythonCAPIType(WrapperBase):
     """
@@ -11,7 +12,11 @@
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
         if isinstance(typedecl, tuple(declaration_type_spec)):
-            PythonCAPIIntrinsicType(parent, typedecl)
+            if isinstance(typedecl, TypeStmt):
+                type_decl = typedecl.get_type_decl(typedecl.name)
+                PythonCAPIDerivedType(parent, type_decl)
+            else:
+                PythonCAPIIntrinsicType(parent, typedecl)
         elif isinstance(typedecl, TypeDecl):
             PythonCAPIDerivedType(parent, typedecl)
         else:
@@ -516,6 +521,7 @@
     fortran_code_template = '''\
       subroutine %(init_func)s(init_func_c, self, obj)
       %(use_stmt_list)s
+      %(type_decl_list)s
       external init_func_c
 !     self is %(oname)sObject
       external self
@@ -557,7 +563,7 @@
         for n in typedecl.a.component_names:
             v = typedecl.a.components[n]
             t = v.get_typedecl()
-            PythonCAPIType(t)
+            PythonCAPIType(parent, t)
             ct = t.get_c_type()
             on = 'f2py_' + t.name
             parent.add(t)
@@ -605,8 +611,12 @@
         self.cname = typedecl.get_c_name()
 
         self.use_stmt_list = []
+        self.type_decl_list = []
         if isinstance(typedecl.parent, Module):
             self.use_stmt_list.append('use %s' % (typedecl.parent.name))
-
+        elif isinstance(typedecl.parent, (Subroutine, Function)):
+            self.type_decl_list.append(typedecl.asfix())
+        else:
+            raise NotImplementedError,'types declared in '+typedecl.parent.__class__.__name__
         parent.apply_templates(self)
         return

Added: trunk/numpy/f2py/lib/test_derived_scalar.py
===================================================================
--- trunk/numpy/f2py/lib/test_derived_scalar.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/test_derived_scalar.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+"""
+Tests for intent(in,out) derived type arguments in Fortran subroutine's.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+import os
+import sys
+from numpy.testing import *
+
+def build(fortran_code, rebuild=True):
+    modulename = os.path.splitext(os.path.basename(__file__))[0]+'_ext'
+    try:
+        exec ('import %s as m' % (modulename))
+        if rebuild and os.stat(m.__file__)[8] < os.stat(__file__)[8]:
+            del sys.modules[m.__name__] # soft unload extension module
+            os.remove(m.__file__)
+            raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
+    except ImportError,msg:
+        print msg, ', recompiling %s.' % (modulename)
+        import tempfile
+        fname = tempfile.mktemp() + '.f90'
+        f = open(fname,'w')
+        f.write(fortran_code)
+        f.close()
+        sys_argv = []
+        sys_argv.extend(['--build-dir','dsctmp'])
+        #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
+        from main import build_extension
+        sys_argv.extend(['-m',modulename, fname])
+        build_extension(sys_argv)
+        os.remove(fname)
+        os.system(' '.join([sys.executable] + sys.argv))
+        sys.exit(0)
+    return m
+
+fortran_code = '''
+subroutine foo(a)
+  type myt
+    integer flag
+  end type myt
+  type(myt) a
+!f2py intent(in,out) a
+  a % flag = a % flag + 1
+end
+'''
+
+# tester note: set rebuild=True when changing fortan_code and for SVN
+m = build(fortran_code, rebuild=True)
+
+from numpy import *
+
+class test_m(NumpyTestCase):
+
+    def check_foo_simple(self, level=1):
+        a = m.myt(2)
+        assert_equal(a.flag,2)
+        assert isinstance(a,m.myt),`a`
+        r = m.foo(a)
+        assert isinstance(r,m.myt),`r`
+        assert_equal(r.flag,3)
+        assert_equal(a.flag,2)
+        
+if __name__ == "__main__":
+    NumpyTest().run()

Modified: trunk/numpy/f2py/lib/test_scalar_in_out.py
===================================================================
--- trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-08 09:38:12 UTC (rev 3291)
+++ trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-08 13:16:13 UTC (rev 3292)
@@ -1,6 +1,15 @@
 #!/usr/bin/env python
 """
+Tests for intent(in,out) arguments in Fortran subroutine's.
 
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
 """
 
 import os



From numpy-svn at scipy.org  Mon Oct  9 03:47:10 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  9 Oct 2006 02:47:10 -0500 (CDT)
Subject: [Numpy-svn] r3293 - in trunk/numpy/lib: . tests
Message-ID: <20061009074710.32D8139C03F@new.scipy.org>

Author: oliphant
Date: 2006-10-09 02:47:06 -0500 (Mon, 09 Oct 2006)
New Revision: 3293

Modified:
   trunk/numpy/lib/shape_base.py
   trunk/numpy/lib/tests/test_shape_base.py
Log:
Fix kron for multiple-dimensions.  kron is defined so tile(b, s) is the same as kron(ones(s,b.dtype), b)

Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-10-08 13:16:13 UTC (rev 3292)
+++ trunk/numpy/lib/shape_base.py	2006-10-09 07:47:06 UTC (rev 3293)
@@ -1,7 +1,7 @@
 __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack',
            'column_stack','row_stack', 'dstack','array_split','split','hsplit',
            'vsplit','dsplit','apply_over_axes','expand_dims',
-           'apply_along_axis', 'kron', 'tile']
+           'apply_along_axis', 'kron', 'tile', 'get_array_wrap']
 
 import numpy.core.numeric as _nx
 from numpy.core.numeric import asarray, zeros, newaxis, outer, \
@@ -526,7 +526,7 @@
         raise ValueError, 'vsplit only works on arrays of 3 or more dimensions'
     return split(ary,indices_or_sections,2)
 
-def _getwrapper(*args):
+def get_array_wrap(*args):
     """Find the wrapper for the array with the highest priority.
 
     In case of ties, leftmost wins. If no wrapper is found, return None
@@ -547,19 +547,28 @@
      [ ...                                   ...   ],
      [ a[m-1,0]*b, a[m-1,1]*b, ... , a[m-1,n-1]*b  ]]
     """
-    wrapper = _getwrapper(a, b)
+    wrapper = get_array_wrap(a, b)
     b = asanyarray(b)    
     a = array(a,copy=False,subok=True,ndmin=b.ndim)
+    ndb, nda = b.ndim, a.ndim
+    if (nda == 0 or ndb == 0):
+        return a * b
     as = a.shape
     bs = b.shape
     if not a.flags.contiguous:
         a = reshape(a, as)
     if not b.flags.contiguous:
         b = reshape(b, bs)
-    o = outer(a,b)
-    result = o.reshape(as + bs)
-    axis = a.ndim-1
-    for k in xrange(b.ndim):
+    nd = ndb
+    if (ndb != nda):
+        if (ndb > nda):
+            as = (1,)*(ndb-nda) + as
+        else:
+            bs = (1,)*(nda-ndb) + bs
+            nd = nda        
+    result = outer(a,b).reshape(as+bs)
+    axis = nd-1
+    for k in xrange(nd):
         result = concatenate(result, axis=axis)
     if wrapper is not None:
         result = wrapper(result)

Modified: trunk/numpy/lib/tests/test_shape_base.py
===================================================================
--- trunk/numpy/lib/tests/test_shape_base.py	2006-10-08 13:16:13 UTC (rev 3292)
+++ trunk/numpy/lib/tests/test_shape_base.py	2006-10-09 07:47:06 UTC (rev 3293)
@@ -11,8 +11,6 @@
         a = ones((20,10),'d')
         assert_array_equal(apply_along_axis(len,0,a),len(a)*ones(shape(a)[1]))
     def check_simple101(self,level=11):
-        # This test causes segmentation fault (Numeric 23.3,23.6,Python 2.3.4)
-        # when enabled and shape(a)[1]>100. See Issue 202.
         a = ones((10,101),'d')
         assert_array_equal(apply_along_axis(len,0,a),len(a)*ones(shape(a)[1]))
 
@@ -370,6 +368,7 @@
         assert_equal(type(kron(a,ma)), ndarray) 
         assert_equal(type(kron(ma,a)), myarray) 
 
+
 class test_tile(NumpyTestCase):
     def check_basic(self):
         a = array([0,1,2])
@@ -380,7 +379,19 @@
         assert_equal(tile(b, 2), [[1,2,1,2],[3,4,3,4]])
         assert_equal(tile(b,(2,1)),[[1,2],[3,4],[1,2],[3,4]])
         assert_equal(tile(b,(2,2)),[[1,2,1,2],[3,4,3,4],[1,2,1,2],[3,4,3,4]])
-        
+
+    def check_kroncompare(self):
+        import numpy.random as nr
+	reps=[(2,),(1,2),(2,1),(2,2),(2,3,2),(3,2)]
+        shape=[(3,),(2,3),(3,4,3),(3,2,3),(4,3,2,4),(2,2)]
+        for s in shape:
+            b = nr.randint(0,10,size=s)
+            for r in reps:
+                a = ones(r, b.dtype)
+                large = tile(b, r)
+                klarge = kron(a, b)
+                assert_equal(large, klarge)
+
 # Utility
 
 def compare_results(res,desired):



From numpy-svn at scipy.org  Mon Oct  9 04:45:22 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  9 Oct 2006 03:45:22 -0500 (CDT)
Subject: [Numpy-svn] r3294 - trunk/numpy/core/src
Message-ID: <20061009084522.C88D739C056@new.scipy.org>

Author: oliphant
Date: 2006-10-09 03:45:20 -0500 (Mon, 09 Oct 2006)
New Revision: 3294

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Speed up concatenate and choose when sequence is an array.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-09 07:47:06 UTC (rev 3293)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-09 08:45:20 UTC (rev 3294)
@@ -1751,6 +1751,21 @@
 		return (void*)PyErr_NoMemory();
 	}
 
+        if (PyArray_Check(op)) {
+                for (i=0; i<n; i++) {
+                        mps[i] = array_big_item((PyArrayObject *)op, i);
+                }
+                if (!PyArray_ISCARRAY(op)) {
+                        for (i=0; i<n; i++) {
+                                PyObject *obj;
+                                obj = PyArray_NewCopy(mps[i], NPY_CORDER);
+                                Py_DECREF(mps[i]);
+                                mps[i] = (PyArrayObject *)obj;
+                        }
+                }                        
+                return mps;
+        }
+
 	for(i=0; i<n; i++) {
 		otmp = PySequence_GetItem(op, i);
 		if (!PyArray_CheckAnyScalar(otmp)) {



From numpy-svn at scipy.org  Mon Oct  9 16:21:22 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  9 Oct 2006 15:21:22 -0500 (CDT)
Subject: [Numpy-svn] r3295 - tags
Message-ID: <20061009202122.E64EF39C04D@new.scipy.org>

Author: oliphant
Date: 2006-10-09 15:21:15 -0500 (Mon, 09 Oct 2006)
New Revision: 3295

Added:
   tags/1.0rc2/
Log:

Create 1.0rc2 tag



Copied: tags/1.0rc2 (from rev 3294, trunk)



From numpy-svn at scipy.org  Mon Oct  9 16:22:43 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  9 Oct 2006 15:22:43 -0500 (CDT)
Subject: [Numpy-svn] r3296 - in tags/1.0rc2/numpy: . core/src
Message-ID: <20061009202243.D926F39C016@new.scipy.org>

Author: oliphant
Date: 2006-10-09 15:22:34 -0500 (Mon, 09 Oct 2006)
New Revision: 3296

Modified:
   tags/1.0rc2/numpy/core/src/multiarraymodule.c
   tags/1.0rc2/numpy/version.py
Log:
Update release for tag.

Modified: tags/1.0rc2/numpy/core/src/multiarraymodule.c
===================================================================
--- tags/1.0rc2/numpy/core/src/multiarraymodule.c	2006-10-09 20:21:15 UTC (rev 3295)
+++ tags/1.0rc2/numpy/core/src/multiarraymodule.c	2006-10-09 20:22:34 UTC (rev 3296)
@@ -1753,7 +1753,8 @@
 
         if (PyArray_Check(op)) {
                 for (i=0; i<n; i++) {
-                        mps[i] = array_big_item((PyArrayObject *)op, i);
+                        mps[i] = (PyArrayObject *)\
+                                array_big_item((PyArrayObject *)op, i);
                 }
                 if (!PyArray_ISCARRAY(op)) {
                         for (i=0; i<n; i++) {

Modified: tags/1.0rc2/numpy/version.py
===================================================================
--- tags/1.0rc2/numpy/version.py	2006-10-09 20:21:15 UTC (rev 3295)
+++ tags/1.0rc2/numpy/version.py	2006-10-09 20:22:34 UTC (rev 3296)
@@ -1,5 +1,5 @@
-version='1.0'
-release=False
+version='1.0rc2'
+release=True
 
 if not release:
     import os



From numpy-svn at scipy.org  Mon Oct  9 16:31:25 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  9 Oct 2006 15:31:25 -0500 (CDT)
Subject: [Numpy-svn] r3297 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061009203125.B317839C016@new.scipy.org>

Author: pearu
Date: 2006-10-09 15:31:16 -0500 (Mon, 09 Oct 2006)
New Revision: 3297

Modified:
   trunk/numpy/f2py/lib/parser/block_statements.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_derived_scalar.py
Log:
F2PY G3: refactored Python specific wrapper code from parser.

Modified: trunk/numpy/f2py/lib/parser/block_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-09 20:22:34 UTC (rev 3296)
+++ trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-09 20:31:16 UTC (rev 3297)
@@ -1070,25 +1070,6 @@
             _cache[id(self)] = s
         return s
 
-    def get_f_type(self):
-        return 'TYPE(%s)' % (self.name)
-
-    def get_c_type(self):
-        return 'f2py_type_%s_%s' % (self.name, self.get_bit_size())
-    
-    def get_c_name(self):
-        return 'f2py_type_%s' % (self.name)
-
-    def get_c_struct_name(self):
-        return self.get_c_name() + '_struct'
-
-    def get_c_struct(self):
-        l = []
-        for name, var in self.a.components.items():
-            t = var.get_typedecl()
-            l.append('  %s %s;' % (t.get_c_type(), name))
-        return 'typedef struct {\n%s\n} %s;' % ('\n'.join(l), self.get_c_struct_name())
-
 TypeDecl = Type
 
 # Enum

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-09 20:22:34 UTC (rev 3296)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-09 20:31:16 UTC (rev 3297)
@@ -364,9 +364,6 @@
     match = re.compile(r'integer\b',re.I).match
     default_kind = 4
 
-    def get_c_type(self):
-        return 'npy_int%s' % (self.get_bit_size())
-
     def get_zero_value(self):
         kind = self.get_kind()
         if kind==self.default_kind: return '0'
@@ -376,9 +373,6 @@
     match = re.compile(r'real\b',re.I).match
     default_kind = 4
 
-    def get_c_type(self):
-        return 'npy_float%s' % (self.get_bit_size())
-
     def get_zero_value(self):
         kind = self.get_kind()
         if kind==self.default_kind: return '0.0'
@@ -394,9 +388,6 @@
     def get_zero_value(self):
         return '0.0D0'
 
-    def get_c_type(self):
-        return 'npy_float%s' % (self.get_bit_size())
-
 class Complex(TypeDeclarationStatement):
     match = re.compile(r'complex\b',re.I).match
     default_kind = 4
@@ -412,9 +403,6 @@
         if kind==self.default_kind: return '(0.0, 0.0)'
         return '(0.0_%s, 0.0_%s)' % (kind, kind)
 
-    def get_c_type(self):
-        return 'npy_complex%s' % (self.get_bit_size())
-
     def get_part_typedecl(self):
         bz = self.get_byte_size()/2
         return Real(self.parent, self.item.copy('REAL*%s' % (bz)))
@@ -430,9 +418,6 @@
     def get_zero_value(self):
         return '(0.0D0,0.0D0)'
 
-    def get_c_type(self):
-        return 'npy_complex%s' % (self.get_bit_size())
-
 class Logical(TypeDeclarationStatement):
     match = re.compile(r'logical\b',re.I).match
     default_kind = 4
@@ -440,9 +425,6 @@
     def get_zero_value(self):
         return ".FALSE."
 
-    def get_c_type(self):
-        return 'f2py_bool%s' % (self.get_bit_size())
-
 class Character(TypeDeclarationStatement):
     match = re.compile(r'character\b',re.I).match
     default_kind = 1
@@ -453,9 +435,6 @@
             return 0  # model for character*(*)
         return CHAR_BIT * int(length) * int(self.get_kind())
 
-    def get_c_type(self):
-        return 'f2py_string%s' % (self.get_bit_size())
-
     def get_zero_value(self):
         return "''"
 
@@ -467,9 +446,6 @@
     def get_zero_value(self):
         return '0'
 
-    def get_c_type(self):
-        return 'npy_int%s' % (self.get_bit_size())
-
 class Type(TypeDeclarationStatement):
     match = re.compile(r'type\s*\(', re.I).match
 
@@ -489,9 +465,6 @@
 
     def get_bit_size(self):
         return self.get_type_decl(self.name).get_bit_size()
-
-    def get_c_type(self):
-        return self.get_type_decl(self.name).get_c_type()
     
 TypeStmt = Type
 

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-09 20:22:34 UTC (rev 3296)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-09 20:31:16 UTC (rev 3297)
@@ -3,6 +3,7 @@
 
 import sys
 
+from parser.api import TypeDecl, TypeStmt
 from wrapper_base import *
 from py_wrap_type import *
 
@@ -80,32 +81,40 @@
 
         args_f = []
         extra_args_f = []
+        argindex = -1
         for argname in block.args:
+            argindex += 1
             var = block.a.variables[argname]
             typedecl = var.get_typedecl()
             PythonCAPIType(parent, typedecl)
-            ctype = typedecl.get_c_type()
-            if ctype=='f2py_string0':
-                self.decl_list.append('%s %s = {NULL,0};' % (ctype, argname))
+            ti = PyTypeInterface(typedecl)
+            self.kw_list.append('"%s"' % (argname))
+
+            if isinstance(typedecl, TypeStmt):
+                self.pyarg_format_list.append('O&')
+                self.decl_list.append('%s* %s = NULL;' % (ti.otype, argname))
+                self.pyarg_obj_list.append('\npyobj_to_%s_inplace, &%s' % (ti.ctype, argname))
+                args_f.append('%s->data' % (argname)) # is_scalar
             else:
-                self.decl_list.append('%s %s;' % (ctype, argname))
-            self.kw_list.append('"%s"' % (argname))
-            self.pyarg_format_list.append('O&')
-            self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ctype, argname))
-            if 1: # is_scalar
-                if ctype=='f2py_string0':
-                    args_f.append('%s.data' % argname)
+                self.pyarg_format_list.append('O&')
+                assert not isinstance(typedecl, TypeDecl)
+                if ti.ctype=='f2py_string0':
+                    self.decl_list.append('%s %s = {NULL,0};' % (ti.ctype, argname))
+                    args_f.append('%s.data' % argname)  # is_scalar
                     extra_args_f.append('%s.len' % argname)
                     self.clean_frompyobj_list.append(\
                         'if (%s.len) free(%s.data);' % (argname,argname))
                 else:
-                    args_f.append('&'+argname)
-                
-            else:
-                args_f.append(argname)
+                    self.decl_list.append('%s %s;' % (ti.ctype, argname))
+                    args_f.append('&'+argname) # is_scalar
+                self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ti.ctype, argname))
             if var.is_intent_out(): # and is_scalar
-                self.return_format_list.append('O&')
-                self.return_obj_list.append('\npyobj_from_%s, &%s' % (ctype, argname))
+                if isinstance(typedecl, TypeStmt):
+                    self.return_format_list.append('N')
+                    self.return_obj_list.append('\n%s' % (argname))
+                else:
+                    self.return_format_list.append('O&')
+                    self.return_obj_list.append('\npyobj_from_%s, &%s' % (ti.ctype, argname))
 
         WrapperCPPMacro(parent, 'F_FUNC')
         self.call_list.append('%s_f(%s);' % (name,', '.join(args_f+extra_args_f)))

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-09 20:22:34 UTC (rev 3296)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-09 20:31:16 UTC (rev 3297)
@@ -1,10 +1,44 @@
 
-__all__ = ['PythonCAPIType']
+__all__ = ['PythonCAPIType', 'PyTypeInterface']
 
 from wrapper_base import *
 from parser.api import CHAR_BIT, Module, declaration_type_spec, \
-     TypeDecl, TypeStmt, Subroutine, Function
+     TypeDecl, TypeStmt, Subroutine, Function, Integer, Real,\
+     DoublePrecision, Complex, DoubleComplex, Logical, Character, \
+     Byte
 
+class PyTypeInterface:
+
+    def __init__(self, typedecl):
+        if isinstance(typedecl, TypeStmt):
+            typedecl = typedecl.get_type_decl(typedecl.name)
+        if isinstance(typedecl, TypeDecl):
+            self.name = name = typedecl.name
+            tname = 'f2py_type_%s_' % (name)
+        else:
+            if isinstance(typedecl,(Integer,Byte)):
+                tname = 'npy_int'
+            elif isinstance(typedecl,(Real, DoublePrecision)):
+                tname = 'npy_float'
+            elif isinstance(typedecl,(Complex, DoubleComplex)):
+                tname = 'npy_complex'
+            elif isinstance(typedecl,Logical):
+                tname = 'f2py_bool'
+            elif isinstance(typedecl,Character):
+                tname = 'f2py_string'
+            else:
+                raise NotImplementedError,`typedecl.__class__`
+        bitsize = typedecl.get_bit_size()
+        self.ctype = ctype = '%s%s' % (tname,bitsize)
+        self.bits = bitsize
+        self.bytes = bitsize / CHAR_BIT
+
+        if isinstance(typedecl, TypeDecl):
+            self.otype = '%sObject' % (ctype)
+            self.ftype = 'TYPE(%s)' % (name)
+        return
+    
+
 class PythonCAPIType(WrapperBase):
     """
     Fortran type hooks.
@@ -294,53 +328,45 @@
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
         self.name = name = typedecl.name
-        self.ctype = ctype = typedecl.get_c_type()
+        ti = PyTypeInterface(typedecl)
+        self.ctype = ctype = ti.ctype
         if ctype in self._defined:
             return
         self._defined.append(ctype)
         self.info('Generating interface for %s: %s' % (typedecl.__class__, ctype))
 
-        if ctype.startswith('npy_'):
-            self.Cls = ctype[4].upper() + ctype[5:] 
-            if ctype.startswith('npy_int') or ctype.startswith('npy_float'):
-                self.capi_code_template = self.capi_code_template_scalar
-            elif ctype.startswith('npy_complex'):
-                PythonCAPIIntrinsicType(parent, typedecl.get_part_typedecl())
-                bits = int(ctype[11:])
-                self.fctype = 'npy_float%s' % (bits/2)
-                self.capi_code_template = self.capi_code_template_complex_scalar
+        if isinstance(typedecl, (Integer,Byte,Real,DoublePrecision)):
+            self.Cls = ctype[4].upper() + ctype[5:]
+            self.capi_code_template = self.capi_code_template_scalar
+        elif isinstance(typedecl, (Complex,DoubleComplex)):
+            self.Cls = ctype[4].upper() + ctype[5:]
+            PythonCAPIIntrinsicType(parent, typedecl.get_part_typedecl())
+            ti1 = PyTypeInterface(typedecl.get_part_typedecl())
+            self.fctype = ti1.ctype
+            self.capi_code_template = self.capi_code_template_complex_scalar
+        elif isinstance(typedecl, Logical):
+            self.ictype = 'npy_int%s' % (typedecl.get_bit_size())
+            self.header_template = '#define %(ctype)s %(ictype)s'
+            self.capi_code_template = self.capi_code_template_logical_scalar
+        elif isinstance(typedecl, Character):
+            self.bits = bits = typedecl.get_bit_size()
+            if bits:
+                self.bytes = bits/CHAR_BIT
+                self.header_template = '''
+#include <string.h>
+typedef struct { char data[%(bytes)s]; } %(ctype)s;
+'''
+                self.capi_code_template = self.capi_code_template_string_scalar
             else:
-                raise NotImplementedError,`name,ctype`
-            parent.apply_templates(self)
-            return
-        if ctype.startswith('f2py_'):
-            if ctype.startswith('f2py_bool'):
-                bits = int(ctype[9:])
-                self.ictype = 'npy_int%s' % (bits)
-                self.header_template = '#define %(ctype)s %(ictype)s'
-                self.capi_code_template = self.capi_code_template_logical_scalar
-                parent.apply_templates(self)
-                return
-            if ctype == 'f2py_string0':
                 self.header_template = '''
 #include <string.h>
 typedef struct { char* data; size_t len; } %(ctype)s;
 '''
                 self.capi_code_template = self.capi_code_template_string0_scalar
-                parent.apply_templates(self)
-                return
-                raise NotImplementedError,`name,ctype`
-            if ctype.startswith('f2py_string'):
-                self.bits = bits = int(ctype[11:])
-                self.bytes = bits/CHAR_BIT
-                self.header_template = '''
-#include <string.h>
-typedef struct { char data[%(bytes)s]; } %(ctype)s;
-'''
-                self.capi_code_template = self.capi_code_template_string_scalar
-                parent.apply_templates(self)
-                return
-        raise NotImplementedError,`name,ctype`
+        else:
+            raise NotImplementedError,`name,ctype`
+        parent.apply_templates(self)
+        return
 
 class PythonCAPIDerivedType(WrapperBase):
     """
@@ -348,8 +374,8 @@
     """
 
     header_template = '''\
-#define %(oname)sObject_Check(obj) \\
-    PyObject_TypeCheck((PyObject*)obj, &%(oname)sType)
+#define %(otype)s_Check(obj) \\
+    PyObject_TypeCheck((PyObject*)obj, &%(otype)sType)
 #define %(init_func)s_f \\
     F_FUNC(%(init_func)s,%(INIT_FUNC)s)
 '''
@@ -360,36 +386,36 @@
   PyObject_HEAD
   %(ptrstruct_list)s
   %(ctype)s data;
-} %(oname)sObject;
+} %(otype)s;
 '''
 
     extern_template = '''\
-static PyTypeObject %(oname)sType;
+static PyTypeObject %(otype)sType;
 '''
 
     objdecl_template = '''\
-static PyMethodDef %(oname)s_methods[] = {
+static PyMethodDef %(otype)s_methods[] = {
     %(type_method_list)s
     {NULL}  /* Sentinel */
 };
 
-static PyGetSetDef %(oname)s_getseters[] = {
+static PyGetSetDef %(otype)s_getseters[] = {
     %(type_getseters_list)s
     {NULL}  /* Sentinel */
 };
 
-static PyTypeObject %(oname)sType = {
+static PyTypeObject %(otype)sType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
     "%(name)s",                /*tp_name*/
-    sizeof(%(oname)sObject),    /*tp_basicsize*/
+    sizeof(%(otype)s),    /*tp_basicsize*/
     0,                         /*tp_itemsize*/
-    (destructor)%(oname)s_dealloc, /*tp_dealloc*/
+    (destructor)%(otype)s_dealloc, /*tp_dealloc*/
     0,                         /*tp_print*/
     0,                         /*tp_getattr*/
     0,                         /*tp_setattr*/
     0,                         /*tp_compare*/
-    %(oname)s_repr,            /*tp_repr*/
+    %(otype)s_repr,            /*tp_repr*/
     0,                         /*tp_as_number*/
     0,                         /*tp_as_sequence*/
     0,                         /*tp_as_mapping*/
@@ -407,25 +433,25 @@
     0,		               /* tp_weaklistoffset */
     0,		               /* tp_iter */
     0,		               /* tp_iternext */
-    %(oname)s_methods,          /* tp_methods */
-    0 /*%(oname)s_members*/,    /* tp_members */
-    %(oname)s_getseters,       /* tp_getset */
+    %(otype)s_methods,          /* tp_methods */
+    0 /*%(otype)s_members*/,    /* tp_members */
+    %(otype)s_getseters,       /* tp_getset */
     0,                         /* tp_base */
     0,                         /* tp_dict */
     0,                         /* tp_descr_get */
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    (initproc)%(oname)s_init,      /* tp_init */
+    (initproc)%(otype)s_init,      /* tp_init */
     0,                         /* tp_alloc */
-    %(oname)s_new,                 /* tp_new */
+    %(otype)s_new,                 /* tp_new */
 };
 '''
 
     module_init_template = '''\
-if (PyType_Ready(&%(oname)sType) < 0)
+if (PyType_Ready(&%(otype)sType) < 0)
   return;
 PyModule_AddObject(f2py_module, "%(name)s",
-                                (PyObject *)&%(oname)sType);
+                                (PyObject *)&%(otype)sType);
 '''
 
     c_code_template = '''\
@@ -436,20 +462,36 @@
 '''
 
     capi_code_template = '''\
-static void %(oname)s_dealloc(%(oname)sObject* self) {
+static void %(otype)s_dealloc(%(otype)s* self) {
   if (self->data)
     PyMem_Free(self->data);
   self->ob_type->tp_free((PyObject*)self);
 }
 
+static int pyobj_to_%(ctype)s_inplace(PyObject *obj,
+                                      %(otype)s** value_ptr) {
+  int return_value = 0;
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
+#endif
+  if (%(otype)s_Check(obj)) {
+    *value_ptr = (%(otype)s*)obj;
+    return_value = 1;
+  }
+#if defined(F2PY_DEBUG_PYOBJ_TOFROM)
+  fprintf(stderr,"pyobj_to_%(ctype)s: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+#endif
+  return return_value;
+}
+
 static int pyobj_to_%(ctype)s(PyObject *obj,
-                              %(ctype)s* value_ptr) {
+                                   %(ctype)s* value_ptr) {
   int return_value = 0;
 #if defined(F2PY_DEBUG_PYOBJ_TOFROM)
   fprintf(stderr,"pyobj_to_%(ctype)s(type=%%s)\\n",PyString_AS_STRING(PyObject_Repr(PyObject_Type(obj))));
 #endif
-  if (%(oname)sObject_Check(obj)) {
-    if (!memcpy(value_ptr,((%(oname)sObject *)obj)->data, %(byte_size)s)) {
+  if (%(otype)s_Check(obj)) {
+    if (!memcpy(value_ptr,((%(otype)s *)obj)->data, %(bytes)s)) {
       PyErr_SetString(PyExc_MemoryError,
          "failed to copy %(name)s instance memory to %(ctype)s object.");
     } else {
@@ -463,16 +505,16 @@
 }
 
 static PyObject* pyobj_from_%(ctype)s(%(ctype)s* value_ptr) {
-  %(oname)sObject* obj = (%(oname)sObject*)(%(oname)sType.tp_alloc(&%(oname)sType, 0));
+  %(otype)s* obj = (%(otype)s*)(%(otype)sType.tp_alloc(&%(otype)sType, 0));
   if (obj == NULL)
     return NULL;
-  obj->data = PyMem_Malloc(%(byte_size)s);
+  obj->data = PyMem_Malloc(%(bytes)s);
   if (obj->data == NULL) {
     Py_DECREF(obj);
     return PyErr_NoMemory();
   }
   if (value_ptr) {
-    if (!memcpy(obj->data, value_ptr, %(byte_size)s)) {
+    if (!memcpy(obj->data, value_ptr, %(bytes)s)) {
       PyErr_SetString(PyExc_MemoryError,
          "failed to copy %(ctype)s object memory to %(name)s instance.");
     }
@@ -481,36 +523,37 @@
   return (PyObject*)obj;
 }
 
-static PyObject * %(oname)s_new(PyTypeObject *type,
+static PyObject * %(otype)s_new(PyTypeObject *type,
                                 PyObject *args, PyObject *kwds)
 {
   return pyobj_from_%(ctype)s(NULL);
 }
 
-static int %(oname)s_init(%(oname)sObject *self,
+static int %(otype)s_init(%(otype)s *self,
                           PyObject *capi_args, PyObject *capi_kwds)
 {
    int return_value = 0;
 #if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"%(oname)s_init()\\n");
+  fprintf(stderr,"%(otype)s_init()\\n");
 #endif
    if (!PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
                                    %(attr_init_clist)s))
-      return_value = -1;                             
+      return_value = -1;
+   
 #if defined(F2PY_DEBUG_PYOBJ_TOFROM)
-  fprintf(stderr,"%(oname)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
+  fprintf(stderr,"%(otype)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
 #endif
    return return_value;
 }
 
-static PyObject * %(oname)s_as_tuple(%(oname)sObject * self) {
+static PyObject * %(otype)s_as_tuple(%(otype)s * self) {
   return Py_BuildValue("%(as_tuple_format_elist)s"
                         %(as_tuple_arg_clist)s);
 }
 
-static PyObject * %(oname)s_repr(PyObject * self) {
+static PyObject * %(otype)s_repr(PyObject * self) {
   PyObject* r = PyString_FromString("%(name)s(");
-  PyString_ConcatAndDel(&r, PyObject_Repr(%(oname)s_as_tuple((%(oname)sObject*)self)));
+  PyString_ConcatAndDel(&r, PyObject_Repr(%(otype)s_as_tuple((%(otype)s*)self)));
   PyString_ConcatAndDel(&r, PyString_FromString(")"));
   return r;
 }
@@ -523,7 +566,7 @@
       %(use_stmt_list)s
       %(type_decl_list)s
       external init_func_c
-!     self is %(oname)sObject
+!     self is %(otype)s
       external self
       %(ftype)s obj
       call init_func_c(%(init_func_f_arg_clist)s)
@@ -535,6 +578,7 @@
     _defined = []
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
+        ti = PyTypeInterface(typedecl)
         name = typedecl.name
         if name in self._defined:
             return
@@ -542,15 +586,15 @@
         self.info('Generating interface for %s: %s' % (typedecl.__class__, name))
 
         self.name = name
-        self.oname = oname = 'f2py_' + name
-        self.ctype = typedecl.get_c_type()
+        self.otype = otype = ti.otype
+        self.ctype = ctype = ti.ctype
         self.ctype_ptrs = self.ctype + '_ptrs'
-        self.ftype = typedecl.get_f_type()
-        self.byte_size = byte_size = typedecl.get_bit_size() / CHAR_BIT
+        self.ftype = ti.ftype
+        self.bytes = bytes = ti.bytes
         WrapperCPPMacro(parent, 'F_FUNC')
 
         self.init_func_f_arg_list = ['self']
-        self.init_func_c_arg_list = ['%sObject *self' % (self.oname)]
+        self.init_func_c_arg_list = ['%s *self' % (otype)]
         self.init_func_c_body_list = []
         self.ptrstruct_list = []
         self.attr_decl_list = []
@@ -563,19 +607,19 @@
         for n in typedecl.a.component_names:
             v = typedecl.a.components[n]
             t = v.get_typedecl()
+            ti1 = PyTypeInterface(t)
             PythonCAPIType(parent, t)
-            ct = t.get_c_type()
-            on = 'f2py_' + t.name
+            ct = ti1.ctype
             parent.add(t)
             self.ptrstruct_list.append('%s* %s_ptr;' % (ct, n))
             self.init_func_f_arg_list.append('obj %% %s' % (n))
             self.init_func_c_arg_list.append('\n%s * %s_ptr' % (ct, n))
             self.init_func_c_body_list.append('''\
 if (!((void*)%(n)s_ptr >= self->data
-      && (void*)%(n)s_ptr < self->data + %(byte_size)s ))
+      && (void*)%(n)s_ptr < self->data + %(bytes)s ))
   fprintf(stderr,"INCONSISTENCY IN %(name)s WRAPPER: "
-                 "self->data=%%p <= %(n)s_ptr=%%p < self->data+%(byte_size)s=%%p\\n",
-                 self->data, %(n)s_ptr, self->data + %(byte_size)s);
+                 "self->data=%%p <= %(n)s_ptr=%%p < self->data+%(bytes)s=%%p\\n",
+                 self->data, %(n)s_ptr, self->data + %(bytes)s);
 self->%(n)s_ptr = %(n)s_ptr;
 ''' % (locals()))
             self.attr_format_list.append('O&')
@@ -583,11 +627,11 @@
             self.as_tuple_format_list.append('O&')
             self.as_tuple_arg_list.append('\npyobj_from_%s, self->%s_ptr' % (ct, n))
             self.getset_func_list.append('''\
-static PyObject * %(oname)s_get_%(n)s(%(oname)sObject *self,
+static PyObject * %(otype)s_get_%(n)s(%(otype)s *self,
                                       void *closure) {
   return pyobj_from_%(ct)s(self->%(n)s_ptr);
 }
-static int %(oname)s_set_%(n)s(%(oname)sObject *self,
+static int %(otype)s_set_%(n)s(%(otype)s *self,
                                PyObject *value, void *closure)
 {
   if (value == NULL) {
@@ -600,15 +644,13 @@
   return -1;
 }
 ''' % (locals()))
-            self.type_getseters_list.append('{"%(n)s",(getter)%(oname)s_get_%(n)s, (setter)%(oname)s_set_%(n)s,\n "component %(n)s",NULL},' % (locals()))
+            self.type_getseters_list.append('{"%(n)s",(getter)%(otype)s_get_%(n)s, (setter)%(otype)s_set_%(n)s,\n "component %(n)s",NULL},' % (locals()))
         if self.attr_init_list: self.attr_init_list.insert(0,'')
         if self.as_tuple_arg_list: self.as_tuple_arg_list.insert(0,'')
         self.init_func = self.ctype + '_init'
-        self.INIT_FUNC = self.init_func.upper()
 
         self.type_method_list = []
-        self.type_method_list.append('{"as_tuple",(PyCFunction)%(oname)s_as_tuple,METH_NOARGS,\n "Return %(name)s components as tuple."},' % (self.__dict__))
-        self.cname = typedecl.get_c_name()
+        self.type_method_list.append('{"as_tuple",(PyCFunction)%(otype)s_as_tuple,METH_NOARGS,\n "Return %(name)s components as tuple."},' % (self.__dict__))
 
         self.use_stmt_list = []
         self.type_decl_list = []

Modified: trunk/numpy/f2py/lib/test_derived_scalar.py
===================================================================
--- trunk/numpy/f2py/lib/test_derived_scalar.py	2006-10-09 20:22:34 UTC (rev 3296)
+++ trunk/numpy/f2py/lib/test_derived_scalar.py	2006-10-09 20:31:16 UTC (rev 3297)
@@ -66,8 +66,9 @@
         assert isinstance(a,m.myt),`a`
         r = m.foo(a)
         assert isinstance(r,m.myt),`r`
+        assert r is a
         assert_equal(r.flag,3)
-        assert_equal(a.flag,2)
+        assert_equal(a.flag,3)
         
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Mon Oct  9 16:44:51 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon,  9 Oct 2006 15:44:51 -0500 (CDT)
Subject: [Numpy-svn] r3298 - trunk/numpy/core/src
Message-ID: <20061009204451.013A139C016@new.scipy.org>

Author: oliphant
Date: 2006-10-09 15:44:45 -0500 (Mon, 09 Oct 2006)
New Revision: 3298

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Get rid of warning on main trunk.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-09 20:31:16 UTC (rev 3297)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-09 20:44:45 UTC (rev 3298)
@@ -1753,7 +1753,8 @@
 
         if (PyArray_Check(op)) {
                 for (i=0; i<n; i++) {
-                        mps[i] = array_big_item((PyArrayObject *)op, i);
+                        mps[i] = (PyArrayObject *)\
+                                array_big_item((PyArrayObject *)op, i);
                 }
                 if (!PyArray_ISCARRAY(op)) {
                         for (i=0; i<n; i++) {



From numpy-svn at scipy.org  Tue Oct 10 04:52:23 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 03:52:23 -0500 (CDT)
Subject: [Numpy-svn] r3299 - in trunk/numpy: core/src lib
Message-ID: <20061010085223.DFAEF39C047@new.scipy.org>

Author: oliphant
Date: 2006-10-10 03:52:18 -0500 (Tue, 10 Oct 2006)
New Revision: 3299

Modified:
   trunk/numpy/core/src/scalartypes.inc.src
   trunk/numpy/lib/shape_base.py
Log:
Fix segfault in .imag for real array scalars.  Be specific about infix multiplication.

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-09 20:44:45 UTC (rev 3298)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-10 08:52:18 UTC (rev 3299)
@@ -834,9 +834,9 @@
         PyObject *ret;
         int typenum;
 
-        typecode = _realdescr_fromcomplexscalar(self, &typenum);
         if (PyArray_IsScalar(self, ComplexFloating)) {
-            ret = PyArray_Scalar((char *)scalar_value(self, NULL)
+                typecode = _realdescr_fromcomplexscalar(self, &typenum);
+                ret = PyArray_Scalar((char *)scalar_value(self, NULL)
                                  + typecode->elsize, typecode, NULL);
         }
         else if (PyArray_IsScalar(self, Object)) {
@@ -854,6 +854,7 @@
         }
         else {
                 char *temp;
+                typecode = PyArray_DescrFromScalar(self);
                 temp = PyDataMem_NEW(typecode->elsize);
                 memset(temp, '\0', typecode->elsize);
                 ret = PyArray_Scalar(temp, typecode, NULL);

Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-10-09 20:44:45 UTC (rev 3298)
+++ trunk/numpy/lib/shape_base.py	2006-10-10 08:52:18 UTC (rev 3299)
@@ -552,7 +552,7 @@
     a = array(a,copy=False,subok=True,ndmin=b.ndim)
     ndb, nda = b.ndim, a.ndim
     if (nda == 0 or ndb == 0):
-        return a * b
+        return _nx.multiply(a,b)
     as = a.shape
     bs = b.shape
     if not a.flags.contiguous:



From numpy-svn at scipy.org  Tue Oct 10 05:08:35 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 04:08:35 -0500 (CDT)
Subject: [Numpy-svn] r3300 - trunk/numpy/f2py
Message-ID: <20061010090835.B29E539C047@new.scipy.org>

Author: pearu
Date: 2006-10-10 04:08:28 -0500 (Tue, 10 Oct 2006)
New Revision: 3300

Modified:
   trunk/numpy/f2py/f2py2e.py
Log:
Resolved ticket 285: imporved error messages

Modified: trunk/numpy/f2py/f2py2e.py
===================================================================
--- trunk/numpy/f2py/f2py2e.py	2006-10-10 08:52:18 UTC (rev 3299)
+++ trunk/numpy/f2py/f2py2e.py	2006-10-10 09:08:28 UTC (rev 3300)
@@ -353,8 +353,8 @@
     for i in range(len(postlist)):
         if postlist[i]['block']!='python module':
             if not options.has_key('python module'):
-                errmess('Tip: If your original code is Fortran 77 then you must use -m option.\n')
-            raise TypeError,'All blocks must be module blocks but got %s'%(`postlist[i]['block']`)
+                errmess('Tip: If your original code is Fortran source then you must use -m option.\n')
+            raise TypeError,'All blocks must be python module blocks but got %s'%(`postlist[i]['block']`)
     auxfuncs.debugoptions=options['debug']
     f90mod_rules.options=options
     auxfuncs.wrapfuncs=options['wrapfuncs']



From numpy-svn at scipy.org  Tue Oct 10 08:26:00 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 07:26:00 -0500 (CDT)
Subject: [Numpy-svn] r3301 - trunk/numpy/core/tests
Message-ID: <20061010122600.8AC3C39C075@new.scipy.org>

Author: stefan
Date: 2006-10-10 07:25:44 -0500 (Tue, 10 Oct 2006)
New Revision: 3301

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Test for ticket #330.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-10 09:08:28 UTC (rev 3300)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-10 12:25:44 UTC (rev 3301)
@@ -498,5 +498,9 @@
         data = N.arange(5)
         data = N.add.outer(data,data)
         
+    def check_mem_float_imag(self, level=rlevel):
+        """Ticket #330"""
+        N.float64(1.0).imag
+        
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Tue Oct 10 16:27:26 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 15:27:26 -0500 (CDT)
Subject: [Numpy-svn] r3302 - trunk/numpy/distutils/fcompiler
Message-ID: <20061010202726.E75BA39C00F@new.scipy.org>

Author: pearu
Date: 2006-10-10 15:27:23 -0500 (Tue, 10 Oct 2006)
New Revision: 3302

Modified:
   trunk/numpy/distutils/fcompiler/__init__.py
Log:
Improved is_free_format.

Modified: trunk/numpy/distutils/fcompiler/__init__.py
===================================================================
--- trunk/numpy/distutils/fcompiler/__init__.py	2006-10-10 12:25:44 UTC (rev 3301)
+++ trunk/numpy/distutils/fcompiler/__init__.py	2006-10-10 20:27:23 UTC (rev 3302)
@@ -394,14 +394,14 @@
             flavor = ':f90'
             compiler = self.compiler_f90
             if compiler is None:
-                raise DistutilsExecError, 'f90 not supported by '\
-                      +self.__class__.__name__
+                raise DistutilsExecError, 'f90 not supported by %s needed for %s'\
+                      % (self.__class__.__name__,src)
         else:
             flavor = ':fix'
             compiler = self.compiler_fix
             if compiler is None:
-                raise DistutilsExecError, 'f90 (fixed) not supported by '\
-                      +self.__class__.__name__
+                raise DistutilsExecError, 'f90 (fixed) not supported by %s needed for %s'\
+                      % (self.__class__.__name__,src)
         if self.object_switch[-1]==' ':
             o_args = [self.object_switch.strip(),obj]
         else:
@@ -755,7 +755,8 @@
 _has_f_header = re.compile(r'-[*]-\s*fortran\s*-[*]-',re.I).search
 _has_f90_header = re.compile(r'-[*]-\s*f90\s*-[*]-',re.I).search
 _has_fix_header = re.compile(r'-[*]-\s*fix\s*-[*]-',re.I).search
-_free_f90_start = re.compile(r'[^c*]\s*[^\s\d\t]',re.I).match
+_free_f90_start = re.compile(r'[^c*!]\s*[^\s\d\t]',re.I).match
+
 def is_free_format(file):
     """Check if file is in free format Fortran."""
     # f90 allows both fixed and free format, assuming fixed unless
@@ -763,16 +764,17 @@
     result = 0
     f = open(file,'r')
     line = f.readline()
-    n = 15 # the number of non-comment lines to scan for hints
+    n = 10000 # the number of non-comment lines to scan for hints
     if _has_f_header(line):
         n = 0
     elif _has_f90_header(line):
         n = 0
         result = 1
     while n>0 and line:
-        if line[0]!='!':
+        line = line.rstrip()
+        if line and line[0]!='!':
             n -= 1
-            if (line[0]!='\t' and _free_f90_start(line[:5])) or line[-2:-1]=='&':
+            if (line[0]!='\t' and _free_f90_start(line[:5])) or line[-1:]=='&':
                 result = 1
                 break
         line = f.readline()



From numpy-svn at scipy.org  Tue Oct 10 19:16:17 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 18:16:17 -0500 (CDT)
Subject: [Numpy-svn] r3303 - in trunk/numpy: . lib
Message-ID: <20061010231617.9116539C032@new.scipy.org>

Author: stefan
Date: 2006-10-10 18:15:58 -0500 (Tue, 10 Oct 2006)
New Revision: 3303

Modified:
   trunk/numpy/add_newdocs.py
   trunk/numpy/lib/function_base.py
Log:
Simplify mean and average docstrings.


Modified: trunk/numpy/add_newdocs.py
===================================================================
--- trunk/numpy/add_newdocs.py	2006-10-10 20:27:23 UTC (rev 3302)
+++ trunk/numpy/add_newdocs.py	2006-10-10 23:15:58 UTC (rev 3303)
@@ -826,11 +826,10 @@
     """a.mean(axis=None, dtype=None)
 
       Average the array over the given axis.  If the axis is None,
-      average over all dimensions of the array.  If an integer axis
-      is given, this equals:
-          a.sum(axis, dtype) * 1.0 / len(a).
-      If axis is None, this equals:
-          a.sum(axis, dtype) * 1.0 / product(a.shape,axis=0)
+      average over all dimensions of the array.  Equivalent to
+
+        a.sum(axis, dtype) * 1.0 / size(a, axis).
+
       The optional dtype argument is the data type for intermediate
       calculations in the sum.;
 

Modified: trunk/numpy/lib/function_base.py
===================================================================
--- trunk/numpy/lib/function_base.py	2006-10-10 20:27:23 UTC (rev 3302)
+++ trunk/numpy/lib/function_base.py	2006-10-10 23:15:58 UTC (rev 3303)
@@ -230,15 +230,12 @@
 def average(a, axis=None, weights=None, returned=False):
     """average(a, axis=None weights=None, returned=False)
 
-    Average the array over the given axis.  If the axis is None, average
-    over all dimensions of the array.  Equivalent to a.mean(axis)
+    Average the array over the given axis.  If the axis is None,
+    average over all dimensions of the array.  Equivalent to
+    a.mean(axis) and to
 
-    If an integer axis is given, this equals:
-        a.sum(axis) * 1.0 / len(a)
+      a.sum(axis) * 1.0 / size(a, axis)
 
-    If axis is None, this equals:
-        a.sum(axis) * 1.0 / product(a.shape,axis=0)
-
     If weights are given, result is:
         sum(a * weights,axis) / sum(weights,axis),
     where the weights must have a's shape or be 1D with length the



From numpy-svn at scipy.org  Tue Oct 10 19:18:09 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 18:18:09 -0500 (CDT)
Subject: [Numpy-svn] r3304 - in trunk/numpy: . lib
Message-ID: <20061010231809.CCB8B39C00F@new.scipy.org>

Author: stefan
Date: 2006-10-10 18:17:54 -0500 (Tue, 10 Oct 2006)
New Revision: 3304

Modified:
   trunk/numpy/add_newdocs.py
   trunk/numpy/lib/function_base.py
Log:
Fidget with average/mean docstrings.


Modified: trunk/numpy/add_newdocs.py
===================================================================
--- trunk/numpy/add_newdocs.py	2006-10-10 23:15:58 UTC (rev 3303)
+++ trunk/numpy/add_newdocs.py	2006-10-10 23:17:54 UTC (rev 3304)
@@ -828,7 +828,7 @@
       Average the array over the given axis.  If the axis is None,
       average over all dimensions of the array.  Equivalent to
 
-        a.sum(axis, dtype) * 1.0 / size(a, axis).
+        a.sum(axis, dtype) / size(a, axis).
 
       The optional dtype argument is the data type for intermediate
       calculations in the sum.;

Modified: trunk/numpy/lib/function_base.py
===================================================================
--- trunk/numpy/lib/function_base.py	2006-10-10 23:15:58 UTC (rev 3303)
+++ trunk/numpy/lib/function_base.py	2006-10-10 23:17:54 UTC (rev 3304)
@@ -234,7 +234,7 @@
     average over all dimensions of the array.  Equivalent to
     a.mean(axis) and to
 
-      a.sum(axis) * 1.0 / size(a, axis)
+      a.sum(axis) / size(a, axis)
 
     If weights are given, result is:
         sum(a * weights,axis) / sum(weights,axis),



From numpy-svn at scipy.org  Tue Oct 10 19:19:17 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 18:19:17 -0500 (CDT)
Subject: [Numpy-svn] r3305 - trunk/numpy
Message-ID: <20061010231917.28DFF39C00F@new.scipy.org>

Author: stefan
Date: 2006-10-10 18:19:05 -0500 (Tue, 10 Oct 2006)
New Revision: 3305

Modified:
   trunk/numpy/add_newdocs.py
Log:
Remove extra semi-colon.


Modified: trunk/numpy/add_newdocs.py
===================================================================
--- trunk/numpy/add_newdocs.py	2006-10-10 23:17:54 UTC (rev 3304)
+++ trunk/numpy/add_newdocs.py	2006-10-10 23:19:05 UTC (rev 3305)
@@ -831,7 +831,7 @@
         a.sum(axis, dtype) / size(a, axis).
 
       The optional dtype argument is the data type for intermediate
-      calculations in the sum.;
+      calculations in the sum.
 
     """))
 



From numpy-svn at scipy.org  Tue Oct 10 20:39:25 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 10 Oct 2006 19:39:25 -0500 (CDT)
Subject: [Numpy-svn] r3306 - trunk/numpy/core/src
Message-ID: <20061011003925.5947039C04A@new.scipy.org>

Author: oliphant
Date: 2006-10-10 19:39:23 -0500 (Tue, 10 Oct 2006)
New Revision: 3306

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix asbuffer function.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-10 23:19:05 UTC (rev 3305)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-11 00:39:23 UTC (rev 3306)
@@ -6767,7 +6767,7 @@
 	{"getbuffer", (PyCFunction)buffer_buffer,
 	 METH_VARARGS | METH_KEYWORDS, NULL},
         {"asbuffer", (PyCFunction)as_buffer,
-         METH_VARARGS, NULL},
+         METH_VARARGS | METH_KEYWORDS, NULL},
         {"format_longfloat", (PyCFunction)format_longfloat,
          METH_VARARGS | METH_KEYWORDS, NULL},
         {"compare_chararrays", (PyCFunction)compare_chararrays,



From numpy-svn at scipy.org  Wed Oct 11 07:25:08 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 06:25:08 -0500 (CDT)
Subject: [Numpy-svn] r3307 - trunk/numpy/f2py/lib/parser
Message-ID: <20061011112508.3909739C03C@new.scipy.org>

Author: pearu
Date: 2006-10-11 06:25:02 -0500 (Wed, 11 Oct 2006)
New Revision: 3307

Modified:
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/block_statements.py
   trunk/numpy/f2py/lib/parser/statements.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
Log:
F2PY G3: improved public/private spec handling. Added function wrapping support.

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-11 00:39:23 UTC (rev 3306)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-11 11:25:02 UTC (rev 3307)
@@ -170,6 +170,7 @@
                     'variable %r already has type %s,'\
                     ' resetting to %s' \
                     % (self.name, self.typedecl.tostr(),typedecl.tostr()))
+        assert typedecl is not None
         self.typedecl = typedecl
         return
 
@@ -282,6 +283,7 @@
     def is_pointer(self): return 'POINTER' in self.attributes
 
     def is_array(self): return not not (self.bounds or self.dimension)
+    def is_scalar(self): return not self.is_array()
 
     def update(self, *attrs):
         attributes = self.attributes
@@ -334,7 +336,7 @@
         if self.check:
             a.append('CHECK(%s)' % (', '.join(self.check)))
         if a:
-            s += ', '.join(a) + ' :: '
+            s += ', ' + ', '.join(a) + ' :: '
         s += self.name
         if self.bounds:
             s += '(%s)' % (', '.join(self.bounds))

Modified: trunk/numpy/f2py/lib/parser/block_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-11 00:39:23 UTC (rev 3306)
+++ trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-11 11:25:02 UTC (rev 3307)
@@ -90,6 +90,24 @@
         sys.stderr.write('HasUseStmt.topyf not implemented\n')
         return ''
 
+class AccessSpecs:
+
+    a = AttributeHolder(private_id_list = [], public_id_list = [])
+
+    def topyf(self, tab='  '):
+        private_list = self.a.private_id_list
+        public_list = self.a.public_id_list
+        l = []
+        if '' in private_list: l.append(tab + 'PRIVATE\n')
+        if '' in public_list: l.append(tab + 'PUBLIC\n')
+        for a in private_list:
+            if not a: continue
+            l.append(tab + 'PRIVATE :: %s\n' % (a))
+        for a in public_list:
+            if not a: continue
+            l.append(tab + 'PUBLIC :: %s\n' % (a))
+        return ''.join(l)
+
 class HasVariables:
 
     a = AttributeHolder(variables = {},
@@ -129,7 +147,6 @@
         type_decl = type_decls.get(kind, None)
         if type_decl is None:
             return self.get_entity(kind)
-            raise NotImplementedError,'get type_decl from use modules'
         return type_decl
 
 class HasAttributes:
@@ -143,13 +160,6 @@
             s += tab + attr + '\n'
         return s
 
-    def is_private(self):
-        attributes = self.a.attributes
-        if 'PUBLIC' in attributes: return False
-        if 'PRIVATE' in attributes: return True
-        return
-    def is_public(self): return not self.is_private()
-
     def update_attributes(self,*attrs):
         attributes = self.a.attributes
         known_attributes = self.known_attributes
@@ -254,7 +264,7 @@
 
 class Module(BeginStatement, HasAttributes,
              HasImplicitStmt, HasUseStmt, HasVariables,
-             HasTypeDecls):
+             HasTypeDecls, AccessSpecs):
     """
     MODULE <name>
      ..
@@ -315,6 +325,7 @@
     def topyf(self, tab=''):
         s = tab + 'MODULE '+self.name + '\n'
         s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
+        s +=  AccessSpecs.topyf(self, tab=tab+'  ')
         s +=  HasAttributes.topyf(self, tab=tab+'  ')
         s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
         s +=  HasVariables.topyf(self, tab=tab+'  ')
@@ -358,8 +369,8 @@
     match = re.compile(r'end(\s*program\s*\w*|)\Z', re.I).match
 
 class Program(BeginStatement, ProgramBlock,
-              HasAttributes, # XXX: why Program needs .attributes?
-              HasImplicitStmt, HasUseStmt):
+              #HasAttributes, # XXX: why Program needs .attributes?
+              HasImplicitStmt, HasUseStmt, AccessSpecs):
     """ PROGRAM [name]
     """
     match = re.compile(r'program\s*\w*\Z', re.I).match
@@ -386,7 +397,7 @@
     blocktype = 'blockdata'
 
 class BlockData(BeginStatement, HasImplicitStmt, HasUseStmt,
-                HasVariables):
+                HasVariables, AccessSpecs):
     """
     BLOCK DATA [ <block-data-name> ]
     """
@@ -407,7 +418,7 @@
     blocktype = 'interface'
 
 class Interface(BeginStatement, HasImplicitStmt, HasUseStmt,
-                HasModuleProcedures, HasAttributes
+                HasModuleProcedures, AccessSpecs
                 ):
     """
     INTERFACE [<generic-spec>] | ABSTRACT INTERFACE
@@ -430,8 +441,6 @@
 
     a = AttributeHolder(interface_provides = {})
 
-    known_attributes = ['PUBLIC','PRIVATE']
-
     def get_classes(self):
         l = intrinsic_type_spec + interface_specification
         if self.reader.mode=='pyf':
@@ -453,8 +462,8 @@
             return 'ABSTRACT INTERFACE'
         return 'INTERFACE '+ str(self.generic_spec)
 
-    def get_provides(self):
-        return self.a.interface_provides
+    #def get_provides(self):
+    #    return self.a.interface_provides
 
     def analyze(self):
         content = self.content[:]
@@ -483,9 +492,6 @@
             parent_interface[self.name] = self
         return
 
-    def is_public(self):
-        return 'PUBLIC' in self.a.attributes
-
     def topyf(self, tab=''):
         s = tab + self.tostr() + '\n'
         s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
@@ -499,12 +505,11 @@
 class SubProgramStatement(BeginStatement, ProgramBlock,
                           HasImplicitStmt, HasAttributes,
                           HasUseStmt,
-                          HasVariables, HasTypeDecls
+                          HasVariables, HasTypeDecls, AccessSpecs
                           ):
     """
     [ <prefix> ] <FUNCTION|SUBROUTINE> <name> [ ( <args> ) ] [ <suffix> ]
     """
-    known_attributes = ['PUBLIC', 'PRIVATE']
 
     a = AttributeHolder(internal_subprogram = {})
 
@@ -596,12 +601,12 @@
         if content:
             self.show_message('Not analyzed content: %s' % content)
 
-        parent_provides = self.parent.get_provides()
-        if parent_provides is not None:
-            if self.is_public():
-                if parent_provides.has_key(self.name):
-                    self.warning('module subprogram name conflict with %s, overriding.' % (self.name))
-                parent_provides[self.name] = self
+        #parent_provides = self.parent.get_provides()
+        #if parent_provides is not None:
+        #    if self.is_public():
+        #        if parent_provides.has_key(self.name):
+        #            self.warning('module subprogram name conflict with %s, overriding.' % (self.name))
+        #        parent_provides[self.name] = self
 
         return
 
@@ -612,6 +617,7 @@
             s += ' RESULT (%s)' % (self.result)
         s += '\n'
         s +=  HasImplicitStmt.topyf(self, tab=tab+'  ')
+        s +=  AccessSpecs.topyf(self, tab=tab+'  ')
         s +=  HasTypeDecls.topyf(self, tab=tab+'  ')
         s +=  HasVariables.topyf(self, tab=tab+'  ', only_variables = self.args)
         s += tab + 'END ' + self.__class__.__name__.upper() + ' ' + self.name + '\n'
@@ -653,6 +659,42 @@
     match = re.compile(r'(recursive|pure|elemental|\s)*function\s*\w+', re.I).match
     _repr_attr_names = ['prefix','bind','suffix','args','typedecl'] + Statement._repr_attr_names
 
+    def subroutine_wrapper_code(self):
+        name = 'f2pywrap_' + self.name
+        args = ['f2pyvalue_'+self.result] + self.args
+        var = self.a.variables[self.result]
+        typedecl = var.get_typedecl().astypedecl()
+        lines = []
+        tab = ' '*6
+        lines.append('%sSUBROUTINE %s(%s)' % (tab, name, ', '.join(args)))
+        if isinstance(self.parent,Module):
+            lines.append('%s  USE %s' % (tab, self.parent.name))
+        else:
+            if isinstance(typedecl, TypeStmt):
+                type_decl = typedecl.get_type_decl(typedecl.name)
+                if type_decl.parent is self:
+                    for line in str(type_decl).split('\n'):
+                        lines.append('%s  %s' % (tab, line.lstrip()))
+            lines.append('%s  EXTERNAL %s' % (tab, self.name))
+            lines.append('%s  %s %s' % (tab, str(typedecl).lstrip(), self.name))
+        lines.append('%s  %s %s' % (tab, str(typedecl).lstrip(), args[0]))
+        lines.append('!f2py intent(out) %s' % (args[0]))
+        for a in self.args:
+            v = self.a.variables[a]
+            lines.append('%s  %s' % (tab, str(v).lstrip()))
+        lines.append('%s  %s = %s(%s)' % (tab, args[0], self.name, ', '.join(self.args)))
+        #lines.append('%s  print*,"%s=",%s' % (tab, args[0], args[0])) # debug line
+        lines.append('%sEND SUBROUTINE %s' % (tab, name))
+        return '\n'.join(lines)
+
+    def subroutine_wrapper(self):
+        code = self.subroutine_wrapper_code()
+        from api import parse
+        block = parse(code) # XXX: set include_dirs
+        while len(block.content)==1:
+            block = block.content[0]
+        return block
+
 # Handle subprogram prefixes
 
 class SubprogramPrefix(Statement):
@@ -936,7 +978,7 @@
     match = re.compile(r'end\s*type\s*\w*\Z', re.I).match
     blocktype = 'type'
 
-class Type(BeginStatement, HasVariables, HasAttributes):
+class Type(BeginStatement, HasVariables, HasAttributes, AccessSpecs):
     """
     TYPE [ [ , <type-attr-spec-list>] :: ] <type-name> [ ( <type-param-name-list> ) ]
     <type-attr-spec> = <access-spec> | EXTENDS ( <parent-type-name> )
@@ -1053,6 +1095,7 @@
         if self.a.parameters:
             s += ' (%s)' % (', '.join(self.a.parameters))
         s += '\n'
+        s += AccessSpecs.topyf(self, tab=tab+'  ')
         s += HasAttributes.topyf(self, tab=tab+'  ')
         s += HasVariables.topyf(self, tab=tab+'  ')
         s += tab + 'END TYPE ' + self.name + '\n'

Modified: trunk/numpy/f2py/lib/parser/statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/statements.py	2006-10-11 00:39:23 UTC (rev 3306)
+++ trunk/numpy/f2py/lib/parser/statements.py	2006-10-11 11:25:02 UTC (rev 3307)
@@ -580,13 +580,14 @@
         return tab + clsname
 
     def analyze(self):
-        clsname = self.__class__.__name__.upper()
+        clsname = self.__class__.__name__
+        l = getattr(self.parent.a, clsname.lower() + '_id_list')
         if self.items:
             for name in self.items:
-                var = self.get_variable(name)
-                var.update(clsname)
+                if name not in l: l.append(name)
         else:
-            self.parent.update_attributes(clsname)
+            if '' not in l:
+                l.append('')
         return
 
 class Public(Access):

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-11 00:39:23 UTC (rev 3306)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-11 11:25:02 UTC (rev 3307)
@@ -289,6 +289,12 @@
             return
         variables = self.parent.a.variables
         typedecl = self.astypedecl()
+        attrspec = self.attrspec[:]
+        try:
+            access_spec = [a for a in attrspec if a.lower() in ['private','public']][0]
+            attrspec.remove(access_spec)
+        except IndexError:
+            access_spec = None
         for item in self.entity_decls:
             name, array_spec, char_length, value = self._parse_entity(item)
             var = self.parent.get_variable(name)
@@ -302,6 +308,9 @@
                 var.set_bounds(array_spec)
             if value:
                 var.set_init(value)
+            if access_spec is not None:
+                l = getattr(self.parent.a,access_spec.lower() + '_id_list')
+                l.append(name)
             var.analyze()
         return
 



From numpy-svn at scipy.org  Wed Oct 11 07:26:06 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 06:26:06 -0500 (CDT)
Subject: [Numpy-svn] r3308 - trunk/numpy/f2py/lib
Message-ID: <20061011112606.CC6B939C03C@new.scipy.org>

Author: pearu
Date: 2006-10-11 06:25:58 -0500 (Wed, 11 Oct 2006)
New Revision: 3308

Added:
   trunk/numpy/f2py/lib/test_scalar_function_in.py
Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/py_wrap.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_derived_scalar.py
   trunk/numpy/f2py/lib/test_scalar_in_out.py
Log:
F2PY G3: Impl. scalar function support and tests.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-11 11:25:02 UTC (rev 3307)
+++ trunk/numpy/f2py/lib/main.py	2006-10-11 11:25:58 UTC (rev 3308)
@@ -297,9 +297,9 @@
             wrapper = PythonWrapperModule(block.name)
             wrapper.add(block)
             c_code = wrapper.c_code()
-            f_code = wrapper.fortran_code()
+            f_code = '! -*- f90 -*-\n' + wrapper.fortran_code()
             c_fn = os.path.join(build_dir,'%smodule.c' % (block.name))
-            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py.f' % (block.name))
+            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py.f90' % (block.name))
             f = open(c_fn,'w')
             f.write(c_code)
             f.close()
@@ -325,7 +325,13 @@
             c_code = wrapper.c_code()
             f_code = wrapper.fortran_code()
             c_fn = os.path.join(build_dir,'%smodule.c' % (modulename))
-            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py.f' % (modulename))
+            ext = '.f'
+            language = 'f77'
+            if wrapper.isf90:
+                f_code = '! -*- f90 -*-\n' + f_code
+                ext = '.f90'
+                language = 'f90'
+            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py%s' % (modulename, ext))
             f = open(c_fn,'w')
             f.write(c_code)
             f.close()
@@ -342,6 +348,7 @@
                                  undef_macros = undef_macros,
                                  include_dirs = include_dirs,
                                  extra_objects = extra_objects,
+                                 language = language
                                  )
         return config
 

Modified: trunk/numpy/f2py/lib/py_wrap.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap.py	2006-10-11 11:25:02 UTC (rev 3307)
+++ trunk/numpy/f2py/lib/py_wrap.py	2006-10-11 11:25:58 UTC (rev 3308)
@@ -78,7 +78,7 @@
         self.list_names = ['header', 'typedef', 'extern', 'objdecl',
                            'c_code','capi_code','module_method','module_init',
                            'fortran_code']
-
+        self.isf90 = False
         return
 
     def add(self, block):
@@ -87,12 +87,22 @@
                 self.add(moduleblock)
             #for name, subblock in block.a.external_subprogram.items():
             #    self.add(subblock)
-        elif isinstance(block, (Subroutine, Function)):
+        elif isinstance(block, Subroutine):
             PythonCAPISubProgram(self, block)
+        elif isinstance(block, Function):
+            fcode = block.subroutine_wrapper_code()
+            self.fortran_code_list.append(fcode)
+            wrapper_block = block.subroutine_wrapper()
+            PythonCAPISubProgram(self, wrapper_block)
         elif isinstance(block, Module):
+            self.isf90 = True
             for name,declblock in block.a.type_decls.items():
                 self.add(declblock)
+            for name,subblock in block.a.module_subprogram.items():
+                self.add(subblock)
         elif isinstance(block, tuple([TypeDecl]+declaration_type_spec)):
+            if isinstance(block, (TypeDecl, TypeStmt)):
+                self.isf90 = True
             PythonCAPIType(self, block)
         else:
             raise NotImplementedError,`block.__class__.__name__`

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-11 11:25:02 UTC (rev 3307)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-11 11:25:58 UTC (rev 3308)
@@ -24,7 +24,7 @@
 '''
     module_init_template = ''
     module_method_template = '''\
-{"%(name)s", (PyCFunction)%(cname)s, METH_VARARGS | METH_KEYWORDS, %(cname)s__doc},'''
+{"%(pyname)s", (PyCFunction)%(cname)s, METH_VARARGS | METH_KEYWORDS, %(cname)s__doc},'''
     c_code_template = ''
     capi_code_template = '''\
 static PyObject* %(cname)s(PyObject *capi_self, PyObject *capi_args, PyObject *capi_keywds) {
@@ -55,13 +55,16 @@
     _defined = []
     def __init__(self, parent, block):
         WrapperBase.__init__(self)
-        self.name = name = block.name
+        self.name = name = pyname = block.name
         self.cname = cname = '%s_%s' % (parent.cname,name)
         if cname in self._defined:
             return
         self._defined.append(cname)
         self.info('Generating interface for %s: %s' % (block.__class__, cname))
 
+        if pyname.startswith('f2pywrap_'):
+            pyname = pyname[9:]
+        self.pyname = pyname
 
         self.decl_list = []
         self.kw_list = []
@@ -85,20 +88,30 @@
         for argname in block.args:
             argindex += 1
             var = block.a.variables[argname]
+            assert var.is_scalar(),'array support not implemented: "%s"' % (var)
             typedecl = var.get_typedecl()
             PythonCAPIType(parent, typedecl)
             ti = PyTypeInterface(typedecl)
-            self.kw_list.append('"%s"' % (argname))
+            if var.is_intent_in():
+                self.kw_list.append('"%s"' % (argname))
 
             if isinstance(typedecl, TypeStmt):
-                self.pyarg_format_list.append('O&')
+                if var.is_intent_in():
+                    self.pyarg_format_list.append('O&')
+                    self.pyarg_obj_list.append('\npyobj_to_%s_inplace, &%s' % (ti.ctype, argname))
+                else:
+                    self.frompyobj_list.append('%s = (%s*)pyobj_from_%s(NULL);' % (argname,ti.otype,ti.ctype))
+                    if not var.is_intent_out():
+                        self.clean_frompyobj_list.append('Py_DECREF(%s);' % (argname))
                 self.decl_list.append('%s* %s = NULL;' % (ti.otype, argname))
-                self.pyarg_obj_list.append('\npyobj_to_%s_inplace, &%s' % (ti.ctype, argname))
                 args_f.append('%s->data' % (argname)) # is_scalar
             else:
-                self.pyarg_format_list.append('O&')
+                if var.is_intent_in():
+                    self.pyarg_format_list.append('O&')
+                    self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ti.ctype, argname))
                 assert not isinstance(typedecl, TypeDecl)
                 if ti.ctype=='f2py_string0':
+                    assert not var.is_intent_out(),'intent(out) not implemented for "%s"' % (var)
                     self.decl_list.append('%s %s = {NULL,0};' % (ti.ctype, argname))
                     args_f.append('%s.data' % argname)  # is_scalar
                     extra_args_f.append('%s.len' % argname)
@@ -107,7 +120,7 @@
                 else:
                     self.decl_list.append('%s %s;' % (ti.ctype, argname))
                     args_f.append('&'+argname) # is_scalar
-                self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ti.ctype, argname))
+
             if var.is_intent_out(): # and is_scalar
                 if isinstance(typedecl, TypeStmt):
                     self.return_format_list.append('N')

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-11 11:25:02 UTC (rev 3307)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-11 11:25:58 UTC (rev 3308)
@@ -48,6 +48,7 @@
         if isinstance(typedecl, tuple(declaration_type_spec)):
             if isinstance(typedecl, TypeStmt):
                 type_decl = typedecl.get_type_decl(typedecl.name)
+                assert type_decl is not None,"%s %s" % (typedecl,typedecl.name)
                 PythonCAPIDerivedType(parent, type_decl)
             else:
                 PythonCAPIIntrinsicType(parent, typedecl)
@@ -584,6 +585,7 @@
             return
         self._defined.append(name)
         self.info('Generating interface for %s: %s' % (typedecl.__class__, name))
+        parent.isf90 = True
 
         self.name = name
         self.otype = otype = ti.otype

Modified: trunk/numpy/f2py/lib/test_derived_scalar.py
===================================================================
--- trunk/numpy/f2py/lib/test_derived_scalar.py	2006-10-11 11:25:02 UTC (rev 3307)
+++ trunk/numpy/f2py/lib/test_derived_scalar.py	2006-10-11 11:25:58 UTC (rev 3308)
@@ -25,6 +25,7 @@
             os.remove(m.__file__)
             raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
     except ImportError,msg:
+        assert str(msg).startswith('No module named'),str(msg)
         print msg, ', recompiling %s.' % (modulename)
         import tempfile
         fname = tempfile.mktemp() + '.f90'
@@ -32,14 +33,14 @@
         f.write(fortran_code)
         f.close()
         sys_argv = []
-        sys_argv.extend(['--build-dir','dsctmp'])
+        sys_argv.extend(['--build-dir','tmp'])
         #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
         from main import build_extension
         sys_argv.extend(['-m',modulename, fname])
         build_extension(sys_argv)
         os.remove(fname)
-        os.system(' '.join([sys.executable] + sys.argv))
-        sys.exit(0)
+        status = os.system(' '.join([sys.executable] + sys.argv))
+        sys.exit(status)
     return m
 
 fortran_code = '''
@@ -51,6 +52,14 @@
 !f2py intent(in,out) a
   a % flag = a % flag + 1
 end
+function foo2(a)
+  type myt
+    integer flag
+  end type myt
+  type(myt) a
+  type(myt) foo2
+  foo2 % flag = a % flag + 2
+end
 '''
 
 # tester note: set rebuild=True when changing fortan_code and for SVN
@@ -69,6 +78,22 @@
         assert r is a
         assert_equal(r.flag,3)
         assert_equal(a.flag,3)
+
+        a.flag = 5
+        assert_equal(r.flag,5)
+
+        #s = m.foo((5,))
+
+    def check_foo2_simple(self, level=1):
+        a = m.myt(2)
+        assert_equal(a.flag,2)
+        assert isinstance(a,m.myt),`a`
+        r = m.foo2(a)
+        assert isinstance(r,m.myt),`r`
+        assert r is not a
+        assert_equal(a.flag,2)
+        assert_equal(r.flag,4)
+
         
 if __name__ == "__main__":
     NumpyTest().run()

Added: trunk/numpy/f2py/lib/test_scalar_function_in.py
===================================================================
--- trunk/numpy/f2py/lib/test_scalar_function_in.py	2006-10-11 11:25:02 UTC (rev 3307)
+++ trunk/numpy/f2py/lib/test_scalar_function_in.py	2006-10-11 11:25:58 UTC (rev 3308)
@@ -0,0 +1,554 @@
+#!/usr/bin/env python
+"""
+Tests for intent(in) arguments in subroutine-wrapped Fortran functions.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+import os
+import sys
+from numpy.testing import *
+
+def build(fortran_code, rebuild=True):
+    modulename = os.path.splitext(os.path.basename(__file__))[0]+'_ext'
+    try:
+        exec ('import %s as m' % (modulename))
+        if rebuild and os.stat(m.__file__)[8] < os.stat(__file__)[8]:
+            del sys.modules[m.__name__] # soft unload extension module
+            os.remove(m.__file__)
+            raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
+    except ImportError,msg:
+        assert str(msg).startswith('No module named'),str(msg)
+        print msg, ', recompiling %s.' % (modulename)
+        import tempfile
+        fname = tempfile.mktemp() + '.f'
+        f = open(fname,'w')
+        f.write(fortran_code)
+        f.close()
+        sys_argv = ['--build-dir','tmp']
+        #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
+        from main import build_extension
+        sys_argv.extend(['-m',modulename, fname])
+        build_extension(sys_argv)
+        os.remove(fname)
+        os.system(' '.join([sys.executable] + sys.argv))
+        sys.exit(0)
+    return m
+
+fortran_code = '''
+      function fooint1(a)
+      integer*1 a
+      integer*1 fooint1
+      fooint1 = a + 1
+      end
+      function fooint2(a)
+      integer*2 a
+      integer*2 fooint2
+      fooint2 = a + 1
+      end
+      function fooint4(a)
+      integer*4 a
+      integer*4 fooint4
+      fooint4 = a + 1
+      end
+      function fooint8(a)
+      integer*8 a
+      integer*8 fooint8
+      fooint8 = a + 1
+      end
+      function foofloat4(a)
+      real*4 a
+      real*4 foofloat4
+      foofloat4 = a + 1.0e0
+      end
+      function foofloat8(a)
+      real*8 a
+      real*8 foofloat8
+      foofloat8 = a + 1.0d0
+      end
+      function foocomplex8(a)
+      complex*8 a
+      complex*8 foocomplex8
+      foocomplex8 = a + 1.0e0
+      end
+      function foocomplex16(a)
+      complex*16 a
+      complex*16 foocomplex16
+      foocomplex16 = a + 1.0d0
+      end
+      function foobool1(a)
+      logical*1 a
+      logical*1 foobool1
+      foobool1 = .not. a
+      end
+      function foobool2(a)
+      logical*2 a
+      logical*2 foobool2
+      foobool2 = .not. a
+      end
+      function foobool4(a)
+      logical*4 a
+      logical*4 foobool4
+      foobool4 = .not. a
+      end
+      function foobool8(a)
+      logical*8 a
+      logical*8 foobool8
+      foobool8 = .not. a
+      end
+      function foostring1(a)
+      character*1 a
+      character*1 foostring1
+      foostring1 = "1"
+      end
+      function foostring5(a)
+      character*5 a
+      character*5 foostring5
+      foostring5 = a
+      foostring5(1:2) = "12"
+      end
+!      function foostringstar(a)
+!      character*(*) a
+!      character*(*) foostringstar
+!      if (len(a).gt.0) then
+!        foostringstar = a
+!        foostringstar(1:1) = "1"
+!      endif
+!      end
+'''
+
+# tester note: set rebuild=True when changing fortan_code and for SVN
+m = build(fortran_code, rebuild=True)
+
+from numpy import *
+
+class test_m(NumpyTestCase):
+
+    def check_foo_integer1(self, level=1):
+        i = int8(2)
+        e = int8(3)
+        func = m.fooint1
+        assert isinstance(i,int8),`type(i)`
+        r = func(i)
+        assert isinstance(r,int8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int64,int16,int32]:
+            r = func(intx(2))
+            assert isinstance(r,int8),`type(r)`
+            assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int8),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_integer2(self, level=1):
+        i = int16(2)
+        e = int16(3)
+        func = m.fooint2
+        assert isinstance(i,int16),`type(i)`
+        r = func(i)
+        assert isinstance(r,int16),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int8,int64,int32]:
+            r = func(intx(2))
+            assert isinstance(r,int16),`type(r)`
+            assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int16),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_integer4(self, level=1):
+        i = int32(2)
+        e = int32(3)
+        func = m.fooint4
+        assert isinstance(i,int32),`type(i)`
+        r = func(i)
+        assert isinstance(r,int32),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int8,int16,int64]:
+            r = func(intx(2))
+            assert isinstance(r,int32),`type(r)`
+            assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_integer8(self, level=1):
+        i = int64(2)
+        e = int64(3)
+        func = m.fooint8
+        assert isinstance(i,int64),`type(i)`
+        r = func(i)
+        assert isinstance(r,int64),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        for intx in [int8,int16,int32]:
+            r = func(intx(2))
+            assert isinstance(r,int64),`type(r)`
+            assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,int64),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_real4(self, level=1):
+        i = float32(2)
+        e = float32(3)
+        func = m.foofloat4
+        assert isinstance(i,float32),`type(i)`
+        r = func(i)
+        assert isinstance(r,float32),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e+float32(0.2))
+
+        r = func(float64(2.0))
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,float32),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_real8(self, level=1):
+        i = float64(2)
+        e = float64(3)
+        func = m.foofloat8
+        assert isinstance(i,float64),`type(i)`
+        r = func(i)
+        assert isinstance(r,float64),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e+float64(0.2))
+
+        r = func(float32(2.0))
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,float64),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func(2.2j))
+        self.assertRaises(TypeError,lambda :func([2,1]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_complex8(self, level=1):
+        i = complex64(2)
+        e = complex64(3)
+        func = m.foocomplex8
+        assert isinstance(i,complex64),`type(i)`
+        r = func(i)
+        assert isinstance(r,complex64),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e+complex64(0.2))
+
+        r = func(2+1j)
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e+complex64(1j))
+
+        r = func(complex128(2.0))
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2])
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2,3])
+        assert isinstance(r,complex64),`type(r)`
+        assert_equal(r,e+complex64(3j))
+
+        self.assertRaises(TypeError,lambda :func([2,1,3]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_complex16(self, level=1):
+        i = complex128(2)
+        e = complex128(3)
+        func = m.foocomplex16
+        assert isinstance(i,complex128),`type(i)`
+        r = func(i)
+        assert isinstance(r,complex128),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func(2)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.0)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        r = func(2.2)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e+complex128(0.2))
+
+        r = func(2+1j)
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e+complex128(1j))
+
+        r = func([2])
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        r = func([2,3])
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e+complex128(3j))
+
+        r = func(complex64(2.0))
+        assert isinstance(r,complex128),`type(r)`
+        assert_equal(r,e)
+
+        self.assertRaises(TypeError,lambda :func([2,1,3]))
+        self.assertRaises(TypeError,lambda :func({}))
+
+    def check_foo_bool1(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool1
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_bool2(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool2
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_bool4(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool4
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_bool8(self, level=1):
+        i = bool8(True)
+        e = bool8(False)
+        func = m.foobool8
+        assert isinstance(i,bool8),`type(i)`
+        r = func(i)
+        assert isinstance(r,bool8),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        for tv in [1,2,2.1,-1j,[0],True]:
+            r = func(tv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,e)
+
+        for fv in [0,0.0,0j,False,(),{},[]]:
+            r = func(fv)
+            assert isinstance(r,bool8),`type(r)`
+            assert_equal(r,not e)
+
+    def check_foo_string1(self, level=1):
+        i = string0('a')
+        e = string0('1')
+        func = m.foostring1
+        assert isinstance(i,string0),`type(i)`
+        r = func(i)
+        assert isinstance(r,string0),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func('ab')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,e)
+
+        r = func('')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,e)
+
+    def check_foo_string5(self, level=1):
+        i = string0('abcde')
+        e = string0('12cde')
+        func = m.foostring5
+        assert isinstance(i,string0),`type(i)`
+        r = func(i)
+        assert isinstance(r,string0),`type(r)`
+        assert i is not r,`id(i),id(r)`
+        assert_equal(r,e)
+
+        r = func('abc')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,'12c  ')
+
+        r = func('abcdefghi')
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,'12cde')
+
+        r = func([1])
+        assert isinstance(r,string0),`type(r)`
+        assert_equal(r,'12]  ')
+
+    def _check_foo_string0(self, level=1):
+        i = string0('abcde')
+        e = string0('12cde')
+        func = m.foostringstar
+        r = func('abcde')
+        assert_equal(r,'1bcde')
+        r = func('')
+        assert_equal(r,'')
+        
+if __name__ == "__main__":
+    NumpyTest().run()

Modified: trunk/numpy/f2py/lib/test_scalar_in_out.py
===================================================================
--- trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-11 11:25:02 UTC (rev 3307)
+++ trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-11 11:25:58 UTC (rev 3308)
@@ -25,6 +25,7 @@
             os.remove(m.__file__)
             raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
     except ImportError,msg:
+        assert str(msg).startswith('No module named'),str(msg)
         print msg, ', recompiling %s.' % (modulename)
         import tempfile
         fname = tempfile.mktemp() + '.f'



From numpy-svn at scipy.org  Wed Oct 11 15:10:54 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 14:10:54 -0500 (CDT)
Subject: [Numpy-svn] r3309 - trunk/numpy/core/src
Message-ID: <20061011191054.D86B439C074@new.scipy.org>

Author: oliphant
Date: 2006-10-11 14:10:51 -0500 (Wed, 11 Oct 2006)
New Revision: 3309

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Make (type,()) return type

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-11 11:25:58 UTC (rev 3308)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-11 19:10:51 UTC (rev 3309)
@@ -4249,9 +4249,10 @@
 					"invalid shape in fixed-type tuple.");
 			goto fail;
 		}
-		/* If (type, 1) was given, it is equivalent to type... */
-		if (shape.len == 1 && shape.ptr[0] == 1 && \
-		    PyNumber_Check(val)) {
+		/* If (type, 1) was given, it is equivalent to type... 
+                   or (type, ()) was given it is equivalent to type... */
+		if ((shape.len == 1 && shape.ptr[0] == 1 && PyNumber_Check(val)) || \
+                    (shape.len == 0 && PyTuple_Check(val))) {
 			PyDimMem_FREE(shape.ptr);
 			return type;
 		}



From numpy-svn at scipy.org  Wed Oct 11 15:38:11 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 14:38:11 -0500 (CDT)
Subject: [Numpy-svn] r3310 - trunk/numpy/f2py/lib
Message-ID: <20061011193811.C983739C00A@new.scipy.org>

Author: pearu
Date: 2006-10-11 14:38:06 -0500 (Wed, 11 Oct 2006)
New Revision: 3310

Added:
   trunk/numpy/f2py/lib/test_module_scalar.py
Modified:
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
Log:
F2PY G3: Impl. F90 module subprogram support and simple tests.

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-11 19:10:51 UTC (rev 3309)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-11 19:38:06 UTC (rev 3310)
@@ -3,7 +3,7 @@
 
 import sys
 
-from parser.api import TypeDecl, TypeStmt
+from parser.api import TypeDecl, TypeStmt, Module
 from wrapper_base import *
 from py_wrap_type import *
 
@@ -12,20 +12,18 @@
     Fortran subprogram hooks.
     """
 
-    header_template = '''\
+    header_template_f77 = '''\
 #define %(name)s_f F_FUNC(%(name)s, %(NAME)s)
 '''
-    typedef_template = ''
-    extern_template = '''\
+    extern_template_f77 = '''\
 extern void %(name)s_f();
 '''
-    objdecl_template = '''\
+    objdecl_template_doc = '''\
 static char %(cname)s__doc[] = "";
 '''
-    module_init_template = ''
     module_method_template = '''\
 {"%(pyname)s", (PyCFunction)%(cname)s, METH_VARARGS | METH_KEYWORDS, %(cname)s__doc},'''
-    c_code_template = ''
+
     capi_code_template = '''\
 static PyObject* %(cname)s(PyObject *capi_self, PyObject *capi_args, PyObject *capi_keywds) {
   PyObject * volatile capi_buildvalue = NULL;
@@ -50,8 +48,35 @@
   return capi_buildvalue;
 }
 '''
-    fortran_code_template = ''
-    
+
+    header_template_module = '''
+#define %(name)s_f (*%(name)s_func_ptr)
+#define %(init_func)s_f F_FUNC(%(init_func)s, %(INIT_FUNC)s)
+'''
+    typedef_template_module = '''
+typedef void (*%(name)s_functype)();
+'''
+    extern_template_module = '''\
+static %(name)s_functype %(name)s_func_ptr;
+'''
+    objdecl_template_module = '''
+'''
+    fortran_code_template_module = '''
+    subroutine %(init_func)s(init_func_c)
+      use %(mname)s
+      external init_func_c
+      call init_func_c(%(name)s)
+    end
+'''
+    c_code_template_module = '''
+static void %(init_func)s_c(%(name)s_functype func_ptr) {
+  %(name)s_func_ptr = func_ptr;
+}
+'''
+    module_init_template_module = '''
+%(init_func)s_f(%(init_func)s_c);
+'''
+
     _defined = []
     def __init__(self, parent, block):
         WrapperBase.__init__(self)
@@ -66,6 +91,30 @@
             pyname = pyname[9:]
         self.pyname = pyname
 
+        self.header_template = ''
+        self.extern_template = ''
+        self.module_init_template = ''
+        self.typedef_template = ''
+        self.c_code_template = ''
+        self.objdecl_template =  ''
+        self.fortran_code_template = ''
+
+        if isinstance(block.parent, Module):
+            self.mname = block.parent.name
+            self.init_func = '%s_init' % (name)
+            self.typedef_template += self.typedef_template_module
+            self.header_template += self.header_template_module
+            self.fortran_code_template += self.fortran_code_template_module
+            self.module_init_template += self.module_init_template_module
+            self.objdecl_template += self.objdecl_template_module
+            self.c_code_template += self.c_code_template_module
+            self.extern_template += self.extern_template_module
+        else:
+            self.extern_template += self.extern_template_f77
+            self.header_template += self.header_template_f77
+
+        self.objdecl_template += self.objdecl_template_doc
+
         self.decl_list = []
         self.kw_list = []
         self.optkw_list = []
@@ -111,7 +160,8 @@
                     self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ti.ctype, argname))
                 assert not isinstance(typedecl, TypeDecl)
                 if ti.ctype=='f2py_string0':
-                    assert not var.is_intent_out(),'intent(out) not implemented for "%s"' % (var)
+                    if not var.is_intent_in():
+                        assert not var.is_intent_out(),'intent(out) not implemented for "%s"' % (var)
                     self.decl_list.append('%s %s = {NULL,0};' % (ti.ctype, argname))
                     args_f.append('%s.data' % argname)  # is_scalar
                     extra_args_f.append('%s.len' % argname)

Added: trunk/numpy/f2py/lib/test_module_scalar.py
===================================================================
--- trunk/numpy/f2py/lib/test_module_scalar.py	2006-10-11 19:10:51 UTC (rev 3309)
+++ trunk/numpy/f2py/lib/test_module_scalar.py	2006-10-11 19:38:06 UTC (rev 3310)
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+"""
+Tests for module with scalar derived types and subprograms.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+import os
+import sys
+from numpy.testing import *
+
+def build(fortran_code, rebuild=True):
+    modulename = os.path.splitext(os.path.basename(__file__))[0] + '_ext'
+    try:
+        exec ('import %s as m' % (modulename))
+        if rebuild and os.stat(m.__file__)[8] < os.stat(__file__)[8]:
+            del sys.modules[m.__name__] # soft unload extension module
+            os.remove(m.__file__)
+            raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
+    except ImportError,msg:
+        assert str(msg)==('No module named %s' % (modulename)),str(msg)
+        print msg, ', recompiling %s.' % (modulename)
+        import tempfile
+        fname = tempfile.mktemp() + '.f90'
+        f = open(fname,'w')
+        f.write(fortran_code)
+        f.close()
+        sys_argv = []
+        sys_argv.extend(['--build-dir','tmp'])
+        #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
+        from main import build_extension
+        sys_argv.extend(['-m',modulename, fname])
+        build_extension(sys_argv)
+        os.remove(fname)
+        status = os.system(' '.join([sys.executable] + sys.argv))
+        sys.exit(status)
+    return m
+
+fortran_code = '''
+module test_module_scalar_ext
+
+  contains
+    subroutine foo(a)
+    integer a
+!f2py intent(in,out) a
+    a = a + 1
+    end subroutine foo
+    function foo2(a)
+    integer a
+    integer foo2
+    foo2 = a + 2
+    end function foo2
+end module test_module_scalar_ext
+'''
+
+# tester note: set rebuild=True when changing fortan_code and for SVN
+m = build(fortran_code, rebuild=True)
+
+from numpy import *
+
+class test_m(NumpyTestCase):
+
+    def check_foo_simple(self, level=1):
+        foo = m.foo
+        r = foo(2)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,3)
+
+    def check_foo2_simple(self, level=1):
+        foo2 = m.foo2
+        r = foo2(2)
+        assert isinstance(r,int32),`type(r)`
+        assert_equal(r,4)
+
+if __name__ == "__main__":
+    NumpyTest().run()



From numpy-svn at scipy.org  Wed Oct 11 16:56:30 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 15:56:30 -0500 (CDT)
Subject: [Numpy-svn] r3311 - trunk/numpy/lib
Message-ID: <20061011205630.8B5CC39C073@new.scipy.org>

Author: oliphant
Date: 2006-10-11 15:56:27 -0500 (Wed, 11 Oct 2006)
New Revision: 3311

Modified:
   trunk/numpy/lib/scimath.py
Log:
Fix some name-space errors in scimath.

Modified: trunk/numpy/lib/scimath.py
===================================================================
--- trunk/numpy/lib/scimath.py	2006-10-11 19:38:06 UTC (rev 3310)
+++ trunk/numpy/lib/scimath.py	2006-10-11 20:56:27 UTC (rev 3311)
@@ -54,13 +54,13 @@
     """
     x = _fix_real_lt_zero(x)
     n = _fix_real_lt_zero(n)
-    return log(x)/log(n)
+    return nx.log(x)/nx.log(n)
 
 def log2(x):
     """ Take log base 2 of x.
     """
     x = _fix_real_lt_zero(x)
-    return log(x)/_ln2
+    return nx.log(x)/_ln2
 
 def power(x, p):
     x = _fix_real_lt_zero(x)
@@ -68,12 +68,12 @@
 
 def arccos(x):
     x = _fix_real_abs_gt_1(x)
-    return arccos(x)
+    return nx.arccos(x)
 
 def arcsin(x):
     x = _fix_real_abs_gt_1(x)
-    return arcsin(x)
+    return nx.arcsin(x)
 
 def arctanh(x):
     x = _fix_real_abs_gt_1(x)
-    return arctanh(x)
+    return nx.arctanh(x)



From numpy-svn at scipy.org  Wed Oct 11 17:23:10 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 16:23:10 -0500 (CDT)
Subject: [Numpy-svn] r3312 - trunk/numpy/core/tests
Message-ID: <20061011212310.049FA39C00A@new.scipy.org>

Author: stefan
Date: 2006-10-11 16:22:58 -0500 (Wed, 11 Oct 2006)
New Revision: 3312

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Test for ticket #334.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-11 20:56:27 UTC (rev 3311)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-11 21:22:58 UTC (rev 3312)
@@ -502,5 +502,9 @@
         """Ticket #330"""
         N.float64(1.0).imag
         
+    def check_dtype_tuple(self, level=rlevel):
+        """Ticket #334"""
+        assert N.dtype('i4') == N.dtype(('i4',()))
+        
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Wed Oct 11 19:28:17 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 18:28:17 -0500 (CDT)
Subject: [Numpy-svn] r3313 - trunk/numpy/lib
Message-ID: <20061011232817.0287C39C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-11 18:28:16 -0500 (Wed, 11 Oct 2006)
New Revision: 3313

Modified:
   trunk/numpy/lib/scimath.py
Log:
Fix scimath.power for negative integer input.

Modified: trunk/numpy/lib/scimath.py
===================================================================
--- trunk/numpy/lib/scimath.py	2006-10-11 21:22:58 UTC (rev 3312)
+++ trunk/numpy/lib/scimath.py	2006-10-11 23:28:16 UTC (rev 3313)
@@ -31,6 +31,12 @@
         x = _tocomplex(x)
     return x
 
+def _fix_int_lt_zero(x):
+    x = asarray(x)
+    if any(isreal(x) & (x < 0)):
+        x = x * 1.0
+    return x
+
 def _fix_real_abs_gt_1(x):
     x = asarray(x)
     if any(isreal(x) & (abs(x)>1)):
@@ -64,6 +70,7 @@
 
 def power(x, p):
     x = _fix_real_lt_zero(x)
+    p = _fix_int_lt_zero(p)
     return nx.power(x, p)
 
 def arccos(x):



From numpy-svn at scipy.org  Wed Oct 11 19:52:55 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 11 Oct 2006 18:52:55 -0500 (CDT)
Subject: [Numpy-svn] r3314 - trunk/numpy/core
Message-ID: <20061011235255.36C1439C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-11 18:52:53 -0500 (Wed, 11 Oct 2006)
New Revision: 3314

Modified:
   trunk/numpy/core/numeric.py
Log:
Add errstate object to be created in new 'with' statement

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-11 23:28:16 UTC (rev 3313)
+++ trunk/numpy/core/numeric.py	2006-10-11 23:52:53 UTC (rev 3314)
@@ -16,7 +16,7 @@
            'load', 'loads', 'isscalar', 'binary_repr', 'base_repr',
            'ones', 'identity', 'allclose', 'compare_chararrays', 'putmask',
            'seterr', 'geterr', 'setbufsize', 'getbufsize',
-           'seterrcall', 'geterrcall', 'flatnonzero',
+           'seterrcall', 'geterrcall', 'errstate', 'flatnonzero',
            'Inf', 'inf', 'infty', 'Infinity',
            'nan', 'NaN', 'False_', 'True_', 'bitwise_not',
            'CLIP', 'RAISE', 'WRAP', 'MAXDIMS', 'BUFSIZE', 'ALLOW_THREADS']
@@ -716,6 +716,14 @@
     """
     return umath.geterrobj()[2]
 
+class errstate(object):
+    def __init__(self, **kwargs):
+        self.kwargs = kwargs
+    def __enter__(self):
+        self.oldstate = seterr(**self.kwargs)
+    def __exit__(self, *exc_info):
+        numpy.seterr(**self.oldstate)
+
 def _setdef():
     defval = [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT, None]
     umath.seterrobj(defval)



From numpy-svn at scipy.org  Thu Oct 12 02:18:12 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 12 Oct 2006 01:18:12 -0500 (CDT)
Subject: [Numpy-svn] r3315 - in trunk/numpy/core: . src
Message-ID: <20061012061812.AA1E639C00A@new.scipy.org>

Author: oliphant
Date: 2006-10-12 01:18:04 -0500 (Thu, 12 Oct 2006)
New Revision: 3315

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix
asbuffer -> int_asbuffer so that it checks for read (and write) ability to the memory to be used as a buffer by catching SIG_SEGV

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-11 23:52:53 UTC (rev 3314)
+++ trunk/numpy/core/numeric.py	2006-10-12 06:18:04 UTC (rev 3315)
@@ -1,7 +1,7 @@
 __all__ = ['newaxis', 'ndarray', 'flatiter', 'ufunc',
            'arange', 'array', 'zeros', 'empty', 'broadcast', 'dtype',
            'fromstring', 'fromfile', 'frombuffer','newbuffer',
-           'getbuffer', 'where', 'argwhere',
+           'getbuffer', 'int_asbuffer', 'where', 'argwhere',
            'concatenate', 'fastCopyAndTranspose', 'lexsort',
            'set_numeric_ops', 'can_cast',
            'asarray', 'asanyarray', 'ascontiguousarray', 'asfortranarray',
@@ -113,6 +113,7 @@
 frombuffer = multiarray.frombuffer
 newbuffer = multiarray.newbuffer
 getbuffer = multiarray.getbuffer
+int_asbuffer = multiarray.int_asbuffer
 where = multiarray.where
 concatenate = multiarray.concatenate
 fastCopyAndTranspose = multiarray._fastCopyAndTranspose

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-11 23:52:53 UTC (rev 3314)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-12 06:18:04 UTC (rev 3315)
@@ -17,9 +17,6 @@
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"
-/*#include <string.h>
-#include <math.h>
-*/
 
 #define _MULTIARRAYMODULE
 #define NPY_NO_PREFIX
@@ -6538,26 +6535,86 @@
 		return PyBuffer_FromReadWriteObject(obj, offset, size);
 }
 
+#ifndef _MSC_VER
+#include <setjmp.h>
+jmp_buf _NPY_SIGSEGV_BUF;
+static void
+_SigSegv_Handler(int signum)
+{
+        longjmp(_NPY_SIGSEGV_BUF, signum);
+}
+#endif
+
+#define _test_code() {                                   \
+                test = *((char*)memptr);                 \
+                if (!ro) {                               \
+                        *((char *)memptr) = '\0';        \
+                        *((char *)memptr) = test;        \
+                }                                        \
+                test = *((char*)memptr+size-1);          \
+                if (!ro) {                               \
+                        *((char *)memptr+size-1) = '\0'; \
+                        *((char *)memptr+size-1) = test; \
+                }                                        \
+        }
+
 static PyObject *
 as_buffer(PyObject *dummy, PyObject *args, PyObject *kwds)
 {
         PyObject *mem;
         Py_ssize_t size;
-        Bool ro=FALSE;
+        Bool ro=FALSE, check=TRUE;
         void *memptr;
-        static char *kwlist[] = {"mem", "size", "readonly", NULL};
+        static char *kwlist[] = {"mem", "size", "readonly", "check", NULL};
         if (!PyArg_ParseTupleAndKeywords(args, kwds, "O" \
-                                         NPY_SSIZE_T_PYFMT "|O&", kwlist,
+                                         NPY_SSIZE_T_PYFMT "|O&O&", kwlist,
                                          &mem, &size, PyArray_BoolConverter,
-                                         &ro)) return NULL;
+                                         &ro, PyArray_BoolConverter,
+                                         &check)) return NULL;
         memptr = PyLong_AsVoidPtr(mem);
         if (memptr == NULL) return NULL;
+
+        if (check) {
+                /* Try to dereference the start and end of the memory region */
+                /* Catch segfault and report error if it occurs */
+                char test;
+                int err=0;
+#ifdef _MSC_VER
+                __try {
+                        _test_code();
+                }
+                __except(1) {
+                        err = 1;
+                }
+#else 
+                PyOS_sighandler_t _npy_sig_save;
+                _npy_sig_save = PyOS_setsig(SIGSEGV, _SigSegv_Handler);
+                
+                if (setjmp(_NPY_SIGSEGV_BUF) == 0) {
+                        _test_code();
+                }
+                else {
+                        err = 1;
+                }
+                PyOS_setsig(SIGSEGV, _npy_sig_save);
+#endif
+                if (err) {
+                        PyErr_SetString(PyExc_ValueError, 
+                                        "cannot use memory location as " \
+                                        "a buffer.");
+                        return NULL;                        
+                }
+        }
+
+
         if (ro) {
                 return PyBuffer_FromMemory(memptr, size);
         }
         return PyBuffer_FromReadWriteMemory(memptr, size);
 }
 
+#undef _test_code
+
 static PyObject *
 format_longfloat(PyObject *dummy, PyObject *args, PyObject *kwds)
 {
@@ -6767,7 +6824,7 @@
 	 METH_VARARGS, NULL},
 	{"getbuffer", (PyCFunction)buffer_buffer,
 	 METH_VARARGS | METH_KEYWORDS, NULL},
-        {"asbuffer", (PyCFunction)as_buffer,
+        {"int_asbuffer", (PyCFunction)as_buffer,
          METH_VARARGS | METH_KEYWORDS, NULL},
         {"format_longfloat", (PyCFunction)format_longfloat,
          METH_VARARGS | METH_KEYWORDS, NULL},



From numpy-svn at scipy.org  Thu Oct 12 07:14:58 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 12 Oct 2006 06:14:58 -0500 (CDT)
Subject: [Numpy-svn] r3316 - trunk/numpy/lib
Message-ID: <20061012111458.C665A39C0B9@new.scipy.org>

Author: rc
Date: 2006-10-12 06:14:55 -0500 (Thu, 12 Oct 2006)
New Revision: 3316

Modified:
   trunk/numpy/lib/arraysetops.py
Log:
modernized to use new numpy features, speed-up of unique1d, doc update

Modified: trunk/numpy/lib/arraysetops.py
===================================================================
--- trunk/numpy/lib/arraysetops.py	2006-10-12 06:18:04 UTC (rev 3315)
+++ trunk/numpy/lib/arraysetops.py	2006-10-12 11:14:55 UTC (rev 3316)
@@ -11,140 +11,160 @@
   union1d,
   setdiff1d
 
-Concerning the speed, test_unique1d_speed() reveals that up to 10000000
-elements unique1d() is about 10 times faster than the standard dictionary-based
-numpy.unique().
+All functions work best with integer numerical arrays on input. For floating
+point arrays, innacurate results may appear due to usual round-off and
+floating point comparison issues.
 
-Limitations: Except unique1d, union1d and intersect1d_nu, all functions expect
-inputs with unique elements. Speed could be gained in some operations by an
-implementaion of sort(), that can provide directly the permutation vectors,
-avoiding thus calls to argsort().
+Except unique1d, union1d and intersect1d_nu, all functions expect inputs with
+unique elements. Speed could be gained in some operations by an implementaion
+of sort(), that can provide directly the permutation vectors, avoiding thus
+calls to argsort().
 
+Run test_unique1d_speed() to compare numpy.unique1d() with numpy.unique() - it
+should be the same.
+
 To do: Optionally return indices analogously to unique1d for all functions.
 
 Author: Robert Cimrman
+
+created:       01.11.2005
+last revision: 12.10.2006
 """
-__all__ = ['unique1d', 'intersect1d', 'intersect1d_nu', 'setxor1d',
+__all__ = ['ediff1d', 'unique1d', 'intersect1d', 'intersect1d_nu', 'setxor1d',
            'setmember1d', 'union1d', 'setdiff1d']
 
 
-# 02.11.2005, c
 import time
-import numpy
+import numpy as nm
 
-##
-# 03.11.2005, c
 def ediff1d(ary, to_end = None, to_begin = None):
-    """Array difference with prefixed and/or appended value."""
-    ary = numpy.asarray(ary)
+    """Array difference with prefixed and/or appended value.
+
+    See also: unique1d, intersect1d, intersect1d_nu, setxor1d,
+    setmember1d, union1d, setdiff1d
+    """
+    ary = nm.asarray(ary).flat
     ed = ary[1:] - ary[:-1]
     if to_begin is not None:
-        ed = numpy.insert(ed, 0, to_begin)
-    if to_end is not None:
-        ed = numpy.append(ed, to_end)
+        if to_end is not None:
+            ed = nm.r_[to_begin, ed, to_end]
+        else:
+            ed = nm.insert(ed, 0, to_begin)
+    elif to_end is not None:
+        ed = nm.append(ed, to_end)
         
     return ed
 
-##
-# 01.11.2005, c
-# 02.11.2005
 def unique1d(ar1, return_index=False):
     """Unique elements of 1D array. When return_index is True, return
     also the indices indx such that ar1.flat[indx] is the resulting
     array of unique elements.
     
+    See also: ediff1d, intersect1d, intersect1d_nu, setxor1d,
+    setmember1d, union1d, setdiff1d
     """
-    ar = numpy.asarray(ar1).ravel()
+    ar = nm.asarray(ar1).flatten()
     if ar.size == 0:
-        if return_index: return numpy.empty(0, numpy.bool), ar
+        if return_index: return nm.empty(0, nm.bool), ar
         else: return ar
     
     if return_index:
         perm = ar.argsort()
-        aux = ar.take(perm)
-        flag = ediff1d(aux, 1) != 0
-        return perm.compress(flag), aux.compress(flag)
+        aux = ar[perm]
+        flag = nm.concatenate( ([True], aux[1:] != aux[:-1]) )
+        return perm[flag], aux[flag]
     
     else:
         ar.sort()
-        return ar.compress(ediff1d(ar, 1) != 0)
+        flag = nm.concatenate( ([True], ar[1:] != ar[:-1]) )
+        return ar[flag]
 
-##
-# 01.11.2005, c
 def intersect1d( ar1, ar2 ):
-    """Intersection of 1D arrays with unique elements."""
-    aux = numpy.concatenate((ar1,ar2))
+    """Intersection of 1D arrays with unique elements.
+
+    See also: ediff1d, unique1d, intersect1d_nu, setxor1d,
+    setmember1d, union1d, setdiff1d
+    """
+    aux = nm.concatenate((ar1,ar2))
     aux.sort()
-    return aux.compress( (aux[1:] - aux[:-1]) == 0)
+    return aux[aux[1:] == aux[:-1]]
 
-##
-# 01.11.2005, c
 def intersect1d_nu( ar1, ar2 ):
-    """Intersection of 1D arrays with any elements."""
+    """Intersection of 1D arrays with any elements.
+
+    See also: ediff1d, unique1d, intersect1d, setxor1d,
+    setmember1d, union1d, setdiff1d
+    """
     # Might be faster then unique1d( intersect1d( ar1, ar2 ) )?
-    aux = numpy.concatenate((unique1d(ar1), unique1d(ar2)))
+    aux = nm.concatenate((unique1d(ar1), unique1d(ar2)))
     aux.sort()
-    return aux.compress( (aux[1:] - aux[:-1]) == 0)
+    return aux[aux[1:] == aux[:-1]]
 
-##
-# 01.11.2005, c
 def setxor1d( ar1, ar2 ):
-    """Set exclusive-or of 1D arrays with unique elements."""
-    aux = numpy.concatenate((ar1, ar2))
+    """Set exclusive-or of 1D arrays with unique elements.
+
+    See also: ediff1d, unique1d, intersect1d, intersect1d_nu,
+    setmember1d, union1d, setdiff1d
+    """
+    aux = nm.concatenate((ar1, ar2))
     if aux.size == 0:
         return aux
     
     aux.sort()
-    flag = ediff1d(aux, to_end = 1, to_begin = 1) == 0
-    flag2 = ediff1d(flag) == 0
-    return aux.compress(flag2)
+#    flag = ediff1d( aux, to_end = 1, to_begin = 1 ) == 0
+    flag = nm.concatenate( ([True], aux[1:] != aux[:-1], [True] ) )
+#    flag2 = ediff1d( flag ) == 0
+    flag2 = flag[1:] == flag[:-1]
+    return aux[flag2]
 
-##
-# 03.11.2005, c
-# 05.01.2006
 def setmember1d( ar1, ar2 ):
     """Return an array of shape of ar1 containing 1 where the elements of
-    ar1 are in ar2 and 0 otherwise."""
-    concat = numpy.concatenate
-    zlike = numpy.zeros_like
-    ar = concat( (ar1, ar2 ) )
-    tt = concat( (zlike( ar1 ),
-                  zlike( ar2 ) + 1) )
+    ar1 are in ar2 and 0 otherwise.
+
+    See also: ediff1d, unique1d, intersect1d, intersect1d_nu, setxor1d,
+    union1d, setdiff1d
+    """
+    zlike = nm.zeros_like
+    ar = nm.concatenate( (ar1, ar2 ) )
+    tt = nm.concatenate( (zlike( ar1 ), zlike( ar2 ) + 1) )
     perm = ar.argsort()
-    aux = ar.take(perm)
-    aux2 = tt.take(perm)
-    flag = ediff1d( aux, 1 ) == 0
+    aux = ar[perm]
+    aux2 = tt[perm]
+#    flag = ediff1d( aux, 1 ) == 0
+    flag = nm.concatenate( (aux[1:] == aux[:-1], [False] ) )
 
-    ii = numpy.where( flag * aux2 )[0]
+    ii = nm.where( flag * aux2 )[0]
     aux = perm[ii+1]
     perm[ii+1] = perm[ii]
     perm[ii] = aux
 
     indx = perm.argsort()[:len( ar1 )]
 
-    return flag.take( indx )
+    return flag[indx]
 
-##
-# 03.11.2005, c
 def union1d( ar1, ar2 ):
-    """Union of 1D arrays with unique elements."""
-    return unique1d( numpy.concatenate( (ar1, ar2) ) )
+    """Union of 1D arrays with unique elements.
 
-##
-# 03.11.2005, c
+    See also: ediff1d, unique1d, intersect1d, intersect1d_nu, setxor1d,
+    setmember1d, setdiff1d
+    """
+    return unique1d( nm.concatenate( (ar1, ar2) ) )
+
 def setdiff1d( ar1, ar2 ):
-    """Set difference of 1D arrays with unique elements."""
+    """Set difference of 1D arrays with unique elements.
+
+    See also: ediff1d, unique1d, intersect1d, intersect1d_nu, setxor1d,
+    setmember1d, union1d
+    """
     aux = setmember1d(ar1,ar2)
     if aux.size == 0:
         return aux
     else:
-        return numpy.asarray(ar1).compress(aux == 0)
+        return nm.asarray(ar1)[aux == 0]
 
-##
-# 02.11.2005, c
 def test_unique1d_speed( plot_results = False ):
-#    exponents = numpy.linspace( 2, 7, 9 )
-    exponents = numpy.linspace( 2, 6, 9 )
+#    exponents = nm.linspace( 2, 7, 9 )
+    exponents = nm.linspace( 2, 7, 9 )
     ratios = []
     nItems = []
     dt1s = []
@@ -153,15 +173,15 @@
 
         nItem = 10 ** ii
         print 'using %d items:' % nItem
-        a = numpy.fix( nItem / 10 * numpy.random.random( nItem ) )
+        a = nm.fix( nItem / 10 * nm.random.random( nItem ) )
 
-        print 'dictionary:'
+        print 'unique:'
         tt = time.clock()
-        b = numpy.unique( a )
+        b = nm.unique( a )
         dt1 = time.clock() - tt
         print dt1
 
-        print 'array:'
+        print 'unique1d:'
         tt = time.clock()
         c = unique1d( a )
         dt2 = time.clock() - tt
@@ -180,7 +200,7 @@
         dt1s.append( dt1 )
         dt2s.append( dt2 )
 
-        assert numpy.alltrue( b == c )
+        assert nm.alltrue( b == c )
 
 
     print nItems
@@ -195,7 +215,7 @@
             pylab.figure( fig )
             fun( nItems, dt1s, 'g-o', linewidth = 2, markersize = 8 )
             fun( nItems, dt2s, 'b-x', linewidth = 2, markersize = 8 )
-            pylab.legend( ('dictionary', 'array' ) )
+            pylab.legend( ('unique', 'unique1d' ) )
             pylab.xlabel( 'nItem' )
             pylab.ylabel( 'time [s]' )
 



From numpy-svn at scipy.org  Thu Oct 12 07:19:04 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 12 Oct 2006 06:19:04 -0500 (CDT)
Subject: [Numpy-svn] r3317 - trunk/numpy/lib
Message-ID: <20061012111904.A337039C0B9@new.scipy.org>

Author: rc
Date: 2006-10-12 06:19:01 -0500 (Thu, 12 Oct 2006)
New Revision: 3317

Modified:
   trunk/numpy/lib/arraysetops.py
Log:


Modified: trunk/numpy/lib/arraysetops.py
===================================================================
--- trunk/numpy/lib/arraysetops.py	2006-10-12 11:14:55 UTC (rev 3316)
+++ trunk/numpy/lib/arraysetops.py	2006-10-12 11:19:01 UTC (rev 3317)
@@ -11,17 +11,17 @@
   union1d,
   setdiff1d
 
-All functions work best with integer numerical arrays on input. For floating
-point arrays, innacurate results may appear due to usual round-off and
-floating point comparison issues.
+All functions work best with integer numerical arrays on input
+(e.g. indices). For floating point arrays, innacurate results may appear due to
+usual round-off and floating point comparison issues.
 
 Except unique1d, union1d and intersect1d_nu, all functions expect inputs with
 unique elements. Speed could be gained in some operations by an implementaion
 of sort(), that can provide directly the permutation vectors, avoiding thus
 calls to argsort().
 
-Run test_unique1d_speed() to compare numpy.unique1d() with numpy.unique() - it
-should be the same.
+Run test_unique1d_speed() to compare performance of numpy.unique1d() and
+numpy.unique() - it should be the same.
 
 To do: Optionally return indices analogously to unique1d for all functions.
 
@@ -33,7 +33,6 @@
 __all__ = ['ediff1d', 'unique1d', 'intersect1d', 'intersect1d_nu', 'setxor1d',
            'setmember1d', 'union1d', 'setdiff1d']
 
-
 import time
 import numpy as nm
 
@@ -202,7 +201,6 @@
 
         assert nm.alltrue( b == c )
 
-
     print nItems
     print dt1s
     print dt2s



From numpy-svn at scipy.org  Thu Oct 12 15:16:58 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 12 Oct 2006 14:16:58 -0500 (CDT)
Subject: [Numpy-svn] r3318 - trunk/numpy/testing
Message-ID: <20061012191658.A755E39C053@new.scipy.org>

Author: tim_hochberg
Date: 2006-10-12 14:16:55 -0500 (Thu, 12 Oct 2006)
New Revision: 3318

Modified:
   trunk/numpy/testing/numpytest.py
Log:
Under Python 2.5 on windows test_multiarray was failing mysteriously. Applying normpath to set_local_path cured that.

Modified: trunk/numpy/testing/numpytest.py
===================================================================
--- trunk/numpy/testing/numpytest.py	2006-10-12 11:19:01 UTC (rev 3317)
+++ trunk/numpy/testing/numpytest.py	2006-10-12 19:16:55 UTC (rev 3318)
@@ -69,7 +69,7 @@
         testfile = sys.argv[0]
     else:
         testfile = f.f_locals['__file__']
-    local_path = os.path.join(os.path.dirname(os.path.abspath(testfile)),reldir)
+    local_path = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(testfile)),reldir))
     if DEBUG:
         print 'Inserting %r to sys.path' % (local_path)
     sys.path.insert(0,local_path)



From numpy-svn at scipy.org  Thu Oct 12 15:19:08 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 12 Oct 2006 14:19:08 -0500 (CDT)
Subject: [Numpy-svn] r3319 - in trunk/numpy/core: . tests
Message-ID: <20061012191908.224FE39C053@new.scipy.org>

Author: tim_hochberg
Date: 2006-10-12 14:19:04 -0500 (Thu, 12 Oct 2006)
New Revision: 3319

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/core/tests/test_numeric.py
Log:
Added docstring and tests to errstate. Also added 'all' option for seterr so that we can set all the options at once. Note that tests on errstate are only run in Python 2.5 and higher.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-12 19:16:55 UTC (rev 3318)
+++ trunk/numpy/core/numeric.py	2006-10-12 19:19:04 UTC (rev 3319)
@@ -617,11 +617,14 @@
     _errdict_rev[_errdict[key]] = key
 del key
 
-def seterr(divide=None, over=None, under=None, invalid=None):
+def seterr(all=None, divide=None, over=None, under=None, invalid=None):
     """Set how floating-point errors are handled.
 
     Valid values for each type of error are the strings
     "ignore", "warn", "raise", and "call". Returns the old settings.
+    If 'all' is specified, values that are not otherwise specified
+    will be set to 'all', otherwise they will retain their old
+    values.
 
     Note that operations on integer scalar types (such as int16) are
     handled like floating point, and are affected by these settings.
@@ -630,19 +633,24 @@
 
     >>> seterr(over='raise')
     {'over': 'ignore', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'}
+    >>> seterr(all='warn', over='raise')
+    {'over': 'raise', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'}
     >>> int16(32000) * int16(3)
     Traceback (most recent call last):
           File "<stdin>", line 1, in ?
     FloatingPointError: overflow encountered in short_scalars
+    >>> seterr(all='ignore')
+    {'over': 'ignore', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'}
+    
     """
 
     pyvals = umath.geterrobj()
     old = geterr()
 
-    if divide is None: divide = old['divide']
-    if over is None: over = old['over']
-    if under is None: under = old['under']
-    if invalid is None: invalid = old['invalid']
+    if divide is None: divide = all or old['divide']
+    if over is None: over = all or old['over']
+    if under is None: under = all or old['under']
+    if invalid is None: invalid = all or old['invalid']
 
     maskvalue = ((_errdict[divide] << SHIFT_DIVIDEBYZERO) +
                  (_errdict[over] << SHIFT_OVERFLOW ) +
@@ -653,6 +661,7 @@
     umath.seterrobj(pyvals)
     return old
 
+
 def geterr():
     """Get the current way of handling floating-point errors.
 
@@ -718,12 +727,38 @@
     return umath.geterrobj()[2]
 
 class errstate(object):
+    """with errstate(**state): --> operations in following block use given state.
+    
+    # Set error handling to known state.
+    >>> _ = seterr(invalid='raise', divide='raise', over='raise', under='ignore') 
+    
+    |>> a = -arange(3)
+    |>> with errstate(invalid='ignore'):
+    ...     print sqrt(a)
+    [ 0.     -1.#IND -1.#IND]
+    |>> print sqrt(a.astype(complex))
+    [ 0. +0.00000000e+00j  0. +1.00000000e+00j  0. +1.41421356e+00j]
+    |>> print sqrt(a)
+    Traceback (most recent call last):
+     ...
+    FloatingPointError: invalid encountered in sqrt
+    |>> with errstate(divide='ignore'):
+    ...     print a/0
+    [0 0 0]
+    |>> print a/0
+    Traceback (most recent call last):
+        ...
+    FloatingPointError: divide by zero encountered in divide
+    
+    """
+    # Note that we don't want to run the above doctests because they will fail
+    # without a from __future__ import with_statement
     def __init__(self, **kwargs):
         self.kwargs = kwargs
     def __enter__(self):
         self.oldstate = seterr(**self.kwargs)
     def __exit__(self, *exc_info):
-        numpy.seterr(**self.oldstate)
+        seterr(**self.oldstate)
 
 def _setdef():
     defval = [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT, None]

Modified: trunk/numpy/core/tests/test_numeric.py
===================================================================
--- trunk/numpy/core/tests/test_numeric.py	2006-10-12 19:16:55 UTC (rev 3318)
+++ trunk/numpy/core/tests/test_numeric.py	2006-10-12 19:19:04 UTC (rev 3319)
@@ -2,6 +2,7 @@
 from numpy.random import rand, randint
 from numpy.testing import *
 from numpy.core.multiarray import dot as dot_
+import sys
 
 class Vec:
     def __init__(self,sequence=None):
@@ -246,6 +247,12 @@
 
     def test_large(self):
         assert_equal(binary_repr(10736848),'101000111101010011010000')
+        
+import sys
+if sys.version_info[:2] >= (2, 5):
+    set_local_path()
+    from test_errstate import *
+    restore_path()
 
 if __name__ == '__main__':
     NumpyTest().run()



From numpy-svn at scipy.org  Thu Oct 12 15:29:15 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 12 Oct 2006 14:29:15 -0500 (CDT)
Subject: [Numpy-svn] r3320 - trunk/numpy/core/tests
Message-ID: <20061012192915.192CF39C16A@new.scipy.org>

Author: tim_hochberg
Date: 2006-10-12 14:29:12 -0500 (Thu, 12 Oct 2006)
New Revision: 3320

Added:
   trunk/numpy/core/tests/test_errstate.py
Log:
Forgot this file in last commit:

Added docstring and tests to errstate. Also added 'all' option for seterr so that we can set all the options at once. Note that tests on errstate are only run in Python 2.5 and higher.




Added: trunk/numpy/core/tests/test_errstate.py
===================================================================
--- trunk/numpy/core/tests/test_errstate.py	2006-10-12 19:19:04 UTC (rev 3319)
+++ trunk/numpy/core/tests/test_errstate.py	2006-10-12 19:29:12 UTC (rev 3320)
@@ -0,0 +1,45 @@
+#~ import sys
+#~ if sys.version_info[:2] >= (2, 5):
+    #~ exec """
+from __future__ import with_statement
+from numpy.core import *
+from numpy.random import rand, randint
+from numpy.testing import *
+
+
+
+class test_errstate(NumpyTestCase):
+
+    
+    def test_invalid(self):
+        with errstate(all='raise', under='ignore'):
+            a = -arange(3)
+            # This should work
+            with errstate(invalid='ignore'):
+                sqrt(a)
+            # While this should fail!
+            try:
+                sqrt(a)
+            except FloatingPointError:
+                pass
+            else:
+                self.fail()
+                
+    def test_divide(self):
+        with errstate(all='raise', under='ignore'):
+            a = -arange(3)
+            # This should work
+            with errstate(divide='ignore'):
+                a / 0
+            # While this should fail!
+            try:
+                a / 0
+            except FloatingPointError:
+                pass
+            else:
+                self.fail()
+#~ """
+
+if __name__ == '__main__':
+    from numpy.testing import *
+    NumpyTest().run()
\ No newline at end of file



From numpy-svn at scipy.org  Thu Oct 12 20:41:46 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 12 Oct 2006 19:41:46 -0500 (CDT)
Subject: [Numpy-svn] r3321 - in trunk/numpy: core linalg
Message-ID: <20061013004146.8D71039C0CE@new.scipy.org>

Author: oliphant
Date: 2006-10-12 19:41:44 -0500 (Thu, 12 Oct 2006)
New Revision: 3321

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/linalg/linalg.py
Log:
Add solvetensor and invtensor

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-12 19:29:12 UTC (rev 3320)
+++ trunk/numpy/core/numeric.py	2006-10-13 00:41:44 UTC (rev 3321)
@@ -252,7 +252,7 @@
         pass
 
 
-def tensordot(a, b, axes=(-1,0)):
+def tensordot(a, b, axes=[-1,0]):
     """tensordot returns the product for any (ndim >= 1) arrays.
 
     r_{xxx, yyy} = \sum_k a_{xxx,k} b_{k,yyy} where

Modified: trunk/numpy/linalg/linalg.py
===================================================================
--- trunk/numpy/linalg/linalg.py	2006-10-12 19:29:12 UTC (rev 3320)
+++ trunk/numpy/linalg/linalg.py	2006-10-13 00:41:44 UTC (rev 3321)
@@ -6,7 +6,7 @@
 zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, dpotrf.
 """
 
-__all__ = ['solve',
+__all__ = ['solve', 'solvetensor', 'invtensor',
            'inv', 'cholesky',
            'eigvals',
            'eigvalsh', 'pinv',
@@ -21,7 +21,7 @@
         newaxis, ravel, all, Inf, dot, add, multiply, identity, sqrt, \
         maximum, flatnonzero, diagonal, arange, fastCopyAndTranspose, sum, \
         argsort
-from numpy.lib import triu
+from numpy.lib import triu, iterable
 from numpy.linalg import lapack_lite
 
 fortran_int = intc
@@ -122,6 +122,36 @@
 
 # Linear equations
 
+def solvetensor(a, b, axes=None):
+    """Solves the tensor equation a x = b for x
+
+    where it is assumed that all the indices of x are summed over in the product.
+
+    a can be N-dimensional.  x will have the dimensions of A subtracted from
+    the dimensions of b.
+    """
+    a = asarray(a)
+    b = asarray(b)
+    an = a.ndim
+
+    if axes is not None:
+        allaxes = range(0,an)
+        for k in axes:
+            allaxes.remove(k)
+            allaxes.insert(an, k)
+        a = a.transpose(allaxes)
+        
+    oldshape = a.shape[-(an-b.ndim):]
+    prod = 1
+    for k in oldshape:
+        prod *= k
+    
+    a = a.reshape(-1,prod)
+    b = b.ravel()
+    res = solve(a, b)
+    res.shape = oldshape
+    return res
+
 def solve(a, b):
     """Return the solution of a*x = b
     """
@@ -151,6 +181,44 @@
         return b.transpose().astype(result_t)
 
 
+def invtensor(a, ind=2):
+    """Find the inverse tensor.
+
+    ind > 0 ==> first (ind) indices of a are summed over 
+    ind < 0 ==> last (-ind) indices of a are summed over
+
+    if ind is a list, then it specifies the summed over axes
+
+    When the inv tensor and the tensor are summed over the
+    indicated axes a separable identity tensor remains. 
+
+    The inverse has the summed over axes at the end.
+    """
+    
+    a = asarray(a)
+    oldshape = a.shape
+    prod = 1
+    if iterable(ind):
+        invshape = range(a.ndim)
+        for axis in ind:
+            invshape.remove(axis)
+            invshape.insert(a.ndim,axis)
+            prod *= oldshape[axis]
+    elif ind > 0:
+        invshape = oldshape[ind:] + oldshape[:ind]
+        for k in oldshape[:ind]:
+            prod *= k
+    elif ind < 0:
+        invshape = oldshape[:-ind] + oldshape[-ind:]
+        for k in oldshape[-ind:]:
+            prod *= k
+    else:
+        raise ValueError, "Invalid ind argument."
+    a = a.reshape(-1,prod)
+    ia = inv(a)
+    return ia.reshape(*invshape)
+    
+
 # Matrix inversion
 
 def inv(a):



From numpy-svn at scipy.org  Fri Oct 13 07:52:34 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 06:52:34 -0500 (CDT)
Subject: [Numpy-svn] r3322 - in trunk/numpy/f2py/lib: . parser
Message-ID: <20061013115234.DA30C39C08F@new.scipy.org>

Author: pearu
Date: 2006-10-13 06:52:25 -0500 (Fri, 13 Oct 2006)
New Revision: 3322

Added:
   trunk/numpy/f2py/lib/test_module_module.py
Modified:
   trunk/numpy/f2py/lib/parser/block_statements.py
   trunk/numpy/f2py/lib/py_wrap.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/wrapper_base.py
Log:
F2PY: Impl. (suboptimal) solution for nested f90 module wrapping.

Modified: trunk/numpy/f2py/lib/parser/block_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-13 00:41:44 UTC (rev 3321)
+++ trunk/numpy/f2py/lib/parser/block_statements.py	2006-10-13 11:52:25 UTC (rev 3322)
@@ -313,12 +313,12 @@
         if content:
             self.show_message('Not analyzed content: %s' % content)
 
-        module_provides = self.a.module_provides
-        for name, var in self.a.variables.items():
-            if var.is_public():
-                if module_provides.has_key(name):
-                    self.warning('module data object name conflict with %s, overriding.' % (name))
-                module_provides[name] = var
+        #module_provides = self.a.module_provides
+        #for name, var in self.a.variables.items():
+        #    if var.is_public():
+        #        if module_provides.has_key(name):
+        #            self.warning('module data object name conflict with %s, overriding.' % (name))
+        #        module_provides[name] = var
 
         return
 
@@ -1078,12 +1078,12 @@
 
         self.parent.a.type_decls[self.name] = self
 
-        parent_provides = self.parent.get_provides()
-        if parent_provides is not None:
-            if self.is_public():
-                if parent_provides.has_key(self.name):
-                    self.warning('type declaration name conflict with %s, overriding.' % (self.name))
-                parent_provides[self.name] = self
+        #parent_provides = self.parent.get_provides()
+        #if parent_provides is not None:
+        #    if self.is_public():
+        #        if parent_provides.has_key(self.name):
+        #            self.warning('type declaration name conflict with %s, overriding.' % (self.name))
+        #        parent_provides[self.name] = self
 
         return
 

Modified: trunk/numpy/f2py/lib/py_wrap.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap.py	2006-10-13 00:41:44 UTC (rev 3321)
+++ trunk/numpy/f2py/lib/py_wrap.py	2006-10-13 11:52:25 UTC (rev 3322)
@@ -57,11 +57,19 @@
     main_fortran_template = '''\
 %(fortran_code_list)s
 '''
+
+
+
     def __init__(self, modulename):
         WrapperBase.__init__(self)
         self.modulename = modulename
         self.cname = 'f2py_' + modulename
 
+        self.defined_cpp_code = []
+        self.defined_c_code = []
+        self.defined_types = []
+        self.defined_capi_codes = []
+
         
         self.header_list = []
         self.typedef_list = []

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-13 00:41:44 UTC (rev 3321)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-13 11:52:25 UTC (rev 3322)
@@ -57,6 +57,7 @@
 typedef void (*%(name)s_functype)();
 '''
     extern_template_module = '''\
+extern void %(init_func)s_f( %(name)s_functype);
 static %(name)s_functype %(name)s_func_ptr;
 '''
     objdecl_template_module = '''
@@ -77,14 +78,16 @@
 %(init_func)s_f(%(init_func)s_c);
 '''
 
-    _defined = []
     def __init__(self, parent, block):
         WrapperBase.__init__(self)
         self.name = name = pyname = block.name
         self.cname = cname = '%s_%s' % (parent.cname,name)
-        if cname in self._defined:
+
+        defined = parent.defined_capi_codes
+        if cname in defined:
             return
-        self._defined.append(cname)
+        defined.append(cname)
+        
         self.info('Generating interface for %s: %s' % (block.__class__, cname))
 
         if pyname.startswith('f2pywrap_'):
@@ -99,6 +102,8 @@
         self.objdecl_template =  ''
         self.fortran_code_template = ''
 
+        WrapperCPPMacro(parent, 'F_FUNC')
+        
         if isinstance(block.parent, Module):
             self.mname = block.parent.name
             self.init_func = '%s_init' % (name)
@@ -179,7 +184,7 @@
                     self.return_format_list.append('O&')
                     self.return_obj_list.append('\npyobj_from_%s, &%s' % (ti.ctype, argname))
 
-        WrapperCPPMacro(parent, 'F_FUNC')
+
         self.call_list.append('%s_f(%s);' % (name,', '.join(args_f+extra_args_f)))
 
         self.clean_pyobjfrom_list.reverse()

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-13 00:41:44 UTC (rev 3321)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-13 11:52:25 UTC (rev 3322)
@@ -325,15 +325,17 @@
   return return_value;
 }
 ''' 
-    _defined = []
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
         self.name = name = typedecl.name
         ti = PyTypeInterface(typedecl)
         self.ctype = ctype = ti.ctype
-        if ctype in self._defined:
+
+        defined = parent.defined_types
+        if name in defined:
             return
-        self._defined.append(ctype)
+        defined.append(name)
+        
         self.info('Generating interface for %s: %s' % (typedecl.__class__, ctype))
 
         if isinstance(typedecl, (Integer,Byte,Real,DoublePrecision)):
@@ -580,14 +582,16 @@
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
         ti = PyTypeInterface(typedecl)
-        name = typedecl.name
-        if name in self._defined:
+        self.ctype = ctype = ti.ctype
+        defined = parent.defined_types
+        if ctype in defined:
             return
-        self._defined.append(name)
-        self.info('Generating interface for %s: %s' % (typedecl.__class__, name))
+        defined.append(ctype)
+
+        self.info('Generating interface for %s: %s' % (typedecl.__class__, ctype))
         parent.isf90 = True
 
-        self.name = name
+        self.name = name = typedecl.name
         self.otype = otype = ti.otype
         self.ctype = ctype = ti.ctype
         self.ctype_ptrs = self.ctype + '_ptrs'

Added: trunk/numpy/f2py/lib/test_module_module.py
===================================================================
--- trunk/numpy/f2py/lib/test_module_module.py	2006-10-13 00:41:44 UTC (rev 3321)
+++ trunk/numpy/f2py/lib/test_module_module.py	2006-10-13 11:52:25 UTC (rev 3322)
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+"""
+Tests for module with scalar derived types and subprograms.
+
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+import os
+import sys
+from numpy.testing import *
+
+def build(fortran_code, rebuild=True):
+    modulename = os.path.splitext(os.path.basename(__file__))[0] + '_ext'
+    try:
+        exec ('import %s as m' % (modulename))
+        if rebuild and os.stat(m.__file__)[8] < os.stat(__file__)[8]:
+            del sys.modules[m.__name__] # soft unload extension module
+            os.remove(m.__file__)
+            raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
+    except ImportError,msg:
+        assert str(msg)==('No module named %s' % (modulename)),str(msg)
+        print msg, ', recompiling %s.' % (modulename)
+        import tempfile
+        fname = tempfile.mktemp() + '.f90'
+        f = open(fname,'w')
+        f.write(fortran_code)
+        f.close()
+        sys_argv = []
+        sys_argv.extend(['--build-dir','tmp'])
+        #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
+        from main import build_extension
+        sys_argv.extend(['-m',modulename, fname])
+        build_extension(sys_argv)
+        os.remove(fname)
+        status = os.system(' '.join([sys.executable] + sys.argv))
+        sys.exit(status)
+    return m
+
+fortran_code = '''
+module test_module_module_ext2
+
+  type rat
+    integer n,d
+  end type rat
+  contains
+    subroutine foo2()
+      print*,"In foo2"
+    end subroutine foo2
+end module
+module test_module_module_ext
+  contains
+    subroutine foo
+      use test_module_module_ext2
+      print*,"In foo"
+      call foo2
+    end subroutine foo
+    subroutine bar(a)
+      use test_module_module_ext2
+      type(rat) a
+      print*,"In bar,a=",a
+    end subroutine bar
+end module test_module_module_ext
+'''
+
+# tester note: set rebuild=True when changing fortan_code and for SVN
+m = build(fortran_code, rebuild=True)
+
+from numpy import *
+
+class test_m(NumpyTestCase):
+
+    def check_foo_simple(self, level=1):
+        foo = m.foo
+        foo()
+
+if __name__ == "__main__":
+    NumpyTest().run()

Modified: trunk/numpy/f2py/lib/wrapper_base.py
===================================================================
--- trunk/numpy/f2py/lib/wrapper_base.py	2006-10-13 00:41:44 UTC (rev 3321)
+++ trunk/numpy/f2py/lib/wrapper_base.py	2006-10-13 11:52:25 UTC (rev 3322)
@@ -118,12 +118,12 @@
     """
     CPP macros
     """
-    _defined_macros = []
     def __init__(self, parent, name):
         WrapperBase.__init__(self)
-        if name in self._defined_macros:
+        defined = parent.defined_cpp_code
+        if name in defined:
             return
-        self._defined_macros.append(name)
+        defined.append(name)
 
         body = self.get_resource_content(name,'.cpp')
         if body is None:
@@ -137,12 +137,12 @@
     """
     C code
     """
-    _defined_codes = []
     def __init__(self, parent, name):
         WrapperBase.__init__(self)
-        if name in self._defined_codes:
+        defined = parent.defined_c_code
+        if name in defined:
             return
-        self._defined_codes.append(name)
+        defined.append(name)
 
         body = self.get_resource_content(name,'.c')
         if body is None:



From numpy-svn at scipy.org  Fri Oct 13 13:08:26 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 12:08:26 -0500 (CDT)
Subject: [Numpy-svn] r3323 - in trunk/numpy: lib linalg
Message-ID: <20061013170826.96B6239C011@new.scipy.org>

Author: charris
Date: 2006-10-13 12:08:24 -0500 (Fri, 13 Oct 2006)
New Revision: 3323

Modified:
   trunk/numpy/lib/polynomial.py
   trunk/numpy/linalg/linalg.py
Log:

Add a rcond parameter to the polyfit function and give it the double precision
default value that dgelsd uses (rcondx=-1) on the principle of least surprise.
Values of rcond less than this can also be useful, so a warning message and a
bit of explanation was added to the documentation.

The default value used by lstsq was set to the default (-1), and rcond in pinv
has a default value of 1e-15.


Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-13 11:52:25 UTC (rev 3322)
+++ trunk/numpy/lib/polynomial.py	2006-10-13 17:08:24 UTC (rev 3323)
@@ -30,13 +30,13 @@
         get_linalg_funcs()
         return eigvals(arg)
 
-def _lstsq(X, y):
+def _lstsq(X, y, rcond):
     "Do least squares on the arguments"
     try:
-        return lstsq(X, y)
+        return lstsq(X, y, rcond)
     except TypeError:
         get_linalg_funcs()
-        return lstsq(X, y)
+        return lstsq(X, y, rcond)
 
 def poly(seq_of_zeros):
     """ Return a sequence representing a polynomial given a sequence of roots.
@@ -169,10 +169,10 @@
             val = poly1d(val)
         return val
 
-def polyfit(x, y, N):
+def polyfit(x, y, N, rcond=-1):
     """
 
-    Do a best fit polynomial of order N of y to x.  Return value is a
+    Do a best fit polynomial of degree N of y to x.  Return value is a
     vector of polynomial coefficients [pk ... p1 p0].  Eg, for N=2
 
       p2*x0^2 +  p1*x0 + p0 = y1
@@ -195,8 +195,23 @@
 
       p = (XT*X)^-1 * XT * y
 
-    where XT is the transpose of X and -1 denotes the inverse.
+    where XT is the transpose of X gand -1 denotes the inverse. However, this
+    method is susceptible to rounding errors and generally the singular value
+    decomposition is preferred and that is the method used here. The singular
+    value method takes a paramenter, 'rcond', which sets a limit on the
+    relative size of the smallest singular value to be used in solving the
+    equation. The default value of rcond is the double precision machine
+    precision as the actual solution is carried out in double precision.
 
+    WARNING: Power series fits are full of pitfalls for the unwary once the
+    degree of the fit get up around 4 or 5. Computation of the polynomial
+    values are sensitive to coefficient errors and the Vandermonde matrix is
+    ill conditioned. The knobs available to tune the fit are degree and rcond.
+    The rcond knob is a bit flaky and it can be useful to use values of rcond
+    less than the machine precision, 1e-24 for instance, but the quality of the
+    resulting fit needs to be checked against the data. The quality of
+    polynomial fits *can not* be taken for granted.
+
     For more info, see
     http://mathworld.wolfram.com/LeastSquaresFittingPolynomial.html,
     but note that the k's and n's in the superscripts and subscripts
@@ -205,12 +220,10 @@
     See also polyval
 
     """
-    x = NX.asarray(x)+0.
-    y = NX.asarray(y)+0.
-    y = NX.reshape(y, (len(y), 1))
-    X = vander(x, N+1)
-    c, resids, rank, s = _lstsq(X, y)
-    c.shape = (N+1,)
+    x = NX.asarray(x) + 0.0
+    y = NX.asarray(y) + 0.0
+    v = vander(x, N+1)
+    c, resids, rank, s = _lstsq(v, y, rcond)
     return c
 
 

Modified: trunk/numpy/linalg/linalg.py
===================================================================
--- trunk/numpy/linalg/linalg.py	2006-10-13 11:52:25 UTC (rev 3322)
+++ trunk/numpy/linalg/linalg.py	2006-10-13 17:08:24 UTC (rev 3323)
@@ -140,12 +140,12 @@
             allaxes.remove(k)
             allaxes.insert(an, k)
         a = a.transpose(allaxes)
-        
+
     oldshape = a.shape[-(an-b.ndim):]
     prod = 1
     for k in oldshape:
         prod *= k
-    
+
     a = a.reshape(-1,prod)
     b = b.ravel()
     res = solve(a, b)
@@ -184,17 +184,17 @@
 def invtensor(a, ind=2):
     """Find the inverse tensor.
 
-    ind > 0 ==> first (ind) indices of a are summed over 
+    ind > 0 ==> first (ind) indices of a are summed over
     ind < 0 ==> last (-ind) indices of a are summed over
 
     if ind is a list, then it specifies the summed over axes
 
     When the inv tensor and the tensor are summed over the
-    indicated axes a separable identity tensor remains. 
+    indicated axes a separable identity tensor remains.
 
     The inverse has the summed over axes at the end.
     """
-    
+
     a = asarray(a)
     oldshape = a.shape
     prod = 1
@@ -217,8 +217,8 @@
     a = a.reshape(-1,prod)
     ia = inv(a)
     return ia.reshape(*invshape)
-    
 
+
 # Matrix inversion
 
 def inv(a):
@@ -250,7 +250,7 @@
 
 def qr(a, mode='full'):
     """cacluates A=QR, Q orthonormal, R upper triangular
-    
+
     mode:  'full' --> (Q,R)
            'r'    --> R
            'economic' --> A2 where the diagonal + upper triangle
@@ -267,8 +267,8 @@
         routine_name = 'zgeqrf'
     else:
         lapack_routine = lapack_lite.dgeqrf
-        routine_name = 'dgeqrf'        
-        
+        routine_name = 'dgeqrf'
+
     # calculate optimal size of work data 'work'
     lwork = 1
     work = zeros((lwork,), t)
@@ -307,7 +307,7 @@
 
     if isComplexType(t):
         lapack_routine = lapack_lite.zungqr
-        routine_name = 'zungqr'                
+        routine_name = 'zungqr'
     else:
         lapack_routine = lapack_lite.dorgqr
         routine_name = 'dorgqr'
@@ -326,7 +326,7 @@
 
     if results['info'] > 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
-    
+
     q = a[:mn,:].transpose()
 
     if (q.dtype != result_t):
@@ -476,7 +476,7 @@
                 v[ind[2*i]] = vr[ind[2*i]] + 1j*vr[ind[2*i+1]]
                 v[ind[2*i+1]] = vr[ind[2*i]] - 1j*vr[ind[2*i+1]]
             result_t = _complexType(result_t)
-            
+
     if results['info'] > 0:
         raise LinAlgError, 'Eigenvalues did not converge'
     vt = v.transpose().astype(result_t)
@@ -534,7 +534,7 @@
     u,s,vh = svd(a)
 
     If a is an M x N array, then the svd produces a factoring of the array
-    into two unitary (orthogonal) 2-d arrays u (MxM) and vh (NxN) and a 
+    into two unitary (orthogonal) 2-d arrays u (MxM) and vh (NxN) and a
     min(M,N)-length array of singular values such that
 
                      a == dot(u,dot(S,vh))
@@ -613,10 +613,10 @@
 
 # Generalized inverse
 
-def pinv(a, rcond = 1.e-10):
+def pinv(a, rcond=1e-15 ):
     """Return the (Moore-Penrose) pseudo-inverse of a 2-d array
 
-    This method computes the generalized inverse using the 
+    This method computes the generalized inverse using the
     singular-value decomposition and all singular values larger than
     rcond of the largest.
     """
@@ -660,18 +660,18 @@
 
 # Linear Least Squares
 
-def lstsq(a, b, rcond=1.e-10):
+def lstsq(a, b, rcond=-1):
     """returns x,resids,rank,s
-where x minimizes 2-norm(|b - Ax|)
-      resids is the sum square residuals
-      rank is the rank of A
-      s is the rank of the singular values of A in descending order
+    where x minimizes 2-norm(|b - Ax|)
+    resids is the sum square residuals
+    rank is the rank of A
+    s is the rank of the singular values of A in descending order
 
-If b is a matrix then x is also a matrix with corresponding columns.
-If the rank of A is less than the number of columns of A or greater than
-the number of rows, then residuals will be returned as an empty array
-otherwise resids = sum((b-dot(A,x)**2).
-Singular values less than s[0]*rcond are treated as zero.
+    If b is a matrix then x is also a matrix with corresponding columns.
+    If the rank of A is less than the number of columns of A or greater than
+    the number of rows, then residuals will be returned as an empty array
+    otherwise resids = sum((b-dot(A,x)**2).
+    Singular values less than s[0]*rcond are treated as zero.
 """
     import math
     a = asarray(a)



From numpy-svn at scipy.org  Fri Oct 13 13:18:34 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 12:18:34 -0500 (CDT)
Subject: [Numpy-svn] r3324 - trunk/numpy/f2py/lib
Message-ID: <20061013171834.6035E39C0A4@new.scipy.org>

Author: pearu
Date: 2006-10-13 12:18:28 -0500 (Fri, 13 Oct 2006)
New Revision: 3324

Modified:
   trunk/numpy/f2py/lib/py_wrap.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_module_module.py
Log:
F2PY G3: exposing f90 type information via _API variable for other modules.

Modified: trunk/numpy/f2py/lib/py_wrap.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap.py	2006-10-13 17:08:24 UTC (rev 3323)
+++ trunk/numpy/f2py/lib/py_wrap.py	2006-10-13 17:18:28 UTC (rev 3324)
@@ -43,11 +43,17 @@
 PyMODINIT_FUNC init%(modulename)s(void) {
   f2py_module = Py_InitModule("%(modulename)s", f2py_module_methods);
   import_array();
-  %(module_init_list)s
   if (PyErr_Occurred()) {
-    PyErr_SetString(PyExc_ImportError, "can\'t initialize module %(modulename)s");
+    PyErr_SetString(PyExc_ImportError, "failed to load array module.");
     return;
   }
+  %(module_init_list)s
+  return;
+capi_err:
+  if (!PyErr_Occurred()) {
+    PyErr_SetString(PyExc_RuntimeError, "failed to initialize %(modulename)s module.");
+  }
+  return;
 }
 #ifdef __cplusplus
 }

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-13 17:08:24 UTC (rev 3323)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-13 17:18:28 UTC (rev 3324)
@@ -448,13 +448,24 @@
     0,                         /* tp_alloc */
     %(otype)s_new,                 /* tp_new */
 };
+
+void *F2PY_%(otype)s_API[] = {
+  (void *) &%(otype)sType,
+  (void *) pyobj_from_%(ctype)s,
+  (void *) pyobj_to_%(ctype)s_inplace
+};
 '''
-
+    
     module_init_template = '''\
 if (PyType_Ready(&%(otype)sType) < 0)
-  return;
+  goto capi_err;
 PyModule_AddObject(f2py_module, "%(name)s",
                                 (PyObject *)&%(otype)sType);
+{
+  PyObject* c_api = PyCObject_FromVoidPtr((void *)F2PY_%(otype)s_API, NULL);
+  PyModule_AddObject(f2py_module, "_%(name)s_API", c_api);
+  if (PyErr_Occurred()) goto capi_err;
+}
 '''
 
     c_code_template = '''\

Modified: trunk/numpy/f2py/lib/test_module_module.py
===================================================================
--- trunk/numpy/f2py/lib/test_module_module.py	2006-10-13 17:08:24 UTC (rev 3323)
+++ trunk/numpy/f2py/lib/test_module_module.py	2006-10-13 17:18:28 UTC (rev 3324)
@@ -16,7 +16,7 @@
 import sys
 from numpy.testing import *
 
-def build(fortran_code, rebuild=True):
+def build(fortran_code, rebuild=True, build_dir = 'tmp'):
     modulename = os.path.splitext(os.path.basename(__file__))[0] + '_ext'
     try:
         exec ('import %s as m' % (modulename))
@@ -25,27 +25,25 @@
             os.remove(m.__file__)
             raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
     except ImportError,msg:
-        assert str(msg)==('No module named %s' % (modulename)),str(msg)
+        assert str(msg)==('No module named %s' % (modulename)) \
+               or str(msg).startswith('%s is newer than' % (__file__)),str(msg)
         print msg, ', recompiling %s.' % (modulename)
-        import tempfile
-        fname = tempfile.mktemp() + '.f90'
+        fname = os.path.join(build_dir, modulename + '_source.f90')
         f = open(fname,'w')
         f.write(fortran_code)
         f.close()
         sys_argv = []
-        sys_argv.extend(['--build-dir','tmp'])
+        sys_argv.extend(['--build-dir',build_dir])
         #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
         from main import build_extension
         sys_argv.extend(['-m',modulename, fname])
         build_extension(sys_argv)
-        os.remove(fname)
         status = os.system(' '.join([sys.executable] + sys.argv))
         sys.exit(status)
     return m
 
 fortran_code = '''
 module test_module_module_ext2
-
   type rat
     integer n,d
   end type rat



From numpy-svn at scipy.org  Fri Oct 13 14:18:21 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 13:18:21 -0500 (CDT)
Subject: [Numpy-svn] r3325 - in trunk/numpy: core linalg
Message-ID: <20061013181821.A3E6639C0A4@new.scipy.org>

Author: oliphant
Date: 2006-10-13 13:18:18 -0500 (Fri, 13 Oct 2006)
New Revision: 3325

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/linalg/linalg.py
Log:
Fix-up tensor solve and tensor inv and rename to match tensordot.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-13 17:18:28 UTC (rev 3324)
+++ trunk/numpy/core/numeric.py	2006-10-13 18:18:18 UTC (rev 3325)
@@ -252,7 +252,7 @@
         pass
 
 
-def tensordot(a, b, axes=[-1,0]):
+def tensordot(a, b, axes=2):
     """tensordot returns the product for any (ndim >= 1) arrays.
 
     r_{xxx, yyy} = \sum_k a_{xxx,k} b_{k,yyy} where
@@ -265,10 +265,19 @@
     When there is more than one axis to sum over, the corresponding
     arguments to axes should be sequences of the same length with the first
     axis to sum over given first in both sequences, the second axis second,
-    and so forth. 
+    and so forth.
+
+    If the axes argument is an integer, N, then the last N dimensions of a
+    and first N dimensions of b are summed over. 
     """
-    axes_a, axes_b = axes
     try:
+        iter(axes)
+    except:
+        axes_a = range(-axes,0)
+        axes_b = range(0,axes)
+    else:
+        axes_a, axes_b = axes
+    try:
         na = len(axes_a)
         axes_a = list(axes_a)
     except TypeError:

Modified: trunk/numpy/linalg/linalg.py
===================================================================
--- trunk/numpy/linalg/linalg.py	2006-10-13 17:18:28 UTC (rev 3324)
+++ trunk/numpy/linalg/linalg.py	2006-10-13 18:18:18 UTC (rev 3325)
@@ -6,7 +6,7 @@
 zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, dpotrf.
 """
 
-__all__ = ['solve', 'solvetensor', 'invtensor',
+__all__ = ['solve', 'tensorsolve', 'tensorinv',
            'inv', 'cholesky',
            'eigvals',
            'eigvalsh', 'pinv',
@@ -122,10 +122,11 @@
 
 # Linear equations
 
-def solvetensor(a, b, axes=None):
+def tensorsolve(a, b, axes=None):
     """Solves the tensor equation a x = b for x
 
-    where it is assumed that all the indices of x are summed over in the product.
+    where it is assumed that all the indices of x are summed over in
+    the product.
 
     a can be N-dimensional.  x will have the dimensions of A subtracted from
     the dimensions of b.
@@ -181,40 +182,48 @@
         return b.transpose().astype(result_t)
 
 
-def invtensor(a, ind=2):
-    """Find the inverse tensor.
+def tensorinv(a, ind=2):
+    """Find the 'inverse' of a N-d array
 
-    ind > 0 ==> first (ind) indices of a are summed over
-    ind < 0 ==> last (-ind) indices of a are summed over
+    ind must be a positive integer specifying
+    how many indices at the front of the array are involved
+    in the inverse sum.
+    
+    the result is ainv with shape a.shape[ind:] + a.shape[:ind]
 
-    if ind is a list, then it specifies the summed over axes
+    tensordot(ainv, a, ind) is an identity operator
 
-    When the inv tensor and the tensor are summed over the
-    indicated axes a separable identity tensor remains.
+    and so is
 
-    The inverse has the summed over axes at the end.
+    tensordot(a, ainv, a.shape-newind)
+
+    Example:
+
+       a = rand(4,6,8,3)
+       ainv = tensorinv(a)
+       # ainv.shape is (8,3,4,6)
+       # suppose b has shape (4,6)
+       tensordot(ainv, b) # produces same (8,3)-shaped output as
+       tensorsolve(a, b)
+
+       a = rand(24,8,3)
+       ainv = tensorinv(a,1)
+       # ainv.shape is (8,3,24)
+       # suppose b has shape (24,)
+       tensordot(ainv, b, 1)  # produces the same (8,3)-shaped output as
+       tensorsolve(a, b)
+
     """
-
     a = asarray(a)
     oldshape = a.shape
     prod = 1
-    if iterable(ind):
-        invshape = range(a.ndim)
-        for axis in ind:
-            invshape.remove(axis)
-            invshape.insert(a.ndim,axis)
-            prod *= oldshape[axis]
-    elif ind > 0:
+    if ind > 0:
         invshape = oldshape[ind:] + oldshape[:ind]
-        for k in oldshape[:ind]:
+        for k in oldshape[ind:]:
             prod *= k
-    elif ind < 0:
-        invshape = oldshape[:-ind] + oldshape[-ind:]
-        for k in oldshape[-ind:]:
-            prod *= k
     else:
         raise ValueError, "Invalid ind argument."
-    a = a.reshape(-1,prod)
+    a = a.reshape(prod,-1)
     ia = inv(a)
     return ia.reshape(*invshape)
 



From numpy-svn at scipy.org  Fri Oct 13 14:45:55 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 13:45:55 -0500 (CDT)
Subject: [Numpy-svn] r3326 - trunk/numpy/core/src
Message-ID: <20061013184555.23E2A39C00C@new.scipy.org>

Author: oliphant
Date: 2006-10-13 13:45:44 -0500 (Fri, 13 Oct 2006)
New Revision: 3326

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Add fix so that '()type' is detected

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-13 18:18:18 UTC (rev 3325)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-13 18:45:44 UTC (rev 3326)
@@ -4686,22 +4686,35 @@
 	return NULL;
 }
 
+#define _chk_byteorder(arg) (arg == '>' || arg == '<' ||        \
+                             arg == '|' || arg == '=')
+
 static int
 _check_for_commastring(char *type, int len)
 {
 	int i;
 
+        /* Check for ints at start of string */
 	if ((type[0] >= '0' && type[0] <= '9') ||
-            ((len > 1) && (type[0] == '>' || type[0] == '<' ||  \
-                           type[0] == '|' || type[0] == '=') && \
+            ((len > 1) && _chk_byteorder(type[0]) && 
              (type[1] >= '0' && type[1] <= '9')))
                 return 1;
+
+        /* Check for empty tuple */
+        if (((len > 1) && (type[0] == '(' && type[1] == ')')) ||
+            ((len > 3) && _chk_byteorder(type[0]) && 
+             (type[1] == '(' && type[2] == ')')))
+                return 1;
+             
+        /* Check for presence of commas */
 	for (i=1;i<len;i++)
 		if (type[i] == ',') return 1;
 
         return 0;
 }
 
+#undef _chk_byteorder
+
 /*
    any object with
    the .fields attribute and/or .itemsize attribute



From numpy-svn at scipy.org  Fri Oct 13 14:54:06 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 13:54:06 -0500 (CDT)
Subject: [Numpy-svn] r3327 - trunk/numpy/core/src
Message-ID: <20061013185406.5C22539C00C@new.scipy.org>

Author: oliphant
Date: 2006-10-13 13:54:02 -0500 (Fri, 13 Oct 2006)
New Revision: 3327

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
   trunk/numpy/core/src/ufuncobject.c
Log:
Fixes from 64-bit warnings in ticket #337

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-13 18:45:44 UTC (rev 3326)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-13 18:54:02 UTC (rev 3327)
@@ -9282,7 +9282,8 @@
         else {
                 if (start < -self->size || start >= self->size) {
                         PyErr_Format(PyExc_ValueError,
-                                     "index (%d) out of range", start);
+                                     "index (%" NPY_INTP_FMT \
+                                     ") out of range", start);
                         goto finish;
                 }
                 retval = 0;

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-13 18:45:44 UTC (rev 3326)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-13 18:54:02 UTC (rev 3327)
@@ -830,7 +830,7 @@
 static PyObject *
 gentype_imag_get(PyObject *self)
 {
-        PyArray_Descr *typecode;
+        PyArray_Descr *typecode=NULL;
         PyObject *ret;
         int typenum;
 
@@ -861,7 +861,7 @@
                 PyDataMem_FREE(temp);
         }
 
-        Py_DECREF(typecode);
+        Py_XDECREF(typecode);
         return ret;
 }
 

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-13 18:45:44 UTC (rev 3326)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-13 18:54:02 UTC (rev 3327)
@@ -791,8 +791,8 @@
 		PyErr_Format(PyExc_ValueError,
 			     "buffer size (%d) is not in range "
                              "(%"INTP_FMT" - %"INTP_FMT") or not a multiple of 16",
-			     *bufsize, PyArray_MIN_BUFSIZE,
-			     PyArray_MAX_BUFSIZE);
+			     *bufsize, (intp) PyArray_MIN_BUFSIZE,
+			     (intp) PyArray_MAX_BUFSIZE);
 		return -1;
 	}
 



From numpy-svn at scipy.org  Fri Oct 13 15:09:08 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 14:09:08 -0500 (CDT)
Subject: [Numpy-svn] r3328 - in trunk/numpy/core: include/numpy src
Message-ID: <20061013190908.F3D4739C00C@new.scipy.org>

Author: oliphant
Date: 2006-10-13 14:09:04 -0500 (Fri, 13 Oct 2006)
New Revision: 3328

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
   trunk/numpy/core/src/arrayobject.c
Log:
Fix ticket #341: part with 'c' arrays not being comparable to strings.

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-13 18:54:02 UTC (rev 3327)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-13 19:09:04 UTC (rev 3328)
@@ -1593,10 +1593,10 @@
 
 #define PyTypeNum_ISNUMBER(type) (type <= NPY_CLONGDOUBLE)
 
-#define PyTypeNum_ISSTRING(type) ((type == NPY_STRING) || \
-                               (type == NPY_UNICODE))
+#define PyTypeNum_ISSTRING(type) ((type == NPY_STRING) ||       \
+                                  (type == NPY_UNICODE))
 
-#define PyTypeNum_ISCOMPLEX(type) ((type >= NPY_CFLOAT) && \
+#define PyTypeNum_ISCOMPLEX(type) ((type >= NPY_CFLOAT) &&      \
                                 (type <= NPY_CLONGDOUBLE))
 
 #define PyTypeNum_ISPYTHON(type) ((type == NPY_LONG) || \

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-13 18:54:02 UTC (rev 3327)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-13 19:09:04 UTC (rev 3328)
@@ -4445,7 +4445,7 @@
         int val;
 
         /* Cast arrays to a common type */
-        if (self->descr->type != other->descr->type) {
+        if (self->descr->type_num != other->descr->type_num) {
                 PyObject *new;
                 if (self->descr->type_num == PyArray_STRING && \
                     other->descr->type_num == PyArray_UNICODE) {



From numpy-svn at scipy.org  Fri Oct 13 15:26:45 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 14:26:45 -0500 (CDT)
Subject: [Numpy-svn] r3329 - trunk/numpy/lib
Message-ID: <20061013192645.C838F39C00C@new.scipy.org>

Author: oliphant
Date: 2006-10-13 14:26:43 -0500 (Fri, 13 Oct 2006)
New Revision: 3329

Modified:
   trunk/numpy/lib/index_tricks.py
Log:
Fix mgrid for count of 1

Modified: trunk/numpy/lib/index_tricks.py
===================================================================
--- trunk/numpy/lib/index_tricks.py	2006-10-13 19:09:04 UTC (rev 3328)
+++ trunk/numpy/lib/index_tricks.py	2006-10-13 19:26:43 UTC (rev 3329)
@@ -132,7 +132,7 @@
                 start = key[k].start
                 if start is None: start=0
                 if step is None: step=1
-                if type(step) is type(1j):
+                if isinstance(step, complex):
                     size.append(int(abs(step)))
                     typ = float
                 else:
@@ -151,9 +151,10 @@
                 start = key[k].start
                 if start is None: start=0
                 if step is None: step=1
-                if type(step) is type(1j):
+                if isinstance(step, complex):
                     step = int(abs(step))
-                    step = (key[k].stop - start)/float(step-1)
+                    if step != 1:
+                        step = (key[k].stop - start)/float(step-1)
                 nn[k] = (nn[k]*step+start)
             if self.sparse:
                 slobj = [_nx.newaxis]*len(size)
@@ -167,10 +168,11 @@
             stop = key.stop
             start = key.start
             if start is None: start = 0
-            if type(step) is type(1j):
+            if isinstance(step, complex):
                 step = abs(step)
                 length = int(step)
-                step = (key.stop-start)/float(step-1)
+                if step != 1:
+                    step = (key.stop-start)/float(step-1)
                 stop = key.stop+step
                 return _nx.arange(0, length,1, float)*step + start
             else:



From numpy-svn at scipy.org  Fri Oct 13 15:37:50 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 14:37:50 -0500 (CDT)
Subject: [Numpy-svn] r3330 - trunk/numpy/lib
Message-ID: <20061013193750.4536E39C00C@new.scipy.org>

Author: charris
Date: 2006-10-13 14:37:48 -0500 (Fri, 13 Oct 2006)
New Revision: 3330

Modified:
   trunk/numpy/lib/polynomial.py
Log:
Mention scaling in the polyfit docstring.

Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-13 19:26:43 UTC (rev 3329)
+++ trunk/numpy/lib/polynomial.py	2006-10-13 19:37:48 UTC (rev 3330)
@@ -201,16 +201,21 @@
     value method takes a paramenter, 'rcond', which sets a limit on the
     relative size of the smallest singular value to be used in solving the
     equation. The default value of rcond is the double precision machine
-    precision as the actual solution is carried out in double precision.
+    precision as the actual solution is carried out in double precision. If you
+    are simply interested in a polynomial line drawn through the data points
+    and *not* in a true power series expansion about zero, then the best bet is
+    to scale the x sample points to the interval [0,1] as the problem will
+    probably be much better posed.
 
     WARNING: Power series fits are full of pitfalls for the unwary once the
-    degree of the fit get up around 4 or 5. Computation of the polynomial
-    values are sensitive to coefficient errors and the Vandermonde matrix is
-    ill conditioned. The knobs available to tune the fit are degree and rcond.
-    The rcond knob is a bit flaky and it can be useful to use values of rcond
-    less than the machine precision, 1e-24 for instance, but the quality of the
-    resulting fit needs to be checked against the data. The quality of
-    polynomial fits *can not* be taken for granted.
+    degree of the fit get up around 4 or 5 and the interval of sample points
+    gets large. Computation of the polynomial values are sensitive to
+    coefficient errors and the Vandermonde matrix is ill conditioned. The knobs
+    available to tune the fit are degree and rcond.  The rcond knob is a bit
+    flaky and it can be useful to use values of rcond less than the machine
+    precision, 1e-24 for instance, but the quality of the resulting fit needs
+    to be checked against the data. The quality of polynomial fits *can not* be
+    taken for granted.
 
     For more info, see
     http://mathworld.wolfram.com/LeastSquaresFittingPolynomial.html,



From numpy-svn at scipy.org  Fri Oct 13 15:56:20 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 14:56:20 -0500 (CDT)
Subject: [Numpy-svn] r3331 - trunk/numpy/core/src
Message-ID: <20061013195620.3FAEA39C1AD@new.scipy.org>

Author: oliphant
Date: 2006-10-13 14:56:17 -0500 (Fri, 13 Oct 2006)
New Revision: 3331

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Fix ticket #344: normalize repr of dtypes with shapes.  Also change align argument in dtype constructor to be a boolean.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-13 19:37:48 UTC (rev 3330)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-13 19:56:17 UTC (rev 3331)
@@ -10792,12 +10792,13 @@
 {
         PyObject *odescr;
         PyArray_Descr *descr, *conv;
-        int align=0;
+        Bool align=FALSE;
         Bool copy=FALSE;
         static char *kwlist[] = {"dtype", "align", "copy", NULL};
 
-        if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|iO&",
-                                         kwlist, &odescr, &align,
+        if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O&O&",
+                                         kwlist, &odescr, 
+                                         PyArray_BoolConverter, &align,
                                          PyArray_BoolConverter, &copy))
                 return NULL;
 
@@ -11160,6 +11161,7 @@
         else if (self->subarray) {
                 PyObject *p;
                 PyObject *t = PyString_FromString("(");
+                PyObject *sh;
                 p = arraydescr_str(self->subarray->base);
                 if (!self->subarray->base->names && !self->subarray->base->subarray) {
                         PyObject *t=PyString_FromString("'");
@@ -11169,7 +11171,15 @@
                 }
                 PyString_ConcatAndDel(&t, p);
                 PyString_ConcatAndDel(&t, PyString_FromString(","));
-                PyString_ConcatAndDel(&t, PyObject_Str(self->subarray->shape));
+                if (!PyTuple_Check(self->subarray->shape)) {
+                        sh = Py_BuildValue("(O)", self->subarray->shape);
+                }
+                else {
+                        sh = self->subarray->shape;
+                        Py_INCREF(sh);
+                }
+                PyString_ConcatAndDel(&t, PyObject_Str(sh));
+                Py_DECREF(sh);
                 PyString_ConcatAndDel(&t, PyString_FromString(")"));
                 sub = t;
         }



From numpy-svn at scipy.org  Fri Oct 13 16:13:22 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 15:13:22 -0500 (CDT)
Subject: [Numpy-svn] r3332 - trunk/numpy/core/src
Message-ID: <20061013201322.4974439C1B5@new.scipy.org>

Author: oliphant
Date: 2006-10-13 15:13:17 -0500 (Fri, 13 Oct 2006)
New Revision: 3332

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Fix ticket #342.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-13 19:56:17 UTC (rev 3331)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-13 20:13:17 UTC (rev 3332)
@@ -6706,18 +6706,6 @@
         if (PyString_Check(s) || PyBuffer_Check(s) || PyUnicode_Check(s))
                 return stop_at_string ? 0:1;
         if (stop_at_tuple && PyTuple_Check(s)) return 0;
-        if ((e=PyObject_GetAttrString(s, "__array_interface__")) != NULL) {
-                d = -1;
-                if (PyDict_Check(e)) {
-                        PyObject *new;
-                        new = PyDict_GetItemString(e, "shape");
-                        if (new && PyTuple_Check(new))
-                                d = PyTuple_GET_SIZE(new);
-                }
-                Py_DECREF(e);
-                if (d>-1) return d;
-        }
-        else PyErr_Clear();
         if ((e=PyObject_GetAttrString(s, "__array_struct__")) != NULL) {
                 d = -1;
                 if (PyCObject_Check(e)) {
@@ -6731,6 +6719,18 @@
                 if (d > -1) return d;
         }
         else PyErr_Clear();
+        if ((e=PyObject_GetAttrString(s, "__array_interface__")) != NULL) {
+                d = -1;
+                if (PyDict_Check(e)) {
+                        PyObject *new;
+                        new = PyDict_GetItemString(e, "shape");
+                        if (new && PyTuple_Check(new))
+                                d = PyTuple_GET_SIZE(new);
+                }
+                Py_DECREF(e);
+                if (d>-1) return d;
+        }
+        else PyErr_Clear();
 
         if (PySequence_Length(s) == 0)
                 return 1;
@@ -7211,11 +7211,8 @@
         int type = typecode->type_num;
         int itemsize = typecode->elsize;
 
-        check_it = ((type != PyArray_STRING) &&
-                    (type != PyArray_UNICODE) &&
-                    (type != PyArray_VOID) &&
-                    (type != PyArray_CHAR));
-                    
+        check_it = (typecode->type != PyArray_CHARLTR);
+
         stop_at_string = ((type == PyArray_OBJECT) ||   
                           (type == PyArray_STRING && 
                            typecode->type == PyArray_STRINGLTR) ||     



From numpy-svn at scipy.org  Fri Oct 13 16:41:33 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 15:41:33 -0500 (CDT)
Subject: [Numpy-svn] r3333 - trunk/numpy/f2py/lib
Message-ID: <20061013204133.C356F39C1AA@new.scipy.org>

Author: pearu
Date: 2006-10-13 15:41:27 -0500 (Fri, 13 Oct 2006)
New Revision: 3333

Modified:
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_module_module.py
   trunk/numpy/f2py/lib/wrapper_base.py
Log:
F2PY G3: modules can import f90 derived type wrappers from other modules.

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-13 20:13:17 UTC (rev 3332)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-13 20:41:27 UTC (rev 3333)
@@ -88,7 +88,8 @@
             return
         defined.append(cname)
         
-        self.info('Generating interface for %s: %s' % (block.__class__, cname))
+        self.info('Generating interface for %s %s: %s' % (parent.modulename, block.__class__.__name__, cname))
+        self.parent = parent
 
         if pyname.startswith('f2pywrap_'):
             pyname = pyname[9:]

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-13 20:13:17 UTC (rev 3332)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-13 20:41:27 UTC (rev 3333)
@@ -332,12 +332,12 @@
         self.ctype = ctype = ti.ctype
 
         defined = parent.defined_types
-        if name in defined:
+        if ctype in defined:
             return
-        defined.append(name)
+        defined.append(ctype)
         
-        self.info('Generating interface for %s: %s' % (typedecl.__class__, ctype))
-
+        self.info('Generating interface for %s: %s' % (typedecl.__class__.__name__, ctype))
+        self.parent = parent
         if isinstance(typedecl, (Integer,Byte,Real,DoublePrecision)):
             self.Cls = ctype[4].upper() + ctype[5:]
             self.capi_code_template = self.capi_code_template_scalar
@@ -376,14 +376,14 @@
     Fortran 90 derived type hooks.
     """
 
-    header_template = '''\
+    header_template_wrapper = '''\
 #define %(otype)s_Check(obj) \\
     PyObject_TypeCheck((PyObject*)obj, &%(otype)sType)
 #define %(init_func)s_f \\
     F_FUNC(%(init_func)s,%(INIT_FUNC)s)
 '''
 
-    typedef_template = '''\
+    typedef_template_wrapper = '''\
 typedef void * %(ctype)s;
 typedef struct {
   PyObject_HEAD
@@ -392,11 +392,26 @@
 } %(otype)s;
 '''
 
-    extern_template = '''\
+    typedef_template_importer = '''\
+typedef void * %(ctype)s;
+typedef struct {
+  PyObject_HEAD
+  %(ptrstruct_list)s
+  %(ctype)s data;
+} %(otype)s;
+typedef int (*pyobj_to_%(ctype)s_inplace_functype)(PyObject*, %(otype)s** );
+typedef int (*pyobj_to_%(ctype)s_functype)(PyObject*, %(otype)s* );
+typedef PyObject* (*pyobj_from_%(ctype)s_functype)(%(ctype)s*);
+#define %(otype)sType (*(PyTypeObject *)PyArray_API[0])
+#define pyobj_from_%(ctype)s ((pyobj_from_%(ctype)s_functype)PyArray_API[1])
+#define pyobj_to_%(ctype)s_inplace ((pyobj_to_%(ctype)s_inplace_functype)PyArray_API[2])
+'''
+
+    extern_template_wrapper = '''\
 static PyTypeObject %(otype)sType;
 '''
 
-    objdecl_template = '''\
+    objdecl_template_wrapper = '''\
 static PyMethodDef %(otype)s_methods[] = {
     %(type_method_list)s
     {NULL}  /* Sentinel */
@@ -410,7 +425,7 @@
 static PyTypeObject %(otype)sType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "%(name)s",                /*tp_name*/
+    "%(modulename)s.%(name)s",                /*tp_name*/
     sizeof(%(otype)s),    /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)%(otype)s_dealloc, /*tp_dealloc*/
@@ -455,27 +470,51 @@
   (void *) pyobj_to_%(ctype)s_inplace
 };
 '''
-    
-    module_init_template = '''\
-if (PyType_Ready(&%(otype)sType) < 0)
-  goto capi_err;
-PyModule_AddObject(f2py_module, "%(name)s",
-                                (PyObject *)&%(otype)sType);
+
+    objdecl_template_importer = '''\
+static void **F2PY_%(otype)s_API;
+'''
+    module_init_template_wrapper = '''\
+if (PyType_Ready(&%(otype)sType) < 0) goto capi_err;
+PyModule_AddObject(f2py_module, "%(name)s", (PyObject *)&%(otype)sType);
 {
   PyObject* c_api = PyCObject_FromVoidPtr((void *)F2PY_%(otype)s_API, NULL);
-  PyModule_AddObject(f2py_module, "_%(name)s_API", c_api);
+  PyModule_AddObject(f2py_module, "_%(NAME)s_API", c_api);
   if (PyErr_Occurred()) goto capi_err;
 }
 '''
+    module_init_template_importer = '''\
+{
+  PyObject *c_api = NULL;
+  PyObject *wrappermodule = PyImport_ImportModule("%(wrappermodulename)s");
+  if (wrappermodule == NULL) goto capi_%(name)s_err;
+  c_api = PyObject_GetAttrString(wrappermodule, "_%(NAME)s_API");
+  if (c_api == NULL) {Py_DECREF(wrappermodule); goto capi_%(name)s_err;}
+  if (PyCObject_Check(c_api)) {
+      F2PY_%(otype)s_API = (void **)PyCObject_AsVoidPtr(c_api);
+  }
+  Py_DECREF(c_api);
+  Py_DECREF(wrappermodule);
+  if (F2PY_%(otype)s_API != NULL) goto capi_%(name)s_ok;
+capi_%(name)s_err:
+  PyErr_Print();
+  PyErr_SetString(PyExc_ImportError, "%(wrappermodulename)s failed to import");
+  return;
+capi_%(name)s_ok:
+  c_api = PyCObject_FromVoidPtr((void *)F2PY_%(otype)s_API, NULL);
+  PyModule_AddObject(f2py_module, "_%(NAME)s_API", c_api);
+  if (PyErr_Occurred()) goto capi_err;
+}
+'''
 
-    c_code_template = '''\
+    c_code_template_wrapper = '''\
 static void %(init_func)s_c(
                %(init_func_c_arg_clist)s) {
   %(init_func_c_body_list)s
 }
 '''
 
-    capi_code_template = '''\
+    capi_code_template_wrapper = '''\
 static void %(otype)s_dealloc(%(otype)s* self) {
   if (self->data)
     PyMem_Free(self->data);
@@ -575,7 +614,7 @@
 %(getset_func_list)s
 '''
 
-    fortran_code_template = '''\
+    fortran_code_template_wrapper = '''\
       subroutine %(init_func)s(init_func_c, self, obj)
       %(use_stmt_list)s
       %(type_decl_list)s
@@ -599,17 +638,40 @@
             return
         defined.append(ctype)
 
-        self.info('Generating interface for %s: %s' % (typedecl.__class__, ctype))
+
+
+        implement_wrappers = True
+        if isinstance(typedecl.parent,Module) and typedecl.parent.name!=parent.modulename:
+            implement_wrappers = False
+            self.info('Using api for %s.%s: %s' % (parent.modulename, typedecl.name, ctype))
+            self.wrappermodulename = typedecl.parent.name
+        else:
+            self.info('Generating interface for %s.%s: %s' % (parent.modulename, typedecl.name, ctype))
+        
         parent.isf90 = True
-
+        self.parent = parent
         self.name = name = typedecl.name
         self.otype = otype = ti.otype
         self.ctype = ctype = ti.ctype
         self.ctype_ptrs = self.ctype + '_ptrs'
         self.ftype = ti.ftype
         self.bytes = bytes = ti.bytes
-        WrapperCPPMacro(parent, 'F_FUNC')
 
+        if not implement_wrappers:
+            self.typedef_template = self.typedef_template_importer
+            self.objdecl_template = self.objdecl_template_importer
+            self.module_init_template = self.module_init_template_importer
+        else:
+            self.header_template = self.header_template_wrapper
+            self.typedef_template = self.typedef_template_wrapper
+            self.extern_template = self.extern_template_wrapper
+            self.objdecl_template = self.objdecl_template_wrapper
+            self.module_init_template = self.module_init_template_wrapper
+            self.c_code_template = self.c_code_template_wrapper
+            self.capi_code_template = self.capi_code_template_wrapper
+            self.fortran_code_template = self.fortran_code_template_wrapper
+            WrapperCPPMacro(parent, 'F_FUNC')
+
         self.init_func_f_arg_list = ['self']
         self.init_func_c_arg_list = ['%s *self' % (otype)]
         self.init_func_c_body_list = []

Modified: trunk/numpy/f2py/lib/test_module_module.py
===================================================================
--- trunk/numpy/f2py/lib/test_module_module.py	2006-10-13 20:13:17 UTC (rev 3332)
+++ trunk/numpy/f2py/lib/test_module_module.py	2006-10-13 20:41:27 UTC (rev 3333)
@@ -28,6 +28,7 @@
         assert str(msg)==('No module named %s' % (modulename)) \
                or str(msg).startswith('%s is newer than' % (__file__)),str(msg)
         print msg, ', recompiling %s.' % (modulename)
+        if not os.path.isdir(build_dir): os.makedirs(build_dir)
         fname = os.path.join(build_dir, modulename + '_source.f90')
         f = open(fname,'w')
         f.write(fortran_code)

Modified: trunk/numpy/f2py/lib/wrapper_base.py
===================================================================
--- trunk/numpy/f2py/lib/wrapper_base.py	2006-10-13 20:13:17 UTC (rev 3332)
+++ trunk/numpy/f2py/lib/wrapper_base.py	2006-10-13 20:41:27 UTC (rev 3333)
@@ -88,10 +88,15 @@
                     joinsymbol = ''
                     realname = realname[:-6] + '_list'
                 realname_lower = realname.lower()
+                parent = getattr(self,'parent',None)
                 if hasattr(self, realname):
                     attr = getattr(self, realname)
                 elif hasattr(self, realname_lower):
                     attr = getattr(self, realname_lower).upper()
+                elif hasattr(parent, realname):
+                    attr = getattr(parent, realname)
+                elif hasattr(parent, realname_lower):
+                    attr = getattr(parent, realname_lower).upper()
                 elif realname.startswith('['):
                     attr = eval(realname)
                 else:



From numpy-svn at scipy.org  Fri Oct 13 16:50:02 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 15:50:02 -0500 (CDT)
Subject: [Numpy-svn] r3334 - in trunk/numpy: core lib
Message-ID: <20061013205002.D23B739C095@new.scipy.org>

Author: oliphant
Date: 2006-10-13 15:50:00 -0500 (Fri, 13 Oct 2006)
New Revision: 3334

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/lib/shape_base.py
Log:
Add roll function from ticket #293

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-13 20:41:27 UTC (rev 3333)
+++ trunk/numpy/core/numeric.py	2006-10-13 20:50:00 UTC (rev 3334)
@@ -7,7 +7,7 @@
            'asarray', 'asanyarray', 'ascontiguousarray', 'asfortranarray',
            'isfortran', 'empty_like', 'zeros_like',
            'correlate', 'convolve', 'inner', 'dot', 'outer', 'vdot',
-           'alterdot', 'restoredot', 'rollaxis', 'cross', 'tensordot',
+           'alterdot', 'restoredot', 'roll', 'rollaxis', 'cross', 'tensordot',
            'array2string', 'get_printoptions', 'set_printoptions',
            'array_repr', 'array_str', 'set_string_function',
            'little_endian', 'require',
@@ -332,6 +332,25 @@
     res = dot(at, bt)
     return res.reshape(olda + oldb)
 
+def roll(a, shift, axis=None):
+    """Roll the elements in the array by 'shift' positions along
+    the given axis.
+    """
+    a = asanyarray(a)
+    if axis is None:
+        n = a.size
+        reshape=1
+    else:
+        n = a.shape[axis]
+        reshape=0
+    shift %= n
+    indexes = concatenate((arange(n-shift,n),arange(n-shift)))
+    res = a.take(indexes, axis)
+    if reshape:
+        return res.reshape(a.shape)
+    else:
+        return res
+
 def rollaxis(a, axis, start=0):
     """Return transposed array so that axis is rolled before start.
 

Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-10-13 20:41:27 UTC (rev 3333)
+++ trunk/numpy/lib/shape_base.py	2006-10-13 20:50:00 UTC (rev 3334)
@@ -1,6 +1,6 @@
 __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack',
            'column_stack','row_stack', 'dstack','array_split','split','hsplit',
-           'vsplit','dsplit','apply_over_axes','expand_dims',
+           'vsplit','dsplit','apply_over_axes','expand_dims', 
            'apply_along_axis', 'kron', 'tile', 'get_array_wrap']
 
 import numpy.core.numeric as _nx



From numpy-svn at scipy.org  Fri Oct 13 20:09:46 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 13 Oct 2006 19:09:46 -0500 (CDT)
Subject: [Numpy-svn] r3335 - trunk/numpy/core/tests
Message-ID: <20061014000946.1EB5539C055@new.scipy.org>

Author: stefan
Date: 2006-10-13 19:09:29 -0500 (Fri, 13 Oct 2006)
New Revision: 3335

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Add tests for tickets #335, #341, #342 and #344.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-13 20:50:00 UTC (rev 3334)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-14 00:09:29 UTC (rev 3335)
@@ -506,5 +506,24 @@
         """Ticket #334"""
         assert N.dtype('i4') == N.dtype(('i4',()))
         
+    def check_dtype_posttuple(self, level=rlevel):
+        """Ticket #335"""
+        N.dtype([('col1', '()i4')])
+        
+    def check_numeric_carray_compare(self, level=rlevel):
+        """Ticket #341"""
+        assert_equal(N.array([ 'X' ], 'c'),'X')        
+        
+    def check_string_array_size(self, level=rlevel):
+        """Ticket #342"""
+        self.failUnlessRaises(ValueError,
+                              N.array,[['X'],['X','X','X']],'|S1')
+                              
+    def check_dtype_repr(self, level=rlevel):
+        """Ticket #344"""
+        dt1=N.dtype(('uint32', 2))
+        dt2=N.dtype(('uint32', (2,)))        
+        assert_equal(dt1.__repr__(), dt2.__repr__())
+                
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Sat Oct 14 05:50:53 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 14 Oct 2006 04:50:53 -0500 (CDT)
Subject: [Numpy-svn] r3336 - trunk/numpy/core/tests
Message-ID: <20061014095053.8991539C039@new.scipy.org>

Author: stefan
Date: 2006-10-14 04:50:35 -0500 (Sat, 14 Oct 2006)
New Revision: 3336

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Add test for ticket #339.


Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-14 00:09:29 UTC (rev 3335)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-14 09:50:35 UTC (rev 3336)
@@ -510,6 +510,11 @@
         """Ticket #335"""
         N.dtype([('col1', '()i4')])
         
+    def check_mgrid_single_element(self, level=rlevel):
+        """Ticket #339"""
+        assert_array_equal(N.mgrid[0:0:1j],[0])
+        assert_array_equal(N.mgrid[0:0],[])
+        
     def check_numeric_carray_compare(self, level=rlevel):
         """Ticket #341"""
         assert_equal(N.array([ 'X' ], 'c'),'X')        



From numpy-svn at scipy.org  Sat Oct 14 17:22:14 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 14 Oct 2006 16:22:14 -0500 (CDT)
Subject: [Numpy-svn] r3337 - trunk/numpy/f2py/lib
Message-ID: <20061014212214.7246339C1E9@new.scipy.org>

Author: pearu
Date: 2006-10-14 16:22:07 -0500 (Sat, 14 Oct 2006)
New Revision: 3337

Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/py_wrap.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
Log:
F2PY G3: fixed compiler warnings.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-14 09:50:35 UTC (rev 3336)
+++ trunk/numpy/f2py/lib/main.py	2006-10-14 21:22:07 UTC (rev 3337)
@@ -221,13 +221,83 @@
         output_stream.close()
     return
 
-def build_extension(sys_argv):
+def construct_extension_sources(modulename, parse_files, include_dirs, build_dir):
     """
+    Construct wrapper sources.
+    """
+    from py_wrap import PythonWrapperModule
+
+    f90_modules = []
+    external_subprograms = []
+    for filename in parse_files:
+        if not os.path.isfile(filename):
+            sys.stderr.write('No or not a file %r. Skipping.\n' % (filename))
+            continue
+        sys.stderr.write('Parsing %r..\n' % (filename))
+        for block in parse(filename, include_dirs=include_dirs).content:
+            if isinstance(block, Module):
+                f90_modules.append(block)
+            elif isinstance(block, (Subroutine, Function)):
+                external_subprograms.append(block)
+            else:
+                sys.stderr.write("Unhandled structure: %r\n" % (block.__class__))
+
+    module_infos = []
+
+    for block in f90_modules:
+        wrapper = PythonWrapperModule(block.name)
+        wrapper.add(block)
+        c_code = wrapper.c_code()
+        f_code = '! -*- f90 -*-\n' + wrapper.fortran_code()
+        c_fn = os.path.join(build_dir,'%smodule.c' % (block.name))
+        f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py.f90' % (block.name))
+        f = open(c_fn,'w')
+        f.write(c_code)
+        f.close()
+        f = open(f_fn,'w')
+        f.write(f_code)
+        f.close()
+        f_lib = '%s_f_wrappers_f2py' % (block.name)
+        module_info = {'name':block.name, 'c_sources':[c_fn],
+                       'f_sources':[f_fn], 'language':'f90'}
+        module_infos.append(module_info)
+
+    if external_subprograms:
+        wrapper = PythonWrapperModule(modulename)
+        for block in external_subprograms:
+            wrapper.add(block)
+        c_code = wrapper.c_code()
+        f_code = wrapper.fortran_code()
+        c_fn = os.path.join(build_dir,'%smodule.c' % (modulename))
+        ext = '.f'
+        language = 'f77'
+        if wrapper.isf90:
+            f_code = '! -*- f90 -*-\n' + f_code
+            ext = '.f90'
+            language = 'f90'
+        f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py%s' % (modulename, ext))
+        f = open(c_fn,'w')
+        f.write(c_code)
+        f.close()
+        f = open(f_fn,'w')
+        f.write(f_code)
+        f.close()
+        module_info = {'name':modulename, 'c_sources':[c_fn],
+                       'f_sources':[f_fn], 'language':language}
+        module_infos.append(module_info)
+
+    return module_infos
+
+def build_extension(sys_argv, sources_only = False):
+    """
     Build wrappers to Fortran 90 modules and external subprograms.
     """
     modulename = get_option_value(sys_argv,'-m','untitled','unspecified')
 
-    build_dir = get_option_value(sys_argv,'--build-dir','.',None)
+    if sources_only:
+        build_dir = get_option_value(sys_argv,'--build-dir','.','')
+    else:
+        build_dir = get_option_value(sys_argv,'--build-dir','.',None)
     if build_dir is None:
         build_dir = tempfile.mktemp()
         clean_build_dir = True
@@ -267,23 +337,11 @@
     else:
         parse_files = fortran_files + c_files
 
-    f90_modules = []
-    external_subprograms = []
+    module_infos = construct_extension_sources(modulename, parse_files, include_dirs, build_dir)
 
-    for filename in parse_files:
-        if not os.path.isfile(filename):
-            sys.stderr.write('No or not a file %r. Skipping.\n' % (filename))
-            continue
-        sys.stderr.write('Parsing %r..\n' % (filename))
-        for block in parse(filename, include_dirs=include_dirs).content:
-            if isinstance(block, Module):
-                f90_modules.append(block)
-            elif isinstance(block, (Subroutine, Function)):
-                external_subprograms.append(block)
-            else:
-                sys.stderr.write("Unhandled structure: %r\n" % (block.__class__))
+    if sources_only:
+        return
 
-    from py_wrap import PythonWrapperModule
     def configuration(parent_package='', top_path=None):
         from numpy.distutils.misc_util import Configuration
         config = Configuration('',parent_package,top_path)
@@ -293,63 +351,26 @@
                                sources = fortran_files)
             libraries.insert(0,flibname)
 
-        for block in f90_modules:
-            wrapper = PythonWrapperModule(block.name)
-            wrapper.add(block)
-            c_code = wrapper.c_code()
-            f_code = '! -*- f90 -*-\n' + wrapper.fortran_code()
-            c_fn = os.path.join(build_dir,'%smodule.c' % (block.name))
-            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py.f90' % (block.name))
-            f = open(c_fn,'w')
-            f.write(c_code)
-            f.close()
-            f = open(f_fn,'w')
-            f.write(f_code)
-            f.close()
-            f_lib = '%s_f_wrappers_f2py' % (block.name)
-            config.add_library(f_lib,
-                               sources = [f_fn])
-            config.add_extension(block.name,
-                                 sources=[c_fn] + c_files,
-                                 libraries = [f_lib] + libraries,
+        for module_info in module_infos:
+            name = module_info['name']
+            c_sources = module_info['c_sources']
+            f_sources = module_info['f_sources']
+            language = module_info['language']
+            if f_sources:
+                f_lib = '%s_f_wrappers_f2py' % (name)
+                config.add_library(f_lib, sources = f_sources)
+                libs = [f_lib] + libraries
+            else:
+                libs = libraries
+            config.add_extension(name,
+                                 sources=c_sources + c_files,
+                                 libraries = libs,
                                  define_macros = define_macros,
                                  undef_macros = undef_macros,
                                  include_dirs = include_dirs,
                                  extra_objects = extra_objects,
-                                 language = 'f90',
+                                 language = language,
                                  )
-        if external_subprograms:
-            wrapper = PythonWrapperModule(modulename)
-            for block in external_subprograms:
-                wrapper.add(block)
-            c_code = wrapper.c_code()
-            f_code = wrapper.fortran_code()
-            c_fn = os.path.join(build_dir,'%smodule.c' % (modulename))
-            ext = '.f'
-            language = 'f77'
-            if wrapper.isf90:
-                f_code = '! -*- f90 -*-\n' + f_code
-                ext = '.f90'
-                language = 'f90'
-            f_fn = os.path.join(build_dir,'%s_f_wrappers_f2py%s' % (modulename, ext))
-            f = open(c_fn,'w')
-            f.write(c_code)
-            f.close()
-            f = open(f_fn,'w')
-            f.write(f_code)
-            f.close()
-            f_lib = '%s_f_wrappers_f2py' % (modulename)
-            config.add_library(f_lib,
-                               sources = [f_fn])
-            config.add_extension(modulename,
-                                 sources=[c_fn] + c_files,
-                                 libraries = [f_lib] + libraries,
-                                 define_macros = define_macros,
-                                 undef_macros = undef_macros,
-                                 include_dirs = include_dirs,
-                                 extra_objects = extra_objects,
-                                 language = language
-                                 )
         return config
 
     old_sys_argv = sys.argv[:]
@@ -390,4 +411,8 @@
     if '-h' in sys_argv:
         dump_signature(sys_argv)
         return
-    print >> sys.stdout, __usage__
+    if not sys_argv or '--help' in sys_argv:
+        print >> sys.stdout, __usage__
+
+    build_extension(sys_argv, sources_only = True)
+    return

Modified: trunk/numpy/f2py/lib/py_wrap.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap.py	2006-10-14 09:50:35 UTC (rev 3336)
+++ trunk/numpy/f2py/lib/py_wrap.py	2006-10-14 21:22:07 UTC (rev 3337)
@@ -45,7 +45,7 @@
   import_array();
   if (PyErr_Occurred()) {
     PyErr_SetString(PyExc_ImportError, "failed to load array module.");
-    return;
+    goto capi_err;
   }
   %(module_init_list)s
   return;

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-14 09:50:35 UTC (rev 3336)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-14 21:22:07 UTC (rev 3337)
@@ -16,7 +16,7 @@
 #define %(name)s_f F_FUNC(%(name)s, %(NAME)s)
 '''
     extern_template_f77 = '''\
-extern void %(name)s_f();
+extern void %(name)s_f(%(ctype_args_f_clist)s);
 '''
     objdecl_template_doc = '''\
 static char %(cname)s__doc[] = "";
@@ -54,10 +54,11 @@
 #define %(init_func)s_f F_FUNC(%(init_func)s, %(INIT_FUNC)s)
 '''
     typedef_template_module = '''
-typedef void (*%(name)s_functype)();
+typedef void (*%(name)s_functype)(%(ctype_args_f_clist)s);
+typedef void (*%(init_func)s_c_functype)(%(name)s_functype);
 '''
     extern_template_module = '''\
-extern void %(init_func)s_f( %(name)s_functype);
+extern void %(init_func)s_f(%(init_func)s_c_functype);
 static %(name)s_functype %(name)s_func_ptr;
 '''
     objdecl_template_module = '''
@@ -139,6 +140,8 @@
 
         args_f = []
         extra_args_f = []
+        ctype_args_f = []
+        extra_ctype_args_f = []
         argindex = -1
         for argname in block.args:
             argindex += 1
@@ -160,6 +163,7 @@
                         self.clean_frompyobj_list.append('Py_DECREF(%s);' % (argname))
                 self.decl_list.append('%s* %s = NULL;' % (ti.otype, argname))
                 args_f.append('%s->data' % (argname)) # is_scalar
+                ctype_args_f.append(ti.ctype)
             else:
                 if var.is_intent_in():
                     self.pyarg_format_list.append('O&')
@@ -170,13 +174,15 @@
                         assert not var.is_intent_out(),'intent(out) not implemented for "%s"' % (var)
                     self.decl_list.append('%s %s = {NULL,0};' % (ti.ctype, argname))
                     args_f.append('%s.data' % argname)  # is_scalar
+                    ctype_args_f.append('char*')
+                    extra_ctype_args_f.append('int')
                     extra_args_f.append('%s.len' % argname)
                     self.clean_frompyobj_list.append(\
                         'if (%s.len) free(%s.data);' % (argname,argname))
                 else:
                     self.decl_list.append('%s %s;' % (ti.ctype, argname))
                     args_f.append('&'+argname) # is_scalar
-
+                    ctype_args_f.append(ti.ctype+'*')
             if var.is_intent_out(): # and is_scalar
                 if isinstance(typedecl, TypeStmt):
                     self.return_format_list.append('N')
@@ -188,6 +194,11 @@
 
         self.call_list.append('%s_f(%s);' % (name,', '.join(args_f+extra_args_f)))
 
+        self.ctype_args_f_list = ctype_args_f + extra_ctype_args_f
+        if not self.ctype_args_f_list:
+            self.ctype_args_f_list.append('void')
+        
+
         self.clean_pyobjfrom_list.reverse()
         self.clean_call_list.reverse()
         self.clean_frompyobj_list.reverse()

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-14 09:50:35 UTC (rev 3336)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-14 21:22:07 UTC (rev 3337)
@@ -390,6 +390,7 @@
   %(ptrstruct_list)s
   %(ctype)s data;
 } %(otype)s;
+typedef void (*%(init_func)s_c_functype)(%(init_func_c_ctype_arg_clist)s);
 '''
 
     typedef_template_importer = '''\
@@ -409,6 +410,7 @@
 
     extern_template_wrapper = '''\
 static PyTypeObject %(otype)sType;
+extern void %(init_func)s_f(%(init_func)s_c_functype, void*, %(ctype)s);
 '''
 
     objdecl_template_wrapper = '''\
@@ -674,6 +676,7 @@
 
         self.init_func_f_arg_list = ['self']
         self.init_func_c_arg_list = ['%s *self' % (otype)]
+        self.init_func_c_ctype_arg_list = ['%s *' % (otype)]
         self.init_func_c_body_list = []
         self.ptrstruct_list = []
         self.attr_decl_list = []
@@ -693,6 +696,7 @@
             self.ptrstruct_list.append('%s* %s_ptr;' % (ct, n))
             self.init_func_f_arg_list.append('obj %% %s' % (n))
             self.init_func_c_arg_list.append('\n%s * %s_ptr' % (ct, n))
+            self.init_func_c_ctype_arg_list.append('\n%s *' % (ct))
             self.init_func_c_body_list.append('''\
 if (!((void*)%(n)s_ptr >= self->data
       && (void*)%(n)s_ptr < self->data + %(bytes)s ))



From numpy-svn at scipy.org  Sat Oct 14 17:34:17 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 14 Oct 2006 16:34:17 -0500 (CDT)
Subject: [Numpy-svn] r3338 - trunk/numpy/lib
Message-ID: <20061014213417.DC54E39C04D@new.scipy.org>

Author: charris
Date: 2006-10-14 16:34:16 -0500 (Sat, 14 Oct 2006)
New Revision: 3338

Modified:
   trunk/numpy/lib/polynomial.py
Log:
Scale the x vector in polyfit to improve condition of Vandermonde matrix.
Throw error on rank reduction in polyfit.
Error should probably be replace with a warning at some point.
Add argument checks in polyfit.


Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-14 21:22:07 UTC (rev 3337)
+++ trunk/numpy/lib/polynomial.py	2006-10-14 21:34:16 UTC (rev 3338)
@@ -7,9 +7,10 @@
            'polyfit']
 
 import re
+import warnings
 import numpy.core.numeric as NX
 
-from numpy.core import isscalar
+from numpy.core import isscalar, abs
 from numpy.lib.twodim_base import diag, vander
 from numpy.lib.shape_base import hstack, atleast_1d
 from numpy.lib.function_base import trim_zeros, sort_complex
@@ -169,11 +170,11 @@
             val = poly1d(val)
         return val
 
-def polyfit(x, y, N, rcond=-1):
+def polyfit(x, y, deg, rcond=-1):
     """
 
-    Do a best fit polynomial of degree N of y to x.  Return value is a
-    vector of polynomial coefficients [pk ... p1 p0].  Eg, for N=2
+    Do a best fit polynomial of degree 'deg' of 'x' to 'y'.  Return value is a
+    vector of polynomial coefficients [pk ... p1 p0].  Eg, for n=2
 
       p2*x0^2 +  p1*x0 + p0 = y1
       p2*x1^2 +  p1*x1 + p0 = y1
@@ -201,21 +202,22 @@
     value method takes a paramenter, 'rcond', which sets a limit on the
     relative size of the smallest singular value to be used in solving the
     equation. The default value of rcond is the double precision machine
-    precision as the actual solution is carried out in double precision. If you
-    are simply interested in a polynomial line drawn through the data points
-    and *not* in a true power series expansion about zero, then the best bet is
-    to scale the x sample points to the interval [0,1] as the problem will
-    probably be much better posed.
+    precision as the actual solution is carried out in double precision. The
+    vector x is also normalized by its maximum absolute value before the fit
+    to improve the condition of the Vandermonde matrix.
 
     WARNING: Power series fits are full of pitfalls for the unwary once the
-    degree of the fit get up around 4 or 5 and the interval of sample points
-    gets large. Computation of the polynomial values are sensitive to
-    coefficient errors and the Vandermonde matrix is ill conditioned. The knobs
-    available to tune the fit are degree and rcond.  The rcond knob is a bit
-    flaky and it can be useful to use values of rcond less than the machine
-    precision, 1e-24 for instance, but the quality of the resulting fit needs
-    to be checked against the data. The quality of polynomial fits *can not* be
-    taken for granted.
+    degree of the fit becomes large or the interval of sample points is badly
+    uncentered. The basic problem is that the powers x**n are not generally a
+    good basis for the functions on the sample interval with the result that
+    the Vandermonde matrix is ill conditioned and computation of the polynomial
+    values is sensitive to coefficient error. The quality of the resulting fit
+    should be checked against the data whenever the condition number is large,
+    as the quality of polynomial fits *can not* be taken for granted. If all
+    you want to do is draw a smooth curve through the y values and polyfit is
+    not doing the job, try centering the sample range or look into
+    scipy.interpolate, which includes some nice spline fitting functions that
+    may be of use.
 
     For more info, see
     http://mathworld.wolfram.com/LeastSquaresFittingPolynomial.html,
@@ -225,10 +227,38 @@
     See also polyval
 
     """
+    order = deg + 1.
     x = NX.asarray(x) + 0.0
     y = NX.asarray(y) + 0.0
-    v = vander(x, N+1)
+
+    # check arguments.
+    if deg < 0 :
+        raise ValueError, "expected deg >= 0"
+    if x.ndim != 1 or x.size == 0:
+        raise TypeError, "expected non-empty vector for x"
+    if y.ndim < 1 or y.ndim > 2 :
+        raise TypeError, "expected 1D or 2D array for y"
+    if x.shape[0] != y.shape[0] :
+        raise TypeError, "expected x and y to have same length"
+
+    # scale x to improve condition number
+    scale = abs(x).max()
+    if scale != 0 :
+        x /= scale
+
+    # solve least squares equation for powers of x
+    v = vander(x, order)
     c, resids, rank, s = _lstsq(v, y, rcond)
+
+    # warn on rank reduction, which indicates an ill conditioned matrix
+    if rank != order :
+        # fixme -- want a warning here, not an exception
+        raise RuntimeError, "degree reduced to %d" % (rank - 1)
+
+    # scale returned coefficients
+    if scale != 0 :
+        c /= vander([scale], order)[0]
+
     return c
 
 



From numpy-svn at scipy.org  Sat Oct 14 23:05:08 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 14 Oct 2006 22:05:08 -0500 (CDT)
Subject: [Numpy-svn] r3339 - trunk/numpy/lib
Message-ID: <20061015030508.E6BE239C06D@new.scipy.org>

Author: charris
Date: 2006-10-14 22:05:06 -0500 (Sat, 14 Oct 2006)
New Revision: 3339

Modified:
   trunk/numpy/lib/polynomial.py
Log:
Set rcond to precision of x as default.
Make error message more informative.


Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-14 21:34:16 UTC (rev 3338)
+++ trunk/numpy/lib/polynomial.py	2006-10-15 03:05:06 UTC (rev 3339)
@@ -11,11 +11,14 @@
 import numpy.core.numeric as NX
 
 from numpy.core import isscalar, abs
+from numpy.lib.machar import MachAr
 from numpy.lib.twodim_base import diag, vander
 from numpy.lib.shape_base import hstack, atleast_1d
 from numpy.lib.function_base import trim_zeros, sort_complex
 eigvals = None
 lstsq = None
+_single_eps = MachAr(NX.single).eps
+_double_eps = MachAr(NX.double).eps
 
 def get_linalg_funcs():
     "Look for linear algebra functions in numpy"
@@ -170,7 +173,7 @@
             val = poly1d(val)
         return val
 
-def polyfit(x, y, deg, rcond=-1):
+def polyfit(x, y, deg, rcond=None):
     """
 
     Do a best fit polynomial of degree 'deg' of 'x' to 'y'.  Return value is a
@@ -241,6 +244,14 @@
     if x.shape[0] != y.shape[0] :
         raise TypeError, "expected x and y to have same length"
 
+    # set rcond
+    if rcond is None :
+        xtype = x.dtype
+        if xtype == NX.single or xtype == NX.csingle :
+            rcond = _single_eps
+        else :
+            rcond = _double_eps
+
     # scale x to improve condition number
     scale = abs(x).max()
     if scale != 0 :
@@ -253,7 +264,7 @@
     # warn on rank reduction, which indicates an ill conditioned matrix
     if rank != order :
         # fixme -- want a warning here, not an exception
-        raise RuntimeError, "degree reduced to %d" % (rank - 1)
+        raise RuntimeError, "Rank deficit fit. Try degree %d." % (rank - 1)
 
     # scale returned coefficients
     if scale != 0 :



From numpy-svn at scipy.org  Sun Oct 15 00:37:32 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 14 Oct 2006 23:37:32 -0500 (CDT)
Subject: [Numpy-svn] r3340 - trunk/numpy/lib
Message-ID: <20061015043732.AE1EE39C06A@new.scipy.org>

Author: charris
Date: 2006-10-14 23:37:30 -0500 (Sat, 14 Oct 2006)
New Revision: 3340

Modified:
   trunk/numpy/lib/polynomial.py
Log:
Make sure order is an integer

Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-15 03:05:06 UTC (rev 3339)
+++ trunk/numpy/lib/polynomial.py	2006-10-15 04:37:30 UTC (rev 3340)
@@ -230,7 +230,7 @@
     See also polyval
 
     """
-    order = deg + 1.
+    order = int(deg) + 1
     x = NX.asarray(x) + 0.0
     y = NX.asarray(y) + 0.0
 



From numpy-svn at scipy.org  Mon Oct 16 01:08:03 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 16 Oct 2006 00:08:03 -0500 (CDT)
Subject: [Numpy-svn] r3341 - trunk/numpy/lib
Message-ID: <20061016050803.9657C39C017@new.scipy.org>

Author: charris
Date: 2006-10-16 00:07:45 -0500 (Mon, 16 Oct 2006)
New Revision: 3341

Modified:
   trunk/numpy/lib/polynomial.py
Log:
Change error exception to RankWarning.
Add keyword argument full to get full fit info.
Make 'always' the default of RankWarning.
Improve documentation.


Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-15 04:37:30 UTC (rev 3340)
+++ trunk/numpy/lib/polynomial.py	2006-10-16 05:07:45 UTC (rev 3341)
@@ -4,7 +4,7 @@
 
 __all__ = ['poly', 'roots', 'polyint', 'polyder', 'polyadd',
            'polysub', 'polymul', 'polydiv', 'polyval', 'poly1d',
-           'polyfit']
+           'polyfit', 'RankWarning']
 
 import re
 import warnings
@@ -20,6 +20,11 @@
 _single_eps = MachAr(NX.single).eps
 _double_eps = MachAr(NX.double).eps
 
+class RankWarning(UserWarning):
+    """Issued by polyfit when Vandermonde matrix is rank deficient.
+    """
+    pass
+
 def get_linalg_funcs():
     "Look for linear algebra functions in numpy"
     global eigvals, lstsq
@@ -173,9 +178,29 @@
             val = poly1d(val)
         return val
 
-def polyfit(x, y, deg, rcond=None):
-    """
+def polyfit(x, y, deg, rcond=None, full=False):
+    """Least squares polynomial fit.
 
+    Required arguments
+
+        x -- vector of sample points
+        y -- vector or 2D array of values to fit
+        deg -- degree of the fitting polynomial
+
+    Keyword arguments
+
+        rcond -- relative condition number of the fit (default len(x)*eps)
+        full -- return full diagnostic output (default False)
+
+    Returns
+
+        full == False -- coeficients
+        full == True -- coeficients, residuals, rank, singular values.
+
+    Warns
+
+        RankWarning -- if rank is reduced and not full output
+
     Do a best fit polynomial of degree 'deg' of 'x' to 'y'.  Return value is a
     vector of polynomial coefficients [pk ... p1 p0].  Eg, for n=2
 
@@ -199,21 +224,34 @@
 
       p = (XT*X)^-1 * XT * y
 
-    where XT is the transpose of X gand -1 denotes the inverse. However, this
+    where XT is the transpose of X and -1 denotes the inverse. However, this
     method is susceptible to rounding errors and generally the singular value
     decomposition is preferred and that is the method used here. The singular
     value method takes a paramenter, 'rcond', which sets a limit on the
     relative size of the smallest singular value to be used in solving the
-    equation. The default value of rcond is the double precision machine
-    precision as the actual solution is carried out in double precision. The
-    vector x is also normalized by its maximum absolute value before the fit
-    to improve the condition of the Vandermonde matrix.
+    equation. This may result in lowering the rank of the Vandermonde matrix,
+    in which case a RankWarning is issued. If polyfit issues a RankWarning, try
+    a fit of lower degree or replace x by x - x.mean(), both of which will
+    generally improve the condition number. The routine already normalizes the
+    vector x by its maximum absolute value to help in this regard. The rcond
+    parameter may also be set to a value smaller than its default, but this may
+    result in bad fits. The current default value of rcond is len(x)*eps, where
+    eps is the relative precision of the floating type being used, generally
+    around 1e-7 and 2e-16 for IEEE single and double precision respectively.
+    This value of rcond is fairly conservative but works pretty well when x -
+    x.mean() is used in place of x.
 
-    WARNING: Power series fits are full of pitfalls for the unwary once the
+    The warnings can be turned off by:
+
+    >>> import numpy
+    >>> import warnings
+    >>> warnings.simplefilter('ignore',numpy.RankWarning)
+
+    DISCLAIMER: Power series fits are full of pitfalls for the unwary once the
     degree of the fit becomes large or the interval of sample points is badly
-    uncentered. The basic problem is that the powers x**n are not generally a
-    good basis for the functions on the sample interval with the result that
-    the Vandermonde matrix is ill conditioned and computation of the polynomial
+    centered. The basic problem is that the powers x**n are generally a poor
+    basis for the functions on the sample interval with the result that the
+    Vandermonde matrix is ill conditioned and computation of the polynomial
     values is sensitive to coefficient error. The quality of the resulting fit
     should be checked against the data whenever the condition number is large,
     as the quality of polynomial fits *can not* be taken for granted. If all
@@ -248,9 +286,9 @@
     if rcond is None :
         xtype = x.dtype
         if xtype == NX.single or xtype == NX.csingle :
-            rcond = _single_eps
+            rcond = len(x)*_single_eps
         else :
-            rcond = _double_eps
+            rcond = len(x)*_double_eps
 
     # scale x to improve condition number
     scale = abs(x).max()
@@ -262,15 +300,18 @@
     c, resids, rank, s = _lstsq(v, y, rcond)
 
     # warn on rank reduction, which indicates an ill conditioned matrix
-    if rank != order :
-        # fixme -- want a warning here, not an exception
-        raise RuntimeError, "Rank deficit fit. Try degree %d." % (rank - 1)
+    if rank != order and not full:
+        msg = "Polyfit may be poorly conditioned"
+        warnings.warn(msg, RankWarning)
 
     # scale returned coefficients
     if scale != 0 :
         c /= vander([scale], order)[0]
 
-    return c
+    if full :
+        return c, resids, rank, s
+    else :
+        return c
 
 
 
@@ -605,3 +646,8 @@
         """Return the mth derivative of this polynomial.
         """
         return poly1d(polyder(self.coeffs, m=m))
+
+# Stuff to do on module import
+
+warnings.simplefilter('always',RankWarning)
+



From numpy-svn at scipy.org  Mon Oct 16 13:44:13 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 16 Oct 2006 12:44:13 -0500 (CDT)
Subject: [Numpy-svn] r3342 - trunk/numpy/lib
Message-ID: <20061016174413.BF43E39C093@new.scipy.org>

Author: oliphant
Date: 2006-10-16 12:44:09 -0500 (Mon, 16 Oct 2006)
New Revision: 3342

Modified:
   trunk/numpy/lib/getlimits.py
   trunk/numpy/lib/polynomial.py
Log:
Fix finfo eps and huge to be array scalars of the appropriate type.  And use finfo interface instead of MachAr.

Modified: trunk/numpy/lib/getlimits.py
===================================================================
--- trunk/numpy/lib/getlimits.py	2006-10-16 05:07:45 UTC (rev 3341)
+++ trunk/numpy/lib/getlimits.py	2006-10-16 17:44:09 UTC (rev 3342)
@@ -80,9 +80,9 @@
             setattr(self,word,getattr(machar, word))
         for word in ['tiny','resolution','epsneg']:
             setattr(self,word,getattr(machar, word).squeeze())
-        self.max = machar.huge.squeeze()
+        self.max = machar.huge.flat[0]
         self.min = -self.max
-        self.eps = machar.epsilon.squeeze()
+        self.eps = machar.eps.flat[0]
         self.nexp = machar.iexp
         self.nmant = machar.it
         self.machar = machar

Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-16 05:07:45 UTC (rev 3341)
+++ trunk/numpy/lib/polynomial.py	2006-10-16 17:44:09 UTC (rev 3342)
@@ -11,14 +11,14 @@
 import numpy.core.numeric as NX
 
 from numpy.core import isscalar, abs
-from numpy.lib.machar import MachAr
+from numpy.lib.getlimits import finfo
 from numpy.lib.twodim_base import diag, vander
 from numpy.lib.shape_base import hstack, atleast_1d
 from numpy.lib.function_base import trim_zeros, sort_complex
 eigvals = None
 lstsq = None
-_single_eps = MachAr(NX.single).eps
-_double_eps = MachAr(NX.double).eps
+_single_eps = finfo(NX.single).eps
+_double_eps = finfo(NX.double).eps
 
 class RankWarning(UserWarning):
     """Issued by polyfit when Vandermonde matrix is rank deficient.



From numpy-svn at scipy.org  Mon Oct 16 13:55:33 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 16 Oct 2006 12:55:33 -0500 (CDT)
Subject: [Numpy-svn] r3343 - in trunk/numpy: lib linalg
Message-ID: <20061016175533.2A21F39C069@new.scipy.org>

Author: charris
Date: 2006-10-16 12:55:30 -0500 (Mon, 16 Oct 2006)
New Revision: 3343

Modified:
   trunk/numpy/lib/polynomial.py
   trunk/numpy/linalg/linalg.py
Log:
Fix qr decomposition. The dimensions m,n were taken from the fortran ordered array
instead of from the numpy ordered array and consequently were reversed.


Modified: trunk/numpy/lib/polynomial.py
===================================================================
--- trunk/numpy/lib/polynomial.py	2006-10-16 17:44:09 UTC (rev 3342)
+++ trunk/numpy/lib/polynomial.py	2006-10-16 17:55:30 UTC (rev 3343)
@@ -194,8 +194,8 @@
 
     Returns
 
-        full == False -- coeficients
-        full == True -- coeficients, residuals, rank, singular values.
+        full == False -- coefficients
+        full == True -- coefficients, residuals, rank, singular values, rcond.
 
     Warns
 
@@ -309,7 +309,7 @@
         c /= vander([scale], order)[0]
 
     if full :
-        return c, resids, rank, s
+        return c, resids, rank, s, rcond
     else :
         return c
 

Modified: trunk/numpy/linalg/linalg.py
===================================================================
--- trunk/numpy/linalg/linalg.py	2006-10-16 17:44:09 UTC (rev 3342)
+++ trunk/numpy/linalg/linalg.py	2006-10-16 17:55:30 UTC (rev 3343)
@@ -188,7 +188,7 @@
     ind must be a positive integer specifying
     how many indices at the front of the array are involved
     in the inverse sum.
-    
+
     the result is ainv with shape a.shape[ind:] + a.shape[:ind]
 
     tensordot(ainv, a, ind) is an identity operator
@@ -266,9 +266,9 @@
                    part of A2 is R. This is faster if you only need R
     """
     _assertRank2(a)
+    m,n = a.shape
     t, result_t = _commonType(a)
     a = _fastCopyAndTranspose(t, a)
-    m,n = a.shape
     mn = min(m,n)
     tau = zeros((mn,), t)
     if isComplexType(t):
@@ -282,7 +282,7 @@
     lwork = 1
     work = zeros((lwork,), t)
     results=lapack_routine(m, n, a, m, tau, work, -1, 0)
-    if results['info'] > 0:
+    if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
     # do qr decomposition
@@ -290,23 +290,19 @@
     work = zeros((lwork,),t)
     results=lapack_routine(m, n, a, m, tau, work, lwork, 0)
 
-    if results['info'] > 0:
+    if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
-    #  atemp: convert fortrag storing order to num storing order
-    atemp = a.transpose()
-
-    if atemp.dtype != result_t:
-        atemp = atemp.astype(result_t)
-
-    #  economic mode
+    #  economic mode. Isn't actually economic.
     if mode[0]=='e':
-        return atemp
+        if t != result_t :
+            a = a.astype(result_t)
+        return a.T
 
     #  generate r
-    r = zeros((mn,n), result_t)
+    r = _fastCopyAndTranspose(result_t, a[:,:mn])
     for i in range(mn):
-            r[i, i:] = atemp[i, i:]
+        r[i,:i].fill(0.0)
 
     #  'r'-mode, that is, calculate only r
     if mode[0]=='r':
@@ -325,22 +321,18 @@
     lwork = 1
     work=zeros((lwork,), t)
     results=lapack_routine(m,mn,mn, a, m, tau, work, -1, 0)
-    if results['info'] > 0:
+    if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
     # compute q
     lwork = int(abs(work[0]))
     work=zeros((lwork,), t)
     results=lapack_routine(m,mn,mn, a, m, tau, work, lwork, 0)
-
-    if results['info'] > 0:
+    if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
-    q = a[:mn,:].transpose()
+    q = _fastCopyAndTranspose(result_t, a[:mn,:])
 
-    if (q.dtype != result_t):
-        q = q.astype(result_t)
-
     return q,r
 
 



From numpy-svn at scipy.org  Mon Oct 16 14:11:34 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 16 Oct 2006 13:11:34 -0500 (CDT)
Subject: [Numpy-svn] r3344 - trunk/numpy/core/tests
Message-ID: <20061016181134.4648339C063@new.scipy.org>

Author: oliphant
Date: 2006-10-16 13:11:31 -0500 (Mon, 16 Oct 2006)
New Revision: 3344

Modified:
   trunk/numpy/core/tests/test_errstate.py
Log:
Applied patch for ticket #345: fix to test_errstate for Python 2.5

Modified: trunk/numpy/core/tests/test_errstate.py
===================================================================
--- trunk/numpy/core/tests/test_errstate.py	2006-10-16 17:55:30 UTC (rev 3343)
+++ trunk/numpy/core/tests/test_errstate.py	2006-10-16 18:11:31 UTC (rev 3344)
@@ -1,6 +1,13 @@
-#~ import sys
-#~ if sys.version_info[:2] >= (2, 5):
-    #~ exec """
+
+# The following exec statement (or something like it) is needed to
+# prevent SyntaxError on Python < 2.5. Even though this is a test,
+# SyntaxErrors are not acceptable; on Debian systems, they block
+# byte-compilation during install and thus cause the package to fail
+# to install.
+
+import sys
+if sys.version_info[:2] >= (2, 5):
+    exec """
 from __future__ import with_statement
 from numpy.core import *
 from numpy.random import rand, randint
@@ -38,8 +45,8 @@
                 pass
             else:
                 self.fail()
-#~ """
+"""
 
 if __name__ == '__main__':
     from numpy.testing import *
-    NumpyTest().run()
\ No newline at end of file
+    NumpyTest().run()



From numpy-svn at scipy.org  Tue Oct 17 11:29:38 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 10:29:38 -0500 (CDT)
Subject: [Numpy-svn] r3345 - trunk
Message-ID: <20061017152938.A1ECD39C0DA@new.scipy.org>

Author: edschofield
Date: 2006-10-17 10:29:20 -0500 (Tue, 17 Oct 2006)
New Revision: 3345

Modified:
   trunk/THANKS.txt
Log:
Added yours truly to THANKS.txt


Modified: trunk/THANKS.txt
===================================================================
--- trunk/THANKS.txt	2006-10-16 18:11:31 UTC (rev 3344)
+++ trunk/THANKS.txt	2006-10-17 15:29:20 UTC (rev 3345)
@@ -7,7 +7,8 @@
 Pearu Peterson for f2py and distutils and help with code organization
 Robert Kern for mtrand, bug fixes, help with distutils, and code organization
 Eric Jones for sundry subroutines
-Fernando Perez for code snippets, ideas, bufixes, and testing.
+Fernando Perez for code snippets, ideas, bugfixes, and testing.
+Ed Schofield for matrix.py patches, bugfixes, testing, and docstrings.
 John Hunter for code snippets (from matplotlib)
 Chris Hanley for help with records.py, testing, and bug fixes.
 Travis Vaught and Joe Cooper for administration of numpy.org web site and SVN 



From numpy-svn at scipy.org  Tue Oct 17 11:54:01 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 10:54:01 -0500 (CDT)
Subject: [Numpy-svn] r3346 - trunk/numpy/core/src
Message-ID: <20061017155401.F3DEB39C0D3@new.scipy.org>

Author: oliphant
Date: 2006-10-17 10:53:59 -0500 (Tue, 17 Oct 2006)
New Revision: 3346

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix reshape for FORTRAN order from 1-d arrays.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-17 15:29:20 UTC (rev 3345)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-17 15:53:59 UTC (rev 3346)
@@ -469,52 +469,80 @@
 PyArray_Newshape(PyArrayObject *self, PyArray_Dims *newdims,
 		 NPY_ORDER fortran)
 {
-        intp i;
+	intp i;
 	intp *dimensions = newdims->ptr;
-        PyArrayObject *ret;
+	PyArrayObject *ret;
 	int n = newdims->len;
-        Bool same, incref=TRUE;
+	Bool same, incref=TRUE;
 	intp *strides = NULL;
 	intp newstrides[MAX_DIMS];
+	int flags;
 
 	if (fortran == PyArray_ANYORDER)
 		fortran = PyArray_ISFORTRAN(self);
 
-        /*  Quick check to make sure anything actually needs to be done */
-        if (n == self->nd) {
-                same = TRUE;
-                i=0;
-                while(same && i<n) {
-                        if (PyArray_DIM(self,i) != dimensions[i])
-                                same=FALSE;
-                        i++;
-                }
-                if (same) return PyArray_View(self, NULL, NULL);
-        }
+	/*  Quick check to make sure anything actually needs to be done */
+	if (n == self->nd) {
+		same = TRUE;
+		i=0;
+		while(same && i<n) {
+			if (PyArray_DIM(self,i) != dimensions[i])
+				same=FALSE;
+			i++;
+		}
+		if (same) return PyArray_View(self, NULL, NULL);
+	}
 
 	/* Returns a pointer to an appropriate strides array
 	   if all we are doing is inserting ones into the shape,
 	   or removing ones from the shape
-	   or doing a combination of the two*/
+	   or doing a combination of the two  
+	   In this case we don't need to do anything but update strides and 
+	   dimensions.	So, we can handle non single-segment cases.
+	*/
 	i=_check_ones(self, n, dimensions, newstrides);
 	if (i==0) strides=newstrides;
 
-	if (strides==NULL) {
-		if ((n == 0) ||
-		    (PyArray_ISCONTIGUOUS(self) && (fortran != PyArray_FORTRANORDER)) ||
-		    (PyArray_ISFORTRAN(self) && (fortran != PyArray_CORDER))) {
-			incref = TRUE;
-		}
-		else {
-			PyObject *tmp;
-			tmp = PyArray_NewCopy(self, fortran);
-			if (tmp==NULL) return NULL;
-			self = (PyArrayObject *)tmp;
+	flags = self->flags;
+
+	if (strides==NULL) { /* we are really re-shaping not just adding ones
+				to the shape somewhere */		 
+		
+		/* fix any -1 dimensions and check new-dimensions against 
+		   old size */
+		if (_fix_unknown_dimension(newdims, PyArray_SIZE(self)) < 0)
+			return NULL;
+
+		/* sometimes we have to create a new copy of the array
+		   in order to get the right orientation 
+		*/
+		if (!(PyArray_ISONESEGMENT(self)) || 
+		    ((self->nd > 1) && 
+		     ((PyArray_ISCONTIGUOUS(self) && fortran == NPY_FORTRANORDER)
+		      || (PyArray_ISFORTRAN(self) && fortran == NPY_CORDER)))) {
+			PyObject *new;
+			new = PyArray_NewCopy(self, fortran);
+			if (new == NULL) return NULL;
 			incref = FALSE;
+			self = (PyArrayObject *)new;
+			flags = self->flags;
 		}
 
-		if (_fix_unknown_dimension(newdims, PyArray_SIZE(self)) < 0)
-			goto fail;
+		/* We always have to interpret the contiguous buffer correctly
+		 */
+
+		/* Make sure the flags argument is set. 
+		*/
+		if (n > 1) {
+			if (fortran == NPY_FORTRANORDER) {
+				flags &= ~NPY_CONTIGUOUS;
+				flags |= NPY_FORTRAN;
+			}
+			else {
+				flags &= ~NPY_FORTRAN;
+				flags |= NPY_CONTIGUOUS;
+			}
+		}
 	}
 	else if (n > 0) {
 		/* replace any 0-valued strides with
@@ -546,15 +574,15 @@
 					   n, dimensions,
 					   strides,
 					   self->data,
-					   self->flags, (PyObject *)self);
+					   flags, (PyObject *)self);
 
 	if (ret== NULL) goto fail;
 
-        if (incref) Py_INCREF(self);
-        ret->base = (PyObject *)self;
+	if (incref) Py_INCREF(self);
+	ret->base = (PyObject *)self;
 	PyArray_UpdateFlags(ret, CONTIGUOUS | FORTRAN);
 
-        return (PyObject *)ret;
+	return (PyObject *)ret;
 
  fail:
 	if (!incref) {Py_DECREF(self);}



From numpy-svn at scipy.org  Tue Oct 17 12:01:40 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 11:01:40 -0500 (CDT)
Subject: [Numpy-svn] r3347 - in trunk: . numpy/core/tests
Message-ID: <20061017160140.ADD4E39C0D3@new.scipy.org>

Author: oliphant
Date: 2006-10-17 11:01:37 -0500 (Tue, 17 Oct 2006)
New Revision: 3347

Modified:
   trunk/THANKS.txt
   trunk/numpy/core/tests/test_regression.py
Log:
Re-format THANKS.txt and add check for reshape order argument.

Modified: trunk/THANKS.txt
===================================================================
--- trunk/THANKS.txt	2006-10-17 15:53:59 UTC (rev 3346)
+++ trunk/THANKS.txt	2006-10-17 16:01:37 UTC (rev 3347)
@@ -5,17 +5,23 @@
     which gave much inspiration and showed the way forward.
 Paul Dubois for Masked Arrays
 Pearu Peterson for f2py and distutils and help with code organization
-Robert Kern for mtrand, bug fixes, help with distutils, and code organization
+Robert Kern for mtrand, bug fixes, help with distutils, code organization, 
+    and much more. 
 Eric Jones for sundry subroutines
 Fernando Perez for code snippets, ideas, bugfixes, and testing.
 Ed Schofield for matrix.py patches, bugfixes, testing, and docstrings.
 John Hunter for code snippets (from matplotlib)
 Chris Hanley for help with records.py, testing, and bug fixes.
-Travis Vaught and Joe Cooper for administration of numpy.org web site and SVN 
+Travis Vaught, Joe Cooper, Jeff Strunk for administration of 
+    numpy.org web site and SVN 
 Eric Firing for bugfixes.
 Arnd Baecker for 64-bit testing
-David Cooke for many code improvements including the auto-generated C-API, and optimizations.
-Alexander Belopolsky (Sasha) for Masked array bug-fixes and tests, rank-0 array improvements, scalar math help and other code additions
-Francesc Altet for unicode and nested record tests and help with nested records
-Tim Hochberg for getting the build working on MSVC, optimization improvements, and code review
-Charles Harris for the sorting code originally written for Numarray.
+David Cooke for many code improvements including the auto-generated C-API,
+    and optimizations.
+Alexander Belopolsky (Sasha) for Masked array bug-fixes and tests, 
+    rank-0 array improvements, scalar math help and other code additions
+Francesc Altet for unicode and nested record tests 
+    and much help with rooting out nested record array bugs. 
+Tim Hochberg for getting the build working on MSVC, optimization 
+    improvements, and code review
+Charles Harris for the sorting code originally written for Numarray and for    improvements to polyfit, many bug fixes, and documentation strings.

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-17 15:53:59 UTC (rev 3346)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-17 16:01:37 UTC (rev 3347)
@@ -529,6 +529,14 @@
         dt1=N.dtype(('uint32', 2))
         dt2=N.dtype(('uint32', (2,)))        
         assert_equal(dt1.__repr__(), dt2.__repr__())
+
+    def check_reshape_order(self, level=rlevel):
+        """Make sure reshape order works."""
+        a = N.arange(6).reshape(2,3,order='F')
+        assert_equal(a,[[0,2,4],[1,3,5]])
+        a = N.array([[1,2],[3,4],[5,6],[7,8]])
+        b = a[:,1]
+        assert_equal(b.reshape(2,2,order='F'), [[2,6],[4,8]])
                 
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Tue Oct 17 12:07:43 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 11:07:43 -0500 (CDT)
Subject: [Numpy-svn] r3348 - trunk/numpy/core/src
Message-ID: <20061017160743.D9E9039C0D3@new.scipy.org>

Author: oliphant
Date: 2006-10-17 11:07:42 -0500 (Tue, 17 Oct 2006)
New Revision: 3348

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
include <signal.h> when trying check for SIGSEGV

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-17 16:01:37 UTC (rev 3347)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-17 16:07:42 UTC (rev 3348)
@@ -6578,6 +6578,7 @@
 
 #ifndef _MSC_VER
 #include <setjmp.h>
+#include <signal.h>
 jmp_buf _NPY_SIGSEGV_BUF;
 static void
 _SigSegv_Handler(int signum)



From numpy-svn at scipy.org  Tue Oct 17 12:35:25 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 11:35:25 -0500 (CDT)
Subject: [Numpy-svn] r3349 - trunk/numpy/core/src
Message-ID: <20061017163525.7BE9339C01D@new.scipy.org>

Author: oliphant
Date: 2006-10-17 11:35:20 -0500 (Tue, 17 Oct 2006)
New Revision: 3349

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Fix #350 by changing wording.

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-17 16:07:42 UTC (rev 3348)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-17 16:35:20 UTC (rev 3349)
@@ -548,7 +548,7 @@
 		HANDLEIT(DIVIDEBYZERO, "divide by zero");
 		HANDLEIT(OVERFLOW, "overflow");
 		HANDLEIT(UNDERFLOW, "underflow");
-		HANDLEIT(INVALID, "invalid");
+		HANDLEIT(INVALID, "invalid value");
 	}
 	return 0;
 }



From numpy-svn at scipy.org  Tue Oct 17 13:14:28 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 12:14:28 -0500 (CDT)
Subject: [Numpy-svn] r3350 - trunk/numpy/core/src
Message-ID: <20061017171428.179DE39C0FA@new.scipy.org>

Author: oliphant
Date: 2006-10-17 12:14:25 -0500 (Tue, 17 Oct 2006)
New Revision: 3350

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Fix PyArray_FromAny so that it raises an exception on casting unless FORCECAST is True.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-17 16:35:20 UTC (rev 3349)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-17 17:14:25 UTC (rev 3350)
@@ -7757,6 +7757,18 @@
                 itemsize = newtype->elsize;
         }
 
+        /* Can't cast unless ndim-0 array, FORCECAST is specified
+           or the cast is safe.
+        */
+        if (!(flags & FORCECAST) && !PyArray_NDIM(arr)==0 && 
+            !PyArray_CanCastTo(oldtype, newtype)) {
+                Py_DECREF(newtype);
+                PyErr_SetString(PyExc_TypeError,
+                                "array cannot be safely cast "  \
+                                "to required type");
+                return NULL;
+        }
+        
         /* Don't copy if sizes are compatible */
         if ((flags & ENSURECOPY) || PyArray_EquivTypes(oldtype, newtype)) {
                 arrflags = arr->flags;
@@ -7799,7 +7811,7 @@
                    count and return the input */
                 else {
                         Py_DECREF(newtype);
-                        if ((flags & ENSUREARRAY)) {
+                        if ((flags & ENSUREARRAY) && !PyArray_CheckExact(arr)) {
                                 Py_INCREF(arr->descr);
                                 ret = (PyArrayObject *)                 \
                                         PyArray_NewFromDescr(&PyArray_Type,
@@ -7822,47 +7834,32 @@
         /* The desired output type is different than the input
            array type */
         else {
-                /* Cast to the desired type if we can do it safely
-                   Also cast if source is a ndim-0 array to mimic
-                   behavior with Python scalars */
-                if (flags & FORCECAST || PyArray_NDIM(arr)==0 ||
-                    PyArray_CanCastTo(oldtype, newtype)) {
-                        if ((flags & UPDATEIFCOPY) &&           \
-                            (!PyArray_ISWRITEABLE(arr))) {
-                                Py_DECREF(newtype);
-                                PyErr_SetString(PyExc_ValueError, msg);
-                                return NULL;
-                        }
-                        if ((flags & ENSUREARRAY)) {
-                                subtype = &PyArray_Type;
-                        }
-                        ret = (PyArrayObject *)\
-                                PyArray_NewFromDescr(subtype,
-                                                     newtype,
-                                                     arr->nd,
-                                                     arr->dimensions,
-                                                     NULL, NULL,
-                                                     flags & FORTRAN,
-                                                     (PyObject *)arr);
-                        if (ret == NULL) return NULL;
-                        if (PyArray_CastTo(ret, arr) < 0) {
-                                Py_DECREF(ret);
-                                return NULL;
-                        }
-                        if (flags & UPDATEIFCOPY)  {
-                                ret->flags |= UPDATEIFCOPY;
-                                ret->base = (PyObject *)arr;
-                                PyArray_FLAGS(ret->base) &= ~WRITEABLE;
-                                Py_INCREF(arr);
-                        }
-                }
-                else {
+                if ((flags & UPDATEIFCOPY) &&                   \
+                    (!PyArray_ISWRITEABLE(arr))) {
                         Py_DECREF(newtype);
-                        PyErr_SetString(PyExc_TypeError,
-                                        "array cannot be safely cast " \
-                                        "to required type");
-                        ret = NULL;
+                        PyErr_SetString(PyExc_ValueError, msg);
+                        return NULL;
                 }
+                if ((flags & ENSUREARRAY)) {
+                        subtype = &PyArray_Type;
+                }
+                ret = (PyArrayObject *)                         \
+                        PyArray_NewFromDescr(subtype, newtype,
+                                             arr->nd, arr->dimensions,
+                                             NULL, NULL,
+                                             flags & FORTRAN,
+                                             (PyObject *)arr);
+                if (ret == NULL) return NULL;
+                if (PyArray_CastTo(ret, arr) < 0) {
+                        Py_DECREF(ret);
+                        return NULL;
+                }
+                if (flags & UPDATEIFCOPY)  {
+                        ret->flags |= UPDATEIFCOPY;
+                        ret->base = (PyObject *)arr;
+                        PyArray_FLAGS(ret->base) &= ~WRITEABLE;
+                        Py_INCREF(arr);
+                }
         }
         return (PyObject *)ret;
 }



From numpy-svn at scipy.org  Tue Oct 17 13:19:32 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 12:19:32 -0500 (CDT)
Subject: [Numpy-svn] r3351 - trunk/numpy/core/src
Message-ID: <20061017171932.86F6339C0F6@new.scipy.org>

Author: oliphant
Date: 2006-10-17 12:19:29 -0500 (Tue, 17 Oct 2006)
New Revision: 3351

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Change the 'array' function so that forcecast is true.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-17 17:14:25 UTC (rev 3350)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-17 17:19:29 UTC (rev 3351)
@@ -5259,6 +5259,8 @@
                 flags |= ENSUREARRAY;
         }
 
+        flags |= NPY_FORCECAST;
+
         ret = PyArray_CheckFromAny(op, type, 0, 0, flags, NULL);
 
  finish:



From numpy-svn at scipy.org  Tue Oct 17 17:43:16 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 16:43:16 -0500 (CDT)
Subject: [Numpy-svn] r3352 - trunk/numpy/core/src
Message-ID: <20061017214316.7537039C0ED@new.scipy.org>

Author: oliphant
Date: 2006-10-17 16:43:08 -0500 (Tue, 17 Oct 2006)
New Revision: 3352

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/multiarraymodule.c
Log:
Allow ability to reset the string function to the builtin string function.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-17 17:19:29 UTC (rev 3351)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-17 21:43:08 UTC (rev 3352)
@@ -4082,7 +4082,7 @@
 }
 
 static PyObject *
-array_repr_builtin(PyArrayObject *self)
+array_repr_builtin(PyArrayObject *self, int repr)
 {
         PyObject *ret;
         char *string;
@@ -4095,27 +4095,35 @@
                 return NULL;
         }
 
-        n = 6;
-        sprintf(string, "array(");
-
+        if (repr) {
+                n = 6;
+                sprintf(string, "array(");
+        }
+        else {
+                n = 0;
+        }
         if (dump_data(&string, &n, &max_n, self->data,
                       self->nd, self->dimensions,
                       self->strides, self) < 0) {
                 _pya_free(string); return NULL;
         }
 
-        if (PyArray_ISEXTENDED(self)) {
-                char buf[100];
-                snprintf(buf, sizeof(buf), "%d", self->descr->elsize);
-                sprintf(string+n, ", '%c%s')", self->descr->type, buf);
-                ret = PyString_FromStringAndSize(string, n+6+strlen(buf));
+        if (repr) {
+                if (PyArray_ISEXTENDED(self)) {
+                        char buf[100];
+                        snprintf(buf, sizeof(buf), "%d", self->descr->elsize);
+                        sprintf(string+n, ", '%c%s')", self->descr->type, buf);
+                        ret = PyString_FromStringAndSize(string, n+6+strlen(buf));
+                }
+                else {
+                        sprintf(string+n, ", '%c')", self->descr->type);
+                        ret = PyString_FromStringAndSize(string, n+6);
+                }
         }
         else {
-                sprintf(string+n, ", '%c')", self->descr->type);
-                ret = PyString_FromStringAndSize(string, n+6);
+                ret = PyString_FromStringAndSize(string, n);
         }
 
-
         _pya_free(string);
         return ret;
 }
@@ -4152,7 +4160,7 @@
         PyObject *s, *arglist;
 
         if (PyArray_ReprFunction == NULL) {
-                s = array_repr_builtin(self);
+                s = array_repr_builtin(self, 1);
         } else {
                 arglist = Py_BuildValue("(O)", self);
                 s = PyEval_CallObject(PyArray_ReprFunction, arglist);
@@ -4167,7 +4175,7 @@
         PyObject *s, *arglist;
 
         if (PyArray_StrFunction == NULL) {
-                s = array_repr(self);
+                s = array_repr_builtin(self, 0);
         } else {
                 arglist = Py_BuildValue("(O)", self);
                 s = PyEval_CallObject(PyArray_StrFunction, arglist);

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-17 17:19:29 UTC (rev 3351)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-17 21:43:08 UTC (rev 3352)
@@ -6411,13 +6411,16 @@
 static PyObject *
 array_set_string_function(PyObject *dummy, PyObject *args, PyObject *kwds)
 {
-	PyObject *op;
+	PyObject *op=NULL;
 	int repr=1;
 	static char *kwlist[] = {"f", "repr", NULL};
 
-	if(!PyArg_ParseTupleAndKeywords(args, kwds, "O|i", kwlist,
+	if(!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi", kwlist,
 					&op, &repr)) return NULL;
-	if (!PyCallable_Check(op)) {
+
+        /* reset the array_repr function to built-in */
+        if (op == Py_None) op = NULL;
+	if (op != NULL && !PyCallable_Check(op)) {
 		PyErr_SetString(PyExc_TypeError,
 				"Argument must be callable.");
 		return NULL;



From numpy-svn at scipy.org  Tue Oct 17 19:53:55 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 18:53:55 -0500 (CDT)
Subject: [Numpy-svn] r3353 - in trunk/numpy/core: . include/numpy src
Message-ID: <20061017235355.9FBDA39C08A@new.scipy.org>

Author: oliphant
Date: 2006-10-17 18:53:52 -0500 (Tue, 17 Oct 2006)
New Revision: 3353

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
   trunk/numpy/core/numeric.py
   trunk/numpy/core/src/ufuncobject.c
Log:
Increase the C-API and allow ufuncs to be given keyword arguments.  Re-compile extension modules after updating to this revision number.  extobj= and dtype= keywords are possible, but only extobj= is implemented in this revision.

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-17 21:43:08 UTC (rev 3352)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-17 23:53:52 UTC (rev 3353)
@@ -30,7 +30,7 @@
 #define NPY_SUCCEED 1
 
         /* Helpful to distinguish what is installed */
-#define NPY_VERSION 0x01000002
+#define NPY_VERSION 0x01000008
 
         /* Some platforms don't define bool, long long, or long double.
            Handle that here.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-17 21:43:08 UTC (rev 3352)
+++ trunk/numpy/core/numeric.py	2006-10-17 23:53:52 UTC (rev 3353)
@@ -156,16 +156,11 @@
         return asanyarray(a, dtype=dtype)
 
     if 'ENSUREARRAY' in requirements or 'E' in requirements:
-        func = asarray
+        subok = 0
     else:
-        func = asanyarray
+        subok = 1
 
-    if 'FORCECAST' in requirements or 'FORCE' in requirements:
-        arr = func(a)
-        if dtype is not None and arr.dtype != dtype:
-            arr = arr.astype(dtype)
-    else:
-        arr = func(a, dtype=dtype)
+    arr = array(a, dtype=dtype, copy=False, subok=subok)
 
     copychar = 'A'
     if 'FORTRAN' in requirements or 'F' in requirements:
@@ -180,7 +175,7 @@
     return arr   
 
 def isfortran(a):
-    """Returns True if 'a' is laid out in Fortran-order in memory.
+    """Returns True if 'a' is laid out in Fortran-order in memory (and a.ndim > 1)
     """
     return a.flags.fnc
 

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-17 21:43:08 UTC (rev 3352)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-17 23:53:52 UTC (rev 3353)
@@ -664,12 +664,19 @@
 static int
 select_types(PyUFuncObject *self, int *arg_types,
              PyUFuncGenericFunction *function, void **data,
-	     PyArray_SCALARKIND *scalars)
+	     PyArray_SCALARKIND *scalars,
+             PyArray_Descr *dtype)
 {
 	int i, j;
 	char start_type;
 	int userdef=-1;
 
+        /*
+          if (dtype != NULL)
+          return extract_specified_loop(self, arg_types, function, data,
+          scalars, dtype)
+        */
+
 	if (self->userloops) {
 		for (i=0; i<self->nin; i++) {
 			if (PyTypeNum_ISUSERDEF(arg_types[i])) {
@@ -745,37 +752,11 @@
 static PyObject *PyUFunc_PYVALS_NAME=NULL;
 
 
-/*UFUNC_API*/
 static int
-PyUFunc_GetPyValues(char *name, int *bufsize, int *errmask, PyObject **errobj)
+_extract_pyvals(PyObject *ref, char *name, int *bufsize, int *errmask, PyObject **errobj)
 {
-        PyObject *thedict;
-        PyObject *ref=NULL;
-	PyObject *retval;
+        PyObject *retval;
 
-        #if USE_USE_DEFAULTS==1
-	if (PyUFunc_NUM_NODEFAULTS != 0) {
-        #endif
-		if (PyUFunc_PYVALS_NAME == NULL) {
-			PyUFunc_PYVALS_NAME = \
-				PyString_InternFromString(UFUNC_PYVALS_NAME);
-		}
-		thedict = PyThreadState_GetDict();
-		if (thedict == NULL) {
-			thedict = PyEval_GetBuiltins();
-		}
-		ref = PyDict_GetItem(thedict, PyUFunc_PYVALS_NAME);
-        #if USE_USE_DEFAULTS==1
-	}
-        #endif
-	if (ref == NULL) {
-		*errmask = UFUNC_ERR_DEFAULT;
-		*errobj = Py_BuildValue("NO",
-					PyString_FromString(name),
-					Py_None);
-		*bufsize = PyArray_BUFSIZE;
-		return 0;
-	}
 	*errobj = NULL;
 	if (!PyList_Check(ref) || (PyList_GET_SIZE(ref)!=3)) {
 		PyErr_Format(PyExc_TypeError, "%s must be a length 3 list.",
@@ -820,6 +801,41 @@
 	return 0;
 }
 
+
+
+/*UFUNC_API*/
+static int
+PyUFunc_GetPyValues(char *name, int *bufsize, int *errmask, PyObject **errobj)
+{
+        PyObject *thedict;
+        PyObject *ref=NULL;
+
+        #if USE_USE_DEFAULTS==1
+	if (PyUFunc_NUM_NODEFAULTS != 0) {
+        #endif
+		if (PyUFunc_PYVALS_NAME == NULL) {
+			PyUFunc_PYVALS_NAME = \
+				PyString_InternFromString(UFUNC_PYVALS_NAME);
+		}
+		thedict = PyThreadState_GetDict();
+		if (thedict == NULL) {
+			thedict = PyEval_GetBuiltins();
+		}
+		ref = PyDict_GetItem(thedict, PyUFunc_PYVALS_NAME);
+        #if USE_USE_DEFAULTS==1
+	}
+        #endif
+	if (ref == NULL) {
+		*errmask = UFUNC_ERR_DEFAULT;
+		*errobj = Py_BuildValue("NO",
+					PyString_FromString(name),
+					Py_None);
+		*bufsize = PyArray_BUFSIZE;
+		return 0;
+	}
+        return _extract_pyvals(ref, name, bufsize, errmask, errobj);
+}
+
 /* Create copies for any arrays that are less than loop->bufsize
    in total size and are mis-behaved or in need
    of casting.
@@ -891,7 +907,8 @@
 #undef _GETATTR_
 
 static int
-construct_arrays(PyUFuncLoopObject *loop, PyObject *args, PyArrayObject **mps)
+construct_arrays(PyUFuncLoopObject *loop, PyObject *args, PyArrayObject **mps,
+                 PyArray_Descr *dtype)
 {
         int nargs, i, maxsize;
         int arg_types[NPY_MAXARGS];
@@ -959,13 +976,13 @@
 
         /* Select an appropriate function for these argument types. */
         if (select_types(loop->ufunc, arg_types, &(loop->function),
-                         &(loop->funcdata), scalars) == -1)
+                         &(loop->funcdata), scalars, dtype) == -1)
 		return -1;
 
         /* FAIL with NotImplemented if the other object has
 	   the __r<op>__ method and has __array_priority__ as
 	   an attribute (signalling it can handle ndarray's)
-	   and is not already an ndarray or bigndarray
+	   and is not already an ndarray
 	*/
         if ((arg_types[1] == PyArray_OBJECT) &&				\
             (loop->ufunc->nin==2) && (loop->ufunc->nout == 1)) {
@@ -1355,10 +1372,13 @@
 }
 
 static PyUFuncLoopObject *
-construct_loop(PyUFuncObject *self, PyObject *args, PyArrayObject **mps)
+construct_loop(PyUFuncObject *self, PyObject *args, PyObject *kwds, PyArrayObject **mps)
 {
 	PyUFuncLoopObject *loop;
 	int i;
+        PyArray_Descr *dtype=NULL;
+        PyObject *extobj=NULL;
+        char *name;
 
 	if (self == NULL) {
 		PyErr_SetString(PyExc_ValueError, "function not supported");
@@ -1379,12 +1399,48 @@
 	loop->errobj = NULL;
         loop->notimplemented = 0;
 
-	if (PyUFunc_GetPyValues((self->name ? self->name : ""),
-				&(loop->bufsize), &(loop->errormask),
-				&(loop->errobj)) < 0) goto fail;
 
+        /* Extract dtype= keyword and
+           extobj= keyword if present
+           Raise an error if anything else present in the keyword dictionary
+        */
+        if (kwds != NULL) {
+                PyObject *key, *value;
+                Py_ssize_t pos;
+                while (PyDict_Next(kwds, &pos, &key, &value)) {
+                        if (!PyString_Check(key)) {
+                                PyErr_SetString(PyExc_TypeError, "invalid keyword");
+                                goto fail;
+                        }
+                        if (strncmp(PyString_AS_STRING(key), "extobj", 6) == 0) {
+                                extobj = value;
+                        }
+                        else if (strncmp(PyString_AS_STRING(key), "dtype", 5) == 0) {
+                                if (PyArray_DescrConverter2(value, &dtype) == PY_FAIL)
+                                        goto fail;
+                        }
+                        else {
+                                PyErr_Format(PyExc_TypeError, "'%s' is an invalid keyword",
+                                             PyString_AS_STRING(key));
+                                goto fail;
+                        }
+                }
+        }
+
+        name = self->name ? self->name : "";
+        if (extobj == NULL) {
+                if (PyUFunc_GetPyValues(name,
+                                        &(loop->bufsize), &(loop->errormask),
+                                        &(loop->errobj)) < 0) goto fail;
+        }
+        else {
+                if (_extract_pyvals(extobj, name,
+                                    &(loop->bufsize), &(loop->errormask),
+                                    &(loop->errobj)) < 0) goto fail;
+        }
+        
 	/* Setup the arrays */
-	if (construct_arrays(loop, args, mps) < 0) goto fail;
+	if (construct_arrays(loop, args, mps, dtype) < 0) goto fail;
 
 	PyUFunc_clearfperr();
 
@@ -1465,14 +1521,14 @@
 
 /*UFUNC_API*/
 static int
-PyUFunc_GenericFunction(PyUFuncObject *self, PyObject *args,
+PyUFunc_GenericFunction(PyUFuncObject *self, PyObject *args, PyObject *kwds,
 			PyArrayObject **mps)
 {
 	PyUFuncLoopObject *loop;
 	int i;
         NPY_BEGIN_THREADS_DEF
 
-	if (!(loop = construct_loop(self, args, mps))) return -1;
+        if (!(loop = construct_loop(self, args, kwds, mps))) return -1;
         if (loop->notimplemented) {ufuncloop_dealloc(loop); return -2;}
 
 	NPY_LOOP_BEGIN_THREADS
@@ -1833,7 +1889,7 @@
 	loop->instrides = (*arr)->strides[axis];
 
 	if (select_types(loop->ufunc, arg_types, &(loop->function),
-			 &(loop->funcdata), scalars) == -1) goto fail;
+			 &(loop->funcdata), scalars, NULL) == -1) goto fail;
 
 	/* output type may change -- if it does
 	 reduction is forced into that type
@@ -1844,7 +1900,7 @@
 		arg_types[0] = otype;
 		arg_types[1] = otype;
 		if (select_types(loop->ufunc, arg_types, &(loop->function),
-				 &(loop->funcdata), scalars) == -1)
+				 &(loop->funcdata), scalars, NULL) == -1)
 			goto fail;
 	}
 
@@ -2769,7 +2825,7 @@
 }
 
 static PyObject *
-ufunc_generic_call(PyUFuncObject *self, PyObject *args)
+ufunc_generic_call(PyUFuncObject *self, PyObject *args, PyObject *kwds)
 {
 	int i;
 	PyTupleObject *ret;
@@ -2783,7 +2839,7 @@
 	   if something goes wrong. */
 	for(i=0; i<self->nargs; i++) mps[i] = NULL;
 
-        errval = PyUFunc_GenericFunction(self, args, mps);
+        errval = PyUFunc_GenericFunction(self, args, kwds, mps);
         if (errval < 0) {
 		for(i=0; i<self->nargs; i++) {
 			PyArray_XDECREF_ERR(mps[i]);
@@ -3317,7 +3373,7 @@
  */
 
 static PyObject *
-ufunc_outer(PyUFuncObject *self, PyObject *args)
+ufunc_outer(PyUFuncObject *self, PyObject *args, PyObject *kwds)
 {
 	int i;
 	PyObject *ret;
@@ -3376,7 +3432,7 @@
 	Py_DECREF(ap1);
 	Py_DECREF(ap2);
 	Py_DECREF(ap_new);
-	ret = ufunc_generic_call(self, new_args);
+	ret = ufunc_generic_call(self, new_args, kwds);
 	Py_DECREF(new_args);
 	return ret;
 
@@ -3385,7 +3441,6 @@
 	Py_XDECREF(ap2);
 	Py_XDECREF(ap_new);
 	return NULL;
-
 }
 
 
@@ -3416,7 +3471,7 @@
 	 METH_VARARGS | METH_KEYWORDS},
 	{"reduceat",  (PyCFunction)ufunc_reduceat,
 	 METH_VARARGS | METH_KEYWORDS},
-	{"outer", (PyCFunction)ufunc_outer, METH_VARARGS},
+	{"outer", (PyCFunction)ufunc_outer, METH_VARARGS | METH_KEYWORDS},
 	{NULL,		NULL}		/* sentinel */
 };
 
@@ -3590,7 +3645,7 @@
 	0,		               /*tp_as_sequence*/
 	0,		               /*tp_as_mapping*/
 	(hashfunc)0,		       /*tp_hash*/
-	(ternaryfunc)ufunc_generic_call,		/*tp_call*/
+	(ternaryfunc)ufunc_generic_call, /*tp_call*/
 	(reprfunc)ufunc_repr,	       /*tp_str*/
         0,	          	       /* tp_getattro */
         0,			       /* tp_setattro */



From numpy-svn at scipy.org  Wed Oct 18 00:44:33 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 17 Oct 2006 23:44:33 -0500 (CDT)
Subject: [Numpy-svn] r3354 - in trunk/numpy/core: . src
Message-ID: <20061018044433.D538139C034@new.scipy.org>

Author: oliphant
Date: 2006-10-17 23:44:28 -0500 (Tue, 17 Oct 2006)
New Revision: 3354

Modified:
   trunk/numpy/core/_internal.py
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix so that reshape copies fewer times. Fix so that arr.ctypes.data returns the integer and arr.ctypes._as_parameter_ returns the c_void_p type

Modified: trunk/numpy/core/_internal.py
===================================================================
--- trunk/numpy/core/_internal.py	2006-10-17 23:53:52 UTC (rev 3353)
+++ trunk/numpy/core/_internal.py	2006-10-18 04:44:28 UTC (rev 3354)
@@ -248,7 +248,7 @@
         return (obj*self._arr.ndim)(*self._arr.strides)
     
     def get_data(self):
-        return self._ctypes.c_void_p(self._data)
+        return self._data
 
     def get_shape(self):
         if self._zerod: 
@@ -261,7 +261,7 @@
         return (_getintp_ctype()*self._arr.ndim)(*self._arr.strides)
 
     def get_as_parameter(self):
-        return self._data
+        return self._ctypes.c_void_p(self._data)
     
     data = property(get_data, None, doc="c-types data")
     shape = property(get_shape, None, doc="c-types shape")

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-17 23:53:52 UTC (rev 3353)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-18 04:44:28 UTC (rev 3354)
@@ -7819,7 +7819,8 @@
                    count and return the input */
                 else {
                         Py_DECREF(newtype);
-                        if ((flags & ENSUREARRAY) && !PyArray_CheckExact(arr)) {
+                        if ((flags & ENSUREARRAY) && 
+                            !PyArray_CheckExact(arr)) {
                                 Py_INCREF(arr->descr);
                                 ret = (PyArrayObject *)                 \
                                         PyArray_NewFromDescr(&PyArray_Type,
@@ -7840,7 +7841,7 @@
         }
 
         /* The desired output type is different than the input
-           array type */
+           array type and copy was not specified */
         else {
                 if ((flags & UPDATEIFCOPY) &&                   \
                     (!PyArray_ISWRITEABLE(arr))) {

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-17 23:53:52 UTC (rev 3353)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-18 04:44:28 UTC (rev 3354)
@@ -454,6 +454,25 @@
 	return 0;
 }
 
+/* returns True if self->nd > 1 and all 
+   there is more than one dimension filled with 1.
+ */
+static int
+_nd_bigger_than_one(PyArrayObject *arr)
+{
+        int i, nd;
+        int count=0;
+        nd = arr->nd;
+        if (nd > 1) {
+                for (i=0; i<nd; i++) {
+                        if (arr->dimensions[i] > 1)
+                                count++;
+                        if (count > 1) return 1;
+                }
+        }
+        return 0;
+}
+
 /* Returns a new array
    with the new shape from the data
    in the old array --- order-perspective depends on fortran argument.
@@ -514,12 +533,16 @@
 			return NULL;
 
 		/* sometimes we have to create a new copy of the array
-		   in order to get the right orientation 
+		   in order to get the right orientation and
+                   because we can't just re-use the buffer with the 
+                   data in the order it is in.
 		*/
 		if (!(PyArray_ISONESEGMENT(self)) || 
-		    ((self->nd > 1) && 
-		     ((PyArray_ISCONTIGUOUS(self) && fortran == NPY_FORTRANORDER)
-		      || (PyArray_ISFORTRAN(self) && fortran == NPY_CORDER)))) {
+                    (((PyArray_CHKFLAGS(self, NPY_CONTIGUOUS) && 
+                       fortran == NPY_FORTRANORDER)
+                      || (PyArray_CHKFLAGS(self, NPY_FORTRAN) && 
+                          fortran == NPY_CORDER)) && 
+                     _nd_bigger_than_one(self))) {
 			PyObject *new;
 			new = PyArray_NewCopy(self, fortran);
 			if (new == NULL) return NULL;



From numpy-svn at scipy.org  Wed Oct 18 02:38:31 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 01:38:31 -0500 (CDT)
Subject: [Numpy-svn] r3355 - trunk/numpy/core/src
Message-ID: <20061018063831.E08CC39C035@new.scipy.org>

Author: oliphant
Date: 2006-10-18 01:38:26 -0500 (Wed, 18 Oct 2006)
New Revision: 3355

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Add ability to select specific 1-d loop to use when calling a ufunc, either by the output type or an exact signature.  An error occurs if a 1-d loop is not found to match the specification.

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-18 04:44:28 UTC (rev 3354)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-18 06:38:26 UTC (rev 3355)
@@ -657,6 +657,142 @@
         return -1;
 }
 
+/* if only one type is specified then it is the "first" output data-type
+   and the first signature matching this output data-type is returned. 
+   
+   if a tuple of types is specified then an exact match to the signature
+   is searched and it much match exactly or an error occurs
+*/
+static int
+extract_specified_loop(PyUFuncObject *self, int *arg_types, 
+                       PyUFuncGenericFunction *function, void **data,
+                       PyObject *type_tup, int userdef)
+{
+        Py_ssize_t n=1;
+        int *rtypenums;
+        static char msg[] = "loop written to specified type(s) not found";
+        PyArray_Descr *dtype;
+        int nargs;
+        int i, j;
+
+        nargs = self->nargs;
+ 
+        if (PyTuple_Check(type_tup)) {
+                n = PyTuple_GET_SIZE(type_tup);
+                if (n != 1 && n != nargs) {
+                        PyErr_Format(PyExc_ValueError, 
+                                     "a type-tuple must be specified "  \
+                                     "of length 1 or %d for %s", nargs, 
+                                     self->name ? self->name : "(unknown)");
+                        return -1;
+                }
+        }
+        else {
+                n = 1;
+        }
+        rtypenums = (int *)_pya_malloc(n*sizeof(int));
+        if (rtypenums==NULL) {
+                PyErr_NoMemory();
+                return -1;
+        }
+        
+        if (PyTuple_Check(type_tup)) {
+                for (i=0; i<n; i++) {
+                        if (PyArray_DescrConverter(PyTuple_GET_ITEM     \
+                                                   (type_tup, i),
+                                                   &dtype) == NPY_FAIL) 
+                                goto fail;
+                        rtypenums[i] = dtype->type_num;
+                        Py_DECREF(dtype);
+                }
+        }
+        else {
+                if (PyArray_DescrConverter(type_tup, &dtype) == NPY_FAIL) {
+                        goto fail;
+                }
+                rtypenums[0] = dtype->type_num;
+                Py_DECREF(dtype);
+        }
+
+        if (userdef > 0) { /* search in the user-defined functions */
+		PyObject *key, *obj;
+                PyUFunc_Loop1d *funcdata;
+		obj = NULL;
+		key = PyInt_FromLong((long) userdef);
+		if (key == NULL) goto fail;
+		obj = PyDict_GetItem(self->userloops, key);
+		Py_DECREF(key);
+		if (obj == NULL) {
+			PyErr_SetString(PyExc_TypeError,
+					"user-defined type used in ufunc" \
+					" with no registered loops");
+                        goto fail;
+		}
+                /* extract the correct function
+                   data and argtypes
+                */
+                funcdata = (PyUFunc_Loop1d *)PyCObject_AsVoidPtr(obj);
+                while (funcdata != NULL) {
+                        if (n != 1) {
+                                for (i=0; i<nargs; i++) {
+                                        if (rtypenums[i] != funcdata->arg_types[i])
+                                                break;
+                                }
+                        }
+                        else if (rtypenums[0] == funcdata->arg_types[self->nin]) {
+                                i = nargs;
+                        }
+                        if (i == nargs) {
+                                *function = funcdata->func;
+                                *data = funcdata->data;
+                                for (i=0; i<nargs; i++) {
+                                        arg_types[i] = funcdata->arg_types[i];
+                                }
+                                Py_DECREF(obj);
+                                goto finish;
+                        }
+                        funcdata = funcdata->next;
+                }
+                Py_DECREF(obj);
+                PyErr_SetString(PyExc_TypeError, msg);
+                goto fail;
+        }
+
+        /* look for match in self->functions */
+
+        for (j=0; j<self->ntypes; j++) {
+                if (n != 1) {
+                        for (i=0; i<nargs; i++) {
+                                if (rtypenums[i] != self->types[j*nargs + i])
+                                        break;
+                        }
+                }
+                else if (rtypenums[0] == self->types[j*nargs+self->nin]) {
+                        i = nargs;
+                }
+                if (i == nargs) {
+                        *function = self->functions[j];
+                        *data = self->data[j];
+                        for (i=0; i<nargs; i++) {
+                                arg_types[i] = self->types[j*nargs+i];
+                        }
+                        goto finish;
+                }
+        }
+        PyErr_SetString(PyExc_TypeError, msg);
+
+ fail:
+        _pya_free(rtypenums);
+        return -1;
+
+ finish:
+        _pya_free(rtypenums);
+        return 0;
+
+                
+}
+
+
 /* Called to determine coercion
    Can change arg_types. 
  */
@@ -665,18 +801,12 @@
 select_types(PyUFuncObject *self, int *arg_types,
              PyUFuncGenericFunction *function, void **data,
 	     PyArray_SCALARKIND *scalars,
-             PyArray_Descr *dtype)
+             PyObject *typetup)
 {
 	int i, j;
 	char start_type;
 	int userdef=-1;
 
-        /*
-          if (dtype != NULL)
-          return extract_specified_loop(self, arg_types, function, data,
-          scalars, dtype)
-        */
-
 	if (self->userloops) {
 		for (i=0; i<self->nin; i++) {
 			if (PyTypeNum_ISUSERDEF(arg_types[i])) {
@@ -685,7 +815,11 @@
 			}
 		}
 	}
-
+        
+        if (typetup != NULL)
+                return extract_specified_loop(self, arg_types, function, data,
+                                              typetup, userdef);
+                        
 	if (userdef > 0) {
 		PyObject *key, *obj;
                 int ret;
@@ -753,7 +887,8 @@
 
 
 static int
-_extract_pyvals(PyObject *ref, char *name, int *bufsize, int *errmask, PyObject **errobj)
+_extract_pyvals(PyObject *ref, char *name, int *bufsize, 
+                int *errmask, PyObject **errobj)
 {
         PyObject *retval;
 
@@ -908,7 +1043,7 @@
 
 static int
 construct_arrays(PyUFuncLoopObject *loop, PyObject *args, PyArrayObject **mps,
-                 PyArray_Descr *dtype)
+                 PyObject *typetup)
 {
         int nargs, i, maxsize;
         int arg_types[NPY_MAXARGS];
@@ -976,7 +1111,7 @@
 
         /* Select an appropriate function for these argument types. */
         if (select_types(loop->ufunc, arg_types, &(loop->function),
-                         &(loop->funcdata), scalars, dtype) == -1)
+                         &(loop->funcdata), scalars, typetup) == -1)
 		return -1;
 
         /* FAIL with NotImplemented if the other object has
@@ -1376,7 +1511,7 @@
 {
 	PyUFuncLoopObject *loop;
 	int i;
-        PyArray_Descr *dtype=NULL;
+        PyObject *typetup=NULL;
         PyObject *extobj=NULL;
         char *name;
 
@@ -1416,8 +1551,7 @@
                                 extobj = value;
                         }
                         else if (strncmp(PyString_AS_STRING(key), "dtype", 5) == 0) {
-                                if (PyArray_DescrConverter2(value, &dtype) == PY_FAIL)
-                                        goto fail;
+                                typetup = value;
                         }
                         else {
                                 PyErr_Format(PyExc_TypeError, "'%s' is an invalid keyword",
@@ -1440,7 +1574,7 @@
         }
         
 	/* Setup the arrays */
-	if (construct_arrays(loop, args, mps, dtype) < 0) goto fail;
+	if (construct_arrays(loop, args, mps, typetup) < 0) goto fail;
 
 	PyUFunc_clearfperr();
 
@@ -3134,10 +3268,10 @@
 	/* Find the location of the matching signature */
 	for (i=0; i<func->ntypes; i++) {
 		for (j=0; j<func->nargs; j++) {
-			if (signature[j] == func->types[i*func->nargs+j])
+			if (signature[j] != func->types[i*func->nargs+j])
 				break;
 		}
-		if (j >= func->nargs) continue;
+		if (j < func->nargs) continue;
 		
 		if (oldfunc != NULL) {
 			*oldfunc = func->functions[i];
@@ -3147,7 +3281,6 @@
                 break;
 	}
 	return res;
-
 }
 
 /*UFUNC_API*/



From numpy-svn at scipy.org  Wed Oct 18 03:08:19 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 02:08:19 -0500 (CDT)
Subject: [Numpy-svn] r3356 - trunk/numpy/core/src
Message-ID: <20061018070819.D196939C0CE@new.scipy.org>

Author: oliphant
Date: 2006-10-18 02:08:13 -0500 (Wed, 18 Oct 2006)
New Revision: 3356

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Allow entry in self->types to type= keyword.  Change from dtype= keyword because it doesn't always follow the rules of data-type conversion.

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-18 06:38:26 UTC (rev 3355)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-18 07:08:13 UTC (rev 3356)
@@ -674,6 +674,7 @@
         PyArray_Descr *dtype;
         int nargs;
         int i, j;
+        int strtype=0;
 
         nargs = self->nargs;
  
@@ -681,14 +682,35 @@
                 n = PyTuple_GET_SIZE(type_tup);
                 if (n != 1 && n != nargs) {
                         PyErr_Format(PyExc_ValueError, 
-                                     "a type-tuple must be specified "  \
+                                     "a type-tuple must be specified " \
                                      "of length 1 or %d for %s", nargs, 
                                      self->name ? self->name : "(unknown)");
                         return -1;
                 }
         }
-        else {
-                n = 1;
+        else if PyString_Check(type_tup) {
+                int slen;
+                char *thestr;
+                slen = PyString_GET_SIZE(type_tup);
+                thestr = PyString_AS_STRING(type_tup);
+                for (i=0; i < slen-2; i++) {
+                        if (thestr[i] == '-' && thestr[i+1] == '>')
+                                break;
+                }
+                if (i < slen-2) {
+                        strtype = 1;
+                        n = slen-2;
+                        if (i != self->nin || 
+                            slen-2-i != self->nout) {
+                                PyErr_Format(PyExc_ValueError, 
+                                             "a type-string for %s, "   \
+                                             "requires %d typecode(s) before " \
+                                             "and %d after the -> sign", 
+                                             self->name ? self->name : "(unknown)",
+                                             self->nin, self->nout);
+                                return -1;
+                        } 
+                }
         }
         rtypenums = (int *)_pya_malloc(n*sizeof(int));
         if (rtypenums==NULL) {
@@ -696,7 +718,23 @@
                 return -1;
         }
         
-        if (PyTuple_Check(type_tup)) {
+        if (strtype) {
+                char *ptr;
+                ptr = PyString_AS_STRING(type_tup);
+                i = 0;
+                while (i < n) {
+                        if (*ptr == '-' || *ptr == '>') { 
+                                ptr++;
+                                continue;
+                        }
+                        dtype = PyArray_DescrFromType((int) *ptr);
+                        if (dtype == NULL) goto fail;
+                        rtypenums[i] = dtype->type_num;
+                        Py_DECREF(dtype);
+                        ptr++; i++;
+                }
+        }
+        else if (PyTuple_Check(type_tup)) {
                 for (i=0; i<n; i++) {
                         if (PyArray_DescrConverter(PyTuple_GET_ITEM     \
                                                    (type_tup, i),
@@ -781,6 +819,7 @@
         }
         PyErr_SetString(PyExc_TypeError, msg);
 
+
  fail:
         _pya_free(rtypenums);
         return -1;
@@ -788,7 +827,6 @@
  finish:
         _pya_free(rtypenums);
         return 0;
-
                 
 }
 
@@ -1534,8 +1572,9 @@
 	loop->errobj = NULL;
         loop->notimplemented = 0;
 
+        name = self->name ? self->name : "";
 
-        /* Extract dtype= keyword and
+        /* Extract type= keyword and
            extobj= keyword if present
            Raise an error if anything else present in the keyword dictionary
         */
@@ -1550,18 +1589,18 @@
                         if (strncmp(PyString_AS_STRING(key), "extobj", 6) == 0) {
                                 extobj = value;
                         }
-                        else if (strncmp(PyString_AS_STRING(key), "dtype", 5) == 0) {
+                        else if (strncmp(PyString_AS_STRING(key), "type", 5) == 0) {
                                 typetup = value;
                         }
                         else {
-                                PyErr_Format(PyExc_TypeError, "'%s' is an invalid keyword",
-                                             PyString_AS_STRING(key));
+                                PyErr_Format(PyExc_TypeError, 
+                                             "'%s' is an invalid keyword to %s",
+                                             PyString_AS_STRING(key), name);
                                 goto fail;
                         }
                 }
         }
 
-        name = self->name ? self->name : "";
         if (extobj == NULL) {
                 if (PyUFunc_GetPyValues(name,
                                         &(loop->bufsize), &(loop->errormask),



From numpy-svn at scipy.org  Wed Oct 18 03:09:23 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 02:09:23 -0500 (CDT)
Subject: [Numpy-svn] r3357 - trunk/numpy/core/src
Message-ID: <20061018070923.22C6439C035@new.scipy.org>

Author: oliphant
Date: 2006-10-18 02:09:19 -0500 (Wed, 18 Oct 2006)
New Revision: 3357

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Change to sig (signature) keyword.

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-18 07:08:13 UTC (rev 3356)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-18 07:09:19 UTC (rev 3357)
@@ -1574,7 +1574,7 @@
 
         name = self->name ? self->name : "";
 
-        /* Extract type= keyword and
+        /* Extract sig= keyword and
            extobj= keyword if present
            Raise an error if anything else present in the keyword dictionary
         */
@@ -1589,7 +1589,7 @@
                         if (strncmp(PyString_AS_STRING(key), "extobj", 6) == 0) {
                                 extobj = value;
                         }
-                        else if (strncmp(PyString_AS_STRING(key), "type", 5) == 0) {
+                        else if (strncmp(PyString_AS_STRING(key), "sig", 5) == 0) {
                                 typetup = value;
                         }
                         else {



From numpy-svn at scipy.org  Wed Oct 18 14:05:40 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 13:05:40 -0500 (CDT)
Subject: [Numpy-svn] r3358 - in trunk: . numpy/core/src numpy/core/tests
Message-ID: <20061018180540.9E5B139C014@new.scipy.org>

Author: oliphant
Date: 2006-10-18 13:05:35 -0500 (Wed, 18 Oct 2006)
New Revision: 3358

Modified:
   trunk/THANKS.txt
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/tests/test_regression.py
Log:
Fix Ticket #352

Modified: trunk/THANKS.txt
===================================================================
--- trunk/THANKS.txt	2006-10-18 07:09:19 UTC (rev 3357)
+++ trunk/THANKS.txt	2006-10-18 18:05:35 UTC (rev 3358)
@@ -24,4 +24,5 @@
     and much help with rooting out nested record array bugs. 
 Tim Hochberg for getting the build working on MSVC, optimization 
     improvements, and code review
-Charles Harris for the sorting code originally written for Numarray and for    improvements to polyfit, many bug fixes, and documentation strings.
+Charles Harris for the sorting code originally written for Numarray and 
+    for improvements to polyfit, many bug fixes, and documentation strings.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-18 07:09:19 UTC (rev 3357)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-18 18:05:35 UTC (rev 3358)
@@ -4749,41 +4749,44 @@
 static PyObject *
 _check_axis(PyArrayObject *arr, int *axis, int flags)
 {
-        PyObject *temp;
+        PyObject *temp1, *temp2;
         int n = arr->nd;
 
         if ((*axis >= MAX_DIMS) || (n==0)) {
                 if (n != 1) {
-                        temp = PyArray_Ravel(arr,0);
-                        if (temp) *axis = PyArray_NDIM(temp)-1;
-                        else *axis = 0;
+                        temp1 = PyArray_Ravel(arr,0);
+                        if (temp1 == NULL) {*axis=0; return NULL;}
+                        *axis = PyArray_NDIM(temp1)-1;
                 }
                 else {
-                        temp = (PyObject *)arr;
-                        Py_INCREF(temp);
+                        temp1 = (PyObject *)arr;
+                        Py_INCREF(temp1);
                         *axis = 0;
                 }
-                return temp;
+                if (!flags) return temp1;
         }
         else {
-                if (flags) {
-                        temp = PyArray_CheckFromAny((PyObject *)arr, NULL,
-                                               0, 0, flags, NULL);
-                        if (temp == NULL) return NULL;
-                }
-                else {
-                        Py_INCREF(arr);
-                        temp = (PyObject *)arr;
-                }
+                temp1 = (PyObject *)arr;
+                Py_INCREF(temp1);
         }
+        if (flags) {
+                temp2 = PyArray_CheckFromAny((PyObject *)temp1, NULL,
+                                             0, 0, flags, NULL);
+                Py_DECREF(temp1);
+                if (temp2 == NULL) return NULL;
+        }
+        else {
+                temp2 = (PyObject *)temp1;
+        }
+        n = PyArray_NDIM(temp2);
         if (*axis < 0) *axis += n;
         if ((*axis < 0) || (*axis >= n)) {
                 PyErr_Format(PyExc_ValueError,
                              "axis(=%d) out of bounds", *axis);
-                Py_DECREF(temp);
+                Py_DECREF(temp2);
                 return NULL;
         }
-        return temp;
+        return temp2;
 }
 
 #include "arraymethods.c"

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-18 07:09:19 UTC (rev 3357)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-18 18:05:35 UTC (rev 3358)
@@ -537,6 +537,12 @@
         a = N.array([[1,2],[3,4],[5,6],[7,8]])
         b = a[:,1]
         assert_equal(b.reshape(2,2,order='F'), [[2,6],[4,8]])
+
+    def check_repeat_discont(self, level=rlevel):
+        """Ticket #352"""
+        a = N.arange(12).reshape(4,3)[:,2]
+        assert_equal(a.repeat(3), [2,2,2,5,5,5,8,8,8,11,11,11])
+        
                 
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Wed Oct 18 14:15:32 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 13:15:32 -0500 (CDT)
Subject: [Numpy-svn] r3359 - trunk/numpy/core/src
Message-ID: <20061018181532.9214039C014@new.scipy.org>

Author: oliphant
Date: 2006-10-18 13:15:26 -0500 (Wed, 18 Oct 2006)
New Revision: 3359

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Fix-up so that if on creation, a string or unicode data-type has an empty elsize it is reset to the size of one character.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-18 18:05:35 UTC (rev 3358)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-18 18:15:26 UTC (rev 3359)
@@ -5255,9 +5255,15 @@
         size = 1;
         sd = (size_t) descr->elsize;
         if (sd == 0) {
-                PyErr_SetString(PyExc_ValueError, "Empty data-type");
-                Py_DECREF(descr);
-                return NULL;
+                if (!PyDataType_ISSTRING(descr)) {
+                        PyErr_SetString(PyExc_ValueError, "Empty data-type");
+                        Py_DECREF(descr);
+                        return NULL;
+                }
+                PyArray_DESCR_REPLACE(descr);
+                if (descr->type_num == NPY_STRING) descr->elsize = 1;
+                else descr->elsize = sizeof(PyArray_UCS4);
+                sd = (size_t) descr->elsize;  
         }
         largest = MAX_INTP / sd;
         for (i=0;i<nd;i++) {



From numpy-svn at scipy.org  Wed Oct 18 18:52:33 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 17:52:33 -0500 (CDT)
Subject: [Numpy-svn] r3360 - in trunk/numpy/core: include/numpy src
Message-ID: <20061018225233.9097639C0DC@new.scipy.org>

Author: oliphant
Date: 2006-10-18 17:52:29 -0500 (Wed, 18 Oct 2006)
New Revision: 3360

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
   trunk/numpy/core/src/arrayobject.c
Log:
Allow F_CONTIGUOUS and C_CONTIGUOUS as aliases to FORTRAN and CONTIGUOUS

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-18 18:15:26 UTC (rev 3359)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-18 22:52:29 UTC (rev 3360)
@@ -1198,6 +1198,9 @@
    C-contiguous array)*/
 #define NPY_FORTRAN       0x0002
 
+#define NPY_C_CONTIGUOUS NPY_CONTIGUOUS
+#define NPY_F_CONTIGUOUS NPY_FORTRAN
+
 /*
   Note: all 0-d arrays are CONTIGUOUS and FORTRAN contiguous. If a
    1-d array is CONTIGUOUS it is also FORTRAN contiguous

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-18 18:15:26 UTC (rev 3359)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-18 22:52:29 UTC (rev 3360)
@@ -11574,6 +11574,14 @@
          (getter)arrayflags_contiguous_get,
          NULL,
          ""},
+        {"c_contiguous",
+         (getter)arrayflags_contiguous_get,
+         NULL,
+         ""},
+        {"f_contiguous",
+         (getter)arrayflags_fortran_get,
+         NULL,
+         ""},
         {"fortran",
          (getter)arrayflags_fortran_get,
          NULL,
@@ -11691,6 +11699,10 @@
         case 12:
                 if (strncmp(key, "UPDATEIFCOPY", n)==0)
                         return arrayflags_updateifcopy_get(self);
+                if (strncmp(key, "C_CONTIGUOUS", n)==0)
+                        return arrayflags_contiguous_get(self);
+                if (strncmp(key, "F_CONTIGUOUS", n)==0)
+                        return arrayflags_fortran_get(self);
                 break;
         }
 
@@ -11736,8 +11748,8 @@
 
         return PyString_FromFormat("  %s : %s\n  %s : %s\n  %s : %s\n"\
                                    "  %s : %s\n  %s : %s\n  %s : %s",
-                                   "CONTIGUOUS", _torf_(fl, CONTIGUOUS),
-                                   "FORTRAN", _torf_(fl, FORTRAN),
+                                   "C_CONTIGUOUS", _torf_(fl, CONTIGUOUS),
+                                   "F_CONTIGUOUS", _torf_(fl, FORTRAN),
                                    "OWNDATA", _torf_(fl, OWNDATA),
                                    "WRITEABLE", _torf_(fl, WRITEABLE),
                                    "ALIGNED", _torf_(fl, ALIGNED),



From numpy-svn at scipy.org  Wed Oct 18 20:13:51 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 19:13:51 -0500 (CDT)
Subject: [Numpy-svn] r3361 - in trunk/numpy/core: . include/numpy src
Message-ID: <20061019001351.EF6C339C059@new.scipy.org>

Author: oliphant
Date: 2006-10-18 19:13:48 -0500 (Wed, 18 Oct 2006)
New Revision: 3361

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
   trunk/numpy/core/include/numpy/ufuncobject.h
   trunk/numpy/core/numeric.py
   trunk/numpy/core/src/scalarmathmodule.c.src
   trunk/numpy/core/src/ufuncobject.c
   trunk/numpy/core/src/umathmodule.c.src
Log:
Add print and log facilities to error handling and change the default error mode to divide='print', over='print', invalid='print', and under='ignore'

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-18 22:52:29 UTC (rev 3360)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-19 00:13:48 UTC (rev 3361)
@@ -30,7 +30,7 @@
 #define NPY_SUCCEED 1
 
         /* Helpful to distinguish what is installed */
-#define NPY_VERSION 0x01000008
+#define NPY_VERSION 0x01000009
 
         /* Some platforms don't define bool, long long, or long double.
            Handle that here.

Modified: trunk/numpy/core/include/numpy/ufuncobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ufuncobject.h	2006-10-18 22:52:29 UTC (rev 3360)
+++ trunk/numpy/core/include/numpy/ufuncobject.h	2006-10-19 00:13:48 UTC (rev 3361)
@@ -27,18 +27,20 @@
 #define UFUNC_ERR_WARN   1
 #define UFUNC_ERR_RAISE  2
 #define UFUNC_ERR_CALL   3
+#define UFUNC_ERR_PRINT  4
+#define UFUNC_ERR_LOG    5
 
 	/* Python side integer mask */
 
-#define UFUNC_MASK_DIVIDEBYZERO 0x03
-#define UFUNC_MASK_OVERFLOW 0x0c
-#define UFUNC_MASK_UNDERFLOW 0x30
-#define UFUNC_MASK_INVALID 0xc0
+#define UFUNC_MASK_DIVIDEBYZERO 0x07
+#define UFUNC_MASK_OVERFLOW 0x3f
+#define UFUNC_MASK_UNDERFLOW 0x1ff
+#define UFUNC_MASK_INVALID 0xfff
 
 #define UFUNC_SHIFT_DIVIDEBYZERO 0
-#define UFUNC_SHIFT_OVERFLOW     2
-#define UFUNC_SHIFT_UNDERFLOW    4
-#define UFUNC_SHIFT_INVALID      6
+#define UFUNC_SHIFT_OVERFLOW     3
+#define UFUNC_SHIFT_UNDERFLOW    6
+#define UFUNC_SHIFT_INVALID      9
 
 
 /* platform-dependent code translates floating point
@@ -49,8 +51,14 @@
 #define UFUNC_FPE_UNDERFLOW     4
 #define UFUNC_FPE_INVALID       8
 
-#define UFUNC_ERR_DEFAULT 0  /* Default error mode */
+#define UFUNC_ERR_DEFAULT  0      /* Error mode that avoids look-up (no checking) */
 
+   /* Default user error mode */
+#define UFUNC_ERR_DEFAULT2                               \
+        (UFUNC_ERR_PRINT << UFUNC_SHIFT_DIVIDEBYZERO) +  \
+        (UFUNC_ERR_PRINT << UFUNC_SHIFT_OVERFLOW) +      \
+        (UFUNC_ERR_PRINT << UFUNC_SHIFT_INVALID)        
+
 	/* Only internal -- not exported, yet*/
 typedef struct {
 	/* Multi-iterator portion --- needs to be present in this order
@@ -70,8 +78,9 @@
 	/* The error handling */
 	int errormask;         /* Integer showing desired error handling */
 	PyObject *errobj;      /* currently a tuple with
-				  (string, func or None)
+				  (string, func or obj with write method or None)
 			       */
+        int first;
 
 	/* Specific function and data to use */
 	PyUFuncGenericFunction function;
@@ -134,6 +143,7 @@
 	/* The error handling */
 	int errormask;
 	PyObject *errobj;
+        int first;
 
         PyUFuncGenericFunction function;
         void *funcdata;
@@ -201,12 +211,13 @@
 #include "__ufunc_api.h"
 
 #define UFUNC_PYVALS_NAME "UFUNC_PYVALS"
-
-#define UFUNC_CHECK_ERROR(arg)                                         \
-	if (((arg)->obj && PyErr_Occurred()) ||                        \
-            ((arg)->errormask &&                                       \
-             PyUFunc_checkfperr((arg)->errormask,                      \
-                                (arg)->errobj)))                       \
+        
+#define UFUNC_CHECK_ERROR(arg)                                          \
+	if (((arg)->obj && PyErr_Occurred()) ||                         \
+            ((arg)->errormask &&                                        \
+             PyUFunc_checkfperr((arg)->errormask,                       \
+                                (arg)->errobj,                          \
+                                &(arg)->first)))                        \
 		goto fail
 
 /* This code checks the IEEE status flags in a platform-dependent way */

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-18 22:52:29 UTC (rev 3360)
+++ trunk/numpy/core/numeric.py	2006-10-19 00:13:48 UTC (rev 3361)
@@ -633,7 +633,9 @@
 _errdict = {"ignore":ERR_IGNORE,
             "warn":ERR_WARN,
             "raise":ERR_RAISE,
-            "call":ERR_CALL}
+            "call":ERR_CALL,
+            "print":ERR_PRINT,
+            "log":ERR_LOG}
 
 _errdict_rev = {}
 for key in _errdict.keys():
@@ -690,10 +692,10 @@
 
     Returns a dictionary with entries "divide", "over", "under", and
     "invalid", whose values are from the strings
-    "ignore", "warn", "raise", and "call".
+    "ignore", "print", "log", "warn", "raise", and "call".
     """
     maskvalue = umath.geterrobj()[1]
-    mask = 3
+    mask = 7
     res = {}
     val = (maskvalue >> SHIFT_DIVIDEBYZERO) & mask
     res['divide'] = _errdict_rev[val]
@@ -728,7 +730,8 @@
 
 def seterrcall(func):
     """Set the callback function used when a floating-point error handler
-    is set to 'call'.
+    is set to 'call' or the object with a write method for use when
+    the floating-point error handler is set to 'log'
 
     'func' should be a function that takes two arguments. The first is
     type of error ("divide", "over", "under", or "invalid"), and the second
@@ -737,7 +740,8 @@
     Returns the old handler.
     """
     if func is not None and not callable(func):
-        raise ValueError, "Only callable can be used as callback"
+        if not hasattr(func, 'write') or not callable(func.write):
+            raise ValueError, "Only callable can be used as callback"
     pyvals = umath.geterrobj()
     old = geterrcall()
     pyvals[2] = func
@@ -784,7 +788,7 @@
         seterr(**self.oldstate)
 
 def _setdef():
-    defval = [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT, None]
+    defval = [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT2, None]
     umath.seterrobj(defval)
 
 # set the default values

Modified: trunk/numpy/core/src/scalarmathmodule.c.src
===================================================================
--- trunk/numpy/core/src/scalarmathmodule.c.src	2006-10-18 22:52:29 UTC (rev 3360)
+++ trunk/numpy/core/src/scalarmathmodule.c.src	2006-10-19 00:13:48 UTC (rev 3361)
@@ -550,6 +550,7 @@
 
 #if @fperr@
     int retstatus;
+    int first;
 #endif
 
     switch(_ at name@_convert2_to_ctypes(a, &arg1, b, &arg2)) {
@@ -584,7 +585,8 @@
 	if (PyUFunc_GetPyValues("@name at _scalars", &bufsize, &errmask,
 				&errobj) < 0)
 	    return NULL;
-	if (PyUFunc_handlefperr(errmask, errobj, retstatus))
+        first = 1;
+	if (PyUFunc_handlefperr(errmask, errobj, retstatus, &first))
 	    return NULL;
     }
 #endif
@@ -625,6 +627,7 @@
     PyObject *ret;
     @name@ arg1, arg2;
     int retstatus;
+    int first;
 
 #if @cmplx@
     @name@ out = {0,0};
@@ -678,7 +681,8 @@
 	if (PyUFunc_GetPyValues("@name at _scalars", &bufsize, &errmask,
 				&errobj) < 0)
 	    return NULL;
-	if (PyUFunc_handlefperr(errmask, errobj, retstatus))
+        first = 1;
+	if (PyUFunc_handlefperr(errmask, errobj, retstatus, &first))
 	    return NULL;
     }
 

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-18 22:52:29 UTC (rev 3360)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-19 00:13:48 UTC (rev 3361)
@@ -473,7 +473,7 @@
 */
 
 static int
-_error_handler(int method, PyObject *errobj, char *errtype, int retstatus)
+_error_handler(int method, PyObject *errobj, char *errtype, int retstatus, int *first)
 {
 	PyObject *pyfunc, *ret, *args;
 	char *name=PyString_AS_STRING(PyTuple_GET_ITEM(errobj,0));
@@ -512,6 +512,29 @@
 		Py_DECREF(ret);
 
 		break;
+        case UFUNC_ERR_PRINT:
+                if (*first) {
+                        fprintf(stderr, "Warning: %s encountered in %s\n", errtype, name);
+                        *first = 0;
+                }
+                break;
+        case UFUNC_ERR_LOG:
+                if (first) {
+                        *first = 0;
+                        pyfunc = PyTuple_GET_ITEM(errobj, 1);
+                        if (pyfunc == Py_None) {
+                                PyErr_Format(PyExc_NameError,
+                                             "log specified for %s (in %s) but no " \
+                                             "object with write method found.",
+                                             errtype, name);
+                                goto fail;
+                        }
+                        snprintf(msg, 100, "Warning: %s encountered in %s\n", errtype, name);
+                        ret = PyObject_CallMethod(pyfunc, "write", "s", msg);
+                        if (ret == NULL) goto fail;
+                        Py_DECREF(ret);
+                }
+                break;
 	}
 	DISABLE_C_API
 	return 0;
@@ -535,13 +558,13 @@
 			handle = errmask & UFUNC_MASK_##NAME;\
 			if (handle && \
 			    _error_handler(handle >> UFUNC_SHIFT_##NAME, \
-					   errobj, str, retstatus) < 0)  \
+					   errobj, str, retstatus, first) < 0) \
 				return -1;		      \
 			}}
 
 /*UFUNC_API*/
 static int
-PyUFunc_handlefperr(int errmask, PyObject *errobj, int retstatus)
+PyUFunc_handlefperr(int errmask, PyObject *errobj, int retstatus, int *first)
 {
 	int handle;
 	if (errmask && retstatus) {
@@ -558,13 +581,13 @@
 
 /*UFUNC_API*/
 static int
-PyUFunc_checkfperr(int errmask, PyObject *errobj)
+PyUFunc_checkfperr(int errmask, PyObject *errobj, int *first)
 {
 	int retstatus;
 
 	/* 1. check hardware flag --- this is platform dependent code */
 	retstatus = PyUFunc_getfperr();
-	return PyUFunc_handlefperr(errmask, errobj, retstatus);
+	return PyUFunc_handlefperr(errmask, errobj, retstatus, first);
 }
 
 
@@ -958,14 +981,21 @@
 			     *errmask);
 		return -1;
 	}
-
+        
 	retval = PyList_GET_ITEM(ref, 2);
 	if (retval != Py_None && !PyCallable_Check(retval)) {
-		PyErr_SetString(PyExc_TypeError,
-				"callback function must be callable");
-		return -1;
+                PyObject *temp;
+                temp = PyObject_GetAttrString(retval, "write");
+                if (temp == NULL || !PyCallable_Check(temp)) {
+                        PyErr_SetString(PyExc_TypeError,
+                                        "python object must be callable or have " \
+                                        "a callable write method");
+                        Py_XDECREF(temp);
+                        return -1;
+                }
+                Py_DECREF(temp);
 	}
-
+        
 	*errobj = Py_BuildValue("NO",
 				PyString_FromString(name),
 				retval);
@@ -1571,6 +1601,7 @@
         }
 	loop->errobj = NULL;
         loop->notimplemented = 0;
+        loop->first = 1;
 
         name = self->name ? self->name : "";
 
@@ -2057,6 +2088,7 @@
 	loop->it = NULL;
 	loop->rit = NULL;
 	loop->errobj = NULL;
+        loop->first = 1;
 	loop->decref=NULL;
         loop->N = (*arr)->dimensions[axis];
 	loop->instrides = (*arr)->strides[axis];

Modified: trunk/numpy/core/src/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umathmodule.c.src	2006-10-18 22:52:29 UTC (rev 3360)
+++ trunk/numpy/core/src/umathmodule.c.src	2006-10-19 00:13:48 UTC (rev 3361)
@@ -2181,7 +2181,10 @@
         ADDCONST(ERR_WARN);
         ADDCONST(ERR_CALL);
         ADDCONST(ERR_RAISE);
+        ADDCONST(ERR_PRINT);
+        ADDCONST(ERR_LOG);
         ADDCONST(ERR_DEFAULT);
+        ADDCONST(ERR_DEFAULT2);
 
         ADDCONST(SHIFT_DIVIDEBYZERO);
         ADDCONST(SHIFT_OVERFLOW);



From numpy-svn at scipy.org  Wed Oct 18 20:26:09 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 19:26:09 -0500 (CDT)
Subject: [Numpy-svn] r3362 - trunk/numpy/core/tests
Message-ID: <20061019002609.5237139C059@new.scipy.org>

Author: oliphant
Date: 2006-10-18 19:26:05 -0500 (Wed, 18 Oct 2006)
New Revision: 3362

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Fix test.

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-19 00:13:48 UTC (rev 3361)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-19 00:26:05 UTC (rev 3362)
@@ -215,8 +215,8 @@
 
     def check_longfloat_repr(self,level=rlevel):
         """Ticket #112"""
-        a = N.exp(N.array([1000]),dtype=N.longfloat)
-        assert(str(a[0]) in str(a))
+        a = N.exp(N.array([1000],dtype=N.longfloat))
+        assert(str(a)[1:9] == str(a[0])[:8])
 
     def check_argmax(self,level=rlevel):
         """Ticket #119"""



From numpy-svn at scipy.org  Thu Oct 19 00:42:49 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 23:42:49 -0500 (CDT)
Subject: [Numpy-svn] r3363 - tags
Message-ID: <20061019044249.7224939C08F@new.scipy.org>

Author: oliphant
Date: 2006-10-18 23:42:45 -0500 (Wed, 18 Oct 2006)
New Revision: 3363

Added:
   tags/1.0rc3/
Log:
Tag the tree for 1.0rc3


Copied: tags/1.0rc3 (from rev 3362, trunk)



From numpy-svn at scipy.org  Thu Oct 19 00:46:22 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 18 Oct 2006 23:46:22 -0500 (CDT)
Subject: [Numpy-svn] r3364 - tags/1.0rc3/numpy
Message-ID: <20061019044622.BB14739C059@new.scipy.org>

Author: oliphant
Date: 2006-10-18 23:46:19 -0500 (Wed, 18 Oct 2006)
New Revision: 3364

Modified:
   tags/1.0rc3/numpy/version.py
Log:
Make a release.

Modified: tags/1.0rc3/numpy/version.py
===================================================================
--- tags/1.0rc3/numpy/version.py	2006-10-19 04:42:45 UTC (rev 3363)
+++ tags/1.0rc3/numpy/version.py	2006-10-19 04:46:19 UTC (rev 3364)
@@ -1,5 +1,5 @@
-version='1.0'
-release=False
+version='1.0rc3'
+release=True
 
 if not release:
     import os



From numpy-svn at scipy.org  Thu Oct 19 06:11:44 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 05:11:44 -0500 (CDT)
Subject: [Numpy-svn] r3365 - trunk/numpy/f2py
Message-ID: <20061019101144.5840A39C097@new.scipy.org>

Author: pearu
Date: 2006-10-19 05:11:40 -0500 (Thu, 19 Oct 2006)
New Revision: 3365

Modified:
   trunk/numpy/f2py/capi_maps.py
Log:
f2py-2e is not ready for PyArray_STRING, using PyArray_CHAR for now (character*n support has improved in f2py-g3.).

Modified: trunk/numpy/f2py/capi_maps.py
===================================================================
--- trunk/numpy/f2py/capi_maps.py	2006-10-19 04:46:19 UTC (rev 3364)
+++ trunk/numpy/f2py/capi_maps.py	2006-10-19 10:11:40 UTC (rev 3365)
@@ -83,7 +83,10 @@
             'complex_float':'PyArray_CFLOAT',
             'complex_double':'PyArray_CDOUBLE',
             'complex_long_double':'PyArray_CDOUBLE',
-            'string':'PyArray_STRING'}
+            'string':'PyArray_CHAR', # f2py 2e is not ready for PyArray_STRING (must set itemisize etc)
+            #'string':'PyArray_STRING'
+                
+                }
 c2pycode_map={'double':'d',
               'float':'f',
               'long_double':'d',                       # forced casting



From numpy-svn at scipy.org  Thu Oct 19 10:36:48 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 09:36:48 -0500 (CDT)
Subject: [Numpy-svn] r3366 - trunk/numpy/core/src
Message-ID: <20061019143648.AA82339C0A6@new.scipy.org>

Author: oliphant
Date: 2006-10-19 09:36:44 -0500 (Thu, 19 Oct 2006)
New Revision: 3366

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
Fix length early in IntpConverter.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-19 10:11:40 UTC (rev 3365)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-19 14:36:44 UTC (rev 3366)
@@ -4158,6 +4158,7 @@
         int nd;
 
         seq->ptr = NULL;
+        seq->len = 0;
         if (obj == Py_None) return PY_SUCCEED;
         len = PySequence_Size(obj);
         if (len == -1) { /* Check to see if it is a number */



From numpy-svn at scipy.org  Thu Oct 19 11:19:00 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 10:19:00 -0500 (CDT)
Subject: [Numpy-svn] r3367 - in trunk/numpy/core: . tests
Message-ID: <20061019151900.8BACA39C13D@new.scipy.org>

Author: oliphant
Date: 2006-10-19 10:18:55 -0500 (Thu, 19 Oct 2006)
New Revision: 3367

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/core/tests/test_regression.py
Log:
Fix longfloat test on platforms where they are the same as doubles.  Add ability to set error call-back/logging-object in errstate object.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-19 14:36:44 UTC (rev 3366)
+++ trunk/numpy/core/numeric.py	2006-10-19 15:18:55 UTC (rev 3367)
@@ -781,11 +781,17 @@
     # Note that we don't want to run the above doctests because they will fail
     # without a from __future__ import with_statement
     def __init__(self, **kwargs):
+        try:
+            self.errcall = kwargs.pop('errcall')
+        except KeyError:
+            self.errcall = None
         self.kwargs = kwargs
     def __enter__(self):
         self.oldstate = seterr(**self.kwargs)
+        self.oldcall = seterrcall(self.errcall)
     def __exit__(self, *exc_info):
         seterr(**self.oldstate)
+        seterrcall(self.oldcall)
 
 def _setdef():
     defval = [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT2, None]

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-19 14:36:44 UTC (rev 3366)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-19 15:18:55 UTC (rev 3367)
@@ -215,8 +215,9 @@
 
     def check_longfloat_repr(self,level=rlevel):
         """Ticket #112"""
-        a = N.exp(N.array([1000],dtype=N.longfloat))
-        assert(str(a)[1:9] == str(a[0])[:8])
+        if N.longfloat(0).itemsize > 8:
+            a = N.exp(N.array([1000],dtype=N.longfloat))
+            assert(str(a)[1:9] == str(a[0])[:8])
 
     def check_argmax(self,level=rlevel):
         """Ticket #119"""



From numpy-svn at scipy.org  Thu Oct 19 12:45:43 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 11:45:43 -0500 (CDT)
Subject: [Numpy-svn] r3368 - in trunk/numpy: core/tests lib/tests
Message-ID: <20061019164543.3719739C0D1@new.scipy.org>

Author: tim_hochberg
Date: 2006-10-19 11:45:36 -0500 (Thu, 19 Oct 2006)
New Revision: 3368

Modified:
   trunk/numpy/core/tests/test_ma.py
   trunk/numpy/lib/tests/test_type_check.py
   trunk/numpy/lib/tests/test_ufunclike.py
Log:
Fix tests to run cleanly with new, tighter error handling.

Modified: trunk/numpy/core/tests/test_ma.py
===================================================================
--- trunk/numpy/core/tests/test_ma.py	2006-10-19 15:18:55 UTC (rev 3367)
+++ trunk/numpy/core/tests/test_ma.py	2006-10-19 16:45:36 UTC (rev 3368)
@@ -86,11 +86,15 @@
             self.failUnless(eq(x + y, xm + ym))
             self.failUnless(eq(x - y, xm - ym))
             self.failUnless(eq(x * y, xm * ym))
+            olderr = numpy.seterr(divide='ignore', invalid='ignore')
             self.failUnless(eq(x / y, xm / ym))
+            numpy.seterr(**olderr)
             self.failUnless(eq(a10 + y, a10 + ym))
             self.failUnless(eq(a10 - y, a10 - ym))
             self.failUnless(eq(a10 * y, a10 * ym))
+            olderr = numpy.seterr(divide='ignore', invalid='ignore')
             self.failUnless(eq(a10 / y, a10 / ym))
+            numpy.seterr(**olderr)
             self.failUnless(eq(x + a10, xm + a10))
             self.failUnless(eq(x - a10, xm - a10))
             self.failUnless(eq(x * a10, xm * a10))
@@ -101,7 +105,9 @@
             self.failUnless(eq(numpy.add(x,y), add(xm, ym)))
             self.failUnless(eq(numpy.subtract(x,y), subtract(xm, ym)))
             self.failUnless(eq(numpy.multiply(x,y), multiply(xm, ym)))
+            olderr = numpy.seterr(divide='ignore', invalid='ignore')
             self.failUnless(eq(numpy.divide(x,y), divide(xm, ym)))
+            numpy.seterr(**olderr)
 
 
     def check_testMixedArithmetic(self):
@@ -119,7 +125,9 @@
         self.failUnless (eq(numpy.sinh(x), sinh(xm)))
         self.failUnless (eq(numpy.tan(x), tan(xm)))
         self.failUnless (eq(numpy.tanh(x), tanh(xm)))
+        olderr = numpy.seterr(divide='ignore', invalid='ignore')
         self.failUnless (eq(numpy.sqrt(abs(x)), sqrt(xm)))
+        numpy.seterr(**olderr)
         self.failUnless (eq(numpy.log(abs(x)), log(xm)))
         self.failUnless (eq(numpy.log10(abs(x)), log10(xm)))
         self.failUnless (eq(numpy.exp(x), exp(xm)))
@@ -671,8 +679,14 @@
                 uf = getattr(fromnumeric, f)
             mf = getattr(numpy.ma, f)
             args = self.d[:uf.nin]
+            olderr = numpy.geterr()
+            if f in ['sqrt', 'arctanh', 'arcsin', 'arccos', 'arccosh', 'arctanh']:
+                numpy.seterr(invalid='ignore')
+            if f in ['arctanh']:
+                numpyseterr(divide='ignore']
             ur = uf(*args)
             mr = mf(*args)
+            numpy.seterr(**olderr)
             self.failUnless(eq(ur.filled(0), mr.filled(0), f))
             self.failUnless(eqmask(ur.mask, mr.mask))
 

Modified: trunk/numpy/lib/tests/test_type_check.py
===================================================================
--- trunk/numpy/lib/tests/test_type_check.py	2006-10-19 15:18:55 UTC (rev 3367)
+++ trunk/numpy/lib/tests/test_type_check.py	2006-10-19 16:45:36 UTC (rev 3368)
@@ -127,11 +127,17 @@
         res = isnan(z) == 0
         assert_all(alltrue(res,axis=0))
     def check_posinf(self):
+        olderr = seterr(divide='ignore')
         assert_all(isnan(array((1.,))/0.) == 0)
+        seterr(**olderr)
     def check_neginf(self):
+        olderr = seterr(divide='ignore')
         assert_all(isnan(array((-1.,))/0.) == 0)
+        seterr(**olderr)
     def check_ind(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         assert_all(isnan(array((0.,))/0.) == 1)
+        seterr(**olderr)
     #def check_qnan(self):             log(-1) return pi*j now
     #    assert_all(isnan(log(-1.)) == 1)
     def check_integer(self):
@@ -139,7 +145,9 @@
     def check_complex(self):
         assert_all(isnan(1+1j) == 0)
     def check_complex1(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         assert_all(isnan(array(0+0j)/0.) == 1)
+        seterr(**olderr)
 
 class test_isfinite(NumpyTestCase):
     def check_goodvalues(self):
@@ -147,11 +155,17 @@
         res = isfinite(z) == 1
         assert_all(alltrue(res,axis=0))
     def check_posinf(self):
+        olderr = seterr(divide='ignore')
         assert_all(isfinite(array((1.,))/0.) == 0)
+        seterr(**olderr)
     def check_neginf(self):
+        olderr = seterr(divide='ignore')
         assert_all(isfinite(array((-1.,))/0.) == 0)
+        seterr(**olderr)
     def check_ind(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         assert_all(isfinite(array((0.,))/0.) == 0)
+        seterr(**olderr)
     #def check_qnan(self):
     #    assert_all(isfinite(log(-1.)) == 0)
     def check_integer(self):
@@ -159,7 +173,9 @@
     def check_complex(self):
         assert_all(isfinite(1+1j) == 1)
     def check_complex1(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         assert_all(isfinite(array(1+1j)/0.) == 0)
+        seterr(**olderr)
 
 class test_isinf(NumpyTestCase):
     def check_goodvalues(self):
@@ -167,36 +183,52 @@
         res = isinf(z) == 0
         assert_all(alltrue(res,axis=0))
     def check_posinf(self):
+        olderr = seterr(divide='ignore')
         assert_all(isinf(array((1.,))/0.) == 1)
+        seterr(**olderr)
     def check_posinf_scalar(self):
+        olderr = seterr(divide='ignore')
         assert_all(isinf(array(1.,)/0.) == 1)
+        seterr(**olderr)
     def check_neginf(self):
+        olderr = seterr(divide='ignore')
         assert_all(isinf(array((-1.,))/0.) == 1)
+        seterr(**olderr)
     def check_neginf_scalar(self):
+        olderr = seterr(divide='ignore')
         assert_all(isinf(array(-1.)/0.) == 1)
+        seterr(**olderr)
     def check_ind(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         assert_all(isinf(array((0.,))/0.) == 0)
+        seterr(**olderr)
     #def check_qnan(self):
     #    assert_all(isinf(log(-1.)) == 0)
     #    assert_all(isnan(log(-1.)) == 1)
 
 class test_isposinf(NumpyTestCase):
     def check_generic(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         vals = isposinf(array((-1.,0,1))/0.)
+        seterr(**olderr)
         assert(vals[0] == 0)
         assert(vals[1] == 0)
         assert(vals[2] == 1)
 
 class test_isneginf(NumpyTestCase):
     def check_generic(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         vals = isneginf(array((-1.,0,1))/0.)
+        seterr(**olderr)
         assert(vals[0] == 1)
         assert(vals[1] == 0)
         assert(vals[2] == 0)
 
 class test_nan_to_num(NumpyTestCase):
     def check_generic(self):
+        olderr = seterr(divide='ignore', invalid='ignore')
         vals = nan_to_num(array((-1.,0,1))/0.)
+        seterr(**olderr)
         assert_all(vals[0] < -1e10) and assert_all(isfinite(vals[0]))
         assert(vals[1] == 0)
         assert_all(vals[2] > 1e10) and assert_all(isfinite(vals[2]))
@@ -208,13 +240,17 @@
         assert_all(vals == 1+1j)
     def check_complex_bad(self):
         v = 1+1j
+        olderr = seterr(divide='ignore', invalid='ignore')
         v += array(0+1.j)/0.
+        seterr(**olderr)
         vals = nan_to_num(v)
         # !! This is actually (unexpectedly) zero
         assert_all(isfinite(vals))
     def check_complex_bad2(self):
         v = 1+1j
+        olderr = seterr(divide='ignore', invalid='ignore')
         v += array(-1+1.j)/0.
+        seterr(**olderr)
         vals = nan_to_num(v)
         assert_all(isfinite(vals))
         #assert_all(vals.imag > 1e10)  and assert_all(isfinite(vals))

Modified: trunk/numpy/lib/tests/test_ufunclike.py
===================================================================
--- trunk/numpy/lib/tests/test_ufunclike.py	2006-10-19 15:18:55 UTC (rev 3367)
+++ trunk/numpy/lib/tests/test_ufunclike.py	2006-10-19 16:45:36 UTC (rev 3368)
@@ -21,8 +21,10 @@
 array([True, False, False, False, False, False], dtype=bool)
 >>> U.isneginf(a)
 array([False, True, False, False, False, False], dtype=bool)
+>>> olderr = nx.seterr(invalid='ignore')
 >>> nx.sign(a)
 array([ 1., -1.,  0.,  0.,  1., -1.])
+>>> olderr = nx.seterr(**olderr)
 
 Same thing with an output array:
 >>> y = nx.zeros(a.shape, bool)
@@ -34,8 +36,10 @@
 array([False, True, False, False, False, False], dtype=bool)
 >>> y
 array([False, True, False, False, False, False], dtype=bool)
+>>> olderr = nx.seterr(invalid='ignore')
 >>> nx.sign(a, y)
 array([True, True, False, False, True, True], dtype=bool)
+>>> olderr = nx.seterr(**olderr)
 >>> y
 array([True, True, False, False, True, True], dtype=bool)
 



From numpy-svn at scipy.org  Thu Oct 19 13:27:57 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 12:27:57 -0500 (CDT)
Subject: [Numpy-svn] r3369 - in trunk/numpy/core: . tests
Message-ID: <20061019172757.B056E39C12C@new.scipy.org>

Author: oliphant
Date: 2006-10-19 12:27:55 -0500 (Thu, 19 Oct 2006)
New Revision: 3369

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/core/tests/test_ma.py
Log:
Eliminate more warnings in testing.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-19 16:45:36 UTC (rev 3368)
+++ trunk/numpy/core/numeric.py	2006-10-19 17:27:55 UTC (rev 3369)
@@ -781,17 +781,16 @@
     # Note that we don't want to run the above doctests because they will fail
     # without a from __future__ import with_statement
     def __init__(self, **kwargs):
-        try:
-            self.errcall = kwargs.pop('errcall')
-        except KeyError:
-            self.errcall = None
+        self.call = kwargs.pop('call',None)
         self.kwargs = kwargs
     def __enter__(self):
         self.oldstate = seterr(**self.kwargs)
-        self.oldcall = seterrcall(self.errcall)
+        if self.call:
+            self.oldcall = seterrcall(self.call)
     def __exit__(self, *exc_info):
         seterr(**self.oldstate)
-        seterrcall(self.oldcall)
+        if self.call:
+            seterrcall(self.oldcall)
 
 def _setdef():
     defval = [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT2, None]

Modified: trunk/numpy/core/tests/test_ma.py
===================================================================
--- trunk/numpy/core/tests/test_ma.py	2006-10-19 16:45:36 UTC (rev 3368)
+++ trunk/numpy/core/tests/test_ma.py	2006-10-19 17:27:55 UTC (rev 3369)
@@ -127,9 +127,9 @@
         self.failUnless (eq(numpy.tanh(x), tanh(xm)))
         olderr = numpy.seterr(divide='ignore', invalid='ignore')
         self.failUnless (eq(numpy.sqrt(abs(x)), sqrt(xm)))
-        numpy.seterr(**olderr)
         self.failUnless (eq(numpy.log(abs(x)), log(xm)))
         self.failUnless (eq(numpy.log10(abs(x)), log10(xm)))
+        numpy.seterr(**olderr)
         self.failUnless (eq(numpy.exp(x), exp(xm)))
         self.failUnless (eq(numpy.arcsin(z), arcsin(zm)))
         self.failUnless (eq(numpy.arccos(z), arccos(zm)))
@@ -680,10 +680,11 @@
             mf = getattr(numpy.ma, f)
             args = self.d[:uf.nin]
             olderr = numpy.geterr()
-            if f in ['sqrt', 'arctanh', 'arcsin', 'arccos', 'arccosh', 'arctanh']:
+            if f in ['sqrt', 'arctanh', 'arcsin', 'arccos', 'arccosh', 'arctanh', 'log',
+                     'log10','divide','true_divide', 'floor_divide', 'remainder', 'fmod']:
                 numpy.seterr(invalid='ignore')
-            if f in ['arctanh']:
-                numpyseterr(divide='ignore']
+            if f in ['arctanh', 'log', 'log10']:
+                numpy.seterr(divide='ignore')
             ur = uf(*args)
             mr = mf(*args)
             numpy.seterr(**olderr)



From numpy-svn at scipy.org  Thu Oct 19 14:26:04 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 13:26:04 -0500 (CDT)
Subject: [Numpy-svn] r3370 - in trunk/numpy/core: . tests
Message-ID: <20061019182604.8EC7639C016@new.scipy.org>

Author: tim_hochberg
Date: 2006-10-19 13:26:00 -0500 (Thu, 19 Oct 2006)
New Revision: 3370

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/core/tests/test_errstate.py
Log:
Added tests for errstate(call=x). Made minor change to errstate so that an existing call can be suppressed using None during a block as well replaced.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-19 17:27:55 UTC (rev 3369)
+++ trunk/numpy/core/numeric.py	2006-10-19 18:26:00 UTC (rev 3370)
@@ -753,6 +753,10 @@
     """
     return umath.geterrobj()[2]
 
+class _unspecified(object): 
+    pass
+_Unspecified = _unspecified()
+
 class errstate(object):
     """with errstate(**state): --> operations in following block use given state.
     
@@ -781,15 +785,15 @@
     # Note that we don't want to run the above doctests because they will fail
     # without a from __future__ import with_statement
     def __init__(self, **kwargs):
-        self.call = kwargs.pop('call',None)
+        self.call = kwargs.pop('call',_Unspecified)
         self.kwargs = kwargs
     def __enter__(self):
         self.oldstate = seterr(**self.kwargs)
-        if self.call:
+        if self.call is not _Unspecified:
             self.oldcall = seterrcall(self.call)
     def __exit__(self, *exc_info):
         seterr(**self.oldstate)
-        if self.call:
+        if self.call is not _Unspecified:
             seterrcall(self.oldcall)
 
 def _setdef():

Modified: trunk/numpy/core/tests/test_errstate.py
===================================================================
--- trunk/numpy/core/tests/test_errstate.py	2006-10-19 17:27:55 UTC (rev 3369)
+++ trunk/numpy/core/tests/test_errstate.py	2006-10-19 18:26:00 UTC (rev 3370)
@@ -45,6 +45,17 @@
                 pass
             else:
                 self.fail()
+                
+    def test_errcall(self):
+        def foo(*args):
+            print args
+        olderrcall = geterrcall()
+        with errstate(call=foo):
+            assert(geterrcall() is foo), 'call is not foo'
+            with errstate(call=None):
+                assert(geterrcall() is None), 'call is not None'
+        assert(geterrcall() is olderrcall), 'call is not olderrcall'
+
 """
 
 if __name__ == '__main__':



From numpy-svn at scipy.org  Thu Oct 19 18:03:27 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 17:03:27 -0500 (CDT)
Subject: [Numpy-svn] r3371 - trunk/numpy/distutils/fcompiler
Message-ID: <20061019220327.9649539C0C8@new.scipy.org>

Author: pearu
Date: 2006-10-19 17:03:23 -0500 (Thu, 19 Oct 2006)
New Revision: 3371

Modified:
   trunk/numpy/distutils/fcompiler/intel.py
Log:
Add Intel Itanium compiler 9.x support (needs testing).

Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 18:26:00 UTC (rev 3370)
+++ trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 22:03:23 UTC (rev 3371)
@@ -74,10 +74,15 @@
 
 class IntelItaniumFCompiler(IntelFCompiler):
     compiler_type = 'intele'
-    version_pattern = r'Intel\(R\) Fortran 90 Compiler Itanium\(TM\) Compiler'\
-                      ' for the Itanium\(TM\)-based applications,'\
-                      ' Version (?P<version>[^\s*]*)'
+    version_pattern = r'Intel\(R\) Fortran (90 Compiler Itanium\(TM\)|Itanium\(R\)) Compiler'\
+                      ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\
+                      '\s+Version (?P<version>[^\s*]*)'
 
+Intel(R) Fortran Itanium(R) Compiler for Itanium(R)-based applications
+Version 9.1? ? Build 20060928 Package ID: l_fc_c_9.1.039
+Copyright (C) 1985-2006 Intel Corporation.? All rights reserved.
+30 DAY EVALUATION LICENSE
+
     for fc_exe in map(find_executable,['ifort','efort','efc']):
         if os.path.isfile(fc_exe):
             break
@@ -176,9 +181,9 @@
 class IntelItaniumVisualFCompiler(IntelVisualFCompiler):
 
     compiler_type = 'intelev'
-    version_pattern = r'Intel\(R\) Fortran 90 Compiler Itanium\(TM\) Compiler'\
-                      ' for the Itanium\(TM\)-based applications,'\
-                      ' Version (?P<version>[^\s*]*)'
+    version_pattern = r'Intel\(R\) Fortran (90 Compiler Itanium\(TM\)|Itanium\(R\)) Compiler'\
+                      ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\
+                      '\s+Version (?P<version>[^\s*]*)'
 
     fc_exe = 'efl' # XXX this is a wild guess
     ar_exe = IntelVisualFCompiler.ar_exe



From numpy-svn at scipy.org  Thu Oct 19 18:55:26 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 19 Oct 2006 17:55:26 -0500 (CDT)
Subject: [Numpy-svn] r3372 - in trunk/numpy: core/src distutils/fcompiler
Message-ID: <20061019225526.129FF39C022@new.scipy.org>

Author: oliphant
Date: 2006-10-19 17:55:23 -0500 (Thu, 19 Oct 2006)
New Revision: 3372

Modified:
   trunk/numpy/core/src/arraymethods.c
   trunk/numpy/distutils/fcompiler/intel.py
Log:
Fix missing comment characters in intel.py.  Check for None in .reshape and .resize

Modified: trunk/numpy/core/src/arraymethods.c
===================================================================
--- trunk/numpy/core/src/arraymethods.c	2006-10-19 22:03:23 UTC (rev 3371)
+++ trunk/numpy/core/src/arraymethods.c	2006-10-19 22:55:23 UTC (rev 3372)
@@ -71,6 +71,8 @@
 
 	n = PyTuple_Size(args);
 	if (n <= 1) {
+                if (PyTuple_GET_ITEM(args, 0) == Py_None)
+                        return PyArray_View(self, NULL, NULL);
 		if (!PyArg_ParseTuple(args, "O&", PyArray_IntpConverter,
 				      &newshape)) return NULL;
 	}
@@ -774,6 +776,10 @@
 	}
 	n = PyTuple_Size(args);
 	if (n <= 1) {
+                if (PyTuple_GET_ITEM(args, 0) == Py_None) {
+                        Py_INCREF(Py_None);
+                        return Py_None;
+                }
 		if (!PyArg_ParseTuple(args, "O&", PyArray_IntpConverter,
 				      &newshape)) return NULL;
 	}

Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 22:03:23 UTC (rev 3371)
+++ trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 22:55:23 UTC (rev 3372)
@@ -78,10 +78,10 @@
                       ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\
                       '\s+Version (?P<version>[^\s*]*)'
 
-Intel(R) Fortran Itanium(R) Compiler for Itanium(R)-based applications
-Version 9.1? ? Build 20060928 Package ID: l_fc_c_9.1.039
-Copyright (C) 1985-2006 Intel Corporation.? All rights reserved.
-30 DAY EVALUATION LICENSE
+#Intel(R) Fortran Itanium(R) Compiler for Itanium(R)-based applications
+#Version 9.1? ? Build 20060928 Package ID: l_fc_c_9.1.039
+#Copyright (C) 1985-2006 Intel Corporation.? All rights reserved.
+#30 DAY EVALUATION LICENSE
 
     for fc_exe in map(find_executable,['ifort','efort','efc']):
         if os.path.isfile(fc_exe):



From numpy-svn at scipy.org  Fri Oct 20 02:43:44 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 20 Oct 2006 01:43:44 -0500 (CDT)
Subject: [Numpy-svn] r3373 - trunk/numpy/f2py/lib/parser
Message-ID: <20061020064344.9771939C098@new.scipy.org>

Author: pearu
Date: 2006-10-20 01:43:31 -0500 (Fri, 20 Oct 2006)
New Revision: 3373

Added:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Modified:
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/typedecl_statements.py
   trunk/numpy/f2py/lib/parser/utils.py
Log:
F2PY G3: started impl array support and expression parser.

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-19 22:55:23 UTC (rev 3372)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-20 06:43:31 UTC (rev 3373)
@@ -120,6 +120,11 @@
         self.bind = []
         self.check = []
         self.init = None
+
+        # after calling analyze the following additional attributes are set:
+        # .is_array:
+        #    rank
+        #    shape
         return
 
     def __repr__(self):
@@ -339,7 +344,7 @@
             s += ', ' + ', '.join(a) + ' :: '
         s += self.name
         if self.bounds:
-            s += '(%s)' % (', '.join(self.bounds))
+            s += '(%s)' % (', '.join([':'.join(spec) for spec in self.bounds]))
         if self.length:
             if is_int_literal_constant(self.length):
                 s += '*%s' % (self.length)
@@ -349,8 +354,59 @@
             s += ' = ' + self.init
         return s
 
+    def get_array_spec(self):
+        assert self.is_array(),'array_spec is available only for arrays'
+        if self.bounds:
+            if self.dimension:
+                self.parent.warning('both bounds=%r and dimension=%r are defined, ignoring dimension.' % (self.bounds, self.dimension))
+            array_spec = self.bounds
+        else:
+            array_spec = self.dimension
+        return array_spec
+
+    def is_deferred_shape_array(self):
+        if not self.is_array(): return False
+        return self.is_allocatable() or self.is_pointer():
+
+    def is_assumed_size_array(self):
+        if not self.is_array(): return False
+        return self.get_array_spec()[-1][-1]=='*'
+
+    def is_assumed_shape_array(self):
+        if not self.is_array(): return False
+        if self.is_deferred_shape_array(): return False
+        for spec in self.get_array_spec():
+            if not spec[-1]: return True
+        return False
+
+    def is_explicit_shape_array(self):
+        if not self.is_array(): return False
+        if self.is_deferred_shape_array(): return False
+        for spec in self.get_array_spec():
+            if not spec[-1] or spec[-1] == '*': return False
+        return True
+
+    def is_allocatable_array(self):
+        return self.is_array() and self.is_allocatable()
+
+    def is_array_pointer(self):
+        return self.is_array() and self.is_pointer()
+    
     def analyze(self):
         typedecl = self.get_typedecl()
+        if self.is_array():
+            array_spec = self.get_array_spec()
+            self.rank = len(array_spec)
+            if self.is_deferred_shape_array(): # a(:,:)
+                pass
+            elif self.is_explict_shape_array(self):
+                shape = []
+                for spec in array_spec:
+                    if len(spec)==1:
+                        shape.append(spec[0])
+                    else:
+                        shape.append(spec[1]-spec[0])
+                self.shape = shape  
         return
 
 class ProgramBlock:

Added: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-19 22:55:23 UTC (rev 3372)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-20 06:43:31 UTC (rev 3373)
@@ -0,0 +1,208 @@
+#!/usr/bin/env python
+"""
+
+Copyright 2006 Pearu Peterson all rights reserved,
+Pearu Peterson <pearu at cens.ioc.ee>
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+
+$Date: $
+Pearu Peterson
+"""
+
+import re
+
+class DefinedOp:
+    def __new__(cls, letters):
+        if not letters: return None
+        obj = object.__new__(cls)
+        obj._init(letters)
+        return obj
+
+    def _init(self, letters):
+        self.letters = letters.upper()
+        return
+
+    def __str__(self): return '.%s.' % (self.letters)
+    def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.letters)
+
+def set_subclasses(cls):
+    for basecls in cls.__bases__:
+        if issubclass(basecls, Base):
+            try:
+                subclasses = basecls.__dict__['_subclasses']
+            except KeyError:
+                subclasses = basecls._subclasses = []
+            subclasses.append(cls)
+    return
+
+is_name = re.compile(r'\A[a-z]\w*\Z',re.I).match
+
+class Expression:
+    def __new__(cls, string):
+        if is_name(string):
+            obj = object.__new__(Name)
+            obj._init(string)
+            return obj
+
+class NoMatch(Exception):
+    pass
+
+class Base(object):
+    def __new__(cls, string):
+        match = getattr(cls,'match',None)
+        if match is not None:
+            if match(string):
+                obj = object.__new__(cls)
+                obj._init(string)
+                return obj
+        else:
+            assert cls._subclasses,`cls`
+            for c in cls._subclasses:
+                try:
+                    return c(string)
+                except NoMatch, msg:
+                    pass
+        raise NoMatch,'%s: %r' % (cls.__name__, string)
+    def _init(self, string):
+        self.string = string
+        return
+    def __str__(self): return self.string
+    def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.string)
+
+class Primary(Base):
+    """
+    <primary> = <constant>
+                | <designator>
+                | <array-constructor>
+                | <structure-constructor>
+                | <function-reference>
+                | <type-param-inquiry>
+                | <type-param-name>
+                | ( <expr> )
+    <type-param-inquiry> = <designator> % <type-param-name>
+    """
+
+class Constant(Primary):
+    """
+    <constant> = <literal-constant>
+                 | <named-constant>
+    """
+
+class Designator(Primary):
+    """
+    <designator> = <object-name>
+                   | <array-element>
+                   | <array-section>
+                   | <structure-component>
+                   | <substring>
+    <array-element> = <data-ref>
+    <array-section> = <data-ref> [ ( <substring-range> ) ]
+    <data-ref> = <part-ref> [ % <part-ref> ]...
+    <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
+    <substring> = <parent-string> ( <substring-range> )
+    <parent-string> = <scalar-variable-name>
+                      | <array-element>
+                      | <scalar-structure-component>
+                      | <scalar-constant>
+    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
+    <structure-component> = <data-ref>
+    """
+
+class Name(Designator):
+    """
+    <name> = <letter> [ <alpha-numeric-character> ]...
+    """
+    match = is_name
+
+class LiteralConstant(Constant):
+    """
+    <constant> = <int-literal-constant>
+                 | <real-literal-constant>
+                 | <complex-literal-constant>
+                 | <logical-literal-constant>
+                 | <char-literal-constant>
+                 | <boz-literal-constant>
+    """
+
+class IntLiteralConstant(LiteralConstant):
+    """
+    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
+    <kind-param> = <digit-string>
+                 | <scalar-int-constant-name>
+    <digit-string> = <digit> [ <digit> ]...
+    """
+    match = re.compile(r'\A\d+\Z').match
+
+class NamedConstant(Constant, Name):
+    """
+    <named-constant> = <name>
+    """
+
+ClassType = type(Base)
+for clsname in dir():
+    cls = eval(clsname)
+    if isinstance(cls, ClassType) and issubclass(cls, Base):
+        set_subclasses(cls)
+
+class Level1Expression(Primary):
+    """
+    <level-1-expr> = [ <defined-unary-op> ] <primary>
+    <defined-unary-op> = . <letter> [ <letter> ]... .
+    """
+    def __new__(cls, primary, defined_unary_op = None):
+        obj = object.__new__(cls)
+        
+        return obj
+
+class Level2Expression:
+    """
+    <level-2-expr> = [ [ <level-2-expr> ] <add-op> ] <add-operand>
+    <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
+    <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
+    <power-op> = **
+    <mult-op>  = *
+                 | /
+    <add-op>   = +
+                 | -
+    """
+
+class Level3Expression:
+    """
+    <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
+    <concat-op>    = //
+    """
+
+class Level4Expression:
+    """
+    <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
+    <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
+    """
+
+class Level5Expression:
+    """
+    <level-5-expr> = [ <level-5-expr> <equiv-op> ] <equiv-operand>
+    <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
+    <or-operand> = [ <or-operand> <and-op> ] <and-operand>
+    <and-operand> = [ <not-op> ] <level-4-expr>
+    <not-op> = .NOT.
+    <and-op> = .AND.
+    <or-op>  = .OR.
+    <equiv-op> = .EQV.
+               | .NEQV.
+    """
+
+class Expression:
+    """
+    <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
+    <defined-binary-op> = . <letter> [ <letter> ]... .
+    """
+
+from splitline import string_replace_map
+
+def parse_expr(line, lower=False):
+    newline, repmap = string_replace_map(line, lower=lower)
+    if repmap:
+        raise NotImplementedError,`newline,repmap`

Added: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-19 22:55:23 UTC (rev 3372)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-20 06:43:31 UTC (rev 3373)
@@ -0,0 +1,35 @@
+
+
+from numpy.testing import *
+
+from expressions import *
+
+class test_Base(NumpyTestCase):
+
+    def check_name(self):
+        a = Name('a')
+        assert isinstance(a,Name),`a`
+        a = Designator('a')
+        assert isinstance(a,Name),`a`
+        a = Primary('a')
+        assert isinstance(a,Name),`a`
+        a = Base('a')
+        assert isinstance(a,Name),`a`
+        a = NamedConstant('a')
+        assert isinstance(a,Name),`a`
+        a = Constant('a')
+        assert isinstance(a,Name),`a`
+
+    def check_int_literal_constant(self):
+        a = IntLiteralConstant('1')
+        assert isinstance(a,IntLiteralConstant),`a`
+        a = LiteralConstant('1')
+        assert isinstance(a,IntLiteralConstant),`a`
+        a = Constant('1')
+        assert isinstance(a,IntLiteralConstant),`a`
+        a = Base('1')
+        assert isinstance(a,IntLiteralConstant),`a`
+        #a = NamedConstant('1') # raise NoMatch error
+
+if __name__ == "__main__":
+    NumpyTest().run()

Modified: trunk/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-19 22:55:23 UTC (rev 3372)
+++ trunk/numpy/f2py/lib/parser/typedecl_statements.py	2006-10-20 06:43:31 UTC (rev 3373)
@@ -20,7 +20,7 @@
 import string
 from base_classes import Statement, BeginStatement, EndStatement,\
      AttributeHolder, Variable
-from utils import split_comma, AnalyzeError, name_re, is_entity_decl, is_name, CHAR_BIT
+from utils import split_comma, AnalyzeError, name_re, is_entity_decl, is_name, CHAR_BIT, parse_array_spec
 
 # Intrinsic type specification statements
 
@@ -325,7 +325,7 @@
         if line.startswith('('):
             i = line.find(')')
             assert i!=-1,`line`
-            array_spec = split_comma(line[1:i].strip(), item)
+            array_spec = parse_array_spec(line[1:i].strip(), item)
             line = line[i+1:].lstrip()
         char_length = None
         if line.startswith('*'):

Modified: trunk/numpy/f2py/lib/parser/utils.py
===================================================================
--- trunk/numpy/f2py/lib/parser/utils.py	2006-10-19 22:55:23 UTC (rev 3372)
+++ trunk/numpy/f2py/lib/parser/utils.py	2006-10-20 06:43:31 UTC (rev 3373)
@@ -13,7 +13,7 @@
 
 __all__ = ['split_comma', 'specs_split_comma',
            'ParseError','AnalyzeError',
-           'get_module_file','parse_bind','parse_result','is_name',
+           'get_module_file','parse_bind','parse_result','is_name','parse_array_spec',
            'CHAR_BIT','str2stmt']
 
 import re
@@ -30,22 +30,28 @@
 is_entity_decl = re.compile(r'^[a-z_]\w*',re.I).match
 is_int_literal_constant = re.compile(r'^\d+(_\w+|)$').match
 
-def split_comma(line, item = None, comma=','):
+def split_comma(line, item = None, comma=',', keep_empty=False):
     items = []
     if item is None:
         for s in line.split(comma):
             s = s.strip()
-            if not s: continue
+            if not s and not keep_empty: continue
             items.append(s)
         return items
     newitem = item.copy(line, True)
     apply_map = newitem.apply_map
     for s in newitem.get_line().split(comma):
         s = apply_map(s).strip()
-        if not s: continue
+        if not s and not keep_empty: continue
         items.append(s)
     return items
 
+def parse_array_spec(line, item = None):
+    items = []
+    for spec in split_comma(line, item):
+        items.append(tuple(split_comma(spec, item, comma=':', keep_empty=True)))
+    return items
+
 def specs_split_comma(line, item = None, upper=False):
     specs0 = split_comma(line, item)
     specs = []



From numpy-svn at scipy.org  Fri Oct 20 02:44:53 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 20 Oct 2006 01:44:53 -0500 (CDT)
Subject: [Numpy-svn] r3374 - trunk/numpy/f2py/lib
Message-ID: <20061020064453.C812F39C098@new.scipy.org>

Author: pearu
Date: 2006-10-20 01:44:43 -0500 (Fri, 20 Oct 2006)
New Revision: 3374

Modified:
   trunk/numpy/f2py/lib/main.py
   trunk/numpy/f2py/lib/py_wrap_subprogram.py
   trunk/numpy/f2py/lib/py_wrap_type.py
   trunk/numpy/f2py/lib/test_scalar_in_out.py
Log:
F2PY G3: started impl array support.

Modified: trunk/numpy/f2py/lib/main.py
===================================================================
--- trunk/numpy/f2py/lib/main.py	2006-10-20 06:43:31 UTC (rev 3373)
+++ trunk/numpy/f2py/lib/main.py	2006-10-20 06:44:43 UTC (rev 3374)
@@ -310,7 +310,7 @@
     libraries = get_values(sys_argv,'-l',strip_prefix=True)
     _define_macros = get_values(sys_argv,'-D',strip_prefix=True)
     undef_macros = get_values(sys_argv,'-U',strip_prefix=True)
-    extra_objects = get_values(sys_argv,'','[.](o|a|so|dll|dynlib|sl)')
+    extra_objects = get_values(sys_argv,'','[.](o|a|so|dll|dylib|sl)')
 
     define_macros = []
     for item in _define_macros:

Modified: trunk/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-20 06:43:31 UTC (rev 3373)
+++ trunk/numpy/f2py/lib/py_wrap_subprogram.py	2006-10-20 06:44:43 UTC (rev 3374)
@@ -146,52 +146,54 @@
         for argname in block.args:
             argindex += 1
             var = block.a.variables[argname]
-            assert var.is_scalar(),'array support not implemented: "%s"' % (var)
             typedecl = var.get_typedecl()
             PythonCAPIType(parent, typedecl)
             ti = PyTypeInterface(typedecl)
             if var.is_intent_in():
                 self.kw_list.append('"%s"' % (argname))
 
-            if isinstance(typedecl, TypeStmt):
-                if var.is_intent_in():
-                    self.pyarg_format_list.append('O&')
-                    self.pyarg_obj_list.append('\npyobj_to_%s_inplace, &%s' % (ti.ctype, argname))
+            if var.is_scalar():
+                if isinstance(typedecl, TypeStmt):
+                    if var.is_intent_in():
+                        self.pyarg_format_list.append('O&')
+                        self.pyarg_obj_list.append('\npyobj_to_%s_inplace, &%s' % (ti.ctype, argname))
+                    else:
+                        self.frompyobj_list.append('%s = (%s*)pyobj_from_%s(NULL);' % (argname,ti.otype,ti.ctype))
+                        if not var.is_intent_out():
+                            self.clean_frompyobj_list.append('Py_DECREF(%s);' % (argname))
+                    self.decl_list.append('%s* %s = NULL;' % (ti.otype, argname))
+                    args_f.append('%s->data' % (argname)) # is_scalar
+                    ctype_args_f.append(ti.ctype)
                 else:
-                    self.frompyobj_list.append('%s = (%s*)pyobj_from_%s(NULL);' % (argname,ti.otype,ti.ctype))
-                    if not var.is_intent_out():
-                        self.clean_frompyobj_list.append('Py_DECREF(%s);' % (argname))
-                self.decl_list.append('%s* %s = NULL;' % (ti.otype, argname))
-                args_f.append('%s->data' % (argname)) # is_scalar
-                ctype_args_f.append(ti.ctype)
+                    if var.is_intent_in():
+                        self.pyarg_format_list.append('O&')
+                        self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ti.ctype, argname))
+                    assert not isinstance(typedecl, TypeDecl)
+                    if ti.ctype=='f2py_string0':
+                        if not var.is_intent_in():
+                            assert not var.is_intent_out(),'intent(out) not implemented for "%s"' % (var)
+                        self.decl_list.append('%s %s = {NULL,0};' % (ti.ctype, argname))
+                        args_f.append('%s.data' % argname)  # is_scalar
+                        ctype_args_f.append('char*')
+                        extra_ctype_args_f.append('int')
+                        extra_args_f.append('%s.len' % argname)
+                        self.clean_frompyobj_list.append(\
+                        'if (%s.len) free(%s.data);' % (argname,argname))
+                    else:
+                        self.decl_list.append('%s %s;' % (ti.ctype, argname))
+                        args_f.append('&'+argname) # is_scalar
+                        ctype_args_f.append(ti.ctype+'*')
+                if var.is_intent_out(): # and is_scalar
+                    if isinstance(typedecl, TypeStmt):
+                        self.return_format_list.append('N')
+                        self.return_obj_list.append('\n%s' % (argname))
+                    else:
+                        self.return_format_list.append('O&')
+                        self.return_obj_list.append('\npyobj_from_%s, &%s' % (ti.ctype, argname))
             else:
-                if var.is_intent_in():
-                    self.pyarg_format_list.append('O&')
-                    self.pyarg_obj_list.append('\npyobj_to_%s, &%s' % (ti.ctype, argname))
-                assert not isinstance(typedecl, TypeDecl)
-                if ti.ctype=='f2py_string0':
-                    if not var.is_intent_in():
-                        assert not var.is_intent_out(),'intent(out) not implemented for "%s"' % (var)
-                    self.decl_list.append('%s %s = {NULL,0};' % (ti.ctype, argname))
-                    args_f.append('%s.data' % argname)  # is_scalar
-                    ctype_args_f.append('char*')
-                    extra_ctype_args_f.append('int')
-                    extra_args_f.append('%s.len' % argname)
-                    self.clean_frompyobj_list.append(\
-                        'if (%s.len) free(%s.data);' % (argname,argname))
-                else:
-                    self.decl_list.append('%s %s;' % (ti.ctype, argname))
-                    args_f.append('&'+argname) # is_scalar
-                    ctype_args_f.append(ti.ctype+'*')
-            if var.is_intent_out(): # and is_scalar
-                if isinstance(typedecl, TypeStmt):
-                    self.return_format_list.append('N')
-                    self.return_obj_list.append('\n%s' % (argname))
-                else:
-                    self.return_format_list.append('O&')
-                    self.return_obj_list.append('\npyobj_from_%s, &%s' % (ti.ctype, argname))
+                print `ti,var.dimension,var.bounds`
+                assert var.is_scalar(),'array support not implemented: "%s"' % (var)
 
-
         self.call_list.append('%s_f(%s);' % (name,', '.join(args_f+extra_args_f)))
 
         self.ctype_args_f_list = ctype_args_f + extra_ctype_args_f

Modified: trunk/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-20 06:43:31 UTC (rev 3373)
+++ trunk/numpy/f2py/lib/py_wrap_type.py	2006-10-20 06:44:43 UTC (rev 3374)
@@ -12,6 +12,7 @@
     def __init__(self, typedecl):
         if isinstance(typedecl, TypeStmt):
             typedecl = typedecl.get_type_decl(typedecl.name)
+        self._typedecl = typedecl
         if isinstance(typedecl, TypeDecl):
             self.name = name = typedecl.name
             tname = 'f2py_type_%s_' % (name)
@@ -37,7 +38,13 @@
             self.otype = '%sObject' % (ctype)
             self.ftype = 'TYPE(%s)' % (name)
         return
-    
+    def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self._typedecl)
+    def __str__(self):
+        s = []
+        for k,v in self.__dict__.items():
+            if k.startswith('_'): continue
+            s.append('%s=%s' % (k,v))
+        return 'PyTypeInterface(%s)' % (', '.join(s))
 
 class PythonCAPIType(WrapperBase):
     """

Modified: trunk/numpy/f2py/lib/test_scalar_in_out.py
===================================================================
--- trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-20 06:43:31 UTC (rev 3373)
+++ trunk/numpy/f2py/lib/test_scalar_in_out.py	2006-10-20 06:44:43 UTC (rev 3374)
@@ -16,7 +16,7 @@
 import sys
 from numpy.testing import *
 
-def build(fortran_code, rebuild=True):
+def build(fortran_code, rebuild=True, build_dir='tmp'):
     modulename = os.path.splitext(os.path.basename(__file__))[0]+'_ext'
     try:
         exec ('import %s as m' % (modulename))
@@ -25,21 +25,21 @@
             os.remove(m.__file__)
             raise ImportError,'%s is newer than %s' % (__file__, m.__file__)
     except ImportError,msg:
-        assert str(msg).startswith('No module named'),str(msg)
+        assert str(msg)==('No module named %s' % (modulename)) \
+               or str(msg).startswith('%s is newer than' % (__file__)),str(msg)
         print msg, ', recompiling %s.' % (modulename)
-        import tempfile
-        fname = tempfile.mktemp() + '.f'
+        if not os.path.isdir(build_dir): os.makedirs(build_dir)
+        fname = os.path.join(build_dir,'%s_source.f' % (modulename))
         f = open(fname,'w')
         f.write(fortran_code)
         f.close()
-        sys_argv = ['--build-dir','foo']
+        sys_argv = ['--build-dir',build_dir]
         #sys_argv.extend(['-DF2PY_DEBUG_PYOBJ_TOFROM'])
         from main import build_extension
         sys_argv.extend(['-m',modulename, fname])
         build_extension(sys_argv)
-        os.remove(fname)
-        os.system(' '.join([sys.executable] + sys.argv))
-        sys.exit(0)
+        status = os.system(' '.join([sys.executable] + sys.argv))
+        sys.exit(status)
     return m
 
 fortran_code = '''



From numpy-svn at scipy.org  Fri Oct 20 08:32:29 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 20 Oct 2006 07:32:29 -0500 (CDT)
Subject: [Numpy-svn] r3375 - trunk/numpy/f2py/lib/parser
Message-ID: <20061020123229.7F52E39C015@new.scipy.org>

Author: pearu
Date: 2006-10-20 07:32:23 -0500 (Fri, 20 Oct 2006)
New Revision: 3375

Added:
   trunk/numpy/f2py/lib/parser/pattern_tools.py
Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY G3: Impl. pattern tools for expression parsing.

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-20 06:44:43 UTC (rev 3374)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-20 12:32:23 UTC (rev 3375)
@@ -28,50 +28,47 @@
     def __str__(self): return '.%s.' % (self.letters)
     def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.letters)
 
-def set_subclasses(cls):
-    for basecls in cls.__bases__:
-        if issubclass(basecls, Base):
-            try:
-                subclasses = basecls.__dict__['_subclasses']
-            except KeyError:
-                subclasses = basecls._subclasses = []
-            subclasses.append(cls)
-    return
+class NoChildAllowed:
+    pass
+class NoChildAllowedError(Exception):
+    pass
+class NoMatchError(Exception):
+    pass
 
 is_name = re.compile(r'\A[a-z]\w*\Z',re.I).match
 
-class Expression:
-    def __new__(cls, string):
-        if is_name(string):
-            obj = object.__new__(Name)
-            obj._init(string)
-            return obj
+class Base(object):
 
-class NoMatch(Exception):
-    pass
+    subclasses = {}
 
-class Base(object):
     def __new__(cls, string):
         match = getattr(cls,'match',None)
         if match is not None:
             if match(string):
                 obj = object.__new__(cls)
-                obj._init(string)
+                init = cls.__dict__.get('init', Base.init)
+                init(obj, string)
                 return obj
-        else:
-            assert cls._subclasses,`cls`
-            for c in cls._subclasses:
-                try:
-                    return c(string)
-                except NoMatch, msg:
-                    pass
-        raise NoMatch,'%s: %r' % (cls.__name__, string)
-    def _init(self, string):
+        for c in Base.subclasses.get(cls.__name__,[]):
+            try:
+                return c(string)
+            except NoMatchError:
+                pass
+        raise NoMatchError,'%s: %r' % (cls.__name__, string)
+
+    def init(self, string):
         self.string = string
         return
-    def __str__(self): return self.string
+    
+    def __str__(self):
+        str_func = self.__class__.__dict__.get('tostr', None)
+        if str_func is not None:
+            return str_func(self)
+        return self.string
     def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.string)
 
+
+
 class Primary(Base):
     """
     <primary> = <constant>
@@ -111,12 +108,8 @@
     <structure-component> = <data-ref>
     """
 
-class Name(Designator):
-    """
-    <name> = <letter> [ <alpha-numeric-character> ]...
-    """
-    match = is_name
 
+
 class LiteralConstant(Constant):
     """
     <constant> = <int-literal-constant>
@@ -127,27 +120,122 @@
                  | <boz-literal-constant>
     """
 
-class IntLiteralConstant(LiteralConstant):
+class SignedIntLiteralConstant(LiteralConstant):
     """
+    <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
+    <sign> = + | -
+    """
+    match = re.compile(r'\A[+-]\s*\d+\Z').match
+
+    def init(self, string):
+        Base.init(self, string)
+        self.content = [string[0], IntLiteralConstant(string[1:].lstrip())]
+        return
+    def tostr(self):
+        return '%s%s' % tuple(self.content)
+
+class NamedConstant(Constant):
+    """
+    <named-constant> = <name>
+    """
+
+def compose_patterns(pattern_list, names join=''):
+    return join.join(pattern_list)
+
+def add_pattern(pattern_name, *pat_list):
+    p = ''
+    for pat in pat_list:
+        if isinstance(pat, PatternOptional):
+            p += '(%s|)' % (add_pattern(None, pat.args))
+        elif isinstance(pat, PatternOr):
+            p += '(%s)' % ('|'.join([add_pattern(None, p1) for p1 in par.args]))
+        else:
+            subpat = pattern_map.get(pat,None)
+            if subpat is None:
+                p += pat
+            else:
+                p += '(?P<%s>%s)' % (pat, subpat)
+    if pattern_map is not None:
+        pattern_map[pattern_name] = p
+    return p
+
+
+
+class PatternBase:
+    def __init__(self,*args):
+        self.args = args
+        return
+
+class PatternOptional(PatternBase):
+    pass
+class PatternOr(PatternBase):
+    pass
+class PatternJoin(PatternBase):
+    join = ''
+
+pattern_map = {
+    'name': r'[a-zA-Z]\w+'
+    'digit-string': r'\d+'
+    }
+add_pattern('kind-param',
+            PatternOr('digit-string','name'))
+add_pattern('int-literal-constant',
+            'digit-string',PatternOptional('_','kind-param'))
+
+name_pat = r'[a-z]\w*'
+digit_pat = r'\d'
+digit_string_pat = r'\d+'
+kind_param_pat = '(%s|%s)' % (digit_string_pat, name_pat)
+
+class Name(Designator, NamedConstant, NoChildAllowed):
+    """
+    <name> = <letter> [ <alpha-numeric-character> ]...
+    """
+    match = re.compile(r'\A'+name_pat+r'\Z',re.I).match
+
+class IntLiteralConstant(SignedIntLiteralConstant, NoChildAllowed):
+    """
     <int-literal-constant> = <digit-string> [ _ <kind-param> ]
     <kind-param> = <digit-string>
                  | <scalar-int-constant-name>
     <digit-string> = <digit> [ <digit> ]...
     """
+    match = compose_pattern([digit_string_pat, '_', kind_param_pat],r'\s*')
+
+    compose_pattern('int-literal-constant','digit-string','_','kind-param')
+
+class DigitString(IntLiteralConstant, NoChildAllowed):
+    """
+    <digit-string> = <digit> [ <digit> ]...
+    """
     match = re.compile(r'\A\d+\Z').match
 
-class NamedConstant(Constant, Name):
+################# Setting up Base.subclasses #####################
+
+def set_subclasses(cls):
     """
-    <named-constant> = <name>
+    Append cls to cls base classes attribute lists `_subclasses`
+    so that all classes derived from Base know their subclasses
+    one level down.
     """
-
+    for basecls in cls.__bases__:
+        if issubclass(basecls, Base):
+            if issubclass(basecls, NoChildAllowed):
+                raise NoChildAllowedError,'%s while adding %s' % (basecls.__name__,cls.__name__)
+            try:
+                Base.subclasses[basecls.__name__].append(cls)
+            except KeyError:
+                Base.subclasses[basecls.__name__] = [cls]
+    return
 ClassType = type(Base)
 for clsname in dir():
     cls = eval(clsname)
     if isinstance(cls, ClassType) and issubclass(cls, Base):
         set_subclasses(cls)
 
-class Level1Expression(Primary):
+####################################################################
+
+class Level1Expression:#(Primary):
     """
     <level-1-expr> = [ <defined-unary-op> ] <primary>
     <defined-unary-op> = . <letter> [ <letter> ]... .

Added: trunk/numpy/f2py/lib/parser/pattern_tools.py
===================================================================
--- trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-20 06:44:43 UTC (rev 3374)
+++ trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-20 12:32:23 UTC (rev 3375)
@@ -0,0 +1,119 @@
+
+import re
+
+class Pattern:
+    """
+    p1 | p2    -> <p1> | <p2>
+    p1 + p2    -> <p1> <p2>
+    p1 & p2    -> <p1><p2>
+    ~p1        -> [ <p1> ]
+    ~~p1       -> [ <p1> ]...
+    ~~~p1      -> <p1> [ <p1> ]...
+    ~~~~p1     -> <p1> [ <p1> ]...
+    abs(p1)    -> whole string match of <p1>
+    p1.named(name) -> match of <p1> has name
+    p1.match(string) -> return string match with <p1>
+    """
+    _special_symbol_map = {'.': '[.]',
+                           '*': '[*]',
+                           '+': '[+]',
+                           '|': '[|]',
+                           '(': r'\(',
+                           ')': r'\)',
+                           }
+
+    def __init__(self, label, pattern, optional=0):
+        self.label = label
+        self.pattern = pattern
+        self.optional = optional
+        return
+
+    def match(self, string):
+        if hasattr(self, '_compiled_match'):
+            return self._compiled.match(string)
+        self._compiled = compiled = re.compile(self.pattern)
+        return compiled.match(string)
+
+    def __abs__(self):
+        return Pattern(self.label, r'\A' + self.pattern+ r'\Z')
+
+    def __repr__(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.label, self.pattern)
+
+    def __or__(self, other):
+        label = '( %s OR %s )' % (self.label, other.label)
+        pattern = '(%s|%s)' % (self.pattern, other.pattern)
+        return Pattern(label, pattern)
+
+    def __and__(self, other):
+        if isinstance(other, Pattern):
+            label = '%s%s' % (self.label, other.label)
+            pattern = self.pattern + other.pattern
+        else:
+            assert isinstance(other,str),`other`
+            label = '%s%s' % (self.label, other)
+            pattern = self.pattern + other
+        return Pattern(label, pattern)
+
+    def __rand__(self, other):
+        assert isinstance(other,str),`other`
+        label = '%s%s' % (other, self.label)
+        pattern = other + self.pattern
+        return Pattern(label, pattern)
+
+    def __invert__(self):
+        if self.optional:
+            if self.optional==1:
+                return Pattern(self.label + '...', self.pattern[:-1] + '*', 2)
+            if self.optional==2:
+                return Pattern('%s %s' % (self.label[1:-4].strip(), self.label), self.pattern[:-1] + '+', 3)
+            return self
+        label = '[ %s ]' % (self.label)
+        pattern = '(%s)?' % (self.pattern)
+        return Pattern(label, pattern, 1)
+
+    def __add__(self, other):
+        if isinstance(other, Pattern):
+            label = '%s %s' % (self.label, other.label)
+            pattern = self.pattern + r'\s*' + other.pattern
+        else:
+            assert isinstance(other,str),`other`
+            label = '%s %s' % (self.label, other)
+            other = self._special_symbol_map.get(other, other)
+            pattern = self.pattern + r'\s*' + other
+        return Pattern(label, pattern)
+
+    def __radd__(self, other):
+        assert isinstance(other,str),`other`
+        label = '%s %s' % (other, self.label)
+        other = self._special_symbol_map.get(other, other)
+        pattern = other + r'\s*' + self.pattern
+        return Pattern(label, pattern)
+
+    def named(self, name = None):
+        if name is None:
+            label = self.label
+            assert label[0]+label[-1]=='<>' and ' ' not in label,`label`
+        else:
+            label = '<%s>' % (name)
+        pattern = '(?P%s%s)' % (label.replace('-','_'), self.pattern)
+        return Pattern(label, pattern)
+
+name = Pattern('<name>', r'[a-z]\w*')
+digit_string = Pattern('<digit-string>',r'\d+')
+sign = Pattern('<sign>',r'[+-]')
+exponent_letter = Pattern('<exponent-letter>',r'[ED]')
+
+kind_param = digit_string | name
+signed_digit_string = ~sign + digit_string
+int_literal_constant = digit_string + ~('_' + kind_param)
+signed_int_literal_constant = ~sign + int_literal_constant
+
+exponent = signed_digit_string
+significand = digit_string + '.' + ~digit_string | '.' + digit_string
+real_literal_constant = significand + ~(exponent_letter + exponent) + ~ ('_' + kind_param) | \
+                        digit_string + exponent_letter + exponent + ~ ('_' + kind_param)
+signed_real_literal_constant = ~sign + real_literal_constant
+
+
+print signed_real_literal_constant

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-20 06:44:43 UTC (rev 3374)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-20 12:32:23 UTC (rev 3375)
@@ -11,7 +11,7 @@
         assert isinstance(a,Name),`a`
         a = Designator('a')
         assert isinstance(a,Name),`a`
-        a = Primary('a')
+        a = Constant('a')
         assert isinstance(a,Name),`a`
         a = Base('a')
         assert isinstance(a,Name),`a`
@@ -29,6 +29,10 @@
         assert isinstance(a,IntLiteralConstant),`a`
         a = Base('1')
         assert isinstance(a,IntLiteralConstant),`a`
+        a = Base('+1')
+        assert isinstance(a,SignedIntLiteralConstant),`a`
+        a = IntLiteralConstant('0')
+        assert isinstance(a,IntLiteralConstant),`a`
         #a = NamedConstant('1') # raise NoMatch error
 
 if __name__ == "__main__":



From numpy-svn at scipy.org  Sat Oct 21 01:48:22 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 21 Oct 2006 00:48:22 -0500 (CDT)
Subject: [Numpy-svn] r3376 - trunk/numpy/core/src
Message-ID: <20061021054822.DB10339C16E@new.scipy.org>

Author: oliphant
Date: 2006-10-21 00:48:11 -0500 (Sat, 21 Oct 2006)
New Revision: 3376

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Fix possible unitialized 'i' to fix #359

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-20 12:32:23 UTC (rev 3375)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-21 05:48:11 UTC (rev 3376)
@@ -803,6 +803,7 @@
                         else if (rtypenums[0] == funcdata->arg_types[self->nin]) {
                                 i = nargs;
                         }
+			else i = -1;
                         if (i == nargs) {
                                 *function = funcdata->func;
                                 *data = funcdata->data;
@@ -831,6 +832,7 @@
                 else if (rtypenums[0] == self->types[j*nargs+self->nin]) {
                         i = nargs;
                 }
+		else i = -1;
                 if (i == nargs) {
                         *function = self->functions[j];
                         *data = self->data[j];



From numpy-svn at scipy.org  Sat Oct 21 05:55:30 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 21 Oct 2006 04:55:30 -0500 (CDT)
Subject: [Numpy-svn] r3377 - trunk/numpy/f2py/lib/parser
Message-ID: <20061021095530.3F3D439C023@new.scipy.org>

Author: pearu
Date: 2006-10-21 04:55:23 -0500 (Sat, 21 Oct 2006)
New Revision: 3377

Modified:
   trunk/numpy/f2py/lib/parser/base_classes.py
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/pattern_tools.py
Log:
F2PY G3: fixed bugs (ticket 361), impl expression parser.

Modified: trunk/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-21 05:48:11 UTC (rev 3376)
+++ trunk/numpy/f2py/lib/parser/base_classes.py	2006-10-21 09:55:23 UTC (rev 3377)
@@ -366,7 +366,7 @@
 
     def is_deferred_shape_array(self):
         if not self.is_array(): return False
-        return self.is_allocatable() or self.is_pointer():
+        return self.is_allocatable() or self.is_pointer()
 
     def is_assumed_size_array(self):
         if not self.is_array(): return False

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-21 05:48:11 UTC (rev 3376)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-21 09:55:23 UTC (rev 3377)
@@ -13,6 +13,8 @@
 """
 
 import re
+from splitline import string_replace_map
+import pattern_tools as pattern
 
 class DefinedOp:
     def __new__(cls, letters):
@@ -35,262 +37,410 @@
 class NoMatchError(Exception):
     pass
 
-is_name = re.compile(r'\A[a-z]\w*\Z',re.I).match
 
+## class Designator(Primary):
+##     """
+##     <designator> = <object-name>
+##                    | <array-element>
+##                    | <array-section>
+##                    | <structure-component>
+##                    | <substring>
+##     <array-element> = <data-ref>
+##     <array-section> = <data-ref> [ ( <substring-range> ) ]
+##     <data-ref> = <part-ref> [ % <part-ref> ]...
+##     <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
+##     <substring> = <parent-string> ( <substring-range> )
+##     <parent-string> = <scalar-variable-name>
+##                       | <array-element>
+##                       | <scalar-structure-component>
+##                       | <scalar-constant>
+##     <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
+##     <structure-component> = <data-ref>
+##     """
+
+
+
+## class LiteralConstant(Constant):
+##     """
+##     <constant> = <int-literal-constant>
+##                  | <real-literal-constant>
+##                  | <complex-literal-constant>
+##                  | <logical-literal-constant>
+##                  | <char-literal-constant>
+##                  | <boz-literal-constant>
+##     """
+
+## class SignedIntLiteralConstant(LiteralConstant):
+##     """
+##     <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
+##     <sign> = + | -
+##     """
+##     match = re.compile(r'\A[+-]\s*\d+\Z').match
+
+##     def init(self, string):
+##         Base.init(self, string)
+##         self.content = [string[0], IntLiteralConstant(string[1:].lstrip())]
+##         return
+##     def tostr(self):
+##         return '%s%s' % tuple(self.content)
+
+## class NamedConstant(Constant):
+##     """
+##     <named-constant> = <name>
+##     """
+
+## class Name(Designator, NamedConstant, NoChildAllowed):
+##     """
+##     <name> = <letter> [ <alpha-numeric-character> ]...
+##     """
+##     match = re.compile(r'\A'+name_pat+r'\Z',re.I).match
+
+## class IntLiteralConstant(SignedIntLiteralConstant, NoChildAllowed):
+##     """
+##     <int-literal-constant> = <digit-string> [ _ <kind-param> ]
+##     <kind-param> = <digit-string>
+##                  | <scalar-int-constant-name>
+##     <digit-string> = <digit> [ <digit> ]...
+##     """
+##     match = compose_pattern([digit_string_pat, '_', kind_param_pat],r'\s*')
+
+##     compose_pattern('int-literal-constant','digit-string','_','kind-param')
+
+## class DigitString(IntLiteralConstant, NoChildAllowed):
+##     """
+##     <digit-string> = <digit> [ <digit> ]...
+##     """
+##     match = re.compile(r'\A\d+\Z').match
+
+
 class Base(object):
 
     subclasses = {}
 
     def __new__(cls, string):
-        match = getattr(cls,'match',None)
-        if match is not None:
-            if match(string):
-                obj = object.__new__(cls)
-                init = cls.__dict__.get('init', Base.init)
-                init(obj, string)
-                return obj
-        for c in Base.subclasses.get(cls.__name__,[]):
-            try:
-                return c(string)
-            except NoMatchError:
-                pass
+        if hasattr(cls,'match'):
+            match = cls.match
+            result = match(string)
+        else:
+            result = None
+        if isinstance(result, tuple):
+            obj = object.__new__(cls)
+            obj.string = string
+            obj.init(*result)
+            return obj
+        elif isinstance(result, Base):
+            return result
+        elif result is None:
+            for subcls in Base.subclasses.get(cls.__name__,[]):
+                try:
+                    return subcls(string)
+                except NoMatchError:
+                    pass
+        else:
+            raise AssertionError,`result`
         raise NoMatchError,'%s: %r' % (cls.__name__, string)
 
-    def init(self, string):
-        self.string = string
-        return
+    findall = staticmethod(re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall)
     
-    def __str__(self):
-        str_func = self.__class__.__dict__.get('tostr', None)
-        if str_func is not None:
-            return str_func(self)
-        return self.string
-    def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.string)
+    def match_binary_operand_right(lhs_cls, op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.rsplit(line)
+        if t is None: return
+        lhs, op, rhs = t
+        for k in Base.findall(lhs):
+            lhs = lhs.replace(k, repman[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repman[k])
+        lhs_obj = lhs_cls(lhs)
+        rhs_obj = rhs_cls(rhs)
+        return lhs_obj, t[1], rhs_obj
+    match_binary_operand_right = staticmethod(match_binary_operand_right)
 
+    def match_binary_unary_operand_right(lhs_cls, op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.rsplit(line)
+        if t is None: return
+        lhs, op, rhs = t
+        if lhs: 
+            for k in Base.findall(lhs):
+                lhs = lhs.replace(k, repman[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repman[k])
+        rhs_obj = rhs_cls(rhs)
+        if lhs:
+            lhs_obj = lhs_cls(lhs)
+            return lhs_obj, t[1], rhs_obj
+        else:
+            return None, t[1], rhs_obj
+    match_binary_unary_operand_right = staticmethod(match_binary_unary_operand_right)
 
+    def match_binary_operand_left(lhs_cls, op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.lsplit(line)
+        if t is None: return
+        lhs, op, rhs = t
+        for k in Base.findall(lhs):
+            lhs = lhs.replace(k, repman[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repman[k])
+        lhs_obj = lhs_cls(lhs)
+        rhs_obj = rhs_cls(rhs)
+        return lhs_obj, t[1], rhs_obj
+    match_binary_operand_left = staticmethod(match_binary_operand_left)
 
-class Primary(Base):
-    """
-    <primary> = <constant>
-                | <designator>
-                | <array-constructor>
-                | <structure-constructor>
-                | <function-reference>
-                | <type-param-inquiry>
-                | <type-param-name>
-                | ( <expr> )
-    <type-param-inquiry> = <designator> % <type-param-name>
-    """
+    def match_unary_operand(op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.lsplit(line)
+        if t is None: return
+        lhs, op, rhs = t
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repman[k])
+        assert not lhs,`lhs`
+        rhs_obj = rhs_cls(rhs)
+        return t[1], rhs_obj
+    match_unary_operand = staticmethod(match_unary_operand)
 
-class Constant(Primary):
-    """
-    <constant> = <literal-constant>
-                 | <named-constant>
-    """
+    def init_binary_operand(self, lhs, op, rhs):
+        self.lhs = lhs
+        self.op = op
+        self.rhs = rhs
+        return
 
-class Designator(Primary):
-    """
-    <designator> = <object-name>
-                   | <array-element>
-                   | <array-section>
-                   | <structure-component>
-                   | <substring>
-    <array-element> = <data-ref>
-    <array-section> = <data-ref> [ ( <substring-range> ) ]
-    <data-ref> = <part-ref> [ % <part-ref> ]...
-    <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
-    <substring> = <parent-string> ( <substring-range> )
-    <parent-string> = <scalar-variable-name>
-                      | <array-element>
-                      | <scalar-structure-component>
-                      | <scalar-constant>
-    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
-    <structure-component> = <data-ref>
-    """
+    def init_unary_operand(self, op, rhs):
+        self.op = op
+        self.rhs = rhs
+        return
 
+    def init_primary(self, primary):
+        self.primary = primary
+        return
 
+    def tostr_binary_operand(self):
+        return '%s %s %s' % (self.lhs, self.op, self.rhs)
 
-class LiteralConstant(Constant):
-    """
-    <constant> = <int-literal-constant>
-                 | <real-literal-constant>
-                 | <complex-literal-constant>
-                 | <logical-literal-constant>
-                 | <char-literal-constant>
-                 | <boz-literal-constant>
-    """
+    def tostr_binary_unary_operand(self):
+        if self.lhs is None:
+            return '%s %s' % (self.op, self.rhs)
+        return '%s %s %s' % (self.lhs, self.op, self.rhs)
 
-class SignedIntLiteralConstant(LiteralConstant):
-    """
-    <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
-    <sign> = + | -
-    """
-    match = re.compile(r'\A[+-]\s*\d+\Z').match
+    def tostr_unary_operand(self):
+        return '%s %s' % (self.op, self.rhs)
 
-    def init(self, string):
-        Base.init(self, string)
-        self.content = [string[0], IntLiteralConstant(string[1:].lstrip())]
-        return
-    def tostr(self):
-        return '%s%s' % tuple(self.content)
+    def tostr_primary(self):
+        return str(self.primary)
 
-class NamedConstant(Constant):
-    """
-    <named-constant> = <name>
-    """
+    def torepr_binary_operand(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
 
-def compose_patterns(pattern_list, names join=''):
-    return join.join(pattern_list)
+    def torepr_binary_unary_operand(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
 
-def add_pattern(pattern_name, *pat_list):
-    p = ''
-    for pat in pat_list:
-        if isinstance(pat, PatternOptional):
-            p += '(%s|)' % (add_pattern(None, pat.args))
-        elif isinstance(pat, PatternOr):
-            p += '(%s)' % ('|'.join([add_pattern(None, p1) for p1 in par.args]))
-        else:
-            subpat = pattern_map.get(pat,None)
-            if subpat is None:
-                p += pat
-            else:
-                p += '(?P<%s>%s)' % (pat, subpat)
-    if pattern_map is not None:
-        pattern_map[pattern_name] = p
-    return p
+    def torepr_unary_operand(self):
+        return '%s(%r, %r)' % (self.__class__.__name__,self.op, self.rhs)
 
+    def torepr_primary(self):
+        return '%s(%r)' % (self.__class__.__name__,self.primary)
 
+    def __str__(self):
+        if self.__class__.__dict__.has_key('tostr'):
+            return self.tostr()
+        return repr(self)
 
-class PatternBase:
-    def __init__(self,*args):
-        self.args = args
-        return
+    def __repr__(self):
+        if self.__class__.__dict__.has_key('torepr'):
+            return self.torepr()
+        return '%s(%r)' % (self.__class__.__name__, self.string)
 
-class PatternOptional(PatternBase):
-    pass
-class PatternOr(PatternBase):
-    pass
-class PatternJoin(PatternBase):
-    join = ''
-
-pattern_map = {
-    'name': r'[a-zA-Z]\w+'
-    'digit-string': r'\d+'
-    }
-add_pattern('kind-param',
-            PatternOr('digit-string','name'))
-add_pattern('int-literal-constant',
-            'digit-string',PatternOptional('_','kind-param'))
-
-name_pat = r'[a-z]\w*'
-digit_pat = r'\d'
-digit_string_pat = r'\d+'
-kind_param_pat = '(%s|%s)' % (digit_string_pat, name_pat)
-
-class Name(Designator, NamedConstant, NoChildAllowed):
+class Expr(Base):
     """
-    <name> = <letter> [ <alpha-numeric-character> ]...
+    <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
+    <defined-binary-op> = . <letter> [ <letter> ]... .
     """
-    match = re.compile(r'\A'+name_pat+r'\Z',re.I).match
+    def match(string):
+        return Base.match_binary_operand_right(\
+            Expr,pattern.defined_binary_op.named(),Level_5_Expr,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
 
-class IntLiteralConstant(SignedIntLiteralConstant, NoChildAllowed):
+class Level_5_Expr(Expr):
     """
-    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
-    <kind-param> = <digit-string>
-                 | <scalar-int-constant-name>
-    <digit-string> = <digit> [ <digit> ]...
+    <level-5-expr> = [ <level-5-expr> <equiv-op> ] <equiv-operand>
+    <equiv-op> = .EQV.
+               | .NEQV.
     """
-    match = compose_pattern([digit_string_pat, '_', kind_param_pat],r'\s*')
-
-    compose_pattern('int-literal-constant','digit-string','_','kind-param')
-
-class DigitString(IntLiteralConstant, NoChildAllowed):
+    def match(string):
+        return Base.match_binary_operand_right(\
+            Level_5_Expr,pattern.equiv_op.named(),Equiv_Operand,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+    
+class Equiv_Operand(Level_5_Expr):
     """
-    <digit-string> = <digit> [ <digit> ]...
+    <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
+    <or-op>  = .OR.
     """
-    match = re.compile(r'\A\d+\Z').match
+    def match(string):
+        return Base.match_binary_operand_right(\
+            Equiv_Operand,pattern.or_op.named(),Or_Operand,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+    
+class Or_Operand(Equiv_Operand):
+    """
+    <or-operand> = [ <or-operand> <and-op> ] <and-operand>    
+    <and-op> = .AND.
 
-################# Setting up Base.subclasses #####################
-
-def set_subclasses(cls):
     """
-    Append cls to cls base classes attribute lists `_subclasses`
-    so that all classes derived from Base know their subclasses
-    one level down.
+    def match(string):
+        return Base.match_binary_operand_right(\
+            Or_Operand,pattern.and_op.named(),And_Operand,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+    
+class And_Operand(Or_Operand):
     """
-    for basecls in cls.__bases__:
-        if issubclass(basecls, Base):
-            if issubclass(basecls, NoChildAllowed):
-                raise NoChildAllowedError,'%s while adding %s' % (basecls.__name__,cls.__name__)
-            try:
-                Base.subclasses[basecls.__name__].append(cls)
-            except KeyError:
-                Base.subclasses[basecls.__name__] = [cls]
-    return
-ClassType = type(Base)
-for clsname in dir():
-    cls = eval(clsname)
-    if isinstance(cls, ClassType) and issubclass(cls, Base):
-        set_subclasses(cls)
-
-####################################################################
-
-class Level1Expression:#(Primary):
+    <and-operand> = [ <not-op> ] <level-4-expr>
+    <not-op> = .NOT.
     """
-    <level-1-expr> = [ <defined-unary-op> ] <primary>
-    <defined-unary-op> = . <letter> [ <letter> ]... .
+    def match(string):
+        return Base.match_unary_operand(\
+            pattern.not_op.named(),Level_4_Expr,string)
+    match = staticmethod(match)
+    init = Base.init_unary_operand
+    tostr = Base.tostr_unary_operand
+    torepr = Base.torepr_unary_operand
+    
+class Level_4_Expr(And_Operand):
     """
-    def __new__(cls, primary, defined_unary_op = None):
-        obj = object.__new__(cls)
-        
-        return obj
-
-class Level2Expression:
+    <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
+    <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
     """
+    def match(string):
+        return Base.match_binary_operand_right(\
+            Level_3_Expr,pattern.rel_op.named(),Level_3_Expr,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+    
+class Level_3_Expr(Level_4_Expr):
+    """
+    <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
+    <concat-op>    = //
+    """
+    def match(string):
+        return Base.match_binary_operand_right(\
+            Level_3_Expr,pattern.concat_op.named(),Level_2_Expr,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+    
+class Level_2_Expr(Level_3_Expr):
+    """
     <level-2-expr> = [ [ <level-2-expr> ] <add-op> ] <add-operand>
-    <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
-    <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
-    <power-op> = **
-    <mult-op>  = *
-                 | /
     <add-op>   = +
                  | -
     """
 
-class Level3Expression:
+    def match(string):
+        return Base.match_binary_unary_operand_right(\
+            Level_2_Expr,pattern.add_op.named(),Add_Operand,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_unary_operand
+    torepr = Base.torepr_binary_operand
+    
+class Add_Operand(Level_2_Expr):
     """
-    <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
-    <concat-op>    = //
+    <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
+    <mult-op>  = *
+                 | /
     """
 
-class Level4Expression:
+    def match(string):
+        return Base.match_binary_operand_right(\
+            Add_Operand,pattern.mult_op.named(),Mult_Operand,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+    
+class Mult_Operand(Add_Operand):
     """
-    <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
-    <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
+    <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
+    <power-op> = **
     """
 
-class Level5Expression:
+    def match(string):
+        return Base.match_binary_operand_left(\
+            Level_1_Expr,pattern.power_op.named(),Mult_Operand,string)
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+    
+class Level_1_Expr(Mult_Operand):
     """
-    <level-5-expr> = [ <level-5-expr> <equiv-op> ] <equiv-operand>
-    <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
-    <or-operand> = [ <or-operand> <and-op> ] <and-operand>
-    <and-operand> = [ <not-op> ] <level-4-expr>
-    <not-op> = .NOT.
-    <and-op> = .AND.
-    <or-op>  = .OR.
-    <equiv-op> = .EQV.
-               | .NEQV.
+    <level-1-expr> = [ <defined-unary-op> ] <primary>
+    <defined-unary-op> = . <letter> [ <letter> ]... .
     """
+    def match(string):
+        return Base.match_unary_operand(\
+            pattern.defined_unary_op.named(),Primary,string)
+    match = staticmethod(match)
+    init = Base.init_unary_operand
+    tostr = Base.tostr_unary_operand
+    torepr = Base.torepr_unary_operand
+    
+class Primary(Level_1_Expr):
+    """
+    <primary> = <constant>
+                | <designator>
+                | <array-constructor>
+                | <structure-constructor>
+                | <function-reference>
+                | <type-param-inquiry>
+                | <type-param-name>
+                | ( <expr> )
+    <type-param-inquiry> = <designator> % <type-param-name>
+    """
 
-class Expression:
+class Constant(Primary):
     """
-    <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
-    <defined-binary-op> = . <letter> [ <letter> ]... .
+    <constant> = <literal-constant>
+                 | <named-constant>
     """
+    def match(string):
+        if pattern.abs_constant.match(string):
+            return (string,)
+        return
+    match = staticmethod(match)
+    init = Base.init_primary
+    tostr = Base.tostr_primary
+    torepr = Base.torepr_primary
 
-from splitline import string_replace_map
+ClassType = type(Base)
+for clsname in dir():
+    cls = eval(clsname)
+    if isinstance(cls, ClassType) and issubclass(cls, Base):
+        for basecls in cls.__bases__:
+            if issubclass(basecls, Base):
+                try:
+                    Base.subclasses[basecls.__name__].append(cls)
+                except KeyError:
+                    Base.subclasses[basecls.__name__] = [cls]
 
-def parse_expr(line, lower=False):
-    newline, repmap = string_replace_map(line, lower=lower)
-    if repmap:
-        raise NotImplementedError,`newline,repmap`
+
+print Constant('a')
+print `Constant('1')`
+print `Base('+1')`
+print `Base('c-1*a/b')`

Modified: trunk/numpy/f2py/lib/parser/pattern_tools.py
===================================================================
--- trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-21 05:48:11 UTC (rev 3376)
+++ trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-21 09:55:23 UTC (rev 3377)
@@ -1,4 +1,16 @@
+"""
+Tools for constructing patterns.
 
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
+
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
 import re
 
 class Pattern:
@@ -20,6 +32,15 @@
                            '|': '[|]',
                            '(': r'\(',
                            ')': r'\)',
+                           '[': r'\[',
+                           ']': r'\]',
+                           '^': '[^]',
+                           '$': '[$]',
+                           '?': '[?]',
+                           '{': '\{',
+                           '}': '\}',
+                           '>': '[>]',
+                           '<': '[<]',
                            }
 
     def __init__(self, label, pattern, optional=0):
@@ -28,12 +49,48 @@
         self.optional = optional
         return
 
+    def get_compiled(self):
+        try:
+            return self._compiled_pattern
+        except AttributeError:
+            self._compiled_pattern = compiled = re.compile(self.pattern)
+            return compiled
+
     def match(self, string):
-        if hasattr(self, '_compiled_match'):
-            return self._compiled.match(string)
-        self._compiled = compiled = re.compile(self.pattern)
-        return compiled.match(string)
+        return self.get_compiled().match(string)
 
+    def rsplit(self, string):
+        """
+        Return (<lhs>, <pattern_match>, <rhs>) where
+          string = lhs + pattern_match + rhs
+        and rhs does not contain pattern_match.
+        If no pattern_match is found in string, return None.
+        """
+        compiled = self.get_compiled()
+        t = compiled.split(string)
+        if len(t) < 3: return
+        rhs = t[-1]
+        pattern_match = t[-2]
+        assert abs(self).match(pattern_match),`pattern_match`
+        lhs = ''.join(t[:-2])
+        return lhs, pattern_match, rhs
+
+    def lsplit(self, string):
+        """
+        Return (<lhs>, <pattern_match>, <rhs>) where
+          string = lhs + pattern_match + rhs
+        and rhs does not contain pattern_match.
+        If no pattern_match is found in string, return None.
+        """
+        compiled = self.get_compiled()
+        t = compiled.split(string) # can be optimized
+        if len(t) < 3: return
+        lhs = t[0]
+        pattern_match = t[1]
+        rhs = ''.join(t[2:])
+        assert abs(self).match(pattern_match),`pattern_match`
+        return lhs, pattern_match, rhs
+
     def __abs__(self):
         return Pattern(self.label, r'\A' + self.pattern+ r'\Z')
 
@@ -42,7 +99,10 @@
 
     def __or__(self, other):
         label = '( %s OR %s )' % (self.label, other.label)
-        pattern = '(%s|%s)' % (self.pattern, other.pattern)
+        if self.pattern==other.pattern:
+            pattern = self.pattern
+        else:
+            pattern = '(%s|%s)' % (self.pattern, other.pattern)
         return Pattern(label, pattern)
 
     def __and__(self, other):
@@ -99,21 +159,106 @@
         pattern = '(?P%s%s)' % (label.replace('-','_'), self.pattern)
         return Pattern(label, pattern)
 
-name = Pattern('<name>', r'[a-z]\w*')
+    def rename(self, label):
+        if label[0]+label[-1]!='<>':
+            label = '<%s>' % (label)
+        return Pattern(label, self.pattern, self.optional)
+
+# Predefined patterns
+
+letter = Pattern('<letter>','[a-zA-Z]')
+name = Pattern('<name>', r'[a-zA-Z]\w*')
+digit = Pattern('<digit>',r'\d')
+underscore = Pattern('<underscore>', '_')
+hex_digit = Pattern('<hex-digit>',r'[\da-fA-F]')
+
 digit_string = Pattern('<digit-string>',r'\d+')
+hex_digit_string = Pattern('<hex-digit-string>',r'[\da-fA-F]+')
+
 sign = Pattern('<sign>',r'[+-]')
 exponent_letter = Pattern('<exponent-letter>',r'[ED]')
 
+alphanumeric_character = Pattern('<alphanumeric-character>','\w') # [a-z0-9_]
+special_character = Pattern('<special-character>',r'[ =+-*/\()[\]{},.:;!"%&~<>?,\'`^|$#@]')
+character = alphanumeric_character | special_character
+
 kind_param = digit_string | name
 signed_digit_string = ~sign + digit_string
 int_literal_constant = digit_string + ~('_' + kind_param)
 signed_int_literal_constant = ~sign + int_literal_constant
 
+binary_constant = '[Bb]' + ("'" & digit_string & "'" | '"' & digit_string & '"')
+octal_constant = '[Oo]' + ("'" & digit_string & "'" | '"' & digit_string & '"')
+hex_constant = '[Zz]' + ("'" & hex_digit_string & "'" | '"' & hex_digit_string & '"')
+boz_literal_constant = binary_constant | octal_constant | hex_constant
+
 exponent = signed_digit_string
 significand = digit_string + '.' + ~digit_string | '.' + digit_string
 real_literal_constant = significand + ~(exponent_letter + exponent) + ~ ('_' + kind_param) | \
                         digit_string + exponent_letter + exponent + ~ ('_' + kind_param)
 signed_real_literal_constant = ~sign + real_literal_constant
 
+named_constant = name
+real_part = signed_int_literal_constant | signed_real_literal_constant | named_constant
+imag_part = real_part
+complex_literal_constant = '(' + real_part + ',' + imag_part + ')'
 
-print signed_real_literal_constant
+char_literal_constant = ~( kind_param + '_') + "'.*'" | ~( kind_param + '_') + '".*"'
+
+logical_literal_constant = '[.](TRUE|FALSE)[.]' + ~ ('_' + kind_param)
+literal_constant = int_literal_constant | real_literal_constant | complex_literal_constant | logical_literal_constant | char_literal_constant | boz_literal_constant
+constant = literal_constant | named_constant
+int_constant = int_literal_constant | boz_literal_constant | named_constant
+char_constant = char_literal_constant | named_constant
+abs_constant = abs(constant)
+
+power_op = Pattern('<power-op>','[*]{2}')
+mult_op = Pattern('<mult-op>','[*/]')
+add_op = Pattern('<add-op>','[+-]')
+concat_op = Pattern('<concat-op>','[/]{}')
+rel_op = Pattern('<rel-op>','([.](EQ|NE|LT|LE|GT|GE)[.])|[=]{2}|/[=]|[<]|[<][=]|[>]|[=][>]')
+not_op = Pattern('<not-op>','[.]NOT[.]')
+and_op = Pattern('<and-op>','[.]AND[.]')
+or_op = Pattern('<or-op>','[.]OR[.]')
+equiv_op = Pattern('<equiv-op>','[.](EQV|NEQV)[.]')
+intrinsic_operator = power_op | mult_op | add_op | concat_op | rel_op | not_op | and_op | or_op | equiv_op
+extended_intrinsic_operator = intrinsic_operator
+
+defined_unary_op = Pattern('<defined-unary-op>','[.][a-zA-Z]+[.]')
+defined_binary_op = Pattern('<defined-binary-op>','[.][a-zA-Z]+[.]')
+defined_operator = defined_unary_op | defined_binary_op | extended_intrinsic_operator
+
+label = Pattern('<label>','\d{1,5}')
+
+def _test():
+    assert name.match('a1_a')
+    assert abs(name).match('a1_a')
+    assert not abs(name).match('a1_a[]')
+
+    m = abs(kind_param)
+    assert m.match('23')
+    assert m.match('SHORT')
+
+    m = abs(signed_digit_string)
+    assert m.match('23')
+    assert m.match('+ 23')
+    assert m.match('- 23')
+    assert m.match('-23')
+    assert not m.match('+n')
+
+    m = ~sign.named() + digit_string.named('number')
+    r = m.match('23')
+    assert r.groupdict()=={'number': '23', 'sign': None}
+    r = m.match('- 23')
+    assert r.groupdict()=={'number': '23', 'sign': '-'}
+
+    m = abs(char_literal_constant)
+    assert m.match('"adadfa"')
+    assert m.match('"adadfa""adad"')
+    assert m.match('HEY_"adadfa"')
+    assert m.match('HEY _ "ad\tadfa"')
+    assert not m.match('adadfa')
+    print 'ok'
+
+if __name__ == '__main__':
+    _test()



From numpy-svn at scipy.org  Sun Oct 22 17:42:53 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun, 22 Oct 2006 16:42:53 -0500 (CDT)
Subject: [Numpy-svn] r3378 - trunk/numpy/f2py/lib/parser
Message-ID: <20061022214253.8AE3439C082@new.scipy.org>

Author: pearu
Date: 2006-10-22 16:42:46 -0500 (Sun, 22 Oct 2006)
New Revision: 3378

Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/pattern_tools.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY G3: implementingg Fortran expression parser cont.

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-21 09:55:23 UTC (rev 3377)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-22 21:42:46 UTC (rev 3378)
@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 """
+Fortran expressions.
 
-Copyright 2006 Pearu Peterson all rights reserved,
-Pearu Peterson <pearu at cens.ioc.ee>
+-----
 Permission to use, modify, and distribute this software is given under the
 terms of the NumPy License. See http://scipy.org.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
-
-$Date: $
-Pearu Peterson
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
 """
 
 import re
@@ -30,103 +30,27 @@
     def __str__(self): return '.%s.' % (self.letters)
     def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.letters)
 
-class NoChildAllowed:
-    pass
-class NoChildAllowedError(Exception):
-    pass
 class NoMatchError(Exception):
     pass
 
+class NoSubClasses:
+    pass
 
-## class Designator(Primary):
-##     """
-##     <designator> = <object-name>
-##                    | <array-element>
-##                    | <array-section>
-##                    | <structure-component>
-##                    | <substring>
-##     <array-element> = <data-ref>
-##     <array-section> = <data-ref> [ ( <substring-range> ) ]
-##     <data-ref> = <part-ref> [ % <part-ref> ]...
-##     <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
-##     <substring> = <parent-string> ( <substring-range> )
-##     <parent-string> = <scalar-variable-name>
-##                       | <array-element>
-##                       | <scalar-structure-component>
-##                       | <scalar-constant>
-##     <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
-##     <structure-component> = <data-ref>
-##     """
-
-
-
-## class LiteralConstant(Constant):
-##     """
-##     <constant> = <int-literal-constant>
-##                  | <real-literal-constant>
-##                  | <complex-literal-constant>
-##                  | <logical-literal-constant>
-##                  | <char-literal-constant>
-##                  | <boz-literal-constant>
-##     """
-
-## class SignedIntLiteralConstant(LiteralConstant):
-##     """
-##     <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
-##     <sign> = + | -
-##     """
-##     match = re.compile(r'\A[+-]\s*\d+\Z').match
-
-##     def init(self, string):
-##         Base.init(self, string)
-##         self.content = [string[0], IntLiteralConstant(string[1:].lstrip())]
-##         return
-##     def tostr(self):
-##         return '%s%s' % tuple(self.content)
-
-## class NamedConstant(Constant):
-##     """
-##     <named-constant> = <name>
-##     """
-
-## class Name(Designator, NamedConstant, NoChildAllowed):
-##     """
-##     <name> = <letter> [ <alpha-numeric-character> ]...
-##     """
-##     match = re.compile(r'\A'+name_pat+r'\Z',re.I).match
-
-## class IntLiteralConstant(SignedIntLiteralConstant, NoChildAllowed):
-##     """
-##     <int-literal-constant> = <digit-string> [ _ <kind-param> ]
-##     <kind-param> = <digit-string>
-##                  | <scalar-int-constant-name>
-##     <digit-string> = <digit> [ <digit> ]...
-##     """
-##     match = compose_pattern([digit_string_pat, '_', kind_param_pat],r'\s*')
-
-##     compose_pattern('int-literal-constant','digit-string','_','kind-param')
-
-## class DigitString(IntLiteralConstant, NoChildAllowed):
-##     """
-##     <digit-string> = <digit> [ <digit> ]...
-##     """
-##     match = re.compile(r'\A\d+\Z').match
-
-
 class Base(object):
 
     subclasses = {}
 
     def __new__(cls, string):
-        if hasattr(cls,'match'):
-            match = cls.match
-            result = match(string)
+        match = cls.__dict__.get('match', None)
+        if match is not None:
+            result = cls.match(string)
         else:
             result = None
         if isinstance(result, tuple):
             obj = object.__new__(cls)
             obj.string = string
-            obj.init(*result)
+            if cls.__dict__.has_key('init'):
+                obj.init(*result)
             return obj
         elif isinstance(result, Base):
             return result
@@ -140,6 +64,8 @@
             raise AssertionError,`result`
         raise NoMatchError,'%s: %r' % (cls.__name__, string)
 
+    default_match = staticmethod(lambda string: None)
+
     findall = staticmethod(re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall)
     
     def match_binary_operand_right(lhs_cls, op_pattern, rhs_cls, string):
@@ -148,9 +74,9 @@
         if t is None: return
         lhs, op, rhs = t
         for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repman[k])
+            lhs = lhs.replace(k, repmap[k])
         for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repman[k])
+            rhs = rhs.replace(k, repmap[k])
         lhs_obj = lhs_cls(lhs)
         rhs_obj = rhs_cls(rhs)
         return lhs_obj, t[1], rhs_obj
@@ -163,9 +89,9 @@
         lhs, op, rhs = t
         if lhs: 
             for k in Base.findall(lhs):
-                lhs = lhs.replace(k, repman[k])
+                lhs = lhs.replace(k, repmap[k])
         for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repman[k])
+            rhs = rhs.replace(k, repmap[k])
         rhs_obj = rhs_cls(rhs)
         if lhs:
             lhs_obj = lhs_cls(lhs)
@@ -180,9 +106,9 @@
         if t is None: return
         lhs, op, rhs = t
         for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repman[k])
+            lhs = lhs.replace(k, repmap[k])
         for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repman[k])
+            rhs = rhs.replace(k, repmap[k])
         lhs_obj = lhs_cls(lhs)
         rhs_obj = rhs_cls(rhs)
         return lhs_obj, t[1], rhs_obj
@@ -194,12 +120,33 @@
         if t is None: return
         lhs, op, rhs = t
         for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repman[k])
+            rhs = rhs.replace(k, repmap[k])
         assert not lhs,`lhs`
         rhs_obj = rhs_cls(rhs)
         return t[1], rhs_obj
     match_unary_operand = staticmethod(match_unary_operand)
 
+    def match_list_of(subcls, string):
+        line, repmap = string_replace_map(string)
+        lst = []
+        for p in line.split(','):
+            p = p.strip()
+            for k in Base.findall(p):
+                p = p.replace(k,repmap[k])
+            lst.append(subcls(p))
+        return tuple(lst)
+    match_list_of = staticmethod(match_list_of)
+
+    def init_list(self, *items):
+        self.items = items
+        return
+
+    def tostr_list(self):
+        return ', '.join(map(str,self.items))
+
+    def torepr_list(self):
+        return '%s(%s)' % (self.__class__.__name__,', '.join(map(repr,self.items)))
+
     def init_binary_operand(self, lhs, op, rhs):
         self.lhs = lhs
         self.op = op
@@ -229,6 +176,9 @@
     def tostr_primary(self):
         return str(self.primary)
 
+    def tostr_string(self):
+        return str(self.string)
+
     def torepr_binary_operand(self):
         return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
 
@@ -241,6 +191,15 @@
     def torepr_primary(self):
         return '%s(%r)' % (self.__class__.__name__,self.primary)
 
+    def torepr_string(self):
+        return '%s(%r)' % (self.__class__.__name__,self.string)
+
+    def tostr_number(self):
+        if self.items[1] is None: return str(self.items[0])
+        return '%s_%s' % (self.items[0],self.items[1])
+    def torepr_number(self):
+        return '%s(%r,%r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
     def __str__(self):
         if self.__class__.__dict__.has_key('tostr'):
             return self.tostr()
@@ -414,33 +373,707 @@
     <type-param-inquiry> = <designator> % <type-param-name>
     """
 
+
+
+class Array_Constructor(Primary):
+    """
+    <array-constructor> = (/ <ac-spec> /)
+                          | <left-square-bracket> <ac-spec> <right-square-bracket>
+
+    """
+    def match(string):
+        if string[:2]+string[-2:]=='(//)':
+            return '(/',Ac_Spec(string[2:-2].strip()),'/)'
+        if string[:1]+string[-1:]=='[]':
+            return '[',Ac_Spec(string[1:-1].strip()),']'
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return ''.join(map(str,self.items))
+    def torepr(self): return '%s(%s)' % (self.__class__.__name__, ', '.join(map(repr,self.items)))
+
+class Ac_Spec(Base):
+    """
+    <ac-spec> = <type-spec> ::
+                | [ <type-spec> :: ] <ac-value-list>
+    """
+    def match(string):
+        if string.endswith('::'):
+            return Type_Spec(string[:-2].rstrip()),None
+        line, repmap = string_replace_map(string)
+        i = line.find('::')
+        if i==-1:
+            return None, Ac_Value_List(string)
+        ts = line[:i].rstrip()
+        line = line[i+2:].lstrip()
+        for k in Base.findall(ts):
+            ts = ts.replace(k,repmap[k])
+        for k in Base.findall(line):
+            line = line.replace(k,repmap[k])
+        return Type_Spec(ts),Ac_Value_List(line)
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[0] is None:
+            return str(self.items[1])
+        if self.items[1] is None:
+            return str(self.items[0]) + ' ::'
+        return str(self.items[0]) + ' :: ' + str(self.items[1])
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Ac_Value_List(Base):
+    """
+    <ac-value-list> = <ac-value> [ , <ac-value> ]...
+    """
+    def match(string):
+        return Base.match_list_of(Ac_Value, string)
+    match = staticmethod(match)
+    init = Base.init_list
+    tostr = Base.tostr_list
+    torepr = Base.torepr_list
+
+class Ac_Value(Base):
+    """
+    <ac-value> = <expr>
+                 | <ac-implied-do>
+    """
+    extra_subclasses = [Expr]
+
+class Ac_Implied_Do(Ac_Value):
+    """
+    <ac-implied-do> = ( <ac-value-list> , <ac-implied-do-control> )
+    """
+    def match(string):
+        if string[0]+string[-1] != '()': return
+        line, repmap = string_replace_map(string[1:-1].strip())
+        i = line.rfind('=')
+        if i==-1: return
+        j = line[:i].rfind(',')
+        assert j!=-1
+        s1 = line[:j].rstrip()
+        s2 = line[j+1:].lstrip()
+        for k in Base.findall(s1):
+            s1 = s1.replace(k,repmap[k])
+        for k in Base.findall(s2):
+            s2 = s2.replace(k,repmap[k])
+        return Ac_Value_List(s1),Ac_Implied_Do_Control(s2)
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return '(%s, %s)' % tuple(self.items)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
+class Ac_Implied_Do_Control(Base):
+    """
+    <ac-implied-do-control> = <ac-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]    
+    """
+    def match(string):
+        i = string.find('=')
+        if i==-1: return
+        s1 = string[:i].rstrip()
+        line, repmap = string_replace_map(string[i+1:].lstrip())
+        t = line.split(',')
+        if not (2<=len(t)<=3): return
+        t = [Scalar_Int_Expr(s.strip()) for s in t]
+        return Ac_Do_Variable(s1), t
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return '%s = %s' % (self.items[0], ', '.join(map(str,self.items[1])))
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
+class Scalar_Int_Expr(Base):
+    """
+    <scalar-int-expr> = <expr>
+    """
+    extra_subclasses = [Expr]
+
+class Ac_Do_Variable(Base):
+    """
+    <ac-do-variable> = <scalar-int-variable>
+    <ac-do-variable> shall be a named variable    
+    """
+
+class Type_Spec(Base):
+    """
+    <type-spec> = <intrinsic-type-spec>
+                  | <derived-type-spec>
+    """
+
+class Intrinsic_Type_Spec(Type_Spec):
+    """
+    <intrinsic-type-spec> = INTEGER [ <kind-selector> ]
+                            | REAL [ <kind-selector> ]
+                            | DOUBLE COMPLEX
+                            | COMPLEX [ <kind-selector> ]
+                            | CHARACTER [ <char-selector> ]
+                            | LOGICAL [ <kind-selector> ]
+
+    Extensions:
+                            | DOUBLE PRECISION
+                            | BYTE
+    """
+    def match(string):
+        if string[:7].upper()=='INTEGER':
+            t = string[:7].upper()
+            line = string[7:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:4].upper()=='REAL':
+            t = string[:4].upper()
+            line = string[4:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:7].upper()=='COMPLEX':
+            t = string[:7].upper()
+            line = string[7:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:7].upper()=='LOGICAL':
+            t = string[:7].upper()
+            line = string[7:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:9].upper()=='CHARACTER':
+            t = string[:9].upper()
+            line = string[9:].lstrip()
+            if line: return t,Char_Selector(line)
+        elif string[:6].upper()=='DOUBLE':
+            line = string[6:].lstrip().upper()
+            if line=='COMPLEX':
+                return 'DOUBLE COMPLEX',None
+            if line=='PRECISION':
+                return 'DOUBLE PRECISION',None
+        elif string.upper()=='BYTE':
+            return 'BYTE',None
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[1] is None: return str(self.items[0])
+        return '%s%s' % tuple(self.items)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Kind_Selector(Base):
+    """
+    <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
+    Extensions:
+                      | * <char-length>
+    """
+    def match(string):
+        if string[0]+string[-1] != '()':
+            if not string.startswith('*'): return
+            return '*',Char_Length(string[1:].lstrip())
+        line = string[1:-1].strip()
+        if line[:4].upper()=='KIND':
+            line = line[4:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+        return '(',Scalar_Int_Initialization_Expr(line),')'
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if len(self.items)==2: return '%s%s' % tuple(self.items)
+        return '%sKIND = %s%s' % tuple(self.items)
+    
+    def torepr(self):
+        if len(self.items)==2:
+            return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0], self.items[1], self.items[2])
+
+class Char_Selector(Base):
+    """
+    <char-selector> = <length-selector>
+                      | ( LEN = <type-param-value> , KIND = <scalar-int-initialization-expr> )
+                      | ( <type-param-value> , [ KIND = ] <scalar-int-initialization-expr> )
+                      | ( KIND = <scalar-int-initialization-expr> [ , LEN = <type-param-value> ] )
+    """
+    def match(string):
+        if string[0]+string[-1] != '()': return
+        line, repmap = string_replace_map(string[1:-1].strip())
+        if line[:3].upper()=='LEN':
+            line = line[3:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+            i = line.find(',')
+            if i==-1: return
+            v = line[:i].rstrip()
+            line = line[i+1:].lstrip()
+            if line[:4].upper()!='KIND': return
+            line = line[4:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+            for k in Base.findall(v): v = v.replace(k,repmap[k])
+            for k in Base.findall(line): line = line.replace(k,repmap[k])
+            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
+        elif line[:4].upper()=='KIND':
+            line = line[4:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+            i = line.find(',')
+            if i==-1: return None,Scalar_Int_Initialization_Expr(line)
+            v = line[i+1:].lstrip()
+            line = line[:i].rstrip()
+            if v[:3].upper()!='LEN': return
+            v = v[3:].lstrip()
+            if not v.startswith('='): return
+            v = v[1:].lstrip()
+            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
+        else:
+            i = line.find(',')
+            if i==-1: return
+            v = line[:i].rstrip()
+            line = line[i+1:].lstrip()
+            if line[:4].upper()=='KIND':
+                line = line[4:].lstrip()
+                if not line.startswith('='): return
+                line = line[1:].lstrip()
+            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[0] is None:
+            return '(KIND = %s)' % (self.items[1])
+        return '(LEN = %s, KIND = %s)' % (self.items[0],self.items[1])
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+    
+class Lenght_Selector(Char_Selector):
+    """
+    <length-selector> = ( [ LEN = ] <type-param-value> )
+                        | * <char-length> [ , ]
+    """
+    def match(string):
+        if string[0]+string[-1] == '()':
+            line = string[1:-1].strip()
+            if line[:3].upper()=='LEN':
+                line = line[3:].lstrip()
+                if not line.startswith('='): return
+                line = line[1:].lstrip()
+            return '(',Type_Param_Value(line),')'
+        if not string.startswith('*'): return
+        line = string[1:].lstrip()
+        if string[-1]==',': line = line[:-1].rstrip()
+        return '*',Char_Length(line)
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if len(self.items)==2: return '%s%s' % tuple(self.items)
+        return '%sLEN = %s%s' % tuple(self.items)
+    def torepr(self):
+        if len(self.items)==2:
+            return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0],self.items[1],self.items[2])
+
+class Char_Length(Base):
+    """
+    <char-length> = ( <type-param-value> )
+                    | scalar-int-literal-constant
+    """
+    def match(string):
+        if string[0]+string[-1] == '()':
+            return '(',Type_Param_Value(string[1:-1].strip()),')'
+        return Scalar_Int_Literal_Constant(string),
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if len(self.items)==1: return str(self.items[0])
+        return '%s%s%s' % tuple(self.items)
+    def torepr(self):
+        if len(self.items)==1:
+            return '%s(%r)' % (self.__class__.__name__, self.items[0])
+        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0],self.items[1],self.items[2])
+
+
+Scalar_Int_Expr = Expr
+Scalar_Int_Initialization_Expr = Expr
+
+class Type_Param_Value(Base):
+    """
+    <type-param-value> = <scalar-int-expr>
+                       | *
+                       | :
+    """
+    extra_subclasses = [Scalar_Int_Expr]
+    def match(string):
+        if string in ['*',':']: return string,
+        return
+    match = staticmethod(match)
+    def init(self, value): self.value = value
+    def tostr(self): return str(self.value)
+    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.value)
+
+class Derived_Type_Spec(Type_Spec):
+    """
+    <derived-type-spec> = <type-name> [ ( <type-param-spec-list> ) ]
+    <type-param-spec> = [ <keyword> = ] <type-param-value>
+    """
+
 class Constant(Primary):
     """
     <constant> = <literal-constant>
                  | <named-constant>
     """
+
+class Designator(Primary):
+    """
+    <designator> = <object-name>
+                   | <array-element>
+                   | <array-section>
+                   | <structure-component>
+                   | <substring>
+    <array-element> = <data-ref>
+    <array-section> = <data-ref> [ ( <substring-range> ) ]
+    <data-ref> = <part-ref> [ % <part-ref> ]...
+    <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
+    <substring> = <parent-string> ( <substring-range> )
+    <parent-string> = <scalar-variable-name>
+                      | <array-element>
+                      | <scalar-structure-component>
+                      | <scalar-constant>
+    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
+    <structure-component> = <data-ref>
+    """
+
+
+class Literal_Constant(Constant):
+    """
+    <literal-constant> = <int-literal-constant>
+                         | <real-literal-constant>
+                         | <complex-literal-constant>
+                         | <logical-literal-constant>
+                         | <char-literal-constant>
+                         | <boz-literal-constant>
+    """
+
+class Int_Literal_Constant(Literal_Constant):
+    """
+    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
+    """
     def match(string):
-        if pattern.abs_constant.match(string):
-            return (string,)
+        m = pattern.abs_int_literal_constant_named.match(string)
+        if m is None: return
+        return m.group('value'),m.group('kind_param')
+    match = staticmethod(match)
+    init = Base.init_list
+    tostr = Base.tostr_number
+    torepr = Base.torepr_number
+
+Scalar_Int_Literal_Constant = Int_Literal_Constant
+
+class Real_Literal_Constant(Literal_Constant):
+    """
+    """
+    def match(string):
+        m = pattern.abs_real_literal_constant_named.match(string)
+        if m is None: return
+        return m.group('value'),m.group('kind_param')
+    match = staticmethod(match)
+    init = Base.init_list
+    tostr = Base.tostr_number
+    torepr = Base.torepr_number
+
+class Complex_Literal_Constant(Literal_Constant):
+    """
+    <complex-literal-constant> = ( <real-part>, <imag-part> )
+    <real-part> = <imag-part> = <signed-int-literal-constant>
+                                | <signed-real-literal-constant>
+                                | <named-constant>
+    """
+    def match(string):
+        if string[0]+string[-1]!='()': return
+        if not pattern.abs_complex_literal_constant.match(string):
+            return
+        r,i = string[1:-1].split(',')
+        return Real_Part(r.strip()), Imag_Part(i.strip())
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return '(%s, %s)' % (self.items[0], self.items[1])
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Real_Part(Base):
+    """
+    <real-part> = <signed-int-literal-constant>
+                  | <signed-real-literal-constant>
+                  | <named-constant>
+    """
+    def match(string):
+        clses = [Int_Literal_Constant, Real_Literal_Constant]
+        if string[0] in '+-':
+            sign = string[0]
+            string = string[1:].lstrip()
+
+        else:
+            sign = None
+            clses.append(Named_Constant)
+        obj = None
+        for cls in clses:
+            try:
+                obj = cls(string)
+            except NoMatchError:
+                pass
+        if obj is None:
+            return
+        return sign, obj
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[0] is None: return str(self.items[1])
+        return '%s%s' % (self.items[0], self.items[1])
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Imag_Part(Real_Part):
+    """
+    <imag-part> = <real-part>
+    """
+    match = staticmethod(Real_Part.match)
+    init = Real_Part.init
+    tostr = Real_Part.tostr
+    torepr = Real_Part.torepr
+
+class Char_Literal_Constant(Literal_Constant):
+    """
+    <char-literal-constant> = [ <kind-param> _ ] ' <rep-char> '
+                              | [ <kind-param> _ ] \" <rep-char> \"
+    """
+    def match(string):
+        if string[-1] not in '"\'': return
+        if string[-1]=='"':
+            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named2
+        else:
+            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named1
+        line, repmap = string_replace_map(string)
+        m = abs_a_n_char_literal_constant_named.match(line)
+        if m is None: return
+        kind_param = m.group('kind_param')
+        line = m.group('value')
+        for k in Base.findall(line):
+            line = line.replace(k,repmap[k])
+        return line, kind_param
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[1] is None: return self.items[0]
+        return '%s_%s' % (self.items[1], self.items[0])
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Logical_Literal_Constant(Literal_Constant):
+    """
+    <logical-literal-constant> = .TRUE. [ _ <kind-param> ]
+                                 | .FALSE. [ _ <kind-param> ]
+    """
+    def match(string):
+        m = pattern.abs_logical_literal_constant_named.match(string)
+        if m is None: return
+        return m.group('value'), m.group('kind_param')
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[1] is None: return self.items[0]
+        return '%s_%s' % (self.items[0], self.items[1])
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Boz_Literal_Constant(Literal_Constant):
+    """
+    <boz-literal-constant> = <binary-constant>
+                             | <octal-constant>
+                             | <hex-constant>
+    """
+
+
+class Binary_Constant(Boz_Literal_Constant):
+    """
+    <binary-constant> = B ' <digit> [ <digit> ]... '
+                        | B \" <digit> [ <digit> ]... \"
+    """
+    def match(string):
+        if pattern.abs_binary_constant.match(string): return (string,)
         return
     match = staticmethod(match)
-    init = Base.init_primary
-    tostr = Base.tostr_primary
-    torepr = Base.torepr_primary
+    tostr = Base.tostr_string
+    torepr = Base.torepr_string
 
+class Octal_Constant(Boz_Literal_Constant):
+    """
+    <octal-constant> = O ' <digit> [ <digit> ]... '
+                       | O \" <digit> [ <digit> ]... \"
+    """
+    def match(string):
+        if pattern.abs_octal_constant.match(string): return (string,)
+        return
+    match = staticmethod(match)
+    tostr = Base.tostr_string
+    torepr = Base.torepr_string
+
+class Hex_Constant(Boz_Literal_Constant):
+    """
+    <hex-constant> = Z ' <digit> [ <digit> ]... '
+                     | Z \" <digit> [ <digit> ]... \"
+    """
+    def match(string):
+        if pattern.abs_hex_constant.match(string): return (string,)
+        return
+    match = staticmethod(match)
+    tostr = Base.tostr_string
+    torepr = Base.torepr_string
+
+class Named_Constant(Constant):
+    """
+    <named-constant> = <name>
+    """
+
+
+class Object_Name(Designator):
+    """
+    <object-name> = <name>
+    """
+
+class Function_Reference(Primary):
+    """
+    <function-reference> = <procedure-designator> ( [ <actual-arg-spec-list> ] )
+    """
+    def match(string):
+        if string[-1] != ')': return None
+        line, repmap = string_replace_map(string)
+        i = line.rfind('(')
+        if i == -1: return
+        lhs = line[:i].lstrip()
+        if not lhs: return
+        rhs = line[i+1:-1].strip()
+        for k in Base.findall(lhs):
+            lhs = lhs.replace(k, repmap[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repmap[k])
+        lhs_obj = Procedure_Designator(lhs)
+        if rhs:
+            rhs_obj = Actual_Arg_Spec_List(rhs)
+        else:
+            rhs_obj = None
+        return lhs_obj,'(',rhs_obj,')'
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[2] is None: return '%s()' % (self.items[0])
+        return '%s(%s)' % (self.items[0],self.items[2])
+    torepr = Base.torepr_list
+        
+    
+class Procedure_Designator(Base):
+    """
+    <procedure-designator> = <procedure-name>
+                           | <proc-component-ref>
+                           | <data-ref> % <binding-name>
+    """
+        
+class Actual_Arg_Spec_List(Base):
+    """
+    <actual-arg-spec-list> = <actual-arg-spec> [ , <actual-arg-spec> ]...
+    """
+    def match(string):
+        return Base.match_list_of(Actual_Arg_Spec, string)
+    match = staticmethod(match)
+    init = Base.init_list
+    tostr = Base.tostr_list
+    torepr = Base.torepr_list
+
+def try_cls(cls, string):
+    try:
+        return cls(string)
+    except NoMatchError:
+        pass
+    return
+
+class Actual_Arg_Spec(Base):
+    """
+    <actual-arg-spec> = [ <keyword> = ] <actual-arg>
+    """    
+    def match(string):
+        if pattern.keyword_equal.match(string):
+            i = string.find('=')
+            assert i!=-1,`string`
+            kw = Keyword(string[:i].rstrip())
+            string = string[i+1:].lstrip()
+        else:
+            kw = None
+        return kw, Actual_Arg(string)
+
+    match = staticmethod(match)
+    def init(self,kw,arg):
+        self.keyword = kw
+        self.actual_arg =arg
+        return
+    def tostr(self):
+        if self.keyword is not None:
+            return '%s = %s' % (self.keyword, self.actual_arg)
+        return str(self.actual_arg)
+    def torepr(self):
+        return '%s(%s, %s)' % (self.__class__.__name__, self.keyword, self.actual_arg)
+
+class Keyword(Base):
+    """
+    <keyword> = <name>
+    """
+
+class Actual_Arg(Actual_Arg_Spec):
+    """
+    <actual-arg> = <expr>
+                 | <variable>
+                 | <procedure-name>
+                 | <proc-component-ref>
+                 | <alt-return-spec>
+    <alt-return-spec> = * <label>
+    <variable> = <designator>
+    <proc-component-ref> = <variable> % <procedure-component-name>
+    """
+    extra_subclasses = [Expr]
+    
+class Procedure_Name(Procedure_Designator, Actual_Arg):
+    """
+    <procedure-name> = <name>
+    """
+    
+class Parenthesis(Primary):
+    """
+    ( <expr> )
+    """
+    def match(string):
+        if string[0]+string[-1]=='()':
+            return '(',Expr(string[1:-1].strip()),')'
+        return None
+    match = staticmethod(match)
+    init = Base.init_binary_operand
+    tostr = Base.tostr_binary_operand
+    torepr = Base.torepr_binary_operand
+
+class Name(Object_Name, Named_Constant, Procedure_Name, Keyword, Ac_Do_Variable):
+    """
+    <name> = <letter> [ <alphanumeric_character> ]...
+    """
+    def match(string):
+        if pattern.abs_name.match(string):
+            return string,
+        return
+    match = staticmethod(match)
+    tostr = Base.tostr_string
+    torepr = Base.torepr_string
+    
 ClassType = type(Base)
 for clsname in dir():
     cls = eval(clsname)
     if isinstance(cls, ClassType) and issubclass(cls, Base):
+        extra_subclasses = cls.__dict__.get('extra_subclasses',[])
+        if extra_subclasses:
+            try:
+                l = Base.subclasses[cls.__name__]
+            except KeyError:
+                Base.subclasses[cls.__name__] = l = []
+            l.extend(extra_subclasses)
         for basecls in cls.__bases__:
+            if basecls is Base: continue
             if issubclass(basecls, Base):
                 try:
                     Base.subclasses[basecls.__name__].append(cls)
                 except KeyError:
                     Base.subclasses[basecls.__name__] = [cls]
-
-
-print Constant('a')
-print `Constant('1')`
-print `Base('+1')`
-print `Base('c-1*a/b')`
+#import pprint
+#pprint.pprint(Base.subclasses)

Modified: trunk/numpy/f2py/lib/parser/pattern_tools.py
===================================================================
--- trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-21 09:55:23 UTC (rev 3377)
+++ trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-22 21:42:46 UTC (rev 3378)
@@ -21,10 +21,13 @@
     ~p1        -> [ <p1> ]
     ~~p1       -> [ <p1> ]...
     ~~~p1      -> <p1> [ <p1> ]...
-    ~~~~p1     -> <p1> [ <p1> ]...
+    ~~~~p1     -> ~~~p1
     abs(p1)    -> whole string match of <p1>
     p1.named(name) -> match of <p1> has name
     p1.match(string) -> return string match with <p1>
+    p1.flags(<re.I,..>)
+    p1.rsplit(..)
+    p1.lsplit(..)
     """
     _special_symbol_map = {'.': '[.]',
                            '*': '[*]',
@@ -41,19 +44,27 @@
                            '}': '\}',
                            '>': '[>]',
                            '<': '[<]',
+                           '=': '[=]'
                            }
 
-    def __init__(self, label, pattern, optional=0):
+    def __init__(self, label, pattern, optional=0, flags=0):
         self.label = label
         self.pattern = pattern
         self.optional = optional
+        self._flags = flags
         return
 
+    def flags(self, *flags):
+        f = self._flags
+        for f1 in flags:
+            f = f | f1
+        return Pattern(self.label, self.pattern, optional=self.optional, flags=f)
+
     def get_compiled(self):
         try:
             return self._compiled_pattern
         except AttributeError:
-            self._compiled_pattern = compiled = re.compile(self.pattern)
+            self._compiled_pattern = compiled = re.compile(self.pattern, self._flags)
             return compiled
 
     def match(self, string):
@@ -69,10 +80,10 @@
         compiled = self.get_compiled()
         t = compiled.split(string)
         if len(t) < 3: return
-        rhs = t[-1]
-        pattern_match = t[-2]
+        rhs = t[-1].strip()
+        pattern_match = t[-2].strip()
         assert abs(self).match(pattern_match),`pattern_match`
-        lhs = ''.join(t[:-2])
+        lhs = (''.join(t[:-2])).strip()
         return lhs, pattern_match, rhs
 
     def lsplit(self, string):
@@ -85,14 +96,14 @@
         compiled = self.get_compiled()
         t = compiled.split(string) # can be optimized
         if len(t) < 3: return
-        lhs = t[0]
-        pattern_match = t[1]
-        rhs = ''.join(t[2:])
+        lhs = t[0].strip()
+        pattern_match = t[1].strip()
+        rhs = (''.join(t[2:])).strip()
         assert abs(self).match(pattern_match),`pattern_match`
         return lhs, pattern_match, rhs
 
     def __abs__(self):
-        return Pattern(self.label, r'\A' + self.pattern+ r'\Z')
+        return Pattern(self.label, r'\A' + self.pattern+ r'\Z',flags=self._flags)
 
     def __repr__(self):
         return '%s(%r, %r)' % (self.__class__.__name__, self.label, self.pattern)
@@ -101,54 +112,61 @@
         label = '( %s OR %s )' % (self.label, other.label)
         if self.pattern==other.pattern:
             pattern = self.pattern
+            flags = self._flags
         else:
             pattern = '(%s|%s)' % (self.pattern, other.pattern)
-        return Pattern(label, pattern)
+            flags = self._flags | other._flags
+        return Pattern(label, pattern, flags=flags)
 
     def __and__(self, other):
         if isinstance(other, Pattern):
             label = '%s%s' % (self.label, other.label)
             pattern = self.pattern + other.pattern
+            flags = self._flags | other._flags
         else:
             assert isinstance(other,str),`other`
             label = '%s%s' % (self.label, other)
             pattern = self.pattern + other
-        return Pattern(label, pattern)
+            flags = self._flags
+        return Pattern(label, pattern, flags=flags)
 
     def __rand__(self, other):
         assert isinstance(other,str),`other`
         label = '%s%s' % (other, self.label)
         pattern = other + self.pattern
-        return Pattern(label, pattern)
+        return Pattern(label, pattern, flags=self._flags)
 
     def __invert__(self):
         if self.optional:
             if self.optional==1:
-                return Pattern(self.label + '...', self.pattern[:-1] + '*', 2)
+                return Pattern(self.label + '...', self.pattern[:-1] + '*', optional=2,flags=self._flags)
             if self.optional==2:
-                return Pattern('%s %s' % (self.label[1:-4].strip(), self.label), self.pattern[:-1] + '+', 3)
+                return Pattern('%s %s' % (self.label[1:-4].strip(), self.label), self.pattern[:-1] + '+',
+                               optional=3, flags=self._flags)
             return self
         label = '[ %s ]' % (self.label)
         pattern = '(%s)?' % (self.pattern)
-        return Pattern(label, pattern, 1)
+        return Pattern(label, pattern, optional=1, flags=self._flags)
 
     def __add__(self, other):
         if isinstance(other, Pattern):
             label = '%s %s' % (self.label, other.label)
             pattern = self.pattern + r'\s*' + other.pattern
+            flags = self._flags | other._flags
         else:
             assert isinstance(other,str),`other`
             label = '%s %s' % (self.label, other)
             other = self._special_symbol_map.get(other, other)
             pattern = self.pattern + r'\s*' + other
-        return Pattern(label, pattern)
+            flags = self._flags
+        return Pattern(label, pattern, flags = flags)
 
     def __radd__(self, other):
         assert isinstance(other,str),`other`
         label = '%s %s' % (other, self.label)
         other = self._special_symbol_map.get(other, other)
         pattern = other + r'\s*' + self.pattern
-        return Pattern(label, pattern)
+        return Pattern(label, pattern, flags=self._flags)
 
     def named(self, name = None):
         if name is None:
@@ -157,45 +175,54 @@
         else:
             label = '<%s>' % (name)
         pattern = '(?P%s%s)' % (label.replace('-','_'), self.pattern)
-        return Pattern(label, pattern)
+        return Pattern(label, pattern, flags=self._flags)
 
     def rename(self, label):
         if label[0]+label[-1]!='<>':
             label = '<%s>' % (label)
-        return Pattern(label, self.pattern, self.optional)
+        return Pattern(label, self.pattern, optional=self.optional, flags=self._flags)
 
 # Predefined patterns
 
-letter = Pattern('<letter>','[a-zA-Z]')
-name = Pattern('<name>', r'[a-zA-Z]\w*')
+letter = Pattern('<letter>','[A-Z]',flags=re.I)
+name = Pattern('<name>', r'[A-Z]\w*',flags=re.I)
 digit = Pattern('<digit>',r'\d')
 underscore = Pattern('<underscore>', '_')
-hex_digit = Pattern('<hex-digit>',r'[\da-fA-F]')
+binary_digit = Pattern('<binary-digit>',r'[01]')
+octal_digit = Pattern('<octal-digit>',r'[0-7]')
+hex_digit = Pattern('<hex-digit>',r'[\dA-F]',flags=re.I)
 
 digit_string = Pattern('<digit-string>',r'\d+')
-hex_digit_string = Pattern('<hex-digit-string>',r'[\da-fA-F]+')
+binary_digit_string = Pattern('<binary-digit-string>',r'[01]+')
+octal_digit_string = Pattern('<octal-digit-string>',r'[0-7]+')
+hex_digit_string = Pattern('<hex-digit-string>',r'[\dA-F]+',flags=re.I)
 
 sign = Pattern('<sign>',r'[+-]')
-exponent_letter = Pattern('<exponent-letter>',r'[ED]')
+exponent_letter = Pattern('<exponent-letter>',r'[ED]',flags=re.I)
 
-alphanumeric_character = Pattern('<alphanumeric-character>','\w') # [a-z0-9_]
+alphanumeric_character = Pattern('<alphanumeric-character>',r'\w') # [A-Z0-9_]
 special_character = Pattern('<special-character>',r'[ =+-*/\()[\]{},.:;!"%&~<>?,\'`^|$#@]')
 character = alphanumeric_character | special_character
 
 kind_param = digit_string | name
+kind_param_named = kind_param.named('kind-param')
 signed_digit_string = ~sign + digit_string
 int_literal_constant = digit_string + ~('_' + kind_param)
 signed_int_literal_constant = ~sign + int_literal_constant
 
-binary_constant = '[Bb]' + ("'" & digit_string & "'" | '"' & digit_string & '"')
-octal_constant = '[Oo]' + ("'" & digit_string & "'" | '"' & digit_string & '"')
-hex_constant = '[Zz]' + ("'" & hex_digit_string & "'" | '"' & hex_digit_string & '"')
+int_literal_constant_named = digit_string.named('value') + ~ ('_' + kind_param_named)
+
+binary_constant = ('B' + ("'" & binary_digit_string & "'" | '"' & binary_digit_string & '"')).flags(re.I)
+octal_constant = ('O' + ("'" & octal_digit_string & "'" | '"' & octal_digit_string & '"')).flags(re.I)
+hex_constant = ('Z' + ("'" & hex_digit_string & "'" | '"' & hex_digit_string & '"')).flags(re.I)
 boz_literal_constant = binary_constant | octal_constant | hex_constant
 
 exponent = signed_digit_string
 significand = digit_string + '.' + ~digit_string | '.' + digit_string
 real_literal_constant = significand + ~(exponent_letter + exponent) + ~ ('_' + kind_param) | \
                         digit_string + exponent_letter + exponent + ~ ('_' + kind_param)
+real_literal_constant_named = (significand + ~(exponent_letter + exponent) |\
+                               digit_string + exponent_letter + exponent).named('value') +  ~ ('_' + kind_param_named)
 signed_real_literal_constant = ~sign + real_literal_constant
 
 named_constant = name
@@ -203,33 +230,59 @@
 imag_part = real_part
 complex_literal_constant = '(' + real_part + ',' + imag_part + ')'
 
-char_literal_constant = ~( kind_param + '_') + "'.*'" | ~( kind_param + '_') + '".*"'
+a_n_rep_char = Pattern('<alpha-numeric-rep-char>',r'\w')
+rep_char = Pattern('<rep-char>',r'.')
+char_literal_constant = ~( kind_param + '_') + ("'" + ~~rep_char + "'" | '"' + ~~rep_char + '"' )
+a_n_char_literal_constant_named1 = ~( kind_param_named + '_') + (~~~("'" + ~~a_n_rep_char + "'" )).named('value')
+a_n_char_literal_constant_named2 = ~( kind_param_named + '_') + (~~~('"' + ~~a_n_rep_char + '"' )).named('value')
 
-logical_literal_constant = '[.](TRUE|FALSE)[.]' + ~ ('_' + kind_param)
+logical_literal_constant = ('[.](TRUE|FALSE)[.]' + ~ ('_' + kind_param)).flags(re.I)
+logical_literal_constant_named = Pattern('<value>',r'[.](TRUE|FALSE)[.]',flags=re.I).named() + ~ ('_' + kind_param_named)
 literal_constant = int_literal_constant | real_literal_constant | complex_literal_constant | logical_literal_constant | char_literal_constant | boz_literal_constant
 constant = literal_constant | named_constant
 int_constant = int_literal_constant | boz_literal_constant | named_constant
 char_constant = char_literal_constant | named_constant
-abs_constant = abs(constant)
 
+
 power_op = Pattern('<power-op>','[*]{2}')
 mult_op = Pattern('<mult-op>','[*/]')
 add_op = Pattern('<add-op>','[+-]')
 concat_op = Pattern('<concat-op>','[/]{}')
-rel_op = Pattern('<rel-op>','([.](EQ|NE|LT|LE|GT|GE)[.])|[=]{2}|/[=]|[<]|[<][=]|[>]|[=][>]')
-not_op = Pattern('<not-op>','[.]NOT[.]')
-and_op = Pattern('<and-op>','[.]AND[.]')
-or_op = Pattern('<or-op>','[.]OR[.]')
-equiv_op = Pattern('<equiv-op>','[.](EQV|NEQV)[.]')
+rel_op = Pattern('<rel-op>','([.](EQ|NE|LT|LE|GT|GE)[.])|[=]{2}|/[=]|[<]|[<][=]|[>]|[=][>]',flags=re.I)
+not_op = Pattern('<not-op>','[.]NOT[.]',flags=re.I)
+and_op = Pattern('<and-op>','[.]AND[.]',flags=re.I)
+or_op = Pattern('<or-op>','[.]OR[.]',flags=re.I)
+equiv_op = Pattern('<equiv-op>','[.](EQV|NEQV)[.]',flags=re.I)
 intrinsic_operator = power_op | mult_op | add_op | concat_op | rel_op | not_op | and_op | or_op | equiv_op
 extended_intrinsic_operator = intrinsic_operator
 
-defined_unary_op = Pattern('<defined-unary-op>','[.][a-zA-Z]+[.]')
-defined_binary_op = Pattern('<defined-binary-op>','[.][a-zA-Z]+[.]')
+defined_unary_op = Pattern('<defined-unary-op>','[.][A-Z]+[.]',flags=re.I)
+defined_binary_op = Pattern('<defined-binary-op>','[.][A-Z]+[.]',flags=re.I)
 defined_operator = defined_unary_op | defined_binary_op | extended_intrinsic_operator
 
 label = Pattern('<label>','\d{1,5}')
 
+keyword = name
+keyword_equal = keyword + '='
+
+abs_constant = abs(constant)
+abs_literal_constant = abs(literal_constant)
+abs_int_literal_constant = abs(int_literal_constant)
+abs_int_literal_constant_named = abs(int_literal_constant_named)
+abs_real_literal_constant = abs(real_literal_constant)
+abs_real_literal_constant_named = abs(real_literal_constant_named)
+abs_complex_literal_constant = abs(complex_literal_constant)
+abs_logical_literal_constant = abs(logical_literal_constant)
+abs_char_literal_constant = abs(char_literal_constant)
+abs_boz_literal_constant = abs(boz_literal_constant)
+abs_name = abs(name)
+abs_a_n_char_literal_constant_named1 = abs(a_n_char_literal_constant_named1)
+abs_a_n_char_literal_constant_named2 = abs(a_n_char_literal_constant_named2)
+abs_logical_literal_constant_named = abs(logical_literal_constant_named)
+abs_binary_constant = abs(binary_constant)
+abs_octal_constant = abs(octal_constant)
+abs_hex_constant = abs(hex_constant)
+
 def _test():
     assert name.match('a1_a')
     assert abs(name).match('a1_a')

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-21 09:55:23 UTC (rev 3377)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-22 21:42:46 UTC (rev 3378)
@@ -4,36 +4,359 @@
 
 from expressions import *
 
-class test_Base(NumpyTestCase):
+class test_Type_Spec(NumpyTestCase):
 
+    def check_kind_selector(self):
+        cls = Kind_Selector
+        a = cls('(1)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(KIND = 1)')
+        assert_equal(repr(a),"Kind_Selector('(', Int_Literal_Constant('1',None), ')')")
+
+        a = cls('(kind=1+2)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(KIND = 1 + 2)')
+
+        a = cls('* 1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'*1')
+
+    def check_type_param_value(self):
+        cls = Type_Param_Value
+        a = cls('*')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'*')
+        assert_equal(repr(a),"Type_Param_Value('*')")
+
+        a = cls(':')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),':')
+
+        a = cls('1+2')
+        assert isinstance(a,Level_2_Expr),`a`
+        assert_equal(str(a),'1 + 2')
+
+    def check_char_length(self):
+        cls = Char_Length
+        a = cls('1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1')
+        assert_equal(repr(a),"Char_Length(Int_Literal_Constant('1',None))")
+
+        a = cls('(1)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(1)')
+
+        a = cls('(*)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(*)')
+
+        a = cls('(:)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(:)')
+
+    def check_lenght_selector(self):
+        cls = Lenght_Selector
+        a = cls('( len = *)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(LEN = *)')
+        assert_equal(repr(a),"Lenght_Selector('(', Type_Param_Value('*'), ')')")
+
+        a = cls('*2,')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'*2')
+
+    def check_char_selector(self):
+        cls = Char_Selector
+        a = cls('(len=2, kind=8)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(LEN = 2, KIND = 8)')
+        assert_equal(repr(a),"Char_Selector(Int_Literal_Constant('2',None), Int_Literal_Constant('8',None))")
+
+
+        a = cls('(2, kind=8)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(LEN = 2, KIND = 8)')
+
+        a = cls('(2, 8)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(LEN = 2, KIND = 8)')
+        
+        a = cls('(kind=8)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(KIND = 8)')
+
+        a = cls('(kind=8,len=2)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(LEN = 2, KIND = 8)')
+
+    def check_intrinsic_type_spec(self):
+        cls = Intrinsic_Type_Spec
+        a = cls('INTEGER')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'INTEGER')
+        assert_equal(repr(a), "Intrinsic_Type_Spec('INTEGER', None)")
+
+        a = cls('Integer*2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'INTEGER*2')
+
+        a = cls('real*2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'REAL*2')
+
+        a = cls('logical*2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'LOGICAL*2')
+
+        a = cls('complex*2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'COMPLEX*2')
+
+        a = cls('character*2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'CHARACTER*2')
+
+        a = cls('double complex')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'DOUBLE COMPLEX')
+
+        a = cls('double precision')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'DOUBLE PRECISION')
+    
+class test_Array_Constructor(NumpyTestCase):
+
+    def check_ac_implied_do_control(self):
+        cls = Ac_Implied_Do_Control
+        a = cls('n = 3, 5')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'n = 3, 5')
+        assert_equal(repr(a),"Ac_Implied_Do_Control(Name('n'), [Int_Literal_Constant('3',None), Int_Literal_Constant('5',None)])")
+
+        a = cls('n = 3+1, 5, 1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'n = 3 + 1, 5, 1')
+
+    def check_ac_value_list(self):
+        cls = Ac_Value_List
+        a = cls('a, b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a, b')
+        assert_equal(repr(a),"Ac_Value_List(Name('a'), Name('b'))")
+
+        a = cls('a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a')
+        
+    def check_ac_implied_do(self):
+        cls = Ac_Implied_Do
+        a = cls('( a, b, n = 1, 5 )')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(a, b, n = 1, 5)')
+        assert_equal(repr(a),"Ac_Implied_Do(Ac_Value_List(Name('a'), Name('b')), Ac_Implied_Do_Control(Name('n'), [Int_Literal_Constant('1',None), Int_Literal_Constant('5',None)]))")
+
+    def check_ac_spec(self):
+        cls = Ac_Spec
+        a = cls('integer ::')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'INTEGER ::')
+        assert_equal(repr(a),"Ac_Spec(Intrinsic_Type_Spec('INTEGER', None), None)")
+
+        a = cls('integer :: a,b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'INTEGER :: a, b')
+
+        a = cls('a,b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a, b')
+
+        a = cls('integer :: a, (a, b, n = 1, 5)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'INTEGER :: a, (a, b, n = 1, 5)')
+
+class test_Constant(NumpyTestCase):
+
     def check_name(self):
         a = Name('a')
         assert isinstance(a,Name),`a`
+        a = Name('a2')
+        assert isinstance(a,Name),`a`
         a = Designator('a')
         assert isinstance(a,Name),`a`
         a = Constant('a')
         assert isinstance(a,Name),`a`
-        a = Base('a')
+        a = Expr('a')
         assert isinstance(a,Name),`a`
-        a = NamedConstant('a')
-        assert isinstance(a,Name),`a`
-        a = Constant('a')
-        assert isinstance(a,Name),`a`
 
     def check_int_literal_constant(self):
-        a = IntLiteralConstant('1')
-        assert isinstance(a,IntLiteralConstant),`a`
-        a = LiteralConstant('1')
-        assert isinstance(a,IntLiteralConstant),`a`
-        a = Constant('1')
-        assert isinstance(a,IntLiteralConstant),`a`
-        a = Base('1')
-        assert isinstance(a,IntLiteralConstant),`a`
-        a = Base('+1')
-        assert isinstance(a,SignedIntLiteralConstant),`a`
-        a = IntLiteralConstant('0')
-        assert isinstance(a,IntLiteralConstant),`a`
-        #a = NamedConstant('1') # raise NoMatch error
+        cls = Int_Literal_Constant
+        a = cls('1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1')
+        assert_equal(repr(a),"%s('1',None)" % (cls.__name__))
 
+        a = cls('21_2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'21_2')
+        assert_equal(repr(a),"%s('21','2')" % (cls.__name__))
+
+        a = cls('21_SHORT')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'21_SHORT')
+
+        a = cls('21_short')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'21_short')
+
+        a = cls('1976354279568241_8')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1976354279568241_8')
+
+    def check_real_literal_constant(self):
+        cls = Real_Literal_Constant
+        a = cls('12.78')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'12.78')
+        assert_equal(repr(a),"%s('12.78',None)" % (cls.__name__))
+
+        a = cls('12.78_8')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'12.78_8')
+        assert_equal(repr(a),"%s('12.78','8')" % (cls.__name__))
+
+        a = cls('12.')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'12.')
+
+        a = cls('1.6E3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6E3')
+
+        a = cls('1.6E3_8')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6E3_8')
+
+        a = cls('1.6D3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6D3')
+
+        a = cls('1.6E-3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6E-3')
+        a = cls('1.6E+3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6E+3')
+
+        a = cls('3E4')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'3E4')
+
+        a = cls('.123')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.123')
+
+        a = cls('1.6E-3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6E-3')
+
+        a = cls('10.9E7_QUAD')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'10.9E7_QUAD')
+
+        a = cls('10.9e-17_quad')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'10.9e-17_quad')
+
+    def check_complex_literal_constant(self):
+        cls = Complex_Literal_Constant
+        a = cls('(1.0, -1.0)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(1.0, -1.0)')
+        assert_equal(repr(a),"%s(Real_Part(None, Real_Literal_Constant('1.0',None)), Imag_Part('-', Real_Literal_Constant('1.0',None)))" % (cls.__name__))
+
+        a = cls('(3,3.1E6)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(3, 3.1E6)')
+
+        a = cls('(4.0_4, 3.6E7_8)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(4.0_4, 3.6E7_8)')
+
+        a = cls('( 0., PI)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(0., PI)')
+
+    def check_char_literal_constant(self):
+        cls = Char_Literal_Constant
+        a = cls('NIH_"DO"')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'NIH_"DO"')
+        assert_equal(repr(a),'Char_Literal_Constant(\'"DO"\', \'NIH\')')
+
+        a = cls("'DO'")
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),"'DO'")
+        assert_equal(repr(a),'Char_Literal_Constant("\'DO\'", None)')
+
+        a = cls("'DON''T'")
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),"'DON''T'")
+
+        a = cls('"DON\'T"')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'"DON\'T"')
+
+        a = cls('""')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'""')
+
+        a = cls("''")
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),"''")
+
+        a = cls('"hey ha(ada)\t"')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'"hey ha(ada)\t"')
+
+    def check_logical_literal_constant(self):
+        cls = Logical_Literal_Constant
+        a = cls('.TRUE.')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.TRUE.')
+        assert_equal(repr(a),"%s('.TRUE.', None)" % (cls.__name__))
+
+        a = cls('.True.')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.True.')
+
+        a = cls('.FALSE.')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.FALSE.')
+
+        a = cls('.TRUE._HA')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.TRUE._HA')
+
+    def check_boz_literal_constant(self):
+        cls = Boz_Literal_Constant
+        bcls = Binary_Constant
+        a = cls('B"01"')
+        assert isinstance(a,bcls),`a`
+        assert_equal(str(a),'B"01"')
+        assert_equal(repr(a),"%s('B\"01\"')" % (bcls.__name__))
+
+        ocls = Octal_Constant
+        a = cls('O"017"')
+        assert isinstance(a,ocls),`a`
+        assert_equal(str(a),'O"017"')
+        assert_equal(repr(a),"%s('O\"017\"')" % (ocls.__name__))
+
+        zcls = Hex_Constant
+        a = cls('Z"01A"')
+        assert isinstance(a,zcls),`a`
+        assert_equal(str(a),'Z"01A"')
+        assert_equal(repr(a),"%s('Z\"01A\"')" % (zcls.__name__))
+    
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Mon Oct 23 07:42:15 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 06:42:15 -0500 (CDT)
Subject: [Numpy-svn] r3379 - trunk/numpy/f2py/lib/parser
Message-ID: <20061023114215.2BFAD39C017@new.scipy.org>

Author: pearu
Date: 2006-10-23 06:42:09 -0500 (Mon, 23 Oct 2006)
New Revision: 3379

Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/pattern_tools.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY G3: Cont. implementing Fortran expression parser and unittests.

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-22 21:42:46 UTC (rev 3378)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-23 11:42:09 UTC (rev 3379)
@@ -49,8 +49,10 @@
         if isinstance(result, tuple):
             obj = object.__new__(cls)
             obj.string = string
-            if cls.__dict__.has_key('init'):
+            if hasattr(cls, 'init'):
                 obj.init(*result)
+            #if cls.__dict__.has_key('init'):
+            #    obj.init(*result)
             return obj
         elif isinstance(result, Base):
             return result
@@ -201,166 +203,264 @@
         return '%s(%r,%r)' % (self.__class__.__name__, self.items[0],self.items[1])
 
     def __str__(self):
+        return self.tostr()
         if self.__class__.__dict__.has_key('tostr'):
             return self.tostr()
         return repr(self)
 
     def __repr__(self):
+        return self.torepr()
         if self.__class__.__dict__.has_key('torepr'):
             return self.torepr()
         return '%s(%r)' % (self.__class__.__name__, self.string)
 
-class Expr(Base):
+class SequenceBase(Base):
+
+    def match(separator, subcls, string):
+        line, repmap = string_replace_map(string)
+        lst = []
+        for p in line.split(separator):
+            p = p.strip()
+            for k in Base.findall(p):
+                p = p.replace(k,repmap[k])
+            lst.append(subcls(p))
+        return separator, tuple(lst)
+    match = staticmethod(match)
+    def init(self, separator, items):
+        self.separator = separator
+        self.items = items
+    def tostr(self): return (self.separator+' ').join(map(str, self.items))
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.separator, self.items)
+    
+class UnaryOpBase(Base):
+    def init(self, op, rhs):
+        self.op = op
+        self.rhs = rhs
+        return    
+    def tostr(self):
+        return '%s %s' % (self.op, self.rhs)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__,self.op, self.rhs)
+    def match(op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.lsplit(line)
+        if t is None:
+            return rhs_cls(string)
+        lhs, op, rhs = t
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repmap[k])
+        assert not lhs,`lhs`
+        rhs_obj = rhs_cls(rhs)
+        return t[1], rhs_obj
+    match = staticmethod(match)
+
+class BinaryOpBase(Base):
     """
+    <..> = <lhs> <op> <rhs>
+    """
+    def match(lhs_cls, op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.rsplit(line)
+        if t is None or len(t)!=3: return
+        lhs, op, rhs = t
+        if lhs is None: return
+        if rhs is None: return
+        for k in Base.findall(lhs):
+            lhs = lhs.replace(k, repmap[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repmap[k])
+        lhs_obj = lhs_cls(lhs)
+        rhs_obj = rhs_cls(rhs)
+        return lhs_obj, t[1], rhs_obj
+    match = staticmethod(match)
+    def init(self, lhs, op, rhs):
+        self.lhs = lhs
+        self.op = op
+        self.rhs = rhs
+        return    
+    def tostr(self):
+        return '%s %s %s' % (self.lhs, self.op, self.rhs)
+    def torepr(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
+
+class RBinaryOpBase(BinaryOpBase):
+    """
+    <..> = [ <lhs> <op> ] <rhs>
+    """
+    def match(lhs_cls, op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.rsplit(line)
+        if t is None:
+            return rhs_cls(string)
+        lhs, op, rhs = t
+        for k in Base.findall(lhs):
+            lhs = lhs.replace(k, repmap[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repmap[k])
+        lhs_obj = lhs_cls(lhs)
+        rhs_obj = rhs_cls(rhs)
+        return lhs_obj, t[1], rhs_obj
+    match = staticmethod(match)
+
+class LBinaryOpBase(BinaryOpBase):
+    """
+    <..> = <lhs> [ <op> <rhs> ]
+    """
+    def match(lhs_cls, op_pattern, rhs_cls, string):
+        line, repmap = string_replace_map(string)
+        t = op_pattern.lsplit(line)
+        if t is None:
+            return lhs_cls(string)
+        lhs, op, rhs = t
+        for k in Base.findall(lhs):
+            lhs = lhs.replace(k, repmap[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repmap[k])
+        lhs_obj = lhs_cls(lhs)
+        rhs_obj = rhs_cls(rhs)
+        return lhs_obj, t[1], rhs_obj
+    match = staticmethod(match)
+
+class Expr(RBinaryOpBase):
+    """
     <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
     <defined-binary-op> = . <letter> [ <letter> ]... .
+    TODO: defined_binary_op must not be intrinsic_binary_op!!
     """
+    #subclass_names = ['Level_5_Expr']
     def match(string):
-        return Base.match_binary_operand_right(\
-            Expr,pattern.defined_binary_op.named(),Level_5_Expr,string)
+        return RBinaryOpBase.match(Expr, pattern.defined_binary_op.named(), Level_5_Expr,
+                                 string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
 
-class Level_5_Expr(Expr):
+class Level_5_Expr(RBinaryOpBase):
     """
     <level-5-expr> = [ <level-5-expr> <equiv-op> ] <equiv-operand>
     <equiv-op> = .EQV.
                | .NEQV.
     """
+    #subclass_names = ['Equiv_Operand']
     def match(string):
-        return Base.match_binary_operand_right(\
+        return RBinaryOpBase.match(\
             Level_5_Expr,pattern.equiv_op.named(),Equiv_Operand,string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
     
-class Equiv_Operand(Level_5_Expr):
+class Equiv_Operand(RBinaryOpBase):
     """
     <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
     <or-op>  = .OR.
     """
+    #subclass_names = ['Or_Operand']
     def match(string):
-        return Base.match_binary_operand_right(\
+        return RBinaryOpBase.match(\
             Equiv_Operand,pattern.or_op.named(),Or_Operand,string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
     
-class Or_Operand(Equiv_Operand):
+class Or_Operand(RBinaryOpBase):
     """
     <or-operand> = [ <or-operand> <and-op> ] <and-operand>    
     <and-op> = .AND.
-
     """
+    #subclass_names = ['And_Operand']
     def match(string):
-        return Base.match_binary_operand_right(\
+        return RBinaryOpBase.match(\
             Or_Operand,pattern.and_op.named(),And_Operand,string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
     
-class And_Operand(Or_Operand):
+class And_Operand(UnaryOpBase):
     """
     <and-operand> = [ <not-op> ] <level-4-expr>
     <not-op> = .NOT.
     """
+    #subclass_names = ['Level_4_Expr']
     def match(string):
-        return Base.match_unary_operand(\
+        return UnaryOpBase.match(\
             pattern.not_op.named(),Level_4_Expr,string)
     match = staticmethod(match)
-    init = Base.init_unary_operand
-    tostr = Base.tostr_unary_operand
-    torepr = Base.torepr_unary_operand
     
-class Level_4_Expr(And_Operand):
+class Level_4_Expr(RBinaryOpBase):
     """
     <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
     <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
     """
+    #subclass_names = ['Level_3_Expr']
     def match(string):
-        return Base.match_binary_operand_right(\
+        return RBinaryOpBase.match(\
             Level_3_Expr,pattern.rel_op.named(),Level_3_Expr,string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
     
-class Level_3_Expr(Level_4_Expr):
+class Level_3_Expr(RBinaryOpBase):
     """
     <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
     <concat-op>    = //
     """
+    #subclass_names = ['Level_2_Expr']
     def match(string):
-        return Base.match_binary_operand_right(\
+        return RBinaryOpBase.match(\
             Level_3_Expr,pattern.concat_op.named(),Level_2_Expr,string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
     
-class Level_2_Expr(Level_3_Expr):
+class Level_2_Expr(BinaryOpBase):
     """
     <level-2-expr> = [ [ <level-2-expr> ] <add-op> ] <add-operand>
     <add-op>   = +
                  | -
     """
-
+    subclass_names = ['Add_Operand']
     def match(string):
-        return Base.match_binary_unary_operand_right(\
-            Level_2_Expr,pattern.add_op.named(),Add_Operand,string)
+        lhs_cls, op_pattern, rhs_cls = Level_2_Expr,pattern.add_op.named(),Add_Operand
+        line, repmap = string_replace_map(string)
+        t = op_pattern.rsplit(line)
+        if t is None:
+            return rhs_cls(string)
+        lhs, op, rhs = t
+        if lhs is not None:
+            for k in Base.findall(lhs):
+                lhs = lhs.replace(k, repmap[k])
+            lhs_obj = lhs_cls(lhs)
+        else:
+            lhs_obj = None
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k, repmap[k])
+        rhs_obj = rhs_cls(rhs)
+        return lhs_obj, t[1], rhs_obj
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_unary_operand
-    torepr = Base.torepr_binary_operand
     
-class Add_Operand(Level_2_Expr):
+class Add_Operand(RBinaryOpBase):
     """
     <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
     <mult-op>  = *
                  | /
     """
-
+    #subclass_names = ['Mult_Operand']
     def match(string):
-        return Base.match_binary_operand_right(\
+        return RBinaryOpBase.match(\
             Add_Operand,pattern.mult_op.named(),Mult_Operand,string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
     
-class Mult_Operand(Add_Operand):
+class Mult_Operand(LBinaryOpBase):
     """
     <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
     <power-op> = **
     """
-
+    #subclass_names = ['Level_1_Expr']
     def match(string):
-        return Base.match_binary_operand_left(\
+        return LBinaryOpBase.match(\
             Level_1_Expr,pattern.power_op.named(),Mult_Operand,string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
     
-class Level_1_Expr(Mult_Operand):
+class Level_1_Expr(UnaryOpBase):
     """
     <level-1-expr> = [ <defined-unary-op> ] <primary>
     <defined-unary-op> = . <letter> [ <letter> ]... .
     """
+    #subclass_names = ['Primary']
     def match(string):
-        return Base.match_unary_operand(\
+        return UnaryOpBase.match(\
             pattern.defined_unary_op.named(),Primary,string)
     match = staticmethod(match)
-    init = Base.init_unary_operand
-    tostr = Base.tostr_unary_operand
-    torepr = Base.torepr_unary_operand
     
-class Primary(Level_1_Expr):
+class Primary(Base):
     """
     <primary> = <constant>
                 | <designator>
@@ -370,17 +470,133 @@
                 | <type-param-inquiry>
                 | <type-param-name>
                 | ( <expr> )
+    """
+    subclass_names = ['Constant', 'Designator','Array_Constructor','Structure_Constructor',
+                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 'Parenthesis']
+
+class Type_Param_Name(Base):
+    """
+    <type-param-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Type_Param_Inquiry(BinaryOpBase):
+    """
     <type-param-inquiry> = <designator> % <type-param-name>
     """
+    subclass_names = []
+    def match(string):
+        return BinaryOpBase.match(\
+            Designator, pattern.percent_op.named(), Type_Param_Name, string)
+    match = staticmethod(match)
 
+class Structure_Constructor(Base):
+    """
+    <structure-constructor> = <derived-type-spec> ( [ <component-spec-list> ] )
+                            | [ <keyword> = ] <component-data-source>
+    """
+    subclass_names = []
+    def match(string):
+        line, repmap = string_replace_map(string)
+        if line[-1]==')':
+            i = line.rfind('(')
+            if i==-1: return
+            specline = line[:i].rstrip()
+            for k in Base.findall(specline):
+                specline = specline.replace(k,repmap[k])
+            try:
+                spec = Derived_Type_Spec(specline)
+            except NoMatchError:
+                spec = None
+            if spec is not None:
+                l = line[i+1:-1].strip()
+                for k in Base.findall(l):
+                    l = l.replace(k,repmap[k])
+                if not l: return spec,'(',None,')'
+                return spec,'(',Component_Spec_List(l),')'
+        if '=' not in string: return None, Component_Data_Source(string)
+        lhs,rhs = string.split('=',1)
+        return Keyword(lhs.rstrip()), Component_Data_Source(rhs.lstrip())        
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if len(self.items)==4:
+            if self.items[2] is None: return '%s()' % (self.items[0])
+            return '%s(%s)' % (self.items[0],self.items[2])
+        if self.items[0] is None:
+            return str(self.items[1])
+        return '%s = %s' % (self.items[0], self.items[1])
+    torepr = Base.torepr_list
 
+class Component_Data_Source(Base):
+    """
+    <component-data-source> = <expr>
+                              | <data-target>
+                              | <proc-target>
+    """
+    subclass_names = ['Expr','Data-Target','Proc-Target']
 
-class Array_Constructor(Primary):
+class Data_Target(Base):
     """
+    <data-target> = <variable>
+                    | <expr>
+    """
+    subclass_names = ['Variable','Expr']
+
+class Proc_Target(Base):
+    """
+    <proc-target> = <expr>
+                    | <procedure-name>
+                    | <proc-component-ref>
+    """
+    subclass_names = ['Expr','Procedure_Name','Proc_Component_Ref']
+
+class Proc_Component_Ref(BinaryOpBase):
+    """
+    <proc-component-ref> = <variable> % <procedure-component-name>
+    """
+    subclass_names = []
+    def match(string):
+        return BinaryOpBase.match(\
+            Variable, pattern.percent_op.named(), Procedure_Component_Name, string)            
+    match = staticmethod(match)
+
+class Component_Spec(Base):
+    """
+    <component-spec> = [ <keyword> = ] <component-data-source>
+    """
+    subclass_names = []
+    def match(string):
+        if '=' not in string: return None, Component_Data_Source(string)
+        lhs,rhs = string.split('=',1)
+        return Keyword(lhs.rstrip()), Component_Data_Source(rhs.lstrip())
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[0] is None: return str(self.items[1])
+        return '%s = %s' % tuple(self.items)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
+class Component_Spec_List(Base):
+    """
+    <component-spec-list> = <component-spec> [ , <component-spec> ]...
+    """
+    subclass_names = []
+    def match(string):
+        return Base.match_list_of(Component_Spec, string)
+    match = staticmethod(match)
+    init = Base.init_list
+    tostr = Base.tostr_list
+    torepr = Base.torepr_list
+
+class Array_Constructor(Base):
+    """
     <array-constructor> = (/ <ac-spec> /)
                           | <left-square-bracket> <ac-spec> <right-square-bracket>
 
     """
+    subclass_names = []
     def match(string):
         if string[:2]+string[-2:]=='(//)':
             return '(/',Ac_Spec(string[2:-2].strip()),'/)'
@@ -397,6 +613,7 @@
     <ac-spec> = <type-spec> ::
                 | [ <type-spec> :: ] <ac-value-list>
     """
+    subclass_names = []
     def match(string):
         if string.endswith('::'):
             return Type_Spec(string[:-2].rstrip()),None
@@ -426,6 +643,7 @@
     """
     <ac-value-list> = <ac-value> [ , <ac-value> ]...
     """
+    subclass_names = []
     def match(string):
         return Base.match_list_of(Ac_Value, string)
     match = staticmethod(match)
@@ -438,12 +656,14 @@
     <ac-value> = <expr>
                  | <ac-implied-do>
     """
+    subclass_names = ['Ac_Implied_Do','Expr']
     extra_subclasses = [Expr]
 
-class Ac_Implied_Do(Ac_Value):
+class Ac_Implied_Do(Base):
     """
     <ac-implied-do> = ( <ac-value-list> , <ac-implied-do-control> )
     """
+    subclass_names = []
     def match(string):
         if string[0]+string[-1] != '()': return
         line, repmap = string_replace_map(string[1:-1].strip())
@@ -467,6 +687,7 @@
     """
     <ac-implied-do-control> = <ac-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]    
     """
+    subclass_names = []
     def match(string):
         i = string.find('=')
         if i==-1: return
@@ -485,6 +706,7 @@
     """
     <scalar-int-expr> = <expr>
     """
+    subclass_names = ['Expr']
     extra_subclasses = [Expr]
 
 class Ac_Do_Variable(Base):
@@ -492,14 +714,16 @@
     <ac-do-variable> = <scalar-int-variable>
     <ac-do-variable> shall be a named variable    
     """
+    subclass_names = ['Name']
 
 class Type_Spec(Base):
     """
     <type-spec> = <intrinsic-type-spec>
                   | <derived-type-spec>
     """
+    subclass_names = ['Intrinsic_Type_Spec', 'Derived_Type_Spec']
 
-class Intrinsic_Type_Spec(Type_Spec):
+class Intrinsic_Type_Spec(Base):
     """
     <intrinsic-type-spec> = INTEGER [ <kind-selector> ]
                             | REAL [ <kind-selector> ]
@@ -507,11 +731,11 @@
                             | COMPLEX [ <kind-selector> ]
                             | CHARACTER [ <char-selector> ]
                             | LOGICAL [ <kind-selector> ]
-
     Extensions:
                             | DOUBLE PRECISION
                             | BYTE
     """
+    subclass_names = []
     def match(string):
         if string[:7].upper()=='INTEGER':
             t = string[:7].upper()
@@ -559,6 +783,7 @@
     Extensions:
                       | * <char-length>
     """
+    subclass_names = []
     def match(string):
         if string[0]+string[-1] != '()':
             if not string.startswith('*'): return
@@ -587,6 +812,7 @@
                       | ( <type-param-value> , [ KIND = ] <scalar-int-initialization-expr> )
                       | ( KIND = <scalar-int-initialization-expr> [ , LEN = <type-param-value> ] )
     """
+    subclass_names = ['Lenght_Selector']
     def match(string):
         if string[0]+string[-1] != '()': return
         line, repmap = string_replace_map(string[1:-1].strip())
@@ -638,11 +864,12 @@
     def torepr(self):
         return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
     
-class Lenght_Selector(Char_Selector):
+class Lenght_Selector(Base):
     """
     <length-selector> = ( [ LEN = ] <type-param-value> )
                         | * <char-length> [ , ]
     """
+    subclass_names = []
     def match(string):
         if string[0]+string[-1] == '()':
             line = string[1:-1].strip()
@@ -668,8 +895,9 @@
 class Char_Length(Base):
     """
     <char-length> = ( <type-param-value> )
-                    | scalar-int-literal-constant
+                    | <scalar-int-literal-constant>
     """
+    subclass_names = []
     def match(string):
         if string[0]+string[-1] == '()':
             return '(',Type_Param_Value(string[1:-1].strip()),')'
@@ -685,15 +913,25 @@
         return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0],self.items[1],self.items[2])
 
 
-Scalar_Int_Expr = Expr
-Scalar_Int_Initialization_Expr = Expr
+class Scalar_Int_Expr(Base):
+    """
+    <scalar-int-expr> = <expr>
+    """
+    subclass_names = ['Expr']
 
+class Scalar_Int_Initialization_Expr(Base):
+    """
+    <scalar-int-initialization-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
 class Type_Param_Value(Base):
     """
     <type-param-value> = <scalar-int-expr>
                        | *
                        | :
     """
+    subclass_names = ['Scalar_Int_Expr']
     extra_subclasses = [Scalar_Int_Expr]
     def match(string):
         if string in ['*',':']: return string,
@@ -703,19 +941,62 @@
     def tostr(self): return str(self.value)
     def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.value)
 
-class Derived_Type_Spec(Type_Spec):
+class Derived_Type_Spec(Base):
     """
     <derived-type-spec> = <type-name> [ ( <type-param-spec-list> ) ]
+    """
+    subclass_names = []
+    def match(string):
+        i = string.find('(')
+        if i==-1: return Type_Name(string),None
+        if string[-1] != ')': return
+        return Type_Name(string[:i].rstrip()), Type_Param_Spec_List(string[i+1:-1].strip())
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[1] is None: return str(self.items[0])
+        return '%s(%s)' % tuple(self.items)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
+class Type_Param_Spec(Base):
+    """
     <type-param-spec> = [ <keyword> = ] <type-param-value>
     """
+    subclass_names = []
+    def match(string):
+        if '=' not in string: return None, Type_Param_Value(string)
+        lhs,rhs = string.split('=',1)
+        return Keyword(lhs.rstrip()), Type_Param_Value(rhs.lstrip())
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[0] is None: return str(self.items[1])
+        return '%s = %s' % tuple(self.items)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
 
-class Constant(Primary):
+class Type_Param_Spec_List(Base):
     """
+    <type-param-spec> = <type-param> [ , <type-param> ]...
+    """
+    subclass_names = []
+    def match(string):
+        return Base.match_list_of(Type_Param_Spec, string)
+    match = staticmethod(match)
+    init = Base.init_list
+    tostr = Base.tostr_list
+    torepr = Base.torepr_list
+
+
+class Constant(Base):
+    """
     <constant> = <literal-constant>
                  | <named-constant>
     """
+    subclass_names = ['Literal_Constant','Named_Constant']
 
-class Designator(Primary):
+class Designator(Base):
     """
     <designator> = <object-name>
                    | <array-element>
@@ -734,9 +1015,11 @@
     <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
     <structure-component> = <data-ref>
     """
+    subclass_names = ['Object_Name','Array_Element','Array_Section','Structure_Component',
+                      'Substring'
+                      ]
 
-
-class Literal_Constant(Constant):
+class Literal_Constant(Base):
     """
     <literal-constant> = <int-literal-constant>
                          | <real-literal-constant>
@@ -745,11 +1028,14 @@
                          | <char-literal-constant>
                          | <boz-literal-constant>
     """
+    subclass_names = ['Int_Literal_Constant', 'Real_Literal_Constant','Complex_Literal_Constant',
+                      'Logical_Literal_Constant','Char_Literal_Constant','Boz_Literal_Constant']
 
-class Int_Literal_Constant(Literal_Constant):
+class Int_Literal_Constant(Base):
     """
     <int-literal-constant> = <digit-string> [ _ <kind-param> ]
     """
+    subclass_names = []
     def match(string):
         m = pattern.abs_int_literal_constant_named.match(string)
         if m is None: return
@@ -759,11 +1045,16 @@
     tostr = Base.tostr_number
     torepr = Base.torepr_number
 
-Scalar_Int_Literal_Constant = Int_Literal_Constant
+class Scalar_Int_Literal_Constant(Base):
+    """
+    <scalar-int-literal-constant> = <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant']
 
-class Real_Literal_Constant(Literal_Constant):
+class Real_Literal_Constant(Base):
     """
     """
+    subclass_names = []
     def match(string):
         m = pattern.abs_real_literal_constant_named.match(string)
         if m is None: return
@@ -773,13 +1064,14 @@
     tostr = Base.tostr_number
     torepr = Base.torepr_number
 
-class Complex_Literal_Constant(Literal_Constant):
+class Complex_Literal_Constant(Base):
     """
     <complex-literal-constant> = ( <real-part>, <imag-part> )
     <real-part> = <imag-part> = <signed-int-literal-constant>
                                 | <signed-real-literal-constant>
                                 | <named-constant>
     """
+    subclass_names = []
     def match(string):
         if string[0]+string[-1]!='()': return
         if not pattern.abs_complex_literal_constant.match(string):
@@ -797,6 +1089,7 @@
                   | <signed-real-literal-constant>
                   | <named-constant>
     """
+    subclass_names = []
     def match(string):
         clses = [Int_Literal_Constant, Real_Literal_Constant]
         if string[0] in '+-':
@@ -826,16 +1119,18 @@
     """
     <imag-part> = <real-part>
     """
+    subclass_names = []
     match = staticmethod(Real_Part.match)
     init = Real_Part.init
     tostr = Real_Part.tostr
     torepr = Real_Part.torepr
 
-class Char_Literal_Constant(Literal_Constant):
+class Char_Literal_Constant(Base):
     """
     <char-literal-constant> = [ <kind-param> _ ] ' <rep-char> '
                               | [ <kind-param> _ ] \" <rep-char> \"
     """
+    subclass_names = []
     def match(string):
         if string[-1] not in '"\'': return
         if string[-1]=='"':
@@ -857,11 +1152,12 @@
         return '%s_%s' % (self.items[1], self.items[0])
     def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
 
-class Logical_Literal_Constant(Literal_Constant):
+class Logical_Literal_Constant(Base):
     """
     <logical-literal-constant> = .TRUE. [ _ <kind-param> ]
                                  | .FALSE. [ _ <kind-param> ]
     """
+    subclass_names = []
     def match(string):
         m = pattern.abs_logical_literal_constant_named.match(string)
         if m is None: return
@@ -873,19 +1169,20 @@
         return '%s_%s' % (self.items[0], self.items[1])
     def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
 
-class Boz_Literal_Constant(Literal_Constant):
+class Boz_Literal_Constant(Base):
     """
     <boz-literal-constant> = <binary-constant>
                              | <octal-constant>
                              | <hex-constant>
     """
+    subclass_names = ['Binary_Constant','Octal_Constant','Hex_Constant']
 
-
-class Binary_Constant(Boz_Literal_Constant):
+class Binary_Constant(Base):
     """
     <binary-constant> = B ' <digit> [ <digit> ]... '
                         | B \" <digit> [ <digit> ]... \"
     """
+    subclass_names = []
     def match(string):
         if pattern.abs_binary_constant.match(string): return (string,)
         return
@@ -893,11 +1190,12 @@
     tostr = Base.tostr_string
     torepr = Base.torepr_string
 
-class Octal_Constant(Boz_Literal_Constant):
+class Octal_Constant(Base):
     """
     <octal-constant> = O ' <digit> [ <digit> ]... '
                        | O \" <digit> [ <digit> ]... \"
     """
+    subclass_names = []
     def match(string):
         if pattern.abs_octal_constant.match(string): return (string,)
         return
@@ -905,11 +1203,12 @@
     tostr = Base.tostr_string
     torepr = Base.torepr_string
 
-class Hex_Constant(Boz_Literal_Constant):
+class Hex_Constant(Base):
     """
     <hex-constant> = Z ' <digit> [ <digit> ]... '
                      | Z \" <digit> [ <digit> ]... \"
     """
+    subclass_names = []
     def match(string):
         if pattern.abs_hex_constant.match(string): return (string,)
         return
@@ -917,21 +1216,23 @@
     tostr = Base.tostr_string
     torepr = Base.torepr_string
 
-class Named_Constant(Constant):
+class Named_Constant(Base):
     """
     <named-constant> = <name>
     """
+    subclass_names = ['Name']
 
-
-class Object_Name(Designator):
+class Object_Name(Base):
     """
     <object-name> = <name>
     """
-
-class Function_Reference(Primary):
+    subclass_names = ['Name']
+    
+class Function_Reference(Base):
     """
     <function-reference> = <procedure-designator> ( [ <actual-arg-spec-list> ] )
     """
+    subclass_names = []
     def match(string):
         if string[-1] != ')': return None
         line, repmap = string_replace_map(string)
@@ -957,18 +1258,60 @@
         return '%s(%s)' % (self.items[0],self.items[2])
     torepr = Base.torepr_list
         
-    
+
+
 class Procedure_Designator(Base):
     """
     <procedure-designator> = <procedure-name>
                            | <proc-component-ref>
                            | <data-ref> % <binding-name>
     """
-        
+    subclass_names = ['Procedure_Name','Proc_Component_Ref']
+    def match(string):
+        return BinaryOpBase.match(\
+            Data_Ref, pattern.percent_op.named(),  Binding_Name, string)
+    match = staticmethod(match)
+
+class Part_Ref(Base):
+    """
+    <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
+    """
+    subclass_names = ['Part_Name']
+    def match(string):
+        if string.endswith(')'):
+            i = string.find('(')
+            if i==-1: return
+            return Part_Name(string[:i].rstrip()),'(',Section_Subscript_List(string[i+1:-1].strip()),')'
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+
+class Part_Name(Base):
+    """
+    <part-name> = <name>
+    """
+    subclass_names = ['Name']
+    
+class Binding_Name(Base):
+    """
+    <binding-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Data_Ref(SequenceBase):
+    """
+    <data-ref> = <part-ref> [ % <part-ref> ]...
+    """
+    subclass_names = []
+    def match(string):
+        return SequenceBase.match(r'%', Part_Ref, string)
+    match = staticmethod(match)
+
 class Actual_Arg_Spec_List(Base):
     """
     <actual-arg-spec-list> = <actual-arg-spec> [ , <actual-arg-spec> ]...
     """
+    subclass_names = []
     def match(string):
         return Base.match_list_of(Actual_Arg_Spec, string)
     match = staticmethod(match)
@@ -976,17 +1319,11 @@
     tostr = Base.tostr_list
     torepr = Base.torepr_list
 
-def try_cls(cls, string):
-    try:
-        return cls(string)
-    except NoMatchError:
-        pass
-    return
-
 class Actual_Arg_Spec(Base):
     """
     <actual-arg-spec> = [ <keyword> = ] <actual-arg>
-    """    
+    """
+    subclass_names = []
     def match(string):
         if pattern.keyword_equal.match(string):
             i = string.find('=')
@@ -1013,9 +1350,23 @@
     """
     <keyword> = <name>
     """
+    subclass_names = ['Name']
 
-class Actual_Arg(Actual_Arg_Spec):
+class Type_Name(Base):
     """
+    <type-name> = <name>
+    <type-name> shall not be DOUBLEPRECISION or the name of intrinsic type
+    """
+    subclass_names = []
+    def match(string):
+        if pattern.abs_intrinsic_type_name.match(string): return
+        return Name(string)
+    match = staticmethod(match)
+    tostr = Base.tostr_string
+    torepr = Base.torepr_string        
+    
+class Actual_Arg(Base):
+    """
     <actual-arg> = <expr>
                  | <variable>
                  | <procedure-name>
@@ -1025,17 +1376,33 @@
     <variable> = <designator>
     <proc-component-ref> = <variable> % <procedure-component-name>
     """
+    subclass_names = ['Expr','Variable','Procedure_Name','Alt_Return_Spec']
     extra_subclasses = [Expr]
-    
-class Procedure_Name(Procedure_Designator, Actual_Arg):
+
+class Variable(Base):
     """
+    <variable> = <designator>
+    """
+    subclass_names = ['Designator']
+    extra_subclasses = [Designator]
+
+class Procedure_Component_Name(Base):
+    """
+    <procedure-component-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Procedure_Name(Base):
+    """
     <procedure-name> = <name>
     """
+    subclass_names = ['Name']
     
-class Parenthesis(Primary):
+class Parenthesis(Base):
     """
-    ( <expr> )
+    <parenthesis> = ( <expr> )
     """
+    subclass_names = []
     def match(string):
         if string[0]+string[-1]=='()':
             return '(',Expr(string[1:-1].strip()),')'
@@ -1045,10 +1412,11 @@
     tostr = Base.tostr_binary_operand
     torepr = Base.torepr_binary_operand
 
-class Name(Object_Name, Named_Constant, Procedure_Name, Keyword, Ac_Do_Variable):
+class Name(Base):
     """
     <name> = <letter> [ <alphanumeric_character> ]...
     """
+    subclass_names = []
     def match(string):
         if pattern.abs_name.match(string):
             return string,
@@ -1058,9 +1426,32 @@
     torepr = Base.torepr_string
     
 ClassType = type(Base)
+Base_classes = {}
 for clsname in dir():
     cls = eval(clsname)
     if isinstance(cls, ClassType) and issubclass(cls, Base):
+        Base_classes[cls.__name__] = cls
+
+for clsname, cls in Base_classes.items():
+    subclass_names = getattr(cls, 'subclass_names', None)
+    if subclass_names is None:
+        print '%s class is missing subclass_names list' % (clsname)
+        continue
+    try:
+        l = Base.subclasses[clsname]
+    except KeyError:
+        Base.subclasses[clsname] = l = []
+    for n in subclass_names:
+        if Base_classes.has_key(n):
+            l.append(Base_classes[n])
+        else:
+            print '%s not implemented needed by %s' % (n,clsname)
+
+print 
+for clsname in dir():
+    break
+    cls = eval(clsname)
+    if isinstance(cls, ClassType) and issubclass(cls, Base):
         extra_subclasses = cls.__dict__.get('extra_subclasses',[])
         if extra_subclasses:
             try:
@@ -1075,5 +1466,16 @@
                     Base.subclasses[basecls.__name__].append(cls)
                 except KeyError:
                     Base.subclasses[basecls.__name__] = [cls]
+
+for cls in Base_classes.values():
+    subclasses = Base.subclasses.get(cls.__name__,[])
+    subclasses_names = [c.__name__ for c in subclasses]
+    subclass_names = getattr(cls,'subclass_names', [])
+    for n in subclasses_names:
+        if n not in subclass_names:
+            print '%s needs to be added to %s subclasses_name list' % (n,cls.__name__)
+    for n in subclass_names:
+        if n not in subclasses_names:
+            print '%s needs to be added to %s subclass_name list' % (n,cls.__name__)
 #import pprint
 #pprint.pprint(Base.subclasses)

Modified: trunk/numpy/f2py/lib/parser/pattern_tools.py
===================================================================
--- trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-22 21:42:46 UTC (rev 3378)
+++ trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-23 11:42:09 UTC (rev 3379)
@@ -26,8 +26,8 @@
     p1.named(name) -> match of <p1> has name
     p1.match(string) -> return string match with <p1>
     p1.flags(<re.I,..>)
-    p1.rsplit(..)
-    p1.lsplit(..)
+    p1.rsplit(..) -> split a string from the rightmost p1 occurrence
+    p1.lsplit(..) -> split a string from the leftmost p1 occurrence
     """
     _special_symbol_map = {'.': '[.]',
                            '*': '[*]',
@@ -253,6 +253,7 @@
 and_op = Pattern('<and-op>','[.]AND[.]',flags=re.I)
 or_op = Pattern('<or-op>','[.]OR[.]',flags=re.I)
 equiv_op = Pattern('<equiv-op>','[.](EQV|NEQV)[.]',flags=re.I)
+percent_op = Pattern('<percent-op>',r'%',flags=re.I)
 intrinsic_operator = power_op | mult_op | add_op | concat_op | rel_op | not_op | and_op | or_op | equiv_op
 extended_intrinsic_operator = intrinsic_operator
 
@@ -283,6 +284,9 @@
 abs_octal_constant = abs(octal_constant)
 abs_hex_constant = abs(hex_constant)
 
+intrinsic_type_name = Pattern('<intrinsic-type-name>',r'(INTEGER|REAL|COMPLEX|LOGICAL|CHARACTER|DOUBLE\s*COMPLEX|DOUBLE\s*PRECISION|BYTE)',flags=re.I)
+abs_intrinsic_type_name = abs(intrinsic_type_name)
+
 def _test():
     assert name.match('a1_a')
     assert abs(name).match('a1_a')

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-22 21:42:46 UTC (rev 3378)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-23 11:42:09 UTC (rev 3379)
@@ -4,6 +4,27 @@
 
 from expressions import *
 
+class test_Expr(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Expr
+        a = cls('a .op. b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .op. b')
+        assert_equal(repr(a),"Expr(Name('a'), '.op.', Name('b'))")
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
+class test_Procedure_Designator(NumpyTestCase):
+
+    def check_part_ref(self):
+        cls = Part_Ref
+        a = cls('a')
+        assert isinstance(a, Name),`a`
+        assert_equal(str(a),'a')
+        
 class test_Type_Spec(NumpyTestCase):
 
     def check_kind_selector(self):
@@ -124,7 +145,84 @@
         a = cls('double precision')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'DOUBLE PRECISION')
+
+    def check_type_param_spec(self):
+        cls = Type_Param_Spec
+        a = cls('a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a')
+        assert_equal(repr(a),"Type_Param_Spec(None, Name('a'))")
+
+        a = cls('k=a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = a')
+
+        a = cls('k=:')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = :')
+
+    def check_type_param_spec_list(self):
+        cls = Type_Param_Spec_List
+        a = cls('a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a')
+        assert_equal(repr(a),"Type_Param_Spec_List(Type_Param_Spec(None, Name('a')))")
+
+        a = cls('a,b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a, b')
+
+        a = cls('k=a,c,g=1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = a, c, g = 1')
+
+class test_Type_Param_Inquiry(NumpyTestCase):
     
+    def check_simple(self):
+        cls = Type_Param_Inquiry
+        a = cls('a % b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a % b')
+        assert_equal(repr(a),"Type_Param_Inquiry(Name('a'), '%', Name('b'))")
+
+class test_Function_Reference(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Function_Reference
+        a = cls('f()')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'f()')
+        assert_equal(repr(a),"Function_Reference(Name('f'), '(', None, ')')")
+
+        a = cls('f(2,k=1,a)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'f(2, k = 1, a)')
+
+class test_Structure_Constructor(NumpyTestCase):
+
+    def check_proc_component_ref(self):
+        cls = Proc_Component_Ref
+        a = cls('a % b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a % b')
+        assert_equal(repr(a),"Proc_Component_Ref(Name('a'), '%', Name('b'))")
+
+    def check_structure_constructor(self):
+        cls = Structure_Constructor
+        a = cls('t()')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'t()')
+        assert_equal(repr(a),"Structure_Constructor(Derived_Type_Spec(Name('t'), None), '(', None, ')')")
+
+        a = cls('t(s=1, a)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'t(s = 1, a)')
+
+        a = cls('a=k')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a = k')
+        assert_equal(repr(a),"Structure_Constructor(Name('a'), Name('k'))")
+    
 class test_Array_Constructor(NumpyTestCase):
 
     def check_ac_implied_do_control(self):



From numpy-svn at scipy.org  Mon Oct 23 12:30:37 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 11:30:37 -0500 (CDT)
Subject: [Numpy-svn] r3380 - trunk/numpy/lib
Message-ID: <20061023163037.1DFBA39C129@new.scipy.org>

Author: stefan
Date: 2006-10-23 11:30:18 -0500 (Mon, 23 Oct 2006)
New Revision: 3380

Modified:
   trunk/numpy/lib/index_tricks.py
Log:
In ix_, do not modify shape of input array.


Modified: trunk/numpy/lib/index_tricks.py
===================================================================
--- trunk/numpy/lib/index_tricks.py	2006-10-23 11:42:09 UTC (rev 3379)
+++ trunk/numpy/lib/index_tricks.py	2006-10-23 16:30:18 UTC (rev 3380)
@@ -78,7 +78,7 @@
         if issubclass(new.dtype.type, _nx.bool_):
             new = new.nonzero()[0]
         baseshape[k] = len(new)
-        new.shape = tuple(baseshape)
+        new = new.reshape(tuple(baseshape))
         out.append(new)
         baseshape[k] = 1
     return tuple(out)



From numpy-svn at scipy.org  Mon Oct 23 15:43:02 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 14:43:02 -0500 (CDT)
Subject: [Numpy-svn] r3381 - trunk/numpy/core/include/numpy
Message-ID: <20061023194302.038F539C192@new.scipy.org>

Author: oliphant
Date: 2006-10-23 14:42:59 -0500 (Mon, 23 Oct 2006)
New Revision: 3381

Modified:
   trunk/numpy/core/include/numpy/ufuncobject.h
Log:
Use fp_swap_flag(0) to reset flags on AIX.  Ticket #362

Modified: trunk/numpy/core/include/numpy/ufuncobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ufuncobject.h	2006-10-23 16:30:18 UTC (rev 3380)
+++ trunk/numpy/core/include/numpy/ufuncobject.h	2006-10-23 19:42:59 UTC (rev 3381)
@@ -311,7 +311,7 @@
 		| ((FP_OVERFLOW & fpstatus) ? UFUNC_FPE_OVERFLOW : 0)	\
 		| ((FP_UNDERFLOW & fpstatus) ? UFUNC_FPE_UNDERFLOW : 0) \
 		| ((FP_INVALID & fpstatus) ? UFUNC_FPE_INVALID : 0); \
-	fp_clr_flag( FP_DIV_BY_ZERO | FP_OVERFLOW | FP_UNDERFLOW | FP_INVALID); \
+	fp_swap_flag(0); \
 }
 
 #define generate_divbyzero_error() fp_raise_xcp(FP_DIV_BY_ZERO)



From numpy-svn at scipy.org  Mon Oct 23 16:44:11 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 15:44:11 -0500 (CDT)
Subject: [Numpy-svn] r3382 - in trunk/numpy/core: src tests
Message-ID: <20061023204411.CF847C7C008@new.scipy.org>

Author: oliphant
Date: 2006-10-23 15:44:07 -0500 (Mon, 23 Oct 2006)
New Revision: 3382

Modified:
   trunk/numpy/core/src/multiarraymodule.c
   trunk/numpy/core/tests/test_regression.py
Log:
Add ticket #358 to improve detection of reshape that does not require a copy.

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-23 19:42:59 UTC (rev 3381)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-23 20:44:07 UTC (rev 3382)
@@ -411,7 +411,121 @@
 	return 0;
 }
 
+/* attempt to reshape an array without copying data
+ *
+ * This function should correctly handle all reshapes, including 
+ * axes of length 1. Zero strides should work but are untested.
+ *
+ * If a copy is needed, returns 0
+ * If no copy is needed, returns 1 and fills newstrides 
+ *     with appropriate strides
+ *
+ * The "fortran" argument describes how the array should be viewed
+ * during the reshape, not how it is stored in memory (that 
+ * information is in self->strides).
+ *
+ * If some output dimensions have length 1, the strides assigned to
+ * them are arbitrary. In the current implementation, they are the
+ * stride of the next-fastest index.
+ */
 static int
+_attempt_nocopy_reshape(PyArrayObject *self, int newnd, intp* newdims, 
+			intp *newstrides, int fortran)
+{
+	int oldnd;
+	intp olddims[MAX_DIMS];
+	intp oldstrides[MAX_DIMS];
+	int oi, oj, ok, ni, nj, nk;
+	int np, op;
+
+	oldnd = 0;
+	for (oi=0; oi<self->nd; oi++) {
+		if (self->dimensions[oi]!=1) {
+			olddims[oldnd] = self->dimensions[oi];
+			oldstrides[oldnd] = self->strides[oi];
+			oldnd++;
+		}
+	}
+
+	/*
+	fprintf(stderr, "_attempt_nocopy_reshape( (");
+	for (oi=0; oi<oldnd; oi++) 
+		fprintf(stderr, "(%d,%d), ", olddims[oi], oldstrides[oi]);
+	fprintf(stderr, ") -> (");
+	for (ni=0; ni<newnd; ni++) 
+		fprintf(stderr, "(%d,*), ", newdims[ni]);
+	fprintf(stderr, "), fortran=%d)\n", fortran);
+	*/
+
+
+	np = 1;
+	for (ni=0; ni<newnd; ni++) np*=newdims[ni];
+
+	op = 1;
+	for (oi=0; oi<oldnd; oi++) op*=olddims[oi];
+
+	if (np != op) return 0; /* different total sizes; no hope */
+
+
+	oi = 0;
+	oj = 1;
+	ni = 0;
+	nj = 1;
+
+	while(ni<newnd && oi<oldnd) {
+
+		np = newdims[ni];
+		op = olddims[oi];
+
+		while (np!=op) {
+			if (np<op) {
+				np *= newdims[nj++];
+			} else {
+				op *= olddims[oj++];
+			}
+		}
+
+		for(ok=oi; ok<oj-1; ok++) {
+			if (fortran) {
+				if (oldstrides[ok+1] !=		\
+				    olddims[ok]*oldstrides[ok]) 
+					return 0; /* not contiguous enough */
+			} else { /* C order */
+				if (oldstrides[ok] !=			\
+				    olddims[ok+1]*oldstrides[ok+1]) 
+					return 0; /* not contiguous enough */
+			}
+		}
+
+		if (fortran) {
+			newstrides[ni]=oldstrides[oi];
+			for (nk=ni+1;nk<nj;nk++) 
+				newstrides[nk]=newstrides[nk-1]*newdims[nk-1];
+		} else { /* C order */
+			newstrides[nj-1]=oldstrides[oj-1];
+			for (nk=nj-1;nk>ni;nk--) 
+				newstrides[nk-1]=newstrides[nk]*newdims[nk];
+		}
+
+		ni = nj++;
+		oi = oj++;
+
+	}
+
+	/*
+	fprintf(stderr, "success: _attempt_nocopy_reshape (");
+	for (oi=0; oi<oldnd; oi++) 
+		fprintf(stderr, "(%d,%d), ", olddims[oi], oldstrides[oi]);
+	fprintf(stderr, ") -> (");
+	for (ni=0; ni<newnd; ni++) 
+		fprintf(stderr, "(%d,%d), ", newdims[ni], newstrides[ni]);
+	fprintf(stderr, ")\n");
+	*/
+
+	return 1;
+}
+
+static int
 _fix_unknown_dimension(PyArray_Dims *newshape, intp s_original)
 {
         intp *dimensions;
@@ -454,25 +568,6 @@
 	return 0;
 }
 
-/* returns True if self->nd > 1 and all 
-   there is more than one dimension filled with 1.
- */
-static int
-_nd_bigger_than_one(PyArrayObject *arr)
-{
-        int i, nd;
-        int count=0;
-        nd = arr->nd;
-        if (nd > 1) {
-                for (i=0; i<nd; i++) {
-                        if (arr->dimensions[i] > 1)
-                                count++;
-                        if (count > 1) return 1;
-                }
-        }
-        return 0;
-}
-
 /* Returns a new array
    with the new shape from the data
    in the old array --- order-perspective depends on fortran argument.
@@ -541,14 +636,23 @@
                     (((PyArray_CHKFLAGS(self, NPY_CONTIGUOUS) && 
                        fortran == NPY_FORTRANORDER)
                       || (PyArray_CHKFLAGS(self, NPY_FORTRAN) && 
-                          fortran == NPY_CORDER)) && 
-                     _nd_bigger_than_one(self))) {
+                          fortran == NPY_CORDER)) && (self->nd > 1))) {
+
+		    int success=0;
+		    success = _attempt_nocopy_reshape(self,n,dimensions,
+                                                      newstrides,fortran);
+		    if (success) {
+			/* no need to copy the array after all */
+			strides = newstrides;
+			flags = self->flags;
+		    } else {
 			PyObject *new;
 			new = PyArray_NewCopy(self, fortran);
 			if (new == NULL) return NULL;
 			incref = FALSE;
 			self = (PyArrayObject *)new;
 			flags = self->flags;
+		    }
 		}
 
 		/* We always have to interpret the contiguous buffer correctly

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-23 19:42:59 UTC (rev 3381)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-23 20:44:07 UTC (rev 3382)
@@ -84,10 +84,10 @@
 
     def check_noncontiguous_fill(self,level=rlevel):
         """Ticket #58."""
-        a = N.zeros((4,2))
-        b = a[:,1]
+        a = N.zeros((5,3))
+	b = a[:,:2,]
         def rs():
-            b.shape = (2,2)
+            b.shape = (10,)
         self.failUnlessRaises(AttributeError,rs)
         
     def check_bool(self,level=rlevel):



From numpy-svn at scipy.org  Mon Oct 23 18:03:22 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 17:03:22 -0500 (CDT)
Subject: [Numpy-svn] r3383 - in trunk/numpy/core: include/numpy src
Message-ID: <20061023220322.28D1539C011@new.scipy.org>

Author: oliphant
Date: 2006-10-23 17:03:14 -0500 (Mon, 23 Oct 2006)
New Revision: 3383

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/arraytypes.inc.src
Log:
Add ability to sort arrays with fields defined more intelligently.

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-23 20:44:07 UTC (rev 3382)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-23 22:03:14 UTC (rev 3383)
@@ -1634,7 +1634,7 @@
 #define PyDataType_ISUSERDEF(obj) PyTypeNum_ISUSERDEF(((PyArray_Descr*)obj)->type_num)
 #define PyDataType_ISEXTENDED(obj) PyTypeNum_ISEXTENDED(((PyArray_Descr*)obj)->type_num)
 #define PyDataType_ISOBJECT(obj) PyTypeNum_ISOBJECT(((PyArray_Descr*)obj)->type_num)
-#define PyDataType_HASFIELDS(obj) (((PyArray_Descr *)obj)->names)
+#define PyDataType_HASFIELDS(obj) (((PyArray_Descr *)obj)->names != NULL)
 
 #define PyArray_ISBOOL(obj) PyTypeNum_ISBOOL(PyArray_TYPE(obj))
 #define PyArray_ISUNSIGNED(obj) PyTypeNum_ISUNSIGNED(PyArray_TYPE(obj))

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-23 20:44:07 UTC (rev 3382)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-23 22:03:14 UTC (rev 3383)
@@ -5881,7 +5881,8 @@
         if (PyArray_DATA(ret) != PyArray_DATA(self)) {
                 Py_DECREF(ret);
                 PyErr_SetString(PyExc_AttributeError,
-                                "incompatible shape for a non-contiguous array");
+                                "incompatible shape for a non-contiguous "\
+                                "array");
                 return -1;
         }
 

Modified: trunk/numpy/core/src/arraytypes.inc.src
===================================================================
--- trunk/numpy/core/src/arraytypes.inc.src	2006-10-23 20:44:07 UTC (rev 3382)
+++ trunk/numpy/core/src/arraytypes.inc.src	2006-10-23 22:03:14 UTC (rev 3383)
@@ -1667,18 +1667,73 @@
         return 0;
 }
 
-/* possibly redefine compare in terms of fields and subarrays if any */
-/* this would have to properly align data (if needed for the type)
-   before passing on to the _compare function of sub-fields
+/* If fields are defined, then compare on first field and if equal
+   compare on second field.  Continue until done or comparison results
+   in not_equal. 
 
-   More importantly, it's unclear what is meant by < and > so we really
-   can't implement it correctly.
+   Must align data passed on to sub-comparisons. 
 */
 
 static int
 VOID_compare(char *ip1, char *ip2, PyArrayObject *ap)
 {
-        return STRING_compare(ip1, ip2, ap);
+        PyArray_Descr *descr, *new;
+        PyObject *names, *key;
+        PyObject *tup, *title;
+        char *nip1, *nip2;
+        int i, offset, res=0;
+
+        if (!PyArray_HASFIELDS(ap)) 
+                return STRING_compare(ip1, ip2, ap);
+        
+        descr = ap->descr;
+        /* Compare on the first-field.  If equal, then
+           compare on the second-field, etc.
+        */
+        names = descr->names;
+        for (i=0; i<PyTuple_GET_SIZE(names); i++) {
+                key = PyTuple_GET_ITEM(names, i);
+                tup = PyDict_GetItem(descr->fields, key);
+                if (!PyArg_ParseTuple(tup, "Oi|O", &new, &offset,
+                                      &title)) {
+                        goto finish;
+                }
+                ap->descr = new;
+                nip1 = ip1+offset;
+                nip2 = ip2+offset;
+                if (new->alignment > 1) {
+                        if (((intp)(nip1) % new->alignment) != 0) {
+                                /* create buffer and copy */
+                                nip1 = _pya_malloc(new->elsize);
+                                if (nip1 == NULL) goto finish;
+                                memcpy(nip1, ip1+offset, new->elsize);
+                        }
+                        if (((intp)(nip2) % new->alignment) != 0) {
+                            /* copy data to a buffer */
+                                nip2 = _pya_malloc(new->elsize);
+                                if (nip2 == NULL) {
+                                        if (nip1 != ip1+offset) 
+                                                _pya_free(nip1);
+                                        goto finish;
+                                }
+                                memcpy(nip2, ip2+offset, new->elsize);
+                        }
+                }
+                res = new->f->compare(nip1, nip2, ap);
+                if (new->alignment > 1) {
+                        if (nip1 != ip1+offset) {
+                                _pya_free(nip1);
+                        }
+                        if (nip2 != ip2+offset) {
+                                _pya_free(nip2);
+                        }
+                }
+                if (res != 0) break;
+        }
+
+ finish:
+        ap->descr = descr;
+        return res;
 }
 
 /****************** argfunc **********************************/



From numpy-svn at scipy.org  Mon Oct 23 18:22:44 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 17:22:44 -0500 (CDT)
Subject: [Numpy-svn] r3384 - trunk/numpy/core/src
Message-ID: <20061023222244.24EFA39C0D6@new.scipy.org>

Author: oliphant
Date: 2006-10-23 17:22:41 -0500 (Mon, 23 Oct 2006)
New Revision: 3384

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Don't allow builtin data-type objects to be deallocated.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-23 22:03:14 UTC (rev 3383)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-23 22:22:41 UTC (rev 3384)
@@ -10562,6 +10562,13 @@
 static void
 arraydescr_dealloc(PyArray_Descr *self)
 {
+        if (self->fields == Py_None) {
+                fprintf(stderr, "*** Reference count error detected: \n" \
+                        "an attempt was made to deallocate %d (%c) ***\n", 
+                        self->type_num, self->type);
+                Py_INCREF(self);
+                return;
+        }
         Py_XDECREF(self->typeobj);
         Py_XDECREF(self->names);
         Py_XDECREF(self->fields);



From numpy-svn at scipy.org  Mon Oct 23 18:42:03 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 17:42:03 -0500 (CDT)
Subject: [Numpy-svn] r3385 - trunk/numpy/f2py/lib/parser
Message-ID: <20061023224203.8CEC239C011@new.scipy.org>

Author: pearu
Date: 2006-10-23 17:41:47 -0500 (Mon, 23 Oct 2006)
New Revision: 3385

Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/pattern_tools.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY G3: Cont implementing Fortran expression parser, almost finished.

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-23 22:22:41 UTC (rev 3384)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-23 22:41:47 UTC (rev 3385)
@@ -33,9 +33,6 @@
 class NoMatchError(Exception):
     pass
 
-class NoSubClasses:
-    pass
-
 class Base(object):
 
     subclasses = {}
@@ -51,8 +48,6 @@
             obj.string = string
             if hasattr(cls, 'init'):
                 obj.init(*result)
-            #if cls.__dict__.has_key('init'):
-            #    obj.init(*result)
             return obj
         elif isinstance(result, Base):
             return result
@@ -66,79 +61,8 @@
             raise AssertionError,`result`
         raise NoMatchError,'%s: %r' % (cls.__name__, string)
 
-    default_match = staticmethod(lambda string: None)
-
     findall = staticmethod(re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall)
     
-    def match_binary_operand_right(lhs_cls, op_pattern, rhs_cls, string):
-        line, repmap = string_replace_map(string)
-        t = op_pattern.rsplit(line)
-        if t is None: return
-        lhs, op, rhs = t
-        for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        lhs_obj = lhs_cls(lhs)
-        rhs_obj = rhs_cls(rhs)
-        return lhs_obj, t[1], rhs_obj
-    match_binary_operand_right = staticmethod(match_binary_operand_right)
-
-    def match_binary_unary_operand_right(lhs_cls, op_pattern, rhs_cls, string):
-        line, repmap = string_replace_map(string)
-        t = op_pattern.rsplit(line)
-        if t is None: return
-        lhs, op, rhs = t
-        if lhs: 
-            for k in Base.findall(lhs):
-                lhs = lhs.replace(k, repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        rhs_obj = rhs_cls(rhs)
-        if lhs:
-            lhs_obj = lhs_cls(lhs)
-            return lhs_obj, t[1], rhs_obj
-        else:
-            return None, t[1], rhs_obj
-    match_binary_unary_operand_right = staticmethod(match_binary_unary_operand_right)
-
-    def match_binary_operand_left(lhs_cls, op_pattern, rhs_cls, string):
-        line, repmap = string_replace_map(string)
-        t = op_pattern.lsplit(line)
-        if t is None: return
-        lhs, op, rhs = t
-        for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        lhs_obj = lhs_cls(lhs)
-        rhs_obj = rhs_cls(rhs)
-        return lhs_obj, t[1], rhs_obj
-    match_binary_operand_left = staticmethod(match_binary_operand_left)
-
-    def match_unary_operand(op_pattern, rhs_cls, string):
-        line, repmap = string_replace_map(string)
-        t = op_pattern.lsplit(line)
-        if t is None: return
-        lhs, op, rhs = t
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        assert not lhs,`lhs`
-        rhs_obj = rhs_cls(rhs)
-        return t[1], rhs_obj
-    match_unary_operand = staticmethod(match_unary_operand)
-
-    def match_list_of(subcls, string):
-        line, repmap = string_replace_map(string)
-        lst = []
-        for p in line.split(','):
-            p = p.strip()
-            for k in Base.findall(p):
-                p = p.replace(k,repmap[k])
-            lst.append(subcls(p))
-        return tuple(lst)
-    match_list_of = staticmethod(match_list_of)
-
     def init_list(self, *items):
         self.items = items
         return
@@ -149,59 +73,12 @@
     def torepr_list(self):
         return '%s(%s)' % (self.__class__.__name__,', '.join(map(repr,self.items)))
 
-    def init_binary_operand(self, lhs, op, rhs):
-        self.lhs = lhs
-        self.op = op
-        self.rhs = rhs
-        return
-
-    def init_unary_operand(self, op, rhs):
-        self.op = op
-        self.rhs = rhs
-        return
-
-    def init_primary(self, primary):
-        self.primary = primary
-        return
-
-    def tostr_binary_operand(self):
-        return '%s %s %s' % (self.lhs, self.op, self.rhs)
-
-    def tostr_binary_unary_operand(self):
-        if self.lhs is None:
-            return '%s %s' % (self.op, self.rhs)
-        return '%s %s %s' % (self.lhs, self.op, self.rhs)
-
-    def tostr_unary_operand(self):
-        return '%s %s' % (self.op, self.rhs)
-
-    def tostr_primary(self):
-        return str(self.primary)
-
     def tostr_string(self):
         return str(self.string)
 
-    def torepr_binary_operand(self):
-        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
-
-    def torepr_binary_unary_operand(self):
-        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
-
-    def torepr_unary_operand(self):
-        return '%s(%r, %r)' % (self.__class__.__name__,self.op, self.rhs)
-
-    def torepr_primary(self):
-        return '%s(%r)' % (self.__class__.__name__,self.primary)
-
     def torepr_string(self):
         return '%s(%r)' % (self.__class__.__name__,self.string)
 
-    def tostr_number(self):
-        if self.items[1] is None: return str(self.items[0])
-        return '%s_%s' % (self.items[0],self.items[1])
-    def torepr_number(self):
-        return '%s(%r,%r)' % (self.__class__.__name__, self.items[0],self.items[1])
-
     def __str__(self):
         return self.tostr()
         if self.__class__.__dict__.has_key('tostr'):
@@ -215,7 +92,9 @@
         return '%s(%r)' % (self.__class__.__name__, self.string)
 
 class SequenceBase(Base):
-
+    """
+    <sequence-base> = <obj> [ , <obj> ]...
+    """
     def match(separator, subcls, string):
         line, repmap = string_replace_map(string)
         lst = []
@@ -229,10 +108,18 @@
     def init(self, separator, items):
         self.separator = separator
         self.items = items
-    def tostr(self): return (self.separator+' ').join(map(str, self.items))
+        return
+    def tostr(self):
+        s = self.separator
+        if s==',': s = s + ' '
+        else: s = ' ' + s + ' '
+        return s.join(map(str, self.items))
     def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.separator, self.items)
     
 class UnaryOpBase(Base):
+    """
+    <unary-op-base> = [ <unary-op> ] <rhs>
+    """
     def init(self, op, rhs):
         self.op = op
         self.rhs = rhs
@@ -256,7 +143,7 @@
 
 class BinaryOpBase(Base):
     """
-    <..> = <lhs> <op> <rhs>
+    <binary-op-base> = <lhs> <op> <rhs>
     """
     def match(lhs_cls, op_pattern, rhs_cls, string):
         line, repmap = string_replace_map(string)
@@ -285,7 +172,7 @@
 
 class RBinaryOpBase(BinaryOpBase):
     """
-    <..> = [ <lhs> <op> ] <rhs>
+    <rbinary-op-base> = [ <lhs> <op> ] <rhs>
     """
     def match(lhs_cls, op_pattern, rhs_cls, string):
         line, repmap = string_replace_map(string)
@@ -304,7 +191,7 @@
 
 class LBinaryOpBase(BinaryOpBase):
     """
-    <..> = <lhs> [ <op> <rhs> ]
+    <lbinary-op-base> = <lhs> [ <op> <rhs> ]
     """
     def match(lhs_cls, op_pattern, rhs_cls, string):
         line, repmap = string_replace_map(string)
@@ -321,16 +208,90 @@
         return lhs_obj, t[1], rhs_obj
     match = staticmethod(match)
 
+class KeywordValueBase(BinaryOpBase):
+    """
+    <keyword-value-base> = [ <keyword> = ] <rhs>
+    """
+    def match(cls, string):
+        if '=' not in string: return cls(string)
+        lhs,rhs = string.split('=',1)
+        return Keyword(lhs.rstrip()),'=',cls(rhs.lstrip())
+    match = staticmethod(match)
+    
+class BracketBase(Base):
+    """
+    <bracket-base> = <left-bracket-base> <something> <right-bracket>
+    """
+    def match(brackets, cls, string):
+        left = brackets[:len(brackets)/2]
+        right = brackets[-len(brackets)/2:]
+        if string.startswith(left) and string.endswith(right):
+            return left,cls(string[len(left):-len(right)].strip())
+        return
+    match = staticmethod(match)
+    def init(self,left,item,right):
+        self.left = left
+        self.item = item
+        self.right = right
+        return
+    def tostr(self): '%s%s%s' % (self.left, self.item, self.right)
+    def torepr(self): '%s(%r, %r, %r)' % (self.__class__.__name__, self.left, self.item, self.right)
+
+class NumberBase(Base):
+    """
+    <number-base> = <number> [ _ <kind-param> ]
+    """
+    def match(number_pattern, string):
+        m = number_pattern.match(string)
+        if m is None: return
+        return m.group('value'),m.group('kind_param')
+    match = staticmethod(match)
+    def init(self, value, kind_param):
+        self.value = value
+        self.kind_param = kind_param
+        return
+    def tostr(self):
+        if self.kind_param is None: return str(self.value)
+        return '%s_%s' % (self.value, self.kind_param)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.value, self.kind_param)
+
+class CallBase(Base):
+    """
+    <call-base> = <lhs> ( <rhs> )
+    """
+    def match(lhs_cls, rhs_cls, string):
+        if not string.endswith(')'): return
+        line, repmap = string_replace_map(string)
+        i = line.find('(')
+        if i==-1: return
+        lhs = line[:i]
+        rhs = line[i+1:-1].strip()
+        for k in Base.findall(lhs):
+            lhs = lhs.replace(k,repmap[k])
+        for k in Base.findall(rhs):
+            rhs = rhs.replace(k,repmap[k])
+        return lhs_cls(lhs), rhs_cls(rhs)
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs = lhs
+        self.rhs = rhs
+        return
+    def tostr(self): return '%s(%s)' % (self.lhs, self.rhs)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.lhs, self.rhs)
+
+##################################################
+    
 class Expr(RBinaryOpBase):
     """
     <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
     <defined-binary-op> = . <letter> [ <letter> ]... .
     TODO: defined_binary_op must not be intrinsic_binary_op!!
     """
-    #subclass_names = ['Level_5_Expr']
+    subclass_names = []
     def match(string):
         return RBinaryOpBase.match(Expr, pattern.defined_binary_op.named(), Level_5_Expr,
-                                 string)
+                                   string)
     match = staticmethod(match)
 
 class Level_5_Expr(RBinaryOpBase):
@@ -339,7 +300,7 @@
     <equiv-op> = .EQV.
                | .NEQV.
     """
-    #subclass_names = ['Equiv_Operand']
+    subclass_names = []
     def match(string):
         return RBinaryOpBase.match(\
             Level_5_Expr,pattern.equiv_op.named(),Equiv_Operand,string)
@@ -350,7 +311,7 @@
     <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
     <or-op>  = .OR.
     """
-    #subclass_names = ['Or_Operand']
+    subclass_names = []
     def match(string):
         return RBinaryOpBase.match(\
             Equiv_Operand,pattern.or_op.named(),Or_Operand,string)
@@ -361,7 +322,7 @@
     <or-operand> = [ <or-operand> <and-op> ] <and-operand>    
     <and-op> = .AND.
     """
-    #subclass_names = ['And_Operand']
+    subclass_names = []
     def match(string):
         return RBinaryOpBase.match(\
             Or_Operand,pattern.and_op.named(),And_Operand,string)
@@ -372,7 +333,7 @@
     <and-operand> = [ <not-op> ] <level-4-expr>
     <not-op> = .NOT.
     """
-    #subclass_names = ['Level_4_Expr']
+    subclass_names = []
     def match(string):
         return UnaryOpBase.match(\
             pattern.not_op.named(),Level_4_Expr,string)
@@ -383,7 +344,7 @@
     <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
     <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
     """
-    #subclass_names = ['Level_3_Expr']
+    subclass_names = []
     def match(string):
         return RBinaryOpBase.match(\
             Level_3_Expr,pattern.rel_op.named(),Level_3_Expr,string)
@@ -394,7 +355,7 @@
     <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
     <concat-op>    = //
     """
-    #subclass_names = ['Level_2_Expr']
+    subclass_names = []
     def match(string):
         return RBinaryOpBase.match(\
             Level_3_Expr,pattern.concat_op.named(),Level_2_Expr,string)
@@ -406,7 +367,7 @@
     <add-op>   = +
                  | -
     """
-    subclass_names = ['Add_Operand']
+    subclass_names = []
     def match(string):
         lhs_cls, op_pattern, rhs_cls = Level_2_Expr,pattern.add_op.named(),Add_Operand
         line, repmap = string_replace_map(string)
@@ -432,7 +393,7 @@
     <mult-op>  = *
                  | /
     """
-    #subclass_names = ['Mult_Operand']
+    subclass_names = []
     def match(string):
         return RBinaryOpBase.match(\
             Add_Operand,pattern.mult_op.named(),Mult_Operand,string)
@@ -443,7 +404,7 @@
     <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
     <power-op> = **
     """
-    #subclass_names = ['Level_1_Expr']
+    subclass_names = []
     def match(string):
         return LBinaryOpBase.match(\
             Level_1_Expr,pattern.power_op.named(),Mult_Operand,string)
@@ -454,7 +415,7 @@
     <level-1-expr> = [ <defined-unary-op> ] <primary>
     <defined-unary-op> = . <letter> [ <letter> ]... .
     """
-    #subclass_names = ['Primary']
+    subclass_names = []
     def match(string):
         return UnaryOpBase.match(\
             pattern.defined_unary_op.named(),Primary,string)
@@ -490,42 +451,39 @@
             Designator, pattern.percent_op.named(), Type_Param_Name, string)
     match = staticmethod(match)
 
+class Structure_Constructor_2(KeywordValueBase):
+    """
+    <structure-constructor-2> = [ <keyword> = ] <component-data-source>
+    """
+    subclass_names = []
+    def match(string): return KeywordValueBase.match(Component_Data_Source, string)
+    match = staticmethod(match)
+
 class Structure_Constructor(Base):
     """
     <structure-constructor> = <derived-type-spec> ( [ <component-spec-list> ] )
                             | [ <keyword> = ] <component-data-source>
     """
-    subclass_names = []
+    subclass_names = ['Structure_Constructor_2']
     def match(string):
+        if string[-1]!=')': return
         line, repmap = string_replace_map(string)
-        if line[-1]==')':
-            i = line.rfind('(')
-            if i==-1: return
-            specline = line[:i].rstrip()
-            for k in Base.findall(specline):
-                specline = specline.replace(k,repmap[k])
-            try:
-                spec = Derived_Type_Spec(specline)
-            except NoMatchError:
-                spec = None
-            if spec is not None:
-                l = line[i+1:-1].strip()
-                for k in Base.findall(l):
-                    l = l.replace(k,repmap[k])
-                if not l: return spec,'(',None,')'
-                return spec,'(',Component_Spec_List(l),')'
-        if '=' not in string: return None, Component_Data_Source(string)
-        lhs,rhs = string.split('=',1)
-        return Keyword(lhs.rstrip()), Component_Data_Source(rhs.lstrip())        
+        i = line.rfind('(')
+        if i==-1: return
+        specline = line[:i].rstrip()
+        for k in Base.findall(specline):
+            specline = specline.replace(k,repmap[k])
+        spec = Derived_Type_Spec(specline)
+        l = line[i+1:-1].strip()
+        for k in Base.findall(l):
+            l = l.replace(k,repmap[k])
+        if not l: return spec,'(',None,')'
+        return spec,'(',Component_Spec_List(l),')'
     match = staticmethod(match)
     init = Base.init_list
     def tostr(self):
-        if len(self.items)==4:
-            if self.items[2] is None: return '%s()' % (self.items[0])
-            return '%s(%s)' % (self.items[0],self.items[2])
-        if self.items[0] is None:
-            return str(self.items[1])
-        return '%s = %s' % (self.items[0], self.items[1])
+        if self.items[2] is None: return '%s()' % (self.items[0])
+        return '%s(%s)' % (self.items[0],self.items[2])
     torepr = Base.torepr_list
 
 class Component_Data_Source(Base):
@@ -534,7 +492,7 @@
                               | <data-target>
                               | <proc-target>
     """
-    subclass_names = ['Expr','Data-Target','Proc-Target']
+    subclass_names = ['Expr','Data_Target','Proc_Target']
 
 class Data_Target(Base):
     """
@@ -549,7 +507,7 @@
                     | <procedure-name>
                     | <proc-component-ref>
     """
-    subclass_names = ['Expr','Procedure_Name','Proc_Component_Ref']
+    subclass_names = ['Procedure_Name','Proc_Component_Ref', 'Expr']
 
 class Proc_Component_Ref(BinaryOpBase):
     """
@@ -561,36 +519,23 @@
             Variable, pattern.percent_op.named(), Procedure_Component_Name, string)            
     match = staticmethod(match)
 
-class Component_Spec(Base):
+class Component_Spec(KeywordValueBase):
     """
     <component-spec> = [ <keyword> = ] <component-data-source>
     """
     subclass_names = []
-    def match(string):
-        if '=' not in string: return None, Component_Data_Source(string)
-        lhs,rhs = string.split('=',1)
-        return Keyword(lhs.rstrip()), Component_Data_Source(rhs.lstrip())
+    def match(string): return KeywordValueBase.match(Component_Data_Source, string)
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[0] is None: return str(self.items[1])
-        return '%s = %s' % tuple(self.items)
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
 
-class Component_Spec_List(Base):
+class Component_Spec_List(SequenceBase):
     """
     <component-spec-list> = <component-spec> [ , <component-spec> ]...
     """
     subclass_names = []
-    def match(string):
-        return Base.match_list_of(Component_Spec, string)
+    def match(string): return SequenceBase.match(r',', Component_Spec, string)
     match = staticmethod(match)
-    init = Base.init_list
-    tostr = Base.tostr_list
-    torepr = Base.torepr_list
 
-class Array_Constructor(Base):
+class Array_Constructor(BracketBase):
     """
     <array-constructor> = (/ <ac-spec> /)
                           | <left-square-bracket> <ac-spec> <right-square-bracket>
@@ -598,15 +543,14 @@
     """
     subclass_names = []
     def match(string):
-        if string[:2]+string[-2:]=='(//)':
-            return '(/',Ac_Spec(string[2:-2].strip()),'/)'
-        if string[:1]+string[-1:]=='[]':
-            return '[',Ac_Spec(string[1:-1].strip()),']'
-        return
+        try:
+            obj = BracketBase.match('(//)', Ac_Spec, string)
+        except NoMatchError:
+            obj = None
+        if obj is None:
+            obj = BracketBase.match('[]', Ac_Spec, string)
+        return obj
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self): return ''.join(map(str,self.items))
-    def torepr(self): return '%s(%s)' % (self.__class__.__name__, ', '.join(map(repr,self.items)))
 
 class Ac_Spec(Base):
     """
@@ -639,17 +583,16 @@
     def torepr(self):
         return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
 
-class Ac_Value_List(Base):
+class Ac_Value_List(SequenceBase):
     """
     <ac-value-list> = <ac-value> [ , <ac-value> ]...
     """
     subclass_names = []
     def match(string):
-        return Base.match_list_of(Ac_Value, string)
+        r = SequenceBase.match(r',', Ac_Value, string)
+        if len(r[1])==1: return r[1][0]
+        return r
     match = staticmethod(match)
-    init = Base.init_list
-    tostr = Base.tostr_list
-    torepr = Base.torepr_list
 
 class Ac_Value(Base):
     """
@@ -657,7 +600,6 @@
                  | <ac-implied-do>
     """
     subclass_names = ['Ac_Implied_Do','Expr']
-    extra_subclasses = [Expr]
 
 class Ac_Implied_Do(Base):
     """
@@ -707,7 +649,6 @@
     <scalar-int-expr> = <expr>
     """
     subclass_names = ['Expr']
-    extra_subclasses = [Expr]
 
 class Ac_Do_Variable(Base):
     """
@@ -932,7 +873,6 @@
                        | :
     """
     subclass_names = ['Scalar_Int_Expr']
-    extra_subclasses = [Scalar_Int_Expr]
     def match(string):
         if string in ['*',':']: return string,
         return
@@ -959,34 +899,24 @@
     def torepr(self):
         return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
 
-class Type_Param_Spec(Base):
+class Type_Param_Spec(KeywordValueBase):
     """
     <type-param-spec> = [ <keyword> = ] <type-param-value>
     """
     subclass_names = []
-    def match(string):
-        if '=' not in string: return None, Type_Param_Value(string)
-        lhs,rhs = string.split('=',1)
-        return Keyword(lhs.rstrip()), Type_Param_Value(rhs.lstrip())
+    def match(string): return KeywordValueBase.match(Type_Param_Value, string)
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[0] is None: return str(self.items[1])
-        return '%s = %s' % tuple(self.items)
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
 
-class Type_Param_Spec_List(Base):
+class Type_Param_Spec_List(SequenceBase):
     """
-    <type-param-spec> = <type-param> [ , <type-param> ]...
+    <type-param-spec-list> = <type-param> [ , <type-param> ]...
     """
     subclass_names = []
     def match(string):
-        return Base.match_list_of(Type_Param_Spec, string)
+        r = SequenceBase.match(',', Type_Param_Spec, string)
+        if len(r[1])==1: return r[1][0]
+        return r
     match = staticmethod(match)
-    init = Base.init_list
-    tostr = Base.tostr_list
-    torepr = Base.torepr_list
 
 
 class Constant(Base):
@@ -1003,15 +933,6 @@
                    | <array-section>
                    | <structure-component>
                    | <substring>
-    <array-element> = <data-ref>
-    <array-section> = <data-ref> [ ( <substring-range> ) ]
-    <data-ref> = <part-ref> [ % <part-ref> ]...
-    <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
-    <substring> = <parent-string> ( <substring-range> )
-    <parent-string> = <scalar-variable-name>
-                      | <array-element>
-                      | <scalar-structure-component>
-                      | <scalar-constant>
     <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
     <structure-component> = <data-ref>
     """
@@ -1019,6 +940,98 @@
                       'Substring'
                       ]
 
+class Substring(CallBase):
+    """
+    <substring> = <parent-string> ( <substring-range> )    
+    """
+    subclass_names = []
+    def match(string): return CallBase.match(Parent_String, Substring_Range, string)
+    match = staticmethod(match)
+
+class Parent_String(Base):
+    """
+    <parent-string> = <scalar-variable-name>
+                      | <array-element>
+                      | <scalar-structure-component>
+                      | <scalar-constant>    
+    """
+    subclass_names = ['Scalar_Variable_Name', 'Array_Element', 'Scalar_Structure_Component', 'Scalar_Constant']
+
+class Scalar_Variable_Name(Base):
+    """
+    <scalar-variable-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Scalar_Structure_Component(Base):
+    """
+    <scalar-structure-component> = <structure-component>
+    """
+    subclass_names = ['Structure_Component']
+
+class Scalar_Constant(Base):
+    """
+    <scalar-constant> = <constant>
+    """
+    subclass_names = ['Constant']
+
+class Structure_Component(Base):
+    """
+    <structure-component> = <data-ref>
+    """
+    subclass_names = ['Data_Ref']
+
+class Array_Section(CallBase):
+    """
+    <array-section> = <data-ref> [ ( <substring-range> ) ]
+    """
+    subclass_names = ['Data_Ref']
+    def match(string): return CallBase.match(Data_Ref, Substring_Range, string)
+    match = staticmethod(match)
+
+class Substring_Range(Base):
+    """
+    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
+    """
+    subclass_names = []
+    def match(string):
+        line, repmap = string_replace_map(string)
+        if ':' not in line: return
+        lhs,rhs = line.split(':',1)
+        lhs = lhs.rstrip()
+        rhs = rhs.lstrip()
+        if lhs:
+            for k in Base.findall(lhs):
+                lhs = lhs.replace(k,repmap[k])
+            lhs_obj = Scalar_Int_Expr(lhs)
+        else:
+            lhs_obj = None
+        if rhs:
+            for k in Base.findall(rhs):
+                rhs = rhs.replace(k,repmap[k])
+            rhs_obj = Scalar_Int_Expr(rhs)
+        else:
+            rhs_obj = None
+        return lhs_obj, rhs_obj
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs, self.rhs = lhs, rhs
+        return
+    def tostr(self):
+        if self.lhs is None:
+            if self.rhs is None: return ':'
+            return ': '+ str(self.rhs)
+        else:
+            if self.rhs is None: return str(self.lhs)+' :'
+            return str(self.lhs)+' : '+ str(self.rhs)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.lhs, self.rhs)
+        
+class Array_Element(Base):
+    """
+    <array-element> = <data-ref>
+    """
+    subclass_names = ['Data_Ref']
+
 class Literal_Constant(Base):
     """
     <literal-constant> = <int-literal-constant>
@@ -1031,45 +1044,50 @@
     subclass_names = ['Int_Literal_Constant', 'Real_Literal_Constant','Complex_Literal_Constant',
                       'Logical_Literal_Constant','Char_Literal_Constant','Boz_Literal_Constant']
 
-class Int_Literal_Constant(Base):
+class Int_Literal_Constant(NumberBase):
     """
     <int-literal-constant> = <digit-string> [ _ <kind-param> ]
     """
     subclass_names = []
     def match(string):
-        m = pattern.abs_int_literal_constant_named.match(string)
-        if m is None: return
-        return m.group('value'),m.group('kind_param')
+        return NumberBase.match(pattern.abs_int_literal_constant_named, string)
     match = staticmethod(match)
-    init = Base.init_list
-    tostr = Base.tostr_number
-    torepr = Base.torepr_number
 
+class Signed_Int_Literal_Constant(NumberBase):
+    """
+    <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_signed_int_literal_constant_named, string)
+    match = staticmethod(match)
+
 class Scalar_Int_Literal_Constant(Base):
     """
     <scalar-int-literal-constant> = <int-literal-constant>
     """
     subclass_names = ['Int_Literal_Constant']
 
-class Real_Literal_Constant(Base):
+class Real_Literal_Constant(NumberBase):
     """
     """
     subclass_names = []
     def match(string):
-        m = pattern.abs_real_literal_constant_named.match(string)
-        if m is None: return
-        return m.group('value'),m.group('kind_param')
+        return NumberBase.match(pattern.abs_real_literal_constant_named, string)
     match = staticmethod(match)
-    init = Base.init_list
-    tostr = Base.tostr_number
-    torepr = Base.torepr_number
 
+class Signed_Real_Literal_Constant(NumberBase):
+    """
+    <signed-real-literal-constant> = [ <sign> ] <real-literal-constant>
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_signed_real_literal_constant_named, string)
+    match = staticmethod(match)
+
 class Complex_Literal_Constant(Base):
     """
     <complex-literal-constant> = ( <real-part>, <imag-part> )
-    <real-part> = <imag-part> = <signed-int-literal-constant>
-                                | <signed-real-literal-constant>
-                                | <named-constant>
     """
     subclass_names = []
     def match(string):
@@ -1079,9 +1097,11 @@
         r,i = string[1:-1].split(',')
         return Real_Part(r.strip()), Imag_Part(i.strip())
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self): return '(%s, %s)' % (self.items[0], self.items[1])
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+    def init(self,real,imag):
+        self.real, self.imag = real, imag
+        return
+    def tostr(self): return '(%s, %s)' % (self.real, self.imag)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.real, self.imag)
 
 class Real_Part(Base):
     """
@@ -1089,41 +1109,13 @@
                   | <signed-real-literal-constant>
                   | <named-constant>
     """
-    subclass_names = []
-    def match(string):
-        clses = [Int_Literal_Constant, Real_Literal_Constant]
-        if string[0] in '+-':
-            sign = string[0]
-            string = string[1:].lstrip()
+    subclass_names = ['Signed_Int_Literal_Constant','Signed_Real_Literal_Constant','Named_Constant']
 
-        else:
-            sign = None
-            clses.append(Named_Constant)
-        obj = None
-        for cls in clses:
-            try:
-                obj = cls(string)
-            except NoMatchError:
-                pass
-        if obj is None:
-            return
-        return sign, obj
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[0] is None: return str(self.items[1])
-        return '%s%s' % (self.items[0], self.items[1])
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
-
-class Imag_Part(Real_Part):
+class Imag_Part(Base):
     """
     <imag-part> = <real-part>
     """
-    subclass_names = []
-    match = staticmethod(Real_Part.match)
-    init = Real_Part.init
-    tostr = Real_Part.tostr
-    torepr = Real_Part.torepr
+    subclass_names = ['Signed_Int_Literal_Constant','Signed_Real_Literal_Constant','Named_Constant']
 
 class Char_Literal_Constant(Base):
     """
@@ -1152,22 +1144,15 @@
         return '%s_%s' % (self.items[1], self.items[0])
     def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
 
-class Logical_Literal_Constant(Base):
+class Logical_Literal_Constant(NumberBase):
     """
     <logical-literal-constant> = .TRUE. [ _ <kind-param> ]
                                  | .FALSE. [ _ <kind-param> ]
     """
     subclass_names = []
     def match(string):
-        m = pattern.abs_logical_literal_constant_named.match(string)
-        if m is None: return
-        return m.group('value'), m.group('kind_param')
+        return NumberBase.match(pattern.abs_logical_literal_constant_named, string)    
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[1] is None: return self.items[0]
-        return '%s_%s' % (self.items[0], self.items[1])
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
 
 class Boz_Literal_Constant(Base):
     """
@@ -1260,11 +1245,11 @@
         
 
 
-class Procedure_Designator(Base):
+class Procedure_Designator(BinaryOpBase):
     """
     <procedure-designator> = <procedure-name>
-                           | <proc-component-ref>
-                           | <data-ref> % <binding-name>
+                             | <proc-component-ref>
+                             | <data-ref> % <binding-name>
     """
     subclass_names = ['Procedure_Name','Proc_Component_Ref']
     def match(string):
@@ -1272,20 +1257,102 @@
             Data_Ref, pattern.percent_op.named(),  Binding_Name, string)
     match = staticmethod(match)
 
-class Part_Ref(Base):
+class Part_Ref(CallBase):
     """
     <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
     """
     subclass_names = ['Part_Name']
+    def match(string): return CallBase.match(Part_Name, Section_Subscript_List, string)
+    match = staticmethod(match)
+
+class Section_Subscript_List(SequenceBase):
+    """
+    <section-subscript-list> = <section-subscript> [ , <section-subscript> ]...
+    """
+    subclass_names = []
     def match(string):
-        if string.endswith(')'):
-            i = string.find('(')
-            if i==-1: return
-            return Part_Name(string[:i].rstrip()),'(',Section_Subscript_List(string[i+1:-1].strip()),')'
-        return
+        r = SequenceBase.match(',', Section_Subscript, string)
+        if len(r[1])==1: return r[1][0]
+        return r
     match = staticmethod(match)
-    init = Base.init_list
 
+class Section_Subscript(Base):
+    """
+    <section-subscript> = <subscript>
+                          | <subscript-triplet>
+                          | <vector-subscript>
+    """
+    subclass_names = ['Subscript', 'Subscript_Triplet', 'Vector_Subscript']
+
+class Subscript_Triplet(Base):
+    """
+    <subscript-triplet> = [ <subscript> ] : [ <subscript> ] [ : <stride> ]
+    """
+    subclass_names = []
+    def match(string):
+        line, repmap = string_replace_map(string)
+        t = line.split(':')
+        if len(t)==1 or len(t)>3: return
+        lhs_obj,rhs_obj, stride_obj = None, None, None
+        if len(t)==2:
+            lhs,rhs = t[0].rstrip(),t[1].lstrip()
+        else:
+            lhs,rhs,stride = t[0].rstrip(),t[1].strip(),t[2].lstrip()
+            if stride:
+                for k in Base.findall(stride):
+                    stride = stride.replace(k, repmap[k])
+                stride_obj = Stride(stride)
+        if lhs:
+            for k in Base.findall(lhs):
+                lhs = lhs.replace(k, repmap[k])
+            lhs_obj = Subscript(lhs)
+        if rhs:
+            for k in Base.findall(rhs):
+                rhs = rhs.replace(k, repmap[k])
+            rhs_obj = Subscript(rhs)
+        return lhs_obj, rhs_obj, stride_obj
+    match = staticmethod(match)
+    def init(self, lhs, rhs, stride):
+        self.lhs, self.rhs, self.stride =lhs, rhs, stride
+        return
+    def tostr(self):
+        s = ''
+        if self.lhs is not None:
+            s += str(self.lhs) + ' :'
+        else:
+            s += ':'
+        if self.rhs is not None:
+            s += ' ' + str(self.rhs)
+        if self.stride is not None:
+            s += ' : ' + str(self.stride)
+        return s
+    def torepr(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.rhs, self.stride)        
+
+class Stride(Base):
+    """
+    <stride> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Vector_Subscript(Base):
+    """
+    <vector-subscript> = <int-expr>
+    """
+    subclass_names = ['Int_Expr']
+
+class Int_Expr(Base):
+    """
+    <int-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Subscript(Base):
+    """
+    <subscript> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
 class Part_Name(Base):
     """
     <part-name> = <name>
@@ -1304,47 +1371,29 @@
     """
     subclass_names = []
     def match(string):
-        return SequenceBase.match(r'%', Part_Ref, string)
+        r = SequenceBase.match('%', Part_Ref, string)
+        if len(r[1])==1: return r[1][0]
+        return r
     match = staticmethod(match)
 
-class Actual_Arg_Spec_List(Base):
+class Actual_Arg_Spec_List(SequenceBase):
     """
     <actual-arg-spec-list> = <actual-arg-spec> [ , <actual-arg-spec> ]...
     """
     subclass_names = []
     def match(string):
-        return Base.match_list_of(Actual_Arg_Spec, string)
+        r = SequenceBase.match(r',', Actual_Arg_Spec, string)
+        if len(r[1])==1: return r[1][0]
+        return r
     match = staticmethod(match)
-    init = Base.init_list
-    tostr = Base.tostr_list
-    torepr = Base.torepr_list
 
-class Actual_Arg_Spec(Base):
+class Actual_Arg_Spec(KeywordValueBase):
     """
     <actual-arg-spec> = [ <keyword> = ] <actual-arg>
     """
     subclass_names = []
-    def match(string):
-        if pattern.keyword_equal.match(string):
-            i = string.find('=')
-            assert i!=-1,`string`
-            kw = Keyword(string[:i].rstrip())
-            string = string[i+1:].lstrip()
-        else:
-            kw = None
-        return kw, Actual_Arg(string)
-
+    def match(string): return KeywordValueBase.match(Actual_Arg, string)
     match = staticmethod(match)
-    def init(self,kw,arg):
-        self.keyword = kw
-        self.actual_arg =arg
-        return
-    def tostr(self):
-        if self.keyword is not None:
-            return '%s = %s' % (self.keyword, self.actual_arg)
-        return str(self.actual_arg)
-    def torepr(self):
-        return '%s(%s, %s)' % (self.__class__.__name__, self.keyword, self.actual_arg)
 
 class Keyword(Base):
     """
@@ -1362,8 +1411,6 @@
         if pattern.abs_intrinsic_type_name.match(string): return
         return Name(string)
     match = staticmethod(match)
-    tostr = Base.tostr_string
-    torepr = Base.torepr_string        
     
 class Actual_Arg(Base):
     """
@@ -1372,19 +1419,32 @@
                  | <procedure-name>
                  | <proc-component-ref>
                  | <alt-return-spec>
+    """
+    subclass_names = ['Expr','Variable','Procedure_Name','Proc_Component_Ref','Alt_Return_Spec']
+
+class Alt_Return_Spec(Base):
+    """
     <alt-return-spec> = * <label>
-    <variable> = <designator>
-    <proc-component-ref> = <variable> % <procedure-component-name>
     """
-    subclass_names = ['Expr','Variable','Procedure_Name','Alt_Return_Spec']
-    extra_subclasses = [Expr]
+    subclass_names = []
+    def match(string):
+        if not string.startswith('*'): return
+        line = string[1:].lstrip()
+        if pattern.abs_label.match(line):
+            return line,
+        return
+    match = staticmethod(match)
+    def init(self, label):
+        self.label = label
+        return
+    def tostr(self): return '*%s' % (self.label)
+    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.label)
 
 class Variable(Base):
     """
     <variable> = <designator>
     """
     subclass_names = ['Designator']
-    extra_subclasses = [Designator]
 
 class Procedure_Component_Name(Base):
     """
@@ -1398,19 +1458,13 @@
     """
     subclass_names = ['Name']
     
-class Parenthesis(Base):
+class Parenthesis(BracketBase):
     """
     <parenthesis> = ( <expr> )
     """
     subclass_names = []
-    def match(string):
-        if string[0]+string[-1]=='()':
-            return '(',Expr(string[1:-1].strip()),')'
-        return None
+    def match(string): BracketBase.match('()', Expr, string)
     match = staticmethod(match)
-    init = Base.init_binary_operand
-    tostr = Base.tostr_binary_operand
-    torepr = Base.torepr_binary_operand
 
 class Name(Base):
     """
@@ -1424,6 +1478,8 @@
     match = staticmethod(match)
     tostr = Base.tostr_string
     torepr = Base.torepr_string
+
+##############################################################################
     
 ClassType = type(Base)
 Base_classes = {}
@@ -1435,7 +1491,8 @@
 for clsname, cls in Base_classes.items():
     subclass_names = getattr(cls, 'subclass_names', None)
     if subclass_names is None:
-        print '%s class is missing subclass_names list' % (clsname)
+        if clsname[-4:]!='Base':
+            print '%s class is missing subclass_names list' % (clsname)
         continue
     try:
         l = Base.subclasses[clsname]
@@ -1447,26 +1504,6 @@
         else:
             print '%s not implemented needed by %s' % (n,clsname)
 
-print 
-for clsname in dir():
-    break
-    cls = eval(clsname)
-    if isinstance(cls, ClassType) and issubclass(cls, Base):
-        extra_subclasses = cls.__dict__.get('extra_subclasses',[])
-        if extra_subclasses:
-            try:
-                l = Base.subclasses[cls.__name__]
-            except KeyError:
-                Base.subclasses[cls.__name__] = l = []
-            l.extend(extra_subclasses)
-        for basecls in cls.__bases__:
-            if basecls is Base: continue
-            if issubclass(basecls, Base):
-                try:
-                    Base.subclasses[basecls.__name__].append(cls)
-                except KeyError:
-                    Base.subclasses[basecls.__name__] = [cls]
-
 for cls in Base_classes.values():
     subclasses = Base.subclasses.get(cls.__name__,[])
     subclasses_names = [c.__name__ for c in subclasses]

Modified: trunk/numpy/f2py/lib/parser/pattern_tools.py
===================================================================
--- trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-23 22:22:41 UTC (rev 3384)
+++ trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-23 22:41:47 UTC (rev 3385)
@@ -209,8 +209,8 @@
 signed_digit_string = ~sign + digit_string
 int_literal_constant = digit_string + ~('_' + kind_param)
 signed_int_literal_constant = ~sign + int_literal_constant
-
 int_literal_constant_named = digit_string.named('value') + ~ ('_' + kind_param_named)
+signed_int_literal_constant_named = (~sign + digit_string).named('value') + ~ ('_' + kind_param_named)
 
 binary_constant = ('B' + ("'" & binary_digit_string & "'" | '"' & binary_digit_string & '"')).flags(re.I)
 octal_constant = ('O' + ("'" & octal_digit_string & "'" | '"' & octal_digit_string & '"')).flags(re.I)
@@ -223,6 +223,8 @@
                         digit_string + exponent_letter + exponent + ~ ('_' + kind_param)
 real_literal_constant_named = (significand + ~(exponent_letter + exponent) |\
                                digit_string + exponent_letter + exponent).named('value') +  ~ ('_' + kind_param_named)
+signed_real_literal_constant_named = (~sign + (significand + ~(exponent_letter + exponent) |\
+                               digit_string + exponent_letter + exponent)).named('value') +  ~ ('_' + kind_param_named)
 signed_real_literal_constant = ~sign + real_literal_constant
 
 named_constant = name
@@ -262,6 +264,7 @@
 defined_operator = defined_unary_op | defined_binary_op | extended_intrinsic_operator
 
 label = Pattern('<label>','\d{1,5}')
+abs_label = abs(label)
 
 keyword = name
 keyword_equal = keyword + '='
@@ -269,8 +272,12 @@
 abs_constant = abs(constant)
 abs_literal_constant = abs(literal_constant)
 abs_int_literal_constant = abs(int_literal_constant)
+abs_signed_int_literal_constant = abs(signed_int_literal_constant)
+abs_signed_int_literal_constant_named = abs(signed_int_literal_constant_named)
 abs_int_literal_constant_named = abs(int_literal_constant_named)
 abs_real_literal_constant = abs(real_literal_constant)
+abs_signed_real_literal_constant = abs(signed_real_literal_constant)
+abs_signed_real_literal_constant_named = abs(signed_real_literal_constant_named)
 abs_real_literal_constant_named = abs(real_literal_constant_named)
 abs_complex_literal_constant = abs(complex_literal_constant)
 abs_logical_literal_constant = abs(logical_literal_constant)

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-23 22:22:41 UTC (rev 3384)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-23 22:41:47 UTC (rev 3385)
@@ -17,6 +17,15 @@
         assert isinstance(a,Name),`a`
         assert_equal(str(a),'a')
 
+class test_Designator(NumpyTestCase):
+
+    def check_substring(self):
+        cls = Substring
+        a = cls('a(1:2)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a(1 : 2)')
+        assert_equal(repr(a),"Substring(Name('a'), Substring_Range(Int_Literal_Constant('1', None), Int_Literal_Constant('2', None)))")
+
 class test_Procedure_Designator(NumpyTestCase):
 
     def check_part_ref(self):
@@ -32,7 +41,7 @@
         a = cls('(1)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(KIND = 1)')
-        assert_equal(repr(a),"Kind_Selector('(', Int_Literal_Constant('1',None), ')')")
+        assert_equal(repr(a),"Kind_Selector('(', Int_Literal_Constant('1', None), ')')")
 
         a = cls('(kind=1+2)')
         assert isinstance(a,cls),`a`
@@ -62,7 +71,7 @@
         a = cls('1')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'1')
-        assert_equal(repr(a),"Char_Length(Int_Literal_Constant('1',None))")
+        assert_equal(repr(a),"Char_Length(Int_Literal_Constant('1', None))")
 
         a = cls('(1)')
         assert isinstance(a,cls),`a`
@@ -92,7 +101,7 @@
         a = cls('(len=2, kind=8)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(LEN = 2, KIND = 8)')
-        assert_equal(repr(a),"Char_Selector(Int_Literal_Constant('2',None), Int_Literal_Constant('8',None))")
+        assert_equal(repr(a),"Char_Selector(Int_Literal_Constant('2', None), Int_Literal_Constant('8', None))")
 
 
         a = cls('(2, kind=8)')
@@ -148,10 +157,10 @@
 
     def check_type_param_spec(self):
         cls = Type_Param_Spec
-        a = cls('a')
+        a = cls('a=1')
         assert isinstance(a,cls),`a`
-        assert_equal(str(a),'a')
-        assert_equal(repr(a),"Type_Param_Spec(None, Name('a'))")
+        assert_equal(str(a),'a = 1')
+        assert_equal(repr(a),"Type_Param_Spec(Name('a'), '=', Int_Literal_Constant('1', None))")
 
         a = cls('k=a')
         assert isinstance(a,cls),`a`
@@ -163,15 +172,15 @@
 
     def check_type_param_spec_list(self):
         cls = Type_Param_Spec_List
-        a = cls('a')
-        assert isinstance(a,cls),`a`
-        assert_equal(str(a),'a')
-        assert_equal(repr(a),"Type_Param_Spec_List(Type_Param_Spec(None, Name('a')))")
 
         a = cls('a,b')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'a, b')
+        assert_equal(repr(a),"Type_Param_Spec_List(',', (Name('a'), Name('b')))")
 
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+
         a = cls('k=a,c,g=1')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'k = a, c, g = 1')
@@ -198,6 +207,61 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'f(2, k = 1, a)')
 
+    def check_alt_return_spec(self):
+        cls = Alt_Return_Spec
+        a = cls('* 123')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'*123')
+        assert_equal(repr(a),"Alt_Return_Spec('123')")
+        
+    def check_substring_range(self):
+        cls = Substring_Range
+        a = cls('a:b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a : b')
+        assert_equal(repr(a),"Substring_Range(Name('a'), Name('b'))")
+
+        a = cls('a:')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a :')
+
+        a = cls(':b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),': b')
+
+        a = cls(':')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),':')
+
+    def check_array_section(self):
+        cls = Array_Section
+        a = cls('a(:)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a(:)')
+        assert_equal(repr(a),"Array_Section(Name('a'), Substring_Range(None, None))")
+
+        a = cls('a(2:)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a(2 :)')
+
+    def check_procedure_designator(self):
+        cls = Procedure_Designator
+        a = cls('a%b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a % b')
+        assert_equal(repr(a),"Procedure_Designator(Name('a'), '%', Name('b'))")
+        
+    def check_data_ref(self):
+        cls = Data_Ref
+        a = cls('a%b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a % b')
+        assert_equal(repr(a),"Data_Ref('%', (Name('a'), Name('b')))")
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
 class test_Structure_Constructor(NumpyTestCase):
 
     def check_proc_component_ref(self):
@@ -219,9 +283,13 @@
         assert_equal(str(a),'t(s = 1, a)')
 
         a = cls('a=k')
-        assert isinstance(a,cls),`a`
+        assert isinstance(a,Structure_Constructor_2),`a`
         assert_equal(str(a),'a = k')
-        assert_equal(repr(a),"Structure_Constructor(Name('a'), Name('k'))")
+        assert_equal(repr(a),"Structure_Constructor_2(Name('a'), '=', Name('k'))")
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
     
 class test_Array_Constructor(NumpyTestCase):
 
@@ -230,7 +298,7 @@
         a = cls('n = 3, 5')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'n = 3, 5')
-        assert_equal(repr(a),"Ac_Implied_Do_Control(Name('n'), [Int_Literal_Constant('3',None), Int_Literal_Constant('5',None)])")
+        assert_equal(repr(a),"Ac_Implied_Do_Control(Name('n'), [Int_Literal_Constant('3', None), Int_Literal_Constant('5', None)])")
 
         a = cls('n = 3+1, 5, 1')
         assert isinstance(a,cls),`a`
@@ -241,10 +309,10 @@
         a = cls('a, b')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'a, b')
-        assert_equal(repr(a),"Ac_Value_List(Name('a'), Name('b'))")
+        assert_equal(repr(a),"Ac_Value_List(',', (Name('a'), Name('b')))")
 
         a = cls('a')
-        assert isinstance(a,cls),`a`
+        assert isinstance(a,Name),`a`
         assert_equal(str(a),'a')
         
     def check_ac_implied_do(self):
@@ -252,7 +320,7 @@
         a = cls('( a, b, n = 1, 5 )')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(a, b, n = 1, 5)')
-        assert_equal(repr(a),"Ac_Implied_Do(Ac_Value_List(Name('a'), Name('b')), Ac_Implied_Do_Control(Name('n'), [Int_Literal_Constant('1',None), Int_Literal_Constant('5',None)]))")
+        assert_equal(repr(a),"Ac_Implied_Do(Ac_Value_List(',', (Name('a'), Name('b'))), Ac_Implied_Do_Control(Name('n'), [Int_Literal_Constant('1', None), Int_Literal_Constant('5', None)]))")
 
     def check_ac_spec(self):
         cls = Ac_Spec
@@ -292,12 +360,12 @@
         a = cls('1')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'1')
-        assert_equal(repr(a),"%s('1',None)" % (cls.__name__))
+        assert_equal(repr(a),"%s('1', None)" % (cls.__name__))
 
         a = cls('21_2')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'21_2')
-        assert_equal(repr(a),"%s('21','2')" % (cls.__name__))
+        assert_equal(repr(a),"%s('21', '2')" % (cls.__name__))
 
         a = cls('21_SHORT')
         assert isinstance(a,cls),`a`
@@ -316,12 +384,12 @@
         a = cls('12.78')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'12.78')
-        assert_equal(repr(a),"%s('12.78',None)" % (cls.__name__))
+        assert_equal(repr(a),"%s('12.78', None)" % (cls.__name__))
 
         a = cls('12.78_8')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'12.78_8')
-        assert_equal(repr(a),"%s('12.78','8')" % (cls.__name__))
+        assert_equal(repr(a),"%s('12.78', '8')" % (cls.__name__))
 
         a = cls('12.')
         assert isinstance(a,cls),`a`
@@ -371,7 +439,7 @@
         a = cls('(1.0, -1.0)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(1.0, -1.0)')
-        assert_equal(repr(a),"%s(Real_Part(None, Real_Literal_Constant('1.0',None)), Imag_Part('-', Real_Literal_Constant('1.0',None)))" % (cls.__name__))
+        assert_equal(repr(a),"Complex_Literal_Constant(Signed_Real_Literal_Constant('1.0', None), Signed_Real_Literal_Constant('-1.0', None))")
 
         a = cls('(3,3.1E6)')
         assert isinstance(a,cls),`a`



From numpy-svn at scipy.org  Mon Oct 23 19:08:02 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 18:08:02 -0500 (CDT)
Subject: [Numpy-svn] r3386 - trunk/numpy/core
Message-ID: <20061023230802.CED39C7C008@new.scipy.org>

Author: oliphant
Date: 2006-10-23 18:08:00 -0500 (Mon, 23 Oct 2006)
New Revision: 3386

Modified:
   trunk/numpy/core/defmatrix.py
Log:
Add .A1 property to matrices to be equivalent to .__array__().ravel()

Modified: trunk/numpy/core/defmatrix.py
===================================================================
--- trunk/numpy/core/defmatrix.py	2006-10-23 22:41:47 UTC (rev 3385)
+++ trunk/numpy/core/defmatrix.py	2006-10-23 23:08:00 UTC (rev 3386)
@@ -289,7 +289,10 @@
 
     def getA(self):
         return self.__array__()
-
+    
+    def getA1(self):
+        return self.__array__().ravel()
+    
     def getT(self):
         return self.transpose()
 
@@ -301,6 +304,7 @@
 
     T = property(getT, None, doc="transpose")
     A = property(getA, None, doc="base array")
+    A1 = property(getA1, None, doc="1-d base array")
     H = property(getH, None, doc="hermitian (conjugate) transpose")
     I = property(getI, None, doc="inverse")
 



From numpy-svn at scipy.org  Mon Oct 23 19:17:24 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 23 Oct 2006 18:17:24 -0500 (CDT)
Subject: [Numpy-svn] r3387 - trunk/numpy/core/src
Message-ID: <20061023231724.A3F5139C017@new.scipy.org>

Author: oliphant
Date: 2006-10-23 18:17:22 -0500 (Mon, 23 Oct 2006)
New Revision: 3387

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Initialize pos before calling PyDict_Next.

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2006-10-23 23:08:00 UTC (rev 3386)
+++ trunk/numpy/core/src/ufuncobject.c	2006-10-23 23:17:22 UTC (rev 3387)
@@ -1613,21 +1613,23 @@
         */
         if (kwds != NULL) {
                 PyObject *key, *value;
-                Py_ssize_t pos;
+                Py_ssize_t pos=0;
                 while (PyDict_Next(kwds, &pos, &key, &value)) {
                         if (!PyString_Check(key)) {
-                                PyErr_SetString(PyExc_TypeError, "invalid keyword");
+                                PyErr_SetString(PyExc_TypeError, 
+                                                "invalid keyword");
                                 goto fail;
                         }
-                        if (strncmp(PyString_AS_STRING(key), "extobj", 6) == 0) {
+                        if (strncmp(PyString_AS_STRING(key),"extobj",6) == 0) {
                                 extobj = value;
                         }
-                        else if (strncmp(PyString_AS_STRING(key), "sig", 5) == 0) {
+                        else if (strncmp(PyString_AS_STRING(key),"sig",5)==0) {
                                 typetup = value;
                         }
                         else {
                                 PyErr_Format(PyExc_TypeError, 
-                                             "'%s' is an invalid keyword to %s",
+                                             "'%s' is an invalid keyword " \
+                                             "to %s",
                                              PyString_AS_STRING(key), name);
                                 goto fail;
                         }



From numpy-svn at scipy.org  Tue Oct 24 02:52:41 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 24 Oct 2006 01:52:41 -0500 (CDT)
Subject: [Numpy-svn] r3388 - in trunk/numpy: . core/src core/tests
Message-ID: <20061024065241.DDF5D39C0B5@new.scipy.org>

Author: oliphant
Date: 2006-10-24 01:52:30 -0500 (Tue, 24 Oct 2006)
New Revision: 3388

Modified:
   trunk/numpy/core/src/multiarraymodule.c
   trunk/numpy/core/tests/test_defmatrix.py
   trunk/numpy/ctypeslib.py
Log:
Add warning for ctypes < 1.0.1 and fix test and add C_CONTIGUOUS and F_CONTIGUOUS to multiarray._flagdict

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-23 23:17:22 UTC (rev 3387)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-24 06:52:30 UTC (rev 3388)
@@ -7151,8 +7151,12 @@
         Py_DECREF(s);
         PyDict_SetItemString(newd, "FORTRAN", s=PyInt_FromLong(FORTRAN));
         Py_DECREF(s);
+        PyDict_SetItemString(newd, "F_CONTIGUOUS", s=PyInt_FromLong(FORTRAN));
+        Py_DECREF(s);
         PyDict_SetItemString(newd, "CONTIGUOUS", s=PyInt_FromLong(CONTIGUOUS));
         Py_DECREF(s);
+        PyDict_SetItemString(newd, "C_CONTIGUOUS", s=PyInt_FromLong(CONTIGUOUS));
+        Py_DECREF(s);
         PyDict_SetItemString(newd, "ALIGNED", s=PyInt_FromLong(ALIGNED));
         Py_DECREF(s);
 

Modified: trunk/numpy/core/tests/test_defmatrix.py
===================================================================
--- trunk/numpy/core/tests/test_defmatrix.py	2006-10-23 23:17:22 UTC (rev 3387)
+++ trunk/numpy/core/tests/test_defmatrix.py	2006-10-24 06:52:30 UTC (rev 3388)
@@ -145,7 +145,7 @@
             }
         excluded_methods = [
             'argmin', 'choose', 'dump', 'dumps', 'fill', 'getfield',
-            'getA', 'item', 'nonzero', 'put', 'putmask', 'resize',
+            'getA', 'getA1', 'item', 'nonzero', 'put', 'putmask', 'resize',
             'searchsorted', 'setflags', 'setfield', 'sort', 'take',
             'tofile', 'tolist', 'tostring', 'all', 'any', 'sum',
             'argmax', 'argmin', 'min', 'max', 'mean', 'var', 'ptp',

Modified: trunk/numpy/ctypeslib.py
===================================================================
--- trunk/numpy/ctypeslib.py	2006-10-23 23:17:22 UTC (rev 3387)
+++ trunk/numpy/ctypeslib.py	2006-10-24 06:52:30 UTC (rev 3388)
@@ -7,6 +7,10 @@
 
 try:
     import ctypes
+    if ctypes.__version__ < '1.0.1':
+        import warnings
+        warnings.warn("All features of ctypes interface may not work with " \
+                      "ctypes < 1.0.1")
 except ImportError:
     ctypes = None
 
@@ -91,14 +95,14 @@
     since several restrictions can be specified, which are verified
     upon calling the ctypes function.  These include data type
     (dtype), number of dimensions (ndim), shape and flags (e.g.
-    'CONTIGUOUS' or 'FORTRAN').  If a given array does not satisfy the
+    'C_CONTIGUOUS' or 'F_CONTIGUOUS').  If a given array does not satisfy the
     specified restrictions, a TypeError is raised.
     
     Example:
         
         clib.somefunc.argtypes = [ndpointer(dtype=float64,
                                             ndim=1,
-                                            flags='CONTIGUOUS')]
+                                            flags='C_CONTIGUOUS')]
         clib.somefunc(array([1,2,3],dtype=float64))
 
     """



From numpy-svn at scipy.org  Tue Oct 24 03:15:42 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 24 Oct 2006 02:15:42 -0500 (CDT)
Subject: [Numpy-svn] r3389 - in trunk/numpy: . core/include/numpy core/src
Message-ID: <20061024071542.3D5B539C0BB@new.scipy.org>

Author: oliphant
Date: 2006-10-24 02:15:28 -0500 (Tue, 24 Oct 2006)
New Revision: 3389

Modified:
   trunk/numpy/core/include/numpy/noprefix.h
   trunk/numpy/core/src/multiarraymodule.c
   trunk/numpy/ctypeslib.py
Log:
Add more keys to _flagdict.  Fix uses of F_CONTIGUOUS and C_CONTIGUOUS up a bit and make sure flags in num_to_flags includes only full flag names.

Modified: trunk/numpy/core/include/numpy/noprefix.h
===================================================================
--- trunk/numpy/core/include/numpy/noprefix.h	2006-10-24 06:52:30 UTC (rev 3388)
+++ trunk/numpy/core/include/numpy/noprefix.h	2006-10-24 07:15:28 UTC (rev 3389)
@@ -136,7 +136,9 @@
 #define LONGDOUBLE_FMT NPY_LONGDOUBLE_FMT
 
 #define CONTIGUOUS         NPY_CONTIGUOUS
+#define C_CONTIGUOUS       NPY_C_CONTIGUOUS
 #define FORTRAN            NPY_FORTRAN
+#define F_CONTIGUOUS       NPY_F_CONTIGUOUS
 #define OWNDATA            NPY_OWNDATA
 #define FORCECAST          NPY_FORCECAST
 #define ENSURECOPY         NPY_ENSURECOPY

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-24 06:52:30 UTC (rev 3388)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-24 07:15:28 UTC (rev 3389)
@@ -7147,24 +7147,28 @@
 
         newd = PyDict_New();
 
-        PyDict_SetItemString(newd, "OWNDATA", s=PyInt_FromLong(OWNDATA));
-        Py_DECREF(s);
-        PyDict_SetItemString(newd, "FORTRAN", s=PyInt_FromLong(FORTRAN));
-        Py_DECREF(s);
-        PyDict_SetItemString(newd, "F_CONTIGUOUS", s=PyInt_FromLong(FORTRAN));
-        Py_DECREF(s);
-        PyDict_SetItemString(newd, "CONTIGUOUS", s=PyInt_FromLong(CONTIGUOUS));
-        Py_DECREF(s);
-        PyDict_SetItemString(newd, "C_CONTIGUOUS", s=PyInt_FromLong(CONTIGUOUS));
-        Py_DECREF(s);
-        PyDict_SetItemString(newd, "ALIGNED", s=PyInt_FromLong(ALIGNED));
-        Py_DECREF(s);
+#define _addnew(val, one) \
+        PyDict_SetItemString(newd, #val, s=PyInt_FromLong(val)); \
+        Py_DECREF(s); \
+        PyDict_SetItemString(newd, #one, s=PyInt_FromLong(val)); \
+        Py_DECREF(s)
 
-        PyDict_SetItemString(newd, "UPDATEIFCOPY", s=PyInt_FromLong(UPDATEIFCOPY));
-        Py_DECREF(s);
-        PyDict_SetItemString(newd, "WRITEABLE", s=PyInt_FromLong(WRITEABLE));
-        Py_DECREF(s);
+#define _addone(val) \
+        PyDict_SetItemString(newd, #val, s=PyInt_FromLong(val)); \
+        Py_DECREF(s)
 
+        _addnew(OWNDATA, O);
+        _addnew(FORTRAN, F);
+        _addnew(CONTIGUOUS, C);
+        _addnew(ALIGNED, A);
+        _addnew(UPDATEIFCOPY, U);
+        _addnew(WRITEABLE, W);
+        _addone(C_CONTIGUOUS);
+        _addone(F_CONTIGUOUS);
+        
+#undef _addone
+#undef _addnew
+
         PyDict_SetItemString(d, "_flagdict", newd);
         Py_DECREF(newd);
         return;

Modified: trunk/numpy/ctypeslib.py
===================================================================
--- trunk/numpy/ctypeslib.py	2006-10-24 06:52:30 UTC (rev 3388)
+++ trunk/numpy/ctypeslib.py	2006-10-24 07:15:28 UTC (rev 3389)
@@ -51,9 +51,12 @@
         num += _flagdict[val]
     return num
 
+_flagnames = ['C_CONTIGUOUS', 'F_CONTIGUOUS', 'ALIGNED', 'WRITEABLE', 
+              'OWNDATA', 'UPDATEIFCOPY']
 def _flags_fromnum(num):
     res = []
-    for key, value in _flagdict.items():
+    for key in _flagnames:
+        value = _flagdict[key]
         if (num & value):
             res.append(key)
     return res



From numpy-svn at scipy.org  Tue Oct 24 03:27:09 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 24 Oct 2006 02:27:09 -0500 (CDT)
Subject: [Numpy-svn] r3390 - in trunk/numpy/core: . src
Message-ID: <20061024072709.C212BC7C016@new.scipy.org>

Author: oliphant
Date: 2006-10-24 02:26:55 -0500 (Tue, 24 Oct 2006)
New Revision: 3390

Modified:
   trunk/numpy/core/numeric.py
   trunk/numpy/core/src/arraymethods.c
Log:
Fix some typos and allow use of F_CONTIGUOUS and C_CONTIGUOUS in requires.

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-24 07:15:28 UTC (rev 3389)
+++ trunk/numpy/core/numeric.py	2006-10-24 07:26:55 UTC (rev 3390)
@@ -159,13 +159,17 @@
         subok = 0
     else:
         subok = 1
-
+        
     arr = array(a, dtype=dtype, copy=False, subok=subok)
 
     copychar = 'A'
-    if 'FORTRAN' in requirements or 'F' in requirements:
+    if 'FORTRAN' in requirements or \
+       'F_CONTIGUOUS' in requirements or \
+       'F' in requirements:
         copychar = 'F'
-    elif 'CONTIGUOUS' in requirements or 'C' in requirements:
+    elif 'CONTIGUOUS' in requirements or \
+         'C_CONTIGUOUS' in requirements or \
+         'C' in requirements:
         copychar = 'C'
 
     for prop in requirements:
@@ -175,7 +179,7 @@
     return arr   
 
 def isfortran(a):
-    """Returns True if 'a' is laid out in Fortran-order in memory (and a.ndim > 1)
+    """Returns True if 'a' is arranged in Fortran-order in memory with a.ndim > 1
     """
     return a.flags.fnc
 

Modified: trunk/numpy/core/src/arraymethods.c
===================================================================
--- trunk/numpy/core/src/arraymethods.c	2006-10-24 07:15:28 UTC (rev 3389)
+++ trunk/numpy/core/src/arraymethods.c	2006-10-24 07:26:55 UTC (rev 3390)
@@ -1689,7 +1689,7 @@
                 if (PyObject_IsTrue(uic)) {
 			self->flags = flagback;
                         PyErr_SetString(PyExc_ValueError,
-                                        "cannot set UPDATEIFCOPY"       \
+                                        "cannot set UPDATEIFCOPY "       \
                                         "flag to True");
                         return NULL;
                 }



From numpy-svn at scipy.org  Tue Oct 24 17:51:49 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 24 Oct 2006 16:51:49 -0500 (CDT)
Subject: [Numpy-svn] r3391 - trunk/numpy/f2py/lib/parser
Message-ID: <20061024215149.1F59E39C12C@new.scipy.org>

Author: pearu
Date: 2006-10-24 16:51:42 -0500 (Tue, 24 Oct 2006)
New Revision: 3391

Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/pattern_tools.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY G3: finished Fortran expression parser implementation, comes with complete unittests.

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-24 07:26:55 UTC (rev 3390)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-24 21:51:42 UTC (rev 3391)
@@ -38,11 +38,13 @@
     subclasses = {}
 
     def __new__(cls, string):
+        #print '__new__:',cls.__name__,`string`
         match = cls.__dict__.get('match', None)
         if match is not None:
             result = cls.match(string)
         else:
             result = None
+        #print '__new__:result:',cls.__name__,`string,result`
         if isinstance(result, tuple):
             obj = object.__new__(cls)
             obj.string = string
@@ -53,6 +55,7 @@
             return result
         elif result is None:
             for subcls in Base.subclasses.get(cls.__name__,[]):
+                #print cls.__name__,subcls.__name__,`string`
                 try:
                     return subcls(string)
                 except NoMatchError:
@@ -73,12 +76,6 @@
     def torepr_list(self):
         return '%s(%s)' % (self.__class__.__name__,', '.join(map(repr,self.items)))
 
-    def tostr_string(self):
-        return str(self.string)
-
-    def torepr_string(self):
-        return '%s(%r)' % (self.__class__.__name__,self.string)
-
     def __str__(self):
         return self.tostr()
         if self.__class__.__dict__.has_key('tostr'):
@@ -103,6 +100,7 @@
             for k in Base.findall(p):
                 p = p.replace(k,repmap[k])
             lst.append(subcls(p))
+        if len(lst)==1: return lst[0]
         return separator, tuple(lst)
     match = staticmethod(match)
     def init(self, separator, items):
@@ -129,16 +127,12 @@
     def torepr(self):
         return '%s(%r, %r)' % (self.__class__.__name__,self.op, self.rhs)
     def match(op_pattern, rhs_cls, string):
-        line, repmap = string_replace_map(string)
-        t = op_pattern.lsplit(line)
-        if t is None:
-            return rhs_cls(string)
-        lhs, op, rhs = t
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        assert not lhs,`lhs`
-        rhs_obj = rhs_cls(rhs)
-        return t[1], rhs_obj
+        m = op_pattern.match(string)
+        if not m: return rhs_cls(string)
+        rhs = string[m.end():].lstrip()        
+        if not rhs: return
+        op = string[:m.end()].rstrip().upper()
+        return op, rhs_cls(rhs)
     match = staticmethod(match)
 
 class BinaryOpBase(Base):
@@ -150,15 +144,16 @@
         t = op_pattern.rsplit(line)
         if t is None or len(t)!=3: return
         lhs, op, rhs = t
-        if lhs is None: return
-        if rhs is None: return
+        if not lhs: return
+        if not rhs: return
+        op = op.upper()
         for k in Base.findall(lhs):
             lhs = lhs.replace(k, repmap[k])
         for k in Base.findall(rhs):
             rhs = rhs.replace(k, repmap[k])
         lhs_obj = lhs_cls(lhs)
         rhs_obj = rhs_cls(rhs)
-        return lhs_obj, t[1], rhs_obj
+        return lhs_obj, op, rhs_obj
     match = staticmethod(match)
     def init(self, lhs, op, rhs):
         self.lhs = lhs
@@ -180,13 +175,15 @@
         if t is None:
             return rhs_cls(string)
         lhs, op, rhs = t
+        if not lhs: return
+        op = op.upper()
         for k in Base.findall(lhs):
             lhs = lhs.replace(k, repmap[k])
         for k in Base.findall(rhs):
             rhs = rhs.replace(k, repmap[k])
         lhs_obj = lhs_cls(lhs)
         rhs_obj = rhs_cls(rhs)
-        return lhs_obj, t[1], rhs_obj
+        return lhs_obj, op, rhs_obj
     match = staticmethod(match)
 
 class LBinaryOpBase(BinaryOpBase):
@@ -199,13 +196,15 @@
         if t is None:
             return lhs_cls(string)
         lhs, op, rhs = t
+        if not rhs: return
+        op = op.upper()
         for k in Base.findall(lhs):
             lhs = lhs.replace(k, repmap[k])
         for k in Base.findall(rhs):
             rhs = rhs.replace(k, repmap[k])
         lhs_obj = lhs_cls(lhs)
         rhs_obj = rhs_cls(rhs)
-        return lhs_obj, t[1], rhs_obj
+        return lhs_obj, op, rhs_obj
     match = staticmethod(match)
 
 class KeywordValueBase(BinaryOpBase):
@@ -223,10 +222,13 @@
     <bracket-base> = <left-bracket-base> <something> <right-bracket>
     """
     def match(brackets, cls, string):
-        left = brackets[:len(brackets)/2]
-        right = brackets[-len(brackets)/2:]
+        i = len(brackets)/2
+        left = brackets[:i]
+        right = brackets[-i:]
         if string.startswith(left) and string.endswith(right):
-            return left,cls(string[len(left):-len(right)].strip())
+            line = string[i:-i].strip()
+            if not line: return
+            return left,cls(line),right
         return
     match = staticmethod(match)
     def init(self,left,item,right):
@@ -234,8 +236,11 @@
         self.item = item
         self.right = right
         return
-    def tostr(self): '%s%s%s' % (self.left, self.item, self.right)
-    def torepr(self): '%s(%r, %r, %r)' % (self.__class__.__name__, self.left, self.item, self.right)
+    def tostr(self):
+        if self.item is None:
+            return '%s%s' % (self.left, self.right)
+        return '%s%s%s' % (self.left, self.item, self.right)
+    def torepr(self): return '%s(%r, %r, %r)' % (self.__class__.__name__, self.left, self.item, self.right)
 
 class NumberBase(Base):
     """
@@ -258,29 +263,83 @@
 
 class CallBase(Base):
     """
-    <call-base> = <lhs> ( <rhs> )
+    <call-base> = <lhs> ( [ <rhs> ] )
     """
     def match(lhs_cls, rhs_cls, string):
         if not string.endswith(')'): return
         line, repmap = string_replace_map(string)
         i = line.find('(')
         if i==-1: return
-        lhs = line[:i]
+        lhs = line[:i].rstrip()
+        if not lhs: return
         rhs = line[i+1:-1].strip()
         for k in Base.findall(lhs):
             lhs = lhs.replace(k,repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k,repmap[k])
-        return lhs_cls(lhs), rhs_cls(rhs)
+        if rhs:
+            for k in Base.findall(rhs):
+                rhs = rhs.replace(k,repmap[k])
+            return lhs_cls(lhs), rhs_cls(rhs)
+        return lhs_cls(lhs), None
     match = staticmethod(match)
     def init(self, lhs, rhs):
         self.lhs = lhs
         self.rhs = rhs
         return
-    def tostr(self): return '%s(%s)' % (self.lhs, self.rhs)
+    def tostr(self):
+        if self.rhs is None: return '%s()' % (self.lhs)
+        return '%s(%s)' % (self.lhs, self.rhs)
     def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.lhs, self.rhs)
 
+class StringBase(Base):
+    """
+    <string-base> = <xyz>
+    """
+    def match(pattern, string):
+        if pattern.match(string): return string,
+        return
+    match = staticmethod(match)
+    def init(self, string):
+        self.string = string
+        return
+    def tostr(self): return str(self.string)
+    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.string)
+
 ##################################################
+
+class Name(StringBase):
+    """
+    <name> = <letter> [ <alphanumeric_character> ]...
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_name, string)
+    match = staticmethod(match)
+
+class Binary_Constant(StringBase):
+    """
+    <binary-constant> = B ' <digit> [ <digit> ]... '
+                        | B \" <digit> [ <digit> ]... \"
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_binary_constant, string)
+    match = staticmethod(match)
+
+class Octal_Constant(StringBase):
+    """
+    <octal-constant> = O ' <digit> [ <digit> ]... '
+                       | O \" <digit> [ <digit> ]... \"
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_octal_constant, string)
+    match = staticmethod(match)
+
+class Hex_Constant(StringBase):
+    """
+    <hex-constant> = Z ' <digit> [ <digit> ]... '
+                     | Z \" <digit> [ <digit> ]... \"
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_hex_constant, string)
+    match = staticmethod(match)
     
 class Expr(RBinaryOpBase):
     """
@@ -289,6 +348,7 @@
     TODO: defined_binary_op must not be intrinsic_binary_op!!
     """
     subclass_names = []
+    use_names = ['Expr', 'Level_5_Expr']
     def match(string):
         return RBinaryOpBase.match(Expr, pattern.defined_binary_op.named(), Level_5_Expr,
                                    string)
@@ -301,6 +361,7 @@
                | .NEQV.
     """
     subclass_names = []
+    use_names = ['Level_5_Expr','Equiv_Operand']
     def match(string):
         return RBinaryOpBase.match(\
             Level_5_Expr,pattern.equiv_op.named(),Equiv_Operand,string)
@@ -312,6 +373,7 @@
     <or-op>  = .OR.
     """
     subclass_names = []
+    use_names = ['Equiv_Operand','Or_Operand']
     def match(string):
         return RBinaryOpBase.match(\
             Equiv_Operand,pattern.or_op.named(),Or_Operand,string)
@@ -323,6 +385,7 @@
     <and-op> = .AND.
     """
     subclass_names = []
+    use_names = ['Or_Operand','And_Operand']
     def match(string):
         return RBinaryOpBase.match(\
             Or_Operand,pattern.and_op.named(),And_Operand,string)
@@ -334,6 +397,7 @@
     <not-op> = .NOT.
     """
     subclass_names = []
+    use_names = ['Level_4_Expr']
     def match(string):
         return UnaryOpBase.match(\
             pattern.not_op.named(),Level_4_Expr,string)
@@ -345,6 +409,7 @@
     <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
     """
     subclass_names = []
+    use_names = ['Level_3_Expr']
     def match(string):
         return RBinaryOpBase.match(\
             Level_3_Expr,pattern.rel_op.named(),Level_3_Expr,string)
@@ -356,37 +421,38 @@
     <concat-op>    = //
     """
     subclass_names = []
+    use_names =['Level_3_Expr','Level_2_Expr']
     def match(string):
         return RBinaryOpBase.match(\
             Level_3_Expr,pattern.concat_op.named(),Level_2_Expr,string)
     match = staticmethod(match)
-    
-class Level_2_Expr(BinaryOpBase):
+
+class Level_2_Expr(RBinaryOpBase):
     """
     <level-2-expr> = [ [ <level-2-expr> ] <add-op> ] <add-operand>
+    <level-2-expr> = [ <level-2-expr> <add-op> ] <add-operand>
+                     | <level-2-unary-expr>
     <add-op>   = +
                  | -
     """
+    subclass_names = ['Level_2_Unary_Expr']
+    use_names = ['Level_2_Expr','Add_Operand']
+    def match(string):
+        return RBinaryOpBase.match(\
+            Level_2_Expr,pattern.add_op.named(),Add_Operand,string)
+    match = staticmethod(match)
+
+class Level_2_Unary_Expr(UnaryOpBase):
+    """
+    <level-2-unary-expr> = [ <add-op> ] <add-operand>
+    """
     subclass_names = []
+    use_names = ['Add_Operand']
     def match(string):
-        lhs_cls, op_pattern, rhs_cls = Level_2_Expr,pattern.add_op.named(),Add_Operand
-        line, repmap = string_replace_map(string)
-        t = op_pattern.rsplit(line)
-        if t is None:
-            return rhs_cls(string)
-        lhs, op, rhs = t
-        if lhs is not None:
-            for k in Base.findall(lhs):
-                lhs = lhs.replace(k, repmap[k])
-            lhs_obj = lhs_cls(lhs)
-        else:
-            lhs_obj = None
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        rhs_obj = rhs_cls(rhs)
-        return lhs_obj, t[1], rhs_obj
+        return UnaryOpBase.match(\
+            pattern.add_op.named(),Add_Operand,string)
     match = staticmethod(match)
-    
+
 class Add_Operand(RBinaryOpBase):
     """
     <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
@@ -394,6 +460,7 @@
                  | /
     """
     subclass_names = []
+    use_names = ['Add_Operand','Mult_Operand']
     def match(string):
         return RBinaryOpBase.match(\
             Add_Operand,pattern.mult_op.named(),Mult_Operand,string)
@@ -405,6 +472,7 @@
     <power-op> = **
     """
     subclass_names = []
+    use_names = ['Level_1_Expr','Mult_Operand']
     def match(string):
         return LBinaryOpBase.match(\
             Level_1_Expr,pattern.power_op.named(),Mult_Operand,string)
@@ -416,7 +484,9 @@
     <defined-unary-op> = . <letter> [ <letter> ]... .
     """
     subclass_names = []
+    use_names = ['Primary']
     def match(string):
+        if pattern.non_defined_binary_op.match(string): return
         return UnaryOpBase.match(\
             pattern.defined_unary_op.named(),Primary,string)
     match = staticmethod(match)
@@ -432,8 +502,8 @@
                 | <type-param-name>
                 | ( <expr> )
     """
-    subclass_names = ['Constant', 'Designator','Array_Constructor','Structure_Constructor',
-                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 'Parenthesis']
+    subclass_names = ['Parenthesis', 'Constant', 'Designator','Array_Constructor','Structure_Constructor',
+                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name']
 
 class Type_Param_Name(Base):
     """
@@ -446,6 +516,7 @@
     <type-param-inquiry> = <designator> % <type-param-name>
     """
     subclass_names = []
+    use_names = ['Designator','Type_Param_Name']
     def match(string):
         return BinaryOpBase.match(\
             Designator, pattern.percent_op.named(), Type_Param_Name, string)
@@ -456,35 +527,19 @@
     <structure-constructor-2> = [ <keyword> = ] <component-data-source>
     """
     subclass_names = []
+    use_names = ['Keyword', 'Component_Data_Source']
     def match(string): return KeywordValueBase.match(Component_Data_Source, string)
     match = staticmethod(match)
 
-class Structure_Constructor(Base):
+class Structure_Constructor(CallBase):
     """
     <structure-constructor> = <derived-type-spec> ( [ <component-spec-list> ] )
-                            | [ <keyword> = ] <component-data-source>
+                            | <structure-constructor-2>
     """
     subclass_names = ['Structure_Constructor_2']
-    def match(string):
-        if string[-1]!=')': return
-        line, repmap = string_replace_map(string)
-        i = line.rfind('(')
-        if i==-1: return
-        specline = line[:i].rstrip()
-        for k in Base.findall(specline):
-            specline = specline.replace(k,repmap[k])
-        spec = Derived_Type_Spec(specline)
-        l = line[i+1:-1].strip()
-        for k in Base.findall(l):
-            l = l.replace(k,repmap[k])
-        if not l: return spec,'(',None,')'
-        return spec,'(',Component_Spec_List(l),')'
+    use_names = ['Derived_Type_Spec', 'Component_Spec_List']
+    def match(string): return CallBase.match(Derived_Type_Spec, Component_Spec_List, string)
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[2] is None: return '%s()' % (self.items[0])
-        return '%s(%s)' % (self.items[0],self.items[2])
-    torepr = Base.torepr_list
 
 class Component_Data_Source(Base):
     """
@@ -492,7 +547,7 @@
                               | <data-target>
                               | <proc-target>
     """
-    subclass_names = ['Expr','Data_Target','Proc_Target']
+    subclass_names = ['Proc_Target', 'Data_Target', 'Expr']
 
 class Data_Target(Base):
     """
@@ -507,13 +562,14 @@
                     | <procedure-name>
                     | <proc-component-ref>
     """
-    subclass_names = ['Procedure_Name','Proc_Component_Ref', 'Expr']
+    subclass_names = ['Proc_Component_Ref', 'Procedure_Name', 'Expr']
 
 class Proc_Component_Ref(BinaryOpBase):
     """
     <proc-component-ref> = <variable> % <procedure-component-name>
     """
     subclass_names = []
+    use_names = ['Variable','Procedure_Component_Name']
     def match(string):
         return BinaryOpBase.match(\
             Variable, pattern.percent_op.named(), Procedure_Component_Name, string)            
@@ -524,6 +580,7 @@
     <component-spec> = [ <keyword> = ] <component-data-source>
     """
     subclass_names = []
+    use_names = ['Keyword','Component_Data_Source']
     def match(string): return KeywordValueBase.match(Component_Data_Source, string)
     match = staticmethod(match)
 
@@ -532,6 +589,7 @@
     <component-spec-list> = <component-spec> [ , <component-spec> ]...
     """
     subclass_names = []
+    use_names = ['Component_Spec']
     def match(string): return SequenceBase.match(r',', Component_Spec, string)
     match = staticmethod(match)
 
@@ -542,6 +600,7 @@
 
     """
     subclass_names = []
+    use_names = ['Ac_Spec']
     def match(string):
         try:
             obj = BracketBase.match('(//)', Ac_Spec, string)
@@ -557,14 +616,14 @@
     <ac-spec> = <type-spec> ::
                 | [ <type-spec> :: ] <ac-value-list>
     """
-    subclass_names = []
+    subclass_names = ['Ac_Value_List']
+    use_names = ['Type_Spec']
     def match(string):
         if string.endswith('::'):
             return Type_Spec(string[:-2].rstrip()),None
         line, repmap = string_replace_map(string)
         i = line.find('::')
-        if i==-1:
-            return None, Ac_Value_List(string)
+        if i==-1: return
         ts = line[:i].rstrip()
         line = line[i+2:].lstrip()
         for k in Base.findall(ts):
@@ -588,10 +647,8 @@
     <ac-value-list> = <ac-value> [ , <ac-value> ]...
     """
     subclass_names = []
-    def match(string):
-        r = SequenceBase.match(r',', Ac_Value, string)
-        if len(r[1])==1: return r[1][0]
-        return r
+    use_names = ['Ac_Value']
+    def match(string): return SequenceBase.match(r',', Ac_Value, string)
     match = staticmethod(match)
 
 class Ac_Value(Base):
@@ -606,6 +663,7 @@
     <ac-implied-do> = ( <ac-value-list> , <ac-implied-do-control> )
     """
     subclass_names = []
+    use_names = ['Ac_Value_List','Ac_Implied_Do_Control']    
     def match(string):
         if string[0]+string[-1] != '()': return
         line, repmap = string_replace_map(string[1:-1].strip())
@@ -630,6 +688,7 @@
     <ac-implied-do-control> = <ac-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]    
     """
     subclass_names = []
+    use_names = ['Ac_Do_Variable','Scalar_Int_Expr']
     def match(string):
         i = string.find('=')
         if i==-1: return
@@ -677,6 +736,8 @@
                             | BYTE
     """
     subclass_names = []
+    use_names = ['Kind_Selector','Char_Selector']
+        
     def match(string):
         if string[:7].upper()=='INTEGER':
             t = string[:7].upper()
@@ -725,6 +786,8 @@
                       | * <char-length>
     """
     subclass_names = []
+    use_names = ['Scalar_Int_Initialization_Expr','Char_Length']
+
     def match(string):
         if string[0]+string[-1] != '()':
             if not string.startswith('*'): return
@@ -753,7 +816,8 @@
                       | ( <type-param-value> , [ KIND = ] <scalar-int-initialization-expr> )
                       | ( KIND = <scalar-int-initialization-expr> [ , LEN = <type-param-value> ] )
     """
-    subclass_names = ['Lenght_Selector']
+    subclass_names = ['Length_Selector']
+    use_names = ['Type_Param_Value','Scalar_Int_Initialization_Expr']
     def match(string):
         if string[0]+string[-1] != '()': return
         line, repmap = string_replace_map(string[1:-1].strip())
@@ -805,12 +869,13 @@
     def torepr(self):
         return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
     
-class Lenght_Selector(Base):
+class Length_Selector(Base):
     """
-    <length-selector> = ( [ LEN = ] <type-param-value> )
+    <length -selector> = ( [ LEN = ] <type-param-value> )
                         | * <char-length> [ , ]
     """
     subclass_names = []
+    use_names = ['Type_Param_Value','Char_Length']
     def match(string):
         if string[0]+string[-1] == '()':
             line = string[1:-1].strip()
@@ -839,6 +904,7 @@
                     | <scalar-int-literal-constant>
     """
     subclass_names = []
+    use_names = ['Type_Param_Value','Scalar_Int_Literal_Constant']
     def match(string):
         if string[0]+string[-1] == '()':
             return '(',Type_Param_Value(string[1:-1].strip()),')'
@@ -873,6 +939,7 @@
                        | :
     """
     subclass_names = ['Scalar_Int_Expr']
+    use_names = ['Scalar_Int_Expr']
     def match(string):
         if string in ['*',':']: return string,
         return
@@ -881,41 +948,31 @@
     def tostr(self): return str(self.value)
     def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.value)
 
-class Derived_Type_Spec(Base):
+class Derived_Type_Spec(CallBase):
     """
     <derived-type-spec> = <type-name> [ ( <type-param-spec-list> ) ]
     """
-    subclass_names = []
-    def match(string):
-        i = string.find('(')
-        if i==-1: return Type_Name(string),None
-        if string[-1] != ')': return
-        return Type_Name(string[:i].rstrip()), Type_Param_Spec_List(string[i+1:-1].strip())
+    subclass_names = ['Type_Name']
+    use_names = ['Type_Param_Spec_List']
+    def match(string): return CallBase.match(Type_Name, Type_Param_Spec_List, string)
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[1] is None: return str(self.items[0])
-        return '%s(%s)' % tuple(self.items)
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
 
 class Type_Param_Spec(KeywordValueBase):
     """
     <type-param-spec> = [ <keyword> = ] <type-param-value>
     """
     subclass_names = []
+    use_names = ['Keyword','Type_Param_Value']
     def match(string): return KeywordValueBase.match(Type_Param_Value, string)
     match = staticmethod(match)
 
 class Type_Param_Spec_List(SequenceBase):
     """
-    <type-param-spec-list> = <type-param> [ , <type-param> ]...
+    <type-param-spec-list> = <type-param-spec> [ , <type-param-spec> ]...
     """
     subclass_names = []
-    def match(string):
-        r = SequenceBase.match(',', Type_Param_Spec, string)
-        if len(r[1])==1: return r[1][0]
-        return r
+    use_names = ['Type_Param_Spec']
+    def match(string): return SequenceBase.match(',', Type_Param_Spec, string)
     match = staticmethod(match)
 
 
@@ -945,6 +1002,7 @@
     <substring> = <parent-string> ( <substring-range> )    
     """
     subclass_names = []
+    use_names = ['Parent_String','Substring_Range']
     def match(string): return CallBase.match(Parent_String, Substring_Range, string)
     match = staticmethod(match)
 
@@ -986,6 +1044,7 @@
     <array-section> = <data-ref> [ ( <substring-range> ) ]
     """
     subclass_names = ['Data_Ref']
+    use_names = ['Data_Ref','Substring_Range']
     def match(string): return CallBase.match(Data_Ref, Substring_Range, string)
     match = staticmethod(match)
 
@@ -994,6 +1053,7 @@
     <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
     """
     subclass_names = []
+    use_names = ['Scalar_Int_Expr']
     def match(string):
         line, repmap = string_replace_map(string)
         if ':' not in line: return
@@ -1057,7 +1117,7 @@
     """
     <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
     """
-    subclass_names = []
+    subclass_names = ['Int_Literal_Constant'] # never used because sign is included in pattern
     def match(string):
         return NumberBase.match(pattern.abs_signed_int_literal_constant_named, string)
     match = staticmethod(match)
@@ -1080,7 +1140,7 @@
     """
     <signed-real-literal-constant> = [ <sign> ] <real-literal-constant>
     """
-    subclass_names = []
+    subclass_names = ['Real_Literal_Constant'] # never used
     def match(string):
         return NumberBase.match(pattern.abs_signed_real_literal_constant_named, string)
     match = staticmethod(match)
@@ -1090,6 +1150,7 @@
     <complex-literal-constant> = ( <real-part>, <imag-part> )
     """
     subclass_names = []
+    use_names = ['Real_Part','Imag_Part']
     def match(string):
         if string[0]+string[-1]!='()': return
         if not pattern.abs_complex_literal_constant.match(string):
@@ -1131,7 +1192,7 @@
             abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named1
         line, repmap = string_replace_map(string)
         m = abs_a_n_char_literal_constant_named.match(line)
-        if m is None: return
+        if not m: return
         kind_param = m.group('kind_param')
         line = m.group('value')
         for k in Base.findall(line):
@@ -1162,45 +1223,8 @@
     """
     subclass_names = ['Binary_Constant','Octal_Constant','Hex_Constant']
 
-class Binary_Constant(Base):
-    """
-    <binary-constant> = B ' <digit> [ <digit> ]... '
-                        | B \" <digit> [ <digit> ]... \"
-    """
-    subclass_names = []
-    def match(string):
-        if pattern.abs_binary_constant.match(string): return (string,)
-        return
-    match = staticmethod(match)
-    tostr = Base.tostr_string
-    torepr = Base.torepr_string
 
-class Octal_Constant(Base):
-    """
-    <octal-constant> = O ' <digit> [ <digit> ]... '
-                       | O \" <digit> [ <digit> ]... \"
-    """
-    subclass_names = []
-    def match(string):
-        if pattern.abs_octal_constant.match(string): return (string,)
-        return
-    match = staticmethod(match)
-    tostr = Base.tostr_string
-    torepr = Base.torepr_string
 
-class Hex_Constant(Base):
-    """
-    <hex-constant> = Z ' <digit> [ <digit> ]... '
-                     | Z \" <digit> [ <digit> ]... \"
-    """
-    subclass_names = []
-    def match(string):
-        if pattern.abs_hex_constant.match(string): return (string,)
-        return
-    match = staticmethod(match)
-    tostr = Base.tostr_string
-    torepr = Base.torepr_string
-
 class Named_Constant(Base):
     """
     <named-constant> = <name>
@@ -1218,6 +1242,7 @@
     <function-reference> = <procedure-designator> ( [ <actual-arg-spec-list> ] )
     """
     subclass_names = []
+    use_names = ['Procedure_Designator','Actual_Arg_Spec_List']
     def match(string):
         if string[-1] != ')': return None
         line, repmap = string_replace_map(string)
@@ -1242,7 +1267,6 @@
         if self.items[2] is None: return '%s()' % (self.items[0])
         return '%s(%s)' % (self.items[0],self.items[2])
     torepr = Base.torepr_list
-        
 
 
 class Procedure_Designator(BinaryOpBase):
@@ -1252,6 +1276,7 @@
                              | <data-ref> % <binding-name>
     """
     subclass_names = ['Procedure_Name','Proc_Component_Ref']
+    use_names = ['Data_Ref','Binding_Name']
     def match(string):
         return BinaryOpBase.match(\
             Data_Ref, pattern.percent_op.named(),  Binding_Name, string)
@@ -1262,6 +1287,7 @@
     <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
     """
     subclass_names = ['Part_Name']
+    use_names = ['Part_Name','Section_Subscript_List']
     def match(string): return CallBase.match(Part_Name, Section_Subscript_List, string)
     match = staticmethod(match)
 
@@ -1270,10 +1296,8 @@
     <section-subscript-list> = <section-subscript> [ , <section-subscript> ]...
     """
     subclass_names = []
-    def match(string):
-        r = SequenceBase.match(',', Section_Subscript, string)
-        if len(r[1])==1: return r[1][0]
-        return r
+    use_names = ['Section_Subscript']
+    def match(string): return SequenceBase.match(',', Section_Subscript, string)
     match = staticmethod(match)
 
 class Section_Subscript(Base):
@@ -1282,17 +1306,18 @@
                           | <subscript-triplet>
                           | <vector-subscript>
     """
-    subclass_names = ['Subscript', 'Subscript_Triplet', 'Vector_Subscript']
+    subclass_names = ['Subscript_Triplet', 'Vector_Subscript', 'Subscript']
 
 class Subscript_Triplet(Base):
     """
     <subscript-triplet> = [ <subscript> ] : [ <subscript> ] [ : <stride> ]
     """
     subclass_names = []
+    use_names = ['Subscript','Stride']
     def match(string):
         line, repmap = string_replace_map(string)
         t = line.split(':')
-        if len(t)==1 or len(t)>3: return
+        if len(t)<=1 or len(t)>3: return
         lhs_obj,rhs_obj, stride_obj = None, None, None
         if len(t)==2:
             lhs,rhs = t[0].rstrip(),t[1].lstrip()
@@ -1370,10 +1395,8 @@
     <data-ref> = <part-ref> [ % <part-ref> ]...
     """
     subclass_names = []
-    def match(string):
-        r = SequenceBase.match('%', Part_Ref, string)
-        if len(r[1])==1: return r[1][0]
-        return r
+    use_names = ['Part_Ref']
+    def match(string): return SequenceBase.match('%', Part_Ref, string)
     match = staticmethod(match)
 
 class Actual_Arg_Spec_List(SequenceBase):
@@ -1381,10 +1404,8 @@
     <actual-arg-spec-list> = <actual-arg-spec> [ , <actual-arg-spec> ]...
     """
     subclass_names = []
-    def match(string):
-        r = SequenceBase.match(r',', Actual_Arg_Spec, string)
-        if len(r[1])==1: return r[1][0]
-        return r
+    use_names = ['Actual_Arg_Spec']
+    def match(string): return SequenceBase.match(r',', Actual_Arg_Spec, string)
     match = staticmethod(match)
 
 class Actual_Arg_Spec(KeywordValueBase):
@@ -1392,6 +1413,7 @@
     <actual-arg-spec> = [ <keyword> = ] <actual-arg>
     """
     subclass_names = []
+    use_names = ['Keyword','Actual_Arg']
     def match(string): return KeywordValueBase.match(Actual_Arg, string)
     match = staticmethod(match)
 
@@ -1407,6 +1429,7 @@
     <type-name> shall not be DOUBLEPRECISION or the name of intrinsic type
     """
     subclass_names = []
+    use_names = ['Name']
     def match(string):
         if pattern.abs_intrinsic_type_name.match(string): return
         return Name(string)
@@ -1463,21 +1486,10 @@
     <parenthesis> = ( <expr> )
     """
     subclass_names = []
-    def match(string): BracketBase.match('()', Expr, string)
+    use_names = ['Expr']
+    def match(string): return BracketBase.match('()', Expr, string)
     match = staticmethod(match)
 
-class Name(Base):
-    """
-    <name> = <letter> [ <alphanumeric_character> ]...
-    """
-    subclass_names = []
-    def match(string):
-        if pattern.abs_name.match(string):
-            return string,
-        return
-    match = staticmethod(match)
-    tostr = Base.tostr_string
-    torepr = Base.torepr_string
 
 ##############################################################################
     
@@ -1504,15 +1516,20 @@
         else:
             print '%s not implemented needed by %s' % (n,clsname)
 
-for cls in Base_classes.values():
-    subclasses = Base.subclasses.get(cls.__name__,[])
-    subclasses_names = [c.__name__ for c in subclasses]
-    subclass_names = getattr(cls,'subclass_names', [])
-    for n in subclasses_names:
-        if n not in subclass_names:
-            print '%s needs to be added to %s subclasses_name list' % (n,cls.__name__)
-    for n in subclass_names:
-        if n not in subclasses_names:
-            print '%s needs to be added to %s subclass_name list' % (n,cls.__name__)
+if 0:
+    for cls in Base_classes.values():
+        subclasses = Base.subclasses.get(cls.__name__,[])
+        subclasses_names = [c.__name__ for c in subclasses]
+        subclass_names = getattr(cls,'subclass_names', [])
+        use_names = getattr(cls,'use_names',[])
+        for n in subclasses_names:
+            if n not in subclass_names:
+                print '%s needs to be added to %s subclasses_name list' % (n,cls.__name__)
+        for n in subclass_names:
+            if n not in subclasses_names:
+                print '%s needs to be added to %s subclass_name list' % (n,cls.__name__)
+        for n in use_names:
+            if not Base_classes.has_key(n):
+                print '%s not defined used by %s' % (n, cls.__name__)
 #import pprint
 #pprint.pprint(Base.subclasses)

Modified: trunk/numpy/f2py/lib/parser/pattern_tools.py
===================================================================
--- trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-24 07:26:55 UTC (rev 3390)
+++ trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-24 21:51:42 UTC (rev 3391)
@@ -82,7 +82,7 @@
         if len(t) < 3: return
         rhs = t[-1].strip()
         pattern_match = t[-2].strip()
-        assert abs(self).match(pattern_match),`pattern_match`
+        assert abs(self).match(pattern_match),`self,string,t,pattern_match`
         lhs = (''.join(t[:-2])).strip()
         return lhs, pattern_match, rhs
 
@@ -248,13 +248,13 @@
 
 power_op = Pattern('<power-op>','[*]{2}')
 mult_op = Pattern('<mult-op>','[*/]')
-add_op = Pattern('<add-op>','[+-]')
-concat_op = Pattern('<concat-op>','[/]{}')
-rel_op = Pattern('<rel-op>','([.](EQ|NE|LT|LE|GT|GE)[.])|[=]{2}|/[=]|[<]|[<][=]|[>]|[=][>]',flags=re.I)
+add_op = Pattern('<add-op>',r'[+-]')
+concat_op = Pattern('<concat-op>',r'[/]{2}')
+rel_op = Pattern('<rel-op>','[.]EQ[.]|[.]NE[.]|[.]LT[.]|[.]LE[.]|[.]GT[.]|[.]GE[.]|[=]{2}|/[=]|[<][=]|[<]|[>][=]|[>]',flags=re.I)
 not_op = Pattern('<not-op>','[.]NOT[.]',flags=re.I)
 and_op = Pattern('<and-op>','[.]AND[.]',flags=re.I)
 or_op = Pattern('<or-op>','[.]OR[.]',flags=re.I)
-equiv_op = Pattern('<equiv-op>','[.](EQV|NEQV)[.]',flags=re.I)
+equiv_op = Pattern('<equiv-op>','[.]EQV[.]|[.]NEQV[.]',flags=re.I)
 percent_op = Pattern('<percent-op>',r'%',flags=re.I)
 intrinsic_operator = power_op | mult_op | add_op | concat_op | rel_op | not_op | and_op | or_op | equiv_op
 extended_intrinsic_operator = intrinsic_operator
@@ -263,6 +263,8 @@
 defined_binary_op = Pattern('<defined-binary-op>','[.][A-Z]+[.]',flags=re.I)
 defined_operator = defined_unary_op | defined_binary_op | extended_intrinsic_operator
 
+non_defined_binary_op = intrinsic_operator | logical_literal_constant
+
 label = Pattern('<label>','\d{1,5}')
 abs_label = abs(label)
 

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-24 07:26:55 UTC (rev 3390)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-24 21:51:42 UTC (rev 3391)
@@ -10,14 +10,14 @@
         cls = Expr
         a = cls('a .op. b')
         assert isinstance(a,cls),`a`
-        assert_equal(str(a),'a .op. b')
-        assert_equal(repr(a),"Expr(Name('a'), '.op.', Name('b'))")
+        assert_equal(str(a),'a .OP. b')
+        assert_equal(repr(a),"Expr(Name('a'), '.OP.', Name('b'))")
 
         a = cls('a')
         assert isinstance(a,Name),`a`
         assert_equal(str(a),'a')
 
-class test_Designator(NumpyTestCase):
+class test_Substring(NumpyTestCase):
 
     def check_substring(self):
         cls = Substring
@@ -26,7 +26,7 @@
         assert_equal(str(a),'a(1 : 2)')
         assert_equal(repr(a),"Substring(Name('a'), Substring_Range(Int_Literal_Constant('1', None), Int_Literal_Constant('2', None)))")
 
-class test_Procedure_Designator(NumpyTestCase):
+class test_Part_Ref(NumpyTestCase):
 
     def check_part_ref(self):
         cls = Part_Ref
@@ -34,7 +34,7 @@
         assert isinstance(a, Name),`a`
         assert_equal(str(a),'a')
         
-class test_Type_Spec(NumpyTestCase):
+class test_Kind_Selector(NumpyTestCase):
 
     def check_kind_selector(self):
         cls = Kind_Selector
@@ -51,6 +51,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'*1')
 
+class test_Type_Param_Value(NumpyTestCase):
+
     def check_type_param_value(self):
         cls = Type_Param_Value
         a = cls('*')
@@ -66,6 +68,8 @@
         assert isinstance(a,Level_2_Expr),`a`
         assert_equal(str(a),'1 + 2')
 
+class test_Char_Length(NumpyTestCase):
+
     def check_char_length(self):
         cls = Char_Length
         a = cls('1')
@@ -85,17 +89,21 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(:)')
 
-    def check_lenght_selector(self):
-        cls = Lenght_Selector
+class test_Length_Selector(NumpyTestCase):
+
+    def check_length_selector(self):
+        cls = Length_Selector
         a = cls('( len = *)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(LEN = *)')
-        assert_equal(repr(a),"Lenght_Selector('(', Type_Param_Value('*'), ')')")
+        assert_equal(repr(a),"Length_Selector('(', Type_Param_Value('*'), ')')")
 
         a = cls('*2,')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'*2')
 
+class test_Char_Selector(NumpyTestCase):
+
     def check_char_selector(self):
         cls = Char_Selector
         a = cls('(len=2, kind=8)')
@@ -120,6 +128,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(LEN = 2, KIND = 8)')
 
+class test_Intrinsic_Type_Spec(NumpyTestCase):
+
     def check_intrinsic_type_spec(self):
         cls = Intrinsic_Type_Spec
         a = cls('INTEGER')
@@ -155,6 +165,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'DOUBLE PRECISION')
 
+class test_Type_Param_Spec(NumpyTestCase):
+
     def check_type_param_spec(self):
         cls = Type_Param_Spec
         a = cls('a=1')
@@ -170,6 +182,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'k = :')
 
+class test_Type_Param_Spec_List(NumpyTestCase):
+
     def check_type_param_spec_list(self):
         cls = Type_Param_Spec_List
 
@@ -207,13 +221,17 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'f(2, k = 1, a)')
 
+class test_Alt_Return_Spec(NumpyTestCase):
+
     def check_alt_return_spec(self):
         cls = Alt_Return_Spec
         a = cls('* 123')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'*123')
         assert_equal(repr(a),"Alt_Return_Spec('123')")
-        
+
+class test_Substring_Range(NumpyTestCase):
+
     def check_substring_range(self):
         cls = Substring_Range
         a = cls('a:b')
@@ -233,6 +251,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),':')
 
+class test_Array_Section(NumpyTestCase):
+
     def check_array_section(self):
         cls = Array_Section
         a = cls('a(:)')
@@ -244,13 +264,17 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'a(2 :)')
 
+class test_Procedure_Designator(NumpyTestCase):
+
     def check_procedure_designator(self):
         cls = Procedure_Designator
         a = cls('a%b')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'a % b')
         assert_equal(repr(a),"Procedure_Designator(Name('a'), '%', Name('b'))")
-        
+
+class test_Data_Ref(NumpyTestCase):
+
     def check_data_ref(self):
         cls = Data_Ref
         a = cls('a%b')
@@ -262,7 +286,7 @@
         assert isinstance(a,Name),`a`
         assert_equal(str(a),'a')
 
-class test_Structure_Constructor(NumpyTestCase):
+class test_Proc_Component_Ref(NumpyTestCase):
 
     def check_proc_component_ref(self):
         cls = Proc_Component_Ref
@@ -271,12 +295,14 @@
         assert_equal(str(a),'a % b')
         assert_equal(repr(a),"Proc_Component_Ref(Name('a'), '%', Name('b'))")
 
+class test_Structure_Constructor(NumpyTestCase):
+
     def check_structure_constructor(self):
         cls = Structure_Constructor
         a = cls('t()')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'t()')
-        assert_equal(repr(a),"Structure_Constructor(Derived_Type_Spec(Name('t'), None), '(', None, ')')")
+        assert_equal(repr(a),"Structure_Constructor(Name('t'), None)")
 
         a = cls('t(s=1, a)')
         assert isinstance(a,cls),`a`
@@ -291,7 +317,7 @@
         assert isinstance(a,Name),`a`
         assert_equal(str(a),'a')
     
-class test_Array_Constructor(NumpyTestCase):
+class test_Ac_Implied_Do_Control(NumpyTestCase):
 
     def check_ac_implied_do_control(self):
         cls = Ac_Implied_Do_Control
@@ -304,6 +330,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'n = 3 + 1, 5, 1')
 
+class test_Ac_Value_List(NumpyTestCase):
+
     def check_ac_value_list(self):
         cls = Ac_Value_List
         a = cls('a, b')
@@ -314,7 +342,9 @@
         a = cls('a')
         assert isinstance(a,Name),`a`
         assert_equal(str(a),'a')
-        
+
+class test_Ac_Implied_Do(NumpyTestCase):
+    
     def check_ac_implied_do(self):
         cls = Ac_Implied_Do
         a = cls('( a, b, n = 1, 5 )')
@@ -322,6 +352,8 @@
         assert_equal(str(a),'(a, b, n = 1, 5)')
         assert_equal(repr(a),"Ac_Implied_Do(Ac_Value_List(',', (Name('a'), Name('b'))), Ac_Implied_Do_Control(Name('n'), [Int_Literal_Constant('1', None), Int_Literal_Constant('5', None)]))")
 
+class test_Ac_Spec(NumpyTestCase):
+
     def check_ac_spec(self):
         cls = Ac_Spec
         a = cls('integer ::')
@@ -334,14 +366,14 @@
         assert_equal(str(a),'INTEGER :: a, b')
 
         a = cls('a,b')
-        assert isinstance(a,cls),`a`
+        assert isinstance(a,Ac_Value_List),`a`
         assert_equal(str(a),'a, b')
 
         a = cls('integer :: a, (a, b, n = 1, 5)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'INTEGER :: a, (a, b, n = 1, 5)')
 
-class test_Constant(NumpyTestCase):
+class test_Name(NumpyTestCase):
 
     def check_name(self):
         a = Name('a')
@@ -355,6 +387,8 @@
         a = Expr('a')
         assert isinstance(a,Name),`a`
 
+class test_Int_Literal_Constant(NumpyTestCase):
+
     def check_int_literal_constant(self):
         cls = Int_Literal_Constant
         a = cls('1')
@@ -379,6 +413,34 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'1976354279568241_8')
 
+class test_Signed_Int_Literal_Constant(NumpyTestCase):
+
+    def check_int_literal_constant(self):
+        cls = Signed_Int_Literal_Constant
+        a = cls('1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1')
+        assert_equal(repr(a),"%s('1', None)" % (cls.__name__))
+
+        a = cls('+ 21_2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+ 21_2')
+        assert_equal(repr(a),"%s('+ 21', '2')" % (cls.__name__))
+
+        a = cls('-21_SHORT')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'-21_SHORT')
+
+        a = cls('21_short')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'21_short')
+
+        a = cls('+1976354279568241_8')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+1976354279568241_8')
+
+class test_Real_Literal_Constant(NumpyTestCase):
+
     def check_real_literal_constant(self):
         cls = Real_Literal_Constant
         a = cls('12.78')
@@ -434,6 +496,66 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'10.9e-17_quad')
 
+class test_Signed_Real_Literal_Constant(NumpyTestCase):
+
+    def check_signed_real_literal_constant(self):
+        cls = Signed_Real_Literal_Constant
+        a = cls('12.78')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'12.78')
+        assert_equal(repr(a),"%s('12.78', None)" % (cls.__name__))
+
+        a = cls('+12.78_8')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+12.78_8')
+        assert_equal(repr(a),"%s('+12.78', '8')" % (cls.__name__))
+
+        a = cls('- 12.')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'- 12.')
+
+        a = cls('1.6E3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6E3')
+
+        a = cls('+1.6E3_8')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+1.6E3_8')
+
+        a = cls('1.6D3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6D3')
+
+        a = cls('-1.6E-3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'-1.6E-3')
+        a = cls('1.6E+3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'1.6E+3')
+
+        a = cls('3E4')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'3E4')
+
+        a = cls('.123')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.123')
+
+        a = cls('+1.6E-3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+1.6E-3')
+
+        a = cls('10.9E7_QUAD')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'10.9E7_QUAD')
+
+        a = cls('-10.9e-17_quad')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'-10.9e-17_quad')
+
+
+class test_Complex_Literal_Constant(NumpyTestCase):
+
     def check_complex_literal_constant(self):
         cls = Complex_Literal_Constant
         a = cls('(1.0, -1.0)')
@@ -453,6 +575,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(0., PI)')
 
+class test_Char_Literal_Constant(NumpyTestCase):
+
     def check_char_literal_constant(self):
         cls = Char_Literal_Constant
         a = cls('NIH_"DO"')
@@ -485,6 +609,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'"hey ha(ada)\t"')
 
+class test_Logical_Literal_Constant(NumpyTestCase):
+
     def check_logical_literal_constant(self):
         cls = Logical_Literal_Constant
         a = cls('.TRUE.')
@@ -504,6 +630,8 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'.TRUE._HA')
 
+class test_Binary_Constant(NumpyTestCase):
+
     def check_boz_literal_constant(self):
         cls = Boz_Literal_Constant
         bcls = Binary_Constant
@@ -512,17 +640,426 @@
         assert_equal(str(a),'B"01"')
         assert_equal(repr(a),"%s('B\"01\"')" % (bcls.__name__))
 
+class test_Octal_Constant(NumpyTestCase):
+
+    def check_boz_literal_constant(self):
+        cls = Boz_Literal_Constant
         ocls = Octal_Constant
         a = cls('O"017"')
         assert isinstance(a,ocls),`a`
         assert_equal(str(a),'O"017"')
         assert_equal(repr(a),"%s('O\"017\"')" % (ocls.__name__))
 
+class test_Hex_Constant(NumpyTestCase):
+
+    def check_boz_literal_constant(self):
+        cls = Boz_Literal_Constant
         zcls = Hex_Constant
         a = cls('Z"01A"')
         assert isinstance(a,zcls),`a`
         assert_equal(str(a),'Z"01A"')
         assert_equal(repr(a),"%s('Z\"01A\"')" % (zcls.__name__))
-    
+
+class test_Subscript_Triplet(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Subscript_Triplet
+        a = cls('a:b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a : b')
+        assert_equal(repr(a),"Subscript_Triplet(Name('a'), Name('b'), None)")
+
+        a = cls('a:b:1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a : b : 1')
+
+        a = cls(':')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),':')
+
+        a = cls('::5')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),': : 5')
+
+        a = cls(':5')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),': 5')
+
+        a = cls('a+1 :')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a + 1 :')
+
+class test_Section_Subscript(NumpyTestCase):
+
+    def check_simple(self):
+        cls_in = Section_Subscript
+
+        a = cls('1:2')
+        assert isinstance(a, Subscript_Triplet),`a`
+        assert_equal(str(a),'1 : 2')
+
+        a = cls('zzz')
+        assert isinstance(a, Name),`a`
+        assert_equal(str(a),'zzz')
+        
+class test_Section_Subscript_List(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Section_Subscript_List
+        a = cls('a,2')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a, 2')
+        assert_equal(repr(a),"Section_Subscript_List(',', (Name('a'), Int_Literal_Constant('2', None)))")
+
+        a = cls('::1')
+        assert isinstance(a,Subscript_Triplet),`a`
+        assert_equal(str(a),': : 1')
+
+        a = cls('::1, 3')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),': : 1, 3')
+
+class test_Derived_Type_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Derived_Type_Spec
+        a = cls('a(b)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a(b)')
+        assert_equal(repr(a),"Derived_Type_Spec(Name('a'), Name('b'))")
+
+        a = cls('a(b,c,g=1)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a(b, c, g = 1)')
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
+        a = cls('a()')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a()')
+
+class test_Type_Name(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Type_Name
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+        assert_equal(repr(a),"Name('a')")
+
+        self.assertRaises(NoMatchError,cls,'integer')
+        self.assertRaises(NoMatchError,cls,'doubleprecision')
+
+class test_Actual_Arg_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Actual_Arg_Spec
+        a = cls('k=a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = a')
+        assert_equal(repr(a),"Actual_Arg_Spec(Name('k'), '=', Name('a'))")
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
+class test_Actual_Arg_Spec_List(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Actual_Arg_Spec_List
+        a = cls('a,b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a, b')
+        assert_equal(repr(a),"Actual_Arg_Spec_List(',', (Name('a'), Name('b')))")
+
+        a = cls('a = k')
+        assert isinstance(a,Actual_Arg_Spec),`a`
+        assert_equal(str(a),'a = k')
+
+        a = cls('a = k,b')
+        assert isinstance(a,Actual_Arg_Spec_List),`a`
+        assert_equal(str(a),'a = k, b')
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
+class test_Component_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Component_Spec
+        a = cls('k=a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = a')
+        assert_equal(repr(a),"Component_Spec(Name('k'), '=', Name('a'))")
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
+        a = cls('a % b')
+        assert isinstance(a, Proc_Component_Ref),`a`
+        assert_equal(str(a),'a % b')
+
+        a = cls('s =a % b')
+        assert isinstance(a, Component_Spec),`a`
+        assert_equal(str(a),'s = a % b')
+
+class test_Component_Spec_List(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Component_Spec_List
+        a = cls('k=a, b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = a, b')
+        assert_equal(repr(a),"Component_Spec_List(',', (Component_Spec(Name('k'), '=', Name('a')), Name('b')))")
+
+        a = cls('k=a, c')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = a, c')
+
+class test_Structure_Constructor_2(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Structure_Constructor_2
+        a = cls('k=a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'k = a')
+        assert_equal(repr(a),"Structure_Constructor_2(Name('k'), '=', Name('a'))")
+
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
+class test_Array_Constructor(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Array_Constructor
+        a = cls('(/a/)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(/a/)')
+        assert_equal(repr(a),"Array_Constructor('(/', Name('a'), '/)')")
+
+        a = cls('[a]')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'[a]')
+        assert_equal(repr(a),"Array_Constructor('[', Name('a'), ']')")
+
+        a = cls('[integer::a]')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'[INTEGER :: a]')
+
+        a = cls('[integer::a,b]')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'[INTEGER :: a, b]')
+
+class test_Parenthesis(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Parenthesis
+        a  = cls('(a)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(a)')
+        assert_equal(repr(a),"Parenthesis('(', Name('a'), ')')")
+
+        a  = cls('(a+1)')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(a + 1)')
+
+        a  = cls('((a))')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'((a))')
+
+        a  = cls('(a+(a+c))')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'(a + (a + c))')
+
+class test_Level_1_Expr(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Level_1_Expr
+        a = cls('.hey. a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.HEY. a')
+        assert_equal(repr(a),"Level_1_Expr('.HEY.', Name('a'))")
+
+        self.assertRaises(NoMatchError,cls,'.not. a')
+
+class test_Level_2_Expr(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Level_2_Expr
+        a = cls('a+b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a + b')
+        assert_equal(repr(a),"Level_2_Expr(Name('a'), '+', Name('b'))")
+
+        a = cls('a-b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a - b')
+
+        a = cls('a+b+c')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a + b + c')
+
+        a = cls('+a')
+        assert isinstance(a,Level_2_Unary_Expr),`a`
+        assert_equal(str(a),'+ a')
+
+        a = cls('+1')
+        assert isinstance(a,Level_2_Unary_Expr),`a`
+        assert_equal(str(a),'+ 1')
+
+        a = cls('+a+b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+ a + b')
+
+class test_Level_2_Unary_Expr(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Level_2_Unary_Expr
+        a = cls('+a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+ a')
+        assert_equal(repr(a),"Level_2_Unary_Expr('+', Name('a'))")
+
+        a = cls('-a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'- a')
+
+        a = cls('+1')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'+ 1')
+
+class test_Level_3_Expr(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Level_3_Expr
+        a = cls('a//b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a // b')
+        assert_equal(repr(a),"Level_3_Expr(Name('a'), '//', Name('b'))")
+
+        a = cls('"a"//"b"')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'"a" // "b"')
+
+class test_Level_4_Expr(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Level_4_Expr
+        a = cls('a.eq.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .EQ. b')
+        assert_equal(repr(a),"Level_4_Expr(Name('a'), '.EQ.', Name('b'))")
+
+        a = cls('a.ne.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .NE. b')
+
+        a = cls('a.lt.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .LT. b')
+
+        a = cls('a.gt.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .GT. b')
+
+        a = cls('a.ge.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .GE. b')
+
+        a = cls('a==b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a == b')
+
+        a = cls('a/=b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a /= b')
+
+        a = cls('a<b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a < b')
+
+        a = cls('a<=b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a <= b')
+
+        a = cls('a>=b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a >= b')
+
+        a = cls('a>b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a > b')
+
+class test_Level_5_Expr(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Level_5_Expr
+        a = cls('a.eqv.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .EQV. b')
+        assert_equal(repr(a),"Level_5_Expr(Name('a'), '.EQV.', Name('b'))")
+
+        a = cls('a.neqv.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .NEQV. b')
+
+        a = cls('a.eq.b')
+        assert isinstance(a,Level_4_Expr),`a`
+        assert_equal(str(a),'a .EQ. b')
+
+class test_Mult_Operand(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Mult_Operand
+        a = cls('a**b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a ** b')
+        assert_equal(repr(a),"Mult_Operand(Name('a'), '**', Name('b'))")
+
+class test_Add_Operand(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Add_Operand
+        a = cls('a*b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a * b')
+        assert_equal(repr(a),"Add_Operand(Name('a'), '*', Name('b'))")
+
+        a = cls('a/b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a / b')
+
+class test_Equiv_Operand(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Equiv_Operand
+        a = cls('a.or.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .OR. b')
+        assert_equal(repr(a),"Equiv_Operand(Name('a'), '.OR.', Name('b'))")
+
+class test_Or_Operand(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Or_Operand
+        a = cls('a.and.b')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'a .AND. b')
+        assert_equal(repr(a),"Or_Operand(Name('a'), '.AND.', Name('b'))")
+
+class test_And_Operand(NumpyTestCase):
+
+    def check_simple(self):
+        cls = And_Operand
+        a = cls('.not.a')
+        assert isinstance(a,cls),`a`
+        assert_equal(str(a),'.NOT. a')
+        assert_equal(repr(a),"And_Operand('.NOT.', Name('a'))")
+        
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Wed Oct 25 02:15:47 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 01:15:47 -0500 (CDT)
Subject: [Numpy-svn] r3392 - trunk/numpy/core/src
Message-ID: <20061025061547.D153C39C197@new.scipy.org>

Author: oliphant
Date: 2006-10-25 01:15:40 -0500 (Wed, 25 Oct 2006)
New Revision: 3392

Modified:
   trunk/numpy/core/src/arraymethods.c
   trunk/numpy/core/src/arrayobject.c
Log:
Fix optimization so that array's of 1-element are not interpeted as integers.

Modified: trunk/numpy/core/src/arraymethods.c
===================================================================
--- trunk/numpy/core/src/arraymethods.c	2006-10-24 21:51:42 UTC (rev 3391)
+++ trunk/numpy/core/src/arraymethods.c	2006-10-25 06:15:40 UTC (rev 3392)
@@ -402,6 +402,9 @@
 }
 
 
+/* This should grow an order= keyword to be consistent
+ */
+
 static PyObject *
 array_tofile(PyArrayObject *self, PyObject *args, PyObject *kwds)
 {

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-24 21:51:42 UTC (rev 3391)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-25 06:15:40 UTC (rev 3392)
@@ -2793,7 +2793,29 @@
 }
 
 
+/* return -1 if tuple-object seq is not a tuple of integers.
+   otherwise fill vals with converted integers
+*/
 static int
+_tuple_of_integers(PyObject *seq, intp *vals, int maxvals)
+{
+        int i;
+        PyObject *obj;
+        intp temp;
+
+        for (i=0; i<maxvals; i++) {
+                obj = PyTuple_GET_ITEM(seq, i);
+                if ((PyArray_Check(obj) && PyArray_NDIM(obj) > 0) ||
+                    PyList_Check(obj)) return -1;
+                temp = PyArray_PyIntAsIntp(obj);
+                if (error_converting(temp)) return -1;
+                vals[i] = temp;
+        }
+        return 0;
+}
+
+
+static int
 array_ass_sub(PyArrayObject *self, PyObject *index, PyObject *op)
 {
         int ret, oned, fancy;
@@ -2857,9 +2879,9 @@
         }
         
         /* optimization for integer-tuple */
-        if (self->nd > 1 && 
+        if (self->nd > 1 &&
             (PyTuple_Check(index) && (PyTuple_GET_SIZE(index) == self->nd)) 
-            && PyArray_IntpFromSequence(index, vals, self->nd) == self->nd) {
+            && (_tuple_of_integers(index, vals, self->nd) >= 0)) {
                 int i;
                 char *item;
                 for (i=0; i<self->nd; i++) {
@@ -2934,7 +2956,7 @@
         /* optimization for a tuple of integers */
         if (self->nd > 1 && PyTuple_Check(op) &&
             (PyTuple_GET_SIZE(op) == self->nd)
-            && PyArray_IntpFromSequence(op, vals, self->nd) == self->nd) {
+            && (_tuple_of_integers(op, vals, self->nd) >= 0)) {
                 int i;
                 char *item;
                 for (i=0; i<self->nd; i++) {
@@ -4862,6 +4884,7 @@
 }
 
 
+
 /* Check whether the given array is stored contiguously (row-wise) in
    memory. */
 



From numpy-svn at scipy.org  Wed Oct 25 02:21:10 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 01:21:10 -0500 (CDT)
Subject: [Numpy-svn] r3393 - trunk/numpy/core/tests
Message-ID: <20061025062110.9E60839C12E@new.scipy.org>

Author: oliphant
Date: 2006-10-25 01:21:04 -0500 (Wed, 25 Oct 2006)
New Revision: 3393

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Add test for recent bug in indexing optimization.

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-25 06:15:40 UTC (rev 3392)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-25 06:21:04 UTC (rev 3393)
@@ -543,7 +543,12 @@
         """Ticket #352"""
         a = N.arange(12).reshape(4,3)[:,2]
         assert_equal(a.repeat(3), [2,2,2,5,5,5,8,8,8,11,11,11])
-        
+
+    def check_array_index(self, level=rlevel):
+        """Make sure optimization is not called in this case."""
+        a = N.array([1,2,3])
+        a2 = N.array([[1,2,3]])
+        assert_equal(a[N.where(a==3)], a2[N.where(a2==3)])
                 
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Wed Oct 25 05:04:39 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 04:04:39 -0500 (CDT)
Subject: [Numpy-svn] r3394 - tags
Message-ID: <20061025090439.E499A39C077@new.scipy.org>

Author: oliphant
Date: 2006-10-25 04:04:35 -0500 (Wed, 25 Oct 2006)
New Revision: 3394

Added:
   tags/1.0/
Log:
Tag tree for 1.0 release
2


Copied: tags/1.0 (from rev 3393, trunk)



From numpy-svn at scipy.org  Wed Oct 25 05:05:10 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 04:05:10 -0500 (CDT)
Subject: [Numpy-svn] r3395 - trunk/numpy
Message-ID: <20061025090510.99BEB39C077@new.scipy.org>

Author: oliphant
Date: 2006-10-25 04:05:07 -0500 (Wed, 25 Oct 2006)
New Revision: 3395

Modified:
   trunk/numpy/version.py
Log:
Update version number of trunk.

Modified: trunk/numpy/version.py
===================================================================
--- trunk/numpy/version.py	2006-10-25 09:04:35 UTC (rev 3394)
+++ trunk/numpy/version.py	2006-10-25 09:05:07 UTC (rev 3395)
@@ -1,4 +1,4 @@
-version='1.0'
+version='1.0.1'
 release=False
 
 if not release:



From numpy-svn at scipy.org  Wed Oct 25 05:06:00 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 04:06:00 -0500 (CDT)
Subject: [Numpy-svn] r3396 - tags/1.0/numpy
Message-ID: <20061025090600.16BBB39C077@new.scipy.org>

Author: oliphant
Date: 2006-10-25 04:05:57 -0500 (Wed, 25 Oct 2006)
New Revision: 3396

Modified:
   tags/1.0/numpy/version.py
Log:
Make tag 1.0 a release.

Modified: tags/1.0/numpy/version.py
===================================================================
--- tags/1.0/numpy/version.py	2006-10-25 09:05:07 UTC (rev 3395)
+++ tags/1.0/numpy/version.py	2006-10-25 09:05:57 UTC (rev 3396)
@@ -1,5 +1,5 @@
 version='1.0'
-release=False
+release=True
 
 if not release:
     import os



From numpy-svn at scipy.org  Wed Oct 25 06:41:15 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 05:41:15 -0500 (CDT)
Subject: [Numpy-svn] r3397 - trunk/numpy/f2py/lib/parser
Message-ID: <20061025104115.0BD13C7C00F@new.scipy.org>

Author: pearu
Date: 2006-10-25 05:41:11 -0500 (Wed, 25 Oct 2006)
New Revision: 3397

Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY: Optimised Fortran expr parser. Fixed bugs.

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-25 09:05:57 UTC (rev 3396)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-25 10:41:11 UTC (rev 3397)
@@ -16,20 +16,8 @@
 from splitline import string_replace_map
 import pattern_tools as pattern
 
-class DefinedOp:
-    def __new__(cls, letters):
-        if not letters: return None
-        obj = object.__new__(cls)
-        obj._init(letters)
-        return obj
+############################# Base classes ################################
 
-    def _init(self, letters):
-        self.letters = letters.upper()
-        return
-
-    def __str__(self): return '.%s.' % (self.letters)
-    def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.letters)
-
 class NoMatchError(Exception):
     pass
 
@@ -90,17 +78,19 @@
 
 class SequenceBase(Base):
     """
-    <sequence-base> = <obj> [ , <obj> ]...
+    <sequence-base> = <obj>, <obj> [ , <obj> ]...
     """
     def match(separator, subcls, string):
         line, repmap = string_replace_map(string)
+        if separator not in line:
+            return
         lst = []
         for p in line.split(separator):
             p = p.strip()
             for k in Base.findall(p):
                 p = p.replace(k,repmap[k])
             lst.append(subcls(p))
-        if len(lst)==1: return lst[0]
+        #if len(lst)==1: return lst[0]
         return separator, tuple(lst)
     match = staticmethod(match)
     def init(self, separator, items):
@@ -116,7 +106,7 @@
     
 class UnaryOpBase(Base):
     """
-    <unary-op-base> = [ <unary-op> ] <rhs>
+    <unary-op-base> = <unary-op> <rhs>
     """
     def init(self, op, rhs):
         self.op = op
@@ -128,7 +118,8 @@
         return '%s(%r, %r)' % (self.__class__.__name__,self.op, self.rhs)
     def match(op_pattern, rhs_cls, string):
         m = op_pattern.match(string)
-        if not m: return rhs_cls(string)
+        if not m: return
+        #if not m: return rhs_cls(string)
         rhs = string[m.end():].lstrip()        
         if not rhs: return
         op = string[:m.end()].rstrip().upper()
@@ -138,10 +129,14 @@
 class BinaryOpBase(Base):
     """
     <binary-op-base> = <lhs> <op> <rhs>
+    <op> is searched from right by default.
     """
-    def match(lhs_cls, op_pattern, rhs_cls, string):
+    def match(lhs_cls, op_pattern, rhs_cls, string, right=True):
         line, repmap = string_replace_map(string)
-        t = op_pattern.rsplit(line)
+        if right:
+            t = op_pattern.rsplit(line)
+        else:
+            t = op_pattern.lsplit(line)
         if t is None or len(t)!=3: return
         lhs, op, rhs = t
         if not lhs: return
@@ -165,54 +160,12 @@
     def torepr(self):
         return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
 
-class RBinaryOpBase(BinaryOpBase):
-    """
-    <rbinary-op-base> = [ <lhs> <op> ] <rhs>
-    """
-    def match(lhs_cls, op_pattern, rhs_cls, string):
-        line, repmap = string_replace_map(string)
-        t = op_pattern.rsplit(line)
-        if t is None:
-            return rhs_cls(string)
-        lhs, op, rhs = t
-        if not lhs: return
-        op = op.upper()
-        for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        lhs_obj = lhs_cls(lhs)
-        rhs_obj = rhs_cls(rhs)
-        return lhs_obj, op, rhs_obj
-    match = staticmethod(match)
-
-class LBinaryOpBase(BinaryOpBase):
-    """
-    <lbinary-op-base> = <lhs> [ <op> <rhs> ]
-    """
-    def match(lhs_cls, op_pattern, rhs_cls, string):
-        line, repmap = string_replace_map(string)
-        t = op_pattern.lsplit(line)
-        if t is None:
-            return lhs_cls(string)
-        lhs, op, rhs = t
-        if not rhs: return
-        op = op.upper()
-        for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        lhs_obj = lhs_cls(lhs)
-        rhs_obj = rhs_cls(rhs)
-        return lhs_obj, op, rhs_obj
-    match = staticmethod(match)
-
 class KeywordValueBase(BinaryOpBase):
     """
-    <keyword-value-base> = [ <keyword> = ] <rhs>
+    <keyword-value-base> = <keyword> = <rhs>
     """
     def match(cls, string):
-        if '=' not in string: return cls(string)
+        if '=' not in string: return
         lhs,rhs = string.split('=',1)
         return Keyword(lhs.rstrip()),'=',cls(rhs.lstrip())
     match = staticmethod(match)
@@ -340,54 +293,134 @@
     subclass_names = []
     def match(string): return StringBase.match(pattern.abs_hex_constant, string)
     match = staticmethod(match)
+
+
+class Int_Literal_Constant(NumberBase):
+    """
+    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_int_literal_constant_named, string)
+    match = staticmethod(match)
+
+class Signed_Int_Literal_Constant(NumberBase):
+    """
+    <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant'] # never used because sign is included in pattern
+    def match(string):
+        return NumberBase.match(pattern.abs_signed_int_literal_constant_named, string)
+    match = staticmethod(match)
+
+class Real_Literal_Constant(NumberBase):
+    """
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_real_literal_constant_named, string)
+    match = staticmethod(match)
+
+class Signed_Real_Literal_Constant(NumberBase):
+    """
+    <signed-real-literal-constant> = [ <sign> ] <real-literal-constant>
+    """
+    subclass_names = ['Real_Literal_Constant'] # never used
+    def match(string):
+        return NumberBase.match(pattern.abs_signed_real_literal_constant_named, string)
+    match = staticmethod(match)
+
+class Logical_Literal_Constant(NumberBase):
+    """
+    <logical-literal-constant> = .TRUE. [ _ <kind-param> ]
+                                 | .FALSE. [ _ <kind-param> ]
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_logical_literal_constant_named, string)    
+    match = staticmethod(match)
+
+class Char_Literal_Constant(Base):
+    """
+    <char-literal-constant> = [ <kind-param> _ ] ' <rep-char> '
+                              | [ <kind-param> _ ] \" <rep-char> \"
+    """
+    subclass_names = []
+    def match(string):
+        if string[-1] not in '"\'': return
+        if string[-1]=='"':
+            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named2
+        else:
+            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named1
+        line, repmap = string_replace_map(string)
+        m = abs_a_n_char_literal_constant_named.match(line)
+        if not m: return
+        kind_param = m.group('kind_param')
+        line = m.group('value')
+        for k in Base.findall(line):
+            line = line.replace(k,repmap[k])
+        return line, kind_param
+    match = staticmethod(match)
+    def init(self, value, kind_param):
+        self.value = value
+        self.kind_param = kind_param
+        return
+    def tostr(self):
+        if self.kind_param is None: return str(self.value)
+        return '%s_%s' % (self.kind_param, self.value)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.value, self.kind_param)
+
+#####
+
     
-class Expr(RBinaryOpBase):
+class Expr(BinaryOpBase):
     """
     <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
     <defined-binary-op> = . <letter> [ <letter> ]... .
     TODO: defined_binary_op must not be intrinsic_binary_op!!
     """
-    subclass_names = []
-    use_names = ['Expr', 'Level_5_Expr']
+    subclass_names = ['Level_5_Expr']
+    use_names = ['Expr']
     def match(string):
-        return RBinaryOpBase.match(Expr, pattern.defined_binary_op.named(), Level_5_Expr,
+        return BinaryOpBase.match(Expr, pattern.defined_binary_op.named(), Level_5_Expr,
                                    string)
     match = staticmethod(match)
 
-class Level_5_Expr(RBinaryOpBase):
+class Level_5_Expr(BinaryOpBase):
     """
     <level-5-expr> = [ <level-5-expr> <equiv-op> ] <equiv-operand>
     <equiv-op> = .EQV.
                | .NEQV.
     """
-    subclass_names = []
-    use_names = ['Level_5_Expr','Equiv_Operand']
+    subclass_names = ['Equiv_Operand']
+    use_names = ['Level_5_Expr']
     def match(string):
-        return RBinaryOpBase.match(\
+        return BinaryOpBase.match(\
             Level_5_Expr,pattern.equiv_op.named(),Equiv_Operand,string)
     match = staticmethod(match)
     
-class Equiv_Operand(RBinaryOpBase):
+class Equiv_Operand(BinaryOpBase):
     """
     <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
     <or-op>  = .OR.
     """
-    subclass_names = []
-    use_names = ['Equiv_Operand','Or_Operand']
+    subclass_names = ['Or_Operand']
+    use_names = ['Equiv_Operand']
     def match(string):
-        return RBinaryOpBase.match(\
+        return BinaryOpBase.match(\
             Equiv_Operand,pattern.or_op.named(),Or_Operand,string)
     match = staticmethod(match)
     
-class Or_Operand(RBinaryOpBase):
+class Or_Operand(BinaryOpBase):
     """
     <or-operand> = [ <or-operand> <and-op> ] <and-operand>    
     <and-op> = .AND.
     """
-    subclass_names = []
+    subclass_names = ['And_Operand']
     use_names = ['Or_Operand','And_Operand']
     def match(string):
-        return RBinaryOpBase.match(\
+        return BinaryOpBase.match(\
             Or_Operand,pattern.and_op.named(),And_Operand,string)
     match = staticmethod(match)
     
@@ -396,38 +429,38 @@
     <and-operand> = [ <not-op> ] <level-4-expr>
     <not-op> = .NOT.
     """
-    subclass_names = []
-    use_names = ['Level_4_Expr']
+    subclass_names = ['Level_4_Expr']
+    use_names = []
     def match(string):
         return UnaryOpBase.match(\
             pattern.not_op.named(),Level_4_Expr,string)
     match = staticmethod(match)
     
-class Level_4_Expr(RBinaryOpBase):
+class Level_4_Expr(BinaryOpBase):
     """
     <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
     <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
     """
-    subclass_names = []
-    use_names = ['Level_3_Expr']
+    subclass_names = ['Level_3_Expr']
+    use_names = []
     def match(string):
-        return RBinaryOpBase.match(\
+        return BinaryOpBase.match(\
             Level_3_Expr,pattern.rel_op.named(),Level_3_Expr,string)
     match = staticmethod(match)
     
-class Level_3_Expr(RBinaryOpBase):
+class Level_3_Expr(BinaryOpBase):
     """
     <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
     <concat-op>    = //
     """
-    subclass_names = []
-    use_names =['Level_3_Expr','Level_2_Expr']
+    subclass_names = ['Level_2_Expr']
+    use_names =['Level_3_Expr']
     def match(string):
-        return RBinaryOpBase.match(\
+        return BinaryOpBase.match(\
             Level_3_Expr,pattern.concat_op.named(),Level_2_Expr,string)
     match = staticmethod(match)
 
-class Level_2_Expr(RBinaryOpBase):
+class Level_2_Expr(BinaryOpBase):
     """
     <level-2-expr> = [ [ <level-2-expr> ] <add-op> ] <add-operand>
     <level-2-expr> = [ <level-2-expr> <add-op> ] <add-operand>
@@ -436,9 +469,9 @@
                  | -
     """
     subclass_names = ['Level_2_Unary_Expr']
-    use_names = ['Level_2_Expr','Add_Operand']
+    use_names = ['Level_2_Expr']
     def match(string):
-        return RBinaryOpBase.match(\
+        return BinaryOpBase.match(\
             Level_2_Expr,pattern.add_op.named(),Add_Operand,string)
     match = staticmethod(match)
 
@@ -446,36 +479,34 @@
     """
     <level-2-unary-expr> = [ <add-op> ] <add-operand>
     """
-    subclass_names = []
-    use_names = ['Add_Operand']
-    def match(string):
-        return UnaryOpBase.match(\
-            pattern.add_op.named(),Add_Operand,string)
+    subclass_names = ['Add_Operand']
+    use_names = []
+    def match(string): return UnaryOpBase.match(pattern.add_op.named(),Add_Operand,string)
     match = staticmethod(match)
 
-class Add_Operand(RBinaryOpBase):
+class Add_Operand(BinaryOpBase):
     """
     <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
     <mult-op>  = *
                  | /
     """
-    subclass_names = []
+    subclass_names = ['Mult_Operand']
     use_names = ['Add_Operand','Mult_Operand']
     def match(string):
-        return RBinaryOpBase.match(\
+        return BinaryOpBase.match(\
             Add_Operand,pattern.mult_op.named(),Mult_Operand,string)
     match = staticmethod(match)
     
-class Mult_Operand(LBinaryOpBase):
+class Mult_Operand(BinaryOpBase):
     """
     <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
     <power-op> = **
     """
-    subclass_names = []
-    use_names = ['Level_1_Expr','Mult_Operand']
+    subclass_names = ['Level_1_Expr']
+    use_names = ['Mult_Operand']
     def match(string):
-        return LBinaryOpBase.match(\
-            Level_1_Expr,pattern.power_op.named(),Mult_Operand,string)
+        return BinaryOpBase.match(\
+            Level_1_Expr,pattern.power_op.named(),Mult_Operand,string,right=False)
     match = staticmethod(match)
     
 class Level_1_Expr(UnaryOpBase):
@@ -483,10 +514,11 @@
     <level-1-expr> = [ <defined-unary-op> ] <primary>
     <defined-unary-op> = . <letter> [ <letter> ]... .
     """
-    subclass_names = []
-    use_names = ['Primary']
+    subclass_names = ['Primary']
+    use_names = []
     def match(string):
-        if pattern.non_defined_binary_op.match(string): return
+        if pattern.non_defined_binary_op.match(string):
+            raise NoMatchError,`string`
         return UnaryOpBase.match(\
             pattern.defined_unary_op.named(),Primary,string)
     match = staticmethod(match)
@@ -503,7 +535,8 @@
                 | ( <expr> )
     """
     subclass_names = ['Parenthesis', 'Constant', 'Designator','Array_Constructor','Structure_Constructor',
-                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name']
+                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 
+                       ]
 
 class Type_Param_Name(Base):
     """
@@ -526,8 +559,8 @@
     """
     <structure-constructor-2> = [ <keyword> = ] <component-data-source>
     """
-    subclass_names = []
-    use_names = ['Keyword', 'Component_Data_Source']
+    subclass_names = ['Component_Data_Source']
+    use_names = ['Keyword']
     def match(string): return KeywordValueBase.match(Component_Data_Source, string)
     match = staticmethod(match)
 
@@ -579,8 +612,8 @@
     """
     <component-spec> = [ <keyword> = ] <component-data-source>
     """
-    subclass_names = []
-    use_names = ['Keyword','Component_Data_Source']
+    subclass_names = ['Component_Data_Source']
+    use_names = ['Keyword']
     def match(string): return KeywordValueBase.match(Component_Data_Source, string)
     match = staticmethod(match)
 
@@ -588,8 +621,8 @@
     """
     <component-spec-list> = <component-spec> [ , <component-spec> ]...
     """
-    subclass_names = []
-    use_names = ['Component_Spec']
+    subclass_names = ['Component_Spec']
+    use_names = []
     def match(string): return SequenceBase.match(r',', Component_Spec, string)
     match = staticmethod(match)
 
@@ -646,8 +679,8 @@
     """
     <ac-value-list> = <ac-value> [ , <ac-value> ]...
     """
-    subclass_names = []
-    use_names = ['Ac_Value']
+    subclass_names = ['Ac_Value']
+    use_names = []
     def match(string): return SequenceBase.match(r',', Ac_Value, string)
     match = staticmethod(match)
 
@@ -786,7 +819,7 @@
                       | * <char-length>
     """
     subclass_names = []
-    use_names = ['Scalar_Int_Initialization_Expr','Char_Length']
+    use_names = ['Char_Length','Scalar_Int_Initialization_Expr']
 
     def match(string):
         if string[0]+string[-1] != '()':
@@ -898,28 +931,16 @@
             return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
         return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0],self.items[1],self.items[2])
 
-class Char_Length(Base):
+class Char_Length(BracketBase):
     """
     <char-length> = ( <type-param-value> )
                     | <scalar-int-literal-constant>
     """
-    subclass_names = []
-    use_names = ['Type_Param_Value','Scalar_Int_Literal_Constant']
-    def match(string):
-        if string[0]+string[-1] == '()':
-            return '(',Type_Param_Value(string[1:-1].strip()),')'
-        return Scalar_Int_Literal_Constant(string),
+    subclass_names = ['Scalar_Int_Literal_Constant']
+    use_names = ['Type_Param_Value']
+    def match(string): return BracketBase.match('()',Type_Param_Value, string)
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if len(self.items)==1: return str(self.items[0])
-        return '%s%s%s' % tuple(self.items)
-    def torepr(self):
-        if len(self.items)==1:
-            return '%s(%r)' % (self.__class__.__name__, self.items[0])
-        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0],self.items[1],self.items[2])
 
-
 class Scalar_Int_Expr(Base):
     """
     <scalar-int-expr> = <expr>
@@ -939,7 +960,7 @@
                        | :
     """
     subclass_names = ['Scalar_Int_Expr']
-    use_names = ['Scalar_Int_Expr']
+    use_names = []
     def match(string):
         if string in ['*',':']: return string,
         return
@@ -961,8 +982,8 @@
     """
     <type-param-spec> = [ <keyword> = ] <type-param-value>
     """
-    subclass_names = []
-    use_names = ['Keyword','Type_Param_Value']
+    subclass_names = ['Type_Param_Value']
+    use_names = ['Keyword']
     def match(string): return KeywordValueBase.match(Type_Param_Value, string)
     match = staticmethod(match)
 
@@ -970,8 +991,8 @@
     """
     <type-param-spec-list> = <type-param-spec> [ , <type-param-spec> ]...
     """
-    subclass_names = []
-    use_names = ['Type_Param_Spec']
+    subclass_names = ['Type_Param_Spec']
+    use_names = []
     def match(string): return SequenceBase.match(',', Type_Param_Spec, string)
     match = staticmethod(match)
 
@@ -1044,7 +1065,7 @@
     <array-section> = <data-ref> [ ( <substring-range> ) ]
     """
     subclass_names = ['Data_Ref']
-    use_names = ['Data_Ref','Substring_Range']
+    use_names = ['Substring_Range']
     def match(string): return CallBase.match(Data_Ref, Substring_Range, string)
     match = staticmethod(match)
 
@@ -1060,18 +1081,15 @@
         lhs,rhs = line.split(':',1)
         lhs = lhs.rstrip()
         rhs = rhs.lstrip()
+        lhs_obj, rhs_obj = None, None
         if lhs:
             for k in Base.findall(lhs):
                 lhs = lhs.replace(k,repmap[k])
             lhs_obj = Scalar_Int_Expr(lhs)
-        else:
-            lhs_obj = None
         if rhs:
             for k in Base.findall(rhs):
                 rhs = rhs.replace(k,repmap[k])
             rhs_obj = Scalar_Int_Expr(rhs)
-        else:
-            rhs_obj = None
         return lhs_obj, rhs_obj
     match = staticmethod(match)
     def init(self, lhs, rhs):
@@ -1104,47 +1122,13 @@
     subclass_names = ['Int_Literal_Constant', 'Real_Literal_Constant','Complex_Literal_Constant',
                       'Logical_Literal_Constant','Char_Literal_Constant','Boz_Literal_Constant']
 
-class Int_Literal_Constant(NumberBase):
-    """
-    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
-    """
-    subclass_names = []
-    def match(string):
-        return NumberBase.match(pattern.abs_int_literal_constant_named, string)
-    match = staticmethod(match)
-
-class Signed_Int_Literal_Constant(NumberBase):
-    """
-    <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
-    """
-    subclass_names = ['Int_Literal_Constant'] # never used because sign is included in pattern
-    def match(string):
-        return NumberBase.match(pattern.abs_signed_int_literal_constant_named, string)
-    match = staticmethod(match)
-
 class Scalar_Int_Literal_Constant(Base):
     """
     <scalar-int-literal-constant> = <int-literal-constant>
     """
     subclass_names = ['Int_Literal_Constant']
 
-class Real_Literal_Constant(NumberBase):
-    """
-    """
-    subclass_names = []
-    def match(string):
-        return NumberBase.match(pattern.abs_real_literal_constant_named, string)
-    match = staticmethod(match)
 
-class Signed_Real_Literal_Constant(NumberBase):
-    """
-    <signed-real-literal-constant> = [ <sign> ] <real-literal-constant>
-    """
-    subclass_names = ['Real_Literal_Constant'] # never used
-    def match(string):
-        return NumberBase.match(pattern.abs_signed_real_literal_constant_named, string)
-    match = staticmethod(match)
-
 class Complex_Literal_Constant(Base):
     """
     <complex-literal-constant> = ( <real-part>, <imag-part> )
@@ -1178,43 +1162,7 @@
     """
     subclass_names = ['Signed_Int_Literal_Constant','Signed_Real_Literal_Constant','Named_Constant']
 
-class Char_Literal_Constant(Base):
-    """
-    <char-literal-constant> = [ <kind-param> _ ] ' <rep-char> '
-                              | [ <kind-param> _ ] \" <rep-char> \"
-    """
-    subclass_names = []
-    def match(string):
-        if string[-1] not in '"\'': return
-        if string[-1]=='"':
-            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named2
-        else:
-            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named1
-        line, repmap = string_replace_map(string)
-        m = abs_a_n_char_literal_constant_named.match(line)
-        if not m: return
-        kind_param = m.group('kind_param')
-        line = m.group('value')
-        for k in Base.findall(line):
-            line = line.replace(k,repmap[k])
-        return line, kind_param
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[1] is None: return self.items[0]
-        return '%s_%s' % (self.items[1], self.items[0])
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
 
-class Logical_Literal_Constant(NumberBase):
-    """
-    <logical-literal-constant> = .TRUE. [ _ <kind-param> ]
-                                 | .FALSE. [ _ <kind-param> ]
-    """
-    subclass_names = []
-    def match(string):
-        return NumberBase.match(pattern.abs_logical_literal_constant_named, string)    
-    match = staticmethod(match)
-
 class Boz_Literal_Constant(Base):
     """
     <boz-literal-constant> = <binary-constant>
@@ -1237,36 +1185,15 @@
     """
     subclass_names = ['Name']
     
-class Function_Reference(Base):
+class Function_Reference(CallBase):
     """
     <function-reference> = <procedure-designator> ( [ <actual-arg-spec-list> ] )
     """
     subclass_names = []
     use_names = ['Procedure_Designator','Actual_Arg_Spec_List']
     def match(string):
-        if string[-1] != ')': return None
-        line, repmap = string_replace_map(string)
-        i = line.rfind('(')
-        if i == -1: return
-        lhs = line[:i].lstrip()
-        if not lhs: return
-        rhs = line[i+1:-1].strip()
-        for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        lhs_obj = Procedure_Designator(lhs)
-        if rhs:
-            rhs_obj = Actual_Arg_Spec_List(rhs)
-        else:
-            rhs_obj = None
-        return lhs_obj,'(',rhs_obj,')'
+        return CallBase.match(Procedure_Designator, Actual_Arg_Spec_List, string)
     match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[2] is None: return '%s()' % (self.items[0])
-        return '%s(%s)' % (self.items[0],self.items[2])
-    torepr = Base.torepr_list
 
 
 class Procedure_Designator(BinaryOpBase):
@@ -1287,7 +1214,7 @@
     <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
     """
     subclass_names = ['Part_Name']
-    use_names = ['Part_Name','Section_Subscript_List']
+    use_names = ['Section_Subscript_List']
     def match(string): return CallBase.match(Part_Name, Section_Subscript_List, string)
     match = staticmethod(match)
 
@@ -1295,8 +1222,8 @@
     """
     <section-subscript-list> = <section-subscript> [ , <section-subscript> ]...
     """
-    subclass_names = []
-    use_names = ['Section_Subscript']
+    subclass_names = ['Section_Subscript']
+    use_names = []
     def match(string): return SequenceBase.match(',', Section_Subscript, string)
     match = staticmethod(match)
 
@@ -1394,8 +1321,8 @@
     """
     <data-ref> = <part-ref> [ % <part-ref> ]...
     """
-    subclass_names = []
-    use_names = ['Part_Ref']
+    subclass_names = ['Part_Ref']
+    use_names = []
     def match(string): return SequenceBase.match('%', Part_Ref, string)
     match = staticmethod(match)
 
@@ -1403,8 +1330,8 @@
     """
     <actual-arg-spec-list> = <actual-arg-spec> [ , <actual-arg-spec> ]...
     """
-    subclass_names = []
-    use_names = ['Actual_Arg_Spec']
+    subclass_names = ['Actual_Arg_Spec']
+    use_names = []
     def match(string): return SequenceBase.match(r',', Actual_Arg_Spec, string)
     match = staticmethod(match)
 
@@ -1412,8 +1339,8 @@
     """
     <actual-arg-spec> = [ <keyword> = ] <actual-arg>
     """
-    subclass_names = []
-    use_names = ['Keyword','Actual_Arg']
+    subclass_names = ['Actual_Arg']
+    use_names = ['Keyword']
     def match(string): return KeywordValueBase.match(Actual_Arg, string)
     match = staticmethod(match)
 
@@ -1423,16 +1350,16 @@
     """
     subclass_names = ['Name']
 
-class Type_Name(Base):
+class Type_Name(Name):
     """
     <type-name> = <name>
     <type-name> shall not be DOUBLEPRECISION or the name of intrinsic type
     """
     subclass_names = []
-    use_names = ['Name']
+    use_names = []
     def match(string):
         if pattern.abs_intrinsic_type_name.match(string): return
-        return Name(string)
+        return Name.match(string)
     match = staticmethod(match)
     
 class Actual_Arg(Base):
@@ -1443,7 +1370,7 @@
                  | <proc-component-ref>
                  | <alt-return-spec>
     """
-    subclass_names = ['Expr','Variable','Procedure_Name','Proc_Component_Ref','Alt_Return_Spec']
+    subclass_names = ['Procedure_Name','Proc_Component_Ref','Alt_Return_Spec', 'Variable', 'Expr']
 
 class Alt_Return_Spec(Base):
     """
@@ -1497,14 +1424,71 @@
 Base_classes = {}
 for clsname in dir():
     cls = eval(clsname)
-    if isinstance(cls, ClassType) and issubclass(cls, Base):
+    if isinstance(cls, ClassType) and issubclass(cls, Base) and not cls.__name__.endswith('Base'):
         Base_classes[cls.__name__] = cls
 
+
+# Optimize subclass_names tree:
+def _rpl_list(clsname):
+    cls = Base_classes[clsname]
+    if cls.__dict__.has_key('match'): return [clsname]
+    l = []
+    for n in getattr(cls,'subclass_names',[]):
+        l1 = _rpl_list(n)
+        for n1 in l1: 
+            if n1 not in l:
+                l.append(n1)
+    return l
+
+for cls in Base_classes.values():
+    if not hasattr(cls, 'subclass_names'): continue
+    opt_subclass_names = []
+    for n in cls.subclass_names:
+        for n1 in _rpl_list(n):
+            if n1 not in opt_subclass_names:  opt_subclass_names.append(n1)
+    if not opt_subclass_names==cls.subclass_names:
+        #print cls.__name__,':',', '.join(cls.subclass_names),'->',', '.join(opt_subclass_names)
+        cls.subclass_names[:] = opt_subclass_names
+    #else:
+    #    print cls.__name__,':',opt_subclass_names
+
+if 0:
+
+    def _deep_subclass_names(clsname, l=[]):
+        cls = Base_classes[clsname]
+        subclass_names = getattr(cls,'subclass_names',[])
+        if clsname not in l:
+            l.append(clsname)
+        for n in subclass_names:
+            if n in l: continue
+            l.append(n)
+            _deep_subclass_names(n,l)
+
+        return l
+
+    Base_deps = {}
+    for cls in Base_classes.values():
+        l = []
+        _deep_subclass_names(cls.__name__,l)
+        Base_deps[cls.__name__] = l
+
+    def _sort_deps(lhs,rhs):
+        if lhs==rhs: return 0
+        rhs_deps = Base_deps[rhs]
+        lhs_deps = Base_deps[lhs]
+        if lhs in rhs_deps: return -1
+        if rhs in lhs_deps: return 1
+        return cmp(len(lhs_deps),len(rhs_deps))
+
+    for clsname,deps in Base_deps.items():
+        deps.sort(_sort_deps)
+        print clsname,deps
+
+# Initialize Base.subclasses dictionary:
 for clsname, cls in Base_classes.items():
     subclass_names = getattr(cls, 'subclass_names', None)
     if subclass_names is None:
-        if clsname[-4:]!='Base':
-            print '%s class is missing subclass_names list' % (clsname)
+        print '%s class is missing subclass_names list' % (clsname)
         continue
     try:
         l = Base.subclasses[clsname]

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-25 09:05:57 UTC (rev 3396)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-25 10:41:11 UTC (rev 3397)
@@ -72,15 +72,15 @@
 
     def check_char_length(self):
         cls = Char_Length
-        a = cls('1')
-        assert isinstance(a,cls),`a`
-        assert_equal(str(a),'1')
-        assert_equal(repr(a),"Char_Length(Int_Literal_Constant('1', None))")
-
         a = cls('(1)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(1)')
+        assert_equal(repr(a),"Char_Length('(', Int_Literal_Constant('1', None), ')')")
 
+        a = cls('1')
+        assert isinstance(a,Int_Literal_Constant),`a`
+        assert_equal(str(a),'1')
+
         a = cls('(*)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(*)')
@@ -215,7 +215,7 @@
         a = cls('f()')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'f()')
-        assert_equal(repr(a),"Function_Reference(Name('f'), '(', None, ')')")
+        assert_equal(repr(a),"Function_Reference(Name('f'), None)")
 
         a = cls('f(2,k=1,a)')
         assert isinstance(a,cls),`a`
@@ -302,7 +302,7 @@
         a = cls('t()')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'t()')
-        assert_equal(repr(a),"Structure_Constructor(Name('t'), None)")
+        assert_equal(repr(a),"Structure_Constructor(Type_Name('t'), None)")
 
         a = cls('t(s=1, a)')
         assert isinstance(a,cls),`a`
@@ -726,7 +726,7 @@
         a = cls('a(b)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'a(b)')
-        assert_equal(repr(a),"Derived_Type_Spec(Name('a'), Name('b'))")
+        assert_equal(repr(a),"Derived_Type_Spec(Type_Name('a'), Name('b'))")
 
         a = cls('a(b,c,g=1)')
         assert isinstance(a,cls),`a`
@@ -745,9 +745,9 @@
     def check_simple(self):
         cls = Type_Name
         a = cls('a')
-        assert isinstance(a,Name),`a`
+        assert isinstance(a,cls),`a`
         assert_equal(str(a),'a')
-        assert_equal(repr(a),"Name('a')")
+        assert_equal(repr(a),"Type_Name('a')")
 
         self.assertRaises(NoMatchError,cls,'integer')
         self.assertRaises(NoMatchError,cls,'doubleprecision')



From numpy-svn at scipy.org  Wed Oct 25 07:37:33 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 06:37:33 -0500 (CDT)
Subject: [Numpy-svn] r3398 - trunk/numpy/lib
Message-ID: <20061025113733.AD51739C054@new.scipy.org>

Author: oliphant
Date: 2006-10-25 06:37:30 -0500 (Wed, 25 Oct 2006)
New Revision: 3398

Modified:
   trunk/numpy/lib/function_base.py
Log:
Fix vectorize bug ignoring otypes.

Modified: trunk/numpy/lib/function_base.py
===================================================================
--- trunk/numpy/lib/function_base.py	2006-10-25 10:41:11 UTC (rev 3397)
+++ trunk/numpy/lib/function_base.py	2006-10-25 11:37:30 UTC (rev 3398)
@@ -764,11 +764,17 @@
   Description:
 
     Define a vectorized function which takes nested sequence
-    objects or numpy arrays as inputs and returns a
+    of objects or numpy arrays as inputs and returns a
     numpy array as output, evaluating the function over successive
     tuples of the input arrays like the python map function except it uses
     the broadcasting rules of numpy.
 
+    Data-type of output of vectorized is determined by calling the function
+    with the first element of the input.  This can be avoided by specifying
+    the otypes argument as either a string of typecode characters or a list
+    of data-types specifiers.  There should be one data-type specifier for
+    each output. 
+
   Input:
 
     somefunction -- a Python function or method
@@ -804,11 +810,13 @@
             self.__doc__ = doc
         if isinstance(otypes, types.StringType):
             self.otypes = otypes
+            for char in self.otypes:
+                if char not in typecodes['All']:
+                    raise ValueError, "invalid otype specified"
+        elif iterable(otypes):
+            self.otypes = ''.join([_nx.dtype(x).char for x in otypes])
         else:
-            raise ValueError, "output types must be a string"
-        for char in self.otypes:
-            if char not in typecodes['All']:
-                raise ValueError, "invalid typecode specified"
+            raise ValueError, "output types must be a string of typecode characters or a list of data-types"
         self.lastcallargs = 0
 
     def __call__(self, *args):
@@ -835,10 +843,11 @@
             else:
                 self.nout = 1
                 theout = (theout,)
-            otypes = []
-            for k in range(self.nout):
-                otypes.append(asarray(theout[k]).dtype.char)
-            self.otypes = ''.join(otypes)
+            if self.otypes == '':
+                otypes = []
+                for k in range(self.nout):
+                    otypes.append(asarray(theout[k]).dtype.char)
+                self.otypes = ''.join(otypes)
 
         if (self.ufunc is None):
             self.ufunc = frompyfunc(self.thefunc, nargs, self.nout)



From numpy-svn at scipy.org  Wed Oct 25 11:40:16 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Wed, 25 Oct 2006 10:40:16 -0500 (CDT)
Subject: [Numpy-svn] r3399 - trunk/numpy/f2py/lib/parser
Message-ID: <20061025154016.82C7F39C022@new.scipy.org>

Author: pearu
Date: 2006-10-25 10:40:10 -0500 (Wed, 25 Oct 2006)
New Revision: 3399

Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY G3: more tests for Fortran expr parser.

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-25 11:37:30 UTC (rev 3398)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-25 15:40:10 UTC (rev 3399)
@@ -202,7 +202,7 @@
     def match(number_pattern, string):
         m = number_pattern.match(string)
         if m is None: return
-        return m.group('value'),m.group('kind_param')
+        return m.group('value').upper(),m.group('kind_param')
     match = staticmethod(match)
     def init(self, value, kind_param):
         self.value = value
@@ -257,6 +257,7 @@
     def tostr(self): return str(self.string)
     def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.string)
 
+
 ##################################################
 
 class Name(StringBase):
@@ -275,6 +276,9 @@
     subclass_names = []
     def match(string): return StringBase.match(pattern.abs_binary_constant, string)
     match = staticmethod(match)
+    def init(self, string):
+        self.string = string.upper()
+        return
 
 class Octal_Constant(StringBase):
     """
@@ -284,6 +288,9 @@
     subclass_names = []
     def match(string): return StringBase.match(pattern.abs_octal_constant, string)
     match = staticmethod(match)
+    def init(self, string):
+        self.string = string.upper()
+        return
 
 class Hex_Constant(StringBase):
     """
@@ -293,8 +300,10 @@
     subclass_names = []
     def match(string): return StringBase.match(pattern.abs_hex_constant, string)
     match = staticmethod(match)
+    def init(self, string):
+        self.string = string.upper()
+        return
 
-
 class Int_Literal_Constant(NumberBase):
     """
     <int-literal-constant> = <digit-string> [ _ <kind-param> ]
@@ -534,7 +543,7 @@
                 | <type-param-name>
                 | ( <expr> )
     """
-    subclass_names = ['Parenthesis', 'Constant', 'Designator','Array_Constructor','Structure_Constructor',
+    subclass_names = ['Constant', 'Parenthesis', 'Designator','Array_Constructor','Structure_Constructor',
                       'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 
                        ]
 
@@ -1014,7 +1023,7 @@
     <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
     <structure-component> = <data-ref>
     """
-    subclass_names = ['Object_Name','Array_Element','Array_Section','Structure_Component',
+    subclass_names = ['Object_Name','Array_Section','Array_Element','Structure_Component',
                       'Substring'
                       ]
 
@@ -1476,8 +1485,10 @@
         if lhs==rhs: return 0
         rhs_deps = Base_deps[rhs]
         lhs_deps = Base_deps[lhs]
+        if lhs in rhs_deps and rhs in lhs_deps: return 0
         if lhs in rhs_deps: return -1
         if rhs in lhs_deps: return 1
+        return 0
         return cmp(len(lhs_deps),len(rhs_deps))
 
     for clsname,deps in Base_deps.items():

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-25 11:37:30 UTC (rev 3398)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-25 15:40:10 UTC (rev 3399)
@@ -494,7 +494,7 @@
 
         a = cls('10.9e-17_quad')
         assert isinstance(a,cls),`a`
-        assert_equal(str(a),'10.9e-17_quad')
+        assert_equal(str(a),'10.9E-17_quad')
 
 class test_Signed_Real_Literal_Constant(NumpyTestCase):
 
@@ -551,7 +551,7 @@
 
         a = cls('-10.9e-17_quad')
         assert isinstance(a,cls),`a`
-        assert_equal(str(a),'-10.9e-17_quad')
+        assert_equal(str(a),'-10.9E-17_quad')
 
 
 class test_Complex_Literal_Constant(NumpyTestCase):
@@ -620,7 +620,7 @@
 
         a = cls('.True.')
         assert isinstance(a,cls),`a`
-        assert_equal(str(a),'.True.')
+        assert_equal(str(a),'.TRUE.')
 
         a = cls('.FALSE.')
         assert isinstance(a,cls),`a`
@@ -1060,6 +1060,60 @@
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'.NOT. a')
         assert_equal(repr(a),"And_Operand('.NOT.', Name('a'))")
+
+class test_Primary(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Primary
+        a = cls('a')
+        assert isinstance(a,Name),`a`
+        assert_equal(str(a),'a')
+
+        a = cls('(a)')
+        assert isinstance(a,Parenthesis),`a`
+        assert_equal(str(a),'(a)')
+
+        a = cls('1')
+        assert isinstance(a,Int_Literal_Constant),`a`
+        assert_equal(str(a),'1')
+
+        a = cls('1.')
+        assert isinstance(a,Real_Literal_Constant),`a`
+        assert_equal(str(a),'1.')
+
+        a = cls('(1, n)')
+        assert isinstance(a,Complex_Literal_Constant),`a`
+        assert_equal(str(a),'(1, n)')
+
+        a = cls('.true.')
+        assert isinstance(a,Logical_Literal_Constant),`a`
+        assert_equal(str(a),'.TRUE.')
+
+        a = cls('"hey a()c"')
+        assert isinstance(a,Char_Literal_Constant),`a`
+        assert_equal(str(a),'"hey a()c"')
+
+        a = cls('b"0101"')
+        assert isinstance(a,Binary_Constant),`a`
+        assert_equal(str(a),'B"0101"')
+
+        a = cls('o"0107"')
+        assert isinstance(a,Octal_Constant),`a`
+        assert_equal(str(a),'O"0107"')
+
+        a = cls('z"a107"')
+        assert isinstance(a,Hex_Constant),`a`
+        assert_equal(str(a),'Z"A107"')
+
+        a = cls('a % b')
+        assert isinstance(a,Data_Ref),`a`
+        assert_equal(str(a),'a % b')
+
+        a = cls('a(:)')
+        assert isinstance(a,Array_Section),`a`
+        assert_equal(str(a),'a(:)')
+
         
+        
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Thu Oct 26 13:20:25 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 26 Oct 2006 12:20:25 -0500 (CDT)
Subject: [Numpy-svn] r3400 - trunk
Message-ID: <20061026172025.DB2AE39C01E@new.scipy.org>

Author: oliphant
Date: 2006-10-26 12:20:22 -0500 (Thu, 26 Oct 2006)
New Revision: 3400

Modified:
   trunk/THANKS.txt
Log:
Fix-up the THANKS file.

Modified: trunk/THANKS.txt
===================================================================
--- trunk/THANKS.txt	2006-10-25 15:40:10 UTC (rev 3399)
+++ trunk/THANKS.txt	2006-10-26 17:20:22 UTC (rev 3400)
@@ -4,12 +4,13 @@
 Perry Greenfield, J Todd Miller, Rick White, Paul Barrett for Numarray
     which gave much inspiration and showed the way forward.
 Paul Dubois for Masked Arrays
-Pearu Peterson for f2py and distutils and help with code organization
+Pearu Peterson for f2py and numpy.distutils and help with code organization
 Robert Kern for mtrand, bug fixes, help with distutils, code organization, 
     and much more. 
 Eric Jones for sundry subroutines
 Fernando Perez for code snippets, ideas, bugfixes, and testing.
 Ed Schofield for matrix.py patches, bugfixes, testing, and docstrings.
+Robert Cimrman for array set operations and numpy.distutils help
 John Hunter for code snippets (from matplotlib)
 Chris Hanley for help with records.py, testing, and bug fixes.
 Travis Vaught, Joe Cooper, Jeff Strunk for administration of 
@@ -26,3 +27,9 @@
     improvements, and code review
 Charles Harris for the sorting code originally written for Numarray and 
     for improvements to polyfit, many bug fixes, and documentation strings.
+A.M. Archibald for no-copy-reshape code. 
+David Huard for histogram improvements including 2-d and d-d code and 
+    other bug-fixes. 
+Albert Strasheim for documentation, bug-fixes, regression tests and 
+    Valgrind expertise.
+Stefan van der Walt for documentation, bug-fixes and regression-tests.



From numpy-svn at scipy.org  Thu Oct 26 13:20:58 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 26 Oct 2006 12:20:58 -0500 (CDT)
Subject: [Numpy-svn] r3401 - trunk
Message-ID: <20061026172058.4142339C01E@new.scipy.org>

Author: oliphant
Date: 2006-10-26 12:20:55 -0500 (Thu, 26 Oct 2006)
New Revision: 3401

Modified:
   trunk/THANKS.txt
Log:
Fix-up the THANKS file.

Modified: trunk/THANKS.txt
===================================================================
--- trunk/THANKS.txt	2006-10-26 17:20:22 UTC (rev 3400)
+++ trunk/THANKS.txt	2006-10-26 17:20:55 UTC (rev 3401)
@@ -33,3 +33,4 @@
 Albert Strasheim for documentation, bug-fixes, regression tests and 
     Valgrind expertise.
 Stefan van der Walt for documentation, bug-fixes and regression-tests.
+Andrew Straw for help with http://www.scipy.org, documentation, and testing. 



From numpy-svn at scipy.org  Thu Oct 26 13:55:33 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Thu, 26 Oct 2006 12:55:33 -0500 (CDT)
Subject: [Numpy-svn] r3402 - trunk/numpy/core/tests
Message-ID: <20061026175533.1D98339C01E@new.scipy.org>

Author: oliphant
Date: 2006-10-26 12:55:30 -0500 (Thu, 26 Oct 2006)
New Revision: 3402

Modified:
   trunk/numpy/core/tests/test_regression.py
Log:
Eliminate test for longfloat.

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-26 17:20:55 UTC (rev 3401)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-26 17:55:30 UTC (rev 3402)
@@ -213,11 +213,13 @@
         x = N.arange(10,dtype='>f8')
         assert_array_equal(ref,x)
 
-    def check_longfloat_repr(self,level=rlevel):
-        """Ticket #112"""
-        if N.longfloat(0).itemsize > 8:
-            a = N.exp(N.array([1000],dtype=N.longfloat))
-            assert(str(a)[1:9] == str(a[0])[:8])
+#    Longfloat support is not consistent enough across
+#     platforms for this test to be meaningful.
+#    def check_longfloat_repr(self,level=rlevel):
+#        """Ticket #112"""
+#        if N.longfloat(0).itemsize > 8:
+#            a = N.exp(N.array([1000],dtype=N.longfloat))
+#            assert(str(a)[1:9] == str(a[0])[:8])
 
     def check_argmax(self,level=rlevel):
         """Ticket #119"""



From numpy-svn at scipy.org  Fri Oct 27 02:27:05 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 01:27:05 -0500 (CDT)
Subject: [Numpy-svn] r3403 - trunk/numpy/f2py/lib/parser
Message-ID: <20061027062705.E754239C00B@new.scipy.org>

Author: pearu
Date: 2006-10-27 01:26:54 -0500 (Fri, 27 Oct 2006)
New Revision: 3403

Added:
   trunk/numpy/f2py/lib/parser/Fortran2003.py
   trunk/numpy/f2py/lib/parser/statements2.py
Modified:
   trunk/numpy/f2py/lib/parser/expressions.py
Log:
F2PY: start unifying Fortran statement and expression parsers.

Added: trunk/numpy/f2py/lib/parser/Fortran2003.py
===================================================================
--- trunk/numpy/f2py/lib/parser/Fortran2003.py	2006-10-26 17:55:30 UTC (rev 3402)
+++ trunk/numpy/f2py/lib/parser/Fortran2003.py	2006-10-27 06:26:54 UTC (rev 3403)
@@ -0,0 +1,69 @@
+
+from statements2 import *
+
+ClassType = type(Base)
+Base_classes = {}
+for clsname in dir():
+    cls = eval(clsname)
+    if isinstance(cls, ClassType) and issubclass(cls, Base) and not cls.__name__.endswith('Base'):
+        Base_classes[cls.__name__] = cls
+
+
+if 0: # Optimize subclass tree:
+
+    def _rpl_list(clsname):
+        cls = Base_classes[clsname]
+        if cls.__dict__.has_key('match'): return [clsname]
+        l = []
+        for n in getattr(cls,'subclass_names',[]):
+            l1 = _rpl_list(n)
+            for n1 in l1: 
+                if n1 not in l:
+                    l.append(n1)
+        return l
+    
+    for cls in Base_classes.values():
+        if not hasattr(cls, 'subclass_names'): continue
+        opt_subclass_names = []
+        for n in cls.subclass_names:
+            for n1 in _rpl_list(n):
+                if n1 not in opt_subclass_names:  opt_subclass_names.append(n1)
+        if not opt_subclass_names==cls.subclass_names:
+            #print cls.__name__,':',', '.join(cls.subclass_names),'->',', '.join(opt_subclass_names)
+            cls.subclass_names[:] = opt_subclass_names
+        #else:
+        #    print cls.__name__,':',opt_subclass_names
+
+# Initialize Base.subclasses dictionary:
+for clsname, cls in Base_classes.items():
+    subclass_names = getattr(cls, 'subclass_names', None)
+    if subclass_names is None:
+        print '%s class is missing subclass_names list' % (clsname)
+        continue
+    try:
+        l = Base.subclasses[clsname]
+    except KeyError:
+        Base.subclasses[clsname] = l = []
+    for n in subclass_names:
+        if Base_classes.has_key(n):
+            l.append(Base_classes[n])
+        else:
+            print '%s not implemented needed by %s' % (n,clsname)
+
+if 1:
+    for cls in Base_classes.values():
+        subclasses = Base.subclasses.get(cls.__name__,[])
+        subclasses_names = [c.__name__ for c in subclasses]
+        subclass_names = getattr(cls,'subclass_names', [])
+        use_names = getattr(cls,'use_names',[])
+        for n in subclasses_names:
+            if n not in subclass_names:
+                print '%s needs to be added to %s subclasses_name list' % (n,cls.__name__)
+        for n in subclass_names:
+            if n not in subclasses_names:
+                print '%s needs to be added to %s subclass_name list' % (n,cls.__name__)
+        for n in use_names:
+            if not Base_classes.has_key(n):
+                print '%s not defined used by %s' % (n, cls.__name__)
+#import pprint
+#pprint.pprint(Base.subclasses)

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-26 17:55:30 UTC (rev 3402)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-27 06:26:54 UTC (rev 3403)
@@ -1432,6 +1432,7 @@
 ClassType = type(Base)
 Base_classes = {}
 for clsname in dir():
+    break
     cls = eval(clsname)
     if isinstance(cls, ClassType) and issubclass(cls, Base) and not cls.__name__.endswith('Base'):
         Base_classes[cls.__name__] = cls
@@ -1450,6 +1451,7 @@
     return l
 
 for cls in Base_classes.values():
+    break
     if not hasattr(cls, 'subclass_names'): continue
     opt_subclass_names = []
     for n in cls.subclass_names:
@@ -1497,6 +1499,7 @@
 
 # Initialize Base.subclasses dictionary:
 for clsname, cls in Base_classes.items():
+    break
     subclass_names = getattr(cls, 'subclass_names', None)
     if subclass_names is None:
         print '%s class is missing subclass_names list' % (clsname)

Added: trunk/numpy/f2py/lib/parser/statements2.py
===================================================================
--- trunk/numpy/f2py/lib/parser/statements2.py	2006-10-26 17:55:30 UTC (rev 3402)
+++ trunk/numpy/f2py/lib/parser/statements2.py	2006-10-27 06:26:54 UTC (rev 3403)
@@ -0,0 +1,600 @@
+
+from expressions import *
+
+class Program(Base):
+    """
+    <program> = <program-unit>
+                  [ <program-unit> ] ...
+    """
+    use_names = ['Program_Unit']
+
+class Program_Unit(Base):
+    """
+    <program-unit> = <main-program>
+                     | <external-subprogram>
+                     | <module>
+                     | <block-data>
+    """
+    subclass_names = ['Main_Program', 'External_Subprogram', 'Module', 'Block_Data']
+
+class External_Subprogram(Base):
+    """
+    <external-subprogram> = <function-subprogram>
+                            | <subroutine-subprogram>
+    """
+    subclass_names = ['Function_Subprogram', 'Subroutine_Subprogram']
+
+class Function_Subprogram(Base):
+    """
+    <function-subprogram> = <function-stmt>
+                               [ <specification-part> ]
+                               [ <execution-part> ]
+                               [ <internal-subprogram-part> ]
+                            <end-function-stmt>
+    """
+    use_names = ['Function_Stmt', 'Specification_Part', 'Execution_Part',
+                 'Internal_Subprogram_Part', 'End_Function_Stmt']
+
+class Subroutine_Subprogram(Base):
+    """
+    <subroutine-subprogram> = <subroutine-stmt>
+                                 [ <specification-part> ]
+                                 [ <execution-part> ]
+                                 [ <internal-subprogram-part> ]
+                              <end-subroutine-stmt>
+    """
+    use_names = ['Subroutine_Stmt', 'Specification_Part', 'Execution_Part',
+                 'Internal_Subprogram_Part', 'End_Subroutine_Stmt']
+
+class Subroutine_Stmt(Base):
+    """
+    <subroutine-stmt> = [ <prefix> ] SUBROUTINE <subroutine-name> [ ( [ <dummy-arg-list> ] ) [ <proc-language-binding-spec> ] ]
+    """
+    use_names = ['Prefix', 'Subroutine_Name', 'Dummy_Arg_List', 'Proc_Language_Binding_Spec']
+
+class End_Subroutine_Stmt(Base):
+    """
+    <end-subroutine-stmt> = END [ SUBROUTINE [ <subroutine-name> ] ]
+    """
+    use_names = ['Subroutine_Name']
+
+class Specification_Part(Base):
+    """
+    <specification-part> = [ <use-stmt> ]...
+                             [ <import-stmt> ]...
+                             [ <implicit-part> ]
+                             [ <declaration-construct> ]...
+    """
+    use_names = ['Use_Stmt', 'Import_Stmt', 'Implicit_Part', 'Declaration_Construct']
+
+class Implicit_Part(Base):
+    """
+    <implicit-part> = [ <implicit-part-stmt> ]...
+                        <implicit-stmt>
+    """
+    use_names = ['Implicit_Part_Stmt', 'Implicit_Stmt']
+
+class Implicit_Part_Stmt(Base):
+    """
+    <implicit-part-stmt> = <implicit-stmt>
+                           | <parameter-stmt>
+                           | <format-stmt>
+                           | <entry-stmt>
+    """
+    subclass_names = ['Implicit_Stmt', 'Parameter_Stmt', 'Format_Stmt', 'Entry_Stmt']
+
+class Declaration_Construct(Base):
+    """
+    <declaration-construct> = <derived-type-def>
+                              | <entry-stmt>
+                              | <enum-def>
+                              | <format-stmt>
+                              | <interface-block>
+                              | <parameter-stmt>
+                              | <procedure-declaration-stmt>
+                              | <specification-stmt>
+                              | <type-declaration-stmt>
+                              | <stmt-function-stmt>
+    """
+    subclass_names = ['Derived_Type_Def', 'Entry_Stmt', 'Enum_Def', 'Format_Stmt',
+                      'Interface_Block', 'Parameter_Stmt', 'Procedure_Declaration_Stmt',
+                      'Specification_Stmt', 'Type_Declaration_Stmt', 'Stmt_Function_Stmt']
+
+class Execution_Part(Base):
+    """
+    <execution-part> = <executable-construct>
+                       | [ <execution-part-construct> ]...
+
+    <execution-part> shall not contain <end-function-stmt>, <end-program-stmt>, <end-subroutine-stmt>
+    """
+    use_names = ['Executable_Construct', 'Execution_Part_Construct']
+
+class Execution_Part_Construct(Base):
+    """
+    <execution-part-construct> = <executable-construct>
+                                 | <format-stmt>
+                                 | <entry-stmt>
+                                 | <data-stmt>
+    """
+    subclass_names = ['Executable_Construct', 'Format_Stmt', 'Entry_Stmt', 'Data_Stmt']
+
+class Internal_Subprogram_Part(Base):
+    """
+    <internal-subprogram-part> = <contains-stmt>
+                                   <internal-subprogram>
+                                   [ <internal-subprogram> ]...
+    """
+    use_names = ['Contains_Stmt', 'Internal_Subprogram']
+
+class Internal_Subprogram(Base):
+    """
+    <internal-subprogram> = <function-subprogram>
+                            | <subroutine-subprogram>
+    """
+    subclass_names = ['Function_Subprogram', 'Subroutine_Subprogram']
+
+class Specification_Stmt(Base):
+    """
+    <specification-stmt> = <access-stmt>
+                           | <allocatable-stmt>
+                           | <asynchronous-stmt>
+                           | <bind-stmt>
+                           | <common-stmt>
+                           | <data-stmt>
+                           | <dimension-stmt>
+                           | <equivalence-stmt>
+                           | <external-stmt>
+                           | <intent-stmt>
+                           | <intrinsic-stmt>
+                           | <namelist-stmt>
+                           | <optional-stmt>
+                           | <pointer-stmt>
+                           | <protected-stmt>
+                           | <save-stmt>
+                           | <target-stmt>
+                           | <volatile-stmt>
+                           | <value-stmt>
+    """
+    subclass_names = ['Access_Stmt', 'Allocatable_Stmt', 'Asynchronous_Stmt','Bind_Stmt',
+                      'Common_Stmt', 'Data_Stmt', 'Dimension_Stmt', 'Equivalence_Stmt',
+                      'External_Stmt', 'Intent_Stmt', 'Intrinsic_Stmt', 'Namelist_Stmt',
+                      'Optional_Stmt','Pointer_Stmt','Protected_Stmt','Save_Stmt',
+                      'Target_Stmt','Volatile_Stmt', 'Value_Stmt']
+
+class Executable_Construct(Base):
+    """
+    <executable-construct> = <action-stmt>
+                             | <associate-stmt>
+                             | <case-construct>
+                             | <do-construct>
+                             | <forall-construct>
+                             | <if-construct>
+                             | <select-type-construct>
+                             | <where-construct>
+    """
+    subclass_names = ['Action_Stmt', 'Associate_Stmt', 'Case_Construct', 'Do_Construct',
+                      'Forall_Construct', 'If_Construct', 'Select_Type_Construct', 'Where_Construct']
+
+class Action_Stmt(Base):
+    """
+    <action-stmt> = <allocate-stmt>
+                    | <assignment-stmt>
+                    | <backspace-stmt>
+                    | <call-stmt>
+                    | <close-stmt>
+                    | <continue-stmt>
+                    | <cycle-stmt>
+                    | <deallocate-stmt>
+                    | <endfile-stmt>
+                    | <end-function-stmt>
+                    | <end-program-stmt>
+                    | <end-subroutine-stmt>
+                    | <exit-stmt>
+                    | <flush-stmt>
+                    | <forall-stmt>
+                    | <goto-stmt>
+                    | <if-stmt>
+                    | <inquire-stmt>
+                    | <nullify-stmt>
+                    | <open-stmt>
+                    | <pointer-assignment-stmt>
+                    | <print-stmt>
+                    | <read-stmt>
+                    | <return-stmt>
+                    | <rewind-stmt>
+                    | <stop-stmt>
+                    | <wait-stmt>
+                    | <where-stmt>
+                    | <write-stmt>
+                    | <arithmetic-if-stmt>
+                    | <computed-goto-stmt>
+    """
+    subclass_names = ['Allocate_Stmt', 'Assignment_Stmt', 'Backspace_Stmt', 'Call_Stmt',
+                      'Close_Stmt', 'Continue_Stmt', 'Cycle_Stmt', 'Deallocate_Stmt',
+                      'Endfile_Stmt', 'End_Function_Stmt', 'End_Subroutine_Stmt', 'Exit_Stmt',
+                      'Flush_Stmt', 'Forall_Stmt', 'Goto_Stmt', 'If_Stmt', 'Inquire_Stmt',
+                      'Nullify_Stmt', 'Open_Stmt', 'Pointer_Assignment_Stmt', 'Print_Stmt',
+                      'Read_Stmt', 'Return_Stmt', 'Rewind_Stmt', 'Stop_Stmt', 'Wait_Stmt',
+                      'Where_Stmt', 'Write_Stmt', 'Arithmetic_If_Stmt', 'Computed_Goto_Stmt']
+
+class Derived_Type_Def(Base):
+    """
+    <derived-type-def> = <derived-type-stmt>
+                           [ <type-param-def-stmt> ]...
+                           [ <private-or-sequence> ]...
+                           [ <component-part> ]
+                           [ <type-bound-procedure-part> ]
+                           <end-type-stmt>
+    """
+    use_names = ['Derived_Type_Stmt', 'Type_Param_Def_Stmt', 'Private_Or_Sequence',
+                 'Component_Part', 'Type_Bound_Procedure_Part', 'End_Type_Stmt']
+
+class Derived_Type_Stmt(Base):
+    """
+    <derived-type-stmt> = TYPE [ [ , <type-attr-spec-list> ] :: ] <type-name> [ ( <type-param-name-list> ) ]
+    """
+    use_names = ['Type_Attr_Spec_List', 'Type_Name', 'Type_Param_Name_List']
+
+class Type_Attr_Spec(Base):
+    """
+    <type-attr-spec> = <access-spec>
+                       | EXTENDS ( <parent-type-name> )
+                       | ABSTRACT
+                       | BIND (C)
+    """
+    subclass_names = ['Access_Spec']
+    use_names = ['Parent_Type_Name']
+
+class Private_Or_Sequence(Base):
+    """
+    <private-or-sequence> = <private-components-stmt>
+                            | <sequence-stmt>
+    """
+    subclass_names = ['Private_Components_Stmt', 'Sequence_Stmt']
+
+class End_Type_Stmt(Base):
+    """
+    <end-type-stmt> = END TYPE [ <type-name> ]
+    """
+    use_names = ['Type_Name']
+    
+class Sequence_Stmt(Base):
+    """
+    <sequence-stmt> = SEQUENCE
+    """
+    def match(string):
+        if len(string) != 8: return
+        start = string.upper()
+        if start=='SEQUENCE': return start,
+        return
+    match = staticmethod(match)
+
+class Type_Param_Def_Stmt(Base):
+    """
+    <type-param-def-stmt> = INTEGER [ <kind-selector> ] , <type-param-attr-spec> :: <type-param-decl-list>
+    """
+    use_names = ['Kind_Selector', 'Type_Param_Attr_Spec', 'Type_Param_Decl_List']
+
+class Type_Param_Decl(Base):
+    """
+    <type-param-decl> = <type-param-name> [ = <scalar-int-initialization-expr> ]
+    """
+    use_names = ['Type_Param_Name', 'Scalar_Int_Initialization_Expr']
+
+class Type_Param_Attr_Spec(Base):
+    """
+    <type-param-attr-spec> = KIND
+                             | LEN
+    """
+
+class Component_Part(Base):
+    """
+    <component-part> = [ <component-def-stmt> ]...
+    """
+    use_names = ['Component_Def_Stmt']
+
+class Component_Def_Stmt(Base):
+    """
+    <component-def-stmt> = <data-component-def-stmt>
+                           | <proc-component-def-stmt>
+    """
+    subclass_names = ['Data_Component_Def_Stmt', 'Proc_Component_Def_Stmt']
+
+class Data_Component_Def_Stmt(Base):
+    """
+    <data-component-def-stmt> = <declaration-type-spec> [ [ , <component-attr-spec-list> ] :: ] <component-decl-list>
+    """
+    use_names = ['Declaration_Type_Spec', 'Component_Attr_Spec_List', 'Component_Decl_List']
+
+class Component_Attr_Spec(Base):
+    """
+    <component-attr-spec> = POINTER
+                            | DIMENSION ( <component-array-spec> )
+                            | ALLOCATABLE
+                            | <access-spec>
+    """
+    subclass_names = ['Access_Spec']
+    use_names = ['Component_Array_Spec']
+
+class Component_Decl(Base):
+    """
+    <component-decl> = <component-name> [ ( <component-array-spec> ) ] [ * <char-length> ] [ <component-initialization> ]
+    """
+    use_names = ['Component_Name', 'Component_Array_Spec', 'Char_Length', 'Component_Initialization']
+
+class Component_Array_Spec(Base):
+    """
+    <component-array-spec> = <explicit-shape-spec-list>
+                             | <deferred-shape-spec-list>
+    """
+    subclass_names = ['Explicit_Shape_Spec_List', 'Deferred_Shape_Spec_List']
+
+class Component_Initialization(Base):
+    """
+    <component-initialization> =  = <initialization-expr>
+                                 | => <null-init>
+    """
+    use_names = ['Initialization-expr', 'Null_Init']
+
+class Proc_Component_Def_Stmt(Base):
+    """
+    <proc-component-def-stmt> = PROCEDURE ( [ <proc-interface> ] ) , <proc-component-attr-spec-list> :: <proc-decl-list>
+    """
+    use_names = ['Proc_Interface', 'Proc_Component_Attr_Spec_List', 'Proc_Decl_List']
+
+class Proc_Component_Attr_Spec(Base):
+    """
+    <proc-component-attr-spec> = POINTER
+                                 | PASS [ ( <arg-name> ) ]
+                                 | NOPASS
+                                 | <access-spec>
+    """
+    use_names = ['Arg_Name', 'Access_Spec']
+
+class Private_Components_Stmt(Base):
+    """
+    <private-components-stmt> = PRIVATE
+    """
+
+class Type_Bound_Procedure_Part(Base):
+    """
+    <type-bound-procedure-part> = <contains-stmt>
+                                      [ <binding-private-stmt> ]
+                                      <proc-binding-stmt>
+                                      [ <proc-binding-stmt> ]...
+    """
+    use_names = ['Contains_Stmt', 'Binding_Private_Stmt', 'Proc_Binding_Stmt']
+
+class Binding_Private_Stmt(Base):
+    """
+    <binding-private-stmt> = PRIVATE
+    """
+
+class Proc_Binding_Stmt(Base):
+    """
+    <proc-binding-stmt> = <specific-binding>
+                          | <generic-binding>
+                          | <final-binding>
+    """
+    subclass_names = ['Specific_Binding', 'Generic_Binding', 'Final_Binding']
+
+class Specific_Binding(Base):
+    """
+    <specific-binding> = PROCEDURE [ ( <interface-name> ) ] [ [ , <binding-attr-list> ] :: ] <binding-name> [ => <procedure-name> ]
+    """
+    use_names = ['Interface_Name', 'Binding_Attr_List', 'Binding_Name', 'Procedure_Name']
+
+class Generic_Binding(Base):
+    """
+    <generic-binding> = GENERIC [ , <access-spec> ] :: <generic-spec> => <binding-name-list>
+    """
+    use_names = ['Access_Spec', 'Generic_Spec', 'Binding_Name_List']
+
+class Binding_Attr(Base):
+    """
+    <binding-attr> = PASS [ ( <arg-name> ) ]
+                     | NOPASS
+                     | NON_OVERRIDABLE
+                     | <access-spec>
+    """
+    use_names = ['Arg_Name', 'Access_Spec']
+
+class Final_Binding(Base):
+    """
+    <final-binding> = FINAL [ :: ] <final-subroutine-name-list>
+    """
+    use_names = ['Final_Subroutine_Name_List']
+
+#<derived-type-spec>
+#<type-param-spec>
+#<structure-constructor>
+#<component-spec>
+#<component-data-source>
+
+class Enum_Def(Base):
+    """
+    <enum-def> = <enum-def-stmt>
+                     <enumerator-def-stmt>
+                     [ <enumerator-def-stmt> ]...
+                     <end-enum-stmt>
+    """
+    use_names = ['Enum_Def_Stmt', 'Enumerator_Def_Stmt', 'End_Enum_Stmt']
+
+class Enum_Def_Stmt(Base):
+    """
+    <enum-def-stmt> = ENUM, BIND(C)
+    """
+
+class Enumerator_Def_Stmt(Base):
+    """
+    <enumerator-def-stmt> = ENUMERATOR [ :: ] <enumerator-list>
+    """
+    use_names = ['Enumerator_List']
+
+class Enumerator(Base):
+    """
+    <enumerator> = <named-constant> [ = <scalar-int-initialization-expr> ]
+    """
+    use_names = ['Named_Constant', 'Scalar_Int_Initialization_Expr']
+
+class End_Enumerator_Stmt(Base):
+    """
+    <end-enumerator-stmt> = END ENUM
+    """
+
+#<array-constructor>
+#<ac-spec>
+#<ac-value>
+#<ac-implied-do>
+#<ac-implied-do-control>
+#<ac-do-variable>
+
+class Type_Declaration_Stmt(Base):
+    """
+    <type-declaration-stmt> = <declaration-type-spec> [ [ , <attr-spec> ]... :: ] <entity-decl-list>
+    """
+    use_names = ['Declaration_Type_Spec', 'Attr_Spec', 'Entity_Decl_List']
+
+class Declaration_Type_Spec(Base):
+    """
+    <declaration-type-spec> = <intrinsic-type-spec>
+                              | TYPE ( <derived-type-spec> )
+                              | CLASS ( <derived-type-spec> )
+                              | CLASS ( * )
+    """
+    subclass_names = ['Intrinsic_Type_Spec']
+    use_names = ['Derived_Type_Spec']
+
+class Attr_Spec(Base):
+    """
+    <attr-spec> = <access-spec>
+                  | ALLOCATABLE
+                  | ASYNCHRONOUS
+                  | DIMENSION ( <array-spec> )
+                  | EXTERNAL
+                  | INTENT ( <intent-spec> )
+                  | INTRINSIC
+                  | <language-binding-spec>
+                  | OPTIONAL
+                  | PARAMETER
+                  | POINTER
+                  | PROTECTED
+                  | SAVE
+                  | TARGET
+                  | VALUE
+                  | VOLATILE
+    """
+    subclass_names = ['Access_Spec', 'Language_Binding_Spec']
+    use_names = ['Array_Spec', 'Intent_Spec']
+
+class Entity_Decl(Base):
+    """
+    <entity-decl> = <object-name> [ ( <array-spec> ) ] [ * <char-length> ] [ <initialization> ]
+                    | <function-name> [ * <char-length> ]
+    """
+    use_names = ['Object_Name', 'Array_Spec', 'Char_Length', 'Initialization', 'Function_Name']
+
+class Object_Name(Base):
+    """
+    <object-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Initialization(Base):
+    """
+    <initialization> =  = <initialization-expr>
+                       | => <null-init> 
+    """
+    use_names = ['Initialization_Expr', 'Null_Init']
+
+class Null_Init(Base):
+    """
+    <null-init> = <function-reference>
+
+    <function-reference> shall be a reference to the NULL intrinsic function with no arguments.
+    """
+    subclass_names = ['Function_Reference']
+
+class Access_Spec(Base):
+    """
+    <access-spec> = PUBLIC
+                    | PRIVATE
+    """
+
+class Language_Binding_Spec(Base):
+    """
+    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
+    """
+    use_names = ['Scalar_Char_Initialization_Expr']
+
+class Array_Spec(Base):
+    """
+    <array-spec> = <explicit-shape-spec-list>
+                   | <assumed-shape-spec-list>
+                   | <deferred-shape-spec-list>
+                   | <assumed-size-spec>
+    """
+    subclass_names = ['Explicit_Shape_Spec_List', 'Assumed_Shape_Spec_List',
+                      'Deferred_Shape_Spec_List', 'Assumed_Size_Spec']
+
+class Explicit_Shape_Spec(Base):
+    """
+    <explicit-shape-spec> = [ <lower-bound> : ] <upper-bound>
+    """
+    use_names = ['Lower_Bound', 'Upper_Bound']
+
+
+class Lower_Bound(Base):
+    """
+    <lower-bound> = <specification-expr>
+    """
+    subclass_names = ['Specification_Expr']
+
+class Upper_Bound(Base):
+    """
+    <upper-bound> = <specification-expr>
+    """
+    subclass_names = ['Specification_Expr']
+
+class Assumed_Shape_Spec(Base):
+    """
+    <assumed-shape-spec> = [ <lower-bound> ] :
+    """
+    use_names = ['Lower_Bound']
+
+class Deferred_Shape_Spec(Base):
+    """
+    <deferred_shape_spec> = :
+    """
+
+class Assumed_Size_Spec(Base):
+    """
+    <assumed-size-spec> = [ <explicit-shape-spec-list> , ] [ <lower-bound> : ] *
+    """
+    use_names = ['Explicit_Shape_Spec_List', 'Lower_Bound']
+
+class Intent_Spec(Base):
+    """
+    <intent-spec> = IN
+                    | OUT
+                    | INOUT
+    """
+
+class Access_Stmt(Base):
+    """
+    <access-stmt> = <access-spec> [ [ :: ] <access-id-list> ]
+    """
+    use_names = ['Access_Spec', 'Access_Id_List']
+
+class Access_Id(Base):
+    """
+    <access-id> = <use-name>
+                  | <generic-spec>
+    """
+    subclass_names = ['Use_Name', 'Generic_Spec']
+
+class Allocatable_Stmt(Base):
+    """
+    <allocateble-stmt> = ALLOCATABLE [ :: ] <object-name> [ ( <deferred-shape-spec-list> ) ] [ , <object-name> [ ( <deferred-shape-spec-list> ) ] ]...
+    """
+    use_names = ['Object_Name', 'Deferred_Shape_Spec_List']



From numpy-svn at scipy.org  Fri Oct 27 12:03:21 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 11:03:21 -0500 (CDT)
Subject: [Numpy-svn] r3404 - trunk/numpy/core/src
Message-ID: <20061027160321.B986639C045@new.scipy.org>

Author: oliphant
Date: 2006-10-27 11:03:16 -0500 (Fri, 27 Oct 2006)
New Revision: 3404

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
Log:
Fix PyArray_Scalar to handle user-defined types.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-27 06:26:54 UTC (rev 3403)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-27 16:03:16 UTC (rev 3404)
@@ -1550,7 +1550,7 @@
 /*
   returns typenum to associate with this type >=PyArray_USERDEF.
   needs the userdecrs table and PyArray_NUMUSER variables
-  defined in arratypes.inc
+  defined in arraytypes.inc
 */
 /*MULTIARRAY_API
  Register Data type

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 06:26:54 UTC (rev 3403)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 16:03:16 UTC (rev 3404)
@@ -189,6 +189,15 @@
                                  NULL, NULL, 0, NULL);
         if (r==NULL) {Py_XDECREF(outcode); return NULL;}
 
+        if (PyDataType_ISUSERDEF(typecode)) {
+                /* Use setitem to set array from scalar */
+                if (typecode->f->setitem(scalar, PyArray_DATA(r), r) < 0) {
+                        Py_XDECREF(outcode);
+                        Py_DECREF(r);
+                        return NULL;
+                }
+        }
+
         memptr = scalar_value(scalar, typecode);
 #ifndef Py_UNICODE_WIDE
         if (typecode->type_num == PyArray_UNICODE) {



From numpy-svn at scipy.org  Fri Oct 27 12:10:37 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 11:10:37 -0500 (CDT)
Subject: [Numpy-svn] r3405 - trunk/numpy/core/src
Message-ID: <20061027161037.1B88439C147@new.scipy.org>

Author: oliphant
Date: 2006-10-27 11:10:34 -0500 (Fri, 27 Oct 2006)
New Revision: 3405

Modified:
   trunk/numpy/core/src/scalartypes.inc.src
Log:
Re-organize user-defined check.

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 16:03:16 UTC (rev 3404)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 16:10:34 UTC (rev 3405)
@@ -189,16 +189,23 @@
                                  NULL, NULL, 0, NULL);
         if (r==NULL) {Py_XDECREF(outcode); return NULL;}
 
-        if (PyDataType_ISUSERDEF(typecode)) {
-                /* Use setitem to set array from scalar */
-                if (typecode->f->setitem(scalar, PyArray_DATA(r), r) < 0) {
-                        Py_XDECREF(outcode);
-                        Py_DECREF(r);
-                        return NULL;
+
+        memptr = scalar_value(scalar, typecode);
+        
+        if (memptr == NULL) {
+                if (PyDataType_ISUSERDEF(typecode)) {
+                        /* Use setitem to set array from scalar */
+                        if (typecode->f->setitem(scalar, 
+                                                 PyArray_DATA(r), r) < 0) {
+                                Py_XDECREF(outcode);
+                                Py_DECREF(r);
+                                return NULL;
+                        }
                 }
+                PyErr_SetString(PyExc_ValueError, "invalid scalar");
+                return NULL;
         }
 
-        memptr = scalar_value(scalar, typecode);
 #ifndef Py_UNICODE_WIDE
         if (typecode->type_num == PyArray_UNICODE) {
                 PyUCS2Buffer_AsUCS4((Py_UNICODE *)memptr,



From numpy-svn at scipy.org  Fri Oct 27 12:56:35 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 11:56:35 -0500 (CDT)
Subject: [Numpy-svn] r3406 - trunk/numpy/core/src
Message-ID: <20061027165635.8C2F439C045@new.scipy.org>

Author: oliphant
Date: 2006-10-27 11:56:32 -0500 (Fri, 27 Oct 2006)
New Revision: 3406

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
Log:
Allow subtypes of all array scalars and fix-up scalar_value to accept sub-types.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-27 16:10:34 UTC (rev 3405)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-27 16:56:32 UTC (rev 3406)
@@ -1432,6 +1432,7 @@
         }
         else {
                 destptr = scalar_value(obj, descr);
+                if (destptr == NULL) {Py_DECREF(obj); return NULL;}
         }
         /* copyswap for OBJECT increments the reference count */
         copyswap(destptr, data, swap, base);

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 16:10:34 UTC (rev 3405)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 16:56:32 UTC (rev 3406)
@@ -31,7 +31,7 @@
 static void *
 scalar_value(PyObject *scalar, PyArray_Descr *descr)
 {
-        enum NPY_TYPES type_num;
+        int type_num;
         if (descr == NULL) {
                 descr = PyArray_DescrFromScalar(scalar);
                 type_num = descr->type_num;
@@ -63,10 +63,59 @@
         case NPY_STRING: return (void *)PyString_AS_STRING(scalar);
         case NPY_UNICODE: return (void *)PyUnicode_AS_DATA(scalar);
         case NPY_VOID: return ((PyVoidScalarObject *)scalar)->obval;
-        default:
-                return NULL;
         }
+
+        /* Must be a user-defined type --- check to see which
+           scalar it inherits from. */
+        
+#define _CHK(cls) (PyObject_IsInstance(scalar, \
+                                       (PyObject *)&Py##cls##ArrType_Type))
+#define _OBJ(lt) &(((Py##lt##ScalarObject *)scalar)->obval)
+#define _IFCASE(cls) if _CHK(cls) return _OBJ(cls)
+
+        if _CHK(Number) {
+                if _CHK(Integer) {
+                        if _CHK(SignedInteger) {
+                                _IFCASE(Byte);
+                                _IFCASE(Short);
+                                _IFCASE(Int);
+                                _IFCASE(Long);
+                                _IFCASE(LongLong);
+                        }
+                        else { /* Unsigned Integer */
+                                _IFCASE(UByte);
+                                _IFCASE(UShort);
+                                _IFCASE(UInt);
+                                _IFCASE(ULong);
+                                _IFCASE(ULongLong);
+                        }
+                }
+                else { /* Inexact */
+                        if _CHK(Floating) {
+                                _IFCASE(Float);
+                                _IFCASE(Double);
+                                _IFCASE(LongDouble);
+                        }
+                        else { /*ComplexFloating */
+                                _IFCASE(CFloat);
+                                _IFCASE(CDouble);
+                                _IFCASE(CLongDouble);
+                        }
+                }
+        }
+        else if _CHK(Bool) return _OBJ(Bool);
+        else if _CHK(Flexible) {
+                if _CHK(String) return (void *)PyString_AS_STRING(scalar);
+                if _CHK(Unicode) return (void *)PyUnicode_AS_DATA(scalar);
+                if _CHK(Void) return ((PyVoidScalarObject *)scalar)->obval;
+        }
+        else _IFCASE(Object);
+        
+        PyErr_SetString(PyExc_RuntimeError, "bad scalar");
         return NULL;
+#undef _IFCASE
+#undef _OBJ
+#undef _CHK
 }
 
 /* no error checking is performed -- ctypeptr must be same type as scalar */
@@ -143,10 +192,12 @@
                          void *ctypeptr, int outtype)
 {
         PyArray_VectorUnaryFunc* castfunc;
+        void *ptr;
         castfunc = PyArray_GetCastFunc(indescr, outtype);
         if (castfunc == NULL) return -1;
-        castfunc(scalar_value(scalar, indescr),
-                 ctypeptr, 1, NULL, NULL);
+        ptr = scalar_value(scalar, indescr);
+        if (ptr == NULL) return -1;
+        castfunc(ptr, ctypeptr, 1, NULL, NULL);
         return 0;
 }
 
@@ -191,21 +242,12 @@
 
 
         memptr = scalar_value(scalar, typecode);
-        
         if (memptr == NULL) {
-                if (PyDataType_ISUSERDEF(typecode)) {
-                        /* Use setitem to set array from scalar */
-                        if (typecode->f->setitem(scalar, 
-                                                 PyArray_DATA(r), r) < 0) {
-                                Py_XDECREF(outcode);
-                                Py_DECREF(r);
-                                return NULL;
-                        }
-                }
-                PyErr_SetString(PyExc_ValueError, "invalid scalar");
+                Py_XDECREF(outcode);
+                Py_DECREF(r);
                 return NULL;
         }
-
+        
 #ifndef Py_UNICODE_WIDE
         if (typecode->type_num == PyArray_UNICODE) {
                 PyUCS2Buffer_AsUCS4((Py_UNICODE *)memptr,
@@ -827,9 +869,11 @@
         int typenum;
 
         if (PyArray_IsScalar(self, ComplexFloating)) {
+                void *ptr;
                 typecode = _realdescr_fromcomplexscalar(self, &typenum);
-                ret = PyArray_Scalar(scalar_value(self, NULL),
-                                     typecode, NULL);
+                ptr = scalar_value(self, NULL);
+                if (ptr == NULL) {Py_DECREF(typecode); return NULL;}
+                ret = PyArray_Scalar(ptr, typecode, NULL);
                 Py_DECREF(typecode);
                 return ret;
         }
@@ -851,9 +895,15 @@
         int typenum;
 
         if (PyArray_IsScalar(self, ComplexFloating)) {
+                char *ptr;
                 typecode = _realdescr_fromcomplexscalar(self, &typenum);
-                ret = PyArray_Scalar((char *)scalar_value(self, NULL)
-                                 + typecode->elsize, typecode, NULL);
+                ptr = (char *)scalar_value(self, NULL);
+                if (ptr == NULL) {
+                        Py_DECREF(typecode);
+                        return NULL;
+                }
+                ret = PyArray_Scalar(ptr + typecode->elsize,
+                                     typecode, NULL);
         }
         else if (PyArray_IsScalar(self, Object)) {
                 PyObject *obj = ((PyObjectScalarObject *)self)->obval;
@@ -1102,9 +1152,12 @@
         if (PyArray_IsScalar(ret, Generic) &&   \
             (!PyArray_IsScalar(ret, Void))) {
                 PyArray_Descr *new;
+                void *ptr;
                 if (!PyArray_ISNBO(self->descr->byteorder)) {
                         new = PyArray_DescrFromScalar(ret);
-                        byte_swap_vector(scalar_value(ret, new), 1, new->elsize);
+                        ptr = scalar_value(ret, new);
+                        if (ptr == NULL) {Py_DECREF(new); return NULL;}
+                        byte_swap_vector(ptr, 1, new->elsize);
                         Py_DECREF(new);
                 }
         }
@@ -2366,12 +2419,10 @@
 #name=bool, byte, short, int, long, longlong, ubyte, ushort, uint, ulong, ulonglong, float, double, longdouble, cfloat, cdouble, clongdouble, string, unicode, void, object#
 #NAME=Bool, Byte, Short, Int, Long, LongLong, UByte, UShort, UInt, ULong, ULongLong, Float, Double, LongDouble, CFloat, CDouble, CLongDouble, String, Unicode, Void, Object#
         */
-        Py at NAME@ArrType_Type.tp_flags = LEAFFLAGS;
+        Py at NAME@ArrType_Type.tp_flags = BASEFLAGS;
         Py at NAME@ArrType_Type.tp_new = @name at _arrtype_new;
         Py at NAME@ArrType_Type.tp_richcompare = gentype_richcompare;
         /**end repeat**/
-        /* Allow the Void type to be subclassed -- for adding new types */
-        PyVoidArrType_Type.tp_flags = BASEFLAGS;
 
         /**begin repeat
 #name=bool, byte, short, ubyte, ushort, uint, ulong, ulonglong, float, longdouble, cfloat, clongdouble, void, object#



From numpy-svn at scipy.org  Fri Oct 27 16:42:02 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 15:42:02 -0500 (CDT)
Subject: [Numpy-svn] r3407 - trunk/numpy/core/src
Message-ID: <20061027204202.6473339C095@new.scipy.org>

Author: oliphant
Date: 2006-10-27 15:41:58 -0500 (Fri, 27 Oct 2006)
New Revision: 3407

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
Log:
More fixes to allow user-defined types in C.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-27 16:56:32 UTC (rev 3406)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-27 20:41:58 UTC (rev 3407)
@@ -1316,11 +1316,11 @@
         type_num = descr->type_num;
         if (type_num == PyArray_BOOL)
                 PyArrayScalar_RETURN_BOOL_FROM_LONG(*(Bool*)data);
-        else if (type_num == PyArray_OBJECT) {
+        else if (type_num == PyArray_OBJECT ||          \
+                 ((type=descr->typeobj)==NULL)) {
                 return descr->f->getitem(data, base);
         }
         itemsize = descr->elsize;
-        type = descr->typeobj;
         copyswap = descr->f->copyswap;
         swap = !PyArray_ISNBO(descr->byteorder);
         if PyTypeNum_ISSTRING(type_num) { /* Eliminate NULL bytes */
@@ -1541,7 +1541,8 @@
 
         for (i=0; i<NPY_NUMUSERTYPES; i++) {
                 descr = userdescrs[i];
-                if (strcmp(descr->typeobj->tp_name, str) == 0)
+                if (descr->typeobj && 
+                    strcmp(descr->typeobj->tp_name, str) == 0)
                         return descr->type_num;
         }
 
@@ -1588,10 +1589,12 @@
                                 " is missing.");
                 return -1;
         }
+        /*
         if (descr->typeobj == NULL) {
                 PyErr_SetString(PyExc_ValueError, "missing typeobject");
                 return -1;
         }
+        */
         userdescrs = realloc(userdescrs,
                              (NPY_NUMUSERTYPES+1)*sizeof(void *));
         if (userdescrs == NULL) {
@@ -10576,7 +10579,7 @@
                 Py_INCREF(new->subarray->shape);
                 Py_INCREF(new->subarray->base);
         }
-        Py_INCREF(new->typeobj);
+        Py_XINCREF(new->typeobj);
         return new;
 }
 
@@ -10658,8 +10661,14 @@
         PyObject *res;
 	char *s;
         static int prefix_len=0;
-
+        
         if (PyTypeNum_ISUSERDEF(self->type_num)) {
+                if (typeobj == NULL) {
+                        return PyString_FromFormat("%s%d (%d)", 
+                                                   self->kind,
+                                                   self->elsize,
+                                                   self->type_num);
+                }
 		s = strrchr(typeobj->tp_name, '.');
 		if (s == NULL) {
 			res = PyString_FromString(typeobj->tp_name);
@@ -10883,6 +10892,10 @@
         Py_DECREF(mod);
         if (obj == NULL) {Py_DECREF(ret); return NULL;}
         PyTuple_SET_ITEM(ret, 0, obj);
+        if (self->typeobj == NULL) { /* Must handle this case in getitem */
+                obj = self->f->getitem(NULL, NULL);
+                if (obj == NULL) {Py_DECREF(ret); return NULL;}
+        }
         if (PyTypeNum_ISUSERDEF(self->type_num) ||              \
             ((self->type_num == PyArray_VOID &&                 \
               self->typeobj != &PyVoidArrType_Type))) {

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 16:56:32 UTC (rev 3406)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 20:41:58 UTC (rev 3407)
@@ -32,6 +32,8 @@
 scalar_value(PyObject *scalar, PyArray_Descr *descr)
 {
         int type_num;
+        int align;
+        intp memloc;
         if (descr == NULL) {
                 descr = PyArray_DescrFromScalar(scalar);
                 type_num = descr->type_num;
@@ -111,8 +113,17 @@
         }
         else _IFCASE(Object);
         
-        PyErr_SetString(PyExc_RuntimeError, "bad scalar");
-        return NULL;
+
+        /* Use the alignment flag to figure out where the data begins
+           after a PyObject_HEAD
+        */
+        memloc = (intp)scalar;
+        memloc += sizeof(PyObject);
+        /* now round-up to the nearest alignment value 
+         */
+        align = descr->alignment;
+        if (align > 1) memloc = ((memloc + align - 1)/align)*align;
+        return (void *)memloc
 #undef _IFCASE
 #undef _OBJ
 #undef _CHK
@@ -2578,7 +2589,7 @@
                 conv->subarray = NULL;
                 Py_DECREF(conv);
         }
-        Py_DECREF(new->typeobj);
+        Py_XDECREF(new->typeobj);
         new->typeobj = (PyTypeObject *)type;
         Py_INCREF(type);
         return new;
@@ -2651,7 +2662,7 @@
 
 /* New reference */
 /*OBJECT_API
- Get a typeobject from a type-number
+ Get a typeobject from a type-number -- can return NULL.
 */
 static PyObject *
 PyArray_TypeObjectFromType(int type)
@@ -2662,7 +2673,7 @@
         descr = PyArray_DescrFromType(type);
         if (descr == NULL) return NULL;
         obj = (PyObject *)descr->typeobj;
-        Py_INCREF(obj);
+        Py_XINCREF(obj);
         Py_DECREF(descr);
         return obj;
 }



From numpy-svn at scipy.org  Fri Oct 27 16:43:04 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 15:43:04 -0500 (CDT)
Subject: [Numpy-svn] r3408 - trunk/numpy/core/src
Message-ID: <20061027204304.0984839C095@new.scipy.org>

Author: oliphant
Date: 2006-10-27 15:43:01 -0500 (Fri, 27 Oct 2006)
New Revision: 3408

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
Log:
scalar value doesn't fail.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-27 20:41:58 UTC (rev 3407)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-27 20:43:01 UTC (rev 3408)
@@ -1432,7 +1432,6 @@
         }
         else {
                 destptr = scalar_value(obj, descr);
-                if (destptr == NULL) {Py_DECREF(obj); return NULL;}
         }
         /* copyswap for OBJECT increments the reference count */
         copyswap(destptr, data, swap, base);

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 20:41:58 UTC (rev 3407)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 20:43:01 UTC (rev 3408)
@@ -207,7 +207,6 @@
         castfunc = PyArray_GetCastFunc(indescr, outtype);
         if (castfunc == NULL) return -1;
         ptr = scalar_value(scalar, indescr);
-        if (ptr == NULL) return -1;
         castfunc(ptr, ctypeptr, 1, NULL, NULL);
         return 0;
 }
@@ -253,11 +252,6 @@
 
 
         memptr = scalar_value(scalar, typecode);
-        if (memptr == NULL) {
-                Py_XDECREF(outcode);
-                Py_DECREF(r);
-                return NULL;
-        }
         
 #ifndef Py_UNICODE_WIDE
         if (typecode->type_num == PyArray_UNICODE) {
@@ -883,7 +877,6 @@
                 void *ptr;
                 typecode = _realdescr_fromcomplexscalar(self, &typenum);
                 ptr = scalar_value(self, NULL);
-                if (ptr == NULL) {Py_DECREF(typecode); return NULL;}
                 ret = PyArray_Scalar(ptr, typecode, NULL);
                 Py_DECREF(typecode);
                 return ret;
@@ -909,10 +902,6 @@
                 char *ptr;
                 typecode = _realdescr_fromcomplexscalar(self, &typenum);
                 ptr = (char *)scalar_value(self, NULL);
-                if (ptr == NULL) {
-                        Py_DECREF(typecode);
-                        return NULL;
-                }
                 ret = PyArray_Scalar(ptr + typecode->elsize,
                                      typecode, NULL);
         }
@@ -1167,7 +1156,6 @@
                 if (!PyArray_ISNBO(self->descr->byteorder)) {
                         new = PyArray_DescrFromScalar(ret);
                         ptr = scalar_value(ret, new);
-                        if (ptr == NULL) {Py_DECREF(new); return NULL;}
                         byte_swap_vector(ptr, 1, new->elsize);
                         Py_DECREF(new);
                 }



From numpy-svn at scipy.org  Fri Oct 27 16:44:34 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 15:44:34 -0500 (CDT)
Subject: [Numpy-svn] r3409 - trunk/numpy/core/src
Message-ID: <20061027204434.F267E39C095@new.scipy.org>

Author: oliphant
Date: 2006-10-27 15:44:32 -0500 (Fri, 27 Oct 2006)
New Revision: 3409

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
Log:
fixes to last commits.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-27 20:43:01 UTC (rev 3408)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-27 20:44:32 UTC (rev 3409)
@@ -10663,7 +10663,7 @@
         
         if (PyTypeNum_ISUSERDEF(self->type_num)) {
                 if (typeobj == NULL) {
-                        return PyString_FromFormat("%s%d (%d)", 
+                        return PyString_FromFormat("%c%d (%d)", 
                                                    self->kind,
                                                    self->elsize,
                                                    self->type_num);

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 20:43:01 UTC (rev 3408)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 20:44:32 UTC (rev 3409)
@@ -123,7 +123,7 @@
          */
         align = descr->alignment;
         if (align > 1) memloc = ((memloc + align - 1)/align)*align;
-        return (void *)memloc
+        return (void *)memloc;
 #undef _IFCASE
 #undef _OBJ
 #undef _CHK



From numpy-svn at scipy.org  Fri Oct 27 17:42:30 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Fri, 27 Oct 2006 16:42:30 -0500 (CDT)
Subject: [Numpy-svn] r3410 - trunk/numpy/core/src
Message-ID: <20061027214230.B6A9539C045@new.scipy.org>

Author: oliphant
Date: 2006-10-27 16:42:27 -0500 (Fri, 27 Oct 2006)
New Revision: 3410

Modified:
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/scalartypes.inc.src
Log:
Fix to allow typeobjects in array descriptors which are not sub-types of array scalars.

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-27 20:44:32 UTC (rev 3409)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-27 21:42:27 UTC (rev 3410)
@@ -1314,10 +1314,12 @@
         int swap;
 
         type_num = descr->type_num;
+        type = descr->typeobj;
         if (type_num == PyArray_BOOL)
                 PyArrayScalar_RETURN_BOOL_FROM_LONG(*(Bool*)data);
-        else if (type_num == PyArray_OBJECT ||          \
-                 ((type=descr->typeobj)==NULL)) {
+        else if (type_num == PyArray_OBJECT ||           
+                 (PyTypeNum_ISUSERDEF(type_num) &&
+                  !(PyType_IsSubtype(type, &PyGenericArrType_Type)))) {
                 return descr->f->getitem(data, base);
         }
         itemsize = descr->elsize;
@@ -1540,8 +1542,7 @@
 
         for (i=0; i<NPY_NUMUSERTYPES; i++) {
                 descr = userdescrs[i];
-                if (descr->typeobj && 
-                    strcmp(descr->typeobj->tp_name, str) == 0)
+                if (strcmp(descr->typeobj->tp_name, str) == 0)
                         return descr->type_num;
         }
 
@@ -1588,12 +1589,10 @@
                                 " is missing.");
                 return -1;
         }
-        /*
         if (descr->typeobj == NULL) {
                 PyErr_SetString(PyExc_ValueError, "missing typeobject");
                 return -1;
         }
-        */
         userdescrs = realloc(userdescrs,
                              (NPY_NUMUSERTYPES+1)*sizeof(void *));
         if (userdescrs == NULL) {
@@ -10662,12 +10661,6 @@
         static int prefix_len=0;
         
         if (PyTypeNum_ISUSERDEF(self->type_num)) {
-                if (typeobj == NULL) {
-                        return PyString_FromFormat("%c%d (%d)", 
-                                                   self->kind,
-                                                   self->elsize,
-                                                   self->type_num);
-                }
 		s = strrchr(typeobj->tp_name, '.');
 		if (s == NULL) {
 			res = PyString_FromString(typeobj->tp_name);
@@ -10891,10 +10884,6 @@
         Py_DECREF(mod);
         if (obj == NULL) {Py_DECREF(ret); return NULL;}
         PyTuple_SET_ITEM(ret, 0, obj);
-        if (self->typeobj == NULL) { /* Must handle this case in getitem */
-                obj = self->f->getitem(NULL, NULL);
-                if (obj == NULL) {Py_DECREF(ret); return NULL;}
-        }
         if (PyTypeNum_ISUSERDEF(self->type_num) ||              \
             ((self->type_num == PyArray_VOID &&                 \
               self->typeobj != &PyVoidArrType_Type))) {

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 20:44:32 UTC (rev 3409)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-27 21:42:27 UTC (rev 3410)
@@ -2556,6 +2556,7 @@
 
         /* Otherwise --- type is a sub-type of an array scalar
            currently only VOID allows it -- use it as the type-object.
+           This is for non-registered data-type objects. 
         */
         /* look for a dtypedescr attribute */
         if (!PyType_IsSubtype((PyTypeObject *)type, &PyVoidArrType_Type)) {



From numpy-svn at scipy.org  Sat Oct 28 05:18:09 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 28 Oct 2006 04:18:09 -0500 (CDT)
Subject: [Numpy-svn] r3411 - in trunk/numpy/core: include/numpy src
Message-ID: <20061028091809.CDA1E39C00B@new.scipy.org>

Author: oliphant
Date: 2006-10-28 04:18:00 -0500 (Sat, 28 Oct 2006)
New Revision: 3411

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
   trunk/numpy/core/src/arraymethods.c
   trunk/numpy/core/src/arrayobject.c
   trunk/numpy/core/src/arraytypes.inc.src
   trunk/numpy/core/src/multiarraymodule.c
Log:
Expand usage of hasobject to be a flag-like entity keeping track of how the data-type should be used.

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-27 21:42:27 UTC (rev 3410)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-28 09:18:00 UTC (rev 3411)
@@ -1105,14 +1105,40 @@
         int **cancastscalarkindto;
         int *cancastto;
 
-        /* Set to 1 if you want pickles of this type
-           to go out as lists of _getitem objects
-        */
-        int listpickle;
+        int listpickle;           /* Unused */
 
 } PyArray_ArrFuncs;
 
+#define NPY_ITEM_REFCOUNT   0x01  /* The item must be reference counted
+                                     when it is inserted or extracted. */
+#define NPY_ITEM_HASOBJECT  0x01  /* Same as needing REFCOUNT */
 
+#define NPY_LIST_PICKLE     0x02  /* Convert to list for pickling */
+#define NPY_ITEM_IS_POINTER 0x06  /* The item is a POINTER -- automatic
+                                     LIST_PICKLE       */
+
+#define NPY_NEEDS_INIT      0x08  /* memory needs to be initialized 
+                                     for this data-type */
+
+#define NPY_NEEDS_PYAPI     0x10  /* operations need Python C-API 
+                                     so don't give-up thread. */
+
+#define NPY_USE_GETITEM     0x20  /* Use f.getitem when extracting elements 
+                                     of this data-type */
+
+
+/* These are inherited for global data-type if any data-types in the field 
+   have them */
+#define NPY_FROM_FIELDS     (NPY_NEEDS_INIT | NPY_LIST_PICKLE | NPY_ITEM_REFCOUNT | NPY_NEEDS_PYAPI)
+                                     
+#define NPY_OBJECT_DTYPE_FLAGS (NPY_LIST_PICKLE | NPY_USE_GETITEM | NPY_ITEM_IS_POINTER | NPY_ITEM_REFCOUNT | NPY_NEEDS_INIT | NPY_NEEDS_PYAPI)
+
+#define PyDataType_FLAGCHK(dtype, flag) \
+        ((dtype->hasobject & flag) == flag)
+#define PyDataType_REFCHK(dtype) \
+        PyDataType_FLAGCHK(dtype, NPY_ITEM_REFCOUNT)
+
+/* Change dtype hasobject to 32-bit in 1.1 and change its name */
 typedef struct {
         PyObject_HEAD
         PyTypeObject *typeobj;  /* the type object representing an
@@ -1123,7 +1149,8 @@
         char type;              /* unique-character representing this type */
         char byteorder;         /* '>' (big), '<' (little), '|'
                                    (not-applicable), or '=' (native). */
-        char hasobject;        /* non-zero if it has object arrays in fields */
+        char hasobject;         /* non-zero if it has object arrays 
+                                   in fields */
         int type_num;          /* number representing this type */
         int elsize;             /* element size for this type */
         int alignment;          /* alignment needed for this type */
@@ -1294,8 +1321,12 @@
 #define NPY_BEGIN_THREADS_DEF PyThreadState *_save=NULL;
 #define NPY_BEGIN_THREADS _save = PyEval_SaveThread();
 #define NPY_END_THREADS   if (_save) PyEval_RestoreThread(_save);
-#define NPY_BEGIN_THREADS_DESCR(dtype) if (!((dtype)->hasobject)) NPY_BEGIN_THREADS
-#define NPY_END_THREADS_DESCR(dtype) if (!((dtype)->hasobject)) NPY_END_THREADS
+#define NPY_BEGIN_THREADS_DESCR(dtype)                          \
+        if (!(PyDataType_FLAGCHK(dtype, NPY_NEEDS_PYAPI)))      \
+                NPY_BEGIN_THREADS
+#define NPY_END_THREADS_DESCR(dtype)                            \
+        if (!(PyDataType_FLAGCHK(dtype, NPY_NEEDS_PYAPI)))      \
+                NPY_END_THREADS
 #define NPY_ALLOW_C_API_DEF  PyGILState_STATE __save__;
 #define NPY_ALLOW_C_API      __save__ = PyGILState_Ensure();
 #define NPY_DISABLE_C_API    PyGILState_Release(__save__);

Modified: trunk/numpy/core/src/arraymethods.c
===================================================================
--- trunk/numpy/core/src/arraymethods.c	2006-10-27 21:42:27 UTC (rev 3410)
+++ trunk/numpy/core/src/arraymethods.c	2006-10-28 09:18:00 UTC (rev 3411)
@@ -897,8 +897,20 @@
 _deepcopy_call(char *iptr, char *optr, PyArray_Descr *dtype,
 	       PyObject *deepcopy, PyObject *visit)
 {
-	if (dtype->hasobject == 0) return;
-	if (dtype->type_num == PyArray_OBJECT) {
+	if (!PyDataType_REFCHK(dtype)) return;
+	else if (PyDescr_HASFIELDS(dtype)) {
+                PyObject *key, *value, *title=NULL;
+                PyArray_Descr *new;
+                int offset;
+                Py_ssize_t pos=0;
+                while (PyDict_Next(dtype->fields, &pos, &key, &value)) {
+ 			if (!PyArg_ParseTuple(value, "Oi|O", &new, &offset,
+					      &title)) return;
+                        _deepcopy_call(iptr + offset, optr + offset, new,
+				       deepcopy, visit);
+                }
+        }
+        else {
 		PyObject **itemp, **otemp;
 		PyObject *res;
 		itemp = (PyObject **)iptr;
@@ -911,18 +923,7 @@
 		Py_XDECREF(*otemp);
 		*otemp = res;
 	}
-	else if (PyDescr_HASFIELDS(dtype)) {
-                PyObject *key, *value, *title=NULL;
-                PyArray_Descr *new;
-                int offset;
-                Py_ssize_t pos=0;
-                while (PyDict_Next(dtype->fields, &pos, &key, &value)) {
- 			if (!PyArg_ParseTuple(value, "Oi|O", &new, &offset,
-					      &title)) return;
-                        _deepcopy_call(iptr + offset, optr + offset, new,
-				       deepcopy, visit);
-                }
-        }
+
 }
 
 
@@ -936,7 +937,7 @@
 
         if (!PyArg_ParseTuple(args, "O", &visit)) return NULL;
         ret = PyArray_Copy(self);
-        if (self->descr->hasobject) {
+        if (PyDataType_REFCHK(self->descr)) {
                 copy = PyImport_ImportModule("copy");
                 if (copy == NULL) return NULL;
                 deepcopy = PyObject_GetAttrString(copy, "deepcopy");
@@ -1057,7 +1058,7 @@
 	mybool = (PyArray_ISFORTRAN(self) ? Py_True : Py_False);
 	Py_INCREF(mybool);
 	PyTuple_SET_ITEM(state, 3, mybool);
-	if (self->descr->hasobject || self->descr->f->listpickle) {
+	if (PyDataType_FLAGCHK(self->descr, NPY_LIST_PICKLE)) {
 		thestr = _getlist_pkl(self);
 	}
 	else {
@@ -1134,7 +1135,7 @@
 		return NULL;
 	}
 
-	if (typecode->hasobject || typecode->f->listpickle) {
+	if (PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
 		if (!PyList_Check(rawdata)) {
 			PyErr_SetString(PyExc_TypeError,
 					"object pickle not returning list");
@@ -1187,7 +1188,7 @@
 					   &(self->flags));
 	}
 
-	if (typecode->hasobject != 1 && !typecode->f->listpickle) {
+	if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
                 int swap=!PyArray_ISNOTSWAPPED(self);
 		self->data = datastr;
 		if (!_IsAligned(self) || swap) {
@@ -1234,7 +1235,8 @@
 			if (self->dimensions) PyDimMem_FREE(self->dimensions);
 			return PyErr_NoMemory();
 		}
-		if (self->descr->hasobject) memset(self->data, 0, PyArray_NBYTES(self));
+		if (PyDataType_FLAGCHK(self->descr, NPY_NEEDS_INIT))
+                        memset(self->data, 0, PyArray_NBYTES(self));
 		self->flags |= OWNDATA;
 		self->base = NULL;
 		if (_setlist_pkl(self, rawdata) < 0)

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-27 21:42:27 UTC (rev 3410)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-28 09:18:00 UTC (rev 3411)
@@ -46,7 +46,7 @@
 static int
 _check_object_rec(PyArray_Descr *descr)
 {
-        if (descr->hasobject && !PyDescr_ISOBJECT(descr)) {
+        if (PyDataType_HASFIELDS(descr) && PyDataType_REFCHK(descr)) {
                 PyErr_SetString(PyExc_TypeError, "Not supported for this data-type.");
                 return -1;
         }
@@ -154,7 +154,7 @@
 {
         PyObject **temp;
 
-        if (descr->hasobject == 0) return;
+        if (!PyDataType_REFCHK(descr)) return;
 
         if (descr->type_num == PyArray_OBJECT) {
                 temp = (PyObject **)data;
@@ -182,7 +182,7 @@
 {
         PyObject **temp;
 
-        if (descr->hasobject == 0) return;
+        if (!PyDataType_REFCHK(descr)) return;
 
         if (descr->type_num == PyArray_OBJECT) {
                 temp = (PyObject **)data;
@@ -216,7 +216,7 @@
         PyObject **data, **temp;
         PyArrayIterObject *it;
 
-        if (mp->descr->hasobject == 0) return 0;
+        if (!PyDataType_REFCHK(mp->descr)) return 0;
 
         if (mp->descr->type_num != PyArray_OBJECT) {
                 it = (PyArrayIterObject *)PyArray_IterNew((PyObject *)mp);
@@ -267,7 +267,7 @@
         PyObject **temp;
         PyArrayIterObject *it;
 
-        if (mp->descr->hasobject == 0) return 0;
+        if (!PyDataType_REFCHK(mp->descr)) return 0;
 
         if (mp->descr->type_num != PyArray_OBJECT) {
                 it = (PyArrayIterObject *)PyArray_IterNew((PyObject *)mp);
@@ -1314,16 +1314,14 @@
         int swap;
 
         type_num = descr->type_num;
-        type = descr->typeobj;
         if (type_num == PyArray_BOOL)
                 PyArrayScalar_RETURN_BOOL_FROM_LONG(*(Bool*)data);
-        else if (type_num == PyArray_OBJECT ||           
-                 (PyTypeNum_ISUSERDEF(type_num) &&
-                  !(PyType_IsSubtype(type, &PyGenericArrType_Type)))) {
+        else if (PyDataType_FLAGCHK(descr, NPY_USE_GETITEM)) {
                 return descr->f->getitem(data, base);
         }
         itemsize = descr->elsize;
         copyswap = descr->f->copyswap;
+        type = descr->typeobj;
         swap = !PyArray_ISNBO(descr->byteorder);
         if PyTypeNum_ISSTRING(type_num) { /* Eliminate NULL bytes */
                 char *dptr = data;
@@ -1705,8 +1703,8 @@
 
         n3 = (sep ? strlen((const char *)sep) : 0);
         if (n3 == 0) { /* binary data */
-                if (self->descr->hasobject) {
-                        PyErr_SetString(PyExc_ValueError, "cannot write "\
+                if (PyDataType_FLAGCHK(self->descr, NPY_LIST_PICKLE)) {
+                        PyErr_SetString(PyExc_ValueError, "cannot write " \
                                         "object arrays to a file in "   \
                                         "binary mode");
                         return -1;
@@ -1934,7 +1932,7 @@
 
         if ((self->flags & OWNDATA) && self->data) {
                 /* Free internal references if an Object array */
-                if (self->descr->hasobject) {
+                if (PyDataType_FLAGCHK(self->descr, NPY_ITEM_REFCOUNT)) {
                         Py_INCREF(self); /*hold on to self */
                         PyArray_XDECREF(self);
                         /* Don't need to DECREF -- because we are deleting
@@ -2443,7 +2441,7 @@
         copyswap = PyArray_DESCR(arr)->f->copyswap;
         PyArray_MapIterReset(mit);
         /* Need to decref hasobject arrays */
-        if (descr->hasobject) {
+        if (PyDataType_FLAGCHK(descr, NPY_ITEM_REFCOUNT)) {
                 while (index--) {
                         PyArray_Item_XDECREF(mit->dataptr, PyArray_DESCR(arr));
                         PyArray_Item_INCREF(it->dataptr, PyArray_DESCR(arr));
@@ -5368,7 +5366,7 @@
 
                 /* It is bad to have unitialized OBJECT pointers */
                 /* which could also be sub-fields of a VOID array */
-                if (descr->hasobject) {
+                if (PyDataType_FLAGCHK(descr, NPY_NEEDS_INIT)) {
                         memset(data, 0, sd);
                 }
         }
@@ -5431,15 +5429,9 @@
 static void
 _putzero(char *optr, PyObject *zero, PyArray_Descr *dtype)
 {
-        if (dtype->hasobject == 0) {
+        if (!PyDataType_FLAGCHK(dtype, NPY_ITEM_REFCOUNT)) {
                 memset(optr, 0, dtype->elsize);
         }
-        else if (PyDescr_ISOBJECT(dtype)) {
-                PyObject **temp;
-                Py_INCREF(zero);
-                temp = (PyObject **)optr;
-                *temp = zero;
-        }
         else if (PyDescr_HASFIELDS(dtype)) {
                 PyObject *key, *value, *title=NULL;
                 PyArray_Descr *new;
@@ -5451,6 +5443,12 @@
                         _putzero(optr + offset, zero, new);
                 }
         }
+        else {
+                PyObject **temp;
+                Py_INCREF(zero);
+                temp = (PyObject **)optr;
+                *temp = zero;
+        }
         return;
 }
 
@@ -5483,12 +5481,6 @@
                 return NULL;
         }
 
-        if (self->descr->hasobject) {
-                PyErr_SetString(PyExc_ValueError,
-                                "cannot resize an object-array like this");
-                return NULL;
-        }
-
         if (fortran == PyArray_ANYORDER)
                 fortran = PyArray_CORDER;
 
@@ -5547,7 +5539,7 @@
         if ((newsize > oldsize) && PyArray_ISWRITEABLE(self)) {
                 /* Fill new memory with zeros */
                 elsize = self->descr->elsize;
-                if (self->descr->hasobject) {
+                if (PyDataType_FLAGCHK(self->descr, NPY_ITEM_REFCOUNT)) {
                         PyObject *zero = PyInt_FromLong(0);
                         char *optr;
                         optr = self->data + oldsize*elsize;
@@ -5595,7 +5587,7 @@
 static void
 _fillobject(char *optr, PyObject *obj, PyArray_Descr *dtype)
 {
-        if (!dtype->hasobject) {
+        if (!PyDataType_FLAGCHK(dtype, NPY_ITEM_REFCOUNT)) {
                 if ((obj == Py_None) ||
                     (PyInt_Check(obj) && PyInt_AsLong(obj)==0))
                         return;
@@ -5610,14 +5602,7 @@
                         Py_XDECREF(arr);
                 }
         }
-        if (PyDescr_ISOBJECT(dtype)) {
-                PyObject **temp;
-                Py_XINCREF(obj);
-                temp = (PyObject **)optr;
-                *temp = obj;
-                return;
-        }
-        if (PyDescr_HASFIELDS(dtype)) {
+        else if (PyDescr_HASFIELDS(dtype)) {
                 PyObject *key, *value, *title=NULL;
                 PyArray_Descr *new;
                 int offset;
@@ -5628,6 +5613,13 @@
                         _fillobject(optr + offset, obj, new);
                 }
         }
+        else {
+                PyObject **temp;
+                Py_XINCREF(obj);
+                temp = (PyObject **)optr;
+                *temp = obj;
+                return;
+        }
 }
 
 /* Assumes contiguous */
@@ -5815,7 +5807,8 @@
                                              dims.ptr,
                                              strides.ptr, NULL, fortran, NULL);
                 if (ret == NULL) {descr=NULL;goto fail;}
-                if (descr->hasobject) { /* place Py_None in object positions */
+                if (PyDataType_FLAGCHK(descr, NPY_ITEM_HASOBJECT)) { 
+                        /* place Py_None in object positions */
                         PyArray_FillObjectArray(ret, Py_None);
                         if (PyErr_Occurred()) {
                                 descr=NULL;
@@ -6235,9 +6228,12 @@
                 PyErr_SetString(PyExc_TypeError, "invalid data-type for array");
                 return -1;
         }
-        if (newtype->hasobject || self->descr->hasobject) {
-                PyErr_SetString(PyExc_TypeError,                        \
-                                "Cannot change data-type for object"    \
+        if (PyDataType_FLAGCHK(newtype, NPY_ITEM_HASOBJECT) ||
+            PyDataType_FLAGCHK(newtype, NPY_ITEM_IS_POINTER) ||
+            PyDataType_FLAGCHK(self->descr, NPY_ITEM_HASOBJECT) || 
+            PyDataType_FLAGCHK(self->descr, NPY_ITEM_IS_POINTER)) {
+                PyErr_SetString(PyExc_TypeError,                      \
+                                "Cannot change data-type for object " \
                                 "array.");
                 Py_DECREF(newtype);
                 return -1;
@@ -6535,7 +6531,7 @@
 
         swap = PyArray_ISNOTSWAPPED(self) != PyArray_ISNOTSWAPPED(arr);
         copyswap = self->descr->f->copyswap;
-        if (self->descr->hasobject) {
+        if (PyDataType_REFCHK(self->descr)) {
                 while(selfit->index < selfit->size) {
                         PyArray_Item_XDECREF(selfit->dataptr, self->descr);
                         PyArray_Item_INCREF(arrit->dataptr, PyArray_DESCR(arr));
@@ -7520,9 +7516,9 @@
                 PyErr_NoMemory();
                 return -1;
         }
-        if (out->descr->hasobject)
+        if (PyDataType_FLAGCHK(out->descr, NPY_NEEDS_INIT))
                 memset(buffers[0], 0, N*delsize);
-        if (in->descr->hasobject)
+        if (PyDataType_FLAGCHK(in->descr, NPY_NEEDS_INIT))
                 memset(buffers[1], 0, N*selsize);
 
 #if NPY_ALLOW_THREADS
@@ -7548,12 +7544,12 @@
                         }
 #endif
         Py_DECREF(multi);
-        if (in->descr->hasobject) {
+        if (PyDataType_REFCHK(in->descr)) {
                 obptr = buffers[1];
                 for (i=0; i<N; i++, obptr+=selsize)
                         PyArray_Item_XDECREF(obptr, out->descr);
         }
-        if (out->descr->hasobject) {
+        if (PyDataType_REFCHK(out->descr)) {
                 obptr = buffers[0];
                 for (i=0; i<N; i++, obptr+=delsize)
                         PyArray_Item_XDECREF(obptr, out->descr);
@@ -10617,7 +10613,10 @@
         {"byteorder", T_CHAR, offsetof(PyArray_Descr, byteorder), RO, NULL},
         {"itemsize", T_INT, offsetof(PyArray_Descr, elsize), RO, NULL},
         {"alignment", T_INT, offsetof(PyArray_Descr, alignment), RO, NULL},
+        /* Get rid of this in 1.1 */
         {"hasobject", T_UBYTE, offsetof(PyArray_Descr, hasobject), RO, NULL},
+        /* END */
+        {"flags", T_UBYTE, offsetof(PyArray_Descr, hasobject), RO, NULL},
         {"names", T_OBJECT, offsetof(PyArray_Descr, names), RO, NULL},
         {NULL},
 };
@@ -10870,7 +10869,7 @@
         /* version number of this pickle type. Increment if we need to
            change the format. Be sure to handle the old versions in
            arraydescr_setstate. */
-        const int version = 2;
+        const int version = 3;
         PyObject *ret, *mod, *obj;
         PyObject *state;
         char endian;
@@ -10906,7 +10905,7 @@
                 endian = '<';
                 if (!PyArray_IsNativeByteOrder(endian)) endian = '>';
         }
-        state = PyTuple_New(7);
+        state = PyTuple_New(8);
         PyTuple_SET_ITEM(state, 0, PyInt_FromLong(version));
         PyTuple_SET_ITEM(state, 1, PyString_FromFormat("%c", endian));
         PyTuple_SET_ITEM(state, 2, arraydescr_subdescr_get(self));
@@ -10932,6 +10931,7 @@
 
         PyTuple_SET_ITEM(state, 5, PyInt_FromLong(elsize));
         PyTuple_SET_ITEM(state, 6, PyInt_FromLong(alignment));
+        PyTuple_SET_ITEM(state, 7, PyInt_FromLong(self->hasobject));
 
         PyTuple_SET_ITEM(ret, 2, state);
         return ret;
@@ -10944,8 +10944,9 @@
 static int
 _descr_find_object(PyArray_Descr *self)
 {
-        if (self->hasobject || self->type_num == PyArray_OBJECT || self->kind == 'O')
-                return 1;
+        if (self->hasobject || self->type_num == PyArray_OBJECT || 
+            self->kind == 'O')
+                return NPY_OBJECT_DTYPE_FLAGS;
         if (PyDescr_HASFIELDS(self)) {
                 PyObject *key, *value, *title=NULL;
                 PyArray_Descr *new;
@@ -10958,8 +10959,8 @@
                                 return 0;
                         }
                         if (_descr_find_object(new)) {
-                                new->hasobject = 1;
-                                return 1;
+                                new->hasobject = NPY_OBJECT_DTYPE_FLAGS;
+                                return NPY_OBJECT_DTYPE_FLAGS;
                         }
                 }
         }
@@ -10974,27 +10975,62 @@
 arraydescr_setstate(PyArray_Descr *self, PyObject *args)
 {
         int elsize = -1, alignment = -1;
-        int version = 2;
+        int version = 3;
         char endian;
         PyObject *subarray, *fields, *names=NULL;
         int incref_names = 1;
+        int dtypeflags=0;
 
         if (self->fields == Py_None) {Py_INCREF(Py_None); return Py_None;}
 
-        if (!PyArg_ParseTuple(args, "(icOOOii)", &version, &endian, &subarray,
-                              &names, &fields, &elsize, &alignment)) {
-            PyErr_Clear();
-            if (!PyArg_ParseTuple(args, "(icOOii)", &version, &endian,
-                                  &subarray, &fields, &elsize,
-                                  &alignment)) {
-                PyErr_Clear();
+        if (PyTuple_GET_SIZE(args) != 1 || 
+            !(PyTuple_Check(PyTuple_GET_ITEM(args, 0)))) {
+                PyErr_BadInternalCall();
+                return NULL;
+        }
+        switch (PyTuple_GET_SIZE(PyTuple_GET_ITEM(args,0))) {
+        case 8:
+                if (!PyArg_ParseTuple(args, "(icOOOiii)", &version, &endian, 
+                                      &subarray, &names, &fields, &elsize, 
+                                      &alignment, &dtypeflags)) {
+                        return NULL;
+                }
+                break;
+        case 7:
+                if (!PyArg_ParseTuple(args, "(icOOOii)", &version, &endian, 
+                                      &subarray, &names, &fields, &elsize, 
+                                      &alignment)) {
+                        return NULL;
+                }
+                break;
+        case 6:
+                if (!PyArg_ParseTuple(args, "(icOOii)", &version, 
+                                      &endian, &subarray, &fields, 
+                                      &elsize, &alignment)) {
+                        PyErr_Clear();
+                }
+                break;
+        case 5:
                 version = 0;
-                if (!PyArg_ParseTuple(args, "(cOOii)", &endian, &subarray,
-                                      &fields, &elsize, &alignment)) {
-                    return NULL;
+                if (!PyArg_ParseTuple(args, "(cOOii)", 
+                                      &endian, &subarray, &fields, &elsize, 
+                                      &alignment)) {
+                        return NULL;
                 }
-            }
+                break;
+        default:
+                version = -1; /* raise an error */
         }
+        
+        /* If we ever need another pickle format, increment the version
+           number. But we should still be able to handle the old versions.
+        */
+        if (version < 0 || version > 3) {
+            PyErr_Format(PyExc_ValueError,
+                         "can't handle version %d of numpy.dtype pickle",
+                         version);
+            return NULL;
+        }
 
         if (version == 1 || version == 0) {
             if (fields != Py_None) {
@@ -11010,18 +11046,8 @@
             else {
                 names = Py_None;
             }
-            version = 2;
         }
 
-        /* If we ever need another pickle format, increment the version
-           number. But we should still be able to handle the old versions.
-        */
-        if (version != 2) {
-            PyErr_Format(PyExc_ValueError,
-                         "can't handle version %d of numpy.dtype pickle",
-                         version);
-            return NULL;
-        }
 
         if ((fields == Py_None && names != Py_None) ||  \
             (names == Py_None && fields != Py_None)) {
@@ -11064,7 +11090,10 @@
                 self->alignment = alignment;
         }
 
-        self->hasobject = _descr_find_object(self);
+        self->hasobject = dtypeflags;
+        if (version < 3) {
+                self->hasobject = _descr_find_object(self);
+        }
         Py_INCREF(Py_None);
         return Py_None;
 }

Modified: trunk/numpy/core/src/arraytypes.inc.src
===================================================================
--- trunk/numpy/core/src/arraytypes.inc.src	2006-10-27 21:42:27 UTC (rev 3410)
+++ trunk/numpy/core/src/arraytypes.inc.src	2006-10-28 09:18:00 UTC (rev 3411)
@@ -514,7 +514,8 @@
         }
 
  finish:
-        if (descr->hasobject) {
+        if (PyDataType_FLAGCHK(descr, NPY_ITEM_HASOBJECT) ||
+            PyDataType_FLAGCHK(descr, NPY_ITEM_IS_POINTER)) {                
                 PyErr_SetString(PyExc_ValueError,
                                 "tried to get void-array with object"
                                 " members as buffer.");
@@ -622,7 +623,8 @@
         {
                 const void *buffer;
                 Py_ssize_t buflen;
-                if (descr->hasobject) {
+                if (PyDataType_FLAGCHK(descr, NPY_ITEM_HASOBJECT) ||
+                    PyDataType_FLAGCHK(descr, NPY_ITEM_IS_POINTER)) {
                         PyErr_SetString(PyExc_ValueError,
                                         "tried to set void-array with object"
                                         " members using buffer.");
@@ -2105,7 +2107,7 @@
 #NAME= Bool, Byte, UByte, Short, UShort, Int, UInt, Long, ULong, LongLong, ULongLong, Float, Double, LongDouble, CFloat, CDouble, CLongDouble, Object#
 #kind= GENBOOL, SIGNED, UNSIGNED, SIGNED, UNSIGNED, SIGNED, UNSIGNED, SIGNED, UNSIGNED, SIGNED, UNSIGNED, FLOATING, FLOATING, FLOATING, COMPLEX, COMPLEX, COMPLEX, OBJECT#
 #endian= |*3, =*14, |#
-#isobject= 0*17,1#
+#isobject= 0*17,NPY_OBJECT_DTYPE_FLAGS#
 */
 
 static PyArray_ArrFuncs _Py at NAME@_ArrFuncs = {
@@ -2154,7 +2156,7 @@
         (PyArray_ScalarKindFunc*)NULL,
         NULL,
         NULL,
-        0
+        0,
 };
 
 static PyArray_Descr @from at _Descr = {

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-10-27 21:42:27 UTC (rev 3410)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-10-28 09:18:00 UTC (rev 3411)
@@ -2571,7 +2571,9 @@
 				     "merge sort not available for item %d", i);
 			goto fail;
 		}
-		if (!object && mps[i]->descr->hasobject) object = 1;
+		if (!object && 
+                    PyDataType_FLAGCHK(mps[i]->descr, NPY_NEEDS_PYAPI))
+                        object = 1;
 		its[i] = (PyArrayIterObject *)PyArray_IterAllButAxis	\
 			((PyObject *)mps[i], &axis);
 		if (its[i]==NULL) goto fail;
@@ -3715,7 +3717,7 @@
         if (values == NULL) goto fail;
         nv = PyArray_SIZE(values);
         if (nv <= 0) goto finish;
-        if (self->descr->hasobject) {
+        if (PyDataType_REFCHK(self->descr)) {
                 switch(clipmode) {
                 case NPY_RAISE:
                         for(i=0; i<ni; i++) {
@@ -3891,7 +3893,7 @@
                 return Py_None;
         }
         if (nv > 0) {
-                if (self->descr->hasobject) {
+                if (PyDataType_REFCHK(self->descr)) {
                         for(i=0; i<ni; i++) {
                                 src = values->data + chunk * (i % nv);
                                 tmp = ((Bool *)(mask->data))[i];
@@ -4337,9 +4339,8 @@
                 new->names = conv->names;
                 Py_XINCREF(new->names);
 	}
+        new->hasobject = conv->hasobject;
 	Py_DECREF(conv);
-        if (conv->hasobject)
-                new->hasobject = 1;
 	*errflag = 0;
 	return new;
 
@@ -4417,7 +4418,7 @@
 		PyDimMem_FREE(shape.ptr);
 		newdescr->subarray = _pya_malloc(sizeof(PyArray_ArrayDescr));
 		newdescr->subarray->base = type;
-		if (type->hasobject) newdescr->hasobject = 1;
+                newdescr->hasobject = type->hasobject;
 		Py_INCREF(val);
 		newdescr->subarray->shape = val;
 		Py_XDECREF(newdescr->fields);
@@ -4448,8 +4449,9 @@
 	PyObject *nameslist;
 	PyArray_Descr *new;
 	PyArray_Descr *conv;
-        int hasobject=0;
+        int dtypeflags=0;
 
+
 	n = PyList_GET_SIZE(obj);
 	nameslist = PyTuple_New(n);
 	if (!nameslist) return NULL;
@@ -4505,8 +4507,7 @@
 					"two fields with the same name");
                         goto fail;
                 }
-                if (!hasobject && conv->hasobject)
-                        hasobject = 1;
+                dtypeflags |= (conv->hasobject & NPY_FROM_FIELDS);
 		tup = PyTuple_New((title == NULL ? 2 : 3));
 		PyTuple_SET_ITEM(tup, 0, (PyObject *)conv);
 		PyTuple_SET_ITEM(tup, 1, PyInt_FromLong((long) totalsize));
@@ -4528,7 +4529,7 @@
 	new->fields = fields;
         new->names = nameslist;
 	new->elsize = totalsize;
-        new->hasobject=hasobject;
+        new->hasobject=dtypeflags;
 	return new;
 
  fail:
@@ -4558,7 +4559,7 @@
 	PyObject *nameslist=NULL;
        	int ret;
 	int maxalign=0;
-        int hasobject=0;
+        int dtypeflags=0;
 
 	n = PyList_GET_SIZE(obj);
 	/* Ignore any empty string at end which _internal._commastring
@@ -4580,8 +4581,7 @@
 			Py_DECREF(key);
 			goto fail;
 		}
-		if (!hasobject && conv->hasobject)
-			hasobject=1;
+                dtypeflags |= (conv->hasobject & NPY_FROM_FIELDS);
 		PyTuple_SET_ITEM(tup, 0, (PyObject *)conv);
 		if (align) {
 			int _align;
@@ -4599,7 +4599,7 @@
 	new = PyArray_DescrNewFromType(PyArray_VOID);
 	new->fields = fields;
         new->names = nameslist;
-        new->hasobject=hasobject;
+        new->hasobject=dtypeflags;
 	if (maxalign > 1) {
 		totalsize = ((totalsize+maxalign-1)/maxalign)*maxalign;
 	}
@@ -4709,7 +4709,7 @@
 	int n, i;
 	int totalsize;
 	int maxalign=0;
-        int hasobject=0;
+        int dtypeflags=0;
 
 	fields = PyDict_New();
 	if (fields == NULL) return (PyArray_Descr *)PyErr_NoMemory();
@@ -4815,8 +4815,7 @@
 		}
 		Py_DECREF(tup);
 		if ((ret == PY_FAIL) || (newdescr->elsize == 0)) goto fail;
-                if (!hasobject && newdescr->hasobject)
-                        hasobject = 1;
+                dtypeflags |= (newdescr->hasobject & NPY_FROM_FIELDS);
 		totalsize += newdescr->elsize;
 	}
 
@@ -4834,7 +4833,7 @@
         }
         new->names = names;
 	new->fields = fields;
-        new->hasobject=hasobject;
+        new->hasobject = dtypeflags;
 	return new;
 
  fail:
@@ -5415,7 +5414,7 @@
 						    fortran, NULL);
 	if (ret == NULL) return NULL;
 
-	if (type->hasobject) {
+	if (PyDataType_REFCHK(type)) {
                 PyArray_FillObjectArray(ret, Py_None);
 		if (PyErr_Occurred()) {Py_DECREF(ret); return NULL;}
 	}
@@ -5476,8 +5475,8 @@
 				"itemsize cannot be zero");
 		return NULL;
 	}
-
-	if (typecode->type_num == PyArray_OBJECT || typecode->f->listpickle) {
+        
+	if (PyDataType_FLAGCHK(typecode, NPY_ITEM_IS_POINTER)) {
 		if (obj == NULL) obj = Py_None;
 		dptr = &obj;
 	}
@@ -5534,7 +5533,7 @@
 						    fortran, NULL);
 	if (ret == NULL) return NULL;
 
-	if (type->hasobject) {
+	if (PyDataType_REFCHK(type)) {
 		PyObject *zero = PyInt_FromLong(0);
                 PyArray_FillObjectArray(ret, zero);
                 Py_DECREF(zero);
@@ -5617,8 +5616,8 @@
 
 	if (dtype == NULL)
 		dtype=PyArray_DescrFromType(PyArray_DEFAULT);
-
-        if (dtype->hasobject) {
+        
+        if (PyDataType_FLAGCHK(dtype, NPY_ITEM_IS_POINTER)) {
                 PyErr_SetString(PyExc_ValueError,
                                 "Cannot create an object array from"    \
                                 " a string");
@@ -5797,9 +5796,9 @@
         elsize = dtype->elsize;
 
         /* We would need to alter the memory RENEW code to decrement any
-           reference counts before just throwing away the memory.
+           reference counts before throwing away any memory.
          */
-        if (dtype->hasobject) {
+        if (PyDataType_REFCHK(dtype)) {
                 PyErr_SetString(PyExc_ValueError, "cannot create "\
                                 "object arrays from iterator");
                 goto done;
@@ -5911,7 +5910,7 @@
 	PyArray_ScanFunc *scan;
 	Bool binary;
 
-        if (typecode->hasobject) {
+        if (PyDataType_REFCHK(typecode)) {
                 PyErr_SetString(PyExc_ValueError, "cannot read into"
                                 "object array");
                 Py_DECREF(typecode);
@@ -6105,7 +6104,7 @@
 	int write=1;
 
 
-	if (type->hasobject) {
+	if (PyDataType_REFCHK(type)) {
 		PyErr_SetString(PyExc_ValueError,
 				"cannot create an OBJECT array from memory"\
 				" buffer");
@@ -7227,29 +7226,28 @@
 	s = PyString_FromString("3.0");
 	PyDict_SetItemString(d, "__version__", s);
 	Py_DECREF(s);
-	s = PyInt_FromLong(NPY_ALLOW_THREADS);
-	PyDict_SetItemString(d, "ALLOW_THREADS", s);
-	Py_DECREF(s);
 
-	s = PyInt_FromLong(NPY_BUFSIZE);
-	PyDict_SetItemString(d, "BUFSIZE", s);
-	Py_DECREF(s);
+#define ADDCONST(NAME) \
+        s = PyInt_FromLong(NPY_##NAME); \
+        PyDict_SetItemString(d, #NAME, s); \
+        Py_DECREF(s)
 
-	s = PyInt_FromLong(NPY_CLIP);
-	PyDict_SetItemString(d, "CLIP", s);
-	Py_DECREF(s);
 
-	s = PyInt_FromLong(NPY_RAISE);
-	PyDict_SetItemString(d, "RAISE", s);
-	Py_DECREF(s);
+        ADDCONST(ALLOW_THREADS);
+        ADDCONST(BUFSIZE);
+        ADDCONST(CLIP);
 
-	s = PyInt_FromLong(NPY_WRAP);
-	PyDict_SetItemString(d, "WRAP", s);
-	Py_DECREF(s);
+        ADDCONST(ITEM_HASOBJECT);
+        ADDCONST(LIST_PICKLE);
+        ADDCONST(ITEM_IS_POINTER);
+        ADDCONST(NEEDS_INIT);
+        ADDCONST(NEEDS_PYAPI);
+        ADDCONST(USE_GETITEM);
 
-	s = PyInt_FromLong(NPY_MAXDIMS);
-	PyDict_SetItemString(d, "MAXDIMS", s);
-	Py_DECREF(s);
+        ADDCONST(RAISE);
+        ADDCONST(WRAP);
+        ADDCONST(MAXDIMS);
+#undef ADDCONST
 
 	Py_INCREF(&PyArray_Type);
 	PyDict_SetItemString(d, "ndarray", (PyObject *)&PyArray_Type);



From numpy-svn at scipy.org  Sat Oct 28 05:26:40 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 28 Oct 2006 04:26:40 -0500 (CDT)
Subject: [Numpy-svn] r3412 - in trunk/numpy/core: include/numpy src
Message-ID: <20061028092640.79F3139C01A@new.scipy.org>

Author: oliphant
Date: 2006-10-28 04:26:36 -0500 (Sat, 28 Oct 2006)
New Revision: 3412

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
   trunk/numpy/core/src/scalartypes.inc.src
Log:
One more fix for allowing use of setitem in PyArray_FromScalar instead of memcpy

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-28 09:18:00 UTC (rev 3411)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2006-10-28 09:26:36 UTC (rev 3412)
@@ -1126,6 +1126,9 @@
 #define NPY_USE_GETITEM     0x20  /* Use f.getitem when extracting elements 
                                      of this data-type */
 
+#define NPY_USE_SETITEM     0x40  /* Use f.setitem when setting creating
+                                     0-d array from this data-type.
+                                  */
 
 /* These are inherited for global data-type if any data-types in the field 
    have them */

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-28 09:18:00 UTC (rev 3411)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-28 09:26:36 UTC (rev 3412)
@@ -250,7 +250,14 @@
                                  NULL, NULL, 0, NULL);
         if (r==NULL) {Py_XDECREF(outcode); return NULL;}
 
-
+        if (PyDataType_FLAGCHK(typecode, NPY_USE_SETITEM)) {
+                if (typecode->f->setitem(scalar, PyArray_DATA(r), r) < 0) {
+                        Py_XDECREF(outcode); Py_DECREF(r);
+                        return NULL;
+                }
+                goto finish;
+        }
+        
         memptr = scalar_value(scalar, typecode);
         
 #ifndef Py_UNICODE_WIDE
@@ -268,6 +275,7 @@
                 }
         }
 
+ finish:
         if (outcode == NULL) return r;
 
         if (outcode->type_num == typecode->type_num) {



From numpy-svn at scipy.org  Sat Oct 28 05:27:52 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 28 Oct 2006 04:27:52 -0500 (CDT)
Subject: [Numpy-svn] r3413 - trunk/numpy/core/src
Message-ID: <20061028092752.3B81039C01A@new.scipy.org>

Author: oliphant
Date: 2006-10-28 04:27:49 -0500 (Sat, 28 Oct 2006)
New Revision: 3413

Modified:
   trunk/numpy/core/src/scalartypes.inc.src
Log:
Use more general notion.

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2006-10-28 09:26:36 UTC (rev 3412)
+++ trunk/numpy/core/src/scalartypes.inc.src	2006-10-28 09:27:49 UTC (rev 3413)
@@ -270,7 +270,7 @@
 #endif
         {
                 memcpy(PyArray_DATA(r), memptr, PyArray_ITEMSIZE(r));
-                if (PyArray_ISOBJECT(r)) {
+                if (PyDataType_FLAGCHK(typecode, NPY_ITEM_HASOBJECT)) {
                         Py_INCREF(*((PyObject **)memptr));
                 }
         }



From numpy-svn at scipy.org  Sat Oct 28 14:46:28 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sat, 28 Oct 2006 13:46:28 -0500 (CDT)
Subject: [Numpy-svn] r3414 - trunk/numpy/core
Message-ID: <20061028184628.9DDAA39C066@new.scipy.org>

Author: oliphant
Date: 2006-10-28 13:46:24 -0500 (Sat, 28 Oct 2006)
New Revision: 3414

Modified:
   trunk/numpy/core/numeric.py
Log:
Fix usage of 'as' as a variable

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-28 09:27:49 UTC (rev 3413)
+++ trunk/numpy/core/numeric.py	2006-10-28 18:46:24 UTC (rev 3414)
@@ -290,7 +290,7 @@
         nb = 1
 
     a, b = asarray(a), asarray(b)
-    as = a.shape
+    as_ = a.shape
     nda = len(a.shape)
     bs = b.shape
     ndb = len(b.shape)
@@ -298,7 +298,7 @@
     if (na != nb): equal = 0
     else:
         for k in xrange(na):
-            if as[axes_a[k]] != bs[axes_b[k]]:
+            if as_[axes_a[k]] != bs[axes_b[k]]:
                 equal = 0
                 break
             if axes_a[k] < 0:
@@ -314,9 +314,9 @@
     newaxes_a = notin + axes_a
     N2 = 1
     for axis in axes_a:
-        N2 *= as[axis]
+        N2 *= as_[axis]
     newshape_a = (-1, N2)
-    olda = [as[axis] for axis in notin]
+    olda = [as_[axis] for axis in notin]
 
     notin = [k for k in range(ndb) if k not in axes_b]
     newaxes_b = axes_b + notin



From numpy-svn at scipy.org  Sun Oct 29 01:39:42 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun, 29 Oct 2006 01:39:42 -0500 (CDT)
Subject: [Numpy-svn] r3415 - trunk/numpy/core
Message-ID: <20061029063942.8506F39C08F@new.scipy.org>

Author: oliphant
Date: 2006-10-29 01:39:30 -0500 (Sun, 29 Oct 2006)
New Revision: 3415

Modified:
   trunk/numpy/core/records.py
Log:
Fix the inability of record arrays to be able to set field data by setting the attribute of that field name to some value. 


Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-28 18:46:24 UTC (rev 3414)
+++ trunk/numpy/core/records.py	2006-10-29 06:39:30 UTC (rev 3415)
@@ -201,12 +201,23 @@
             return obj.view(chararray)
         return obj.view(sb.ndarray)
 
+# Save the dictionary
+#  If the attr is a field name and not in the saved dictionary
+#  Undo any "setting" of the attribute and do a setfield
+# Thus, you can't create attributes on-the-fly that are field names. 
+
     def __setattr__(self, attr, val):
+        newattr = attr not in self.__dict__
         try:
-            return object.__setattr__(self, attr, val)
-        except AttributeError: # Must be a fieldname
-            pass
-        fielddict = sb.ndarray.__getattribute__(self,'dtype').fields
+            res = object.__setattr__(self, attr, val)
+        except AttributeError:
+            fielddict = sb.ndarray.__getattribute__(self,'dtype').fields
+        else:
+            fielddict = sb.ndarray.__getattribute__(self,'dtype').fields
+            if attr not in fielddict:
+                return res
+            if newattr:         # We just added this one
+                object.__delattr__(self, attr)
         try:
             res = fielddict[attr][:2]
         except (TypeError,KeyError):



From numpy-svn at scipy.org  Sun Oct 29 02:38:29 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Sun, 29 Oct 2006 01:38:29 -0600 (CST)
Subject: [Numpy-svn] r3416 - in trunk/numpy/core: . tests
Message-ID: <20061029073829.CFF0839C08F@new.scipy.org>

Author: oliphant
Date: 2006-10-29 01:38:25 -0600 (Sun, 29 Oct 2006)
New Revision: 3416

Modified:
   trunk/numpy/core/records.py
   trunk/numpy/core/tests/test_records.py
Log:
Add test for recent fixes to recarray setattr.  Replace sb.ndarray with global variable ndarray

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-29 06:39:30 UTC (rev 3415)
+++ trunk/numpy/core/records.py	2006-10-29 07:38:25 UTC (rev 3416)
@@ -7,6 +7,8 @@
 import types
 import os
 
+ndarray = sb.ndarray
+
 _byteorderconv = {'b':'>',
                   'l':'<',
                   'n':'=',
@@ -164,7 +166,7 @@
 # If byteorder is given it forces a particular byteorder on all
 #  the fields (and any subfields)
 
-class recarray(sb.ndarray):
+class recarray(ndarray):
     def __new__(subtype, shape, dtype=None, buf=None, offset=0, strides=None,
                 formats=None, names=None, titles=None,
                 byteorder=None, aligned=False):
@@ -175,9 +177,9 @@
             descr = format_parser(formats, names, titles, aligned, byteorder)._descr
 
         if buf is None:
-            self = sb.ndarray.__new__(subtype, shape, (record, descr))
+            self = ndarray.__new__(subtype, shape, (record, descr))
         else:
-            self = sb.ndarray.__new__(subtype, shape, (record, descr),
+            self = ndarray.__new__(subtype, shape, (record, descr),
                                       buffer=buf, offset=offset,
                                       strides=strides)
         return self
@@ -187,7 +189,7 @@
             return object.__getattribute__(self,attr)
         except AttributeError: # attr must be a fieldname
             pass
-        fielddict = sb.ndarray.__getattribute__(self,'dtype').fields
+        fielddict = ndarray.__getattribute__(self,'dtype').fields
         try:
             res = fielddict[attr][:2]
         except (TypeError, KeyError):
@@ -199,7 +201,7 @@
             return obj
         if obj.dtype.char in 'SU':
             return obj.view(chararray)
-        return obj.view(sb.ndarray)
+        return obj.view(ndarray)
 
 # Save the dictionary
 #  If the attr is a field name and not in the saved dictionary
@@ -209,15 +211,22 @@
     def __setattr__(self, attr, val):
         newattr = attr not in self.__dict__
         try:
-            res = object.__setattr__(self, attr, val)
-        except AttributeError:
-            fielddict = sb.ndarray.__getattribute__(self,'dtype').fields
+            ret = object.__setattr__(self, attr, val)
+        except:
+            fielddict = ndarray.__getattribute__(self,'dtype').fields
+            if attr not in fielddict:
+                exctype, value = sys.exc_info()[:2]
+                raise exctype, value
         else:
-            fielddict = sb.ndarray.__getattribute__(self,'dtype').fields
+            fielddict = ndarray.__getattribute__(self,'dtype').fields
             if attr not in fielddict:
-                return res
+                return ret
             if newattr:         # We just added this one
-                object.__delattr__(self, attr)
+                try:            #  or this setattr worked on an internal
+                                #  attribute. 
+                    object.__delattr__(self, attr)
+                except:
+                    return ret
         try:
             res = fielddict[attr][:2]
         except (TypeError,KeyError):
@@ -225,17 +234,17 @@
         return self.setfield(val,*res)
 
     def __getitem__(self, indx):
-        obj = sb.ndarray.__getitem__(self, indx)
-        if (isinstance(obj, sb.ndarray) and obj.dtype.isbuiltin):
-            return obj.view(sb.ndarray)
+        obj = ndarray.__getitem__(self, indx)
+        if (isinstance(obj, ndarray) and obj.dtype.isbuiltin):
+            return obj.view(ndarray)
         return obj
 
     def field(self,attr, val=None):
         if isinstance(attr,int):
-            names = sb.ndarray.__getattribute__(self,'dtype').names
+            names = ndarray.__getattribute__(self,'dtype').names
             attr=names[attr]
 
-        fielddict = sb.ndarray.__getattribute__(self,'dtype').fields
+        fielddict = ndarray.__getattribute__(self,'dtype').fields
 
         res = fielddict[attr][:2]
 
@@ -245,20 +254,20 @@
                 return obj
             if obj.dtype.char in 'SU':
                 return obj.view(chararray)
-            return obj.view(sb.ndarray)
+            return obj.view(ndarray)
         else:
             return self.setfield(val, *res)
 
     def view(self, obj):
         try:
-            if issubclass(obj, sb.ndarray):
-                return sb.ndarray.view(self, obj)
+            if issubclass(obj, ndarray):
+                return ndarray.view(self, obj)
         except TypeError:
             pass
         dtype = sb.dtype(obj)
         if dtype.fields is None:
             return self.__array__().view(dtype)
-        return sb.ndarray.view(self, obj)            
+        return ndarray.view(self, obj)            
     
 def fromarrays(arrayList, dtype=None, shape=None, formats=None,
                names=None, titles=None, aligned=False, byteorder=None):
@@ -288,7 +297,7 @@
         # and determine the formats.
         formats = ''
         for obj in arrayList:
-            if not isinstance(obj, sb.ndarray):
+            if not isinstance(obj, ndarray):
                 raise ValueError, "item in the array list must be an ndarray."
             formats += _typestr[obj.dtype.type]
             if issubclass(obj.dtype.type, nt.flexible):
@@ -536,7 +545,7 @@
     elif isinstance(obj, file):
         return fromfile(obj, dtype=dtype, shape=shape, offset=offset)
 
-    elif isinstance(obj, sb.ndarray):
+    elif isinstance(obj, ndarray):
         if dtype is not None and (obj.dtype != dtype):
             new = obj.view(dtype)
         else:

Modified: trunk/numpy/core/tests/test_records.py
===================================================================
--- trunk/numpy/core/tests/test_records.py	2006-10-29 06:39:30 UTC (rev 3415)
+++ trunk/numpy/core/tests/test_records.py	2006-10-29 07:38:25 UTC (rev 3416)
@@ -70,5 +70,20 @@
         for k in xrange(len(ra)):
             assert ra[k].item() == pa[k].item()
 
+    def check_recarray_conflict_fields(self):
+        ra = rec.array([(1,'abc',2.3),(2,'xyz',4.2),
+                        (3,'wrs',1.3)],
+                       names='field, shape, mean')
+        ra.mean = [1.1,2.2,3.3]
+        assert_array_almost_equal(ra['mean'], [1.1,2.2,3.3])
+        assert type(ra.mean) is type(ra.var)
+        ra.shape = (1,3)
+        assert ra.shape == (1,3)
+        ra.shape = ['A','B','C']
+        assert_array_equal(ra['shape'], [['A','B','C']])
+        ra.field = 5
+        assert_array_equal(ra['field'], [[5,5,5]])
+        assert callable(ra.field)
+
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Mon Oct 30 14:21:37 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 30 Oct 2006 13:21:37 -0600 (CST)
Subject: [Numpy-svn] r3417 - trunk/numpy/f2py/lib/parser
Message-ID: <20061030192137.52C2239C077@new.scipy.org>

Author: pearu
Date: 2006-10-30 13:21:25 -0600 (Mon, 30 Oct 2006)
New Revision: 3417

Added:
   trunk/numpy/f2py/lib/parser/test_statements2.py
Modified:
   trunk/numpy/f2py/lib/parser/Fortran2003.py
   trunk/numpy/f2py/lib/parser/api.py
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/pattern_tools.py
   trunk/numpy/f2py/lib/parser/readfortran.py
   trunk/numpy/f2py/lib/parser/splitline.py
   trunk/numpy/f2py/lib/parser/statements2.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
Log:
F2PY: Cont. unifying Fortran stmt and expr parsers.

Modified: trunk/numpy/f2py/lib/parser/Fortran2003.py
===================================================================
--- trunk/numpy/f2py/lib/parser/Fortran2003.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/Fortran2003.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -9,9 +9,11 @@
         Base_classes[cls.__name__] = cls
 
 
-if 0: # Optimize subclass tree:
+if 1: # Optimize subclass tree:
 
     def _rpl_list(clsname):
+        if not Base_classes.has_key(clsname):
+            return [] # remove this code when all classes are implemented
         cls = Base_classes[clsname]
         if cls.__dict__.has_key('match'): return [clsname]
         l = []
@@ -29,11 +31,12 @@
             for n1 in _rpl_list(n):
                 if n1 not in opt_subclass_names:  opt_subclass_names.append(n1)
         if not opt_subclass_names==cls.subclass_names:
-            #print cls.__name__,':',', '.join(cls.subclass_names),'->',', '.join(opt_subclass_names)
+            print cls.__name__,':',', '.join(cls.subclass_names),'->',', '.join(opt_subclass_names)
             cls.subclass_names[:] = opt_subclass_names
         #else:
         #    print cls.__name__,':',opt_subclass_names
 
+
 # Initialize Base.subclasses dictionary:
 for clsname, cls in Base_classes.items():
     subclass_names = getattr(cls, 'subclass_names', None)
@@ -50,19 +53,21 @@
         else:
             print '%s not implemented needed by %s' % (n,clsname)
 
-if 1:
+if 0:
     for cls in Base_classes.values():
         subclasses = Base.subclasses.get(cls.__name__,[])
         subclasses_names = [c.__name__ for c in subclasses]
         subclass_names = getattr(cls,'subclass_names', [])
         use_names = getattr(cls,'use_names',[])
         for n in subclasses_names:
+            break
             if n not in subclass_names:
                 print '%s needs to be added to %s subclasses_name list' % (n,cls.__name__)
         for n in subclass_names:
+            break
             if n not in subclasses_names:
                 print '%s needs to be added to %s subclass_name list' % (n,cls.__name__)
-        for n in use_names:
+        for n in use_names:            
             if not Base_classes.has_key(n):
                 print '%s not defined used by %s' % (n, cls.__name__)
 #import pprint

Modified: trunk/numpy/f2py/lib/parser/api.py
===================================================================
--- trunk/numpy/f2py/lib/parser/api.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/api.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -18,17 +18,7 @@
 # CHAR_BIT is used to convert object bit sizes to byte sizes
 from utils import CHAR_BIT
 
-def parse(input, isfree=None, isstrict=None, include_dirs = None):
-    """ Parse input and return Statement tree.
-
-    input            --- string or filename.
-    isfree, isstrict --- specify input Fortran format.
-                         Defaults are True, False, respectively, or
-                         determined from input.
-    include_dirs     --- list of include directories.
-                         Default contains current working directory
-                         and the directory of file name.
-    """
+def get_reader(input, isfree=None, isstrict=None, include_dirs = None):
     import os
     import re
     from readfortran import FortranFileReader, FortranStringReader
@@ -61,9 +51,21 @@
                                      include_dirs = include_dirs)
     else:
         raise TypeError,'Expected string or filename input but got %s' % (type(input))
+    return reader
+
+def parse(input, isfree=None, isstrict=None, include_dirs = None):
+    """ Parse input and return Statement tree.
+
+    input            --- string or filename.
+    isfree, isstrict --- specify input Fortran format.
+                         Defaults are True, False, respectively, or
+                         determined from input.
+    include_dirs     --- list of include directories.
+                         Default contains current working directory
+                         and the directory of file name.
+    """
+    reader = get_reader(input, isfree, isstrict, include_dirs)
     parser = FortranParser(reader)
     parser.parse()
     parser.analyze()
     return parser.block
-
-    

Modified: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -15,6 +15,7 @@
 import re
 from splitline import string_replace_map
 import pattern_tools as pattern
+from readfortran import FortranReaderBase
 
 ############################# Base classes ################################
 
@@ -22,11 +23,23 @@
     pass
 
 class Base(object):
-
+    """
+    """
     subclasses = {}
 
     def __new__(cls, string):
         #print '__new__:',cls.__name__,`string`
+        if isinstance(string, FortranReaderBase) and not issubclass(cls, BlockBase):
+            reader = string
+            item = reader.get_item()
+            try:
+                obj = cls(item.line)
+            except NoMatchError:
+                obj = None
+            if obj is None:
+                reader.put_item(item)
+                return
+            return obj
         match = cls.__dict__.get('match', None)
         if match is not None:
             result = cls.match(string)
@@ -53,6 +66,11 @@
         raise NoMatchError,'%s: %r' % (cls.__name__, string)
 
     findall = staticmethod(re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall)
+    def apply_map(line, repmap):
+        for k in Base.findall(line):
+            line = line.replace(k, repmap[k])
+        return line
+    apply_map = staticmethod(apply_map)
     
     def init_list(self, *items):
         self.items = items
@@ -76,21 +94,42 @@
             return self.torepr()
         return '%s(%r)' % (self.__class__.__name__, self.string)
 
+class BlockBase(Base):
+    """
+    <block-base> = <subcls>
+                     [ <subcls> ]...
+                     [ <endcls> ]
+    """
+    def match(reader, subcls, endcls):
+        content = []
+        return content,
+        
+    def init(self, content):
+        self.content = content
+        return
+    def tostr(self):
+        return '\n'.join(map(str, self.content))
+    def torepr(self):
+        return '\n'.join(map(repr, self.content))
+    def get_content(reader, content_class, end_class):
+        #for content_class.sub
+        pass
+    
 class SequenceBase(Base):
     """
     <sequence-base> = <obj>, <obj> [ , <obj> ]...
     """
     def match(separator, subcls, string):
         line, repmap = string_replace_map(string)
-        if separator not in line:
-            return
+        if isinstance(separator, str):
+            splitted = line.split(separator)
+        else:
+            splitted = separator[1].split(line)
+            separator = separator[0]
+        if len(splitted)<=1: return
         lst = []
-        for p in line.split(separator):
-            p = p.strip()
-            for k in Base.findall(p):
-                p = p.replace(k,repmap[k])
-            lst.append(subcls(p))
-        #if len(lst)==1: return lst[0]
+        for p in splitted:
+            lst.append(subcls(repmap(p.strip())))
         return separator, tuple(lst)
     match = staticmethod(match)
     def init(self, separator, items):
@@ -100,6 +139,7 @@
     def tostr(self):
         s = self.separator
         if s==',': s = s + ' '
+        elif s==' ': pass
         else: s = ' ' + s + ' '
         return s.join(map(str, self.items))
     def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.separator, self.items)
@@ -160,6 +200,16 @@
     def torepr(self):
         return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
 
+class SeparatorBase(BinaryOpBase):
+    """
+    <shape-base> = <lhs> : <rhs>
+    """
+    def init(self, lhs, rhs):
+        self.lhs = lhs
+        self.op = ':'
+        self.rhs = rhs
+        return
+
 class KeywordValueBase(BinaryOpBase):
     """
     <keyword-value-base> = <keyword> = <rhs>
@@ -257,7 +307,43 @@
     def tostr(self): return str(self.string)
     def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.string)
 
+class STRINGBase(StringBase):
+    """
+    <STRING-base> = <XYZ>
+    """
+    match = staticmethod(StringBase.match)
+    def init(self, string):
+        self.string = string.upper()
+        return
 
+class EndStmtBase(Base):
+    """
+    <end-stmt-base> = END [ <stmt> [ <stmt-name>] ]
+    """
+    def match(stmt_type, stmt_name, string):
+        start = string[:3].upper()
+        if start != 'END': return
+        line = string[3:].lstrip()
+        start = line[:len(stmt_type)].upper()
+        if start:
+            if start != stmt_type: return
+            line = line[len(stmt_type):].lstrip()
+        else:
+            line = ''
+        if line:
+            return stmt_type, stmt_name(line)
+        return stmt_type, None
+    match = staticmethod(match)
+    def init(self, stmt_type, stmt_name):
+        self.type, self.name = stmt_type, stmt_name
+        return
+    def tostr(self):
+        if self.name is not None:
+            return 'END %s %s' % (self.type, self.name)
+        return 'END %s' % (self.type)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.type, self.name)
+
 ##################################################
 
 class Name(StringBase):
@@ -355,6 +441,7 @@
                               | [ <kind-param> _ ] \" <rep-char> \"
     """
     subclass_names = []
+    rep = pattern.char_literal_constant
     def match(string):
         if string[-1] not in '"\'': return
         if string[-1]=='"':
@@ -543,7 +630,8 @@
                 | <type-param-name>
                 | ( <expr> )
     """
-    subclass_names = ['Constant', 'Parenthesis', 'Designator','Array_Constructor','Structure_Constructor',
+    subclass_names = ['Constant', 'Parenthesis', 'Designator','Array_Constructor',
+                      'Structure_Constructor',
                       'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 
                        ]
 
@@ -756,7 +844,7 @@
     <ac-do-variable> = <scalar-int-variable>
     <ac-do-variable> shall be a named variable    
     """
-    subclass_names = ['Name']
+    subclass_names = ['Scalar_Int_Variable']
 
 class Type_Spec(Base):
     """
@@ -1045,12 +1133,18 @@
     """
     subclass_names = ['Scalar_Variable_Name', 'Array_Element', 'Scalar_Structure_Component', 'Scalar_Constant']
 
-class Scalar_Variable_Name(Base):
+class Variable_Name(Base):
     """
-    <scalar-variable-name> = <name>
+    <variable-name> = <name>
     """
     subclass_names = ['Name']
 
+class Scalar_Variable_Name(Base):
+    """
+    <scalar-variable-name> = <variable-name>
+    """
+    subclass_names = ['Variable_Name']
+
 class Scalar_Structure_Component(Base):
     """
     <scalar-structure-component> = <structure-component>

Modified: trunk/numpy/f2py/lib/parser/pattern_tools.py
===================================================================
--- trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/pattern_tools.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -70,6 +70,9 @@
     def match(self, string):
         return self.get_compiled().match(string)
 
+    def search(self, string):
+        return self.get_compiled().search(string)
+
     def rsplit(self, string):
         """
         Return (<lhs>, <pattern_match>, <rhs>) where
@@ -182,6 +185,11 @@
             label = '<%s>' % (label)
         return Pattern(label, self.pattern, optional=self.optional, flags=self._flags)
 
+    def __call__(self, string):
+        m = self.match(string)
+        if m is None: return
+        return m.group()
+
 # Predefined patterns
 
 letter = Pattern('<letter>','[A-Z]',flags=re.I)
@@ -245,6 +253,10 @@
 int_constant = int_literal_constant | boz_literal_constant | named_constant
 char_constant = char_literal_constant | named_constant
 
+# assume that replace_string_map is applied:
+part_ref = name + ~((r'[(]' + name + r'[)]'))
+data_ref = part_ref + ~~~(r'[%]' + part_ref)
+primary = constant | name | data_ref | (r'[(]' + name + r'[)]')
 
 power_op = Pattern('<power-op>','[*]{2}')
 mult_op = Pattern('<mult-op>','[*/]')
@@ -271,6 +283,9 @@
 keyword = name
 keyword_equal = keyword + '='
 
+
+
+
 abs_constant = abs(constant)
 abs_literal_constant = abs(literal_constant)
 abs_int_literal_constant = abs(int_literal_constant)
@@ -296,6 +311,23 @@
 intrinsic_type_name = Pattern('<intrinsic-type-name>',r'(INTEGER|REAL|COMPLEX|LOGICAL|CHARACTER|DOUBLE\s*COMPLEX|DOUBLE\s*PRECISION|BYTE)',flags=re.I)
 abs_intrinsic_type_name = abs(intrinsic_type_name)
 
+access_spec = Pattern('<access-spec>',r'PUBLIC|PRIVATE',flags=re.I)
+abs_access_spec = abs(access_spec)
+
+attr_spec = Pattern('<attr-spec>',r'ALLOCATABLE|ASYNCHRONOUS|EXTERNAL|INTENT|INTRINSIC|OPTIONAL|PARAMETER|POINTER|PROTECTED|SAVE|TARGET|VALUE|VOLATILE',flags=re.I)
+abs_attr_spec = abs(attr_spec)
+
+dimension = Pattern('<dimension>',r'DIMENSION', flags=re.I)
+abs_dimension = abs(dimension)
+
+intent = Pattern('<intent>', r'INTENT', flags=re.I)
+abs_intent = abs(intent)
+
+intent_spec = Pattern('<intent-spec>', r'INOUT|IN|OUT', flags=re.I)
+abs_intent_spec = abs(intent_spec)
+
+subroutine = Pattern('<subroutine>', r'SUBROUTINE', flags=re.I)
+
 def _test():
     assert name.match('a1_a')
     assert abs(name).match('a1_a')

Modified: trunk/numpy/f2py/lib/parser/readfortran.py
===================================================================
--- trunk/numpy/f2py/lib/parser/readfortran.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/readfortran.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -260,6 +260,17 @@
         self.put_single_line(line)
         return line
 
+    # Parser methods:
+    def get_item(self):
+        try:
+            return self.next(ignore_comments = True)
+        except StopIteration:
+            pass
+        return
+
+    def put_item(self):
+        self.fifo_item.insert(0, item)
+        return
     # Iterator methods:
 
     def __iter__(self):

Modified: trunk/numpy/f2py/lib/parser/splitline.py
===================================================================
--- trunk/numpy/f2py/lib/parser/splitline.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/splitline.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -30,7 +30,18 @@
 _f2py_str_findall = re.compile(r"_F2PY_STRING_CONSTANT_\d+_").findall
 _is_name = re.compile(r'\w*\Z',re.I).match
 _is_simple_str = re.compile(r'\w*\Z',re.I).match
+_f2py_findall = re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall
 
+class string_replace_dict(dict):
+    """
+    Dictionary object that is callable for applying map returned
+    by string_replace_map() function.
+    """
+    def __call__(self, line):
+        for k in _f2py_findall(line):
+            line = line.replace(k, self[k])
+        return line
+
 def string_replace_map(line, lower=False,
                        _cache={'index':0,'pindex':0}):
     """
@@ -39,7 +50,7 @@
     Returns a new line and the replacement map.
     """
     items = []
-    string_map = {}
+    string_map = string_replace_dict()
     rev_string_map = {}
     for item in splitquote(line, lower=lower)[0]:
         if isinstance(item, String) and not _is_simple_str(item[1:-1]):

Modified: trunk/numpy/f2py/lib/parser/statements2.py
===================================================================
--- trunk/numpy/f2py/lib/parser/statements2.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/statements2.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -6,6 +6,7 @@
     <program> = <program-unit>
                   [ <program-unit> ] ...
     """
+    subclass_names = []
     use_names = ['Program_Unit']
 
 class Program_Unit(Base):
@@ -32,10 +33,11 @@
                                [ <internal-subprogram-part> ]
                             <end-function-stmt>
     """
+    subclass_names = []
     use_names = ['Function_Stmt', 'Specification_Part', 'Execution_Part',
                  'Internal_Subprogram_Part', 'End_Function_Stmt']
 
-class Subroutine_Subprogram(Base):
+class Subroutine_Subprogram(BlockBase):
     """
     <subroutine-subprogram> = <subroutine-stmt>
                                  [ <specification-part> ]
@@ -43,35 +45,97 @@
                                  [ <internal-subprogram-part> ]
                               <end-subroutine-stmt>
     """
+    subclass_names = []
     use_names = ['Subroutine_Stmt', 'Specification_Part', 'Execution_Part',
                  'Internal_Subprogram_Part', 'End_Subroutine_Stmt']
+    def match(reader):
+        item = get_item(reader)
+        line = item.line
+        content = []
+        try:
+            start_stmt = Subroutine_Stmt(line)
+        except NoMatchError:
+            start_stmt = None
+        if start_stmt is None:
+            put_item(reader, item)
+            return
+        content.append(start_stmt)
+        content.extend(get_content(reader, Specification_Part, End_Subroutine_Stmt))
+        if isinstance(content[-1], End_Subroutine_Stmt):
+            return content,
+        content.extend(get_content(reader, Execution_Part, End_Subroutine_Stmt))
+        if isinstance(content[-1], End_Subroutine_Stmt):
+            return content,
+        content.extend(get_content(reader, Internal_Subprogram_Part, End_Subroutine_Stmt))
+        assert isinstance(content[-1], End_Subroutine_Stmt),`content[-1]`
+        return content,            
+    match = staticmethod(match)
 
-class Subroutine_Stmt(Base):
+
+
+
+class Prefix(SequenceBase):
     """
-    <subroutine-stmt> = [ <prefix> ] SUBROUTINE <subroutine-name> [ ( [ <dummy-arg-list> ] ) [ <proc-language-binding-spec> ] ]
+    <prefix> = <prefix-spec> [ <prefix-spec> ]..
     """
-    use_names = ['Prefix', 'Subroutine_Name', 'Dummy_Arg_List', 'Proc_Language_Binding_Spec']
+    subclass_names = ['Prefix_Spec']
+    _separator = (' ',re.compile(r'\s+(?=[a-z_])',re.I))
+    def match(string): return SequenceBase.match(Prefix._separator, Prefix_Spec, string)
+    match = staticmethod(match)
 
-class End_Subroutine_Stmt(Base):
+class Prefix_Spec(StringBase):
     """
-    <end-subroutine-stmt> = END [ SUBROUTINE [ <subroutine-name> ] ]
+    <prefix-spec> = <declaration-type-spec>
+                    | RECURSIVE
+                    | PURE
+                    | ELEMENTAL
     """
-    use_names = ['Subroutine_Name']
+    subclass_names = ['Declaration_Type_Spec']
+    def match(string):
+        if len(string)==9:
+            upper = string.upper()
+            if upper in ['RECURSIVE', 'ELEMENTAL']: return upper,
+        elif len(string)==4:
+            upper = string.upper()
+            if upper=='PURE': return upper,
+        return None
+    match = staticmethod(match)
 
-class Specification_Part(Base):
+
+class Specification_Part(BlockBase):
     """
     <specification-part> = [ <use-stmt> ]...
                              [ <import-stmt> ]...
                              [ <implicit-part> ]
                              [ <declaration-construct> ]...
     """
+    subclass_names = []
     use_names = ['Use_Stmt', 'Import_Stmt', 'Implicit_Part', 'Declaration_Construct']
+    def match(reader):
+        content = []
+        for cls in [Declaration_Construct]:
+            item = reader.get_item()
+            while item is not None:
+                obj = None
+                line = item.line
+                try:
+                    obj = cls(line)
+                except NoMatchError:
+                    pass
+                if obj is None:
+                    reader.put_item(item)
+                    break
+                content.append(obj)
+                item = reader.get_item()
+        return content,
+    match = staticmethod(match)
 
 class Implicit_Part(Base):
     """
     <implicit-part> = [ <implicit-part-stmt> ]...
                         <implicit-stmt>
     """
+    subclass_names = []
     use_names = ['Implicit_Part_Stmt', 'Implicit_Stmt']
 
 class Implicit_Part_Stmt(Base):
@@ -107,6 +171,7 @@
 
     <execution-part> shall not contain <end-function-stmt>, <end-program-stmt>, <end-subroutine-stmt>
     """
+    subclass_names = []
     use_names = ['Executable_Construct', 'Execution_Part_Construct']
 
 class Execution_Part_Construct(Base):
@@ -124,6 +189,7 @@
                                    <internal-subprogram>
                                    [ <internal-subprogram> ]...
     """
+    subclass_names = []
     use_names = ['Contains_Stmt', 'Internal_Subprogram']
 
 class Internal_Subprogram(Base):
@@ -217,6 +283,12 @@
                       'Read_Stmt', 'Return_Stmt', 'Rewind_Stmt', 'Stop_Stmt', 'Wait_Stmt',
                       'Where_Stmt', 'Write_Stmt', 'Arithmetic_If_Stmt', 'Computed_Goto_Stmt']
 
+class Int_Constant(Base):
+    subclass_names = ['Constant']
+
+class Scalar_Int_Constant(Base):
+    subclass_names = ['Int_Constant']
+
 class Derived_Type_Def(Base):
     """
     <derived-type-def> = <derived-type-stmt>
@@ -226,6 +298,7 @@
                            [ <type-bound-procedure-part> ]
                            <end-type-stmt>
     """
+    subclass_names = []
     use_names = ['Derived_Type_Stmt', 'Type_Param_Def_Stmt', 'Private_Or_Sequence',
                  'Component_Part', 'Type_Bound_Procedure_Part', 'End_Type_Stmt']
 
@@ -233,6 +306,7 @@
     """
     <derived-type-stmt> = TYPE [ [ , <type-attr-spec-list> ] :: ] <type-name> [ ( <type-param-name-list> ) ]
     """
+    subclass_names = []
     use_names = ['Type_Attr_Spec_List', 'Type_Name', 'Type_Param_Name_List']
 
 class Type_Attr_Spec(Base):
@@ -256,12 +330,14 @@
     """
     <end-type-stmt> = END TYPE [ <type-name> ]
     """
+    subclass_names = []
     use_names = ['Type_Name']
     
 class Sequence_Stmt(Base):
     """
     <sequence-stmt> = SEQUENCE
     """
+    subclass_names = []
     def match(string):
         if len(string) != 8: return
         start = string.upper()
@@ -273,12 +349,14 @@
     """
     <type-param-def-stmt> = INTEGER [ <kind-selector> ] , <type-param-attr-spec> :: <type-param-decl-list>
     """
+    subclass_names = []
     use_names = ['Kind_Selector', 'Type_Param_Attr_Spec', 'Type_Param_Decl_List']
 
 class Type_Param_Decl(Base):
     """
     <type-param-decl> = <type-param-name> [ = <scalar-int-initialization-expr> ]
     """
+    subclass_names = []
     use_names = ['Type_Param_Name', 'Scalar_Int_Initialization_Expr']
 
 class Type_Param_Attr_Spec(Base):
@@ -286,11 +364,13 @@
     <type-param-attr-spec> = KIND
                              | LEN
     """
+    subclass_names = []
 
 class Component_Part(Base):
     """
     <component-part> = [ <component-def-stmt> ]...
     """
+    subclass_names = []
     use_names = ['Component_Def_Stmt']
 
 class Component_Def_Stmt(Base):
@@ -304,6 +384,7 @@
     """
     <data-component-def-stmt> = <declaration-type-spec> [ [ , <component-attr-spec-list> ] :: ] <component-decl-list>
     """
+    subclass_names = []
     use_names = ['Declaration_Type_Spec', 'Component_Attr_Spec_List', 'Component_Decl_List']
 
 class Component_Attr_Spec(Base):
@@ -320,6 +401,7 @@
     """
     <component-decl> = <component-name> [ ( <component-array-spec> ) ] [ * <char-length> ] [ <component-initialization> ]
     """
+    subclass_names = []
     use_names = ['Component_Name', 'Component_Array_Spec', 'Char_Length', 'Component_Initialization']
 
 class Component_Array_Spec(Base):
@@ -334,12 +416,14 @@
     <component-initialization> =  = <initialization-expr>
                                  | => <null-init>
     """
+    subclass_names = []
     use_names = ['Initialization-expr', 'Null_Init']
 
 class Proc_Component_Def_Stmt(Base):
     """
     <proc-component-def-stmt> = PROCEDURE ( [ <proc-interface> ] ) , <proc-component-attr-spec-list> :: <proc-decl-list>
     """
+    subclass_names = []
     use_names = ['Proc_Interface', 'Proc_Component_Attr_Spec_List', 'Proc_Decl_List']
 
 class Proc_Component_Attr_Spec(Base):
@@ -349,12 +433,14 @@
                                  | NOPASS
                                  | <access-spec>
     """
+    subclass_names = []
     use_names = ['Arg_Name', 'Access_Spec']
 
 class Private_Components_Stmt(Base):
     """
     <private-components-stmt> = PRIVATE
     """
+    subclass_names = []
 
 class Type_Bound_Procedure_Part(Base):
     """
@@ -363,12 +449,14 @@
                                       <proc-binding-stmt>
                                       [ <proc-binding-stmt> ]...
     """
+    subclass_names = []
     use_names = ['Contains_Stmt', 'Binding_Private_Stmt', 'Proc_Binding_Stmt']
 
 class Binding_Private_Stmt(Base):
     """
     <binding-private-stmt> = PRIVATE
     """
+    subclass_names = []
 
 class Proc_Binding_Stmt(Base):
     """
@@ -382,12 +470,14 @@
     """
     <specific-binding> = PROCEDURE [ ( <interface-name> ) ] [ [ , <binding-attr-list> ] :: ] <binding-name> [ => <procedure-name> ]
     """
+    subclass_names = []
     use_names = ['Interface_Name', 'Binding_Attr_List', 'Binding_Name', 'Procedure_Name']
 
 class Generic_Binding(Base):
     """
     <generic-binding> = GENERIC [ , <access-spec> ] :: <generic-spec> => <binding-name-list>
     """
+    subclass_names = []
     use_names = ['Access_Spec', 'Generic_Spec', 'Binding_Name_List']
 
 class Binding_Attr(Base):
@@ -397,12 +487,14 @@
                      | NON_OVERRIDABLE
                      | <access-spec>
     """
+    subclass_names = []
     use_names = ['Arg_Name', 'Access_Spec']
 
 class Final_Binding(Base):
     """
     <final-binding> = FINAL [ :: ] <final-subroutine-name-list>
     """
+    subclass_names = []
     use_names = ['Final_Subroutine_Name_List']
 
 #<derived-type-spec>
@@ -418,29 +510,34 @@
                      [ <enumerator-def-stmt> ]...
                      <end-enum-stmt>
     """
+    subclass_names = []
     use_names = ['Enum_Def_Stmt', 'Enumerator_Def_Stmt', 'End_Enum_Stmt']
 
 class Enum_Def_Stmt(Base):
     """
     <enum-def-stmt> = ENUM, BIND(C)
     """
+    subclass_names = []
 
 class Enumerator_Def_Stmt(Base):
     """
     <enumerator-def-stmt> = ENUMERATOR [ :: ] <enumerator-list>
     """
+    subclass_names = []
     use_names = ['Enumerator_List']
 
 class Enumerator(Base):
     """
     <enumerator> = <named-constant> [ = <scalar-int-initialization-expr> ]
     """
+    subclass_names = []
     use_names = ['Named_Constant', 'Scalar_Int_Initialization_Expr']
 
 class End_Enumerator_Stmt(Base):
     """
     <end-enumerator-stmt> = END ENUM
     """
+    subclass_names = []
 
 #<array-constructor>
 #<ac-spec>
@@ -453,8 +550,46 @@
     """
     <type-declaration-stmt> = <declaration-type-spec> [ [ , <attr-spec> ]... :: ] <entity-decl-list>
     """
-    use_names = ['Declaration_Type_Spec', 'Attr_Spec', 'Entity_Decl_List']
+    subclass_names = []
+    use_names = ['Declaration_Type_Spec', 'Attr_Spec_List', 'Entity_Decl_List']
 
+    def match(string):
+        line, repmap = string_replace_map(string)
+        i = line.find(',')
+        if i==-1:
+            i = line.find('::')
+        if i==-1:
+            m = re.search(r'\s[a-z_]',line,re.I)
+            if m is None: return
+            i = m.start()
+        type_spec = Declaration_Type_Spec(repmap(line[:i]))
+        if type_spec is None: return
+        line = line[i:].lstrip()
+        if line.startswith(','):
+            i = line.find('::')
+            if i==-1: return
+            attr_specs = Attr_Spec_List(repmap(line[1:i].strip()))
+            if attr_specs is None: return
+            line = line[i:]
+        else:
+            attr_specs = None
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        entity_decls = Entity_Decl_List(repmap(line))
+        if entity_decls is None: return
+        return type_spec, attr_specs, entity_decls
+    match = staticmethod(match)
+    def init(self, *args):
+        self.type_spec, self.attr_specs, self.entity_decls = args
+        return
+    def tostr(self):
+        if self.attr_specs is None:
+            return '%s :: %s' % (self.type_spec, self.entity_decls)
+        else:
+            return '%s, %s :: %s' % (self.type_spec, self.attr_specs, self.entity_decls)
+    def torepr(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.type_spec, self.attr_specs, self.entity_decls)
+
 class Declaration_Type_Spec(Base):
     """
     <declaration-type-spec> = <intrinsic-type-spec>
@@ -465,8 +600,54 @@
     subclass_names = ['Intrinsic_Type_Spec']
     use_names = ['Derived_Type_Spec']
 
-class Attr_Spec(Base):
+    def match(string):
+        if string[-1] != ')': return
+        start = string[:4].upper()
+        if start == 'TYPE':
+            line = string[4:].lstrip()
+            if not line.startswith('('): return
+            return 'TYPE',Derived_Type_Spec(line[1:-1].strip())
+        start = string[:5].upper()
+        if start == 'CLASS':
+            line = string[5:].lstrip()
+            if not line.startswith('('): return
+            line = line[1:-1].strip()
+            if line=='*': return 'CLASS','*'
+            return 'CLASS', Derived_Type_Spec(line)
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return '%s(%s)' % tuple(map(str,self.items))
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Dimension_Attr_Spec(CallBase):
     """
+    <dimension-attr-spec> = DIMENSION ( <array-spec> )
+    """
+    subclass_names = []
+    use_names = ['Array_Spec']
+    def match(string): return CallBase.match(pattern.abs_dimension, Array_Spec, string)
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs = lhs.upper()
+        self.rhs = rhs
+        return
+
+class Intent_Attr_Spec(CallBase):
+    """
+    <intent-attr-spec> = INTENT ( <intent-spec> )
+    """
+    subclass_names = []
+    use_names = ['Intent_Spec']
+    def match(string): return CallBase.match(pattern.abs_intent, Intent_Spec, string)
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs = lhs.upper()
+        self.rhs = rhs
+        return
+
+class Attr_Spec(STRINGBase):
+    """
     <attr-spec> = <access-spec>
                   | ALLOCATABLE
                   | ASYNCHRONOUS
@@ -484,16 +665,66 @@
                   | VALUE
                   | VOLATILE
     """
-    subclass_names = ['Access_Spec', 'Language_Binding_Spec']
-    use_names = ['Array_Spec', 'Intent_Spec']
+    subclass_names = ['Access_Spec', 'Language_Binding_Spec',
+                      'Dimension_Attr_Spec', 'Intent_Attr_Spec']
+    use_names = []
+    def match(string): return STRINGBase.match(pattern.abs_attr_spec, string)
+    match = staticmethod(match)
 
 class Entity_Decl(Base):
     """
     <entity-decl> = <object-name> [ ( <array-spec> ) ] [ * <char-length> ] [ <initialization> ]
                     | <function-name> [ * <char-length> ]
     """
+    subclass_names = []
     use_names = ['Object_Name', 'Array_Spec', 'Char_Length', 'Initialization', 'Function_Name']
-
+    def match(string):
+        m = pattern.name.match(string)
+        if m is None: return
+        name = Name(m.group())
+        newline = string[m.end():].lstrip()
+        if not newline: return name, None, None, None
+        array_spec = None
+        char_length = None
+        init = None
+        if newline.startswith('('):
+            line, repmap = string_replace_map(newline)
+            i = line.find(')')
+            if i==-1: return
+            array_spec = Array_Spec(repmap(line[1:i].strip()))
+            newline = repmap(line[i+1:].lstrip())
+        if newline.startswith('*'):
+            line, repmap = string_replace_map(newline)
+            i = line.find('=')
+            if i!=-1:
+                char_length = repmap(line[1:i].strip())
+                newline = repmap(newline[i:].lstrip())
+            else:
+                char_length = repmap(newline[1:].strip())
+                newline = ''
+            char_length = Char_Length(char_length)
+        if newline.startswith('='):
+            init = Initialization(newline)
+        else:
+            assert newline=='',`newline`
+        return name, array_spec, char_length, init
+    match = staticmethod(match)
+    def init(self, *args):
+        self.name, self.array_spec, self.char_length, self.init = args
+        return
+    def tostr(self):
+        s = str(self.name)
+        if self.array_spec is not None:
+            s += '(' + str(self.array_spec) + ')'
+        if self.char_length is not None:
+            s += '*' + str(self.char_length)
+        if self.init is not None:
+            s += ' ' + str(self.init)
+        return s
+    def torepr(self):
+        return '%s(%r, %r, %r, %r)' \
+               % (self.__class__.__name__, self.name, self.array_spec, self.char_length, self.init)
+    
 class Object_Name(Base):
     """
     <object-name> = <name>
@@ -505,7 +736,21 @@
     <initialization> =  = <initialization-expr>
                        | => <null-init> 
     """
+    subclass_names = []
     use_names = ['Initialization_Expr', 'Null_Init']
+    def match(string):
+        if string.startswith('=>'):
+            return '=>', Null_Init(string[2:].lstrip())
+        if string.startswith('='):
+            return '=', Initialization_Expr(string[2:].lstrip())
+        return
+    match = staticmethod(match)
+    def init(self, op, rhs):
+        self.op = op
+        self.rhs = rhs
+        return
+    def tostr(self): return '%s %s' % (self.op, self.rhs)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.op, self.rhs)
 
 class Null_Init(Base):
     """
@@ -515,17 +760,47 @@
     """
     subclass_names = ['Function_Reference']
 
-class Access_Spec(Base):
+class Access_Spec(STRINGBase):
     """
     <access-spec> = PUBLIC
                     | PRIVATE
     """
+    subclass_names = []
+    def match(string): return STRINGBase.match(pattern.abs_access_spec, string)
+    match = staticmethod(match)
 
 class Language_Binding_Spec(Base):
     """
     <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
     """
+    subclass_names = []
     use_names = ['Scalar_Char_Initialization_Expr']
+    def match(string):
+        start = string[:4].upper()
+        if start != 'BIND': return
+        line = string[4:].lstrip()
+        if not line or line[0]+line[-1]!='()': return
+        line = line[1:-1].strip()
+        if not line: return
+        start = line[0].upper()
+        if start!='C': return
+        line = line[1:].lstrip()
+        if not line: return None,
+        if not line.startswith(','): return
+        line = line[1:].lstrip()
+        start = line[:4].upper()
+        if start!='NAME': return
+        line=line[4:].lstrip()
+        if not line.startswith('='): return
+        return Scalar_Char_Initialization_Expr(line[1:].lstrip()),
+    match = staticmethod(match)
+    def init(self, name):
+        self.name = name
+    def tostr(self):
+        if self.name is None: return 'BIND(C)'
+        return 'BIND(C, NAME = %s)' % (self.name)
+    def torepr(self):
+        return '%s(%r)' % (self.__class__.__name__, self.name)
 
 class Array_Spec(Base):
     """
@@ -537,13 +812,23 @@
     subclass_names = ['Explicit_Shape_Spec_List', 'Assumed_Shape_Spec_List',
                       'Deferred_Shape_Spec_List', 'Assumed_Size_Spec']
 
-class Explicit_Shape_Spec(Base):
+class Explicit_Shape_Spec(SeparatorBase):
     """
     <explicit-shape-spec> = [ <lower-bound> : ] <upper-bound>
     """
-    use_names = ['Lower_Bound', 'Upper_Bound']
-
-
+    subclass_names = ['Upper_Bound']
+    use_names = ['Lower_Bound']
+    def match(string):
+        line, repmap = string_replace_map(string)
+        if ':' not in line: return
+        lower,upper = line.split(':',1)
+        for k in Base.findall(lower):
+            lower = lower.replace(k, repmap[k])
+        for k in Base.findall(upper):
+            upper = upper.replace(k, repmap[k])
+        return Lower_Bound(lower), Upper_Bound(upper)
+    match = staticmethod(match)
+    
 class Lower_Bound(Base):
     """
     <lower-bound> = <specification-expr>
@@ -560,30 +845,37 @@
     """
     <assumed-shape-spec> = [ <lower-bound> ] :
     """
+    subclass_names = []
     use_names = ['Lower_Bound']
 
 class Deferred_Shape_Spec(Base):
     """
     <deferred_shape_spec> = :
     """
+    subclass_names = []
 
 class Assumed_Size_Spec(Base):
     """
     <assumed-size-spec> = [ <explicit-shape-spec-list> , ] [ <lower-bound> : ] *
     """
+    subclass_names = []
     use_names = ['Explicit_Shape_Spec_List', 'Lower_Bound']
 
-class Intent_Spec(Base):
+class Intent_Spec(STRINGBase):
     """
     <intent-spec> = IN
                     | OUT
                     | INOUT
     """
+    subclass_names = []
+    def match(string): return STRINGBase.match(pattern.abs_intent_spec, string)
+    match = staticmethod(match)
 
 class Access_Stmt(Base):
     """
     <access-stmt> = <access-spec> [ [ :: ] <access-id-list> ]
     """
+    subclass_names = []
     use_names = ['Access_Spec', 'Access_Id_List']
 
 class Access_Id(Base):
@@ -597,4 +889,645 @@
     """
     <allocateble-stmt> = ALLOCATABLE [ :: ] <object-name> [ ( <deferred-shape-spec-list> ) ] [ , <object-name> [ ( <deferred-shape-spec-list> ) ] ]...
     """
+    subclass_names = []
     use_names = ['Object_Name', 'Deferred_Shape_Spec_List']
+
+class Asynchronous_Stmt(Base):
+    """
+    <asynchronous-stmt> = ASYNCHRONOUS [ :: ] <object-name-list>
+    """
+    subclass_names = []
+    use_names = ['Object_Name_List']
+
+class Bind_Stmt(Base):
+    """
+    <bind-stmt> = <language-binding-spec> [ :: ] <bind-entity-list>
+    """
+    use_names = ['Language_Binding_Spec', 'Bind_Entity_List']
+
+class Bind_Entity(Base):
+    """
+    <bind-entity> = <entity-name>
+                    | / <common-block-name> /
+    """
+    subclass_names = ['Entity_Name']
+    use_names = ['Common_Block_Name']
+
+class Data_Stmt(Base):
+    """
+    <data-stmt> = DATA <data-stmt-set> [ [ , ] <data-stmt-set> ]...
+    """
+    subclass_names = []
+    use_names = ['Data_Stmt_Set']
+
+class Data_Stmt_Set(Base):
+    """
+    <data-stmt-set> = <data-stmt-object-list> / <data-stmt-value-list> /
+    """
+    use_names = ['Data_Stmt_Object_List', 'Data_Stmt_Value_List']
+
+class Data_Stmt_Object(Base):
+    """
+    <data-stmt-object> = <variable>
+                         | <data-implied-do>
+    """
+    subclass_names = ['Variable', 'Data_Implied_Do']
+
+class Data_Implied_Do(Base):
+    """
+    <data-implied-do> = ( <data-i-do-object-list> , <data-i-do-variable> = <scalar-int-expr > , <scalar-int-expr> [ , <scalar-int-expr> ] )
+    """
+    subclass_names = []
+    use_names = ['Data_I_Do_Object_List', 'Data_I_Do_Variable', 'Scalar_Int_Expr']
+
+class Data_I_Do_Object(Base):
+    """
+    <data-i-do-object> = <array-element>
+                         | <scalar-structure-component>
+                         | <data-implied-do>
+    """
+    subclass_names = ['Array_Element', 'Scalar_Structure_Component', 'Data_Implied_Do']
+
+class Data_I_Do_Variable(Base):
+    """
+    <data-i-do-variable> = <scalar-int-variable>
+    """
+    subclass_names = ['Scalar_Int_Variable']
+
+class Data_Stmt_Value(Base):
+    """
+    <data-stmt-value> = [ <data-stmt-repeat> * ] <data-stmt-constant>
+    """
+    subclass_names = []
+    use_names = ['Data_Stmt_Repeat', 'Data_Stmt_Constant']
+
+class Data_Stmt_Repeat(Base):
+    """
+    <data-stmt-repeat> = <scalar-int-constant>
+                         | <scalar-int-constant-subobject>
+    """
+    subclass_names = ['Scalar_Int_Constant', 'Scalar_Int_Constant_Subobject']
+
+class Data_Stmt_Constant(Base):
+    """
+    <data-stmt-constant> = <scalar-constant>
+                           | <scalar-constant-subobject>
+                           | <signed-int-literal-constant>
+                           | <signed-real-literal-constant>
+                           | <null-init>
+                           | <structure-constructor>
+    """
+    subclass_names = ['Scalar_Constant', 'Scalar_Constant_Subobject',
+                      'Signed_Int_Literal_Constant', 'Signed_Real_Literal_Constant',
+                      'Null_Init', 'Structure_Constructor']
+
+class Int_Constant_Subobject(Base):
+    """
+    <int-constant-subobject> = <constant-subobject>
+    """
+    subclass_names = ['Constant_Subobject']
+
+class Scalar_Int_Constant_Subobject(Base):
+    subclass_names = ['Int_Constant_Subobject']
+
+class Scalar_Constant_Subobject(Base):
+    subclass_names = ['Constant_Subobject']
+
+class Constant_Subobject(Base):
+    """
+    <constant-subobject> = <designator>
+    """
+    subclass_names = ['Designator']
+
+class Dimension_Stmt(Base):
+    """
+    <dimension-stmt> = DIMENSION [ :: ] <array-name> ( <array-spec> ) [ , <array-name> ( <array-spec> ) ]...
+    """
+    subclass_names = []
+    use_names = ['Array_Name', 'Array_Spec']
+
+class Intent_Stmt(Base):
+    """
+    <intent-stmt> = INTENT ( <intent-spec> ) [ :: ] <dummy-arg-name-list>
+    """
+    subclass_names = []
+    use_names = ['Intent_Spec', 'Dummy_Arg_Name_List']
+
+class Optional_Stmt(Base):
+    """
+    <optional-stmt> = OPTIONAL [ :: ] <dummy-arg-name-list>
+    """
+    subclass_names = []
+    use_names = ['Dummy_Arg_Name_List']
+
+class Parameter_Stmt(Base):
+    """
+    <parameter-stmt> = PARAMETER ( <named-constant-def-list> )
+    """
+    subclass_names = []
+    use_names = ['Named_Constant_Def_List']
+
+class Named_Constant_Def(Base):
+    """
+    <named-constant-def> = <named-constant> = <initialization-expr>
+    """
+    subclass_names = []
+    use_names = ['Named_Constant', 'Initialization_Expr']
+
+class Pointer_Stmt(Base):
+    """
+    <pointer-stmt> = POINTER [ :: ] <pointer-decl-list>
+    """
+    subclass_names = []
+    use_names = ['Pointer_Decl_List']
+
+class Pointer_Decl(Base):
+    """
+    <pointer-decl> = <object-name> [ ( <deferred-shape-spec-list> ) ]
+                     | <proc-entity-name>
+    """
+    use_names = ['Object_Name', 'Deferred_Shape_Spec_List']
+    subclass_names = ['Proc_Entity_Name']
+
+class Protected_Stmt(Base):
+    """
+    <protected-stmt> = PROTECTED [ :: ] <entity-name-list>
+    """
+    subclass_names = []
+    use_names = ['Entity_Name_List']
+
+class Save_Stmt(Base):
+    """
+    <save-stmt> = SAVE [ [ :: ] <saved-entity-list> ]
+    """
+    subclass_names = []
+    use_names = ['Saved_Entity_List']
+
+class Saved_Entity(Base):
+    """
+    <saved-entity> = <object-name>
+                     | <proc-pointer-name>
+                     | / <common-block-name> /
+    """
+    subclass_names = ['Object_Name', 'Proc_Pointer_Name']
+    use_names = ['Common_Block_Name']
+
+class Proc_Pointer_Name(Base):
+    """
+    <proc-pointer-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Target_Stmt(Base):
+    """
+    <target-stmt> = TARGET [ :: ] <object-name> [ ( <array-spec> ) ] [ , <object-name> [ ( <array-spec> ) ]]
+    """
+    subclass_names = []
+    use_names = ['Object_Name', 'Array_Spec']
+
+class Value_Stmt(Base):
+    """
+    <value-stmt> = VALUE [ :: ] <dummy-arg-name-list>
+    """
+    subclass_names = []
+    use_names = ['Dummy_Arg_Name_List']
+
+class Volatile_Stmt(Base):
+    """
+    <volatile-stmt> = VOLATILE [ :: ] <object-name-list>
+    """
+    subclass_names = []
+    use_names = ['Object_Name_List']
+
+class Implicit_Stmt(Base):
+    """
+    <implicit-stmt> = IMPLICIT <implicit-spec-list>
+                      | IMPLICIT NONE
+    """
+    subclass_names = []
+    use_names = ['Implicit_Spec_List']
+
+class Implicit_Spec(Base):
+    """
+    <implicit-spec> = <declaration-type-spec> ( <letter-spec-list> )
+    """
+    subclass_names = []
+    use_names = ['Declaration_Type_Spec', 'Letter_Spec_List']
+
+class Letter_Spec(Base):
+    """
+    <letter-spec> = <letter> [ - <letter> ]
+    """
+    subclass_names = []
+
+class Namelist_Stmt(Base):
+    """
+    <namelist-stmt> = NAMELIST / <namelist-group-name> / <namelist-group-object-list> [ [ , ] / <namelist-group-name> / <namelist-group-object-list> ]
+    """
+    subclass_names = []
+    use_names = ['Namelist_Group_Name', 'Namelist_Group_Object_List']
+
+class Namelist_Group_Object(Base):
+    """
+    <namelist-group-object> = <variable-name>
+    """
+    subclass_names = ['Variable_Name']
+
+class Equivalence_Stmt(Base):
+    """
+    <equivalence-stmt> = EQUIVALENCE <equivalence-set-list>
+    """
+    subclass_names = []
+    use_names = ['Equivalence_Set_List']
+
+class Equivalence_Set(Base):
+    """
+    <equivalence-set> = ( <equivalence-object> , <equivalence-object-list> )
+    """
+    subclass_names = []
+    use_names = ['Equivalence_Object', 'Equivalence_Object_List']
+
+class Equivalence_Object(Base):
+    """
+    <equivalence-object> = <variable-name>
+                           | <array-element>
+                           | <substring>
+    """
+    subclass_names = ['Variable_Name', 'Array_Element', 'Substring']
+
+class Common_Stmt(Base):
+    """
+    <common-stmt> = COMMON [ / [ <common-block-name> ] / ] <common-block-object-list> [ [ , ] / [ <common-block-name> ] / <common-block-object-list> ]...
+    """
+    subclass_names = []
+    use_names = ['Common_Block_Name', 'Common_Block_Object_List']
+
+class Common_Block_Object(Base):
+    """
+    <common-block-object> = <variable-name> [ ( <explicit-shape-spec-list> ) ]
+                            | <proc-pointer-name>
+    """
+    subclass_names = ['Proc_Pointer_Name']
+    use_names = ['Variable_Name', 'Explicit_Shape_Spec_List']
+
+class Variable_Name(Base):
+    """
+    <variable-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Int_Variable(Base):
+    """
+    <int-variable> = <variable>
+    """
+    subclass_names = ['Variable']
+
+class Scalar_Int_Variable(Base):
+    """
+    <scalar-int-variable> = <int-variable>
+    """
+    subclass_names = ['Int_Variable']
+
+class Char_Variable(Base):
+    """
+    <char-variable> = <variable>
+    """
+    subclass_names = ['Variable']
+
+class Scalar_Default_Char_Variable(Base):
+    """
+    <scalar-default-char-variable> = <char-variable>
+    """
+    subclass_names = ['Char_Variable']
+
+class Allocate_Stmt(Base):
+    """
+    <allocate-stmt> = ALLOCATE ( [ <type-spec> :: ] <allocation-list> [ , <alloc-opt-list> ] )
+    """
+    subclass_names = []
+    use_names = ['Type_Spec', 'Allocation_List', 'Alloc_Opt_List']
+    
+class Alloc_Opt(Base):
+    """
+    <alloc-opt> = STAT = <stat-variable>
+                  | ERRMSG = <errmsg-variable>
+                  | SOURCE = <source-expr>
+    """
+    subclass_names = []
+    use_names = ['Stat_Variable', 'Errmsg_Variable', 'Source_Expr',
+                 ]
+
+class Stat_Variable(Base):
+    """
+    <stat-variable> = <scalar-int-variable>
+    """
+    subclass_names = ['Scalar_Int_Variable']
+
+class Errmsg_Variable(Base):
+    """
+    <errmsg-variable> = <scalar-default-char-variable>
+    """
+    subclass_names = ['Scalar_Default_Char_Variable']
+
+class Source_Expr(Base):
+    """
+    <source-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Allocation(Base):
+    """
+    <allocation> = <allocate-object> [ <allocate-shape-spec-list> ]
+                 | <variable-name>
+    """
+    subclass_names = ['Variable_Name']
+    use_names = ['Allocate_Object', 'Allocate_Shape_Spec_List']
+
+class Allocate_Shape_Spec(Base):
+    """
+    <allocate-shape-spec> = [ <lower-bound-expr> : ] <upper-bound-expr>
+    """
+    subclass_names = []
+    use_names = ['Lower_Bound_Expr', 'Upper_Bound_Expr']
+
+class Lower_Bound_Expr(Base):
+    """
+    <lower-bound-expr> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Upper_Bound_Expr(Base):
+    """
+    <upper-bound-expr> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Nullify_Stmt(Base):
+    """
+    <nullify-stmt> = NULLIFY ( <pointer-object-list> )
+    """
+    subclass_names = []
+    use_names = ['Pointer_Object_List']
+
+class Pointer_Object(Base):
+    """
+    <pointer-object> = <variable-name>
+                       | <structure-component>
+                       | <proc-pointer-name>
+    """
+    subclass_names = ['Variable_Name', 'Structure_Component', 'Proc_Pointer_Name']
+
+class Deallocate_Stmt(Base):
+    """
+    <deallocate-stmt> = DEALLOCATE ( <allocate-object-list> [ , <dealloc-opt-list> ] )
+    """
+    subclass_names = []
+    use_names = ['Allocate_Object_List', 'Dealloc_Opt_List']
+
+class Dealloc_Opt(Base):
+    """
+    <dealloc-opt> = STAT = <stat-variable>
+                    | ERRMSG = <errmsg-variable>
+    """
+    subclass_names = []
+    use_names = ['Stat_Variable', 'Errmsg_Variable']
+
+
+class Logical_Expr(Base):
+    """
+    <logical-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Char_Expr(Base):
+    """
+    <char-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Default_Char_Expr(Base):
+    """
+    <default-char-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Int_Expr(Base):
+    """
+    <int-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Numeric_Expr(Base):
+    """
+    <numeric-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Specification_Expr(Base):
+    """
+    <specification-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Char_Initialization_Expr(Base):
+    """
+    <char-initialization-expr> = <expr>
+    """
+    subclass_names = ['Char_Expr']
+
+class Scalar_Char_Initialization_Expr(Base):
+    subclass_names = ['Char_Initialization_Expr']
+
+class Initialization_Expr(Base):
+    """
+    <initialization-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Int_Initialization_Expr(Base):
+    """
+    <int-initialization-expr> = <expr>
+    """
+    subclass_names = ['Int_Expr']
+
+class Logical_Initialization_Expr(Base):
+    """
+    <logical-initialization-expr> = <expr>
+    """
+    subclass_names = ['Logical_Expr']
+
+class Where_Stmt(Base):
+    """
+    <where-stmt> = WHERE ( <mask-expr> ) <where-assignment-stmt>
+    """
+    subclass_names = []
+    use_names = ['Mask_Expr', 'Where_Assignment_Stmt']
+
+class Where_Construct(Base):
+    """
+    <where-construct> = <where-construct-stmt>
+                              [ <where-body-construct> ]...
+                            [ <masked-elsewhere-stmt>
+                              [ <where-body-construct> ]...
+                            ]...
+                            [ <elsewhere-stmt>
+                              [ <where-body-construct> ]... ]
+                            <end-where-stmt>
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Stmt', 'Where_Body_Construct',
+                 'Elsewhere_Stmt', 'End_Where_Stmt'
+                 ]
+
+class Where_Construct_Stmt(Base):
+    """
+    <where-construct-stmt> = [ <where-construct-name> : ] WHERE ( <masked-expr> )
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Name', 'Masked_Expr']
+
+class Where_Body_Construct(Base):
+    """
+    <where-body-construct> = <where-assignment-stmt>
+                             | <where-stmt>
+                             | <where-construct>
+    """
+    subclass_names = ['Where_Assignment_Stmt', 'Where_Stmt', 'Where_Construct']
+
+class Where_Assignment_Stmt(Base):
+    """
+    <where-assignment-stmt> = <assignment-stmt>
+    """
+    subclass_names = ['Assignment_Stmt']
+
+class Mask_Expr(Base):
+    """
+    <mask-expr> = <logical-expr>
+    """
+    subclass_names = ['Logical_Expr']
+
+class Masked_Elsewhere_Stmt(Base):
+    """
+    <masked-elsewhere-stmt> = ELSEWHERE ( <mask-expr> ) [ <where-construct-name> ]
+    """
+    subclass_names = []
+    use_names = ['Mask_Expr', 'Where_Construct_Name']
+
+class Elsewhere_Stmt(Base):
+    """
+    <elsewhere-stmt> = ELSEWHERE [ <where-construct-name> ]
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Name']
+
+class End_Where_Stmt(Base):
+    """
+    <end-where-stmt> = END WHERE [ <where-construct-name> ]
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Name']
+
+class Proc_Language_Binding_Spec(Base): # R1125
+    subclass_names = ['Language_Binding_Spec']
+
+
+class Dummy_Arg_Name(Base): # R1226
+    """
+    <dummy-arg-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Subroutine_Stmt(Base): # R1232
+    """
+    <subroutine-stmt> = [ <prefix> ] SUBROUTINE <subroutine-name> [ ( [ <dummy-arg-list> ] ) [ <proc-language-binding-spec> ] ]
+    """
+    subclass_names = []
+    use_names = ['Prefix', 'Subroutine_Name', 'Dummy_Arg_List', 'Proc_Language_Binding_Spec']
+    def match(string):
+        line, repmap = string_replace_map(string)
+        m = pattern.subroutine.search(line)
+        prefix = line[:m.start()].rstrip() or None
+        if prefix is not None:
+            prefix = Prefix(repmap(prefix))
+        line = line[m.end():].lstrip()
+        m = pattern.name.match(line)
+        if m is None: return
+        name = Subroutine_Name(m.group())
+        line = line[m.end():].lstrip()
+        dummy_args = None
+        if line.startswith('('):
+            i = line.find(')')
+            if i==-1: return
+            dummy_args = line[1:i].strip() or None
+            if dummy_args is not None:
+                dummy_args = Dummy_Arg_List(repmap(dummy_args))
+            line = line[i+1:].lstrip()
+        binding_spec = None
+        if line:
+            binding_spec = Proc_Language_Binding_Spec(repmap(line))
+        return prefix, name, dummy_args, binding_spec
+    match = staticmethod(match)
+    def init(self, *args):
+        self.prefix, self.name, self.dummy_args, self.binding_spec = args
+        return
+    def tostr(self):
+        if self.prefix is not None:
+            s = '%s SUBROUTINE %s' % (self.prefix, self.name)
+        else:
+            s = 'SUBROUTINE %s' % (self.name)
+        if self.dummy_args is not None:
+            s += '(%s)' % (self.dummy_args)
+        if self.binding_spec is not None:
+            s += ' %s' % (self.binding_spec)
+        return s
+    def torepr(self):
+        return '%s(%r, %r, %r, %r)'\
+               % (self.__class__.__name__, self.prefix, self.name, self.dummy_args, self.binding_spec)
+
+class End_Subroutine_Stmt(EndStmtBase): # R1234
+    """
+    <end-subroutine-stmt> = END [ SUBROUTINE [ <subroutine-name> ] ]
+    """
+    subclass_names = []
+    use_names = ['Subroutine_Name']
+    def match(string): return EndStmtBase.match('SUBROUTINE', Subroutine_Name, string)
+    match = staticmethod(match)
+
+class Dummy_Arg(StringBase): # R1233
+    """
+    <dummy-arg> = <dummy-arg-name>
+                  | *
+    """
+    subclass_names = ['Dummy_Arg_Name']
+    def match(string):
+        if string=='*': return '*',
+        return
+    match = staticmethod(match)
+
+# Create *_List classes:
+ClassType = type(Base)
+_names = dir()
+for clsname in _names:
+    cls = eval(clsname)
+    if not (isinstance(cls, ClassType) and issubclass(cls, Base) and not cls.__name__.endswith('Base')): continue
+    names = getattr(cls, 'subclass_names', []) + getattr(cls, 'use_names', [])
+    for n in names:
+        if n in _names: continue
+        if n.endswith('_List'):
+            n = n[:-5]
+            print 'Generating %s_List' % (n)
+            exec '''\
+class %s_List(SequenceBase):
+    subclass_names = [\'%s\']
+    use_names = []
+    def match(string): return SequenceBase.match(r\',\', %s, string)
+    match = staticmethod(match)
+''' % (n, n, n)
+        if n.endswith('_Name'):
+            n = n[:-5]
+            print 'Generating %s_Name' % (n)
+            exec '''\
+class %s_Name(Base):
+    subclass_names = [\'Name\']
+''' % (n)
+

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -2,7 +2,8 @@
 
 from numpy.testing import *
 
-from expressions import *
+#from expressions import *
+from Fortran2003 import *
 
 class test_Expr(NumpyTestCase):
 
@@ -692,7 +693,7 @@
 class test_Section_Subscript(NumpyTestCase):
 
     def check_simple(self):
-        cls_in = Section_Subscript
+        cls = Section_Subscript
 
         a = cls('1:2')
         assert isinstance(a, Subscript_Triplet),`a`

Added: trunk/numpy/f2py/lib/parser/test_statements2.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_statements2.py	2006-10-29 07:38:25 UTC (rev 3416)
+++ trunk/numpy/f2py/lib/parser/test_statements2.py	2006-10-30 19:21:25 UTC (rev 3417)
@@ -0,0 +1,189 @@
+from numpy.testing import *
+
+from Fortran2003 import *
+
+class test_Declaration_Type_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Declaration_Type_Spec
+        a = cls('Integer*2')
+        assert isinstance(a, Intrinsic_Type_Spec),`a`
+        assert_equal(str(a), 'INTEGER*2')
+        
+        a = cls('type(foo)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a), 'TYPE(foo)')
+        assert_equal(repr(a), "Declaration_Type_Spec('TYPE', Type_Name('foo'))")
+
+class test_Type_Declaration_Stmt(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Type_Declaration_Stmt
+        a = cls('integer a')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a), 'INTEGER :: a')
+        assert_equal(repr(a), "Type_Declaration_Stmt(Intrinsic_Type_Spec('INTEGER', None), None, Entity_Decl(Name('a'), None, None, None))")
+
+        a = cls('integer ,dimension(2):: a*3')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a), 'INTEGER, DIMENSION(2) :: a*3')
+
+class test_Access_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Access_Spec
+        a = cls('private')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a), 'PRIVATE')
+        assert_equal(repr(a), "Access_Spec('PRIVATE')")
+
+        a = cls('public')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a), 'PUBLIC')
+
+class test_Attr_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Attr_Spec
+        a = cls('allocatable')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a), 'ALLOCATABLE')
+
+        a = cls('dimension(a)')
+        assert isinstance(a, Dimension_Attr_Spec),`a`
+        assert_equal(str(a),'DIMENSION(a)')
+
+class test_Dimension_Attr_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Dimension_Attr_Spec
+        a = cls('dimension(a)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'DIMENSION(a)')
+        assert_equal(repr(a),"Dimension_Attr_Spec('DIMENSION', Name('a'))")
+
+class test_Intent_Attr_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Intent_Attr_Spec
+        a = cls('intent(in)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'INTENT(IN)')
+        assert_equal(repr(a),"Intent_Attr_Spec('INTENT', Intent_Spec('IN'))")
+
+class test_Language_Binding_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Language_Binding_Spec
+        a = cls('bind(c)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'BIND(C)')
+        assert_equal(repr(a),'Language_Binding_Spec(None)')
+
+        a = cls('bind(c, name="hey")')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'BIND(C, NAME = "hey")')
+
+class test_Entity_Decl(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Entity_Decl
+        a = cls('a(1)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'a(1)')
+        assert_equal(repr(a),"Entity_Decl(Name('a'), Int_Literal_Constant('1', None), None, None)")
+
+        a = cls('a(1)*(3)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'a(1)*(3)')
+
+        a = cls('a(1)*(3) = 2')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'a(1)*(3) = 2')
+
+class test_Prefix_Spec(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Prefix_Spec
+        a = cls('pure')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'PURE')
+        assert_equal(repr(a),"Prefix_Spec('PURE')")
+
+        a = cls('elemental')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'ELEMENTAL')
+
+        a = cls('recursive')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'RECURSIVE')
+
+        a = cls('integer * 2')
+        assert isinstance(a, Intrinsic_Type_Spec),`a`
+        assert_equal(str(a),'INTEGER*2')
+
+class test_Prefix(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Prefix
+        a = cls('pure  recursive')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'PURE RECURSIVE')
+        assert_equal(repr(a), "Prefix(' ', (Prefix_Spec('PURE'), Prefix_Spec('RECURSIVE')))")
+
+        a = cls('integer * 2 pure')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'INTEGER*2 PURE')
+
+class test_Subroutine_Stmt(NumpyTestCase):
+
+    def check_simple(self):
+        cls = Subroutine_Stmt
+        a = cls('subroutine foo')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'SUBROUTINE foo')
+        assert_equal(repr(a),"Subroutine_Stmt(None, Name('foo'), None, None)")
+
+        a = cls('pure subroutine foo')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'PURE SUBROUTINE foo')
+
+        a = cls('pure subroutine foo(a,b)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'PURE SUBROUTINE foo(a, b)')
+
+        a = cls('subroutine foo() bind(c)')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'SUBROUTINE foo BIND(C)')
+
+class test_End_Subroutine_Stmt(NumpyTestCase):
+
+    def check_simple(self):
+        cls = End_Subroutine_Stmt
+        a = cls('end subroutine foo')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'END SUBROUTINE foo')
+        assert_equal(repr(a),"End_Subroutine_Stmt('SUBROUTINE', Name('foo'))")
+
+        a = cls('end')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'END SUBROUTINE')
+
+        a = cls('endsubroutine')
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'END SUBROUTINE')
+
+class test_Specification_Part(NumpyTestCase):
+
+    def check_simple(self):
+        from api import get_reader
+        reader = get_reader('''\
+      integer a''')
+        cls = Specification_Part
+        a = cls(reader)
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'INTEGER :: a')
+        assert_equal(repr(a),'INTEGER :: a')
+
+if __name__ == "__main__":
+    NumpyTest().run()



From numpy-svn at scipy.org  Mon Oct 30 17:05:14 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 30 Oct 2006 16:05:14 -0600 (CST)
Subject: [Numpy-svn] r3418 - trunk/numpy/core
Message-ID: <20061030220514.A2FC039C018@new.scipy.org>

Author: oliphant
Date: 2006-10-30 16:05:11 -0600 (Mon, 30 Oct 2006)
New Revision: 3418

Modified:
   trunk/numpy/core/records.py
Log:
Fixes when fielddict is None

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2006-10-30 19:21:25 UTC (rev 3417)
+++ trunk/numpy/core/records.py	2006-10-30 22:05:11 UTC (rev 3418)
@@ -213,12 +213,12 @@
         try:
             ret = object.__setattr__(self, attr, val)
         except:
-            fielddict = ndarray.__getattribute__(self,'dtype').fields
+            fielddict = ndarray.__getattribute__(self,'dtype').fields or {}
             if attr not in fielddict:
                 exctype, value = sys.exc_info()[:2]
                 raise exctype, value
         else:
-            fielddict = ndarray.__getattribute__(self,'dtype').fields
+            fielddict = ndarray.__getattribute__(self,'dtype').fields or {}
             if attr not in fielddict:
                 return ret
             if newattr:         # We just added this one



From numpy-svn at scipy.org  Mon Oct 30 17:45:34 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 30 Oct 2006 16:45:34 -0600 (CST)
Subject: [Numpy-svn] r3419 - trunk/numpy/f2py/src
Message-ID: <20061030224534.A40FA39C018@new.scipy.org>

Author: oliphant
Date: 2006-10-30 16:45:31 -0600 (Mon, 30 Oct 2006)
New Revision: 3419

Modified:
   trunk/numpy/f2py/src/fortranobject.c
Log:
Fix some reference-count problems in f2py with data-type objects.

Modified: trunk/numpy/f2py/src/fortranobject.c
===================================================================
--- trunk/numpy/f2py/src/fortranobject.c	2006-10-30 22:05:11 UTC (rev 3418)
+++ trunk/numpy/f2py/src/fortranobject.c	2006-10-30 22:45:31 UTC (rev 3419)
@@ -116,7 +116,8 @@
     }
   } else {
     PyArray_Descr *d = PyArray_DescrFromType(def.type);
-    if (sprintf(p,"%s'%c'-",p,d->type)==0) goto fail;
+    if (sprintf(p,"%s'%c'-",p,d->type)==0) {Py_DECREF(d); goto fail;}
+    Py_DECREF(d);
     if (def.data==NULL) {
       if (sprintf(p,"%sarray(%" NPY_INTP_FMT,p,def.dims.d[0])==0) goto fail;
       for(i=1;i<def.rank;++i)
@@ -521,7 +522,9 @@
   */
   char mess[200];
   PyArrayObject *arr = NULL;
-  PyArray_Descr *descr = PyArray_DescrFromType(type_num);
+  PyArray_Descr *descr;
+  char typechar;
+  int elsize;
 
   if ((intent & F2PY_INTENT_HIDE)
       || ((intent & F2PY_INTENT_CACHE) && (obj==Py_None))
@@ -549,15 +552,20 @@
     return arr;
   }
 
+  descr = PyArray_DescrFromType(type_num);
+  elsize = descr->elsize;
+  typechar = descr->type;
+  Py_DECREF(descr);   
   if (PyArray_Check(obj)) {
     arr = (PyArrayObject *)obj;
-
+    
     if (intent & F2PY_INTENT_CACHE) {
       /* intent(cache) */
       if (PyArray_ISONESEGMENT(obj)
-	  && PyArray_ITEMSIZE((PyArrayObject *)obj)>=descr->elsize) {
-	if (check_and_fix_dimensions((PyArrayObject *)obj,rank,dims))
+	  && PyArray_ITEMSIZE((PyArrayObject *)obj)>=elsize) {
+	if (check_and_fix_dimensions((PyArrayObject *)obj,rank,dims)) {
 	  return NULL; /*XXX: set exception */
+        }
 	if (intent & F2PY_INTENT_OUT)
 	  Py_INCREF(obj);
 	return (PyArrayObject *)obj;
@@ -565,9 +573,9 @@
       sprintf(mess,"failed to initialize intent(cache) array");
       if (!PyArray_ISONESEGMENT(obj))
 	sprintf(mess+strlen(mess)," -- input must be in one segment");
-      if (PyArray_ITEMSIZE(arr)<descr->elsize)
+      if (PyArray_ITEMSIZE(arr)<elsize)
 	sprintf(mess+strlen(mess)," -- expected at least elsize=%d but got %d",
-		descr->elsize,PyArray_ITEMSIZE(arr)
+		elsize,PyArray_ITEMSIZE(arr)
 		);
       PyErr_SetString(PyExc_ValueError,mess);
       return NULL;
@@ -575,11 +583,12 @@
 
     /* here we have always intent(in) or intent(inout) or intent(inplace) */
 
-    if (check_and_fix_dimensions(arr,rank,dims))
+    if (check_and_fix_dimensions(arr,rank,dims)) {
       return NULL; /*XXX: set exception */
+    }
 
     if ((! (intent & F2PY_INTENT_COPY))
-	&& PyArray_ITEMSIZE(arr)==descr->elsize
+	&& PyArray_ITEMSIZE(arr)==elsize
 	&& ARRAY_ISCOMPATIBLE(arr,type_num)
 	) {
       if ((intent & F2PY_INTENT_C)?PyArray_ISCARRAY(arr):PyArray_ISFARRAY(arr)) {
@@ -597,14 +606,14 @@
 	sprintf(mess+strlen(mess)," -- input not contiguous");
       if (!(intent & F2PY_INTENT_C) && !PyArray_ISFARRAY(arr))
 	sprintf(mess+strlen(mess)," -- input not fortran contiguous");
-      if (PyArray_ITEMSIZE(arr)!=descr->elsize)
+      if (PyArray_ITEMSIZE(arr)!=elsize)
 	sprintf(mess+strlen(mess)," -- expected elsize=%d but got %d",
-		descr->elsize,
+		elsize,
 		PyArray_ITEMSIZE(arr)
 		);
       if (!(ARRAY_ISCOMPATIBLE(arr,type_num)))
 	sprintf(mess+strlen(mess)," -- input '%c' not compatible to '%c'",
-		arr->descr->type,descr->type);
+		arr->descr->type,typechar);
       PyErr_SetString(PyExc_ValueError,mess);
       return NULL;
     }



From numpy-svn at scipy.org  Tue Oct 31 00:17:51 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Mon, 30 Oct 2006 23:17:51 -0600 (CST)
Subject: [Numpy-svn] r3420 - in trunk/numpy/core: src tests
Message-ID: <20061031051751.2577C39C067@new.scipy.org>

Author: oliphant
Date: 2006-10-30 23:17:46 -0600 (Mon, 30 Oct 2006)
New Revision: 3420

Modified:
   trunk/numpy/core/src/arraytypes.inc.src
   trunk/numpy/core/tests/test_regression.py
Log:
Fix OBJECT_argmax problem and add test.

Modified: trunk/numpy/core/src/arraytypes.inc.src
===================================================================
--- trunk/numpy/core/src/arraytypes.inc.src	2006-10-30 22:45:31 UTC (rev 3419)
+++ trunk/numpy/core/src/arraytypes.inc.src	2006-10-31 05:17:46 UTC (rev 3420)
@@ -1775,8 +1775,7 @@
                 mp=ip[i];
                 i++;
         }
-        if (i==n) return 0;
-        for(i=n; i<n; i++) {
+        for(; i<n; i++) {
                 ip++;
                 if (*ip != NULL && PyObject_Compare(*ip,mp) > 0) {
                         mp = *ip;

Modified: trunk/numpy/core/tests/test_regression.py
===================================================================
--- trunk/numpy/core/tests/test_regression.py	2006-10-30 22:45:31 UTC (rev 3419)
+++ trunk/numpy/core/tests/test_regression.py	2006-10-31 05:17:46 UTC (rev 3420)
@@ -551,6 +551,10 @@
         a = N.array([1,2,3])
         a2 = N.array([[1,2,3]])
         assert_equal(a[N.where(a==3)], a2[N.where(a2==3)])
+
+    def check_object_argmax(self, level=rlevel):
+        a = N.array([1,2,3],dtype=object)
+        assert a.argmax() == 2
                 
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Tue Oct 31 08:28:44 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 31 Oct 2006 07:28:44 -0600 (CST)
Subject: [Numpy-svn] r3421 - trunk/numpy/f2py/lib/parser
Message-ID: <20061031132844.0F24B39C078@new.scipy.org>

Author: pearu
Date: 2006-10-31 07:28:31 -0600 (Tue, 31 Oct 2006)
New Revision: 3421

Removed:
   trunk/numpy/f2py/lib/parser/expressions.py
   trunk/numpy/f2py/lib/parser/statements2.py
Modified:
   trunk/numpy/f2py/lib/parser/Fortran2003.py
   trunk/numpy/f2py/lib/parser/readfortran.py
   trunk/numpy/f2py/lib/parser/test_expressions.py
   trunk/numpy/f2py/lib/parser/test_statements2.py
Log:
F2PY: Cont implementing Fortran 2003 parser. Clean up.

Modified: trunk/numpy/f2py/lib/parser/Fortran2003.py
===================================================================
--- trunk/numpy/f2py/lib/parser/Fortran2003.py	2006-10-31 05:17:46 UTC (rev 3420)
+++ trunk/numpy/f2py/lib/parser/Fortran2003.py	2006-10-31 13:28:31 UTC (rev 3421)
@@ -1,7 +1,3906 @@
+#!/usr/bin/env python
+"""
+Fortran 2003 Syntax Rules.
 
-from statements2 import *
+-----
+Permission to use, modify, and distribute this software is given under the
+terms of the NumPy License. See http://scipy.org.
 
+NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
+Author: Pearu Peterson <pearu at cens.ioc.ee>
+Created: Oct 2006
+-----
+"""
+
+import re
+from splitline import string_replace_map
+import pattern_tools as pattern
+from readfortran import FortranReaderBase
+
+###############################################################################
+############################## BASE CLASSES ###################################
+###############################################################################
+
+class NoMatchError(Exception):
+    pass
+
+class Base(object):
+    """
+    """
+    subclasses = {}
+
+    def __new__(cls, string):
+        #print '__new__:',cls.__name__,`string`
+        if isinstance(string, FortranReaderBase) and not issubclass(cls, BlockBase):
+            reader = string
+            item = reader.get_item()
+            if item is None: return
+            try:
+                obj = cls(item.line)
+            except NoMatchError:
+                obj = None
+            if obj is None:
+                reader.put_item(item)
+                return
+            obj._item = item
+            return obj
+        match = cls.__dict__.get('match', None)
+        if match is not None:
+            result = cls.match(string)
+        else:
+            result = None
+        #print '__new__:result:',cls.__name__,`string,result`
+        if isinstance(result, tuple):
+            obj = object.__new__(cls)
+            obj.string = string
+            if hasattr(cls, 'init'):
+                obj.init(*result)
+            return obj
+        elif isinstance(result, Base):
+            return result
+        elif result is None:
+            for subcls in Base.subclasses.get(cls.__name__,[]):
+                #print cls.__name__,subcls.__name__,`string`
+                try:
+                    return subcls(string)
+                except NoMatchError:
+                    pass
+        else:
+            raise AssertionError,`result`
+        raise NoMatchError,'%s: %r' % (cls.__name__, string)
+
+    def restore_reader(self):
+        self._item.reader.put_item(self._item)
+        return
+
+    def init_list(self, *items):
+        self.items = items
+        return
+
+    def tostr_list(self):
+        return ', '.join(map(str,self.items))
+
+    def torepr_list(self):
+        return '%s(%s)' % (self.__class__.__name__,', '.join(map(repr,self.items)))
+
+    def __str__(self):
+        return self.tostr()
+        if self.__class__.__dict__.has_key('tostr'):
+            return self.tostr()
+        return repr(self)
+
+    def __repr__(self):
+        return self.torepr()
+        if self.__class__.__dict__.has_key('torepr'):
+            return self.torepr()
+        return '%s(%r)' % (self.__class__.__name__, self.string)
+
+    def __cmp__(self, other):
+        if self is other: return 0
+        if not isinstance(other, self.__class__): return -1
+        return self.compare(other)
+
+class BlockBase(Base):
+    """
+    <block-base> = [ <startcls> ]
+                     [ <subcls> ]...
+                     ...
+                     [ <subcls> ]...
+                     [ <endcls> ]
+    """
+    def match(startcls, subclasses, endcls, reader):
+        content = []
+        if startcls is not None:
+            try:
+                obj = startcls(reader)
+            except NoMatchError:
+                obj = None
+            if obj is None: return
+            content.append(obj)
+        if endcls is not None:
+            classes = subclasses + [endcls]
+        else:
+            classes = subclasses[:]
+        i = 0
+        while 1:
+            cls = classes[i]
+            try:
+                obj = cls(reader)
+            except NoMatchError:
+                obj = None
+            if obj is None:
+                j = i
+                for cls in classes[i+1:]:
+                    j += 1
+                    try:
+                        obj = cls(reader)
+                    except NoMatchError:
+                        obj = None
+                    if obj is not None:
+                        break
+                if obj is not None:
+                    i = j
+            if obj is not None:
+                content.append(obj)
+                if endcls is not None and isinstance(obj, endcls): break
+                continue
+            if endcls is not None:
+                item = reader.get_item()
+                if item is not None:
+                    reader.error('failed to parse with %s, skipping.' % ('|'.join([c.__name__ for c in classes[i:]])), item)
+                    continue
+                reader.error('unexpected eof file while looking line for <%s>.' % (classes[-1].__name__.lower().replace('_','-')))
+            break
+        if not content: return
+        if startcls is not None and endcls is not None:
+            # check names of start and end statements:
+            start_stmt = content[0]
+            end_stmt = content[-1]
+            if isinstance(end_stmt, endcls) and hasattr(end_stmt, 'name'):
+                if end_stmt.name is not None and start_stmt.name != end_stmt.name:
+                    end_stmt._item.reader.error('expected <%s-name> is %s but got %s. Ignoring.'\
+                                                % (end_stmt.type.lower(), start_stmt.name, end_stmt.name))
+        return content,
+    match = staticmethod(match)
+
+    def init(self, content):
+        self.content = content
+        return
+    def tostr(self):
+        return '\n'.join(map(str, self.content))
+    def torepr(self):
+        return '%s(%s)' % (self.__class__.__name__,', '.join(map(repr, self.content)))
+
+    def restore_reader(self):
+        content = self.content[:]
+        content.reverse()
+        for obj in content:
+            obj.restore_reader()
+        return
+    
+class SequenceBase(Base):
+    """
+    <sequence-base> = <obj>, <obj> [ , <obj> ]...
+    """
+    def match(separator, subcls, string):
+        line, repmap = string_replace_map(string)
+        if isinstance(separator, str):
+            splitted = line.split(separator)
+        else:
+            splitted = separator[1].split(line)
+            separator = separator[0]
+        if len(splitted)<=1: return
+        lst = []
+        for p in splitted:
+            lst.append(subcls(repmap(p.strip())))
+        return separator, tuple(lst)
+    match = staticmethod(match)
+    def init(self, separator, items):
+        self.separator = separator
+        self.items = items
+        return
+    def tostr(self):
+        s = self.separator
+        if s==',': s = s + ' '
+        elif s==' ': pass
+        else: s = ' ' + s + ' '
+        return s.join(map(str, self.items))
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.separator, self.items)
+    def compare(self, other):
+        return cmp((self.separator,self.items),(other.separator,self.items))
+    
+class UnaryOpBase(Base):
+    """
+    <unary-op-base> = <unary-op> <rhs>
+    """
+    def init(self, op, rhs):
+        self.op = op
+        self.rhs = rhs
+        return    
+    def tostr(self):
+        return '%s %s' % (self.op, self.rhs)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__,self.op, self.rhs)
+    def match(op_pattern, rhs_cls, string):
+        m = op_pattern.match(string)
+        if not m: return
+        #if not m: return rhs_cls(string)
+        rhs = string[m.end():].lstrip()        
+        if not rhs: return
+        op = string[:m.end()].rstrip().upper()
+        return op, rhs_cls(rhs)
+    match = staticmethod(match)
+    def compare(self, other):
+        return cmp((self.op,self.rhs),(other.op,other.rhs))
+
+class BinaryOpBase(Base):
+    """
+    <binary-op-base> = <lhs> <op> <rhs>
+    <op> is searched from right by default.
+    """
+    def match(lhs_cls, op_pattern, rhs_cls, string, right=True):
+        line, repmap = string_replace_map(string)
+        if right:
+            t = op_pattern.rsplit(line)
+        else:
+            t = op_pattern.lsplit(line)
+        if t is None or len(t)!=3: return
+        lhs, op, rhs = t
+        if not lhs: return
+        if not rhs: return
+        op = op.upper()
+        lhs_obj = lhs_cls(repmap(lhs))
+        rhs_obj = rhs_cls(repmap(rhs))
+        return lhs_obj, op, rhs_obj
+    match = staticmethod(match)
+    def init(self, lhs, op, rhs):
+        self.lhs = lhs
+        self.op = op
+        self.rhs = rhs
+        return    
+    def tostr(self):
+        return '%s %s %s' % (self.lhs, self.op, self.rhs)
+    def torepr(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
+    def compare(self, other):
+        return cmp((self.op,self.lhs,self.rhs),(other.op,other.lhs,other.rhs))
+
+class SeparatorBase(BinaryOpBase):
+    """
+    <shape-base> = <lhs> : <rhs>
+    """
+    def init(self, lhs, rhs):
+        self.lhs = lhs
+        self.op = ':'
+        self.rhs = rhs
+        return
+
+class KeywordValueBase(BinaryOpBase):
+    """
+    <keyword-value-base> = <keyword> = <rhs>
+    """
+    def match(cls, string):
+        if '=' not in string: return
+        lhs,rhs = string.split('=',1)
+        return Keyword(lhs.rstrip()),'=',cls(rhs.lstrip())
+    match = staticmethod(match)
+
+class BracketBase(Base):
+    """
+    <bracket-base> = <left-bracket-base> <something> <right-bracket>
+    """
+    def match(brackets, cls, string):
+        i = len(brackets)/2
+        left = brackets[:i]
+        right = brackets[-i:]
+        if string.startswith(left) and string.endswith(right):
+            line = string[i:-i].strip()
+            if not line: return
+            return left,cls(line),right
+        return
+    match = staticmethod(match)
+    def init(self,left,item,right):
+        self.left = left
+        self.item = item
+        self.right = right
+        return
+    def tostr(self):
+        if self.item is None:
+            return '%s%s' % (self.left, self.right)
+        return '%s%s%s' % (self.left, self.item, self.right)
+    def torepr(self): return '%s(%r, %r, %r)' % (self.__class__.__name__, self.left, self.item, self.right)
+    def compare(self, other):
+        return cmp((self.left,self.item,self.right),(other.left,other.item,other.right))
+
+
+
+class NumberBase(Base):
+    """
+    <number-base> = <number> [ _ <kind-param> ]
+    """
+    def match(number_pattern, string):
+        m = number_pattern.match(string)
+        if m is None: return
+        return m.group('value').upper(),m.group('kind_param')
+    match = staticmethod(match)
+    def init(self, value, kind_param):
+        self.value = value
+        self.kind_param = kind_param
+        return
+    def tostr(self):
+        if self.kind_param is None: return str(self.value)
+        return '%s_%s' % (self.value, self.kind_param)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.value, self.kind_param)
+    def compare(self, other):
+        return cmp(self.value, other.value)
+
+class CallBase(Base):
+    """
+    <call-base> = <lhs> ( [ <rhs> ] )
+    """
+    def match(lhs_cls, rhs_cls, string):
+        if not string.endswith(')'): return
+        line, repmap = string_replace_map(string)
+        i = line.find('(')
+        if i==-1: return
+        lhs = line[:i].rstrip()
+        if not lhs: return
+        rhs = line[i+1:-1].strip()
+        lhs = repmap(lhs)
+        if rhs:
+            rhs = repmap(rhs)
+            return lhs_cls(lhs), rhs_cls(rhs)
+        return lhs_cls(lhs), None
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs = lhs
+        self.rhs = rhs
+        return
+    def tostr(self):
+        if self.rhs is None: return '%s()' % (self.lhs)
+        return '%s(%s)' % (self.lhs, self.rhs)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.lhs, self.rhs)
+    def compare(self, other):
+        return cmp((self.lhs,self.rhs),(other.lhs,other.rhs))
+
+class StringBase(Base):
+    """
+    <string-base> = <xyz>
+    """
+    def match(pattern, string):
+        if pattern.match(string): return string,
+        return
+    match = staticmethod(match)
+    def init(self, string):
+        self.string = string
+        return
+    def tostr(self): return str(self.string)
+    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.string)
+    def compare(self, other):
+        return cmp(self.string,other.string)
+
+class STRINGBase(StringBase):
+    """
+    <STRING-base> = <XYZ>
+    """
+    match = staticmethod(StringBase.match)
+    def init(self, string):
+        self.string = string.upper()
+        return
+
+class EndStmtBase(Base):
+    """
+    <end-stmt-base> = END [ <stmt> [ <stmt-name>] ]
+    """
+    def match(stmt_type, stmt_name, string):
+        start = string[:3].upper()
+        if start != 'END': return
+        line = string[3:].lstrip()
+        start = line[:len(stmt_type)].upper()
+        if start:
+            if start != stmt_type: return
+            line = line[len(stmt_type):].lstrip()
+        else:
+            line = ''
+        if line:
+            return stmt_type, stmt_name(line)
+        return stmt_type, None
+    match = staticmethod(match)
+    def init(self, stmt_type, stmt_name):
+        self.type, self.name = stmt_type, stmt_name
+        return
+    def tostr(self):
+        if self.name is not None:
+            return 'END %s %s' % (self.type, self.name)
+        return 'END %s' % (self.type)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.type, self.name)
+    def compare(self, other):
+        return cmp((self.type,self.name),(other.type,other.name))
+
+
+###############################################################################
+############################### SECTION  1 ####################################
+###############################################################################
+
+#R101: <xyz-list> = <xyz> [ , <xyz> ]...
+#R102: <xyz-name> = <name>
+#R103: <scalar-xyz> = <xyz>
+
+###############################################################################
+############################### SECTION  2 ####################################
+###############################################################################
+
+class Program(Base): # R201
+    """
+    <program> = <program-unit>
+                  [ <program-unit> ] ...
+    """
+    subclass_names = []
+    use_names = ['Program_Unit']
+
+class Program_Unit(Base): # R202
+    """
+    <program-unit> = <main-program>
+                     | <external-subprogram>
+                     | <module>
+                     | <block-data>
+    """
+    subclass_names = ['Main_Program', 'External_Subprogram', 'Module', 'Block_Data']
+
+class External_Subprogram(Base): # R203
+    """
+    <external-subprogram> = <function-subprogram>
+                            | <subroutine-subprogram>
+    """
+    subclass_names = ['Function_Subprogram', 'Subroutine_Subprogram']
+
+
+class Specification_Part(BlockBase): # R204
+    """
+    <specification-part> = [ <use-stmt> ]...
+                             [ <import-stmt> ]...
+                             [ <implicit-part> ]
+                             [ <declaration-construct> ]...
+    """
+    subclass_names = []
+    use_names = ['Use_Stmt', 'Import_Stmt', 'Implicit_Part', 'Declaration_Construct']
+    def match(reader):
+        return BlockBase.match(None, [Use_Stmt, Import_Stmt, Implicit_Part, Declaration_Construct], None, reader)
+    match = staticmethod(match)
+
+class Implicit_Part(Base): # R205
+    """
+    <implicit-part> = [ <implicit-part-stmt> ]...
+                        <implicit-stmt>
+    """
+    subclass_names = []
+    use_names = ['Implicit_Part_Stmt', 'Implicit_Stmt']
+
+class Implicit_Part_Stmt(Base): # R206
+    """
+    <implicit-part-stmt> = <implicit-stmt>
+                           | <parameter-stmt>
+                           | <format-stmt>
+                           | <entry-stmt>
+    """
+    subclass_names = ['Implicit_Stmt', 'Parameter_Stmt', 'Format_Stmt', 'Entry_Stmt']
+
+class Declaration_Construct(Base): # R207
+    """
+    <declaration-construct> = <derived-type-def>
+                              | <entry-stmt>
+                              | <enum-def>
+                              | <format-stmt>
+                              | <interface-block>
+                              | <parameter-stmt>
+                              | <procedure-declaration-stmt>
+                              | <specification-stmt>
+                              | <type-declaration-stmt>
+                              | <stmt-function-stmt>
+    """
+    subclass_names = ['Derived_Type_Def', 'Entry_Stmt', 'Enum_Def', 'Format_Stmt',
+                      'Interface_Block', 'Parameter_Stmt', 'Procedure_Declaration_Stmt',
+                      'Specification_Stmt', 'Type_Declaration_Stmt', 'Stmt_Function_Stmt']
+
+class Execution_Part(Base): # R208
+    """
+    <execution-part> = <executable-construct>
+                       | [ <execution-part-construct> ]...
+
+    <execution-part> shall not contain <end-function-stmt>, <end-program-stmt>, <end-subroutine-stmt>
+    """
+    subclass_names = []
+    use_names = ['Executable_Construct', 'Execution_Part_Construct']
+
+class Execution_Part_Construct(Base): # R209
+    """
+    <execution-part-construct> = <executable-construct>
+                                 | <format-stmt>
+                                 | <entry-stmt>
+                                 | <data-stmt>
+    """
+    subclass_names = ['Executable_Construct', 'Format_Stmt', 'Entry_Stmt', 'Data_Stmt']
+
+class Internal_Subprogram_Part(Base): # R210
+    """
+    <internal-subprogram-part> = <contains-stmt>
+                                   <internal-subprogram>
+                                   [ <internal-subprogram> ]...
+    """
+    subclass_names = []
+    use_names = ['Contains_Stmt', 'Internal_Subprogram']
+
+class Internal_Subprogram(Base): # R211
+    """
+    <internal-subprogram> = <function-subprogram>
+                            | <subroutine-subprogram>
+    """
+    subclass_names = ['Function_Subprogram', 'Subroutine_Subprogram']
+
+class Specification_Stmt(Base):# R212
+    """
+    <specification-stmt> = <access-stmt>
+                           | <allocatable-stmt>
+                           | <asynchronous-stmt>
+                           | <bind-stmt>
+                           | <common-stmt>
+                           | <data-stmt>
+                           | <dimension-stmt>
+                           | <equivalence-stmt>
+                           | <external-stmt>
+                           | <intent-stmt>
+                           | <intrinsic-stmt>
+                           | <namelist-stmt>
+                           | <optional-stmt>
+                           | <pointer-stmt>
+                           | <protected-stmt>
+                           | <save-stmt>
+                           | <target-stmt>
+                           | <volatile-stmt>
+                           | <value-stmt>
+    """
+    subclass_names = ['Access_Stmt', 'Allocatable_Stmt', 'Asynchronous_Stmt','Bind_Stmt',
+                      'Common_Stmt', 'Data_Stmt', 'Dimension_Stmt', 'Equivalence_Stmt',
+                      'External_Stmt', 'Intent_Stmt', 'Intrinsic_Stmt', 'Namelist_Stmt',
+                      'Optional_Stmt','Pointer_Stmt','Protected_Stmt','Save_Stmt',
+                      'Target_Stmt','Volatile_Stmt', 'Value_Stmt']
+
+class Executable_Construct(Base):# R213
+    """
+    <executable-construct> = <action-stmt>
+                             | <associate-stmt>
+                             | <case-construct>
+                             | <do-construct>
+                             | <forall-construct>
+                             | <if-construct>
+                             | <select-type-construct>
+                             | <where-construct>
+    """
+    subclass_names = ['Action_Stmt', 'Associate_Stmt', 'Case_Construct', 'Do_Construct',
+                      'Forall_Construct', 'If_Construct', 'Select_Type_Construct', 'Where_Construct']
+
+class Action_Stmt(Base):# R214
+    """
+    <action-stmt> = <allocate-stmt>
+                    | <assignment-stmt>
+                    | <backspace-stmt>
+                    | <call-stmt>
+                    | <close-stmt>
+                    | <continue-stmt>
+                    | <cycle-stmt>
+                    | <deallocate-stmt>
+                    | <endfile-stmt>
+                    | <end-function-stmt>
+                    | <end-program-stmt>
+                    | <end-subroutine-stmt>
+                    | <exit-stmt>
+                    | <flush-stmt>
+                    | <forall-stmt>
+                    | <goto-stmt>
+                    | <if-stmt>
+                    | <inquire-stmt>
+                    | <nullify-stmt>
+                    | <open-stmt>
+                    | <pointer-assignment-stmt>
+                    | <print-stmt>
+                    | <read-stmt>
+                    | <return-stmt>
+                    | <rewind-stmt>
+                    | <stop-stmt>
+                    | <wait-stmt>
+                    | <where-stmt>
+                    | <write-stmt>
+                    | <arithmetic-if-stmt>
+                    | <computed-goto-stmt>
+    """
+    subclass_names = ['Allocate_Stmt', 'Assignment_Stmt', 'Backspace_Stmt', 'Call_Stmt',
+                      'Close_Stmt', 'Continue_Stmt', 'Cycle_Stmt', 'Deallocate_Stmt',
+                      'Endfile_Stmt', 'End_Function_Stmt', 'End_Subroutine_Stmt', 'Exit_Stmt',
+                      'Flush_Stmt', 'Forall_Stmt', 'Goto_Stmt', 'If_Stmt', 'Inquire_Stmt',
+                      'Nullify_Stmt', 'Open_Stmt', 'Pointer_Assignment_Stmt', 'Print_Stmt',
+                      'Read_Stmt', 'Return_Stmt', 'Rewind_Stmt', 'Stop_Stmt', 'Wait_Stmt',
+                      'Where_Stmt', 'Write_Stmt', 'Arithmetic_If_Stmt', 'Computed_Goto_Stmt']
+
+
+class Keyword(Base): # R215
+    """
+    <keyword> = <name>
+    """
+    subclass_names = ['Name']
+
+###############################################################################
+############################### SECTION  3 ####################################
+###############################################################################
+
+#R301: <character> = <alphanumeric-character> | <special-character>
+#R302: <alphanumeric-character> = <letter> | <digit> | <underscore>
+#R303: <underscore> = _
+
+class Name(StringBase): # R304
+    """
+    <name> = <letter> [ <alphanumeric_character> ]...
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_name, string)
+    match = staticmethod(match)
+
+class Constant(Base): # R305
+    """
+    <constant> = <literal-constant>
+                 | <named-constant>
+    """
+    subclass_names = ['Literal_Constant','Named_Constant']
+
+class Literal_Constant(Base): # R306
+    """
+    <literal-constant> = <int-literal-constant>
+                         | <real-literal-constant>
+                         | <complex-literal-constant>
+                         | <logical-literal-constant>
+                         | <char-literal-constant>
+                         | <boz-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant', 'Real_Literal_Constant','Complex_Literal_Constant',
+                      'Logical_Literal_Constant','Char_Literal_Constant','Boz_Literal_Constant']
+
+class Named_Constant(Base): # R307
+    """
+    <named-constant> = <name>
+    """
+    subclass_names = ['Name']
+
+class Int_Constant(Base): # R308
+    """
+    <int-constant> = <constant>
+    """
+    subclass_names = ['Constant']
+
+class Char_Constant(Base): # R309
+    """
+    <char-constant> = <constant>
+    """
+    subclass_names = ['Constant']
+
+#R310: <intrinsic-operator> = <power-op> | <mult-op> | <add-op> | <concat-op> | <rel-op> | <not-op> | <and-op> | <or-op> | <equiv-op>
+#R311: <defined-operator> = <defined--unary-op> | <defined-binary-op> | <extended-intrinsic-op>
+#R312: <extended-intrinsic-op> = <intrinsic-op>
+#R313: <label> = <digit> [ <digit> [ <digit> [ <digit> [ <digit> ] ] ] ]
+
+###############################################################################
+############################### SECTION  4 ####################################
+###############################################################################
+
+class Type_Spec(Base): # R401
+    """
+    <type-spec> = <intrinsic-type-spec>
+                  | <derived-type-spec>
+    """
+    subclass_names = ['Intrinsic_Type_Spec', 'Derived_Type_Spec']
+
+class Type_Param_Value(Base): # R402
+    """
+    <type-param-value> = <scalar-int-expr>
+                       | *
+                       | :
+    """
+    subclass_names = ['Scalar_Int_Expr']
+    use_names = []
+    def match(string):
+        if string in ['*',':']: return string,
+        return
+    match = staticmethod(match)
+    def init(self, value): self.value = value
+    def tostr(self): return str(self.value)
+    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.value)
+
+class Intrinsic_Type_Spec(Base): # R403
+    """
+    <intrinsic-type-spec> = INTEGER [ <kind-selector> ]
+                            | REAL [ <kind-selector> ]
+                            | DOUBLE COMPLEX
+                            | COMPLEX [ <kind-selector> ]
+                            | CHARACTER [ <char-selector> ]
+                            | LOGICAL [ <kind-selector> ]
+    Extensions:
+                            | DOUBLE PRECISION
+                            | BYTE
+    """
+    subclass_names = []
+    use_names = ['Kind_Selector','Char_Selector']
+        
+    def match(string):
+        if string[:7].upper()=='INTEGER':
+            t = string[:7].upper()
+            line = string[7:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:4].upper()=='REAL':
+            t = string[:4].upper()
+            line = string[4:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:7].upper()=='COMPLEX':
+            t = string[:7].upper()
+            line = string[7:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:7].upper()=='LOGICAL':
+            t = string[:7].upper()
+            line = string[7:].lstrip()
+            if line: return t,Kind_Selector(line)
+            return t,None
+        elif string[:9].upper()=='CHARACTER':
+            t = string[:9].upper()
+            line = string[9:].lstrip()
+            if line: return t,Char_Selector(line)
+        elif string[:6].upper()=='DOUBLE':
+            line = string[6:].lstrip().upper()
+            if line=='COMPLEX':
+                return 'DOUBLE COMPLEX',None
+            if line=='PRECISION':
+                return 'DOUBLE PRECISION',None
+        elif string.upper()=='BYTE':
+            return 'BYTE',None
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[1] is None: return str(self.items[0])
+        return '%s%s' % tuple(self.items)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Kind_Selector(Base): # R404
+    """
+    <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
+    Extensions:
+                      | * <char-length>
+    """
+    subclass_names = []
+    use_names = ['Char_Length','Scalar_Int_Initialization_Expr']
+
+    def match(string):
+        if string[0]+string[-1] != '()':
+            if not string.startswith('*'): return
+            return '*',Char_Length(string[1:].lstrip())
+        line = string[1:-1].strip()
+        if line[:4].upper()=='KIND':
+            line = line[4:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+        return '(',Scalar_Int_Initialization_Expr(line),')'
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if len(self.items)==2: return '%s%s' % tuple(self.items)
+        return '%sKIND = %s%s' % tuple(self.items)
+    
+    def torepr(self):
+        if len(self.items)==2:
+            return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0], self.items[1], self.items[2])
+
+class Signed_Int_Literal_Constant(NumberBase): # R405
+    """
+    <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant'] # never used because sign is included in pattern
+    def match(string):
+        return NumberBase.match(pattern.abs_signed_int_literal_constant_named, string)
+    match = staticmethod(match)
+
+class Int_Literal_Constant(NumberBase): # R406
+    """
+    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_int_literal_constant_named, string)
+    match = staticmethod(match)
+
+#R407: <kind-param> = <digit-string> | <scalar-int-constant-name>
+#R408: <signed-digit-string> = [ <sign> ] <digit-string>
+#R409: <digit-string> = <digit> [ <digit> ]...
+#R410: <sign> = + | -
+
+class Boz_Literal_Constant(Base): # R411
+    """
+    <boz-literal-constant> = <binary-constant>
+                             | <octal-constant>
+                             | <hex-constant>
+    """
+    subclass_names = ['Binary_Constant','Octal_Constant','Hex_Constant']
+
+class Binary_Constant(StringBase): # R412
+    """
+    <binary-constant> = B ' <digit> [ <digit> ]... '
+                        | B \" <digit> [ <digit> ]... \"
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_binary_constant, string)
+    match = staticmethod(match)
+    def init(self, string):
+        self.string = string.upper()
+        return
+
+class Octal_Constant(StringBase): # R413
+    """
+    <octal-constant> = O ' <digit> [ <digit> ]... '
+                       | O \" <digit> [ <digit> ]... \"
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_octal_constant, string)
+    match = staticmethod(match)
+    def init(self, string):
+        self.string = string.upper()
+        return
+
+class Hex_Constant(StringBase): # R414
+    """
+    <hex-constant> = Z ' <digit> [ <digit> ]... '
+                     | Z \" <digit> [ <digit> ]... \"
+    """
+    subclass_names = []
+    def match(string): return StringBase.match(pattern.abs_hex_constant, string)
+    match = staticmethod(match)
+    def init(self, string):
+        self.string = string.upper()
+        return
+
+#R415: <hex-digit> = <digit> | A | B | C | D | E | F
+
+class Signed_Real_Literal_Constant(NumberBase): # R416
+    """
+    <signed-real-literal-constant> = [ <sign> ] <real-literal-constant>
+    """
+    subclass_names = ['Real_Literal_Constant'] # never used
+    def match(string):
+        return NumberBase.match(pattern.abs_signed_real_literal_constant_named, string)
+    match = staticmethod(match)
+
+class Real_Literal_Constant(NumberBase): # R417
+    """
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_real_literal_constant_named, string)
+    match = staticmethod(match)
+
+#R418: <significand> = <digit-string> . [ <digit-string> ]  | . <digit-string>
+#R419: <exponent-letter> = E | D
+#R420: <exponent> = <signed-digit-string>
+
+class Complex_Literal_Constant(Base): # R421
+    """
+    <complex-literal-constant> = ( <real-part>, <imag-part> )
+    """
+    subclass_names = []
+    use_names = ['Real_Part','Imag_Part']
+    def match(string):
+        if string[0]+string[-1]!='()': return
+        if not pattern.abs_complex_literal_constant.match(string):
+            return
+        r,i = string[1:-1].split(',')
+        return Real_Part(r.strip()), Imag_Part(i.strip())
+    match = staticmethod(match)
+    def init(self,real,imag):
+        self.real, self.imag = real, imag
+        return
+    def tostr(self): return '(%s, %s)' % (self.real, self.imag)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.real, self.imag)
+
+class Real_Part(Base): # R422
+    """
+    <real-part> = <signed-int-literal-constant>
+                  | <signed-real-literal-constant>
+                  | <named-constant>
+    """
+    subclass_names = ['Signed_Int_Literal_Constant','Signed_Real_Literal_Constant','Named_Constant']
+
+class Imag_Part(Base): # R423
+    """
+    <imag-part> = <real-part>
+    """
+    subclass_names = ['Signed_Int_Literal_Constant','Signed_Real_Literal_Constant','Named_Constant']
+
+class Char_Selector(Base): # R424
+    """
+    <char-selector> = <length-selector>
+                      | ( LEN = <type-param-value> , KIND = <scalar-int-initialization-expr> )
+                      | ( <type-param-value> , [ KIND = ] <scalar-int-initialization-expr> )
+                      | ( KIND = <scalar-int-initialization-expr> [ , LEN = <type-param-value> ] )
+    """
+    subclass_names = ['Length_Selector']
+    use_names = ['Type_Param_Value','Scalar_Int_Initialization_Expr']
+    def match(string):
+        if string[0]+string[-1] != '()': return
+        line, repmap = string_replace_map(string[1:-1].strip())
+        if line[:3].upper()=='LEN':
+            line = line[3:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+            i = line.find(',')
+            if i==-1: return
+            v = line[:i].rstrip()
+            line = line[i+1:].lstrip()
+            if line[:4].upper()!='KIND': return
+            line = line[4:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+            v = repmap(v)
+            line = repmap(line)
+            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
+        elif line[:4].upper()=='KIND':
+            line = line[4:].lstrip()
+            if not line.startswith('='): return
+            line = line[1:].lstrip()
+            i = line.find(',')
+            if i==-1: return None,Scalar_Int_Initialization_Expr(line)
+            v = line[i+1:].lstrip()
+            line = line[:i].rstrip()
+            if v[:3].upper()!='LEN': return
+            v = v[3:].lstrip()
+            if not v.startswith('='): return
+            v = v[1:].lstrip()
+            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
+        else:
+            i = line.find(',')
+            if i==-1: return
+            v = line[:i].rstrip()
+            line = line[i+1:].lstrip()
+            if line[:4].upper()=='KIND':
+                line = line[4:].lstrip()
+                if not line.startswith('='): return
+                line = line[1:].lstrip()
+            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[0] is None:
+            return '(KIND = %s)' % (self.items[1])
+        return '(LEN = %s, KIND = %s)' % (self.items[0],self.items[1])
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
+class Length_Selector(Base): # R425
+    """
+    <length -selector> = ( [ LEN = ] <type-param-value> )
+                        | * <char-length> [ , ]
+    """
+    subclass_names = []
+    use_names = ['Type_Param_Value','Char_Length']
+    def match(string):
+        if string[0]+string[-1] == '()':
+            line = string[1:-1].strip()
+            if line[:3].upper()=='LEN':
+                line = line[3:].lstrip()
+                if not line.startswith('='): return
+                line = line[1:].lstrip()
+            return '(',Type_Param_Value(line),')'
+        if not string.startswith('*'): return
+        line = string[1:].lstrip()
+        if string[-1]==',': line = line[:-1].rstrip()
+        return '*',Char_Length(line)
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if len(self.items)==2: return '%s%s' % tuple(self.items)
+        return '%sLEN = %s%s' % tuple(self.items)
+    def torepr(self):
+        if len(self.items)==2:
+            return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0],self.items[1],self.items[2])
+
+class Char_Length(BracketBase): # R426
+    """
+    <char-length> = ( <type-param-value> )
+                    | <scalar-int-literal-constant>
+    """
+    subclass_names = ['Scalar_Int_Literal_Constant']
+    use_names = ['Type_Param_Value']
+    def match(string): return BracketBase.match('()',Type_Param_Value, string)
+    match = staticmethod(match)
+
+class Char_Literal_Constant(Base): # R427
+    """
+    <char-literal-constant> = [ <kind-param> _ ] ' <rep-char> '
+                              | [ <kind-param> _ ] \" <rep-char> \"
+    """
+    subclass_names = []
+    rep = pattern.char_literal_constant
+    def match(string):
+        if string[-1] not in '"\'': return
+        if string[-1]=='"':
+            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named2
+        else:
+            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named1
+        line, repmap = string_replace_map(string)
+        m = abs_a_n_char_literal_constant_named.match(line)
+        if not m: return
+        kind_param = m.group('kind_param')
+        line = m.group('value')
+        line = repmap(line)
+        return line, kind_param
+    match = staticmethod(match)
+    def init(self, value, kind_param):
+        self.value = value
+        self.kind_param = kind_param
+        return
+    def tostr(self):
+        if self.kind_param is None: return str(self.value)
+        return '%s_%s' % (self.kind_param, self.value)
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.value, self.kind_param)
+
+class Logical_Literal_Constant(NumberBase): # R428
+    """
+    <logical-literal-constant> = .TRUE. [ _ <kind-param> ]
+                                 | .FALSE. [ _ <kind-param> ]
+    """
+    subclass_names = []
+    def match(string):
+        return NumberBase.match(pattern.abs_logical_literal_constant_named, string)    
+    match = staticmethod(match)
+
+class Derived_Type_Def(Base): # R429
+    """
+    <derived-type-def> = <derived-type-stmt>
+                           [ <type-param-def-stmt> ]...
+                           [ <private-or-sequence> ]...
+                           [ <component-part> ]
+                           [ <type-bound-procedure-part> ]
+                           <end-type-stmt>
+    """
+    subclass_names = []
+    use_names = ['Derived_Type_Stmt', 'Type_Param_Def_Stmt', 'Private_Or_Sequence',
+                 'Component_Part', 'Type_Bound_Procedure_Part', 'End_Type_Stmt']
+
+class Derived_Type_Stmt(Base): # R430
+    """
+    <derived-type-stmt> = TYPE [ [ , <type-attr-spec-list> ] :: ] <type-name> [ ( <type-param-name-list> ) ]
+    """
+    subclass_names = []
+    use_names = ['Type_Attr_Spec_List', 'Type_Name', 'Type_Param_Name_List']
+
+class Type_Name(Name): # C424
+    """
+    <type-name> = <name>
+    <type-name> shall not be DOUBLEPRECISION or the name of intrinsic type
+    """
+    subclass_names = []
+    use_names = []
+    def match(string):
+        if pattern.abs_intrinsic_type_name.match(string): return
+        return Name.match(string)
+    match = staticmethod(match)
+
+class Type_Attr_Spec(Base): # R431
+    """
+    <type-attr-spec> = <access-spec>
+                       | EXTENDS ( <parent-type-name> )
+                       | ABSTRACT
+                       | BIND (C)
+    """
+    subclass_names = ['Access_Spec']
+    use_names = ['Parent_Type_Name']
+
+class Private_Or_Sequence(Base): # R432
+    """
+    <private-or-sequence> = <private-components-stmt>
+                            | <sequence-stmt>
+    """
+    subclass_names = ['Private_Components_Stmt', 'Sequence_Stmt']
+
+class End_Type_Stmt(Base): # R433
+    """
+    <end-type-stmt> = END TYPE [ <type-name> ]
+    """
+    subclass_names = []
+    use_names = ['Type_Name']
+    
+class Sequence_Stmt(Base): # R434
+    """
+    <sequence-stmt> = SEQUENCE
+    """
+    subclass_names = []
+    def match(string):
+        if len(string) != 8: return
+        start = string.upper()
+        if start=='SEQUENCE': return start,
+        return
+    match = staticmethod(match)
+
+class Type_Param_Def_Stmt(Base): # R435
+    """
+    <type-param-def-stmt> = INTEGER [ <kind-selector> ] , <type-param-attr-spec> :: <type-param-decl-list>
+    """
+    subclass_names = []
+    use_names = ['Kind_Selector', 'Type_Param_Attr_Spec', 'Type_Param_Decl_List']
+
+class Type_Param_Decl(Base): # R436
+    """
+    <type-param-decl> = <type-param-name> [ = <scalar-int-initialization-expr> ]
+    """
+    subclass_names = []
+    use_names = ['Type_Param_Name', 'Scalar_Int_Initialization_Expr']
+
+class Type_Param_Attr_Spec(Base): # R437
+    """
+    <type-param-attr-spec> = KIND
+                             | LEN
+    """
+    subclass_names = []
+
+class Component_Part(Base): # R438
+    """
+    <component-part> = [ <component-def-stmt> ]...
+    """
+    subclass_names = []
+    use_names = ['Component_Def_Stmt']
+
+class Component_Def_Stmt(Base): # R439
+    """
+    <component-def-stmt> = <data-component-def-stmt>
+                           | <proc-component-def-stmt>
+    """
+    subclass_names = ['Data_Component_Def_Stmt', 'Proc_Component_Def_Stmt']
+
+class Data_Component_Def_Stmt(Base): # R440
+    """
+    <data-component-def-stmt> = <declaration-type-spec> [ [ , <component-attr-spec-list> ] :: ] <component-decl-list>
+    """
+    subclass_names = []
+    use_names = ['Declaration_Type_Spec', 'Component_Attr_Spec_List', 'Component_Decl_List']
+
+class Component_Attr_Spec(Base): # R441
+    """
+    <component-attr-spec> = POINTER
+                            | DIMENSION ( <component-array-spec> )
+                            | ALLOCATABLE
+                            | <access-spec>
+    """
+    subclass_names = ['Access_Spec']
+    use_names = ['Component_Array_Spec']
+
+class Component_Decl(Base): # R442
+    """
+    <component-decl> = <component-name> [ ( <component-array-spec> ) ] [ * <char-length> ] [ <component-initialization> ]
+    """
+    subclass_names = []
+    use_names = ['Component_Name', 'Component_Array_Spec', 'Char_Length', 'Component_Initialization']
+
+class Component_Array_Spec(Base): # R443
+    """
+    <component-array-spec> = <explicit-shape-spec-list>
+                             | <deferred-shape-spec-list>
+    """
+    subclass_names = ['Explicit_Shape_Spec_List', 'Deferred_Shape_Spec_List']
+
+class Component_Initialization(Base): # R444
+    """
+    <component-initialization> =  = <initialization-expr>
+                                 | => <null-init>
+    """
+    subclass_names = []
+    use_names = ['Initialization_Expr', 'Null_Init']
+
+class Proc_Component_Def_Stmt(Base): # R445
+    """
+    <proc-component-def-stmt> = PROCEDURE ( [ <proc-interface> ] ) , <proc-component-attr-spec-list> :: <proc-decl-list>
+    """
+    subclass_names = []
+    use_names = ['Proc_Interface', 'Proc_Component_Attr_Spec_List', 'Proc_Decl_List']
+
+class Proc_Component_Attr_Spec(Base): # R446
+    """
+    <proc-component-attr-spec> = POINTER
+                                 | PASS [ ( <arg-name> ) ]
+                                 | NOPASS
+                                 | <access-spec>
+    """
+    subclass_names = []
+    use_names = ['Arg_Name', 'Access_Spec']
+
+class Private_Components_Stmt(Base): # R447
+    """
+    <private-components-stmt> = PRIVATE
+    """
+    subclass_names = []
+
+class Type_Bound_Procedure_Part(Base): # R448
+    """
+    <type-bound-procedure-part> = <contains-stmt>
+                                      [ <binding-private-stmt> ]
+                                      <proc-binding-stmt>
+                                      [ <proc-binding-stmt> ]...
+    """
+    subclass_names = []
+    use_names = ['Contains_Stmt', 'Binding_Private_Stmt', 'Proc_Binding_Stmt']
+
+class Binding_Private_Stmt(Base): # R449
+    """
+    <binding-private-stmt> = PRIVATE
+    """
+    subclass_names = []
+
+class Proc_Binding_Stmt(Base): # R450
+    """
+    <proc-binding-stmt> = <specific-binding>
+                          | <generic-binding>
+                          | <final-binding>
+    """
+    subclass_names = ['Specific_Binding', 'Generic_Binding', 'Final_Binding']
+
+class Specific_Binding(Base): # R451
+    """
+    <specific-binding> = PROCEDURE [ ( <interface-name> ) ] [ [ , <binding-attr-list> ] :: ] <binding-name> [ => <procedure-name> ]
+    """
+    subclass_names = []
+    use_names = ['Interface_Name', 'Binding_Attr_List', 'Binding_Name', 'Procedure_Name']
+
+class Generic_Binding(Base): # R452
+    """
+    <generic-binding> = GENERIC [ , <access-spec> ] :: <generic-spec> => <binding-name-list>
+    """
+    subclass_names = []
+    use_names = ['Access_Spec', 'Generic_Spec', 'Binding_Name_List']
+
+class Binding_Attr(Base): # R453
+    """
+    <binding-attr> = PASS [ ( <arg-name> ) ]
+                     | NOPASS
+                     | NON_OVERRIDABLE
+                     | <access-spec>
+    """
+    subclass_names = []
+    use_names = ['Arg_Name', 'Access_Spec']
+
+class Final_Binding(Base): # R454
+    """
+    <final-binding> = FINAL [ :: ] <final-subroutine-name-list>
+    """
+    subclass_names = []
+    use_names = ['Final_Subroutine_Name_List']
+
+class Derived_Type_Spec(CallBase): # R455
+    """
+    <derived-type-spec> = <type-name> [ ( <type-param-spec-list> ) ]
+    """
+    subclass_names = ['Type_Name']
+    use_names = ['Type_Param_Spec_List']
+    def match(string): return CallBase.match(Type_Name, Type_Param_Spec_List, string)
+    match = staticmethod(match)
+
+class Type_Param_Spec(KeywordValueBase): # R456
+    """
+    <type-param-spec> = [ <keyword> = ] <type-param-value>
+    """
+    subclass_names = ['Type_Param_Value']
+    use_names = ['Keyword']
+    def match(string): return KeywordValueBase.match(Type_Param_Value, string)
+    match = staticmethod(match)
+
+class Structure_Constructor_2(KeywordValueBase):
+    """
+    <structure-constructor-2> = [ <keyword> = ] <component-data-source>
+    """
+    subclass_names = ['Component_Data_Source']
+    use_names = ['Keyword']
+    def match(string): return KeywordValueBase.match(Component_Data_Source, string)
+    match = staticmethod(match)
+
+class Structure_Constructor(CallBase): # R457
+    """
+    <structure-constructor> = <derived-type-spec> ( [ <component-spec-list> ] )
+                            | <structure-constructor-2>
+    """
+    subclass_names = ['Structure_Constructor_2']
+    use_names = ['Derived_Type_Spec', 'Component_Spec_List']
+    def match(string): return CallBase.match(Derived_Type_Spec, Component_Spec_List, string)
+    match = staticmethod(match)
+
+class Component_Spec(KeywordValueBase): # R458
+    """
+    <component-spec> = [ <keyword> = ] <component-data-source>
+    """
+    subclass_names = ['Component_Data_Source']
+    use_names = ['Keyword']
+    def match(string): return KeywordValueBase.match(Component_Data_Source, string)
+    match = staticmethod(match)
+
+class Component_Data_Source(Base): # R459
+    """
+    <component-data-source> = <expr>
+                              | <data-target>
+                              | <proc-target>
+    """
+    subclass_names = ['Proc_Target', 'Data_Target', 'Expr']
+
+class Enum_Def(Base): # R460
+    """
+    <enum-def> = <enum-def-stmt>
+                     <enumerator-def-stmt>
+                     [ <enumerator-def-stmt> ]...
+                     <end-enum-stmt>
+    """
+    subclass_names = []
+    use_names = ['Enum_Def_Stmt', 'Enumerator_Def_Stmt', 'End_Enum_Stmt']
+
+class Enum_Def_Stmt(Base): # R461
+    """
+    <enum-def-stmt> = ENUM, BIND(C)
+    """
+    subclass_names = []
+
+class Enumerator_Def_Stmt(Base): # R462
+    """
+    <enumerator-def-stmt> = ENUMERATOR [ :: ] <enumerator-list>
+    """
+    subclass_names = []
+    use_names = ['Enumerator_List']
+
+class Enumerator(BinaryOpBase): # R463
+    """
+    <enumerator> = <named-constant> [ = <scalar-int-initialization-expr> ]
+    """
+    subclass_names = ['Named_Constant']
+    use_names = ['Scalar_Int_Initialization_Expr']
+    def match(string):
+        if '=' not in string: return
+        lhs,rhs = string.split('=',1)
+        return Named_Constant(lhs.rstrip()),'=',Scalar_Int_Initialization_Expr(rhs.lstrip())
+    match = staticmethod(match)
+
+class End_Enum_Stmt(Base): # R464
+    """
+    <end-enum-stmt> = END ENUM
+    """
+    subclass_names = []
+
+class Array_Constructor(BracketBase): # R469
+    """
+    <array-constructor> = (/ <ac-spec> /)
+                          | <left-square-bracket> <ac-spec> <right-square-bracket>
+
+    """
+    subclass_names = []
+    use_names = ['Ac_Spec']
+    def match(string):
+        try:
+            obj = BracketBase.match('(//)', Ac_Spec, string)
+        except NoMatchError:
+            obj = None
+        if obj is None:
+            obj = BracketBase.match('[]', Ac_Spec, string)
+        return obj
+    match = staticmethod(match)
+
+class Ac_Spec(Base): # R466
+    """
+    <ac-spec> = <type-spec> ::
+                | [ <type-spec> :: ] <ac-value-list>
+    """
+    subclass_names = ['Ac_Value_List']
+    use_names = ['Type_Spec']
+    def match(string):
+        if string.endswith('::'):
+            return Type_Spec(string[:-2].rstrip()),None
+        line, repmap = string_replace_map(string)
+        i = line.find('::')
+        if i==-1: return
+        ts = line[:i].rstrip()
+        line = line[i+2:].lstrip()
+        ts = repmap(ts)
+        line = repmap(line)
+        return Type_Spec(ts),Ac_Value_List(line)
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self):
+        if self.items[0] is None:
+            return str(self.items[1])
+        if self.items[1] is None:
+            return str(self.items[0]) + ' ::'
+        return str(self.items[0]) + ' :: ' + str(self.items[1])
+    def torepr(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+# R467: <left-square-bracket> = [
+# R468: <right-square-bracket> = ]
+
+class Ac_Value(Base): # R469
+    """
+    <ac-value> = <expr>
+                 | <ac-implied-do>
+    """
+    subclass_names = ['Ac_Implied_Do','Expr']
+
+class Ac_Implied_Do(Base): # R470
+    """
+    <ac-implied-do> = ( <ac-value-list> , <ac-implied-do-control> )
+    """
+    subclass_names = []
+    use_names = ['Ac_Value_List','Ac_Implied_Do_Control']    
+    def match(string):
+        if string[0]+string[-1] != '()': return
+        line, repmap = string_replace_map(string[1:-1].strip())
+        i = line.rfind('=')
+        if i==-1: return
+        j = line[:i].rfind(',')
+        assert j!=-1
+        s1 = repmap(line[:j].rstrip())
+        s2 = repmap(line[j+1:].lstrip())
+        return Ac_Value_List(s1),Ac_Implied_Do_Control(s2)
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return '(%s, %s)' % tuple(self.items)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
+class Ac_Implied_Do_Control(Base): # R471
+    """
+    <ac-implied-do-control> = <ac-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]    
+    """
+    subclass_names = []
+    use_names = ['Ac_Do_Variable','Scalar_Int_Expr']
+    def match(string):
+        i = string.find('=')
+        if i==-1: return
+        s1 = string[:i].rstrip()
+        line, repmap = string_replace_map(string[i+1:].lstrip())
+        t = line.split(',')
+        if not (2<=len(t)<=3): return
+        t = [Scalar_Int_Expr(s.strip()) for s in t]
+        return Ac_Do_Variable(s1), t
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return '%s = %s' % (self.items[0], ', '.join(map(str,self.items[1])))
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
+
+class Ac_Do_Variable(Base): # R472
+    """
+    <ac-do-variable> = <scalar-int-variable>
+    <ac-do-variable> shall be a named variable    
+    """
+    subclass_names = ['Scalar_Int_Variable']
+
+###############################################################################
+############################### SECTION  5 ####################################
+###############################################################################
+
+class Type_Declaration_Stmt(Base): # R501
+    """
+    <type-declaration-stmt> = <declaration-type-spec> [ [ , <attr-spec> ]... :: ] <entity-decl-list>
+    """
+    subclass_names = []
+    use_names = ['Declaration_Type_Spec', 'Attr_Spec_List', 'Entity_Decl_List']
+
+    def match(string):
+        line, repmap = string_replace_map(string)
+        i = line.find(',')
+        if i==-1:
+            i = line.find('::')
+        if i==-1:
+            m = re.search(r'\s[a-z_]',line,re.I)
+            if m is None: return
+            i = m.start()
+        type_spec = Declaration_Type_Spec(repmap(line[:i]))
+        if type_spec is None: return
+        line = line[i:].lstrip()
+        if line.startswith(','):
+            i = line.find('::')
+            if i==-1: return
+            attr_specs = Attr_Spec_List(repmap(line[1:i].strip()))
+            if attr_specs is None: return
+            line = line[i:]
+        else:
+            attr_specs = None
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        entity_decls = Entity_Decl_List(repmap(line))
+        if entity_decls is None: return
+        return type_spec, attr_specs, entity_decls
+    match = staticmethod(match)
+    def init(self, *args):
+        self.type_spec, self.attr_specs, self.entity_decls = args
+        return
+    def tostr(self):
+        if self.attr_specs is None:
+            return '%s :: %s' % (self.type_spec, self.entity_decls)
+        else:
+            return '%s, %s :: %s' % (self.type_spec, self.attr_specs, self.entity_decls)
+    def torepr(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.type_spec, self.attr_specs, self.entity_decls)
+
+class Declaration_Type_Spec(Base): # R502
+    """
+    <declaration-type-spec> = <intrinsic-type-spec>
+                              | TYPE ( <derived-type-spec> )
+                              | CLASS ( <derived-type-spec> )
+                              | CLASS ( * )
+    """
+    subclass_names = ['Intrinsic_Type_Spec']
+    use_names = ['Derived_Type_Spec']
+
+    def match(string):
+        if string[-1] != ')': return
+        start = string[:4].upper()
+        if start == 'TYPE':
+            line = string[4:].lstrip()
+            if not line.startswith('('): return
+            return 'TYPE',Derived_Type_Spec(line[1:-1].strip())
+        start = string[:5].upper()
+        if start == 'CLASS':
+            line = string[5:].lstrip()
+            if not line.startswith('('): return
+            line = line[1:-1].strip()
+            if line=='*': return 'CLASS','*'
+            return 'CLASS', Derived_Type_Spec(line)
+        return
+    match = staticmethod(match)
+    init = Base.init_list
+    def tostr(self): return '%s(%s)' % tuple(map(str,self.items))
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
+
+class Dimension_Attr_Spec(CallBase):
+    """
+    <dimension-attr-spec> = DIMENSION ( <array-spec> )
+    """
+    subclass_names = []
+    use_names = ['Array_Spec']
+    def match(string): return CallBase.match(pattern.abs_dimension, Array_Spec, string)
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs = lhs.upper()
+        self.rhs = rhs
+        return
+
+class Intent_Attr_Spec(CallBase):
+    """
+    <intent-attr-spec> = INTENT ( <intent-spec> )
+    """
+    subclass_names = []
+    use_names = ['Intent_Spec']
+    def match(string): return CallBase.match(pattern.abs_intent, Intent_Spec, string)
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs = lhs.upper()
+        self.rhs = rhs
+        return
+
+class Attr_Spec(STRINGBase): # R503
+    """
+    <attr-spec> = <access-spec>
+                  | ALLOCATABLE
+                  | ASYNCHRONOUS
+                  | DIMENSION ( <array-spec> )
+                  | EXTERNAL
+                  | INTENT ( <intent-spec> )
+                  | INTRINSIC
+                  | <language-binding-spec>
+                  | OPTIONAL
+                  | PARAMETER
+                  | POINTER
+                  | PROTECTED
+                  | SAVE
+                  | TARGET
+                  | VALUE
+                  | VOLATILE
+    """
+    subclass_names = ['Access_Spec', 'Language_Binding_Spec',
+                      'Dimension_Attr_Spec', 'Intent_Attr_Spec']
+    use_names = []
+    def match(string): return STRINGBase.match(pattern.abs_attr_spec, string)
+    match = staticmethod(match)
+
+class Entity_Decl(Base): # R504
+    """
+    <entity-decl> = <object-name> [ ( <array-spec> ) ] [ * <char-length> ] [ <initialization> ]
+                    | <function-name> [ * <char-length> ]
+    """
+    subclass_names = []
+    use_names = ['Object_Name', 'Array_Spec', 'Char_Length', 'Initialization', 'Function_Name']
+    def match(string):
+        m = pattern.name.match(string)
+        if m is None: return
+        name = Name(m.group())
+        newline = string[m.end():].lstrip()
+        if not newline: return name, None, None, None
+        array_spec = None
+        char_length = None
+        init = None
+        if newline.startswith('('):
+            line, repmap = string_replace_map(newline)
+            i = line.find(')')
+            if i==-1: return
+            array_spec = Array_Spec(repmap(line[1:i].strip()))
+            newline = repmap(line[i+1:].lstrip())
+        if newline.startswith('*'):
+            line, repmap = string_replace_map(newline)
+            i = line.find('=')
+            if i!=-1:
+                char_length = repmap(line[1:i].strip())
+                newline = repmap(newline[i:].lstrip())
+            else:
+                char_length = repmap(newline[1:].strip())
+                newline = ''
+            char_length = Char_Length(char_length)
+        if newline.startswith('='):
+            init = Initialization(newline)
+        else:
+            assert newline=='',`newline`
+        return name, array_spec, char_length, init
+    match = staticmethod(match)
+    def init(self, *args):
+        self.name, self.array_spec, self.char_length, self.init = args
+        return
+    def tostr(self):
+        s = str(self.name)
+        if self.array_spec is not None:
+            s += '(' + str(self.array_spec) + ')'
+        if self.char_length is not None:
+            s += '*' + str(self.char_length)
+        if self.init is not None:
+            s += ' ' + str(self.init)
+        return s
+    def torepr(self):
+        return '%s(%r, %r, %r, %r)' \
+               % (self.__class__.__name__, self.name, self.array_spec, self.char_length, self.init)
+    
+class Object_Name(Base): # R505
+    """
+    <object-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Initialization(Base): # R506
+    """
+    <initialization> =  = <initialization-expr>
+                       | => <null-init> 
+    """
+    subclass_names = []
+    use_names = ['Initialization_Expr', 'Null_Init']
+    def match(string):
+        if string.startswith('=>'):
+            return '=>', Null_Init(string[2:].lstrip())
+        if string.startswith('='):
+            return '=', Initialization_Expr(string[2:].lstrip())
+        return
+    match = staticmethod(match)
+    def init(self, op, rhs):
+        self.op = op
+        self.rhs = rhs
+        return
+    def tostr(self): return '%s %s' % (self.op, self.rhs)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.op, self.rhs)
+
+class Null_Init(Base): # R507
+    """
+    <null-init> = <function-reference>
+
+    <function-reference> shall be a reference to the NULL intrinsic function with no arguments.
+    """
+    subclass_names = ['Function_Reference']
+
+class Access_Spec(STRINGBase): # R508
+    """
+    <access-spec> = PUBLIC
+                    | PRIVATE
+    """
+    subclass_names = []
+    def match(string): return STRINGBase.match(pattern.abs_access_spec, string)
+    match = staticmethod(match)
+
+class Language_Binding_Spec(Base): # R509
+    """
+    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
+    """
+    subclass_names = []
+    use_names = ['Scalar_Char_Initialization_Expr']
+    def match(string):
+        start = string[:4].upper()
+        if start != 'BIND': return
+        line = string[4:].lstrip()
+        if not line or line[0]+line[-1]!='()': return
+        line = line[1:-1].strip()
+        if not line: return
+        start = line[0].upper()
+        if start!='C': return
+        line = line[1:].lstrip()
+        if not line: return None,
+        if not line.startswith(','): return
+        line = line[1:].lstrip()
+        start = line[:4].upper()
+        if start!='NAME': return
+        line=line[4:].lstrip()
+        if not line.startswith('='): return
+        return Scalar_Char_Initialization_Expr(line[1:].lstrip()),
+    match = staticmethod(match)
+    def init(self, name):
+        self.name = name
+    def tostr(self):
+        if self.name is None: return 'BIND(C)'
+        return 'BIND(C, NAME = %s)' % (self.name)
+    def torepr(self):
+        return '%s(%r)' % (self.__class__.__name__, self.name)
+
+class Array_Spec(Base): # R510
+    """
+    <array-spec> = <explicit-shape-spec-list>
+                   | <assumed-shape-spec-list>
+                   | <deferred-shape-spec-list>
+                   | <assumed-size-spec>
+    """
+    subclass_names = ['Explicit_Shape_Spec_List', 'Assumed_Shape_Spec_List',
+                      'Deferred_Shape_Spec_List', 'Assumed_Size_Spec']
+
+class Explicit_Shape_Spec(SeparatorBase): # R511
+    """
+    <explicit-shape-spec> = [ <lower-bound> : ] <upper-bound>
+    """
+    subclass_names = ['Upper_Bound']
+    use_names = ['Lower_Bound']
+    def match(string):
+        line, repmap = string_replace_map(string)
+        if ':' not in line: return
+        lower,upper = line.split(':',1)
+        return Lower_Bound(repmap(lower)), Upper_Bound(repmap(upper))
+    match = staticmethod(match)
+    
+class Lower_Bound(Base): # R512
+    """
+    <lower-bound> = <specification-expr>
+    """
+    subclass_names = ['Specification_Expr']
+
+class Upper_Bound(Base): # R513
+    """
+    <upper-bound> = <specification-expr>
+    """
+    subclass_names = ['Specification_Expr']
+
+class Assumed_Shape_Spec(Base): # R514
+    """
+    <assumed-shape-spec> = [ <lower-bound> ] :
+    """
+    subclass_names = []
+    use_names = ['Lower_Bound']
+
+class Deferred_Shape_Spec(Base): # R515
+    """
+    <deferred_shape_spec> = :
+    """
+    subclass_names = []
+
+class Assumed_Size_Spec(Base): # R516
+    """
+    <assumed-size-spec> = [ <explicit-shape-spec-list> , ] [ <lower-bound> : ] *
+    """
+    subclass_names = []
+    use_names = ['Explicit_Shape_Spec_List', 'Lower_Bound']
+
+class Intent_Spec(STRINGBase): # R517
+    """
+    <intent-spec> = IN
+                    | OUT
+                    | INOUT
+    """
+    subclass_names = []
+    def match(string): return STRINGBase.match(pattern.abs_intent_spec, string)
+    match = staticmethod(match)
+
+class Access_Stmt(Base): # R518
+    """
+    <access-stmt> = <access-spec> [ [ :: ] <access-id-list> ]
+    """
+    subclass_names = []
+    use_names = ['Access_Spec', 'Access_Id_List']
+
+class Access_Id(Base): # R519
+    """
+    <access-id> = <use-name>
+                  | <generic-spec>
+    """
+    subclass_names = ['Use_Name', 'Generic_Spec']
+
+class Allocatable_Stmt(Base): # R520
+    """
+    <allocateble-stmt> = ALLOCATABLE [ :: ] <object-name> [ ( <deferred-shape-spec-list> ) ] [ , <object-name> [ ( <deferred-shape-spec-list> ) ] ]...
+    """
+    subclass_names = []
+    use_names = ['Object_Name', 'Deferred_Shape_Spec_List']
+
+class Asynchronous_Stmt(Base): # R521
+    """
+    <asynchronous-stmt> = ASYNCHRONOUS [ :: ] <object-name-list>
+    """
+    subclass_names = []
+    use_names = ['Object_Name_List']
+
+class Bind_Stmt(Base): # R522
+    """
+    <bind-stmt> = <language-binding-spec> [ :: ] <bind-entity-list>
+    """
+    subclass_names = []
+    use_names = ['Language_Binding_Spec', 'Bind_Entity_List']
+
+class Bind_Entity(Base): # R523
+    """
+    <bind-entity> = <entity-name>
+                    | / <common-block-name> /
+    """
+    subclass_names = ['Entity_Name']
+    use_names = ['Common_Block_Name']
+
+class Data_Stmt(Base): # R524
+    """
+    <data-stmt> = DATA <data-stmt-set> [ [ , ] <data-stmt-set> ]...
+    """
+    subclass_names = []
+    use_names = ['Data_Stmt_Set']
+
+class Data_Stmt_Set(Base): # R525
+    """
+    <data-stmt-set> = <data-stmt-object-list> / <data-stmt-value-list> /
+    """
+    subclass_names = []
+    use_names = ['Data_Stmt_Object_List', 'Data_Stmt_Value_List']
+
+class Data_Stmt_Object(Base): # R526
+    """
+    <data-stmt-object> = <variable>
+                         | <data-implied-do>
+    """
+    subclass_names = ['Variable', 'Data_Implied_Do']
+
+class Data_Implied_Do(Base): # R527
+    """
+    <data-implied-do> = ( <data-i-do-object-list> , <data-i-do-variable> = <scalar-int-expr > , <scalar-int-expr> [ , <scalar-int-expr> ] )
+    """
+    subclass_names = []
+    use_names = ['Data_I_Do_Object_List', 'Data_I_Do_Variable', 'Scalar_Int_Expr']
+
+class Data_I_Do_Object(Base): # R528
+    """
+    <data-i-do-object> = <array-element>
+                         | <scalar-structure-component>
+                         | <data-implied-do>
+    """
+    subclass_names = ['Array_Element', 'Scalar_Structure_Component', 'Data_Implied_Do']
+
+class Data_I_Do_Variable(Base): # R529
+    """
+    <data-i-do-variable> = <scalar-int-variable>
+    """
+    subclass_names = ['Scalar_Int_Variable']
+
+class Data_Stmt_Value(Base): # R530
+    """
+    <data-stmt-value> = [ <data-stmt-repeat> * ] <data-stmt-constant>
+    """
+    subclass_names = []
+    use_names = ['Data_Stmt_Repeat', 'Data_Stmt_Constant']
+
+class Data_Stmt_Repeat(Base): # R531
+    """
+    <data-stmt-repeat> = <scalar-int-constant>
+                         | <scalar-int-constant-subobject>
+    """
+    subclass_names = ['Scalar_Int_Constant', 'Scalar_Int_Constant_Subobject']
+
+class Data_Stmt_Constant(Base): # R532
+    """
+    <data-stmt-constant> = <scalar-constant>
+                           | <scalar-constant-subobject>
+                           | <signed-int-literal-constant>
+                           | <signed-real-literal-constant>
+                           | <null-init>
+                           | <structure-constructor>
+    """
+    subclass_names = ['Scalar_Constant', 'Scalar_Constant_Subobject',
+                      'Signed_Int_Literal_Constant', 'Signed_Real_Literal_Constant',
+                      'Null_Init', 'Structure_Constructor']
+
+class Int_Constant_Subobject(Base): # R533
+    """
+    <int-constant-subobject> = <constant-subobject>
+    """
+    subclass_names = ['Constant_Subobject']
+
+class Constant_Subobject(Base): # R534
+    """
+    <constant-subobject> = <designator>
+    """
+    subclass_names = ['Designator']
+
+class Dimension_Stmt(Base): # R535
+    """
+    <dimension-stmt> = DIMENSION [ :: ] <array-name> ( <array-spec> ) [ , <array-name> ( <array-spec> ) ]...
+    """
+    subclass_names = []
+    use_names = ['Array_Name', 'Array_Spec']
+
+class Intent_Stmt(Base): # R536
+    """
+    <intent-stmt> = INTENT ( <intent-spec> ) [ :: ] <dummy-arg-name-list>
+    """
+    subclass_names = []
+    use_names = ['Intent_Spec', 'Dummy_Arg_Name_List']
+
+class Optional_Stmt(Base): # R537
+    """
+    <optional-stmt> = OPTIONAL [ :: ] <dummy-arg-name-list>
+    """
+    subclass_names = []
+    use_names = ['Dummy_Arg_Name_List']
+
+class Parameter_Stmt(Base): # R538
+    """
+    <parameter-stmt> = PARAMETER ( <named-constant-def-list> )
+    """
+    subclass_names = []
+    use_names = ['Named_Constant_Def_List']
+
+class Named_Constant_Def(Base): # R539
+    """
+    <named-constant-def> = <named-constant> = <initialization-expr>
+    """
+    subclass_names = []
+    use_names = ['Named_Constant', 'Initialization_Expr']
+
+class Pointer_Stmt(Base): # R540
+    """
+    <pointer-stmt> = POINTER [ :: ] <pointer-decl-list>
+    """
+    subclass_names = []
+    use_names = ['Pointer_Decl_List']
+
+class Pointer_Decl(Base): # R541
+    """
+    <pointer-decl> = <object-name> [ ( <deferred-shape-spec-list> ) ]
+                     | <proc-entity-name>
+    """
+    use_names = ['Object_Name', 'Deferred_Shape_Spec_List']
+    subclass_names = ['Proc_Entity_Name']
+
+class Protected_Stmt(Base): # R542
+    """
+    <protected-stmt> = PROTECTED [ :: ] <entity-name-list>
+    """
+    subclass_names = []
+    use_names = ['Entity_Name_List']
+
+class Save_Stmt(Base): # R543
+    """
+    <save-stmt> = SAVE [ [ :: ] <saved-entity-list> ]
+    """
+    subclass_names = []
+    use_names = ['Saved_Entity_List']
+
+class Saved_Entity(Base): # R544
+    """
+    <saved-entity> = <object-name>
+                     | <proc-pointer-name>
+                     | / <common-block-name> /
+    """
+    subclass_names = ['Object_Name', 'Proc_Pointer_Name']
+    use_names = ['Common_Block_Name']
+
+class Proc_Pointer_Name(Base): # R545
+    """
+    <proc-pointer-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Target_Stmt(Base): # R546
+    """
+    <target-stmt> = TARGET [ :: ] <object-name> [ ( <array-spec> ) ] [ , <object-name> [ ( <array-spec> ) ]]
+    """
+    subclass_names = []
+    use_names = ['Object_Name', 'Array_Spec']
+
+class Value_Stmt(Base): # R547
+    """
+    <value-stmt> = VALUE [ :: ] <dummy-arg-name-list>
+    """
+    subclass_names = []
+    use_names = ['Dummy_Arg_Name_List']
+
+class Volatile_Stmt(Base): # R548
+    """
+    <volatile-stmt> = VOLATILE [ :: ] <object-name-list>
+    """
+    subclass_names = []
+    use_names = ['Object_Name_List']
+
+class Implicit_Stmt(Base): # R549
+    """
+    <implicit-stmt> = IMPLICIT <implicit-spec-list>
+                      | IMPLICIT NONE
+    """
+    subclass_names = []
+    use_names = ['Implicit_Spec_List']
+
+class Implicit_Spec(Base): # R550
+    """
+    <implicit-spec> = <declaration-type-spec> ( <letter-spec-list> )
+    """
+    subclass_names = []
+    use_names = ['Declaration_Type_Spec', 'Letter_Spec_List']
+
+class Letter_Spec(Base): # R551
+    """
+    <letter-spec> = <letter> [ - <letter> ]
+    """
+    subclass_names = []
+
+class Namelist_Stmt(Base): # R552
+    """
+    <namelist-stmt> = NAMELIST / <namelist-group-name> / <namelist-group-object-list> [ [ , ] / <namelist-group-name> / <namelist-group-object-list> ]
+    """
+    subclass_names = []
+    use_names = ['Namelist_Group_Name', 'Namelist_Group_Object_List']
+
+class Namelist_Group_Object(Base): # R553
+    """
+    <namelist-group-object> = <variable-name>
+    """
+    subclass_names = ['Variable_Name']
+
+class Equivalence_Stmt(Base): # R554
+    """
+    <equivalence-stmt> = EQUIVALENCE <equivalence-set-list>
+    """
+    subclass_names = []
+    use_names = ['Equivalence_Set_List']
+
+class Equivalence_Set(Base): # R555
+    """
+    <equivalence-set> = ( <equivalence-object> , <equivalence-object-list> )
+    """
+    subclass_names = []
+    use_names = ['Equivalence_Object', 'Equivalence_Object_List']
+
+class Equivalence_Object(Base): # R556
+    """
+    <equivalence-object> = <variable-name>
+                           | <array-element>
+                           | <substring>
+    """
+    subclass_names = ['Variable_Name', 'Array_Element', 'Substring']
+
+class Common_Stmt(Base): # R557
+    """
+    <common-stmt> = COMMON [ / [ <common-block-name> ] / ] <common-block-object-list> [ [ , ] / [ <common-block-name> ] / <common-block-object-list> ]...
+    """
+    subclass_names = []
+    use_names = ['Common_Block_Name', 'Common_Block_Object_List']
+
+class Common_Block_Object(Base): # R558
+    """
+    <common-block-object> = <variable-name> [ ( <explicit-shape-spec-list> ) ]
+                            | <proc-pointer-name>
+    """
+    subclass_names = ['Proc_Pointer_Name']
+    use_names = ['Variable_Name', 'Explicit_Shape_Spec_List']
+
+###############################################################################
+############################### SECTION  6 ####################################
+###############################################################################
+
+class Variable(Base): # R601
+    """
+    <variable> = <designator>
+    """
+    subclass_names = ['Designator']
+
+class Variable_Name(Base): # R602
+    """
+    <variable-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Designator(Base): # R603
+    """
+    <designator> = <object-name>
+                   | <array-element>
+                   | <array-section>
+                   | <structure-component>
+                   | <substring>
+    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
+    <structure-component> = <data-ref>
+    """
+    subclass_names = ['Object_Name','Array_Section','Array_Element','Structure_Component',
+                      'Substring'
+                      ]
+
+class Logical_Variable(Base): # R604
+    """
+    <logical-variable> = <variable>
+    """
+    subclass_names = ['Variable']
+
+class Default_Logical_Variable(Base): # R605
+    """
+    <default-logical-variable> = <variable>
+    """
+    subclass_names = ['Variable']
+
+class Char_Variable(Base): # R606
+    """
+    <char-variable> = <variable>
+    """
+    subclass_names = ['Variable']
+
+class Default_Char_Variable(Base): # R607
+    """
+    <default-char-variable> = <variable>
+    """
+    subclass_names = ['Variable']
+
+
+class Int_Variable(Base): # R608
+    """
+    <int-variable> = <variable>
+    """
+    subclass_names = ['Variable']
+
+
+class Substring(CallBase): # R609
+    """
+    <substring> = <parent-string> ( <substring-range> )    
+    """
+    subclass_names = []
+    use_names = ['Parent_String','Substring_Range']
+    def match(string): return CallBase.match(Parent_String, Substring_Range, string)
+    match = staticmethod(match)
+
+class Parent_String(Base): # R610
+    """
+    <parent-string> = <scalar-variable-name>
+                      | <array-element>
+                      | <scalar-structure-component>
+                      | <scalar-constant>    
+    """
+    subclass_names = ['Scalar_Variable_Name', 'Array_Element', 'Scalar_Structure_Component', 'Scalar_Constant']
+
+class Substring_Range(Base): # R611
+    """
+    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
+    """
+    subclass_names = []
+    use_names = ['Scalar_Int_Expr']
+    def match(string):
+        line, repmap = string_replace_map(string)
+        if ':' not in line: return
+        lhs,rhs = line.split(':',1)
+        lhs = lhs.rstrip()
+        rhs = rhs.lstrip()
+        lhs_obj, rhs_obj = None, None
+        if lhs:
+            lhs_obj = Scalar_Int_Expr(repmap(lhs))
+        if rhs:
+            rhs_obj = Scalar_Int_Expr(repmap(rhs))
+        return lhs_obj, rhs_obj
+    match = staticmethod(match)
+    def init(self, lhs, rhs):
+        self.lhs, self.rhs = lhs, rhs
+        return
+    def tostr(self):
+        if self.lhs is None:
+            if self.rhs is None: return ':'
+            return ': '+ str(self.rhs)
+        else:
+            if self.rhs is None: return str(self.lhs)+' :'
+            return str(self.lhs)+' : '+ str(self.rhs)
+    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.lhs, self.rhs)
+
+class Data_Ref(SequenceBase): # R612
+    """
+    <data-ref> = <part-ref> [ % <part-ref> ]...
+    """
+    subclass_names = ['Part_Ref']
+    use_names = []
+    def match(string): return SequenceBase.match('%', Part_Ref, string)
+    match = staticmethod(match)
+
+class Part_Ref(CallBase): # R613
+    """
+    <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
+    """
+    subclass_names = ['Part_Name']
+    use_names = ['Section_Subscript_List']
+    def match(string): return CallBase.match(Part_Name, Section_Subscript_List, string)
+    match = staticmethod(match)
+
+class Structure_Component(Base): # R614
+    """
+    <structure-component> = <data-ref>
+    """
+    subclass_names = ['Data_Ref']
+
+class Type_Param_Inquiry(BinaryOpBase): # R615
+    """
+    <type-param-inquiry> = <designator> % <type-param-name>
+    """
+    subclass_names = []
+    use_names = ['Designator','Type_Param_Name']
+    def match(string):
+        return BinaryOpBase.match(\
+            Designator, pattern.percent_op.named(), Type_Param_Name, string)
+    match = staticmethod(match)
+
+class Array_Element(Base): # R616
+    """
+    <array-element> = <data-ref>
+    """
+    subclass_names = ['Data_Ref']
+
+class Array_Section(CallBase): # R617
+    """
+    <array-section> = <data-ref> [ ( <substring-range> ) ]
+    """
+    subclass_names = ['Data_Ref']
+    use_names = ['Substring_Range']
+    def match(string): return CallBase.match(Data_Ref, Substring_Range, string)
+    match = staticmethod(match)
+
+class Subscript(Base): # R618
+    """
+    <subscript> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Section_Subscript(Base): # R619
+    """
+    <section-subscript> = <subscript>
+                          | <subscript-triplet>
+                          | <vector-subscript>
+    """
+    subclass_names = ['Subscript_Triplet', 'Vector_Subscript', 'Subscript']
+
+class Subscript_Triplet(Base): # R620
+    """
+    <subscript-triplet> = [ <subscript> ] : [ <subscript> ] [ : <stride> ]
+    """
+    subclass_names = []
+    use_names = ['Subscript','Stride']
+    def match(string):
+        line, repmap = string_replace_map(string)
+        t = line.split(':')
+        if len(t)<=1 or len(t)>3: return
+        lhs_obj,rhs_obj, stride_obj = None, None, None
+        if len(t)==2:
+            lhs,rhs = t[0].rstrip(),t[1].lstrip()
+        else:
+            lhs,rhs,stride = t[0].rstrip(),t[1].strip(),t[2].lstrip()
+            if stride:
+                stride_obj = Stride(repmap(stride))
+        if lhs:
+            lhs_obj = Subscript(repmap(lhs))
+        if rhs:
+            rhs_obj = Subscript(repmap(rhs))
+        return lhs_obj, rhs_obj, stride_obj
+    match = staticmethod(match)
+    def init(self, lhs, rhs, stride):
+        self.lhs, self.rhs, self.stride =lhs, rhs, stride
+        return
+    def tostr(self):
+        s = ''
+        if self.lhs is not None:
+            s += str(self.lhs) + ' :'
+        else:
+            s += ':'
+        if self.rhs is not None:
+            s += ' ' + str(self.rhs)
+        if self.stride is not None:
+            s += ' : ' + str(self.stride)
+        return s
+    def torepr(self):
+        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.rhs, self.stride)        
+
+class Stride(Base): # R621
+    """
+    <stride> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Vector_Subscript(Base): # R622
+    """
+    <vector-subscript> = <int-expr>
+    """
+    subclass_names = ['Int_Expr']
+
+class Allocate_Stmt(Base): # R623
+    """
+    <allocate-stmt> = ALLOCATE ( [ <type-spec> :: ] <allocation-list> [ , <alloc-opt-list> ] )
+    """
+    subclass_names = []
+    use_names = ['Type_Spec', 'Allocation_List', 'Alloc_Opt_List']
+    
+class Alloc_Opt(Base):# R624
+    """
+    <alloc-opt> = STAT = <stat-variable>
+                  | ERRMSG = <errmsg-variable>
+                  | SOURCE = <source-expr>
+    """
+    subclass_names = []
+    use_names = ['Stat_Variable', 'Errmsg_Variable', 'Source_Expr',
+                 ]
+
+class Stat_Variable(Base):# R625
+    """
+    <stat-variable> = <scalar-int-variable>
+    """
+    subclass_names = ['Scalar_Int_Variable']
+
+class Errmsg_Variable(Base):# R626
+    """
+    <errmsg-variable> = <scalar-default-char-variable>
+    """
+    subclass_names = ['Scalar_Default_Char_Variable']
+
+class Source_Expr(Base):# R627
+    """
+    <source-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Allocation(Base):# R628
+    """
+    <allocation> = <allocate-object> [ <allocate-shape-spec-list> ]
+                 | <variable-name>
+    """
+    subclass_names = ['Variable_Name']
+    use_names = ['Allocate_Object', 'Allocate_Shape_Spec_List']
+
+class Allocate_Object(Base): # R629
+    """
+    <allocate-object> = <variable-name>
+                        | <structure-component>
+    """
+    subclass_names = ['Variable_Name', 'Structure_Component']
+
+class Allocate_Shape_Spec(Base): # R630
+    """
+    <allocate-shape-spec> = [ <lower-bound-expr> : ] <upper-bound-expr>
+    """
+    subclass_names = []
+    use_names = ['Lower_Bound_Expr', 'Upper_Bound_Expr']
+
+class Lower_Bound_Expr(Base): # R631
+    """
+    <lower-bound-expr> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Upper_Bound_Expr(Base): # R632
+    """
+    <upper-bound-expr> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Nullify_Stmt(Base): # R633
+    """
+    <nullify-stmt> = NULLIFY ( <pointer-object-list> )
+    """
+    subclass_names = []
+    use_names = ['Pointer_Object_List']
+
+class Pointer_Object(Base): # R634
+    """
+    <pointer-object> = <variable-name>
+                       | <structure-component>
+                       | <proc-pointer-name>
+    """
+    subclass_names = ['Variable_Name', 'Structure_Component', 'Proc_Pointer_Name']
+
+class Deallocate_Stmt(Base): # R635
+    """
+    <deallocate-stmt> = DEALLOCATE ( <allocate-object-list> [ , <dealloc-opt-list> ] )
+    """
+    subclass_names = []
+    use_names = ['Allocate_Object_List', 'Dealloc_Opt_List']
+
+class Dealloc_Opt(Base): # R636
+    """
+    <dealloc-opt> = STAT = <stat-variable>
+                    | ERRMSG = <errmsg-variable>
+    """
+    subclass_names = []
+    use_names = ['Stat_Variable', 'Errmsg_Variable']
+
+
+class Scalar_Char_Initialization_Expr(Base):
+    subclass_names = ['Char_Initialization_Expr']
+
+###############################################################################
+############################### SECTION  7 ####################################
+###############################################################################
+
+class Primary(Base): # R701
+    """
+    <primary> = <constant>
+                | <designator>
+                | <array-constructor>
+                | <structure-constructor>
+                | <function-reference>
+                | <type-param-inquiry>
+                | <type-param-name>
+                | ( <expr> )
+    """
+    subclass_names = ['Constant', 'Parenthesis', 'Designator','Array_Constructor',
+                      'Structure_Constructor',
+                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 
+                       ]
+
+class Parenthesis(BracketBase):
+    """
+    <parenthesis> = ( <expr> )
+    """
+    subclass_names = []
+    use_names = ['Expr']
+    def match(string): return BracketBase.match('()', Expr, string)
+    match = staticmethod(match)
+
+class Level_1_Expr(UnaryOpBase): # R702
+    """
+    <level-1-expr> = [ <defined-unary-op> ] <primary>
+    <defined-unary-op> = . <letter> [ <letter> ]... .
+    """
+    subclass_names = ['Primary']
+    use_names = []
+    def match(string):
+        if pattern.non_defined_binary_op.match(string):
+            raise NoMatchError,`string`
+        return UnaryOpBase.match(\
+            pattern.defined_unary_op.named(),Primary,string)
+    match = staticmethod(match)
+
+#R703: <defined-unary-op> = . <letter> [ <letter> ]... . 
+
+class Mult_Operand(BinaryOpBase): # R704
+    """
+    <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
+    <power-op> = **
+    """
+    subclass_names = ['Level_1_Expr']
+    use_names = ['Mult_Operand']
+    def match(string):
+        return BinaryOpBase.match(\
+            Level_1_Expr,pattern.power_op.named(),Mult_Operand,string,right=False)
+    match = staticmethod(match)
+
+class Add_Operand(BinaryOpBase): # R705
+    """
+    <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
+    <mult-op>  = *
+                 | /
+    """
+    subclass_names = ['Mult_Operand']
+    use_names = ['Add_Operand','Mult_Operand']
+    def match(string):
+        return BinaryOpBase.match(\
+            Add_Operand,pattern.mult_op.named(),Mult_Operand,string)
+    match = staticmethod(match)
+
+class Level_2_Expr(BinaryOpBase): # R706
+    """
+    <level-2-expr> = [ [ <level-2-expr> ] <add-op> ] <add-operand>
+    <level-2-expr> = [ <level-2-expr> <add-op> ] <add-operand>
+                     | <level-2-unary-expr>
+    <add-op>   = +
+                 | -
+    """
+    subclass_names = ['Level_2_Unary_Expr']
+    use_names = ['Level_2_Expr']
+    def match(string):
+        return BinaryOpBase.match(\
+            Level_2_Expr,pattern.add_op.named(),Add_Operand,string)
+    match = staticmethod(match)
+
+class Level_2_Unary_Expr(UnaryOpBase):
+    """
+    <level-2-unary-expr> = [ <add-op> ] <add-operand>
+    """
+    subclass_names = ['Add_Operand']
+    use_names = []
+    def match(string): return UnaryOpBase.match(pattern.add_op.named(),Add_Operand,string)
+    match = staticmethod(match)
+
+#R707: <power-op> = **
+#R708: <mult-op> = * | /
+#R709: <add-op> = + | -
+
+class Level_3_Expr(BinaryOpBase): # R710
+    """
+    <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
+    <concat-op>    = //
+    """
+    subclass_names = ['Level_2_Expr']
+    use_names =['Level_3_Expr']
+    def match(string):
+        return BinaryOpBase.match(\
+            Level_3_Expr,pattern.concat_op.named(),Level_2_Expr,string)
+    match = staticmethod(match)
+
+#R711: <concat-op> = //
+
+class Level_4_Expr(BinaryOpBase): # R712
+    """
+    <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
+    <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
+    """
+    subclass_names = ['Level_3_Expr']
+    use_names = []
+    def match(string):
+        return BinaryOpBase.match(\
+            Level_3_Expr,pattern.rel_op.named(),Level_3_Expr,string)
+    match = staticmethod(match)
+
+#R713: <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
+
+class And_Operand(UnaryOpBase): # R714
+    """
+    <and-operand> = [ <not-op> ] <level-4-expr>
+    <not-op> = .NOT.
+    """
+    subclass_names = ['Level_4_Expr']
+    use_names = []
+    def match(string):
+        return UnaryOpBase.match(\
+            pattern.not_op.named(),Level_4_Expr,string)
+    match = staticmethod(match)
+
+class Or_Operand(BinaryOpBase): # R715
+    """
+    <or-operand> = [ <or-operand> <and-op> ] <and-operand>    
+    <and-op> = .AND.
+    """
+    subclass_names = ['And_Operand']
+    use_names = ['Or_Operand','And_Operand']
+    def match(string):
+        return BinaryOpBase.match(\
+            Or_Operand,pattern.and_op.named(),And_Operand,string)
+    match = staticmethod(match)
+
+class Equiv_Operand(BinaryOpBase): # R716
+    """
+    <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
+    <or-op>  = .OR.
+    """
+    subclass_names = ['Or_Operand']
+    use_names = ['Equiv_Operand']
+    def match(string):
+        return BinaryOpBase.match(\
+            Equiv_Operand,pattern.or_op.named(),Or_Operand,string)
+    match = staticmethod(match)
+
+
+class Level_5_Expr(BinaryOpBase): # R717
+    """
+    <level-5-expr> = [ <level-5-expr> <equiv-op> ] <equiv-operand>
+    <equiv-op> = .EQV.
+               | .NEQV.
+    """
+    subclass_names = ['Equiv_Operand']
+    use_names = ['Level_5_Expr']
+    def match(string):
+        return BinaryOpBase.match(\
+            Level_5_Expr,pattern.equiv_op.named(),Equiv_Operand,string)
+    match = staticmethod(match)
+
+#R718: <not-op> = .NOT.
+#R719: <and-op> = .AND.
+#R720: <or-op> = .OR.
+#R721: <equiv-op> = .EQV. | .NEQV.
+
+class Expr(BinaryOpBase): # R722
+    """
+    <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
+    <defined-binary-op> = . <letter> [ <letter> ]... .
+    TODO: defined_binary_op must not be intrinsic_binary_op!!
+    """
+    subclass_names = ['Level_5_Expr']
+    use_names = ['Expr']
+    def match(string):
+        return BinaryOpBase.match(Expr, pattern.defined_binary_op.named(), Level_5_Expr,
+                                   string)
+    match = staticmethod(match)
+
+#R723: <defined-binary-op> = . <letter> [ <letter> ]... .
+
+class Logical_Expr(Base): # R724
+    """
+    <logical-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Char_Expr(Base): # R725
+    """
+    <char-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Default_Char_Expr(Base): # R726
+    """
+    <default-char-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Int_Expr(Base): # R727
+    """
+    <int-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Numeric_Expr(Base): # R728
+    """
+    <numeric-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Specification_Expr(Base): # R729
+    """
+    <specification-expr> = <scalar-int-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr']
+
+class Initialization_Expr(Base): # R730
+    """
+    <initialization-expr> = <expr>
+    """
+    subclass_names = ['Expr']
+
+class Char_Initialization_Expr(Base): # R731
+    """
+    <char-initialization-expr> = <char-expr>
+    """
+    subclass_names = ['Char_Expr']
+
+class Int_Initialization_Expr(Base): # R732
+    """
+    <int-initialization-expr> = <int-expr>
+    """
+    subclass_names = ['Int_Expr']
+
+class Logical_Initialization_Expr(Base): # R733
+    """
+    <logical-initialization-expr> = <logical-expr>
+    """
+    subclass_names = ['Logical_Expr']
+
+class Assignment_Stmt(Base): # R734
+    """
+    <assignment-stmt> = <variable> = <expr>
+    """
+    subclass_names = []
+    use_names = ['Variable', 'Expr']
+
+class Pointer_Assignment_Stmt(Base): # R735
+    """
+    <pointer-assignment-stmt> = <data-pointer-object> [ ( <bounds-spec-list> ) ] => <data-target>
+                                | <data-pointer-object> ( <bounds-remapping-list> ) => <data-target>
+                                | <proc-pointer-object> => <proc-target>
+    """
+    subclass_names = []
+    use_names = ['Data_Pointer_Object', 'Bounds_Spec_List', 'Data_Target', 'Bounds_Remapping_List',
+                 'Proc_Pointer_Object', 'Proc_Target']
+
+class Data_Pointer_Object(Base): # R736
+    """
+    <data-pointer-object> = <variable-name>
+                            | <variable> % <data-pointer-component-name>
+    """
+    subclass_names = ['Variable_Name']
+    use_names = ['Variable', 'Data_Pointer_Component_Name']
+
+class Bounds_Spec(Base): # R737
+    """
+    <bounds-spec> = <lower-bound-expr> :
+    """
+    subclass_names = []
+    use_names = ['Lower_Bound_Expr']
+
+class Bounds_Remapping(Base): # R738
+    """
+    <bounds-remapping> = <lower-bound-expr> : <upper-bound-expr>
+    """
+    subclass_names = []
+    use_classes = ['Lower_Bound_Expr', 'Upper_Bound_Expr']
+
+class Data_Target(Base): # R739
+    """
+    <data-target> = <variable>
+                    | <expr>
+    """
+    subclass_names = ['Variable','Expr']
+
+class Proc_Pointer_Object(Base): # R740
+    """
+    <proc-pointer-object> = <proc-pointer-name>
+                            | <proc-component-ref>
+    """
+    subclass_names = ['Proc_Pointer_Name', 'Proc_Component_Ref']
+
+class Proc_Component_Ref(BinaryOpBase): # R741
+    """
+    <proc-component-ref> = <variable> % <procedure-component-name>
+    """
+    subclass_names = []
+    use_names = ['Variable','Procedure_Component_Name']
+    def match(string):
+        return BinaryOpBase.match(\
+            Variable, pattern.percent_op.named(), Procedure_Component_Name, string)            
+    match = staticmethod(match)
+
+class Proc_Target(Base): # R742
+    """
+    <proc-target> = <expr>
+                    | <procedure-name>
+                    | <proc-component-ref>
+    """
+    subclass_names = ['Proc_Component_Ref', 'Procedure_Name', 'Expr']
+
+
+class Where_Stmt(Base): # R743
+    """
+    <where-stmt> = WHERE ( <mask-expr> ) <where-assignment-stmt>
+    """
+    subclass_names = []
+    use_names = ['Mask_Expr', 'Where_Assignment_Stmt']
+
+class Where_Construct(Base): # R744
+    """
+    <where-construct> = <where-construct-stmt>
+                              [ <where-body-construct> ]...
+                            [ <masked-elsewhere-stmt>
+                              [ <where-body-construct> ]...
+                            ]...
+                            [ <elsewhere-stmt>
+                              [ <where-body-construct> ]... ]
+                            <end-where-stmt>
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Stmt', 'Where_Body_Construct',
+                 'Elsewhere_Stmt', 'End_Where_Stmt'
+                 ]
+
+class Where_Construct_Stmt(Base): # R745
+    """
+    <where-construct-stmt> = [ <where-construct-name> : ] WHERE ( <mask-expr> )
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Name', 'Mask_Expr']
+
+class Where_Body_Construct(Base): # R746
+    """
+    <where-body-construct> = <where-assignment-stmt>
+                             | <where-stmt>
+                             | <where-construct>
+    """
+    subclass_names = ['Where_Assignment_Stmt', 'Where_Stmt', 'Where_Construct']
+
+class Where_Assignment_Stmt(Base): # R747
+    """
+    <where-assignment-stmt> = <assignment-stmt>
+    """
+    subclass_names = ['Assignment_Stmt']
+
+class Mask_Expr(Base): # R748
+    """
+    <mask-expr> = <logical-expr>
+    """
+    subclass_names = ['Logical_Expr']
+
+class Masked_Elsewhere_Stmt(Base): # R749
+    """
+    <masked-elsewhere-stmt> = ELSEWHERE ( <mask-expr> ) [ <where-construct-name> ]
+    """
+    subclass_names = []
+    use_names = ['Mask_Expr', 'Where_Construct_Name']
+
+class Elsewhere_Stmt(Base): # R750
+    """
+    <elsewhere-stmt> = ELSEWHERE [ <where-construct-name> ]
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Name']
+
+class End_Where_Stmt(Base): # R751
+    """
+    <end-where-stmt> = END WHERE [ <where-construct-name> ]
+    """
+    subclass_names = []
+    use_names = ['Where_Construct_Name']
+
+class Forall_Construct(Base): # R752
+    """
+    <forall-construct> = <forall-construct-stmt>
+                             [ <forall-body-construct> ]...
+                             <end-forall-stmt>
+    """
+    subclass_names = []
+    use_names = ['Forall_Construct_Stmt', 'Forall_Body_Construct', 'End_Forall_Stmt']
+
+class Forall_Construct_Stmt(Base): # R753
+    """
+    <forall-construct-stmt> = [ <forall-construct-name> : ] FORALL <forall-header>
+    """
+    subclass_names = []
+    use_names = ['Forall_Construct_Name', 'Forall_Header']
+
+class Forall_Header(Base): # R754
+    """
+    <forall-header> = ( <forall-triplet-spec-list> [ , <scalar-mask-expr> ] )
+    """
+    subclass_names = []
+    use_names = ['Forall_Triplet_Spec_List', 'Scalar_Mask_Expr']
+
+class Forall_Triplet_Spec(Base): # R755
+    """
+    <forall-triplet-spec> = <index-name> = <subscript> : <subscript> [ : <stride> ]
+    """
+    subclass_names = []
+    use_names = ['Index_Name', 'Subscript', 'Stride']
+
+class Forall_Body_Construct(Base): # R756
+    """
+    <forall-body-construct> = <forall-assignment-stmt>
+                              | <where-stmt>
+                              | <where-construct>
+                              | <forall-construct>
+                              | <forall-stmt>
+    """
+    subclass_names = ['Forall_Assignment_Stmt', 'Where_Stmt', 'Where_Construct',
+                      'Forall_Construct', 'Forall_Stmt']
+
+class Forall_Assignment_Stmt(Base): # R757
+    """
+    <forall-assignment-stmt> = <assignment-stmt>
+                               | <pointer-assignment-stmt>
+    """
+    subclass_names = ['Assignment_Stmt', 'Pointer_Assignment_Stmt']
+
+class End_Forall_Stmt(Base): # R758
+    """
+    <end-forall-stmt> = END FORALL [ <forall-construct-name> ]
+    """
+    subclass_names = []
+    use_names = ['Forall_Construct_Name']
+
+class Forall_Stmt(Base): # R759
+    """
+    <forall-stmt> = FORALL <forall-header> <forall-assignment-stmt>
+    """
+    subclass_names = []
+    use_names = ['Forall_Header', 'Forall_Assignment_Stmt']
+
+###############################################################################
+############################### SECTION  8 ####################################
+###############################################################################
+
+class Block(Base): # R801
+    """
+    block = [ <execution-part-construct> ]...
+    """
+    subclass_names = []
+    use_names = ['Execution_Part_Construct']
+
+class If_Construct(Base):
+    """
+    <if-construct> = <if-then-stmt>
+                           <block>
+                         [ <else-if-stmt>
+                           <block>
+                         ]...
+                         [ <else-stmt>
+                           <block>
+                         ]
+                         <end-if-stmt>
+    """
+    use_names = ['If_Then_Stmt', 'Block', 'Else_If_Stmt', 'Else_Stmt', 'End_If_Stmt']
+
+class If_Then_Stmt(Base):
+    """
+    <if-then-stmt> = [ <if-construct-name> : ] IF ( <scalar-logical-expr> ) THEN
+    """
+    use_names = ['If_Construct_Name', 'Scalar_Logical_Expr']
+
+class Else_If_Stmt(Base):
+    """
+    <else-if-stmt> = ELSE IF ( <scalar-logical-expr> ) THEN [ <if-construct-name> ]
+    """
+    use_names = ['Scalar_Logical_Expr', 'If_Construct_Name']
+
+class Else_Stmt(Base):
+    """
+    <else-stmt> = ELSE [ <if-construct-name> ]
+    """
+    use_names = ['If_Construct_Name']
+
+class End_If_Stmt(Base):
+    """
+    <end-if-stmt> = END IF [ <if-construct-name> ]
+    """
+    use_names = ['If_Construct_Name']
+
+class If_Stmt(Base):
+    """
+    <if-stmt> = IF ( <scalar-logical-expr> ) <action-stmt>
+    """
+    use_names = ['Scalar_Logical_Expr', 'Action_Stmt']
+
+class Case_Construct(Base):
+    """
+    <case-construct> = <select-case-stmt>
+                           [ <case-stmt>
+                             <block>
+                           ]..
+                           <end-select-stmt>
+    """
+    use_names = ['Select_Case_Stmt', 'Case_Stmt', 'End_Select_Stmt']
+
+class Select_Case_Stmt(Base):
+    """
+    <select-case-stmt> = [ <case-construct-name> : ] SELECT CASE ( <case-expr> )
+    """
+    use_names = ['Case_Construct_Name', 'Case_Expr']
+
+class Case_Stmt(Base):
+    """
+    <case-stmt> = CASE <case-selector> [ <case-construct-name> ]
+    """
+    use_names = ['Case_Selector', 'Case_Construct_Name']
+
+class End_Select_Stmt(Base):
+    """
+    <end-select-stmt> = END SELECT [ <case-construct-name> ]
+    """
+    use_names = ['Case_Construct_Name']
+
+class Case_Expr(Base):
+    """
+    <case-expr> = <scalar-int-expr>
+                  | <scalar-char-expr>
+                  | <scalar-logical-expr>
+    """
+    subclass_names = ['Scalar_Int_Expr', 'Scalar_Char_Expr', 'Scalar_Logical_Expr']
+
+class Case_Selector(Base):
+    """
+    <case-selector> = ( <case-value-range-list> )
+                      | DEFAULT
+    """
+    use_names = ['Case_Value_Range_List']
+
+class Case_Value_Range(Base):
+    """
+    <case-value-range> = <case-value>
+                         | <case-value> :
+                         | : <case-value>
+                         | <case-value> : <case-value>
+    """
+    subclass_names = ['Case_Value']
+
+class Case_Value(Base): # R815
+    """
+    <case-value> = <scalar-int-initialization-expr>
+                   | <scalar-char-initialization-expr>
+                   | <scalar-logical-initialization-expr>
+    """
+    subclass_names = ['Scalar_Int_Initialization_Expr', 'Scalar_Char_Initialization_Expr', 'Scalar_Logical_Initialization_Expr']
+
+
+class Associate_Construct(Base):
+    """
+    <associate-construct> = <associate-stmt>
+                                <block>
+                                <end-associate-stmt>
+    """
+    use_names = ['Associate_Stmt', 'Block', 'End_Associate_Stmt']
+
+class Associate_Stmt(Base):
+    """
+    <associate-stmt> = [ <associate-construct-name> : ] ASSOCIATE ( <association-list> )
+    """
+    use_names = ['Associate_Construct_Name', 'Associateion_List']
+
+class Association(Base):
+    """
+    <association> = <associate-name> => <selector>
+    """
+    use_names = ['Associate_Name', 'Selector']
+
+class Selector(Base):
+    """
+    <selector> = <expr>
+                 | <variable>
+    """
+    subclass_names = ['Expr', 'Variable']
+
+class End_Associate_Stmt(Base):
+    """
+    <end-associate-stmt> = END ASSOCIATE [ <associate-construct-name> ]
+    """
+    use_names = ['Associate_Construct_Name']
+
+class Select_Type_Construct(Base):
+    """
+    <select-type-construct> = <select-type-stmt>
+                                  [ <type-guard-stmt>
+                                    <block>
+                                  ]...
+                                  <end-select-type-stmt>
+    """
+    use_names = ['Select_Type_Stmt', 'Type_Guard_Stmt', 'Block', 'End_Select_Type_Stmt']
+
+class Select_Type_Stmt(Base):
+    """
+    <select-type-stmt> = [ <select-construct-name> : ] SELECT TYPE ( [ <associate-name> => ] <selector> )
+    """
+    use_names = ['Select_Construct_Name', 'Associate_Name', 'Selector']
+
+class Type_Guard_Stmt(Base):
+    """
+    <type-guard-stmt> = TYPE IS ( <type-spec> ) [ <select-construct-name> ]
+                        | CLASS IS ( <type-spec> ) [ <select-construct-name> ]
+                        | CLASS DEFAULT [ <select-construct-name> ]
+    """
+    use_names = ['Type_Spec', 'Select_Construct_Name']
+
+class End_Select_Type_Stmt(Base):
+    """
+    <end-select-type-stmt> = END SELECT [ <select-construct-name> ]
+    """
+    use_names = ['Select_Construct_Name']
+
+class Do_Construct(Base):
+    """
+    <do-construct> = <block-do-construct>
+                     | <nonblock-do-construct>
+    """
+    subclass_names = ['Block_Do_Construct', 'Nonblock_Do_Construct']
+
+class Block_Do_Construct(Base):
+    """
+    <block-do-construct> = <do-stmt>
+                               <do-block>
+                               <end-do>
+    """
+    use_names = ['Do_Stmt', 'Do_Block', 'End_Do']
+
+class Do_Stmt(Base):
+    """
+    <do-stmt> = <label-do-stmt>
+                | <nonlabel-do-stmt>
+    """
+    subclass_names = ['Label_Do_Stmt', 'Nonlabel_Do_Stmt']
+
+class Label_Do_Stmt(Base):
+    """
+    <label-do-stmt> = [ <do-construct-name> : ] DO <label> [ <loop-control> ]
+    """
+    use_names = ['Do_Construct_Name', 'Label', 'Loop_Control']
+
+class NonLabel_Do_Stmt(Base):
+    """
+    <nonlabel-do-stmt> = [ <do-construct-name> : ] DO [ <loop-control> ]
+    """
+    use_names = ['Do_Construct_Name', 'Loop_Control']
+
+class Loop_Control(Base):
+    """
+    <loop-control> = [ , ] <do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]
+                     | [ , ] WHILE ( <scalar-logical-expr> )
+    """
+    use_names = ['Do_Variable', 'Scalar_Int_Expr', 'Scalar_Logical_Expr']
+
+class Do_Variable(Base):
+    """
+    <do-variable> = <scalar-int-variable>
+    """
+    subclass_names = ['Scalar_Int_Variable']
+
+class Do_Block(Base):
+    """
+    <do-block> = <block>
+    """
+    subclass_names = ['Block']
+
+class End_Do(Base):
+    """
+    <end-do> = <end-do-stmt>
+               | <continue-stmt>
+    """
+    subclass_names = ['End_Do_Stmt', 'Continue_Stmt']
+
+class End_Do_Stmt(Base):
+    """
+    <end-do-stmt> = END DO [ <do-construct-name> ]
+    """
+    use_names = ['Do_Construct_Name']
+
+#...
+
+###############################################################################
+############################### SECTION  9 ####################################
+###############################################################################
+
+class Io_Unit(Base): # R901
+    """
+    <io-unit> = <file-unit-number>
+                | *
+                | <internal-file-variable>
+    """
+    subclass_names = ['File_Unit_Number', 'Internal_File_Variable']
+
+###############################################################################
+############################### SECTION 10 ####################################
+###############################################################################
+
+class Format_Stmt(Base): # R1001
+    """
+    <format-stmt> = FORMAT <format-specification>
+    """
+    subclass_names = []
+    use_names = ['Format_Specification']
+
+class Format_Specification(Base): # R1002
+    """
+    <format-specification> = ( [ <format-item-list> ] )
+    """
+    subclass_names = []
+    use_names = ['Format_Item_List']
+
+class Format_Item(Base): # R1003
+    """
+    <format-item> = [ <r> ] <data-edit-desc>
+                    | <control-edit-desc>
+                    | <char-string-edit-desc>
+                    | [ <r> ] ( <format-item-list> )
+    """
+    subclass_names = ['Control_Edit_Desc', 'Char_String_Edit_Desc']
+    use_names = ['R', 'Format_Item_List']
+
+class R(Base): # R1004
+    """
+    <r> = <int-literal-constant>
+    <r> shall be positive and without kind parameter specified.
+    """
+    subclass_names = ['Int_Literal_Constant']
+
+class Data_Edit_Desc(Base): # R1005
+    """
+    <data-edit-desc> = I <w> [ . <m> ]
+                       | B <w> [ . <m> ]
+                       | O <w> [ . <m> ]
+                       | Z <w> [ . <m> ]
+                       | F <w> . <d>
+                       | E <w> . <d> [ E <e> ]
+                       | EN <w> . <d> [ E <e> ]
+                       | ES <w> . <d> [ E <e>]
+                       | G <w> . <d> [ E <e> ]
+                       | L <w>
+                       | A [ <w> ]
+                       | D <w> . <d>
+                       | DT [ <char-literal-constant> ] [ ( <v-list> ) ]
+    """
+    subclass_names = []
+    use_names = ['W', 'M', 'D', 'E', 'Char_Literal_Constant', 'V_List']
+
+class W(Base): # R1006
+    """
+    <w> = <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant']
+
+class M(Base): # R1007
+    """
+    <m> = <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant']
+
+class D(Base): # R1008
+    """
+    <d> = <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant']
+
+class E(Base): # R1009
+    """
+    <e> = <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant']
+
+class V(Base): # R1010
+    """
+    <v> = <signed-int-literal-constant>
+    """
+    subclass_names = ['Signed_Int_Literal_Constant']
+
+class Control_Edit_Desc(Base): # R1011
+    """
+    <control-edit-desc> = <position-edit-desc>
+                          | [ <r> ] /
+                          | :
+                          | <sign-edit-desc>
+                          | <k> P
+                          | <blank-interp-edit-desc>
+                          | <round-edit-desc>
+                          | <decimal-edit-desc>
+    """
+    subclass_names = ['Position_Edit_Desc', 'Sign_Edit_Desc', 'Blank_Interp_Edit_Desc', 'Round_Edit_Desc',
+                      'Decimal_Edit_Desc']
+    use_names = ['R', 'K']
+
+class K(Base): # R1012
+    """
+    <k> = <signed-int-literal-constant>
+    """
+    subclass_names = ['Signed_Int_Literal_Constant']
+
+class Position_Edit_Desc(Base): # R1013
+    """
+    <position-edit-desc> = T <n>
+                           | TL <n>
+                           | TR <n>
+                           | <n> X
+    """
+    subclass_names = []
+    use_names = ['N']
+
+class N(Base): # R1014
+    """
+    <n> = <int-literal-constant>
+    """
+    subclass_names = ['Int_Literal_Constant']
+
+class Sign_Edit_Desc(Base): # R1015
+    """
+    <sign-edit-desc> = SS
+                       | SP
+                       | S
+    """
+    subclass_names = []
+    
+class Blank_Interp_Edit_Desc(Base): # R1016
+    """
+    <blank-interp-edit-desc> = BN
+                               | BZ
+    """
+    subclass_names = []
+    
+class Round_Edit_Desc(Base): # R1017
+    """
+    <round-edit-desc> = RU
+                        | RD
+                        | RZ
+                        | RN
+                        | RC
+                        | RP
+    """
+    subclass_names = []
+    
+class Decimal_Edit_Desc(Base): # R1018
+    """
+    <decimal-edit-desc> = DC
+                          | DP
+    """
+    subclass_names = []
+    
+class Char_String_Edit_Desc(Base): # R1019
+    """
+    <char-string-edit-desc> = <char-literal-constant>
+    """
+    subclass_names = ['Char_Literal_Constant']
+
+###############################################################################
+############################### SECTION 11 ####################################
+###############################################################################
+
+class Main_Program(Base): # R1101
+    """
+    <main-program> = [ <program-stmt> ]
+                         [ <specification-part> ]
+                         [ <execution-part> ]
+                         [ <internal-subprogram-part> ]
+                         <end-program-stmt>
+    """
+    subclass_names = []
+    use_names = ['Program_Stmt', 'Specification_Part', 'Execution_Part', 'Internal_Subprogram_Part',
+                 'End_Program_Stmt']
+
+class Program_Stmt(Base): # R1102
+    """
+    <program-stmt> = PROGRAM <program-name>
+    """
+    subclass_names = []
+    use_names = ['Program_Name']
+
+class End_Program_Stmt(Base): # R1103
+    """
+    <end-program-stmt> = END [ PROGRAM [ <program-name> ] ]
+    """
+    subclass_names = []
+    use_names = ['Program_Name']
+    
+class Module(Base): # R1104
+    """
+    <module> = <module-stmt>
+                   [ <specification-part> ]
+                   [ <module-subprogram-part> ]
+                   <end-module-stmt>
+    """
+    subclass_names = []
+    use_names = ['Module_Stmt', 'Specification_Part', 'Module_Subprogram_Part', 'End_Module_Stmt']
+
+class Module_Stmt(Base): # R1105
+    """
+    <module-stmt> = MODULE <module-name>
+    """
+    subclass_names = []
+    use_names = ['Module_Name']
+
+class End_Module_Stmt(Base): # R1106
+    """
+    <end-module-stmt> = END [ MODULE [ <module-name> ] ]
+    """
+    subclass_names = []
+    use_names = ['Module_Name']
+
+class Module_Subprogram_Part(Base): # R1107
+    """
+    <module-subprogram-part> = <contains-stmt>
+                                   <module-subprogram>
+                                   [ <module-subprogram> ]...
+    """
+    subclass_names = []
+    use_names = ['Contains_Stmt', 'Module_Subprogram']
+
+class Module_Subprogram(Base): # R1108
+    """
+    <module-subprogram> = <function-subprogram>
+                          | <subroutine-subprogram>
+    """
+    subclass_names = ['Function_Subprogram', 'Subroutine_Subprogram']
+
+class Use_Stmt(Base): # R1109
+    """
+    <use-stmt> = USE [ [ , <module-nature> ] :: ] <module-name> [ , <rename-list> ]
+                 | USE [ [ , <module-nature> ] :: ] <module-name> , ONLY: [ <only-list> ]
+    """
+    subclass_names = []
+    use_names = ['Module_Nature', 'Module_Name', 'Rename_List', 'Only_List']
+
+class Module_Nature(Base): # R1110
+    """
+    <module-nature> = INTRINSIC
+                      | NON_INTRINSIC
+    """
+    subclass_names = []
+    
+class Rename(Base): # R1111
+    """
+    <rename> = <local-name> => <use-name>
+               | OPERATOR(<local-defined-operator>) => OPERATOR(<use-defined-operator>)
+    """
+    subclass_names = []
+    use_names = ['Local_Name', 'Use_Name', 'Local_Defined_Operator', 'Use_Defined_Operator']
+
+class Only(Base): # R1112
+    """
+    <only> = <generic-spec>
+             | <only-use-name>
+             | <rename>
+    """
+    subclass_names = ['Generic_Spec', 'Only_Use_Name', 'Rename']
+
+class Only_Use_Name(Base): # R1113
+    """
+    <only-use-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Local_Defined_Operator(Base): # R1114
+    """
+    <local-defined-operator> = <defined-unary-op>
+                               | <defined-binary-op>
+    """
+    subclass_names = ['Defined_Unary_Op', 'Defined_Binary_Op']
+
+class Use_Defined_Operator(Base): # R1115
+    """
+    <use-defined-operator> = <defined-unary-op>
+                             | <defined-binary-op>
+    """
+    subclass_names = ['Defined_Unary_Op', 'Defined_Binary_Op']
+
+class Block_Data(Base): # R1116
+    """
+    <block-data> = <block-data-stmt>
+                       [ <specification-part> ]
+                       <end-block-data-stmt>
+    """
+    subclass_names = []
+    use_names = ['Block_Data_Stmt', 'Specification_Part', 'End_Block_Data_Stmt']
+
+class Block_Data_Stmt(Base): # R1117
+    """
+    <block-data-stmt> = BLOCK DATA [ <block-data-name> ]
+    """
+    subclass_names = []
+    use_names = ['Block_Data_Name']
+
+class End_Block_Data_Stmt(Base): # R1118
+    """
+    <end-block-data-stmt> = END [ BLOCK DATA [ <block-data-name> ] ]
+    """
+    subclass_names = []
+    use_names = ['Block_Data_Name']
+
+###############################################################################
+############################### SECTION 12 ####################################
+###############################################################################
+
+
+class Interface_Block(Base): # R1201
+    """
+    <interface-block> = <interface-stmt>
+                            [ <interface-specification> ]...
+                            <end-interface-stmt>
+    """
+    subclass_names = []
+    use_names = ['Interface_Stmt', 'Interface_Specification', 'End_Interface_Stmt']
+
+class Interface_Specification(Base): # R1202
+    """
+    <interface-specification> = <interface-body>
+                                | <procedure-stmt>
+    """
+    subclass_names = ['Interface_Body', 'Procedure_Stmt']
+
+class Interface_Stmt(Base): # R1203
+    """
+    <interface-stmt> = INTERFACE [ <generic-spec> ]
+                       | ABSTRACT INTERFACE
+    """
+    subclass_names = []
+    use_names = ['Generic_Spec']
+
+class End_Interface_Stmt(Base): # R1204
+    """
+    <end-interface-stmt> = END INTERFACE [ <generic-spec> ]
+    """
+    subclass_names = []
+    use_names = ['Generic_Spec']
+
+class Interface_Body(Base): # R1205
+    """
+    <interface-body> = <function-stmt>
+                           [ <specification-part> ]
+                           <end-function-stmt>
+                       | <subroutine-stmt>
+                           [ <specification-part> ]
+                           <end-subroutine-stmt>
+    """
+    subclass_names = []
+    use_names = ['Function_Stmt', 'Specification_Part', 'Subroutine_Stmt', 'End_Function_Stmt', 'End_Subroutine_Stmt']
+
+class Procedure_Stmt(Base): # R1206
+    """
+    <procedure-stmt> = [ MODULE ] PROCEDURE <procedure-name-list>
+    """
+    subclass_names = []
+    use_names = ['Procedure_Name_List']
+
+class Generic_Spec(Base): # R1207
+    """
+    <generic-spec> = <generic-name>
+                     | OPERATOR ( <defined-operator> )
+                     | ASSIGNMENT ( = )
+                     | <dtio-generic-spec>
+    """
+    subclass_names = ['Generic_Name', 'Dtio_Generic_Spec']
+    use_names = ['Defined_Operator']
+
+class Dtio_Generic_Spec(Base): # R1208
+    """
+    <dtio-generic-spec> = READ ( FORMATTED )
+                          | READ ( UNFORMATTED )
+                          | WRITE ( FORMATTED )
+                          | WRITE ( UNFORMATTED )
+    """
+    subclass_names = []
+
+class Import_Stmt(Base): # R1209
+    """
+    <import-stmt> = IMPORT [ :: ] <import-name-list>
+    """
+    subclass_names = []
+    use_names = ['Import_Name_List']
+    def match(string):
+        start = string[:6].upper()
+        if start != 'IMPORT': return
+        line = string[6:].lstrip()
+        if line.startswith('::'):
+            line = line[2:].lstrip()
+        return Import_Name_List(line),
+    match = staticmethod(match)
+    def init(self, names):
+        self.names = names
+        return
+    def tostr(self): return 'IMPORT :: %s' % (self.names)
+    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.names)
+
+class External_Stmt(Base): # R1210
+    """
+    <external-stmt> = EXTERNAL [ :: ] <external-name-list>
+    """
+    subclass_names = []
+    use_names = ['External_Name_List']
+
+class Procedure_Declaration_Stmt(Base): # R1211
+    """
+    <procedure-declaration-stmt> = PROCEDURE ( [ <proc-interface> ] ) [ [ , <proc-attr-spec> ]... :: ] <proc-decl-list>
+    """
+    subclass_names = []
+    use_names = ['Proc_Interface', 'Proc_Attr_Spec', 'Proc_Decl_List']
+
+class Proc_Interface(Base): # R1212
+    """
+    <proc-interface> = <interface-name>
+                       | <declaration-type-spec>
+    """
+    subclass_names = ['Interface_Name', 'Declaration_Type_Spec']
+
+class Proc_Attr_Spec(Base): # R1213
+    """
+    <proc-attr-spec> = <access-spec>
+                       | <proc-language-binding-spec>
+                       | INTENT ( <intent-spec> )
+                       | OPTIONAL
+                       | SAVE
+    """
+    subclass_names = ['Access_Spec', 'Proc_Language_Binding_Spec']
+    use_names = ['Intent_Spec']
+
+class Proc_Decl(Base): # R1214
+    """
+    <proc-decl> = <procedure-entity-name> [ => <null-init> ]
+    """
+    subclass_names = ['Procedure_Entity_Name']
+    use_names = ['Null_Init']
+
+class Interface_Name(Base): # R1215
+    """
+    <interface-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Intrinsic_Stmt(Base): # R1216
+    """
+    <intrinsic-stmt> = INTRINSIC [ :: ] <intrinsic-procedure-name-list>
+    """
+    subclass_names = []
+    use_names = ['Intrinsic_Procedure_Name_List']
+
+class Function_Reference(CallBase): # R1217
+    """
+    <function-reference> = <procedure-designator> ( [ <actual-arg-spec-list> ] )
+    """
+    subclass_names = []
+    use_names = ['Procedure_Designator','Actual_Arg_Spec_List']
+    def match(string):
+        return CallBase.match(Procedure_Designator, Actual_Arg_Spec_List, string)
+    match = staticmethod(match)
+
+class Call_Stmt(Base): # R1218
+    """
+    <call-stmt> = CALL <procedure-designator> [ ( [ <actual-arg-spec-list> ] ) ]
+    """
+    subclass_names = []
+    use_names = ['Procedure_Designator', 'Actual_Arg_Spec_List']
+
+class Procedure_Designator(BinaryOpBase): # R1219
+    """
+    <procedure-designator> = <procedure-name>
+                             | <proc-component-ref>
+                             | <data-ref> % <binding-name>
+    """
+    subclass_names = ['Procedure_Name','Proc_Component_Ref']
+    use_names = ['Data_Ref','Binding_Name']
+    def match(string):
+        return BinaryOpBase.match(\
+            Data_Ref, pattern.percent_op.named(),  Binding_Name, string)
+    match = staticmethod(match)
+
+class Actual_Arg_Spec(KeywordValueBase): # R1220
+    """
+    <actual-arg-spec> = [ <keyword> = ] <actual-arg>
+    """
+    subclass_names = ['Actual_Arg']
+    use_names = ['Keyword']
+    def match(string): return KeywordValueBase.match(Actual_Arg, string)
+    match = staticmethod(match)
+
+class Actual_Arg(Base): # R1221
+    """
+    <actual-arg> = <expr>
+                 | <variable>
+                 | <procedure-name>
+                 | <proc-component-ref>
+                 | <alt-return-spec>
+    """
+    subclass_names = ['Procedure_Name','Proc_Component_Ref','Alt_Return_Spec', 'Variable', 'Expr']
+
+class Alt_Return_Spec(Base): # R1222
+    """
+    <alt-return-spec> = * <label>
+    """
+    subclass_names = []
+    def match(string):
+        if not string.startswith('*'): return
+        line = string[1:].lstrip()
+        if pattern.abs_label.match(line):
+            return line,
+        return
+    match = staticmethod(match)
+    def init(self, label):
+        self.label = label
+        return
+    def tostr(self): return '*%s' % (self.label)
+    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.label)
+
+class Function_Subprogram(BlockBase): # R1223
+    """
+    <function-subprogram> = <function-stmt>
+                               [ <specification-part> ]
+                               [ <execution-part> ]
+                               [ <internal-subprogram-part> ]
+                            <end-function-stmt>
+    """
+    subclass_names = []
+    use_names = ['Function_Stmt', 'Specification_Part', 'Execution_Part',
+                 'Internal_Subprogram_Part', 'End_Function_Stmt']
+    def match(reader):
+        return BlockBase.match(Function_Stmt, [Specification_Part, Execution_Part, Internal_Subprogram_Part], End_Function_Stmt, reader)
+    match = staticmethod(match)
+
+class Function_Stmt(Base): # R1224
+    """
+    <function-stmt> = [ <prefix> ] FUNCTION <function-name> ( [ <dummy-arg-name-list> ] ) [ <suffix> ]
+    """
+    subclass_names = []
+    use_names = ['Prefix','Function_Name','Dummy_Arg_Name_List', 'Suffix']
+
+class Proc_Language_Binding_Spec(Base): #1225
+    """
+    <proc-language-binding-spec> = <language-binding-spec>
+    """
+    subclass_names = ['Language_Binding_Spec']
+
+class Dummy_Arg_Name(Base): # R1226
+    """
+    <dummy-arg-name> = <name>
+    """
+    subclass_names = ['Name']
+
+class Prefix(SequenceBase): # R1227
+    """
+    <prefix> = <prefix-spec> [ <prefix-spec> ]..
+    """
+    subclass_names = ['Prefix_Spec']
+    _separator = (' ',re.compile(r'\s+(?=[a-z_])',re.I))
+    def match(string): return SequenceBase.match(Prefix._separator, Prefix_Spec, string)
+    match = staticmethod(match)
+
+class Prefix_Spec(StringBase): # R1228
+    """
+    <prefix-spec> = <declaration-type-spec>
+                    | RECURSIVE
+                    | PURE
+                    | ELEMENTAL
+    """
+    subclass_names = ['Declaration_Type_Spec']
+    def match(string):
+        if len(string)==9:
+            upper = string.upper()
+            if upper in ['RECURSIVE', 'ELEMENTAL']: return upper,
+        elif len(string)==4:
+            upper = string.upper()
+            if upper=='PURE': return upper,
+        return None
+    match = staticmethod(match)
+
+class Suffix(Base): # R1229
+    """
+    <suffix> = <proc-language-binding-spec> [ RESULT ( <result-name> ) ]
+               | RESULT ( <result-name> ) [ <proc-language-binding-spec> ]
+    """
+    subclass_names = ['Proc_Language_Binding_Spec']
+    use_names = ['Result_Name']
+
+class End_Function_Stmt(EndStmtBase): # R1230
+    """
+    <end-function-stmt> = END [ FUNCTION [ <function-name> ] ]
+    """
+    subclass_names = []
+    use_names = ['Function_Name']
+    def match(string):
+        return EndStmtBase.match('FUNCTION',Function_Name, string)
+    match = staticmethod(match)
+
+class Subroutine_Subprogram(BlockBase): # R1231
+    """
+    <subroutine-subprogram> = <subroutine-stmt>
+                                 [ <specification-part> ]
+                                 [ <execution-part> ]
+                                 [ <internal-subprogram-part> ]
+                              <end-subroutine-stmt>
+    """
+    subclass_names = []
+    use_names = ['Subroutine_Stmt', 'Specification_Part', 'Execution_Part',
+                 'Internal_Subprogram_Part', 'End_Subroutine_Stmt']
+    def match(reader):
+        return BlockBase.match(Subroutine_Stmt, [Specification_Part, Execution_Part, Internal_Subprogram_Part], End_Subroutine_Stmt, reader)
+    match = staticmethod(match)
+
+class Subroutine_Stmt(Base): # R1232
+    """
+    <subroutine-stmt> = [ <prefix> ] SUBROUTINE <subroutine-name> [ ( [ <dummy-arg-list> ] ) [ <proc-language-binding-spec> ] ]
+    """
+    subclass_names = []
+    use_names = ['Prefix', 'Subroutine_Name', 'Dummy_Arg_List', 'Proc_Language_Binding_Spec']
+    def match(string):
+        line, repmap = string_replace_map(string)
+        m = pattern.subroutine.search(line)
+        prefix = line[:m.start()].rstrip() or None
+        if prefix is not None:
+            prefix = Prefix(repmap(prefix))
+        line = line[m.end():].lstrip()
+        m = pattern.name.match(line)
+        if m is None: return
+        name = Subroutine_Name(m.group())
+        line = line[m.end():].lstrip()
+        dummy_args = None
+        if line.startswith('('):
+            i = line.find(')')
+            if i==-1: return
+            dummy_args = line[1:i].strip() or None
+            if dummy_args is not None:
+                dummy_args = Dummy_Arg_List(repmap(dummy_args))
+            line = line[i+1:].lstrip()
+        binding_spec = None
+        if line:
+            binding_spec = Proc_Language_Binding_Spec(repmap(line))
+        return prefix, name, dummy_args, binding_spec
+    match = staticmethod(match)
+    def init(self, *args):
+        self.prefix, self.name, self.dummy_args, self.binding_spec = args
+        return
+    def tostr(self):
+        if self.prefix is not None:
+            s = '%s SUBROUTINE %s' % (self.prefix, self.name)
+        else:
+            s = 'SUBROUTINE %s' % (self.name)
+        if self.dummy_args is not None:
+            s += '(%s)' % (self.dummy_args)
+        if self.binding_spec is not None:
+            s += ' %s' % (self.binding_spec)
+        return s
+    def torepr(self):
+        return '%s(%r, %r, %r, %r)'\
+               % (self.__class__.__name__, self.prefix, self.name, self.dummy_args, self.binding_spec)
+
+class Dummy_Arg(StringBase): # R1233
+    """
+    <dummy-arg> = <dummy-arg-name>
+                  | *
+    """
+    subclass_names = ['Dummy_Arg_Name']
+    def match(string):
+        if string=='*': return '*',
+        return
+    match = staticmethod(match)
+
+class End_Subroutine_Stmt(EndStmtBase): # R1234
+    """
+    <end-subroutine-stmt> = END [ SUBROUTINE [ <subroutine-name> ] ]
+    """
+    subclass_names = []
+    use_names = ['Subroutine_Name']
+    def match(string): return EndStmtBase.match('SUBROUTINE', Subroutine_Name, string)
+    match = staticmethod(match)
+
+class Entry_Stmt(Base): # R1235
+    """
+    <entry-stmt> = ENTRY <entry-name> [ ( [ <dummy-arg-list> ] ) [ <suffix> ] ]
+    """
+    subclass_names = []
+    use_names = ['Entry_Name', 'Dummy_Arg_List', 'Suffix']
+
+class Return_Stmt(Base): # R1236
+    """
+    <return-stmt> = RETURN [ <scalar-int-expr> ]
+    """
+    subclass_names = []
+    use_names = ['Scalar_Int_Expr']
+
+class Contains_Stmt(Base): # R1237
+    """
+    <contains-stmt> = CONTAINS
+    """
+    subclass_names = []
+
+class Stmt_Function_Stmt(Base): # R1238
+    """
+    <stmt-function-stmt> = <function-name> ( [ <dummy-arg-name-list> ] ) = Scalar_Expr
+    """
+    subclass_names = []
+    use_names = ['Function_Name', 'Dummy_Arg_Name_List', 'Scalar_Expr']
+
+###############################################################################
+################ GENERATE Scalar_, _List, _Name CLASSES #######################
+###############################################################################
+
 ClassType = type(Base)
+_names = dir()
+for clsname in _names:
+    cls = eval(clsname)
+    if not (isinstance(cls, ClassType) and issubclass(cls, Base) and not cls.__name__.endswith('Base')): continue
+    names = getattr(cls, 'subclass_names', []) + getattr(cls, 'use_names', [])
+    for n in names:
+        if n in _names: continue
+        if n.endswith('_List'):
+            _names.append(n)
+            n = n[:-5]
+            #print 'Generating %s_List' % (n)
+            exec '''\
+class %s_List(SequenceBase):
+    subclass_names = [\'%s\']
+    use_names = []
+    def match(string): return SequenceBase.match(r\',\', %s, string)
+    match = staticmethod(match)
+''' % (n, n, n)
+        elif n.endswith('_Name'):
+            _names.append(n)
+            n = n[:-5]
+            #print 'Generating %s_Name' % (n)
+            exec '''\
+class %s_Name(Base):
+    subclass_names = [\'Name\']
+''' % (n)
+        elif n.startswith('Scalar_'):
+            _names.append(n)
+            n = n[7:]
+            #print 'Generating Scalar_%s' % (n)
+            exec '''\
+class Scalar_%s(Base):
+    subclass_names = [\'%s\']
+''' % (n,n)
+
+
 Base_classes = {}
 for clsname in dir():
     cls = eval(clsname)
@@ -9,6 +3908,10 @@
         Base_classes[cls.__name__] = cls
 
 
+###############################################################################
+##################### OPTIMIZE subclass_names tree ############################
+###############################################################################
+
 if 1: # Optimize subclass tree:
 
     def _rpl_list(clsname):
@@ -31,7 +3934,7 @@
             for n1 in _rpl_list(n):
                 if n1 not in opt_subclass_names:  opt_subclass_names.append(n1)
         if not opt_subclass_names==cls.subclass_names:
-            print cls.__name__,':',', '.join(cls.subclass_names),'->',', '.join(opt_subclass_names)
+            #print cls.__name__,':',', '.join(cls.subclass_names),'->',', '.join(opt_subclass_names)
             cls.subclass_names[:] = opt_subclass_names
         #else:
         #    print cls.__name__,':',opt_subclass_names
@@ -70,5 +3973,6 @@
         for n in use_names:            
             if not Base_classes.has_key(n):
                 print '%s not defined used by %s' % (n, cls.__name__)
-#import pprint
-#pprint.pprint(Base.subclasses)
+
+
+#EOF

Deleted: trunk/numpy/f2py/lib/parser/expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/expressions.py	2006-10-31 05:17:46 UTC (rev 3420)
+++ trunk/numpy/f2py/lib/parser/expressions.py	2006-10-31 13:28:31 UTC (rev 3421)
@@ -1,1627 +0,0 @@
-#!/usr/bin/env python
-"""
-Fortran expressions.
-
------
-Permission to use, modify, and distribute this software is given under the
-terms of the NumPy License. See http://scipy.org.
-
-NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
-Author: Pearu Peterson <pearu at cens.ioc.ee>
-Created: Oct 2006
------
-"""
-
-import re
-from splitline import string_replace_map
-import pattern_tools as pattern
-from readfortran import FortranReaderBase
-
-############################# Base classes ################################
-
-class NoMatchError(Exception):
-    pass
-
-class Base(object):
-    """
-    """
-    subclasses = {}
-
-    def __new__(cls, string):
-        #print '__new__:',cls.__name__,`string`
-        if isinstance(string, FortranReaderBase) and not issubclass(cls, BlockBase):
-            reader = string
-            item = reader.get_item()
-            try:
-                obj = cls(item.line)
-            except NoMatchError:
-                obj = None
-            if obj is None:
-                reader.put_item(item)
-                return
-            return obj
-        match = cls.__dict__.get('match', None)
-        if match is not None:
-            result = cls.match(string)
-        else:
-            result = None
-        #print '__new__:result:',cls.__name__,`string,result`
-        if isinstance(result, tuple):
-            obj = object.__new__(cls)
-            obj.string = string
-            if hasattr(cls, 'init'):
-                obj.init(*result)
-            return obj
-        elif isinstance(result, Base):
-            return result
-        elif result is None:
-            for subcls in Base.subclasses.get(cls.__name__,[]):
-                #print cls.__name__,subcls.__name__,`string`
-                try:
-                    return subcls(string)
-                except NoMatchError:
-                    pass
-        else:
-            raise AssertionError,`result`
-        raise NoMatchError,'%s: %r' % (cls.__name__, string)
-
-    findall = staticmethod(re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall)
-    def apply_map(line, repmap):
-        for k in Base.findall(line):
-            line = line.replace(k, repmap[k])
-        return line
-    apply_map = staticmethod(apply_map)
-    
-    def init_list(self, *items):
-        self.items = items
-        return
-
-    def tostr_list(self):
-        return ', '.join(map(str,self.items))
-
-    def torepr_list(self):
-        return '%s(%s)' % (self.__class__.__name__,', '.join(map(repr,self.items)))
-
-    def __str__(self):
-        return self.tostr()
-        if self.__class__.__dict__.has_key('tostr'):
-            return self.tostr()
-        return repr(self)
-
-    def __repr__(self):
-        return self.torepr()
-        if self.__class__.__dict__.has_key('torepr'):
-            return self.torepr()
-        return '%s(%r)' % (self.__class__.__name__, self.string)
-
-class BlockBase(Base):
-    """
-    <block-base> = <subcls>
-                     [ <subcls> ]...
-                     [ <endcls> ]
-    """
-    def match(reader, subcls, endcls):
-        content = []
-        return content,
-        
-    def init(self, content):
-        self.content = content
-        return
-    def tostr(self):
-        return '\n'.join(map(str, self.content))
-    def torepr(self):
-        return '\n'.join(map(repr, self.content))
-    def get_content(reader, content_class, end_class):
-        #for content_class.sub
-        pass
-    
-class SequenceBase(Base):
-    """
-    <sequence-base> = <obj>, <obj> [ , <obj> ]...
-    """
-    def match(separator, subcls, string):
-        line, repmap = string_replace_map(string)
-        if isinstance(separator, str):
-            splitted = line.split(separator)
-        else:
-            splitted = separator[1].split(line)
-            separator = separator[0]
-        if len(splitted)<=1: return
-        lst = []
-        for p in splitted:
-            lst.append(subcls(repmap(p.strip())))
-        return separator, tuple(lst)
-    match = staticmethod(match)
-    def init(self, separator, items):
-        self.separator = separator
-        self.items = items
-        return
-    def tostr(self):
-        s = self.separator
-        if s==',': s = s + ' '
-        elif s==' ': pass
-        else: s = ' ' + s + ' '
-        return s.join(map(str, self.items))
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.separator, self.items)
-    
-class UnaryOpBase(Base):
-    """
-    <unary-op-base> = <unary-op> <rhs>
-    """
-    def init(self, op, rhs):
-        self.op = op
-        self.rhs = rhs
-        return    
-    def tostr(self):
-        return '%s %s' % (self.op, self.rhs)
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__,self.op, self.rhs)
-    def match(op_pattern, rhs_cls, string):
-        m = op_pattern.match(string)
-        if not m: return
-        #if not m: return rhs_cls(string)
-        rhs = string[m.end():].lstrip()        
-        if not rhs: return
-        op = string[:m.end()].rstrip().upper()
-        return op, rhs_cls(rhs)
-    match = staticmethod(match)
-
-class BinaryOpBase(Base):
-    """
-    <binary-op-base> = <lhs> <op> <rhs>
-    <op> is searched from right by default.
-    """
-    def match(lhs_cls, op_pattern, rhs_cls, string, right=True):
-        line, repmap = string_replace_map(string)
-        if right:
-            t = op_pattern.rsplit(line)
-        else:
-            t = op_pattern.lsplit(line)
-        if t is None or len(t)!=3: return
-        lhs, op, rhs = t
-        if not lhs: return
-        if not rhs: return
-        op = op.upper()
-        for k in Base.findall(lhs):
-            lhs = lhs.replace(k, repmap[k])
-        for k in Base.findall(rhs):
-            rhs = rhs.replace(k, repmap[k])
-        lhs_obj = lhs_cls(lhs)
-        rhs_obj = rhs_cls(rhs)
-        return lhs_obj, op, rhs_obj
-    match = staticmethod(match)
-    def init(self, lhs, op, rhs):
-        self.lhs = lhs
-        self.op = op
-        self.rhs = rhs
-        return    
-    def tostr(self):
-        return '%s %s %s' % (self.lhs, self.op, self.rhs)
-    def torepr(self):
-        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.op, self.rhs)
-
-class SeparatorBase(BinaryOpBase):
-    """
-    <shape-base> = <lhs> : <rhs>
-    """
-    def init(self, lhs, rhs):
-        self.lhs = lhs
-        self.op = ':'
-        self.rhs = rhs
-        return
-
-class KeywordValueBase(BinaryOpBase):
-    """
-    <keyword-value-base> = <keyword> = <rhs>
-    """
-    def match(cls, string):
-        if '=' not in string: return
-        lhs,rhs = string.split('=',1)
-        return Keyword(lhs.rstrip()),'=',cls(rhs.lstrip())
-    match = staticmethod(match)
-    
-class BracketBase(Base):
-    """
-    <bracket-base> = <left-bracket-base> <something> <right-bracket>
-    """
-    def match(brackets, cls, string):
-        i = len(brackets)/2
-        left = brackets[:i]
-        right = brackets[-i:]
-        if string.startswith(left) and string.endswith(right):
-            line = string[i:-i].strip()
-            if not line: return
-            return left,cls(line),right
-        return
-    match = staticmethod(match)
-    def init(self,left,item,right):
-        self.left = left
-        self.item = item
-        self.right = right
-        return
-    def tostr(self):
-        if self.item is None:
-            return '%s%s' % (self.left, self.right)
-        return '%s%s%s' % (self.left, self.item, self.right)
-    def torepr(self): return '%s(%r, %r, %r)' % (self.__class__.__name__, self.left, self.item, self.right)
-
-class NumberBase(Base):
-    """
-    <number-base> = <number> [ _ <kind-param> ]
-    """
-    def match(number_pattern, string):
-        m = number_pattern.match(string)
-        if m is None: return
-        return m.group('value').upper(),m.group('kind_param')
-    match = staticmethod(match)
-    def init(self, value, kind_param):
-        self.value = value
-        self.kind_param = kind_param
-        return
-    def tostr(self):
-        if self.kind_param is None: return str(self.value)
-        return '%s_%s' % (self.value, self.kind_param)
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.value, self.kind_param)
-
-class CallBase(Base):
-    """
-    <call-base> = <lhs> ( [ <rhs> ] )
-    """
-    def match(lhs_cls, rhs_cls, string):
-        if not string.endswith(')'): return
-        line, repmap = string_replace_map(string)
-        i = line.find('(')
-        if i==-1: return
-        lhs = line[:i].rstrip()
-        if not lhs: return
-        rhs = line[i+1:-1].strip()
-        for k in Base.findall(lhs):
-            lhs = lhs.replace(k,repmap[k])
-        if rhs:
-            for k in Base.findall(rhs):
-                rhs = rhs.replace(k,repmap[k])
-            return lhs_cls(lhs), rhs_cls(rhs)
-        return lhs_cls(lhs), None
-    match = staticmethod(match)
-    def init(self, lhs, rhs):
-        self.lhs = lhs
-        self.rhs = rhs
-        return
-    def tostr(self):
-        if self.rhs is None: return '%s()' % (self.lhs)
-        return '%s(%s)' % (self.lhs, self.rhs)
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.lhs, self.rhs)
-
-class StringBase(Base):
-    """
-    <string-base> = <xyz>
-    """
-    def match(pattern, string):
-        if pattern.match(string): return string,
-        return
-    match = staticmethod(match)
-    def init(self, string):
-        self.string = string
-        return
-    def tostr(self): return str(self.string)
-    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.string)
-
-class STRINGBase(StringBase):
-    """
-    <STRING-base> = <XYZ>
-    """
-    match = staticmethod(StringBase.match)
-    def init(self, string):
-        self.string = string.upper()
-        return
-
-class EndStmtBase(Base):
-    """
-    <end-stmt-base> = END [ <stmt> [ <stmt-name>] ]
-    """
-    def match(stmt_type, stmt_name, string):
-        start = string[:3].upper()
-        if start != 'END': return
-        line = string[3:].lstrip()
-        start = line[:len(stmt_type)].upper()
-        if start:
-            if start != stmt_type: return
-            line = line[len(stmt_type):].lstrip()
-        else:
-            line = ''
-        if line:
-            return stmt_type, stmt_name(line)
-        return stmt_type, None
-    match = staticmethod(match)
-    def init(self, stmt_type, stmt_name):
-        self.type, self.name = stmt_type, stmt_name
-        return
-    def tostr(self):
-        if self.name is not None:
-            return 'END %s %s' % (self.type, self.name)
-        return 'END %s' % (self.type)
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.type, self.name)
-
-##################################################
-
-class Name(StringBase):
-    """
-    <name> = <letter> [ <alphanumeric_character> ]...
-    """
-    subclass_names = []
-    def match(string): return StringBase.match(pattern.abs_name, string)
-    match = staticmethod(match)
-
-class Binary_Constant(StringBase):
-    """
-    <binary-constant> = B ' <digit> [ <digit> ]... '
-                        | B \" <digit> [ <digit> ]... \"
-    """
-    subclass_names = []
-    def match(string): return StringBase.match(pattern.abs_binary_constant, string)
-    match = staticmethod(match)
-    def init(self, string):
-        self.string = string.upper()
-        return
-
-class Octal_Constant(StringBase):
-    """
-    <octal-constant> = O ' <digit> [ <digit> ]... '
-                       | O \" <digit> [ <digit> ]... \"
-    """
-    subclass_names = []
-    def match(string): return StringBase.match(pattern.abs_octal_constant, string)
-    match = staticmethod(match)
-    def init(self, string):
-        self.string = string.upper()
-        return
-
-class Hex_Constant(StringBase):
-    """
-    <hex-constant> = Z ' <digit> [ <digit> ]... '
-                     | Z \" <digit> [ <digit> ]... \"
-    """
-    subclass_names = []
-    def match(string): return StringBase.match(pattern.abs_hex_constant, string)
-    match = staticmethod(match)
-    def init(self, string):
-        self.string = string.upper()
-        return
-
-class Int_Literal_Constant(NumberBase):
-    """
-    <int-literal-constant> = <digit-string> [ _ <kind-param> ]
-    """
-    subclass_names = []
-    def match(string):
-        return NumberBase.match(pattern.abs_int_literal_constant_named, string)
-    match = staticmethod(match)
-
-class Signed_Int_Literal_Constant(NumberBase):
-    """
-    <signed-int-literal-constant> = [ <sign> ] <int-literal-constant>
-    """
-    subclass_names = ['Int_Literal_Constant'] # never used because sign is included in pattern
-    def match(string):
-        return NumberBase.match(pattern.abs_signed_int_literal_constant_named, string)
-    match = staticmethod(match)
-
-class Real_Literal_Constant(NumberBase):
-    """
-    """
-    subclass_names = []
-    def match(string):
-        return NumberBase.match(pattern.abs_real_literal_constant_named, string)
-    match = staticmethod(match)
-
-class Signed_Real_Literal_Constant(NumberBase):
-    """
-    <signed-real-literal-constant> = [ <sign> ] <real-literal-constant>
-    """
-    subclass_names = ['Real_Literal_Constant'] # never used
-    def match(string):
-        return NumberBase.match(pattern.abs_signed_real_literal_constant_named, string)
-    match = staticmethod(match)
-
-class Logical_Literal_Constant(NumberBase):
-    """
-    <logical-literal-constant> = .TRUE. [ _ <kind-param> ]
-                                 | .FALSE. [ _ <kind-param> ]
-    """
-    subclass_names = []
-    def match(string):
-        return NumberBase.match(pattern.abs_logical_literal_constant_named, string)    
-    match = staticmethod(match)
-
-class Char_Literal_Constant(Base):
-    """
-    <char-literal-constant> = [ <kind-param> _ ] ' <rep-char> '
-                              | [ <kind-param> _ ] \" <rep-char> \"
-    """
-    subclass_names = []
-    rep = pattern.char_literal_constant
-    def match(string):
-        if string[-1] not in '"\'': return
-        if string[-1]=='"':
-            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named2
-        else:
-            abs_a_n_char_literal_constant_named = pattern.abs_a_n_char_literal_constant_named1
-        line, repmap = string_replace_map(string)
-        m = abs_a_n_char_literal_constant_named.match(line)
-        if not m: return
-        kind_param = m.group('kind_param')
-        line = m.group('value')
-        for k in Base.findall(line):
-            line = line.replace(k,repmap[k])
-        return line, kind_param
-    match = staticmethod(match)
-    def init(self, value, kind_param):
-        self.value = value
-        self.kind_param = kind_param
-        return
-    def tostr(self):
-        if self.kind_param is None: return str(self.value)
-        return '%s_%s' % (self.kind_param, self.value)
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.value, self.kind_param)
-
-#####
-
-    
-class Expr(BinaryOpBase):
-    """
-    <expr> = [ <expr> <defined-binary-op> ] <level-5-expr>
-    <defined-binary-op> = . <letter> [ <letter> ]... .
-    TODO: defined_binary_op must not be intrinsic_binary_op!!
-    """
-    subclass_names = ['Level_5_Expr']
-    use_names = ['Expr']
-    def match(string):
-        return BinaryOpBase.match(Expr, pattern.defined_binary_op.named(), Level_5_Expr,
-                                   string)
-    match = staticmethod(match)
-
-class Level_5_Expr(BinaryOpBase):
-    """
-    <level-5-expr> = [ <level-5-expr> <equiv-op> ] <equiv-operand>
-    <equiv-op> = .EQV.
-               | .NEQV.
-    """
-    subclass_names = ['Equiv_Operand']
-    use_names = ['Level_5_Expr']
-    def match(string):
-        return BinaryOpBase.match(\
-            Level_5_Expr,pattern.equiv_op.named(),Equiv_Operand,string)
-    match = staticmethod(match)
-    
-class Equiv_Operand(BinaryOpBase):
-    """
-    <equiv-operand> = [ <equiv-operand> <or-op> ] <or-operand>
-    <or-op>  = .OR.
-    """
-    subclass_names = ['Or_Operand']
-    use_names = ['Equiv_Operand']
-    def match(string):
-        return BinaryOpBase.match(\
-            Equiv_Operand,pattern.or_op.named(),Or_Operand,string)
-    match = staticmethod(match)
-    
-class Or_Operand(BinaryOpBase):
-    """
-    <or-operand> = [ <or-operand> <and-op> ] <and-operand>    
-    <and-op> = .AND.
-    """
-    subclass_names = ['And_Operand']
-    use_names = ['Or_Operand','And_Operand']
-    def match(string):
-        return BinaryOpBase.match(\
-            Or_Operand,pattern.and_op.named(),And_Operand,string)
-    match = staticmethod(match)
-    
-class And_Operand(UnaryOpBase):
-    """
-    <and-operand> = [ <not-op> ] <level-4-expr>
-    <not-op> = .NOT.
-    """
-    subclass_names = ['Level_4_Expr']
-    use_names = []
-    def match(string):
-        return UnaryOpBase.match(\
-            pattern.not_op.named(),Level_4_Expr,string)
-    match = staticmethod(match)
-    
-class Level_4_Expr(BinaryOpBase):
-    """
-    <level-4-expr> = [ <level-3-expr> <rel-op> ] <level-3-expr>
-    <rel-op> = .EQ. | .NE. | .LT. | .LE. | .GT. | .GE. | == | /= | < | <= | > | >=
-    """
-    subclass_names = ['Level_3_Expr']
-    use_names = []
-    def match(string):
-        return BinaryOpBase.match(\
-            Level_3_Expr,pattern.rel_op.named(),Level_3_Expr,string)
-    match = staticmethod(match)
-    
-class Level_3_Expr(BinaryOpBase):
-    """
-    <level-3-expr> = [ <level-3-expr> <concat-op> ] <level-2-expr>
-    <concat-op>    = //
-    """
-    subclass_names = ['Level_2_Expr']
-    use_names =['Level_3_Expr']
-    def match(string):
-        return BinaryOpBase.match(\
-            Level_3_Expr,pattern.concat_op.named(),Level_2_Expr,string)
-    match = staticmethod(match)
-
-class Level_2_Expr(BinaryOpBase):
-    """
-    <level-2-expr> = [ [ <level-2-expr> ] <add-op> ] <add-operand>
-    <level-2-expr> = [ <level-2-expr> <add-op> ] <add-operand>
-                     | <level-2-unary-expr>
-    <add-op>   = +
-                 | -
-    """
-    subclass_names = ['Level_2_Unary_Expr']
-    use_names = ['Level_2_Expr']
-    def match(string):
-        return BinaryOpBase.match(\
-            Level_2_Expr,pattern.add_op.named(),Add_Operand,string)
-    match = staticmethod(match)
-
-class Level_2_Unary_Expr(UnaryOpBase):
-    """
-    <level-2-unary-expr> = [ <add-op> ] <add-operand>
-    """
-    subclass_names = ['Add_Operand']
-    use_names = []
-    def match(string): return UnaryOpBase.match(pattern.add_op.named(),Add_Operand,string)
-    match = staticmethod(match)
-
-class Add_Operand(BinaryOpBase):
-    """
-    <add-operand> = [ <add-operand> <mult-op> ] <mult-operand>
-    <mult-op>  = *
-                 | /
-    """
-    subclass_names = ['Mult_Operand']
-    use_names = ['Add_Operand','Mult_Operand']
-    def match(string):
-        return BinaryOpBase.match(\
-            Add_Operand,pattern.mult_op.named(),Mult_Operand,string)
-    match = staticmethod(match)
-    
-class Mult_Operand(BinaryOpBase):
-    """
-    <mult-operand> = <level-1-expr> [ <power-op> <mult-operand> ]
-    <power-op> = **
-    """
-    subclass_names = ['Level_1_Expr']
-    use_names = ['Mult_Operand']
-    def match(string):
-        return BinaryOpBase.match(\
-            Level_1_Expr,pattern.power_op.named(),Mult_Operand,string,right=False)
-    match = staticmethod(match)
-    
-class Level_1_Expr(UnaryOpBase):
-    """
-    <level-1-expr> = [ <defined-unary-op> ] <primary>
-    <defined-unary-op> = . <letter> [ <letter> ]... .
-    """
-    subclass_names = ['Primary']
-    use_names = []
-    def match(string):
-        if pattern.non_defined_binary_op.match(string):
-            raise NoMatchError,`string`
-        return UnaryOpBase.match(\
-            pattern.defined_unary_op.named(),Primary,string)
-    match = staticmethod(match)
-    
-class Primary(Base):
-    """
-    <primary> = <constant>
-                | <designator>
-                | <array-constructor>
-                | <structure-constructor>
-                | <function-reference>
-                | <type-param-inquiry>
-                | <type-param-name>
-                | ( <expr> )
-    """
-    subclass_names = ['Constant', 'Parenthesis', 'Designator','Array_Constructor',
-                      'Structure_Constructor',
-                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 
-                       ]
-
-class Type_Param_Name(Base):
-    """
-    <type-param-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Type_Param_Inquiry(BinaryOpBase):
-    """
-    <type-param-inquiry> = <designator> % <type-param-name>
-    """
-    subclass_names = []
-    use_names = ['Designator','Type_Param_Name']
-    def match(string):
-        return BinaryOpBase.match(\
-            Designator, pattern.percent_op.named(), Type_Param_Name, string)
-    match = staticmethod(match)
-
-class Structure_Constructor_2(KeywordValueBase):
-    """
-    <structure-constructor-2> = [ <keyword> = ] <component-data-source>
-    """
-    subclass_names = ['Component_Data_Source']
-    use_names = ['Keyword']
-    def match(string): return KeywordValueBase.match(Component_Data_Source, string)
-    match = staticmethod(match)
-
-class Structure_Constructor(CallBase):
-    """
-    <structure-constructor> = <derived-type-spec> ( [ <component-spec-list> ] )
-                            | <structure-constructor-2>
-    """
-    subclass_names = ['Structure_Constructor_2']
-    use_names = ['Derived_Type_Spec', 'Component_Spec_List']
-    def match(string): return CallBase.match(Derived_Type_Spec, Component_Spec_List, string)
-    match = staticmethod(match)
-
-class Component_Data_Source(Base):
-    """
-    <component-data-source> = <expr>
-                              | <data-target>
-                              | <proc-target>
-    """
-    subclass_names = ['Proc_Target', 'Data_Target', 'Expr']
-
-class Data_Target(Base):
-    """
-    <data-target> = <variable>
-                    | <expr>
-    """
-    subclass_names = ['Variable','Expr']
-
-class Proc_Target(Base):
-    """
-    <proc-target> = <expr>
-                    | <procedure-name>
-                    | <proc-component-ref>
-    """
-    subclass_names = ['Proc_Component_Ref', 'Procedure_Name', 'Expr']
-
-class Proc_Component_Ref(BinaryOpBase):
-    """
-    <proc-component-ref> = <variable> % <procedure-component-name>
-    """
-    subclass_names = []
-    use_names = ['Variable','Procedure_Component_Name']
-    def match(string):
-        return BinaryOpBase.match(\
-            Variable, pattern.percent_op.named(), Procedure_Component_Name, string)            
-    match = staticmethod(match)
-
-class Component_Spec(KeywordValueBase):
-    """
-    <component-spec> = [ <keyword> = ] <component-data-source>
-    """
-    subclass_names = ['Component_Data_Source']
-    use_names = ['Keyword']
-    def match(string): return KeywordValueBase.match(Component_Data_Source, string)
-    match = staticmethod(match)
-
-class Component_Spec_List(SequenceBase):
-    """
-    <component-spec-list> = <component-spec> [ , <component-spec> ]...
-    """
-    subclass_names = ['Component_Spec']
-    use_names = []
-    def match(string): return SequenceBase.match(r',', Component_Spec, string)
-    match = staticmethod(match)
-
-class Array_Constructor(BracketBase):
-    """
-    <array-constructor> = (/ <ac-spec> /)
-                          | <left-square-bracket> <ac-spec> <right-square-bracket>
-
-    """
-    subclass_names = []
-    use_names = ['Ac_Spec']
-    def match(string):
-        try:
-            obj = BracketBase.match('(//)', Ac_Spec, string)
-        except NoMatchError:
-            obj = None
-        if obj is None:
-            obj = BracketBase.match('[]', Ac_Spec, string)
-        return obj
-    match = staticmethod(match)
-
-class Ac_Spec(Base):
-    """
-    <ac-spec> = <type-spec> ::
-                | [ <type-spec> :: ] <ac-value-list>
-    """
-    subclass_names = ['Ac_Value_List']
-    use_names = ['Type_Spec']
-    def match(string):
-        if string.endswith('::'):
-            return Type_Spec(string[:-2].rstrip()),None
-        line, repmap = string_replace_map(string)
-        i = line.find('::')
-        if i==-1: return
-        ts = line[:i].rstrip()
-        line = line[i+2:].lstrip()
-        for k in Base.findall(ts):
-            ts = ts.replace(k,repmap[k])
-        for k in Base.findall(line):
-            line = line.replace(k,repmap[k])
-        return Type_Spec(ts),Ac_Value_List(line)
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[0] is None:
-            return str(self.items[1])
-        if self.items[1] is None:
-            return str(self.items[0]) + ' ::'
-        return str(self.items[0]) + ' :: ' + str(self.items[1])
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
-
-class Ac_Value_List(SequenceBase):
-    """
-    <ac-value-list> = <ac-value> [ , <ac-value> ]...
-    """
-    subclass_names = ['Ac_Value']
-    use_names = []
-    def match(string): return SequenceBase.match(r',', Ac_Value, string)
-    match = staticmethod(match)
-
-class Ac_Value(Base):
-    """
-    <ac-value> = <expr>
-                 | <ac-implied-do>
-    """
-    subclass_names = ['Ac_Implied_Do','Expr']
-
-class Ac_Implied_Do(Base):
-    """
-    <ac-implied-do> = ( <ac-value-list> , <ac-implied-do-control> )
-    """
-    subclass_names = []
-    use_names = ['Ac_Value_List','Ac_Implied_Do_Control']    
-    def match(string):
-        if string[0]+string[-1] != '()': return
-        line, repmap = string_replace_map(string[1:-1].strip())
-        i = line.rfind('=')
-        if i==-1: return
-        j = line[:i].rfind(',')
-        assert j!=-1
-        s1 = line[:j].rstrip()
-        s2 = line[j+1:].lstrip()
-        for k in Base.findall(s1):
-            s1 = s1.replace(k,repmap[k])
-        for k in Base.findall(s2):
-            s2 = s2.replace(k,repmap[k])
-        return Ac_Value_List(s1),Ac_Implied_Do_Control(s2)
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self): return '(%s, %s)' % tuple(self.items)
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
-
-class Ac_Implied_Do_Control(Base):
-    """
-    <ac-implied-do-control> = <ac-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]    
-    """
-    subclass_names = []
-    use_names = ['Ac_Do_Variable','Scalar_Int_Expr']
-    def match(string):
-        i = string.find('=')
-        if i==-1: return
-        s1 = string[:i].rstrip()
-        line, repmap = string_replace_map(string[i+1:].lstrip())
-        t = line.split(',')
-        if not (2<=len(t)<=3): return
-        t = [Scalar_Int_Expr(s.strip()) for s in t]
-        return Ac_Do_Variable(s1), t
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self): return '%s = %s' % (self.items[0], ', '.join(map(str,self.items[1])))
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
-
-class Scalar_Int_Expr(Base):
-    """
-    <scalar-int-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Ac_Do_Variable(Base):
-    """
-    <ac-do-variable> = <scalar-int-variable>
-    <ac-do-variable> shall be a named variable    
-    """
-    subclass_names = ['Scalar_Int_Variable']
-
-class Type_Spec(Base):
-    """
-    <type-spec> = <intrinsic-type-spec>
-                  | <derived-type-spec>
-    """
-    subclass_names = ['Intrinsic_Type_Spec', 'Derived_Type_Spec']
-
-class Intrinsic_Type_Spec(Base):
-    """
-    <intrinsic-type-spec> = INTEGER [ <kind-selector> ]
-                            | REAL [ <kind-selector> ]
-                            | DOUBLE COMPLEX
-                            | COMPLEX [ <kind-selector> ]
-                            | CHARACTER [ <char-selector> ]
-                            | LOGICAL [ <kind-selector> ]
-    Extensions:
-                            | DOUBLE PRECISION
-                            | BYTE
-    """
-    subclass_names = []
-    use_names = ['Kind_Selector','Char_Selector']
-        
-    def match(string):
-        if string[:7].upper()=='INTEGER':
-            t = string[:7].upper()
-            line = string[7:].lstrip()
-            if line: return t,Kind_Selector(line)
-            return t,None
-        elif string[:4].upper()=='REAL':
-            t = string[:4].upper()
-            line = string[4:].lstrip()
-            if line: return t,Kind_Selector(line)
-            return t,None
-        elif string[:7].upper()=='COMPLEX':
-            t = string[:7].upper()
-            line = string[7:].lstrip()
-            if line: return t,Kind_Selector(line)
-            return t,None
-        elif string[:7].upper()=='LOGICAL':
-            t = string[:7].upper()
-            line = string[7:].lstrip()
-            if line: return t,Kind_Selector(line)
-            return t,None
-        elif string[:9].upper()=='CHARACTER':
-            t = string[:9].upper()
-            line = string[9:].lstrip()
-            if line: return t,Char_Selector(line)
-        elif string[:6].upper()=='DOUBLE':
-            line = string[6:].lstrip().upper()
-            if line=='COMPLEX':
-                return 'DOUBLE COMPLEX',None
-            if line=='PRECISION':
-                return 'DOUBLE PRECISION',None
-        elif string.upper()=='BYTE':
-            return 'BYTE',None
-        return
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[1] is None: return str(self.items[0])
-        return '%s%s' % tuple(self.items)
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
-
-class Kind_Selector(Base):
-    """
-    <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
-    Extensions:
-                      | * <char-length>
-    """
-    subclass_names = []
-    use_names = ['Char_Length','Scalar_Int_Initialization_Expr']
-
-    def match(string):
-        if string[0]+string[-1] != '()':
-            if not string.startswith('*'): return
-            return '*',Char_Length(string[1:].lstrip())
-        line = string[1:-1].strip()
-        if line[:4].upper()=='KIND':
-            line = line[4:].lstrip()
-            if not line.startswith('='): return
-            line = line[1:].lstrip()
-        return '(',Scalar_Int_Initialization_Expr(line),')'
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if len(self.items)==2: return '%s%s' % tuple(self.items)
-        return '%sKIND = %s%s' % tuple(self.items)
-    
-    def torepr(self):
-        if len(self.items)==2:
-            return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
-        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0], self.items[1], self.items[2])
-
-class Char_Selector(Base):
-    """
-    <char-selector> = <length-selector>
-                      | ( LEN = <type-param-value> , KIND = <scalar-int-initialization-expr> )
-                      | ( <type-param-value> , [ KIND = ] <scalar-int-initialization-expr> )
-                      | ( KIND = <scalar-int-initialization-expr> [ , LEN = <type-param-value> ] )
-    """
-    subclass_names = ['Length_Selector']
-    use_names = ['Type_Param_Value','Scalar_Int_Initialization_Expr']
-    def match(string):
-        if string[0]+string[-1] != '()': return
-        line, repmap = string_replace_map(string[1:-1].strip())
-        if line[:3].upper()=='LEN':
-            line = line[3:].lstrip()
-            if not line.startswith('='): return
-            line = line[1:].lstrip()
-            i = line.find(',')
-            if i==-1: return
-            v = line[:i].rstrip()
-            line = line[i+1:].lstrip()
-            if line[:4].upper()!='KIND': return
-            line = line[4:].lstrip()
-            if not line.startswith('='): return
-            line = line[1:].lstrip()
-            for k in Base.findall(v): v = v.replace(k,repmap[k])
-            for k in Base.findall(line): line = line.replace(k,repmap[k])
-            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
-        elif line[:4].upper()=='KIND':
-            line = line[4:].lstrip()
-            if not line.startswith('='): return
-            line = line[1:].lstrip()
-            i = line.find(',')
-            if i==-1: return None,Scalar_Int_Initialization_Expr(line)
-            v = line[i+1:].lstrip()
-            line = line[:i].rstrip()
-            if v[:3].upper()!='LEN': return
-            v = v[3:].lstrip()
-            if not v.startswith('='): return
-            v = v[1:].lstrip()
-            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
-        else:
-            i = line.find(',')
-            if i==-1: return
-            v = line[:i].rstrip()
-            line = line[i+1:].lstrip()
-            if line[:4].upper()=='KIND':
-                line = line[4:].lstrip()
-                if not line.startswith('='): return
-                line = line[1:].lstrip()
-            return Type_Param_Value(v), Scalar_Int_Initialization_Expr(line)
-        return
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if self.items[0] is None:
-            return '(KIND = %s)' % (self.items[1])
-        return '(LEN = %s, KIND = %s)' % (self.items[0],self.items[1])
-    def torepr(self):
-        return '%s(%r, %r)' % (self.__class__.__name__, self.items[0],self.items[1])
-    
-class Length_Selector(Base):
-    """
-    <length -selector> = ( [ LEN = ] <type-param-value> )
-                        | * <char-length> [ , ]
-    """
-    subclass_names = []
-    use_names = ['Type_Param_Value','Char_Length']
-    def match(string):
-        if string[0]+string[-1] == '()':
-            line = string[1:-1].strip()
-            if line[:3].upper()=='LEN':
-                line = line[3:].lstrip()
-                if not line.startswith('='): return
-                line = line[1:].lstrip()
-            return '(',Type_Param_Value(line),')'
-        if not string.startswith('*'): return
-        line = string[1:].lstrip()
-        if string[-1]==',': line = line[:-1].rstrip()
-        return '*',Char_Length(line)
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self):
-        if len(self.items)==2: return '%s%s' % tuple(self.items)
-        return '%sLEN = %s%s' % tuple(self.items)
-    def torepr(self):
-        if len(self.items)==2:
-            return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
-        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.items[0],self.items[1],self.items[2])
-
-class Char_Length(BracketBase):
-    """
-    <char-length> = ( <type-param-value> )
-                    | <scalar-int-literal-constant>
-    """
-    subclass_names = ['Scalar_Int_Literal_Constant']
-    use_names = ['Type_Param_Value']
-    def match(string): return BracketBase.match('()',Type_Param_Value, string)
-    match = staticmethod(match)
-
-class Scalar_Int_Expr(Base):
-    """
-    <scalar-int-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Scalar_Int_Initialization_Expr(Base):
-    """
-    <scalar-int-initialization-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Type_Param_Value(Base):
-    """
-    <type-param-value> = <scalar-int-expr>
-                       | *
-                       | :
-    """
-    subclass_names = ['Scalar_Int_Expr']
-    use_names = []
-    def match(string):
-        if string in ['*',':']: return string,
-        return
-    match = staticmethod(match)
-    def init(self, value): self.value = value
-    def tostr(self): return str(self.value)
-    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.value)
-
-class Derived_Type_Spec(CallBase):
-    """
-    <derived-type-spec> = <type-name> [ ( <type-param-spec-list> ) ]
-    """
-    subclass_names = ['Type_Name']
-    use_names = ['Type_Param_Spec_List']
-    def match(string): return CallBase.match(Type_Name, Type_Param_Spec_List, string)
-    match = staticmethod(match)
-
-class Type_Param_Spec(KeywordValueBase):
-    """
-    <type-param-spec> = [ <keyword> = ] <type-param-value>
-    """
-    subclass_names = ['Type_Param_Value']
-    use_names = ['Keyword']
-    def match(string): return KeywordValueBase.match(Type_Param_Value, string)
-    match = staticmethod(match)
-
-class Type_Param_Spec_List(SequenceBase):
-    """
-    <type-param-spec-list> = <type-param-spec> [ , <type-param-spec> ]...
-    """
-    subclass_names = ['Type_Param_Spec']
-    use_names = []
-    def match(string): return SequenceBase.match(',', Type_Param_Spec, string)
-    match = staticmethod(match)
-
-
-class Constant(Base):
-    """
-    <constant> = <literal-constant>
-                 | <named-constant>
-    """
-    subclass_names = ['Literal_Constant','Named_Constant']
-
-class Designator(Base):
-    """
-    <designator> = <object-name>
-                   | <array-element>
-                   | <array-section>
-                   | <structure-component>
-                   | <substring>
-    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
-    <structure-component> = <data-ref>
-    """
-    subclass_names = ['Object_Name','Array_Section','Array_Element','Structure_Component',
-                      'Substring'
-                      ]
-
-class Substring(CallBase):
-    """
-    <substring> = <parent-string> ( <substring-range> )    
-    """
-    subclass_names = []
-    use_names = ['Parent_String','Substring_Range']
-    def match(string): return CallBase.match(Parent_String, Substring_Range, string)
-    match = staticmethod(match)
-
-class Parent_String(Base):
-    """
-    <parent-string> = <scalar-variable-name>
-                      | <array-element>
-                      | <scalar-structure-component>
-                      | <scalar-constant>    
-    """
-    subclass_names = ['Scalar_Variable_Name', 'Array_Element', 'Scalar_Structure_Component', 'Scalar_Constant']
-
-class Variable_Name(Base):
-    """
-    <variable-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Scalar_Variable_Name(Base):
-    """
-    <scalar-variable-name> = <variable-name>
-    """
-    subclass_names = ['Variable_Name']
-
-class Scalar_Structure_Component(Base):
-    """
-    <scalar-structure-component> = <structure-component>
-    """
-    subclass_names = ['Structure_Component']
-
-class Scalar_Constant(Base):
-    """
-    <scalar-constant> = <constant>
-    """
-    subclass_names = ['Constant']
-
-class Structure_Component(Base):
-    """
-    <structure-component> = <data-ref>
-    """
-    subclass_names = ['Data_Ref']
-
-class Array_Section(CallBase):
-    """
-    <array-section> = <data-ref> [ ( <substring-range> ) ]
-    """
-    subclass_names = ['Data_Ref']
-    use_names = ['Substring_Range']
-    def match(string): return CallBase.match(Data_Ref, Substring_Range, string)
-    match = staticmethod(match)
-
-class Substring_Range(Base):
-    """
-    <substring-range> = [ <scalar-int-expr> ] : [ <scalar-int-expr> ]
-    """
-    subclass_names = []
-    use_names = ['Scalar_Int_Expr']
-    def match(string):
-        line, repmap = string_replace_map(string)
-        if ':' not in line: return
-        lhs,rhs = line.split(':',1)
-        lhs = lhs.rstrip()
-        rhs = rhs.lstrip()
-        lhs_obj, rhs_obj = None, None
-        if lhs:
-            for k in Base.findall(lhs):
-                lhs = lhs.replace(k,repmap[k])
-            lhs_obj = Scalar_Int_Expr(lhs)
-        if rhs:
-            for k in Base.findall(rhs):
-                rhs = rhs.replace(k,repmap[k])
-            rhs_obj = Scalar_Int_Expr(rhs)
-        return lhs_obj, rhs_obj
-    match = staticmethod(match)
-    def init(self, lhs, rhs):
-        self.lhs, self.rhs = lhs, rhs
-        return
-    def tostr(self):
-        if self.lhs is None:
-            if self.rhs is None: return ':'
-            return ': '+ str(self.rhs)
-        else:
-            if self.rhs is None: return str(self.lhs)+' :'
-            return str(self.lhs)+' : '+ str(self.rhs)
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.lhs, self.rhs)
-        
-class Array_Element(Base):
-    """
-    <array-element> = <data-ref>
-    """
-    subclass_names = ['Data_Ref']
-
-class Literal_Constant(Base):
-    """
-    <literal-constant> = <int-literal-constant>
-                         | <real-literal-constant>
-                         | <complex-literal-constant>
-                         | <logical-literal-constant>
-                         | <char-literal-constant>
-                         | <boz-literal-constant>
-    """
-    subclass_names = ['Int_Literal_Constant', 'Real_Literal_Constant','Complex_Literal_Constant',
-                      'Logical_Literal_Constant','Char_Literal_Constant','Boz_Literal_Constant']
-
-class Scalar_Int_Literal_Constant(Base):
-    """
-    <scalar-int-literal-constant> = <int-literal-constant>
-    """
-    subclass_names = ['Int_Literal_Constant']
-
-
-class Complex_Literal_Constant(Base):
-    """
-    <complex-literal-constant> = ( <real-part>, <imag-part> )
-    """
-    subclass_names = []
-    use_names = ['Real_Part','Imag_Part']
-    def match(string):
-        if string[0]+string[-1]!='()': return
-        if not pattern.abs_complex_literal_constant.match(string):
-            return
-        r,i = string[1:-1].split(',')
-        return Real_Part(r.strip()), Imag_Part(i.strip())
-    match = staticmethod(match)
-    def init(self,real,imag):
-        self.real, self.imag = real, imag
-        return
-    def tostr(self): return '(%s, %s)' % (self.real, self.imag)
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.real, self.imag)
-
-class Real_Part(Base):
-    """
-    <real-part> = <signed-int-literal-constant>
-                  | <signed-real-literal-constant>
-                  | <named-constant>
-    """
-    subclass_names = ['Signed_Int_Literal_Constant','Signed_Real_Literal_Constant','Named_Constant']
-
-class Imag_Part(Base):
-    """
-    <imag-part> = <real-part>
-    """
-    subclass_names = ['Signed_Int_Literal_Constant','Signed_Real_Literal_Constant','Named_Constant']
-
-
-class Boz_Literal_Constant(Base):
-    """
-    <boz-literal-constant> = <binary-constant>
-                             | <octal-constant>
-                             | <hex-constant>
-    """
-    subclass_names = ['Binary_Constant','Octal_Constant','Hex_Constant']
-
-
-
-class Named_Constant(Base):
-    """
-    <named-constant> = <name>
-    """
-    subclass_names = ['Name']
-
-class Object_Name(Base):
-    """
-    <object-name> = <name>
-    """
-    subclass_names = ['Name']
-    
-class Function_Reference(CallBase):
-    """
-    <function-reference> = <procedure-designator> ( [ <actual-arg-spec-list> ] )
-    """
-    subclass_names = []
-    use_names = ['Procedure_Designator','Actual_Arg_Spec_List']
-    def match(string):
-        return CallBase.match(Procedure_Designator, Actual_Arg_Spec_List, string)
-    match = staticmethod(match)
-
-
-class Procedure_Designator(BinaryOpBase):
-    """
-    <procedure-designator> = <procedure-name>
-                             | <proc-component-ref>
-                             | <data-ref> % <binding-name>
-    """
-    subclass_names = ['Procedure_Name','Proc_Component_Ref']
-    use_names = ['Data_Ref','Binding_Name']
-    def match(string):
-        return BinaryOpBase.match(\
-            Data_Ref, pattern.percent_op.named(),  Binding_Name, string)
-    match = staticmethod(match)
-
-class Part_Ref(CallBase):
-    """
-    <part-ref> = <part-name> [ ( <section-subscript-list> ) ]
-    """
-    subclass_names = ['Part_Name']
-    use_names = ['Section_Subscript_List']
-    def match(string): return CallBase.match(Part_Name, Section_Subscript_List, string)
-    match = staticmethod(match)
-
-class Section_Subscript_List(SequenceBase):
-    """
-    <section-subscript-list> = <section-subscript> [ , <section-subscript> ]...
-    """
-    subclass_names = ['Section_Subscript']
-    use_names = []
-    def match(string): return SequenceBase.match(',', Section_Subscript, string)
-    match = staticmethod(match)
-
-class Section_Subscript(Base):
-    """
-    <section-subscript> = <subscript>
-                          | <subscript-triplet>
-                          | <vector-subscript>
-    """
-    subclass_names = ['Subscript_Triplet', 'Vector_Subscript', 'Subscript']
-
-class Subscript_Triplet(Base):
-    """
-    <subscript-triplet> = [ <subscript> ] : [ <subscript> ] [ : <stride> ]
-    """
-    subclass_names = []
-    use_names = ['Subscript','Stride']
-    def match(string):
-        line, repmap = string_replace_map(string)
-        t = line.split(':')
-        if len(t)<=1 or len(t)>3: return
-        lhs_obj,rhs_obj, stride_obj = None, None, None
-        if len(t)==2:
-            lhs,rhs = t[0].rstrip(),t[1].lstrip()
-        else:
-            lhs,rhs,stride = t[0].rstrip(),t[1].strip(),t[2].lstrip()
-            if stride:
-                for k in Base.findall(stride):
-                    stride = stride.replace(k, repmap[k])
-                stride_obj = Stride(stride)
-        if lhs:
-            for k in Base.findall(lhs):
-                lhs = lhs.replace(k, repmap[k])
-            lhs_obj = Subscript(lhs)
-        if rhs:
-            for k in Base.findall(rhs):
-                rhs = rhs.replace(k, repmap[k])
-            rhs_obj = Subscript(rhs)
-        return lhs_obj, rhs_obj, stride_obj
-    match = staticmethod(match)
-    def init(self, lhs, rhs, stride):
-        self.lhs, self.rhs, self.stride =lhs, rhs, stride
-        return
-    def tostr(self):
-        s = ''
-        if self.lhs is not None:
-            s += str(self.lhs) + ' :'
-        else:
-            s += ':'
-        if self.rhs is not None:
-            s += ' ' + str(self.rhs)
-        if self.stride is not None:
-            s += ' : ' + str(self.stride)
-        return s
-    def torepr(self):
-        return '%s(%r, %r, %r)' % (self.__class__.__name__,self.lhs, self.rhs, self.stride)        
-
-class Stride(Base):
-    """
-    <stride> = <scalar-int-expr>
-    """
-    subclass_names = ['Scalar_Int_Expr']
-
-class Vector_Subscript(Base):
-    """
-    <vector-subscript> = <int-expr>
-    """
-    subclass_names = ['Int_Expr']
-
-class Int_Expr(Base):
-    """
-    <int-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Subscript(Base):
-    """
-    <subscript> = <scalar-int-expr>
-    """
-    subclass_names = ['Scalar_Int_Expr']
-
-class Part_Name(Base):
-    """
-    <part-name> = <name>
-    """
-    subclass_names = ['Name']
-    
-class Binding_Name(Base):
-    """
-    <binding-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Data_Ref(SequenceBase):
-    """
-    <data-ref> = <part-ref> [ % <part-ref> ]...
-    """
-    subclass_names = ['Part_Ref']
-    use_names = []
-    def match(string): return SequenceBase.match('%', Part_Ref, string)
-    match = staticmethod(match)
-
-class Actual_Arg_Spec_List(SequenceBase):
-    """
-    <actual-arg-spec-list> = <actual-arg-spec> [ , <actual-arg-spec> ]...
-    """
-    subclass_names = ['Actual_Arg_Spec']
-    use_names = []
-    def match(string): return SequenceBase.match(r',', Actual_Arg_Spec, string)
-    match = staticmethod(match)
-
-class Actual_Arg_Spec(KeywordValueBase):
-    """
-    <actual-arg-spec> = [ <keyword> = ] <actual-arg>
-    """
-    subclass_names = ['Actual_Arg']
-    use_names = ['Keyword']
-    def match(string): return KeywordValueBase.match(Actual_Arg, string)
-    match = staticmethod(match)
-
-class Keyword(Base):
-    """
-    <keyword> = <name>
-    """
-    subclass_names = ['Name']
-
-class Type_Name(Name):
-    """
-    <type-name> = <name>
-    <type-name> shall not be DOUBLEPRECISION or the name of intrinsic type
-    """
-    subclass_names = []
-    use_names = []
-    def match(string):
-        if pattern.abs_intrinsic_type_name.match(string): return
-        return Name.match(string)
-    match = staticmethod(match)
-    
-class Actual_Arg(Base):
-    """
-    <actual-arg> = <expr>
-                 | <variable>
-                 | <procedure-name>
-                 | <proc-component-ref>
-                 | <alt-return-spec>
-    """
-    subclass_names = ['Procedure_Name','Proc_Component_Ref','Alt_Return_Spec', 'Variable', 'Expr']
-
-class Alt_Return_Spec(Base):
-    """
-    <alt-return-spec> = * <label>
-    """
-    subclass_names = []
-    def match(string):
-        if not string.startswith('*'): return
-        line = string[1:].lstrip()
-        if pattern.abs_label.match(line):
-            return line,
-        return
-    match = staticmethod(match)
-    def init(self, label):
-        self.label = label
-        return
-    def tostr(self): return '*%s' % (self.label)
-    def torepr(self): return '%s(%r)' % (self.__class__.__name__, self.label)
-
-class Variable(Base):
-    """
-    <variable> = <designator>
-    """
-    subclass_names = ['Designator']
-
-class Procedure_Component_Name(Base):
-    """
-    <procedure-component-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Procedure_Name(Base):
-    """
-    <procedure-name> = <name>
-    """
-    subclass_names = ['Name']
-    
-class Parenthesis(BracketBase):
-    """
-    <parenthesis> = ( <expr> )
-    """
-    subclass_names = []
-    use_names = ['Expr']
-    def match(string): return BracketBase.match('()', Expr, string)
-    match = staticmethod(match)
-
-
-##############################################################################
-    
-ClassType = type(Base)
-Base_classes = {}
-for clsname in dir():
-    break
-    cls = eval(clsname)
-    if isinstance(cls, ClassType) and issubclass(cls, Base) and not cls.__name__.endswith('Base'):
-        Base_classes[cls.__name__] = cls
-
-
-# Optimize subclass_names tree:
-def _rpl_list(clsname):
-    cls = Base_classes[clsname]
-    if cls.__dict__.has_key('match'): return [clsname]
-    l = []
-    for n in getattr(cls,'subclass_names',[]):
-        l1 = _rpl_list(n)
-        for n1 in l1: 
-            if n1 not in l:
-                l.append(n1)
-    return l
-
-for cls in Base_classes.values():
-    break
-    if not hasattr(cls, 'subclass_names'): continue
-    opt_subclass_names = []
-    for n in cls.subclass_names:
-        for n1 in _rpl_list(n):
-            if n1 not in opt_subclass_names:  opt_subclass_names.append(n1)
-    if not opt_subclass_names==cls.subclass_names:
-        #print cls.__name__,':',', '.join(cls.subclass_names),'->',', '.join(opt_subclass_names)
-        cls.subclass_names[:] = opt_subclass_names
-    #else:
-    #    print cls.__name__,':',opt_subclass_names
-
-if 0:
-
-    def _deep_subclass_names(clsname, l=[]):
-        cls = Base_classes[clsname]
-        subclass_names = getattr(cls,'subclass_names',[])
-        if clsname not in l:
-            l.append(clsname)
-        for n in subclass_names:
-            if n in l: continue
-            l.append(n)
-            _deep_subclass_names(n,l)
-
-        return l
-
-    Base_deps = {}
-    for cls in Base_classes.values():
-        l = []
-        _deep_subclass_names(cls.__name__,l)
-        Base_deps[cls.__name__] = l
-
-    def _sort_deps(lhs,rhs):
-        if lhs==rhs: return 0
-        rhs_deps = Base_deps[rhs]
-        lhs_deps = Base_deps[lhs]
-        if lhs in rhs_deps and rhs in lhs_deps: return 0
-        if lhs in rhs_deps: return -1
-        if rhs in lhs_deps: return 1
-        return 0
-        return cmp(len(lhs_deps),len(rhs_deps))
-
-    for clsname,deps in Base_deps.items():
-        deps.sort(_sort_deps)
-        print clsname,deps
-
-# Initialize Base.subclasses dictionary:
-for clsname, cls in Base_classes.items():
-    break
-    subclass_names = getattr(cls, 'subclass_names', None)
-    if subclass_names is None:
-        print '%s class is missing subclass_names list' % (clsname)
-        continue
-    try:
-        l = Base.subclasses[clsname]
-    except KeyError:
-        Base.subclasses[clsname] = l = []
-    for n in subclass_names:
-        if Base_classes.has_key(n):
-            l.append(Base_classes[n])
-        else:
-            print '%s not implemented needed by %s' % (n,clsname)
-
-if 0:
-    for cls in Base_classes.values():
-        subclasses = Base.subclasses.get(cls.__name__,[])
-        subclasses_names = [c.__name__ for c in subclasses]
-        subclass_names = getattr(cls,'subclass_names', [])
-        use_names = getattr(cls,'use_names',[])
-        for n in subclasses_names:
-            if n not in subclass_names:
-                print '%s needs to be added to %s subclasses_name list' % (n,cls.__name__)
-        for n in subclass_names:
-            if n not in subclasses_names:
-                print '%s needs to be added to %s subclass_name list' % (n,cls.__name__)
-        for n in use_names:
-            if not Base_classes.has_key(n):
-                print '%s not defined used by %s' % (n, cls.__name__)
-#import pprint
-#pprint.pprint(Base.subclasses)

Modified: trunk/numpy/f2py/lib/parser/readfortran.py
===================================================================
--- trunk/numpy/f2py/lib/parser/readfortran.py	2006-10-31 05:17:46 UTC (rev 3420)
+++ trunk/numpy/f2py/lib/parser/readfortran.py	2006-10-31 13:28:31 UTC (rev 3421)
@@ -268,7 +268,7 @@
             pass
         return
 
-    def put_item(self):
+    def put_item(self, item):
         self.fifo_item.insert(0, item)
         return
     # Iterator methods:
@@ -389,6 +389,7 @@
     def show_message(self, message, stream = sys.stdout):
         stream.write(message+'\n')
         stream.flush()
+        return
 
     def format_message(self, kind, message, startlineno, endlineno,
                        startcolno=0, endcolno=-1):
@@ -424,6 +425,22 @@
         return self.format_message('WARNING',message, startlineno,
                                    endlineno, startcolno, endcolno)
 
+    def error(self, message, item=None):
+        if item is None:
+            m = self.format_error_message(message, len(self.source_lines)-2, len(self.source_lines))
+        else:
+            m = self.format_error_message(message, item.span[0], item.span[1])
+        self.show_message(m)
+        return
+
+    def warning(self, message, item=None):
+        if item is None:
+            m = self.format_warning_message(message, len(self.source_lines)-2, len(self.source_lines))
+        else:
+            m = self.format_warning_message(message, item.span[0], item.span[1])
+        self.show_message(m)
+        return
+
     # Auxiliary methods for processing raw source lines:
 
     def handle_cf2py_start(self, line):

Deleted: trunk/numpy/f2py/lib/parser/statements2.py
===================================================================
--- trunk/numpy/f2py/lib/parser/statements2.py	2006-10-31 05:17:46 UTC (rev 3420)
+++ trunk/numpy/f2py/lib/parser/statements2.py	2006-10-31 13:28:31 UTC (rev 3421)
@@ -1,1533 +0,0 @@
-
-from expressions import *
-
-class Program(Base):
-    """
-    <program> = <program-unit>
-                  [ <program-unit> ] ...
-    """
-    subclass_names = []
-    use_names = ['Program_Unit']
-
-class Program_Unit(Base):
-    """
-    <program-unit> = <main-program>
-                     | <external-subprogram>
-                     | <module>
-                     | <block-data>
-    """
-    subclass_names = ['Main_Program', 'External_Subprogram', 'Module', 'Block_Data']
-
-class External_Subprogram(Base):
-    """
-    <external-subprogram> = <function-subprogram>
-                            | <subroutine-subprogram>
-    """
-    subclass_names = ['Function_Subprogram', 'Subroutine_Subprogram']
-
-class Function_Subprogram(Base):
-    """
-    <function-subprogram> = <function-stmt>
-                               [ <specification-part> ]
-                               [ <execution-part> ]
-                               [ <internal-subprogram-part> ]
-                            <end-function-stmt>
-    """
-    subclass_names = []
-    use_names = ['Function_Stmt', 'Specification_Part', 'Execution_Part',
-                 'Internal_Subprogram_Part', 'End_Function_Stmt']
-
-class Subroutine_Subprogram(BlockBase):
-    """
-    <subroutine-subprogram> = <subroutine-stmt>
-                                 [ <specification-part> ]
-                                 [ <execution-part> ]
-                                 [ <internal-subprogram-part> ]
-                              <end-subroutine-stmt>
-    """
-    subclass_names = []
-    use_names = ['Subroutine_Stmt', 'Specification_Part', 'Execution_Part',
-                 'Internal_Subprogram_Part', 'End_Subroutine_Stmt']
-    def match(reader):
-        item = get_item(reader)
-        line = item.line
-        content = []
-        try:
-            start_stmt = Subroutine_Stmt(line)
-        except NoMatchError:
-            start_stmt = None
-        if start_stmt is None:
-            put_item(reader, item)
-            return
-        content.append(start_stmt)
-        content.extend(get_content(reader, Specification_Part, End_Subroutine_Stmt))
-        if isinstance(content[-1], End_Subroutine_Stmt):
-            return content,
-        content.extend(get_content(reader, Execution_Part, End_Subroutine_Stmt))
-        if isinstance(content[-1], End_Subroutine_Stmt):
-            return content,
-        content.extend(get_content(reader, Internal_Subprogram_Part, End_Subroutine_Stmt))
-        assert isinstance(content[-1], End_Subroutine_Stmt),`content[-1]`
-        return content,            
-    match = staticmethod(match)
-
-
-
-
-class Prefix(SequenceBase):
-    """
-    <prefix> = <prefix-spec> [ <prefix-spec> ]..
-    """
-    subclass_names = ['Prefix_Spec']
-    _separator = (' ',re.compile(r'\s+(?=[a-z_])',re.I))
-    def match(string): return SequenceBase.match(Prefix._separator, Prefix_Spec, string)
-    match = staticmethod(match)
-
-class Prefix_Spec(StringBase):
-    """
-    <prefix-spec> = <declaration-type-spec>
-                    | RECURSIVE
-                    | PURE
-                    | ELEMENTAL
-    """
-    subclass_names = ['Declaration_Type_Spec']
-    def match(string):
-        if len(string)==9:
-            upper = string.upper()
-            if upper in ['RECURSIVE', 'ELEMENTAL']: return upper,
-        elif len(string)==4:
-            upper = string.upper()
-            if upper=='PURE': return upper,
-        return None
-    match = staticmethod(match)
-
-
-class Specification_Part(BlockBase):
-    """
-    <specification-part> = [ <use-stmt> ]...
-                             [ <import-stmt> ]...
-                             [ <implicit-part> ]
-                             [ <declaration-construct> ]...
-    """
-    subclass_names = []
-    use_names = ['Use_Stmt', 'Import_Stmt', 'Implicit_Part', 'Declaration_Construct']
-    def match(reader):
-        content = []
-        for cls in [Declaration_Construct]:
-            item = reader.get_item()
-            while item is not None:
-                obj = None
-                line = item.line
-                try:
-                    obj = cls(line)
-                except NoMatchError:
-                    pass
-                if obj is None:
-                    reader.put_item(item)
-                    break
-                content.append(obj)
-                item = reader.get_item()
-        return content,
-    match = staticmethod(match)
-
-class Implicit_Part(Base):
-    """
-    <implicit-part> = [ <implicit-part-stmt> ]...
-                        <implicit-stmt>
-    """
-    subclass_names = []
-    use_names = ['Implicit_Part_Stmt', 'Implicit_Stmt']
-
-class Implicit_Part_Stmt(Base):
-    """
-    <implicit-part-stmt> = <implicit-stmt>
-                           | <parameter-stmt>
-                           | <format-stmt>
-                           | <entry-stmt>
-    """
-    subclass_names = ['Implicit_Stmt', 'Parameter_Stmt', 'Format_Stmt', 'Entry_Stmt']
-
-class Declaration_Construct(Base):
-    """
-    <declaration-construct> = <derived-type-def>
-                              | <entry-stmt>
-                              | <enum-def>
-                              | <format-stmt>
-                              | <interface-block>
-                              | <parameter-stmt>
-                              | <procedure-declaration-stmt>
-                              | <specification-stmt>
-                              | <type-declaration-stmt>
-                              | <stmt-function-stmt>
-    """
-    subclass_names = ['Derived_Type_Def', 'Entry_Stmt', 'Enum_Def', 'Format_Stmt',
-                      'Interface_Block', 'Parameter_Stmt', 'Procedure_Declaration_Stmt',
-                      'Specification_Stmt', 'Type_Declaration_Stmt', 'Stmt_Function_Stmt']
-
-class Execution_Part(Base):
-    """
-    <execution-part> = <executable-construct>
-                       | [ <execution-part-construct> ]...
-
-    <execution-part> shall not contain <end-function-stmt>, <end-program-stmt>, <end-subroutine-stmt>
-    """
-    subclass_names = []
-    use_names = ['Executable_Construct', 'Execution_Part_Construct']
-
-class Execution_Part_Construct(Base):
-    """
-    <execution-part-construct> = <executable-construct>
-                                 | <format-stmt>
-                                 | <entry-stmt>
-                                 | <data-stmt>
-    """
-    subclass_names = ['Executable_Construct', 'Format_Stmt', 'Entry_Stmt', 'Data_Stmt']
-
-class Internal_Subprogram_Part(Base):
-    """
-    <internal-subprogram-part> = <contains-stmt>
-                                   <internal-subprogram>
-                                   [ <internal-subprogram> ]...
-    """
-    subclass_names = []
-    use_names = ['Contains_Stmt', 'Internal_Subprogram']
-
-class Internal_Subprogram(Base):
-    """
-    <internal-subprogram> = <function-subprogram>
-                            | <subroutine-subprogram>
-    """
-    subclass_names = ['Function_Subprogram', 'Subroutine_Subprogram']
-
-class Specification_Stmt(Base):
-    """
-    <specification-stmt> = <access-stmt>
-                           | <allocatable-stmt>
-                           | <asynchronous-stmt>
-                           | <bind-stmt>
-                           | <common-stmt>
-                           | <data-stmt>
-                           | <dimension-stmt>
-                           | <equivalence-stmt>
-                           | <external-stmt>
-                           | <intent-stmt>
-                           | <intrinsic-stmt>
-                           | <namelist-stmt>
-                           | <optional-stmt>
-                           | <pointer-stmt>
-                           | <protected-stmt>
-                           | <save-stmt>
-                           | <target-stmt>
-                           | <volatile-stmt>
-                           | <value-stmt>
-    """
-    subclass_names = ['Access_Stmt', 'Allocatable_Stmt', 'Asynchronous_Stmt','Bind_Stmt',
-                      'Common_Stmt', 'Data_Stmt', 'Dimension_Stmt', 'Equivalence_Stmt',
-                      'External_Stmt', 'Intent_Stmt', 'Intrinsic_Stmt', 'Namelist_Stmt',
-                      'Optional_Stmt','Pointer_Stmt','Protected_Stmt','Save_Stmt',
-                      'Target_Stmt','Volatile_Stmt', 'Value_Stmt']
-
-class Executable_Construct(Base):
-    """
-    <executable-construct> = <action-stmt>
-                             | <associate-stmt>
-                             | <case-construct>
-                             | <do-construct>
-                             | <forall-construct>
-                             | <if-construct>
-                             | <select-type-construct>
-                             | <where-construct>
-    """
-    subclass_names = ['Action_Stmt', 'Associate_Stmt', 'Case_Construct', 'Do_Construct',
-                      'Forall_Construct', 'If_Construct', 'Select_Type_Construct', 'Where_Construct']
-
-class Action_Stmt(Base):
-    """
-    <action-stmt> = <allocate-stmt>
-                    | <assignment-stmt>
-                    | <backspace-stmt>
-                    | <call-stmt>
-                    | <close-stmt>
-                    | <continue-stmt>
-                    | <cycle-stmt>
-                    | <deallocate-stmt>
-                    | <endfile-stmt>
-                    | <end-function-stmt>
-                    | <end-program-stmt>
-                    | <end-subroutine-stmt>
-                    | <exit-stmt>
-                    | <flush-stmt>
-                    | <forall-stmt>
-                    | <goto-stmt>
-                    | <if-stmt>
-                    | <inquire-stmt>
-                    | <nullify-stmt>
-                    | <open-stmt>
-                    | <pointer-assignment-stmt>
-                    | <print-stmt>
-                    | <read-stmt>
-                    | <return-stmt>
-                    | <rewind-stmt>
-                    | <stop-stmt>
-                    | <wait-stmt>
-                    | <where-stmt>
-                    | <write-stmt>
-                    | <arithmetic-if-stmt>
-                    | <computed-goto-stmt>
-    """
-    subclass_names = ['Allocate_Stmt', 'Assignment_Stmt', 'Backspace_Stmt', 'Call_Stmt',
-                      'Close_Stmt', 'Continue_Stmt', 'Cycle_Stmt', 'Deallocate_Stmt',
-                      'Endfile_Stmt', 'End_Function_Stmt', 'End_Subroutine_Stmt', 'Exit_Stmt',
-                      'Flush_Stmt', 'Forall_Stmt', 'Goto_Stmt', 'If_Stmt', 'Inquire_Stmt',
-                      'Nullify_Stmt', 'Open_Stmt', 'Pointer_Assignment_Stmt', 'Print_Stmt',
-                      'Read_Stmt', 'Return_Stmt', 'Rewind_Stmt', 'Stop_Stmt', 'Wait_Stmt',
-                      'Where_Stmt', 'Write_Stmt', 'Arithmetic_If_Stmt', 'Computed_Goto_Stmt']
-
-class Int_Constant(Base):
-    subclass_names = ['Constant']
-
-class Scalar_Int_Constant(Base):
-    subclass_names = ['Int_Constant']
-
-class Derived_Type_Def(Base):
-    """
-    <derived-type-def> = <derived-type-stmt>
-                           [ <type-param-def-stmt> ]...
-                           [ <private-or-sequence> ]...
-                           [ <component-part> ]
-                           [ <type-bound-procedure-part> ]
-                           <end-type-stmt>
-    """
-    subclass_names = []
-    use_names = ['Derived_Type_Stmt', 'Type_Param_Def_Stmt', 'Private_Or_Sequence',
-                 'Component_Part', 'Type_Bound_Procedure_Part', 'End_Type_Stmt']
-
-class Derived_Type_Stmt(Base):
-    """
-    <derived-type-stmt> = TYPE [ [ , <type-attr-spec-list> ] :: ] <type-name> [ ( <type-param-name-list> ) ]
-    """
-    subclass_names = []
-    use_names = ['Type_Attr_Spec_List', 'Type_Name', 'Type_Param_Name_List']
-
-class Type_Attr_Spec(Base):
-    """
-    <type-attr-spec> = <access-spec>
-                       | EXTENDS ( <parent-type-name> )
-                       | ABSTRACT
-                       | BIND (C)
-    """
-    subclass_names = ['Access_Spec']
-    use_names = ['Parent_Type_Name']
-
-class Private_Or_Sequence(Base):
-    """
-    <private-or-sequence> = <private-components-stmt>
-                            | <sequence-stmt>
-    """
-    subclass_names = ['Private_Components_Stmt', 'Sequence_Stmt']
-
-class End_Type_Stmt(Base):
-    """
-    <end-type-stmt> = END TYPE [ <type-name> ]
-    """
-    subclass_names = []
-    use_names = ['Type_Name']
-    
-class Sequence_Stmt(Base):
-    """
-    <sequence-stmt> = SEQUENCE
-    """
-    subclass_names = []
-    def match(string):
-        if len(string) != 8: return
-        start = string.upper()
-        if start=='SEQUENCE': return start,
-        return
-    match = staticmethod(match)
-
-class Type_Param_Def_Stmt(Base):
-    """
-    <type-param-def-stmt> = INTEGER [ <kind-selector> ] , <type-param-attr-spec> :: <type-param-decl-list>
-    """
-    subclass_names = []
-    use_names = ['Kind_Selector', 'Type_Param_Attr_Spec', 'Type_Param_Decl_List']
-
-class Type_Param_Decl(Base):
-    """
-    <type-param-decl> = <type-param-name> [ = <scalar-int-initialization-expr> ]
-    """
-    subclass_names = []
-    use_names = ['Type_Param_Name', 'Scalar_Int_Initialization_Expr']
-
-class Type_Param_Attr_Spec(Base):
-    """
-    <type-param-attr-spec> = KIND
-                             | LEN
-    """
-    subclass_names = []
-
-class Component_Part(Base):
-    """
-    <component-part> = [ <component-def-stmt> ]...
-    """
-    subclass_names = []
-    use_names = ['Component_Def_Stmt']
-
-class Component_Def_Stmt(Base):
-    """
-    <component-def-stmt> = <data-component-def-stmt>
-                           | <proc-component-def-stmt>
-    """
-    subclass_names = ['Data_Component_Def_Stmt', 'Proc_Component_Def_Stmt']
-
-class Data_Component_Def_Stmt(Base):
-    """
-    <data-component-def-stmt> = <declaration-type-spec> [ [ , <component-attr-spec-list> ] :: ] <component-decl-list>
-    """
-    subclass_names = []
-    use_names = ['Declaration_Type_Spec', 'Component_Attr_Spec_List', 'Component_Decl_List']
-
-class Component_Attr_Spec(Base):
-    """
-    <component-attr-spec> = POINTER
-                            | DIMENSION ( <component-array-spec> )
-                            | ALLOCATABLE
-                            | <access-spec>
-    """
-    subclass_names = ['Access_Spec']
-    use_names = ['Component_Array_Spec']
-
-class Component_Decl(Base):
-    """
-    <component-decl> = <component-name> [ ( <component-array-spec> ) ] [ * <char-length> ] [ <component-initialization> ]
-    """
-    subclass_names = []
-    use_names = ['Component_Name', 'Component_Array_Spec', 'Char_Length', 'Component_Initialization']
-
-class Component_Array_Spec(Base):
-    """
-    <component-array-spec> = <explicit-shape-spec-list>
-                             | <deferred-shape-spec-list>
-    """
-    subclass_names = ['Explicit_Shape_Spec_List', 'Deferred_Shape_Spec_List']
-
-class Component_Initialization(Base):
-    """
-    <component-initialization> =  = <initialization-expr>
-                                 | => <null-init>
-    """
-    subclass_names = []
-    use_names = ['Initialization-expr', 'Null_Init']
-
-class Proc_Component_Def_Stmt(Base):
-    """
-    <proc-component-def-stmt> = PROCEDURE ( [ <proc-interface> ] ) , <proc-component-attr-spec-list> :: <proc-decl-list>
-    """
-    subclass_names = []
-    use_names = ['Proc_Interface', 'Proc_Component_Attr_Spec_List', 'Proc_Decl_List']
-
-class Proc_Component_Attr_Spec(Base):
-    """
-    <proc-component-attr-spec> = POINTER
-                                 | PASS [ ( <arg-name> ) ]
-                                 | NOPASS
-                                 | <access-spec>
-    """
-    subclass_names = []
-    use_names = ['Arg_Name', 'Access_Spec']
-
-class Private_Components_Stmt(Base):
-    """
-    <private-components-stmt> = PRIVATE
-    """
-    subclass_names = []
-
-class Type_Bound_Procedure_Part(Base):
-    """
-    <type-bound-procedure-part> = <contains-stmt>
-                                      [ <binding-private-stmt> ]
-                                      <proc-binding-stmt>
-                                      [ <proc-binding-stmt> ]...
-    """
-    subclass_names = []
-    use_names = ['Contains_Stmt', 'Binding_Private_Stmt', 'Proc_Binding_Stmt']
-
-class Binding_Private_Stmt(Base):
-    """
-    <binding-private-stmt> = PRIVATE
-    """
-    subclass_names = []
-
-class Proc_Binding_Stmt(Base):
-    """
-    <proc-binding-stmt> = <specific-binding>
-                          | <generic-binding>
-                          | <final-binding>
-    """
-    subclass_names = ['Specific_Binding', 'Generic_Binding', 'Final_Binding']
-
-class Specific_Binding(Base):
-    """
-    <specific-binding> = PROCEDURE [ ( <interface-name> ) ] [ [ , <binding-attr-list> ] :: ] <binding-name> [ => <procedure-name> ]
-    """
-    subclass_names = []
-    use_names = ['Interface_Name', 'Binding_Attr_List', 'Binding_Name', 'Procedure_Name']
-
-class Generic_Binding(Base):
-    """
-    <generic-binding> = GENERIC [ , <access-spec> ] :: <generic-spec> => <binding-name-list>
-    """
-    subclass_names = []
-    use_names = ['Access_Spec', 'Generic_Spec', 'Binding_Name_List']
-
-class Binding_Attr(Base):
-    """
-    <binding-attr> = PASS [ ( <arg-name> ) ]
-                     | NOPASS
-                     | NON_OVERRIDABLE
-                     | <access-spec>
-    """
-    subclass_names = []
-    use_names = ['Arg_Name', 'Access_Spec']
-
-class Final_Binding(Base):
-    """
-    <final-binding> = FINAL [ :: ] <final-subroutine-name-list>
-    """
-    subclass_names = []
-    use_names = ['Final_Subroutine_Name_List']
-
-#<derived-type-spec>
-#<type-param-spec>
-#<structure-constructor>
-#<component-spec>
-#<component-data-source>
-
-class Enum_Def(Base):
-    """
-    <enum-def> = <enum-def-stmt>
-                     <enumerator-def-stmt>
-                     [ <enumerator-def-stmt> ]...
-                     <end-enum-stmt>
-    """
-    subclass_names = []
-    use_names = ['Enum_Def_Stmt', 'Enumerator_Def_Stmt', 'End_Enum_Stmt']
-
-class Enum_Def_Stmt(Base):
-    """
-    <enum-def-stmt> = ENUM, BIND(C)
-    """
-    subclass_names = []
-
-class Enumerator_Def_Stmt(Base):
-    """
-    <enumerator-def-stmt> = ENUMERATOR [ :: ] <enumerator-list>
-    """
-    subclass_names = []
-    use_names = ['Enumerator_List']
-
-class Enumerator(Base):
-    """
-    <enumerator> = <named-constant> [ = <scalar-int-initialization-expr> ]
-    """
-    subclass_names = []
-    use_names = ['Named_Constant', 'Scalar_Int_Initialization_Expr']
-
-class End_Enumerator_Stmt(Base):
-    """
-    <end-enumerator-stmt> = END ENUM
-    """
-    subclass_names = []
-
-#<array-constructor>
-#<ac-spec>
-#<ac-value>
-#<ac-implied-do>
-#<ac-implied-do-control>
-#<ac-do-variable>
-
-class Type_Declaration_Stmt(Base):
-    """
-    <type-declaration-stmt> = <declaration-type-spec> [ [ , <attr-spec> ]... :: ] <entity-decl-list>
-    """
-    subclass_names = []
-    use_names = ['Declaration_Type_Spec', 'Attr_Spec_List', 'Entity_Decl_List']
-
-    def match(string):
-        line, repmap = string_replace_map(string)
-        i = line.find(',')
-        if i==-1:
-            i = line.find('::')
-        if i==-1:
-            m = re.search(r'\s[a-z_]',line,re.I)
-            if m is None: return
-            i = m.start()
-        type_spec = Declaration_Type_Spec(repmap(line[:i]))
-        if type_spec is None: return
-        line = line[i:].lstrip()
-        if line.startswith(','):
-            i = line.find('::')
-            if i==-1: return
-            attr_specs = Attr_Spec_List(repmap(line[1:i].strip()))
-            if attr_specs is None: return
-            line = line[i:]
-        else:
-            attr_specs = None
-        if line.startswith('::'):
-            line = line[2:].lstrip()
-        entity_decls = Entity_Decl_List(repmap(line))
-        if entity_decls is None: return
-        return type_spec, attr_specs, entity_decls
-    match = staticmethod(match)
-    def init(self, *args):
-        self.type_spec, self.attr_specs, self.entity_decls = args
-        return
-    def tostr(self):
-        if self.attr_specs is None:
-            return '%s :: %s' % (self.type_spec, self.entity_decls)
-        else:
-            return '%s, %s :: %s' % (self.type_spec, self.attr_specs, self.entity_decls)
-    def torepr(self):
-        return '%s(%r, %r, %r)' % (self.__class__.__name__, self.type_spec, self.attr_specs, self.entity_decls)
-
-class Declaration_Type_Spec(Base):
-    """
-    <declaration-type-spec> = <intrinsic-type-spec>
-                              | TYPE ( <derived-type-spec> )
-                              | CLASS ( <derived-type-spec> )
-                              | CLASS ( * )
-    """
-    subclass_names = ['Intrinsic_Type_Spec']
-    use_names = ['Derived_Type_Spec']
-
-    def match(string):
-        if string[-1] != ')': return
-        start = string[:4].upper()
-        if start == 'TYPE':
-            line = string[4:].lstrip()
-            if not line.startswith('('): return
-            return 'TYPE',Derived_Type_Spec(line[1:-1].strip())
-        start = string[:5].upper()
-        if start == 'CLASS':
-            line = string[5:].lstrip()
-            if not line.startswith('('): return
-            line = line[1:-1].strip()
-            if line=='*': return 'CLASS','*'
-            return 'CLASS', Derived_Type_Spec(line)
-        return
-    match = staticmethod(match)
-    init = Base.init_list
-    def tostr(self): return '%s(%s)' % tuple(map(str,self.items))
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.items[0], self.items[1])
-
-class Dimension_Attr_Spec(CallBase):
-    """
-    <dimension-attr-spec> = DIMENSION ( <array-spec> )
-    """
-    subclass_names = []
-    use_names = ['Array_Spec']
-    def match(string): return CallBase.match(pattern.abs_dimension, Array_Spec, string)
-    match = staticmethod(match)
-    def init(self, lhs, rhs):
-        self.lhs = lhs.upper()
-        self.rhs = rhs
-        return
-
-class Intent_Attr_Spec(CallBase):
-    """
-    <intent-attr-spec> = INTENT ( <intent-spec> )
-    """
-    subclass_names = []
-    use_names = ['Intent_Spec']
-    def match(string): return CallBase.match(pattern.abs_intent, Intent_Spec, string)
-    match = staticmethod(match)
-    def init(self, lhs, rhs):
-        self.lhs = lhs.upper()
-        self.rhs = rhs
-        return
-
-class Attr_Spec(STRINGBase):
-    """
-    <attr-spec> = <access-spec>
-                  | ALLOCATABLE
-                  | ASYNCHRONOUS
-                  | DIMENSION ( <array-spec> )
-                  | EXTERNAL
-                  | INTENT ( <intent-spec> )
-                  | INTRINSIC
-                  | <language-binding-spec>
-                  | OPTIONAL
-                  | PARAMETER
-                  | POINTER
-                  | PROTECTED
-                  | SAVE
-                  | TARGET
-                  | VALUE
-                  | VOLATILE
-    """
-    subclass_names = ['Access_Spec', 'Language_Binding_Spec',
-                      'Dimension_Attr_Spec', 'Intent_Attr_Spec']
-    use_names = []
-    def match(string): return STRINGBase.match(pattern.abs_attr_spec, string)
-    match = staticmethod(match)
-
-class Entity_Decl(Base):
-    """
-    <entity-decl> = <object-name> [ ( <array-spec> ) ] [ * <char-length> ] [ <initialization> ]
-                    | <function-name> [ * <char-length> ]
-    """
-    subclass_names = []
-    use_names = ['Object_Name', 'Array_Spec', 'Char_Length', 'Initialization', 'Function_Name']
-    def match(string):
-        m = pattern.name.match(string)
-        if m is None: return
-        name = Name(m.group())
-        newline = string[m.end():].lstrip()
-        if not newline: return name, None, None, None
-        array_spec = None
-        char_length = None
-        init = None
-        if newline.startswith('('):
-            line, repmap = string_replace_map(newline)
-            i = line.find(')')
-            if i==-1: return
-            array_spec = Array_Spec(repmap(line[1:i].strip()))
-            newline = repmap(line[i+1:].lstrip())
-        if newline.startswith('*'):
-            line, repmap = string_replace_map(newline)
-            i = line.find('=')
-            if i!=-1:
-                char_length = repmap(line[1:i].strip())
-                newline = repmap(newline[i:].lstrip())
-            else:
-                char_length = repmap(newline[1:].strip())
-                newline = ''
-            char_length = Char_Length(char_length)
-        if newline.startswith('='):
-            init = Initialization(newline)
-        else:
-            assert newline=='',`newline`
-        return name, array_spec, char_length, init
-    match = staticmethod(match)
-    def init(self, *args):
-        self.name, self.array_spec, self.char_length, self.init = args
-        return
-    def tostr(self):
-        s = str(self.name)
-        if self.array_spec is not None:
-            s += '(' + str(self.array_spec) + ')'
-        if self.char_length is not None:
-            s += '*' + str(self.char_length)
-        if self.init is not None:
-            s += ' ' + str(self.init)
-        return s
-    def torepr(self):
-        return '%s(%r, %r, %r, %r)' \
-               % (self.__class__.__name__, self.name, self.array_spec, self.char_length, self.init)
-    
-class Object_Name(Base):
-    """
-    <object-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Initialization(Base):
-    """
-    <initialization> =  = <initialization-expr>
-                       | => <null-init> 
-    """
-    subclass_names = []
-    use_names = ['Initialization_Expr', 'Null_Init']
-    def match(string):
-        if string.startswith('=>'):
-            return '=>', Null_Init(string[2:].lstrip())
-        if string.startswith('='):
-            return '=', Initialization_Expr(string[2:].lstrip())
-        return
-    match = staticmethod(match)
-    def init(self, op, rhs):
-        self.op = op
-        self.rhs = rhs
-        return
-    def tostr(self): return '%s %s' % (self.op, self.rhs)
-    def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.op, self.rhs)
-
-class Null_Init(Base):
-    """
-    <null-init> = <function-reference>
-
-    <function-reference> shall be a reference to the NULL intrinsic function with no arguments.
-    """
-    subclass_names = ['Function_Reference']
-
-class Access_Spec(STRINGBase):
-    """
-    <access-spec> = PUBLIC
-                    | PRIVATE
-    """
-    subclass_names = []
-    def match(string): return STRINGBase.match(pattern.abs_access_spec, string)
-    match = staticmethod(match)
-
-class Language_Binding_Spec(Base):
-    """
-    <language-binding-spec> = BIND ( C [ , NAME = <scalar-char-initialization-expr> ] )
-    """
-    subclass_names = []
-    use_names = ['Scalar_Char_Initialization_Expr']
-    def match(string):
-        start = string[:4].upper()
-        if start != 'BIND': return
-        line = string[4:].lstrip()
-        if not line or line[0]+line[-1]!='()': return
-        line = line[1:-1].strip()
-        if not line: return
-        start = line[0].upper()
-        if start!='C': return
-        line = line[1:].lstrip()
-        if not line: return None,
-        if not line.startswith(','): return
-        line = line[1:].lstrip()
-        start = line[:4].upper()
-        if start!='NAME': return
-        line=line[4:].lstrip()
-        if not line.startswith('='): return
-        return Scalar_Char_Initialization_Expr(line[1:].lstrip()),
-    match = staticmethod(match)
-    def init(self, name):
-        self.name = name
-    def tostr(self):
-        if self.name is None: return 'BIND(C)'
-        return 'BIND(C, NAME = %s)' % (self.name)
-    def torepr(self):
-        return '%s(%r)' % (self.__class__.__name__, self.name)
-
-class Array_Spec(Base):
-    """
-    <array-spec> = <explicit-shape-spec-list>
-                   | <assumed-shape-spec-list>
-                   | <deferred-shape-spec-list>
-                   | <assumed-size-spec>
-    """
-    subclass_names = ['Explicit_Shape_Spec_List', 'Assumed_Shape_Spec_List',
-                      'Deferred_Shape_Spec_List', 'Assumed_Size_Spec']
-
-class Explicit_Shape_Spec(SeparatorBase):
-    """
-    <explicit-shape-spec> = [ <lower-bound> : ] <upper-bound>
-    """
-    subclass_names = ['Upper_Bound']
-    use_names = ['Lower_Bound']
-    def match(string):
-        line, repmap = string_replace_map(string)
-        if ':' not in line: return
-        lower,upper = line.split(':',1)
-        for k in Base.findall(lower):
-            lower = lower.replace(k, repmap[k])
-        for k in Base.findall(upper):
-            upper = upper.replace(k, repmap[k])
-        return Lower_Bound(lower), Upper_Bound(upper)
-    match = staticmethod(match)
-    
-class Lower_Bound(Base):
-    """
-    <lower-bound> = <specification-expr>
-    """
-    subclass_names = ['Specification_Expr']
-
-class Upper_Bound(Base):
-    """
-    <upper-bound> = <specification-expr>
-    """
-    subclass_names = ['Specification_Expr']
-
-class Assumed_Shape_Spec(Base):
-    """
-    <assumed-shape-spec> = [ <lower-bound> ] :
-    """
-    subclass_names = []
-    use_names = ['Lower_Bound']
-
-class Deferred_Shape_Spec(Base):
-    """
-    <deferred_shape_spec> = :
-    """
-    subclass_names = []
-
-class Assumed_Size_Spec(Base):
-    """
-    <assumed-size-spec> = [ <explicit-shape-spec-list> , ] [ <lower-bound> : ] *
-    """
-    subclass_names = []
-    use_names = ['Explicit_Shape_Spec_List', 'Lower_Bound']
-
-class Intent_Spec(STRINGBase):
-    """
-    <intent-spec> = IN
-                    | OUT
-                    | INOUT
-    """
-    subclass_names = []
-    def match(string): return STRINGBase.match(pattern.abs_intent_spec, string)
-    match = staticmethod(match)
-
-class Access_Stmt(Base):
-    """
-    <access-stmt> = <access-spec> [ [ :: ] <access-id-list> ]
-    """
-    subclass_names = []
-    use_names = ['Access_Spec', 'Access_Id_List']
-
-class Access_Id(Base):
-    """
-    <access-id> = <use-name>
-                  | <generic-spec>
-    """
-    subclass_names = ['Use_Name', 'Generic_Spec']
-
-class Allocatable_Stmt(Base):
-    """
-    <allocateble-stmt> = ALLOCATABLE [ :: ] <object-name> [ ( <deferred-shape-spec-list> ) ] [ , <object-name> [ ( <deferred-shape-spec-list> ) ] ]...
-    """
-    subclass_names = []
-    use_names = ['Object_Name', 'Deferred_Shape_Spec_List']
-
-class Asynchronous_Stmt(Base):
-    """
-    <asynchronous-stmt> = ASYNCHRONOUS [ :: ] <object-name-list>
-    """
-    subclass_names = []
-    use_names = ['Object_Name_List']
-
-class Bind_Stmt(Base):
-    """
-    <bind-stmt> = <language-binding-spec> [ :: ] <bind-entity-list>
-    """
-    use_names = ['Language_Binding_Spec', 'Bind_Entity_List']
-
-class Bind_Entity(Base):
-    """
-    <bind-entity> = <entity-name>
-                    | / <common-block-name> /
-    """
-    subclass_names = ['Entity_Name']
-    use_names = ['Common_Block_Name']
-
-class Data_Stmt(Base):
-    """
-    <data-stmt> = DATA <data-stmt-set> [ [ , ] <data-stmt-set> ]...
-    """
-    subclass_names = []
-    use_names = ['Data_Stmt_Set']
-
-class Data_Stmt_Set(Base):
-    """
-    <data-stmt-set> = <data-stmt-object-list> / <data-stmt-value-list> /
-    """
-    use_names = ['Data_Stmt_Object_List', 'Data_Stmt_Value_List']
-
-class Data_Stmt_Object(Base):
-    """
-    <data-stmt-object> = <variable>
-                         | <data-implied-do>
-    """
-    subclass_names = ['Variable', 'Data_Implied_Do']
-
-class Data_Implied_Do(Base):
-    """
-    <data-implied-do> = ( <data-i-do-object-list> , <data-i-do-variable> = <scalar-int-expr > , <scalar-int-expr> [ , <scalar-int-expr> ] )
-    """
-    subclass_names = []
-    use_names = ['Data_I_Do_Object_List', 'Data_I_Do_Variable', 'Scalar_Int_Expr']
-
-class Data_I_Do_Object(Base):
-    """
-    <data-i-do-object> = <array-element>
-                         | <scalar-structure-component>
-                         | <data-implied-do>
-    """
-    subclass_names = ['Array_Element', 'Scalar_Structure_Component', 'Data_Implied_Do']
-
-class Data_I_Do_Variable(Base):
-    """
-    <data-i-do-variable> = <scalar-int-variable>
-    """
-    subclass_names = ['Scalar_Int_Variable']
-
-class Data_Stmt_Value(Base):
-    """
-    <data-stmt-value> = [ <data-stmt-repeat> * ] <data-stmt-constant>
-    """
-    subclass_names = []
-    use_names = ['Data_Stmt_Repeat', 'Data_Stmt_Constant']
-
-class Data_Stmt_Repeat(Base):
-    """
-    <data-stmt-repeat> = <scalar-int-constant>
-                         | <scalar-int-constant-subobject>
-    """
-    subclass_names = ['Scalar_Int_Constant', 'Scalar_Int_Constant_Subobject']
-
-class Data_Stmt_Constant(Base):
-    """
-    <data-stmt-constant> = <scalar-constant>
-                           | <scalar-constant-subobject>
-                           | <signed-int-literal-constant>
-                           | <signed-real-literal-constant>
-                           | <null-init>
-                           | <structure-constructor>
-    """
-    subclass_names = ['Scalar_Constant', 'Scalar_Constant_Subobject',
-                      'Signed_Int_Literal_Constant', 'Signed_Real_Literal_Constant',
-                      'Null_Init', 'Structure_Constructor']
-
-class Int_Constant_Subobject(Base):
-    """
-    <int-constant-subobject> = <constant-subobject>
-    """
-    subclass_names = ['Constant_Subobject']
-
-class Scalar_Int_Constant_Subobject(Base):
-    subclass_names = ['Int_Constant_Subobject']
-
-class Scalar_Constant_Subobject(Base):
-    subclass_names = ['Constant_Subobject']
-
-class Constant_Subobject(Base):
-    """
-    <constant-subobject> = <designator>
-    """
-    subclass_names = ['Designator']
-
-class Dimension_Stmt(Base):
-    """
-    <dimension-stmt> = DIMENSION [ :: ] <array-name> ( <array-spec> ) [ , <array-name> ( <array-spec> ) ]...
-    """
-    subclass_names = []
-    use_names = ['Array_Name', 'Array_Spec']
-
-class Intent_Stmt(Base):
-    """
-    <intent-stmt> = INTENT ( <intent-spec> ) [ :: ] <dummy-arg-name-list>
-    """
-    subclass_names = []
-    use_names = ['Intent_Spec', 'Dummy_Arg_Name_List']
-
-class Optional_Stmt(Base):
-    """
-    <optional-stmt> = OPTIONAL [ :: ] <dummy-arg-name-list>
-    """
-    subclass_names = []
-    use_names = ['Dummy_Arg_Name_List']
-
-class Parameter_Stmt(Base):
-    """
-    <parameter-stmt> = PARAMETER ( <named-constant-def-list> )
-    """
-    subclass_names = []
-    use_names = ['Named_Constant_Def_List']
-
-class Named_Constant_Def(Base):
-    """
-    <named-constant-def> = <named-constant> = <initialization-expr>
-    """
-    subclass_names = []
-    use_names = ['Named_Constant', 'Initialization_Expr']
-
-class Pointer_Stmt(Base):
-    """
-    <pointer-stmt> = POINTER [ :: ] <pointer-decl-list>
-    """
-    subclass_names = []
-    use_names = ['Pointer_Decl_List']
-
-class Pointer_Decl(Base):
-    """
-    <pointer-decl> = <object-name> [ ( <deferred-shape-spec-list> ) ]
-                     | <proc-entity-name>
-    """
-    use_names = ['Object_Name', 'Deferred_Shape_Spec_List']
-    subclass_names = ['Proc_Entity_Name']
-
-class Protected_Stmt(Base):
-    """
-    <protected-stmt> = PROTECTED [ :: ] <entity-name-list>
-    """
-    subclass_names = []
-    use_names = ['Entity_Name_List']
-
-class Save_Stmt(Base):
-    """
-    <save-stmt> = SAVE [ [ :: ] <saved-entity-list> ]
-    """
-    subclass_names = []
-    use_names = ['Saved_Entity_List']
-
-class Saved_Entity(Base):
-    """
-    <saved-entity> = <object-name>
-                     | <proc-pointer-name>
-                     | / <common-block-name> /
-    """
-    subclass_names = ['Object_Name', 'Proc_Pointer_Name']
-    use_names = ['Common_Block_Name']
-
-class Proc_Pointer_Name(Base):
-    """
-    <proc-pointer-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Target_Stmt(Base):
-    """
-    <target-stmt> = TARGET [ :: ] <object-name> [ ( <array-spec> ) ] [ , <object-name> [ ( <array-spec> ) ]]
-    """
-    subclass_names = []
-    use_names = ['Object_Name', 'Array_Spec']
-
-class Value_Stmt(Base):
-    """
-    <value-stmt> = VALUE [ :: ] <dummy-arg-name-list>
-    """
-    subclass_names = []
-    use_names = ['Dummy_Arg_Name_List']
-
-class Volatile_Stmt(Base):
-    """
-    <volatile-stmt> = VOLATILE [ :: ] <object-name-list>
-    """
-    subclass_names = []
-    use_names = ['Object_Name_List']
-
-class Implicit_Stmt(Base):
-    """
-    <implicit-stmt> = IMPLICIT <implicit-spec-list>
-                      | IMPLICIT NONE
-    """
-    subclass_names = []
-    use_names = ['Implicit_Spec_List']
-
-class Implicit_Spec(Base):
-    """
-    <implicit-spec> = <declaration-type-spec> ( <letter-spec-list> )
-    """
-    subclass_names = []
-    use_names = ['Declaration_Type_Spec', 'Letter_Spec_List']
-
-class Letter_Spec(Base):
-    """
-    <letter-spec> = <letter> [ - <letter> ]
-    """
-    subclass_names = []
-
-class Namelist_Stmt(Base):
-    """
-    <namelist-stmt> = NAMELIST / <namelist-group-name> / <namelist-group-object-list> [ [ , ] / <namelist-group-name> / <namelist-group-object-list> ]
-    """
-    subclass_names = []
-    use_names = ['Namelist_Group_Name', 'Namelist_Group_Object_List']
-
-class Namelist_Group_Object(Base):
-    """
-    <namelist-group-object> = <variable-name>
-    """
-    subclass_names = ['Variable_Name']
-
-class Equivalence_Stmt(Base):
-    """
-    <equivalence-stmt> = EQUIVALENCE <equivalence-set-list>
-    """
-    subclass_names = []
-    use_names = ['Equivalence_Set_List']
-
-class Equivalence_Set(Base):
-    """
-    <equivalence-set> = ( <equivalence-object> , <equivalence-object-list> )
-    """
-    subclass_names = []
-    use_names = ['Equivalence_Object', 'Equivalence_Object_List']
-
-class Equivalence_Object(Base):
-    """
-    <equivalence-object> = <variable-name>
-                           | <array-element>
-                           | <substring>
-    """
-    subclass_names = ['Variable_Name', 'Array_Element', 'Substring']
-
-class Common_Stmt(Base):
-    """
-    <common-stmt> = COMMON [ / [ <common-block-name> ] / ] <common-block-object-list> [ [ , ] / [ <common-block-name> ] / <common-block-object-list> ]...
-    """
-    subclass_names = []
-    use_names = ['Common_Block_Name', 'Common_Block_Object_List']
-
-class Common_Block_Object(Base):
-    """
-    <common-block-object> = <variable-name> [ ( <explicit-shape-spec-list> ) ]
-                            | <proc-pointer-name>
-    """
-    subclass_names = ['Proc_Pointer_Name']
-    use_names = ['Variable_Name', 'Explicit_Shape_Spec_List']
-
-class Variable_Name(Base):
-    """
-    <variable-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Int_Variable(Base):
-    """
-    <int-variable> = <variable>
-    """
-    subclass_names = ['Variable']
-
-class Scalar_Int_Variable(Base):
-    """
-    <scalar-int-variable> = <int-variable>
-    """
-    subclass_names = ['Int_Variable']
-
-class Char_Variable(Base):
-    """
-    <char-variable> = <variable>
-    """
-    subclass_names = ['Variable']
-
-class Scalar_Default_Char_Variable(Base):
-    """
-    <scalar-default-char-variable> = <char-variable>
-    """
-    subclass_names = ['Char_Variable']
-
-class Allocate_Stmt(Base):
-    """
-    <allocate-stmt> = ALLOCATE ( [ <type-spec> :: ] <allocation-list> [ , <alloc-opt-list> ] )
-    """
-    subclass_names = []
-    use_names = ['Type_Spec', 'Allocation_List', 'Alloc_Opt_List']
-    
-class Alloc_Opt(Base):
-    """
-    <alloc-opt> = STAT = <stat-variable>
-                  | ERRMSG = <errmsg-variable>
-                  | SOURCE = <source-expr>
-    """
-    subclass_names = []
-    use_names = ['Stat_Variable', 'Errmsg_Variable', 'Source_Expr',
-                 ]
-
-class Stat_Variable(Base):
-    """
-    <stat-variable> = <scalar-int-variable>
-    """
-    subclass_names = ['Scalar_Int_Variable']
-
-class Errmsg_Variable(Base):
-    """
-    <errmsg-variable> = <scalar-default-char-variable>
-    """
-    subclass_names = ['Scalar_Default_Char_Variable']
-
-class Source_Expr(Base):
-    """
-    <source-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Allocation(Base):
-    """
-    <allocation> = <allocate-object> [ <allocate-shape-spec-list> ]
-                 | <variable-name>
-    """
-    subclass_names = ['Variable_Name']
-    use_names = ['Allocate_Object', 'Allocate_Shape_Spec_List']
-
-class Allocate_Shape_Spec(Base):
-    """
-    <allocate-shape-spec> = [ <lower-bound-expr> : ] <upper-bound-expr>
-    """
-    subclass_names = []
-    use_names = ['Lower_Bound_Expr', 'Upper_Bound_Expr']
-
-class Lower_Bound_Expr(Base):
-    """
-    <lower-bound-expr> = <scalar-int-expr>
-    """
-    subclass_names = ['Scalar_Int_Expr']
-
-class Upper_Bound_Expr(Base):
-    """
-    <upper-bound-expr> = <scalar-int-expr>
-    """
-    subclass_names = ['Scalar_Int_Expr']
-
-class Nullify_Stmt(Base):
-    """
-    <nullify-stmt> = NULLIFY ( <pointer-object-list> )
-    """
-    subclass_names = []
-    use_names = ['Pointer_Object_List']
-
-class Pointer_Object(Base):
-    """
-    <pointer-object> = <variable-name>
-                       | <structure-component>
-                       | <proc-pointer-name>
-    """
-    subclass_names = ['Variable_Name', 'Structure_Component', 'Proc_Pointer_Name']
-
-class Deallocate_Stmt(Base):
-    """
-    <deallocate-stmt> = DEALLOCATE ( <allocate-object-list> [ , <dealloc-opt-list> ] )
-    """
-    subclass_names = []
-    use_names = ['Allocate_Object_List', 'Dealloc_Opt_List']
-
-class Dealloc_Opt(Base):
-    """
-    <dealloc-opt> = STAT = <stat-variable>
-                    | ERRMSG = <errmsg-variable>
-    """
-    subclass_names = []
-    use_names = ['Stat_Variable', 'Errmsg_Variable']
-
-
-class Logical_Expr(Base):
-    """
-    <logical-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Char_Expr(Base):
-    """
-    <char-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Default_Char_Expr(Base):
-    """
-    <default-char-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Int_Expr(Base):
-    """
-    <int-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Numeric_Expr(Base):
-    """
-    <numeric-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Specification_Expr(Base):
-    """
-    <specification-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Char_Initialization_Expr(Base):
-    """
-    <char-initialization-expr> = <expr>
-    """
-    subclass_names = ['Char_Expr']
-
-class Scalar_Char_Initialization_Expr(Base):
-    subclass_names = ['Char_Initialization_Expr']
-
-class Initialization_Expr(Base):
-    """
-    <initialization-expr> = <expr>
-    """
-    subclass_names = ['Expr']
-
-class Int_Initialization_Expr(Base):
-    """
-    <int-initialization-expr> = <expr>
-    """
-    subclass_names = ['Int_Expr']
-
-class Logical_Initialization_Expr(Base):
-    """
-    <logical-initialization-expr> = <expr>
-    """
-    subclass_names = ['Logical_Expr']
-
-class Where_Stmt(Base):
-    """
-    <where-stmt> = WHERE ( <mask-expr> ) <where-assignment-stmt>
-    """
-    subclass_names = []
-    use_names = ['Mask_Expr', 'Where_Assignment_Stmt']
-
-class Where_Construct(Base):
-    """
-    <where-construct> = <where-construct-stmt>
-                              [ <where-body-construct> ]...
-                            [ <masked-elsewhere-stmt>
-                              [ <where-body-construct> ]...
-                            ]...
-                            [ <elsewhere-stmt>
-                              [ <where-body-construct> ]... ]
-                            <end-where-stmt>
-    """
-    subclass_names = []
-    use_names = ['Where_Construct_Stmt', 'Where_Body_Construct',
-                 'Elsewhere_Stmt', 'End_Where_Stmt'
-                 ]
-
-class Where_Construct_Stmt(Base):
-    """
-    <where-construct-stmt> = [ <where-construct-name> : ] WHERE ( <masked-expr> )
-    """
-    subclass_names = []
-    use_names = ['Where_Construct_Name', 'Masked_Expr']
-
-class Where_Body_Construct(Base):
-    """
-    <where-body-construct> = <where-assignment-stmt>
-                             | <where-stmt>
-                             | <where-construct>
-    """
-    subclass_names = ['Where_Assignment_Stmt', 'Where_Stmt', 'Where_Construct']
-
-class Where_Assignment_Stmt(Base):
-    """
-    <where-assignment-stmt> = <assignment-stmt>
-    """
-    subclass_names = ['Assignment_Stmt']
-
-class Mask_Expr(Base):
-    """
-    <mask-expr> = <logical-expr>
-    """
-    subclass_names = ['Logical_Expr']
-
-class Masked_Elsewhere_Stmt(Base):
-    """
-    <masked-elsewhere-stmt> = ELSEWHERE ( <mask-expr> ) [ <where-construct-name> ]
-    """
-    subclass_names = []
-    use_names = ['Mask_Expr', 'Where_Construct_Name']
-
-class Elsewhere_Stmt(Base):
-    """
-    <elsewhere-stmt> = ELSEWHERE [ <where-construct-name> ]
-    """
-    subclass_names = []
-    use_names = ['Where_Construct_Name']
-
-class End_Where_Stmt(Base):
-    """
-    <end-where-stmt> = END WHERE [ <where-construct-name> ]
-    """
-    subclass_names = []
-    use_names = ['Where_Construct_Name']
-
-class Proc_Language_Binding_Spec(Base): # R1125
-    subclass_names = ['Language_Binding_Spec']
-
-
-class Dummy_Arg_Name(Base): # R1226
-    """
-    <dummy-arg-name> = <name>
-    """
-    subclass_names = ['Name']
-
-class Subroutine_Stmt(Base): # R1232
-    """
-    <subroutine-stmt> = [ <prefix> ] SUBROUTINE <subroutine-name> [ ( [ <dummy-arg-list> ] ) [ <proc-language-binding-spec> ] ]
-    """
-    subclass_names = []
-    use_names = ['Prefix', 'Subroutine_Name', 'Dummy_Arg_List', 'Proc_Language_Binding_Spec']
-    def match(string):
-        line, repmap = string_replace_map(string)
-        m = pattern.subroutine.search(line)
-        prefix = line[:m.start()].rstrip() or None
-        if prefix is not None:
-            prefix = Prefix(repmap(prefix))
-        line = line[m.end():].lstrip()
-        m = pattern.name.match(line)
-        if m is None: return
-        name = Subroutine_Name(m.group())
-        line = line[m.end():].lstrip()
-        dummy_args = None
-        if line.startswith('('):
-            i = line.find(')')
-            if i==-1: return
-            dummy_args = line[1:i].strip() or None
-            if dummy_args is not None:
-                dummy_args = Dummy_Arg_List(repmap(dummy_args))
-            line = line[i+1:].lstrip()
-        binding_spec = None
-        if line:
-            binding_spec = Proc_Language_Binding_Spec(repmap(line))
-        return prefix, name, dummy_args, binding_spec
-    match = staticmethod(match)
-    def init(self, *args):
-        self.prefix, self.name, self.dummy_args, self.binding_spec = args
-        return
-    def tostr(self):
-        if self.prefix is not None:
-            s = '%s SUBROUTINE %s' % (self.prefix, self.name)
-        else:
-            s = 'SUBROUTINE %s' % (self.name)
-        if self.dummy_args is not None:
-            s += '(%s)' % (self.dummy_args)
-        if self.binding_spec is not None:
-            s += ' %s' % (self.binding_spec)
-        return s
-    def torepr(self):
-        return '%s(%r, %r, %r, %r)'\
-               % (self.__class__.__name__, self.prefix, self.name, self.dummy_args, self.binding_spec)
-
-class End_Subroutine_Stmt(EndStmtBase): # R1234
-    """
-    <end-subroutine-stmt> = END [ SUBROUTINE [ <subroutine-name> ] ]
-    """
-    subclass_names = []
-    use_names = ['Subroutine_Name']
-    def match(string): return EndStmtBase.match('SUBROUTINE', Subroutine_Name, string)
-    match = staticmethod(match)
-
-class Dummy_Arg(StringBase): # R1233
-    """
-    <dummy-arg> = <dummy-arg-name>
-                  | *
-    """
-    subclass_names = ['Dummy_Arg_Name']
-    def match(string):
-        if string=='*': return '*',
-        return
-    match = staticmethod(match)
-
-# Create *_List classes:
-ClassType = type(Base)
-_names = dir()
-for clsname in _names:
-    cls = eval(clsname)
-    if not (isinstance(cls, ClassType) and issubclass(cls, Base) and not cls.__name__.endswith('Base')): continue
-    names = getattr(cls, 'subclass_names', []) + getattr(cls, 'use_names', [])
-    for n in names:
-        if n in _names: continue
-        if n.endswith('_List'):
-            n = n[:-5]
-            print 'Generating %s_List' % (n)
-            exec '''\
-class %s_List(SequenceBase):
-    subclass_names = [\'%s\']
-    use_names = []
-    def match(string): return SequenceBase.match(r\',\', %s, string)
-    match = staticmethod(match)
-''' % (n, n, n)
-        if n.endswith('_Name'):
-            n = n[:-5]
-            print 'Generating %s_Name' % (n)
-            exec '''\
-class %s_Name(Base):
-    subclass_names = [\'Name\']
-''' % (n)
-

Modified: trunk/numpy/f2py/lib/parser/test_expressions.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-31 05:17:46 UTC (rev 3420)
+++ trunk/numpy/f2py/lib/parser/test_expressions.py	2006-10-31 13:28:31 UTC (rev 3421)
@@ -1,8 +1,6 @@
 
-
 from numpy.testing import *
 
-#from expressions import *
 from Fortran2003 import *
 
 class test_Expr(NumpyTestCase):

Modified: trunk/numpy/f2py/lib/parser/test_statements2.py
===================================================================
--- trunk/numpy/f2py/lib/parser/test_statements2.py	2006-10-31 05:17:46 UTC (rev 3420)
+++ trunk/numpy/f2py/lib/parser/test_statements2.py	2006-10-31 13:28:31 UTC (rev 3421)
@@ -183,7 +183,30 @@
         a = cls(reader)
         assert isinstance(a, cls),`a`
         assert_equal(str(a),'INTEGER :: a')
-        assert_equal(repr(a),'INTEGER :: a')
+        assert_equal(repr(a), "Specification_Part(Type_Declaration_Stmt(Intrinsic_Type_Spec('INTEGER', None), None, Entity_Decl(Name('a'), None, None, None)))")
 
+class test_Subroutine_Subprogram(NumpyTestCase):
+
+    def check_simple(self):
+        from api import get_reader
+        reader = get_reader('''\
+      subroutine foo
+      end subroutine foo''')
+        cls = Subroutine_Subprogram
+        a = cls(reader)
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'SUBROUTINE foo\nEND SUBROUTINE foo')
+        assert_equal(repr(a),"Subroutine_Subprogram(Subroutine_Stmt(None, Name('foo'), None, None), End_Subroutine_Stmt('SUBROUTINE', Name('foo')))")
+
+        reader = get_reader('''\
+      subroutine foo
+        integer a
+      end subroutine foo''')
+        cls = Subroutine_Subprogram
+        a = cls(reader)
+        assert isinstance(a, cls),`a`
+        assert_equal(str(a),'SUBROUTINE foo\nINTEGER :: a\nEND SUBROUTINE foo')
+
+
 if __name__ == "__main__":
     NumpyTest().run()



From numpy-svn at scipy.org  Tue Oct 31 09:58:22 2006
From: numpy-svn at scipy.org (numpy-svn at scipy.org)
Date: Tue, 31 Oct 2006 08:58:22 -0600 (CST)
Subject: [Numpy-svn] r3422 - trunk/numpy/core/src
Message-ID: <20061031145822.BC64239C078@new.scipy.org>

Author: oliphant
Date: 2006-10-31 08:58:19 -0600 (Tue, 31 Oct 2006)
New Revision: 3422

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Revert hasobject to returning True or False

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-10-31 13:28:31 UTC (rev 3421)
+++ trunk/numpy/core/src/arrayobject.c	2006-10-31 14:58:19 UTC (rev 3422)
@@ -10613,9 +10613,6 @@
         {"byteorder", T_CHAR, offsetof(PyArray_Descr, byteorder), RO, NULL},
         {"itemsize", T_INT, offsetof(PyArray_Descr, elsize), RO, NULL},
         {"alignment", T_INT, offsetof(PyArray_Descr, alignment), RO, NULL},
-        /* Get rid of this in 1.1 */
-        {"hasobject", T_UBYTE, offsetof(PyArray_Descr, hasobject), RO, NULL},
-        /* END */
         {"flags", T_UBYTE, offsetof(PyArray_Descr, hasobject), RO, NULL},
         {"names", T_OBJECT, offsetof(PyArray_Descr, names), RO, NULL},
         {NULL},
@@ -10795,6 +10792,18 @@
         return PyDictProxy_New(self->fields);
 }
 
+static PyObject *
+arraydescr_hasobject_get(PyArray_Descr *self)
+{
+        PyObject *res;
+        if (PyDataType_FLAGCHK(self, NPY_ITEM_HASOBJECT))
+                res = Py_True;
+        else
+                res = Py_False;
+        Py_INCREF(res);
+        return res;
+}
+
 static PyGetSetDef arraydescr_getsets[] = {
         {"subdtype",
          (getter)arraydescr_subdescr_get,
@@ -10822,8 +10831,10 @@
          NULL, NULL},
         {"fields",
          (getter)arraydescr_fields_get,
-         NULL,
-         NULL},
+         NULL, NULL},
+        {"hasobject",
+         (getter)arraydescr_hasobject_get,
+         NULL, NULL},
         {NULL, NULL, NULL, NULL},
 };