author Benjamin Smedberg <>
Thu, 26 Feb 2009 20:32:19 -0500
changeset 191 7a8dc41115d67e05b6da433da2f7685ca9941b02
parent 190 e36530da06f158844dddfc7aa7b54a9b9f571dc2
child 201 62711c446a4714fb20b7236e24bf5a5fe4da65da
permissions -rw-r--r--
I noticed Expansion.resolve still comes up really high on perf charts. This patch makes it much easier to resolve expansions which are just literals, which is very common for variable names. Unfortunately, this makes the code a fair bit more complex, and doesn't help nearly as much as I'd like. I'm beginning to wonder if getting gmake performance parity is impossible, or at least improbable given the current architecture: but I can't think of an alternate architecture that is better.

import os

def makeobject(proplist, **kwargs):
    class P(object):
        __slots__ = proplist

    p = P()
    for k, v in kwargs.iteritems():
        setattr(p, k, v)
    return p

class MakeError(Exception):
    def __init__(self, message, loc=None):
        self.message = message
        self.loc = loc

    def __str__(self):
        locstr = ''
        if self.loc is not None:
            locstr = "%s:" % (self.loc,)

        return "%s%s" % (locstr, self.message)

def itersplit(it):
    Given an iterator that returns strings, yield words as if string.split() had been called on the concatenation
    of the strings.

    curword = None
    for s in it:
        if not len(s):

        initws = s[0].isspace()
        trailws = s[-1].isspace()

        words = s.split()
        if curword is not None:
            if initws:
                yield curword
                words[0] = curword + words[0]

        if trailws:
            curword = None
            curword = words.pop()

        for w in words:
            yield w

    if curword is not None:
        yield curword

def joiniter(it, j=' '):
    Given an iterator that returns strings, yield the words with j inbetween each.
    it = iter(it)
    for i in it:
        yield i

    for i in it:
        yield j
        yield i

def checkmsyscompat():
    """For msys compatibility on windows, honor the SHELL environment variable,
    and if $MSYSTEM == MINGW32, run commands through $SHELL -c instead of
    letting Python use the system shell."""
    if 'SHELL' in os.environ:
        shell = os.environ['SHELL']
    elif 'COMSPEC' in os.environ:
        shell = os.environ['COMSPEC']
        raise DataError("Can't find a suitable shell!")

    msys = False
    if 'MSYSTEM' in os.environ and os.environ['MSYSTEM'] == 'MINGW32':
        msys = True
        if not shell.lower().endswith(".exe"):
            shell += ".exe"
    return (shell, msys)

if hasattr(str, 'partition'):
    def strpartition(str, token):
        return str.partition(token)

    def strrpartition(str, token):
        return str.rpartition(token)

    def strpartition(str, token):
        """Python 2.4 compatible str.partition"""

        offset = str.find(token)
        if offset == -1:
            return str, '', ''

        return str[:offset], token, str[offset + len(token):]

    def strrpartition(str, token):
        """Python 2.4 compatible str.rpartition"""

        offset = str.rfind(token)
        if offset == -1:
            return '', '', str

        return str[:offset], token, str[offset + len(token):]

    from __builtin__ import any
except ImportError:
    def any(it):
        for i in it:
            if i:
                return True
        return False