This is a copy of regalloc_code2_BRANCH from Netscape's private repository,

as it existed in January of 1998.


git-svn-id: svn://10.0.0.236/branches/regalloc_code2_BRANCH@22571 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/build/mac/build_scripts/MozillaCheckoutList.txt

@@ -1,15 +0,0 @@
-# List of modules to check out. Format is
-#   module, (tag), (date)
-# where tag and date are optional (non-trailing commas are required)
-#
-# Examples:
-#   mozilla/nsprpub, NSPRPUB_CLIENT_BRANCH
-#   mozilla/gc, , 10/25/2000 12:00:00
-#
-
-mozilla/nsprpub,        NSPRPUB_CLIENT_BRANCH
-mozilla/security/nss,   NSS_CLIENT_TAG
-mozilla/security/psm,   
-DirectorySDKSourceC,    LDAPCSDK_40_BRANCH
-mozilla/lib/mac/Instrumentation
-SeaMonkeyAll            STRING_081_BRANCH

mozilla/content/base/src/nsHTMLContentSerializer.cpp

@@ -1,792 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsHTMLContentSerializer.h"
-
-#include "nsIDOMElement.h"
-#include "nsIContent.h"
-#include "nsIDocument.h"
-#include "nsINameSpaceManager.h"
-#include "nsString.h"
-#include "nsXPIDLString.h"
-#include "nsParserCIID.h"
-#include "nsIServiceManager.h"
-#include "nsIDocumentEncoder.h"
-#include "nsLayoutAtoms.h"
-#include "nsHTMLAtoms.h"
-#include "nsIURI.h"
-#include "nsNetUtil.h"
-#include "nsEscape.h"
-
-static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID);
-
-#define kIndentStr NS_LITERAL_STRING("  ")
-#define kMozStr "_moz"
-#define kLessThan NS_LITERAL_STRING("<")
-#define kGreaterThan NS_LITERAL_STRING(">")
-#define kEndTag NS_LITERAL_STRING("</")
-
-static const PRInt32 kLongLineLen = 128;
-
-nsresult NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer)
-{
-  nsHTMLContentSerializer* it = new nsHTMLContentSerializer();
-  if (!it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return it->QueryInterface(NS_GET_IID(nsIContentSerializer), (void**)aSerializer);
-}
-
-nsHTMLContentSerializer::nsHTMLContentSerializer()
-{
-  mColPos = 0;
-  mIndent = 0;
-  mInBody = PR_FALSE;
-  mInCDATA = PR_FALSE;
-}
-
-nsHTMLContentSerializer::~nsHTMLContentSerializer()
-{
-}
-
-nsresult
-nsHTMLContentSerializer::GetParserService(nsIParserService** aParserService)
-{
-  if (!mParserService) {
-    nsresult rv;
-    mParserService = do_GetService(kParserServiceCID, &rv);
-    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-  }
-
-  CallQueryInterface(mParserService.get(), aParserService);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsHTMLContentSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn,
-                              nsIAtom* aCharSet)
-{
-  mFlags = aFlags;
-  if (!aWrapColumn) {
-    mMaxColumn = 72;
-  }
-  else {
-    mMaxColumn = aWrapColumn;
-  }
-
-  mDoFormat = (mFlags & nsIDocumentEncoder::OutputFormatted) ? PR_TRUE
-                                                             : PR_FALSE;
-  mBodyOnly = (mFlags & nsIDocumentEncoder::OutputBodyOnly) ? PR_TRUE
-                                                            : PR_FALSE;
-  // Set the line break character:
-  if ((mFlags & nsIDocumentEncoder::OutputCRLineBreak)
-      && (mFlags & nsIDocumentEncoder::OutputLFLineBreak)) { // Windows/mail
-    mLineBreak.AssignWithConversion("\r\n");
-  }
-  else if (mFlags & nsIDocumentEncoder::OutputCRLineBreak) { // Mac
-    mLineBreak.AssignWithConversion("\r");
-  }
-  else if (mFlags & nsIDocumentEncoder::OutputLFLineBreak) { // Unix/DOM
-    mLineBreak.AssignWithConversion("\n");
-  }
-  else {
-    mLineBreak.AssignWithConversion(NS_LINEBREAK);         // Platform/default
-  }
-
-  mPreLevel = 0;
-
-  mIsLatin1 = PR_FALSE;
-  if (aCharSet) {
-    const PRUnichar *charset;
-    aCharSet->GetUnicode(&charset);
-
-    if (NS_LITERAL_STRING("ISO-8859-1").Equals(charset)) {
-      mIsLatin1 = PR_TRUE;
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsHTMLContentSerializer::AppendText(nsIDOMText* aText, 
-                                    PRInt32 aStartOffset,
-                                    PRInt32 aEndOffset,
-                                    nsAWritableString& aStr)
-{
-  NS_ENSURE_ARG(aText);
-
-  nsAutoString data;
-
-  nsresult rv;
-  rv = AppendTextData((nsIDOMNode*)aText, aStartOffset, 
-                      aEndOffset, data, PR_TRUE, PR_FALSE);
-  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-  PRInt32 lastNewlineOffset = kNotFound;
-  PRBool hasLongLines = HasLongLines(data, lastNewlineOffset);
-
-  if (mPreLevel || (!mDoFormat && !hasLongLines) ||
-      (mFlags & nsIDocumentEncoder::OutputRaw)) {
-    AppendToString(data, aStr);
-
-    if (lastNewlineOffset != kNotFound) {
-      mColPos = data.Length() - lastNewlineOffset;
-    }   
-  }
-  else {
-    AppendToStringWrapped(data, aStr, PR_FALSE);
-  }
-
-  return NS_OK;
-}
-
-
-void 
-nsHTMLContentSerializer::SerializeAttributes(nsIContent* aContent,
-                                             nsIAtom* aTagName,
-                                             nsAWritableString& aStr)
-{
-  nsresult rv;
-  PRInt32 index, count;
-  nsAutoString nameStr, valueStr;
-  PRInt32 namespaceID;
-  nsCOMPtr<nsIAtom> attrName, attrPrefix;
-
-  aContent->GetAttributeCount(count);
-
-  for (index = 0; index < count; index++) {
-    aContent->GetAttributeNameAt(index, 
-                                 namespaceID,
-                                 *getter_AddRefs(attrName),
-                                 *getter_AddRefs(attrPrefix));
-
-    // Filter out any attribute starting with _moz
-    nsXPIDLString sharedName;
-    attrName->GetUnicode(getter_Shares(sharedName));
-    if (nsCRT::strncmp(sharedName, 
-                       NS_ConvertASCIItoUCS2(kMozStr), 
-                       sizeof(kMozStr)-1) == 0) {
-      continue;
-    }
-
-    aContent->GetAttribute(namespaceID, attrName, valueStr);
-
-    // 
-    // Filter out special case of <br type="_moz"> or <br _moz*>,
-    // used by the editor.  Bug 16988.  Yuck.
-    //
-    if ((aTagName == nsHTMLAtoms::br) &&
-        (attrName.get() == nsHTMLAtoms::type) &&
-        (valueStr.EqualsWithConversion(kMozStr, PR_FALSE, sizeof(kMozStr)-1))) {
-      continue;
-    }
-
-    // Make all links absolute when converting only the selection:
-    if ((mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) &&
-        ((attrName.get() == nsHTMLAtoms::href) || 
-         (attrName.get() == nsHTMLAtoms::src))) {
-      // Would be nice to handle OBJECT and APPLET tags,
-      // but that gets more complicated since we have to
-      // search the tag list for CODEBASE as well.
-      // For now, just leave them relative.
-      nsCOMPtr<nsIDocument> document;
-      aContent->GetDocument(*getter_AddRefs(document));
-      if (document) {
-        nsCOMPtr<nsIURI> uri = dont_AddRef(document->GetDocumentURL());
-        if (uri) {
-          nsAutoString absURI;
-          rv = NS_MakeAbsoluteURI(absURI, valueStr, uri);
-          if (NS_SUCCEEDED(rv)) {
-            valueStr = absURI;
-          }
-        }
-      }
-    }
-
-    attrName->ToString(nameStr);
-    
-    SerializeAttr(nsAutoString(), nameStr, valueStr, aStr);
-  }
-}
-
-NS_IMETHODIMP
-nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement,
-                                            nsAWritableString& aStr)
-{
-  NS_ENSURE_ARG(aElement);
-  
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
-  if (!content) return NS_ERROR_FAILURE;
-  
-  // The _moz_dirty attribute is emitted by the editor to
-  // indicate that this element should be pretty printed
-  // even if we're not in pretty printing mode
-  PRBool hasDirtyAttr = HasDirtyAttr(content);
-
-  nsCOMPtr<nsIAtom> name;
-  content->GetTag(*getter_AddRefs(name));
-
-  if (name.get() == nsHTMLAtoms::body) {
-    mInBody = PR_TRUE;
-  }
-
-  if (LineBreakBeforeOpen(name, hasDirtyAttr)) {
-    AppendToString(mLineBreak, aStr);
-    mColPos = 0;
-  }
-
-  StartIndentation(name, hasDirtyAttr, aStr);
-
-  if ((name.get() == nsHTMLAtoms::pre) ||
-      (name.get() == nsHTMLAtoms::script) ||
-      (name.get() == nsHTMLAtoms::style)) {
-    mPreLevel++;
-  }
-  
-  AppendToString(kLessThan, aStr);
-
-  nsXPIDLString sharedName;
-  name->GetUnicode(getter_Shares(sharedName));
-  AppendToString(sharedName, -1, aStr);
-
-  SerializeAttributes(content, name, aStr);
-
-  AppendToString(kGreaterThan, aStr);
-
-  if (LineBreakAfterOpen(name, hasDirtyAttr)) {
-    AppendToString(mLineBreak, aStr);
-    mColPos = 0;
-  }
-
-  if ((name.get() == nsHTMLAtoms::script) ||
-      (name.get() == nsHTMLAtoms::style) ||
-      (name.get() == nsHTMLAtoms::noscript)) {
-    mInCDATA = PR_TRUE;
-  }
-
-  return NS_OK;
-}
-  
-NS_IMETHODIMP 
-nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement,
-                                          nsAWritableString& aStr)
-{
-  NS_ENSURE_ARG(aElement);
-
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
-  if (!content) return NS_ERROR_FAILURE;
-
-  PRBool hasDirtyAttr = HasDirtyAttr(content);
-
-  nsCOMPtr<nsIAtom> name;
-  content->GetTag(*getter_AddRefs(name));
-
-  if ((name.get() == nsHTMLAtoms::pre) ||
-      (name.get() == nsHTMLAtoms::script) ||
-      (name.get() == nsHTMLAtoms::style)) {
-    mPreLevel--;
-  }
-
-  nsXPIDLString sharedName;
-  name->GetUnicode(getter_Shares(sharedName));
-
-  nsCOMPtr<nsIParserService> parserService;
-  GetParserService(getter_AddRefs(parserService));
-
-  if (parserService && (name.get() != nsHTMLAtoms::style)) {
-    nsAutoString nameStr(sharedName);
-    PRBool isContainer;
-    PRInt32 id;
-
-    parserService->HTMLStringTagToId(nameStr, &id);
-    parserService->IsContainer(id, isContainer);
-    if (!isContainer) return NS_OK;
-  }
-
-  if (LineBreakBeforeClose(name, hasDirtyAttr)) {
-    AppendToString(mLineBreak, aStr);
-    mColPos = 0;
-  }
-
-  EndIndentation(name, hasDirtyAttr, aStr);
-
-  AppendToString(kEndTag, aStr);
-  AppendToString(sharedName, -1, aStr);
-  AppendToString(kGreaterThan, aStr);
-
-  if (LineBreakAfterClose(name, hasDirtyAttr)) {
-    AppendToString(mLineBreak, aStr);
-    mColPos = 0;
-  }
-
-  mInCDATA = PR_FALSE;
-
-  return NS_OK;
-}
-
-void
-nsHTMLContentSerializer::AppendToString(const PRUnichar* aStr,
-                                        PRInt32 aLength,
-                                        nsAWritableString& aOutputStr)
-{
-  if (mBodyOnly && !mInBody) {
-    return;
-  }
-
-  PRInt32 length = (aLength == -1) ? nsCRT::strlen(aStr) : aLength;
-  
-  mColPos += length;
-
-  aOutputStr.Append(aStr, length);
-}
-
-void 
-nsHTMLContentSerializer::AppendToString(const PRUnichar aChar,
-                                        nsAWritableString& aOutputStr)
-{
-  if (mBodyOnly && !mInBody) {
-    return;
-  }
-
-  mColPos += 1;
-
-  aOutputStr.Append(aChar);
-}
-
-void 
-nsHTMLContentSerializer::AppendToStringWrapped(const nsAReadableString& aStr,
-                                               nsAWritableString& aOutputStr,
-                                               PRBool aTranslateEntities)
-{
-  PRInt32 length = aStr.Length();
-
-  nsAutoString line;
-  PRBool    done = PR_FALSE;
-  PRInt32   indx = 0;
-  PRInt32   strOffset = 0;
-  PRInt32   lineLength, oldLineEnd;
-  
-  // Make sure we haven't gone too far already
-  if (mColPos > mMaxColumn) {
-    AppendToString(mLineBreak, aOutputStr);
-    mColPos = 0;
-  }
-  
-  // Find the end of the first old line
-  oldLineEnd = aStr.FindChar(PRUnichar('\n'), 0);
-  
-  while ((!done) && (strOffset < length)) {
-    // This is how much is needed to fill up the new line
-    PRInt32 leftInLine = mMaxColumn - mColPos;
-    
-    // This is the last position in the current old line
-    PRInt32 oldLineLimit;
-    if (oldLineEnd == kNotFound) {
-      oldLineLimit = length;
-    }
-    else {
-      oldLineLimit = oldLineEnd;
-    }
-    
-    PRBool addLineBreak = PR_FALSE;
-
-    // if we can fill up the new line with less than what's
-    // in the current old line...
-    if ((strOffset + leftInLine) < oldLineLimit) {
-      addLineBreak = PR_TRUE;
-      
-      // Look for the next word end to break
-      indx = aStr.FindChar(PRUnichar(' '), strOffset + leftInLine);
-      
-      // If it's after the end of the current line, then break at
-      // the current line
-      if ((indx == kNotFound) || 
-          ((oldLineEnd != kNotFound) && (oldLineEnd < indx))) {
-        indx = oldLineEnd;
-      }
-    }
-    else {
-      indx = oldLineEnd;
-    }
-    
-    // if there was no place to break, then just add the entire string
-    if (indx == kNotFound) {
-      if (strOffset == 0) {
-        AppendToString(aStr, aOutputStr, aTranslateEntities);
-      }
-      else {
-        lineLength = length - strOffset;
-        aStr.Right(line, lineLength);
-        AppendToString(line, aOutputStr, aTranslateEntities);
-      }
-      done = PR_TRUE;
-    }
-    else {
-      // Add the part of the current old line that's part of the 
-      // new line
-      lineLength = indx - strOffset;
-      aStr.Mid(line, strOffset, lineLength);
-      AppendToString(line, aOutputStr, aTranslateEntities);
-      
-      // if we've reached the end of an old line, don't add the
-      // old line break and find the end of the next old line.
-      if (indx == oldLineEnd) {
-        oldLineEnd = aStr.FindChar(PRUnichar('\n'), indx+1);
-        AppendToString(NS_LITERAL_STRING(" "), aOutputStr);
-      }
-      
-      if (addLineBreak) {
-        AppendToString(mLineBreak, aOutputStr);
-        mColPos = 0;
-      }
-      strOffset = indx+1;
-    }
-  }
-}
-
-static PRUint16 kGTVal = 62;
-static const char* kEntities[] = {
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "", "", "", "", "amp", "",
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "", "", "", "", "", "",
-  "lt", "", "gt"
-};
-
-static const char* kAttrEntities[] = {
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "quot", "", "", "", "amp", "apos",
-  "", "", "", "", "", "", "", "", "", "",
-  "", "", "", "", "", "", "", "", "", "",
-  "lt", "", "gt"
-};
-
-void
-nsHTMLContentSerializer::AppendToString(const nsAReadableString& aStr,
-                                        nsAWritableString& aOutputStr,
-                                        PRBool aTranslateEntities,
-                                        PRBool aIncrColumn)
-{
-  if (mBodyOnly && !mInBody) {
-    return;
-  }
-
-  if (aIncrColumn) {
-    mColPos += aStr.Length();
-  }
-
-  if (aTranslateEntities && !mInCDATA) {
-    if (mFlags & nsIDocumentEncoder::OutputEncodeEntities) {
-      nsCOMPtr<nsIParserService> parserService;
-      GetParserService(getter_AddRefs(parserService));
-
-      if (!parserService) {
-        NS_ERROR("Can't get parser service");
-        return;
-      }
-
-      nsReadingIterator<PRUnichar> done_reading;
-      aStr.EndReading(done_reading);
-
-      // for each chunk of |aString|...
-      PRUint32 advanceLength = 0;
-      nsReadingIterator<PRUnichar> iter;
-
-      const char **entityTable = mInAttribute ? kAttrEntities : kEntities;
-
-      for (aStr.BeginReading(iter); 
-           iter != done_reading; 
-           iter.advance(PRInt32(advanceLength))) {
-        PRUint32 fragmentLength = iter.size_forward();
-        const PRUnichar* c = iter.get();
-        const PRUnichar* fragmentStart = c;
-        const PRUnichar* fragmentEnd = c + fragmentLength;
-        const char* entityText = nsnull;
-        nsCAutoString entityReplacement;
-
-        advanceLength = 0;
-        // for each character in this chunk, check if it
-        // needs to be replaced
-        for (; c < fragmentEnd; c++, advanceLength++) {
-          PRUnichar val = *c;
-          if ((val <= kGTVal) && (entityTable[val][0] != 0)) {
-            entityText = entityTable[val];
-            break;
-          } else if (mIsLatin1 && val > 127 && val < 256) {
-            parserService->HTMLConvertUnicodeToEntity(val, entityReplacement);
-
-            if (entityReplacement.Length() > 0) {
-              entityText = entityReplacement.get();
-              break;
-            }
-          }
-        }
-
-        aOutputStr.Append(fragmentStart, advanceLength);
-        if (entityText) {
-          aOutputStr.Append(PRUnichar('&'));
-          aOutputStr.Append(NS_ConvertASCIItoUCS2(entityText));
-          aOutputStr.Append(PRUnichar(';'));
-          advanceLength++;
-        }
-      }
-    } else {
-      nsXMLContentSerializer::AppendToString(aStr, aOutputStr, aTranslateEntities, aIncrColumn);
-    }
-
-    return;
-  }
-
-  aOutputStr.Append(aStr);
-}
-
-PRBool
-nsHTMLContentSerializer::HasDirtyAttr(nsIContent* aContent)
-{
-  nsAutoString val;
-
-  if (NS_CONTENT_ATTR_NOT_THERE != aContent->GetAttribute(kNameSpaceID_None,
-                                                          nsLayoutAtoms::mozdirty,
-                                                          val)) {
-    return PR_TRUE;
-  }
-  else {
-    return PR_FALSE;
-  }
-}
-
-PRBool 
-nsHTMLContentSerializer::LineBreakBeforeOpen(nsIAtom* aName, 
-                                             PRBool aHasDirtyAttr)
-{
-  if ((!mDoFormat && !aHasDirtyAttr) || mPreLevel || !mColPos ||
-      (mFlags & nsIDocumentEncoder::OutputRaw)) {
-    return PR_FALSE;
-  }
-        
-  if (aName == nsHTMLAtoms::title ||
-      aName == nsHTMLAtoms::meta  ||
-      aName == nsHTMLAtoms::link  ||
-      aName == nsHTMLAtoms::style ||
-      aName == nsHTMLAtoms::script ||
-      aName == nsHTMLAtoms::html) {
-    return PR_TRUE;
-  }
-  else {
-    nsCOMPtr<nsIParserService> parserService;
-    GetParserService(getter_AddRefs(parserService));
-    
-    if (parserService) {
-      nsAutoString str;
-      aName->ToString(str);
-      PRBool res;
-      PRInt32 id;
-
-      parserService->HTMLStringTagToId(str, &id);
-      parserService->IsBlock(id, res);
-      return res;
-    }
-  }
-
-  return PR_FALSE;
-}
-
-PRBool 
-nsHTMLContentSerializer::LineBreakAfterOpen(nsIAtom* aName, 
-                                            PRBool aHasDirtyAttr)
-{
-  if ((!mDoFormat && !aHasDirtyAttr) || mPreLevel ||
-      (mFlags & nsIDocumentEncoder::OutputRaw)) {
-    return PR_FALSE;
-  }
-
-  if ((aName == nsHTMLAtoms::html) ||
-      (aName == nsHTMLAtoms::head) ||
-      (aName == nsHTMLAtoms::body) ||
-      (aName == nsHTMLAtoms::ul) ||
-      (aName == nsHTMLAtoms::ol) ||
-      (aName == nsHTMLAtoms::dl) ||
-      (aName == nsHTMLAtoms::table) ||
-      (aName == nsHTMLAtoms::tbody) ||
-      (aName == nsHTMLAtoms::tr) ||
-      (aName == nsHTMLAtoms::br) ||
-      (aName == nsHTMLAtoms::meta) ||
-      (aName == nsHTMLAtoms::link) ||
-      (aName == nsHTMLAtoms::script) ||
-      (aName == nsHTMLAtoms::style)) {
-    return PR_TRUE;
-  }
-
-  return PR_FALSE;
-}
-
-PRBool 
-nsHTMLContentSerializer::LineBreakBeforeClose(nsIAtom* aName, 
-                                              PRBool aHasDirtyAttr)
-{
-  if ((!mDoFormat && !aHasDirtyAttr) || mPreLevel || !mColPos ||
-      (mFlags & nsIDocumentEncoder::OutputRaw)) {
-    return PR_FALSE;
-  }
-
-  if ((aName == nsHTMLAtoms::html) ||
-      (aName == nsHTMLAtoms::head) ||
-      (aName == nsHTMLAtoms::body) ||
-      (aName == nsHTMLAtoms::ul) ||
-      (aName == nsHTMLAtoms::ol) ||
-      (aName == nsHTMLAtoms::dl) ||
-      (aName == nsHTMLAtoms::table) ||
-      (aName == nsHTMLAtoms::tbody)) {
-    return PR_TRUE;
-  }
-  
-  return PR_FALSE;
-}
-
-PRBool 
-nsHTMLContentSerializer::LineBreakAfterClose(nsIAtom* aName, 
-                                             PRBool aHasDirtyAttr)
-{
-  if ((!mDoFormat && !aHasDirtyAttr) || mPreLevel ||
-      (mFlags & nsIDocumentEncoder::OutputRaw)) {
-    return PR_FALSE;
-  }
-
-  if ((aName == nsHTMLAtoms::html) ||
-      (aName == nsHTMLAtoms::head) ||
-      (aName == nsHTMLAtoms::body) ||
-      (aName == nsHTMLAtoms::tr) ||
-      (aName == nsHTMLAtoms::th) ||
-      (aName == nsHTMLAtoms::td) ||
-      (aName == nsHTMLAtoms::pre) ||
-      (aName == nsHTMLAtoms::title) ||
-      (aName == nsHTMLAtoms::li) ||
-      (aName == nsHTMLAtoms::dt) ||
-      (aName == nsHTMLAtoms::dd) ||
-      (aName == nsHTMLAtoms::blockquote) ||
-      (aName == nsHTMLAtoms::p) ||
-      (aName == nsHTMLAtoms::div)) {
-    return PR_TRUE;
-  }
-  else {
-    nsCOMPtr<nsIParserService> parserService;
-    GetParserService(getter_AddRefs(parserService));
-    
-    if (parserService) {
-      nsAutoString str;
-      aName->ToString(str);
-      PRBool res;
-      PRInt32 id;
-
-      parserService->HTMLStringTagToId(str, &id);
-      parserService->IsBlock(id, res);
-      return res;
-    }
-  }
-
-  return PR_FALSE;
-}
-
-void
-nsHTMLContentSerializer::StartIndentation(nsIAtom* aName,
-                                          PRBool aHasDirtyAttr,
-                                          nsAWritableString& aStr)
-{
-  if ((mDoFormat || aHasDirtyAttr) && !mPreLevel && !mColPos) {
-    for (PRInt32 i = mIndent; --i >= 0; ) {
-      AppendToString(kIndentStr.get(), -1, 
-                     aStr);
-    }
-  }
-
-  if ((aName == nsHTMLAtoms::head) ||
-      (aName == nsHTMLAtoms::table) ||
-      (aName == nsHTMLAtoms::tr) ||
-      (aName == nsHTMLAtoms::ul) ||
-      (aName == nsHTMLAtoms::ol) ||
-      (aName == nsHTMLAtoms::tbody) ||
-      (aName == nsHTMLAtoms::form) ||
-      (aName == nsHTMLAtoms::frameset) ||
-      (aName == nsHTMLAtoms::blockquote) ||
-      (aName == nsHTMLAtoms::li) ||
-      (aName == nsHTMLAtoms::dt) ||
-      (aName == nsHTMLAtoms::dd)) {
-    mIndent++;
-  }
-}
-
-void
-nsHTMLContentSerializer::EndIndentation(nsIAtom* aName,
-                                        PRBool aHasDirtyAttr,
-                                        nsAWritableString& aStr)
-{
-  if ((aName == nsHTMLAtoms::head) ||
-      (aName == nsHTMLAtoms::table) ||
-      (aName == nsHTMLAtoms::tr) ||
-      (aName == nsHTMLAtoms::ul) ||
-      (aName == nsHTMLAtoms::ol) ||
-      (aName == nsHTMLAtoms::li) ||
-      (aName == nsHTMLAtoms::tbody) ||
-      (aName == nsHTMLAtoms::form) ||
-      (aName == nsHTMLAtoms::frameset)) {
-    mIndent--;
-  }
-
-  if ((mDoFormat || aHasDirtyAttr) && !mPreLevel && !mColPos) {
-    for (PRInt32 i = mIndent; --i >= 0; ) {
-      AppendToString(kIndentStr.get(), -1,
-                     aStr);
-    }
-  }
-}
-
-// See if the string has any lines longer than longLineLen:
-// if so, we presume formatting is wonky (e.g. the node has been edited)
-// and we'd better rewrap the whole text node.
-PRBool 
-nsHTMLContentSerializer::HasLongLines(const nsString& text, PRInt32& aLastNewlineOffset)
-{
-  PRUint32 start=0;
-  PRUint32 theLen=text.Length();
-  PRBool rv = PR_FALSE;
-  aLastNewlineOffset = kNotFound;
-  for (start = 0; start < theLen; )
-  {
-    PRInt32 eol = text.FindChar('\n', PR_FALSE, start);
-    if (eol < 0) {
-      eol = text.Length();
-    }
-    else {
-      aLastNewlineOffset = eol;
-    }
-    if (PRInt32(eol - start) > kLongLineLen)
-      rv = PR_TRUE;
-    start = eol+1;
-  }
-  return rv;
-}

mozilla/content/xbl/src/nsXBLWindowHandler.cpp

@@ -1,332 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  - David W. Hyatt (hyatt@netscape.com)
- *  - Mike Pinkerton (pinkerton@netscape.com)
- *  - Akkana Peck (akkana@netscape.com)
- */
-
-
-#include "nsXBLWindowHandler.h"
-
-#include "nsCOMPtr.h"
-#include "nsPIWindowRoot.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIFocusController.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIDocShell.h"
-#include "nsIPresShell.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsIXBLPrototypeHandler.h"
-#include "nsIXBLPrototypeBinding.h"
-#include "nsIPrivateDOMEvent.h"
-#include "nsIDOMEvent.h"
-#include "nsIContent.h"
-#include "nsHTMLAtoms.h"
-#include "nsINameSpaceManager.h"
-#include "nsIXBLDocumentInfo.h"
-#include "nsIDocument.h"
-#include "nsIXBLService.h"
-#include "nsIServiceManager.h"
-
-class nsXBLSpecialDocInfo
-{
-public:
-  nsCOMPtr<nsIXBLDocumentInfo> mHTMLBindings;
-  nsCOMPtr<nsIXBLDocumentInfo> mPlatformHTMLBindings;
-  nsCOMPtr<nsIXBLDocumentInfo> mUserHTMLBindings;
-
-  nsCString mHTMLBindingStr;
-  nsCString mPlatformHTMLBindingStr;
-  nsCString mUserHTMLBindingStr;
-
-  static char* sHTMLBindingStr;
-  static char* sPlatformHTMLBindingStr;
-  static char* sUserHTMLBindingStr;
-
-  PRBool mInitialized;
-
-public:
-  void LoadDocInfo();
-  void GetAllHandlers(const char* aType,
-                      nsIXBLPrototypeHandler** handler,
-                      nsIXBLPrototypeHandler** platformHandler,
-                      nsIXBLPrototypeHandler** userHandler);
-  void GetHandlers(nsIXBLDocumentInfo* aInfo,
-                   const nsAReadableCString& aRef,
-                   nsIXBLPrototypeHandler** aResult);
-
-  nsXBLSpecialDocInfo() : mInitialized(PR_FALSE) {};
-};
-
-char* nsXBLSpecialDocInfo::sHTMLBindingStr = "resource:///res/builtin/htmlBindings.xml";
-char* nsXBLSpecialDocInfo::sPlatformHTMLBindingStr = "resource:///res/builtin/platformHTMLBindings.xml";
-// Allow for a userHTMLBindings.xml.
-// XXX Should be in the user profile directory, when we have a urlspec for that
-char* nsXBLSpecialDocInfo::sUserHTMLBindingStr = "resource:///res/builtin/userHTMLBindings.xml";
-
-void nsXBLSpecialDocInfo::LoadDocInfo()
-{
-  if (mInitialized)
-    return;
-  mInitialized = PR_TRUE;
-
-  mHTMLBindingStr = sHTMLBindingStr;
-  mPlatformHTMLBindingStr = sPlatformHTMLBindingStr;
-  mUserHTMLBindingStr = sUserHTMLBindingStr;
-
-  if (mHTMLBindings && mPlatformHTMLBindings && mUserHTMLBindings)
-    return;
-
-  nsresult rv;
-  NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv);
-  if (NS_FAILED(rv) || !xblService)
-    return;
-
-  // Obtain the XP and platform doc infos
-  xblService->LoadBindingDocumentInfo(nsnull, nsnull, 
-                                      mHTMLBindingStr,
-                                      nsCAutoString(""), PR_TRUE, 
-                                      getter_AddRefs(mHTMLBindings));
-  xblService->LoadBindingDocumentInfo(nsnull, nsnull,
-                                      mPlatformHTMLBindingStr,
-                                      nsCAutoString(""), PR_TRUE, 
-                                      getter_AddRefs(mPlatformHTMLBindings));
-  xblService->LoadBindingDocumentInfo(nsnull, nsnull,
-                                      mUserHTMLBindingStr,
-                                      nsCAutoString(""), PR_TRUE, 
-                                      getter_AddRefs(mUserHTMLBindings));
-}
-
-//
-// GetHandlers
-//
-// 
-void
-nsXBLSpecialDocInfo::GetHandlers(nsIXBLDocumentInfo* aInfo,
-                                 const nsAReadableCString& aRef,
-                                 nsIXBLPrototypeHandler** aResult)
-{
-  nsCOMPtr<nsIXBLPrototypeBinding> binding;
-  aInfo->GetPrototypeBinding(aRef, getter_AddRefs(binding));
-  if (!binding) {
-    nsCOMPtr<nsIDocument> doc;
-    aInfo->GetDocument(getter_AddRefs(doc));
-    nsCOMPtr<nsIContent> root = getter_AddRefs(doc->GetRootContent());
-    if (root) { // no root, no handlers. don't crash please.
-      PRInt32 childCount;
-      root->ChildCount(childCount);
-      for (PRInt32 i = 0; i < childCount; i++) {
-        nsCOMPtr<nsIContent> child;
-        root->ChildAt(i, *getter_AddRefs(child));
-        nsAutoString id;
-        child->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::id, id);
-        if (id.EqualsWithConversion(nsPromiseFlatCString(aRef).get())) {
-          NS_NewXBLPrototypeBinding(aRef, child, aInfo, getter_AddRefs(binding));
-          aInfo->SetPrototypeBinding(aRef, binding);
-          break;
-        }
-      }
-    }
-  }
-
-  if (binding) {
-    nsCOMPtr<nsIXBLPrototypeHandler> dummy;
-    binding->GetPrototypeHandlers(aResult, getter_AddRefs(dummy)); // Addref happens here.
-  }
-} // GetHandlers
-
-void
-nsXBLSpecialDocInfo::GetAllHandlers(const char* aType,
-                                    nsIXBLPrototypeHandler** aHandler,
-                                    nsIXBLPrototypeHandler** aPlatformHandler,
-                                    nsIXBLPrototypeHandler** aUserHandler)
-{
-  if (mUserHTMLBindings) {
-    nsCAutoString type(aType);
-    type.Append("User");
-    GetHandlers(mUserHTMLBindings, type, aUserHandler);
-  }
-  if (mPlatformHTMLBindings) {
-    nsCAutoString type(aType);
-    GetHandlers(mPlatformHTMLBindings, type, aPlatformHandler);
-  }
-  if (mHTMLBindings) {
-    nsCAutoString type(aType);
-    type.Append("Base");
-    GetHandlers(mHTMLBindings, type, aHandler);
-  }
-}
-
-// Init statics
-nsXBLSpecialDocInfo* nsXBLWindowHandler::sXBLSpecialDocInfo = nsnull;
-PRUint32 nsXBLWindowHandler::sRefCnt = 0;
-
-
-//
-// nsXBLWindowHandler ctor
-//
-// Increment the refcount
-//
-nsXBLWindowHandler :: nsXBLWindowHandler (nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver)
-  : mElement(aElement), mReceiver(aReceiver)
-{
-  ++sRefCnt;
-}
-
-
-//
-// nsXBLWindowHandler dtor
-//
-// Decrement the refcount. If we get to zero, get rid of the static XBL doc
-// info.
-//
-nsXBLWindowHandler :: ~nsXBLWindowHandler ( )
-{
-  --sRefCnt;
-  if ( !sRefCnt ) {
-    delete sXBLSpecialDocInfo;
-    sXBLSpecialDocInfo = nsnull;
-  }
-}
-
-
-//
-// IsEditor
-//
-// Determine if the document we're working with is Editor or Browser
-//
-PRBool
-nsXBLWindowHandler :: IsEditor()
-{
-  nsCOMPtr<nsPIWindowRoot> windowRoot(do_QueryInterface(mReceiver));
-  nsCOMPtr<nsIFocusController> focusController;
-  windowRoot->GetFocusController(getter_AddRefs(focusController));
-  if (!focusController) {
-    NS_WARNING("********* Something went wrong! No focus controller on the root!!!\n");
-    return PR_FALSE;
-  }
-
-  nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-  focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-  if (!focusedWindow)
-    return PR_FALSE;
-  
-  nsCOMPtr<nsIScriptGlobalObject> obj(do_QueryInterface(focusedWindow));
-  nsCOMPtr<nsIDocShell> docShell;
-  obj->GetDocShell(getter_AddRefs(docShell));
-  nsCOMPtr<nsIPresShell> presShell;
-  if (docShell)
-    docShell->GetPresShell(getter_AddRefs(presShell));
-
-  if (presShell) {
-    PRBool isEditor;
-    presShell->GetDisplayNonTextSelection(&isEditor);
-    return isEditor;
-  }
-
-  return PR_FALSE;
-} // IsEditor
-
-
-//
-// WalkHandlersInternal
-//
-// Given a particular DOM event and a pointer to the first handler in the list,
-// scan through the list to find something to handle the event and then make it
-// so.
-//
-nsresult
-nsXBLWindowHandler::WalkHandlersInternal(nsIDOMEvent* aEvent, nsIAtom* aEventType, 
-                                            nsIXBLPrototypeHandler* aHandler)
-{
-  nsresult rv;
-  nsCOMPtr<nsIXBLPrototypeHandler> currHandler = aHandler;
-  while (currHandler) {
-
-    PRBool stopped;
-    nsCOMPtr<nsIPrivateDOMEvent> privateEvent(do_QueryInterface(aEvent));
-    privateEvent->IsDispatchStopped(&stopped);
-    if (stopped)
-      return NS_OK;
- 
-    // if the handler says it wants the event, execute it
-    if ( EventMatched(currHandler, aEventType, aEvent) ) {
-      // ...but don't exectute if it is disabled.
-      nsAutoString disabled;
-      
-      nsCOMPtr<nsIContent> elt;
-      currHandler->GetHandlerElement(getter_AddRefs(elt));
-
-      elt->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::disabled, disabled);
-      if (!disabled.Equals(NS_LITERAL_STRING("true"))) {
-        nsCOMPtr<nsIDOMEventReceiver> rec = mReceiver;
-        if (mElement)
-          rec = do_QueryInterface(elt);
-        rv = currHandler->ExecuteHandler(rec, aEvent);
-        if (NS_SUCCEEDED(rv))
-          return NS_OK;
-      }
-    }
-
-    // the current handler didn't want it, try the next one.
-    nsCOMPtr<nsIXBLPrototypeHandler> nextHandler;
-    currHandler->GetNextHandler(getter_AddRefs(nextHandler));
-    currHandler = nextHandler;
-  }
-
-  return NS_OK;
-} // WalkHandlersInternal
-
-
-
-//
-// EnsureHandlers
-//
-// Lazily load the XP and platform-specific bindings
-//
-nsresult
-nsXBLWindowHandler::EnsureHandlers()
-{
-  if (!sXBLSpecialDocInfo)
-    sXBLSpecialDocInfo = new nsXBLSpecialDocInfo();    
-  if (!sXBLSpecialDocInfo)
-    return NS_ERROR_OUT_OF_MEMORY;
-  sXBLSpecialDocInfo->LoadDocInfo();
-
-  // Now determine which handlers we should be using.
-  if (IsEditor()) {
-    sXBLSpecialDocInfo->GetAllHandlers("editor",
-                                       getter_AddRefs(mHandler),
-                                       getter_AddRefs(mPlatformHandler),
-                                       getter_AddRefs(mUserHandler));
-  }
-  else {
-    sXBLSpecialDocInfo->GetAllHandlers("browser",
-                                       getter_AddRefs(mHandler),
-                                       getter_AddRefs(mPlatformHandler),
-                                       getter_AddRefs(mUserHandler));
-  }
-
-  return NS_OK;
-  
-} // EnsureHandlers
-

mozilla/editor/base/TextEditorTest.cpp

@@ -1,259 +0,0 @@
-/* -*- Mode: C++ tab-width: 2 indent-tabs-mode: nil c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <stdio.h>
-
-#include "nsIEditor.h"
-#include "nsIHTMLEditor.h"
-#include "TextEditorTest.h"
-#include "nsISelection.h"
-#include "nsIDOMCharacterData.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMNodeList.h"
-#include "nsIEditProperty.h"
-#include "nsString.h"
-
-#ifdef NS_DEBUG
-
-#define TEST_RESULT(r) { if (NS_FAILED(r)) {printf("FAILURE result=%X\n", r); return r; } }
-#define TEST_POINTER(p) { if (!p) {printf("FAILURE null pointer\n"); return NS_ERROR_NULL_POINTER; } }
-
-TextEditorTest::TextEditorTest()
-{
-  printf("constructed a TextEditorTest\n");
-}
-
-TextEditorTest::~TextEditorTest()
-{
-  printf("destroyed a TextEditorTest\n");
-}
-
-void TextEditorTest::Run(nsIEditor *aEditor, PRInt32 *outNumTests, PRInt32 *outNumTestsFailed)
-{
-  if (!aEditor) return;
-  mTextEditor = do_QueryInterface(aEditor);
-  mEditor = do_QueryInterface(aEditor);
-  RunUnitTest(outNumTests, outNumTestsFailed);
-}
-
-nsresult TextEditorTest::RunUnitTest(PRInt32 *outNumTests, PRInt32 *outNumTestsFailed)
-{
-  nsresult result;
-  
-  if (!outNumTests || !outNumTestsFailed)
-    return NS_ERROR_NULL_POINTER;
-  
-  *outNumTests = 0;
-  *outNumTestsFailed = 0;
-  
-  result = InitDoc();
-  TEST_RESULT(result);
-  // shouldn't we just bail on error here?
-  
-  // insert some simple text
-  result = mTextEditor->InsertText(NS_LITERAL_STRING("1234567890abcdefghij1234567890").get());
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-  
-  // insert some more text
-  result = mTextEditor->InsertText(NS_LITERAL_STRING("Moreover, I am cognizant of the interrelatedness of all communities and states.  I cannot sit idly by in Atlanta and not be concerned about what happens in Birmingham.  Injustice anywhere is a threat to justice everywhere").get());
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-
-  result = TestInsertBreak();
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-
-  result = TestTextProperties();
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-
-  // get us back to the original document
-  result = mEditor->Undo(12);
-  TEST_RESULT(result);
-
-  return result;
-}
-
-nsresult TextEditorTest::InitDoc()
-{
-  nsresult result = mEditor->SelectAll();
-  TEST_RESULT(result);
-  result = mEditor->DeleteSelection(nsIEditor::eNext);
-  TEST_RESULT(result);
-  return result;
-}
-
-nsresult TextEditorTest::TestInsertBreak()
-{
-  nsCOMPtr<nsISelection>selection;
-  nsresult result = mEditor->GetSelection(getter_AddRefs(selection));
-  TEST_RESULT(result);
-  TEST_POINTER(selection.get());
-  nsCOMPtr<nsIDOMNode>anchor;
-  result = selection->GetAnchorNode(getter_AddRefs(anchor));
-  TEST_RESULT(result);
-  TEST_POINTER(anchor.get());
-  selection->Collapse(anchor, 0);
-  // insert one break
-  printf("inserting a break\n");
-  result = mTextEditor->InsertLineBreak();
-  TEST_RESULT(result);
-  mEditor->DebugDumpContent();
-
-  // insert a second break adjacent to the first
-  printf("inserting a second break\n");
-  result = mTextEditor->InsertLineBreak();
-  TEST_RESULT(result);
-  mEditor->DebugDumpContent();
-    
-  return result;
-}
-
-nsresult TextEditorTest::TestTextProperties()
-{
-  nsCOMPtr<nsIDOMDocument>doc;
-  nsresult result = mEditor->GetDocument(getter_AddRefs(doc));
-  TEST_RESULT(result);
-  TEST_POINTER(doc.get());
-  nsCOMPtr<nsIDOMNodeList>nodeList;
-  nsAutoString textTag; textTag.AssignWithConversion("__moz_text");
-  result = doc->GetElementsByTagName(textTag, getter_AddRefs(nodeList));
-  TEST_RESULT(result);
-  TEST_POINTER(nodeList.get());
-  PRUint32 count;
-  nodeList->GetLength(&count);
-  NS_ASSERTION(0!=count, "there are no text nodes in the document!");
-  nsCOMPtr<nsIDOMNode>textNode;
-  result = nodeList->Item(count-1, getter_AddRefs(textNode));
-  TEST_RESULT(result);
-  TEST_POINTER(textNode.get());
-
-  // set the whole text node to bold
-  printf("set the whole first text node to bold\n");
-  nsCOMPtr<nsISelection>selection;
-  result = mEditor->GetSelection(getter_AddRefs(selection));
-  TEST_RESULT(result);
-  TEST_POINTER(selection.get());
-  nsCOMPtr<nsIDOMCharacterData>textData;
-  textData = do_QueryInterface(textNode);
-  PRUint32 length;
-  textData->GetLength(&length);
-  selection->Collapse(textNode, 0);
-  selection->Extend(textNode, length);
-
-  nsCOMPtr<nsIHTMLEditor> htmlEditor (do_QueryInterface(mTextEditor));
-  if (!htmlEditor)
-    return NS_ERROR_FAILURE;
-
-  PRBool any = PR_FALSE;
-  PRBool all = PR_FALSE;
-  PRBool first=PR_FALSE;
-
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_FALSE==first, "first should be false");
-  NS_ASSERTION(PR_FALSE==any, "any should be false");
-  NS_ASSERTION(PR_FALSE==all, "all should be false");
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::b, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-
-  // remove the bold we just set
-  printf("set the whole first text node to not bold\n");
-  result = htmlEditor->RemoveInlineProperty(nsIEditProperty::b, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_FALSE==first, "first should be false");
-  NS_ASSERTION(PR_FALSE==any, "any should be false");
-  NS_ASSERTION(PR_FALSE==all, "all should be false");
-  mEditor->DebugDumpContent();
-
-  // set all but the first and last character to bold
-  printf("set the first text node (1, length-1) to bold and italic, and (2, length-1) to underline.\n");
-  selection->Collapse(textNode, 1);
-  selection->Extend(textNode, length-1);
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::b, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-  // make all that same text italic
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::i, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::i, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-
-  // make all the text underlined, except for the first 2 and last 2 characters
-  result = doc->GetElementsByTagName(textTag, getter_AddRefs(nodeList));
-  TEST_RESULT(result);
-  TEST_POINTER(nodeList.get());
-  nodeList->GetLength(&count);
-  NS_ASSERTION(0!=count, "there are no text nodes in the document!");
-  result = nodeList->Item(count-2, getter_AddRefs(textNode));
-  TEST_RESULT(result);
-  TEST_POINTER(textNode.get());
-  textData = do_QueryInterface(textNode);
-  textData->GetLength(&length);
-  NS_ASSERTION(length==915, "wrong text node");
-  selection->Collapse(textNode, 1);
-  selection->Extend(textNode, length-2);
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::u, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::u, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-
-  return result;
-}
-
-
-
-#endif
-
-

mozilla/editor/libeditor/html/TextEditorTest.cpp

@@ -1,259 +0,0 @@
-/* -*- Mode: C++ tab-width: 2 indent-tabs-mode: nil c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <stdio.h>
-
-#include "nsIEditor.h"
-#include "nsIHTMLEditor.h"
-#include "TextEditorTest.h"
-#include "nsISelection.h"
-#include "nsIDOMCharacterData.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMNodeList.h"
-#include "nsIEditProperty.h"
-#include "nsString.h"
-
-#ifdef NS_DEBUG
-
-#define TEST_RESULT(r) { if (NS_FAILED(r)) {printf("FAILURE result=%X\n", r); return r; } }
-#define TEST_POINTER(p) { if (!p) {printf("FAILURE null pointer\n"); return NS_ERROR_NULL_POINTER; } }
-
-TextEditorTest::TextEditorTest()
-{
-  printf("constructed a TextEditorTest\n");
-}
-
-TextEditorTest::~TextEditorTest()
-{
-  printf("destroyed a TextEditorTest\n");
-}
-
-void TextEditorTest::Run(nsIEditor *aEditor, PRInt32 *outNumTests, PRInt32 *outNumTestsFailed)
-{
-  if (!aEditor) return;
-  mTextEditor = do_QueryInterface(aEditor);
-  mEditor = do_QueryInterface(aEditor);
-  RunUnitTest(outNumTests, outNumTestsFailed);
-}
-
-nsresult TextEditorTest::RunUnitTest(PRInt32 *outNumTests, PRInt32 *outNumTestsFailed)
-{
-  nsresult result;
-  
-  if (!outNumTests || !outNumTestsFailed)
-    return NS_ERROR_NULL_POINTER;
-  
-  *outNumTests = 0;
-  *outNumTestsFailed = 0;
-  
-  result = InitDoc();
-  TEST_RESULT(result);
-  // shouldn't we just bail on error here?
-  
-  // insert some simple text
-  result = mTextEditor->InsertText(NS_LITERAL_STRING("1234567890abcdefghij1234567890").get());
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-  
-  // insert some more text
-  result = mTextEditor->InsertText(NS_LITERAL_STRING("Moreover, I am cognizant of the interrelatedness of all communities and states.  I cannot sit idly by in Atlanta and not be concerned about what happens in Birmingham.  Injustice anywhere is a threat to justice everywhere").get());
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-
-  result = TestInsertBreak();
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-
-  result = TestTextProperties();
-  TEST_RESULT(result);
-  (*outNumTests)++;
-  (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK);
-
-  // get us back to the original document
-  result = mEditor->Undo(12);
-  TEST_RESULT(result);
-
-  return result;
-}
-
-nsresult TextEditorTest::InitDoc()
-{
-  nsresult result = mEditor->SelectAll();
-  TEST_RESULT(result);
-  result = mEditor->DeleteSelection(nsIEditor::eNext);
-  TEST_RESULT(result);
-  return result;
-}
-
-nsresult TextEditorTest::TestInsertBreak()
-{
-  nsCOMPtr<nsISelection>selection;
-  nsresult result = mEditor->GetSelection(getter_AddRefs(selection));
-  TEST_RESULT(result);
-  TEST_POINTER(selection.get());
-  nsCOMPtr<nsIDOMNode>anchor;
-  result = selection->GetAnchorNode(getter_AddRefs(anchor));
-  TEST_RESULT(result);
-  TEST_POINTER(anchor.get());
-  selection->Collapse(anchor, 0);
-  // insert one break
-  printf("inserting a break\n");
-  result = mTextEditor->InsertLineBreak();
-  TEST_RESULT(result);
-  mEditor->DebugDumpContent();
-
-  // insert a second break adjacent to the first
-  printf("inserting a second break\n");
-  result = mTextEditor->InsertLineBreak();
-  TEST_RESULT(result);
-  mEditor->DebugDumpContent();
-    
-  return result;
-}
-
-nsresult TextEditorTest::TestTextProperties()
-{
-  nsCOMPtr<nsIDOMDocument>doc;
-  nsresult result = mEditor->GetDocument(getter_AddRefs(doc));
-  TEST_RESULT(result);
-  TEST_POINTER(doc.get());
-  nsCOMPtr<nsIDOMNodeList>nodeList;
-  nsAutoString textTag; textTag.AssignWithConversion("__moz_text");
-  result = doc->GetElementsByTagName(textTag, getter_AddRefs(nodeList));
-  TEST_RESULT(result);
-  TEST_POINTER(nodeList.get());
-  PRUint32 count;
-  nodeList->GetLength(&count);
-  NS_ASSERTION(0!=count, "there are no text nodes in the document!");
-  nsCOMPtr<nsIDOMNode>textNode;
-  result = nodeList->Item(count-1, getter_AddRefs(textNode));
-  TEST_RESULT(result);
-  TEST_POINTER(textNode.get());
-
-  // set the whole text node to bold
-  printf("set the whole first text node to bold\n");
-  nsCOMPtr<nsISelection>selection;
-  result = mEditor->GetSelection(getter_AddRefs(selection));
-  TEST_RESULT(result);
-  TEST_POINTER(selection.get());
-  nsCOMPtr<nsIDOMCharacterData>textData;
-  textData = do_QueryInterface(textNode);
-  PRUint32 length;
-  textData->GetLength(&length);
-  selection->Collapse(textNode, 0);
-  selection->Extend(textNode, length);
-
-  nsCOMPtr<nsIHTMLEditor> htmlEditor (do_QueryInterface(mTextEditor));
-  if (!htmlEditor)
-    return NS_ERROR_FAILURE;
-
-  PRBool any = PR_FALSE;
-  PRBool all = PR_FALSE;
-  PRBool first=PR_FALSE;
-
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_FALSE==first, "first should be false");
-  NS_ASSERTION(PR_FALSE==any, "any should be false");
-  NS_ASSERTION(PR_FALSE==all, "all should be false");
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::b, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-
-  // remove the bold we just set
-  printf("set the whole first text node to not bold\n");
-  result = htmlEditor->RemoveInlineProperty(nsIEditProperty::b, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_FALSE==first, "first should be false");
-  NS_ASSERTION(PR_FALSE==any, "any should be false");
-  NS_ASSERTION(PR_FALSE==all, "all should be false");
-  mEditor->DebugDumpContent();
-
-  // set all but the first and last character to bold
-  printf("set the first text node (1, length-1) to bold and italic, and (2, length-1) to underline.\n");
-  selection->Collapse(textNode, 1);
-  selection->Extend(textNode, length-1);
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::b, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-  // make all that same text italic
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::i, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::i, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::b, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-
-  // make all the text underlined, except for the first 2 and last 2 characters
-  result = doc->GetElementsByTagName(textTag, getter_AddRefs(nodeList));
-  TEST_RESULT(result);
-  TEST_POINTER(nodeList.get());
-  nodeList->GetLength(&count);
-  NS_ASSERTION(0!=count, "there are no text nodes in the document!");
-  result = nodeList->Item(count-2, getter_AddRefs(textNode));
-  TEST_RESULT(result);
-  TEST_POINTER(textNode.get());
-  textData = do_QueryInterface(textNode);
-  textData->GetLength(&length);
-  NS_ASSERTION(length==915, "wrong text node");
-  selection->Collapse(textNode, 1);
-  selection->Extend(textNode, length-2);
-  result = htmlEditor->SetInlineProperty(nsIEditProperty::u, nsnull, nsnull);
-  TEST_RESULT(result);
-  result = htmlEditor->GetInlineProperty(nsIEditProperty::u, nsnull, nsnull, first, any, all);
-  TEST_RESULT(result);
-  NS_ASSERTION(PR_TRUE==first, "first should be true");
-  NS_ASSERTION(PR_TRUE==any, "any should be true");
-  NS_ASSERTION(PR_TRUE==all, "all should be true");
-  mEditor->DebugDumpContent();
-
-  return result;
-}
-
-
-
-#endif
-
-

mozilla/ef/Compiler/RegisterAllocator/BitSet.cpp

@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "BitSet.h"
+
+// Return the next bit after index set to true or -1 if none.
+//
+Int32 BitSet::nextOne(Int32 pos) const
+{
+	++pos;
+
+	if (pos < 0 || Uint32(pos) >= universeSize)
+		return -1;
+
+	Uint32 offset = getWordOffset(pos);
+	Uint8 index = getBitOffset(pos);
+	Word* ptr = &word[offset];
+	Word currentWord = *ptr++ >> index;
+	
+	if (currentWord != Word(0)) {
+		while ((currentWord & Word(1)) == 0) {
+			++index;
+			currentWord >>= 1;
+		}
+		return (offset << nBitsInWordLog2) + index;
+	}
+
+	Word* limit = &word[getSizeInWords(universeSize)];
+	while (ptr < limit) {
+		++offset;
+		currentWord = *ptr++;
+		if (currentWord != Word(0)) {
+			index = 0;
+			while ((currentWord & Word(1)) == 0) {
+				++index;
+				currentWord >>= 1;
+			}
+			return (offset << nBitsInWordLog2) + index;
+		}
+	}
+	return -1;
+}
+
+// Return the next bit after index set to false or -1 if none.
+//
+Int32 BitSet::nextZero(Int32 pos) const
+{
+	++pos;
+
+	if (pos < 0 || Uint32(pos) >= universeSize)
+		return -1;
+
+	Uint32 offset = getWordOffset(pos);
+	Uint8 index = getBitOffset(pos);
+	Word* ptr = &word[offset];
+	Word currentWord = *ptr++ >> index;
+	
+	if (currentWord != Word(~0)) {
+		for (; index < nBitsInWord; ++index) {
+			if ((currentWord & Word(1)) == 0) {
+				Int32 ret = (offset << nBitsInWordLog2) + index;
+				return (Uint32(ret) < universeSize) ? ret : -1;
+			}
+			currentWord >>= 1;
+		}
+	}
+
+	Word* limit = &word[getSizeInWords(universeSize)];
+	while (ptr < limit) {
+		++offset;
+		currentWord = *ptr++;
+		if (currentWord != Word(~0)) {
+			for (index = 0; index < nBitsInWord; ++index) {
+				if ((currentWord & Word(1)) == 0) {
+					Int32 ret = (offset << nBitsInWordLog2) + index;
+					return (Uint32(ret) < universeSize) ? ret : -1;
+				}
+				currentWord >>= 1;
+			}
+		}
+	}
+	return -1;
+}
+
+#ifdef DEBUG_LOG
+
+// Print the set.
+//
+void BitSet::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("[ "));
+
+	for (Int32 i = firstOne(); i != -1; i = nextOne(i)) {
+		Int32 currentBit = i;
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%d", currentBit));
+
+		Int32 nextBit = nextOne(currentBit);
+		if (nextBit != currentBit + 1) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" "));
+			continue;
+		}
+		  
+		while ((nextBit != -1) && (nextBit == (currentBit + 1))) {
+			currentBit = nextBit;
+			nextBit = nextOne(nextBit);
+		}
+
+		if (currentBit > (i+1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("-%d ", currentBit));
+		else
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" %d ", currentBit));
+
+		i = currentBit;
+	}
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("]\n"));
+}
+
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/BitSet.h

@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _BITSET_H_
+#define _BITSET_H_
+
+#include "Fundamentals.h"
+#include "LogModule.h"
+#include "Pool.h"
+#include <string.h>
+
+//------------------------------------------------------------------------------
+// BitSet -
+
+class BitSet
+{
+private:
+
+#if (PR_BITS_PER_WORD == 64)
+	typedef Uint64 Word;
+#elif (PR_BITS_PER_WORD == 32)
+	typedef Uint32 Word;
+#endif
+
+	static const nBitsInWord = 		PR_BITS_PER_WORD;
+	static const nBytesInWord = 	PR_BYTES_PER_WORD;
+	static const nBitsInWordLog2 =	PR_BITS_PER_WORD_LOG2;
+	static const nBytesInWordLog2 = PR_BYTES_PER_WORD_LOG2;
+
+	// Return the number of Word need to store the universe.
+	static Uint32 getSizeInWords(Uint32 sizeOfUniverse) {return (sizeOfUniverse + (nBitsInWord - 1)) >> nBitsInWordLog2;}
+	// Return the given element offset in its containing Word.
+	static Uint32 getBitOffset(Uint32 element) {return element & (nBitsInWord - 1);}
+	// Return the Word offset for the given element int the universe.
+	static Uint32 getWordOffset(Uint32 element) {return element >> nBitsInWordLog2;}
+	// Return the mask for the given bit index.
+	static Word getMask(Uint8 index) {return Word(1) << index;}
+	
+private:
+
+	Uint32							universeSize;			// Size of the universe
+	Word*							word;					// universe memory.
+
+private:
+
+	// No copy constructor.
+	BitSet(const BitSet&);
+
+	// Check if the given set's universe is of the same size than this universe.
+	void checkUniverseCompatibility(const BitSet& set) const {assert(set.universeSize == universeSize);}
+	// Check if pos is valid for this set's universe.
+	void checkMember(Int32 pos) const {assert(pos >=0 && Uint32(pos) < universeSize);}
+
+public:
+
+	// Create a bitset of universeSize bits.
+	BitSet(Pool& pool, Uint32 universeSize) : universeSize(universeSize) {word = new(pool) Word[getSizeInWords(universeSize)]; clear();}
+
+	// Return the size of this bitset.
+	Uint32 getSize() const {return universeSize;}
+
+	// Clear the bitset.
+	void clear() {memset(word, 0x00, getSizeInWords(universeSize) << nBytesInWordLog2);}
+	// Clear the bit at index.
+	void clear(Uint32 index) {checkMember(index); word[getWordOffset(index)] &= ~getMask(index);}
+	// Set the bitset.
+	void set() {memset(word, 0xFF, getSizeInWords(universeSize) << nBytesInWordLog2);}
+	// Set the bit at index.
+	void set(Uint32 index) {checkMember(index); word[getWordOffset(index)] |= getMask(index);}
+	// Return true if the bit at index is set.
+	bool test(Uint32 index) const {checkMember(index); return (word[getWordOffset(index)] & getMask(index)) != 0;}
+	// Union with the given bitset.
+	inline void or(const BitSet& set);
+	// Intersection with the given bitset.
+	inline void and(const BitSet& set);
+	// Difference with the given bitset.
+	inline void difference(const BitSet& set);
+	// Copy set.
+	inline BitSet& operator = (const BitSet& set);
+	// Return true if the bitset are identical.
+	friend bool operator == (const BitSet& set1, const BitSet& set2);
+	// Return true if the bitset are different.
+	friend bool operator != (const BitSet& set1, const BitSet& set2);
+
+	// Logical operators.
+	BitSet& operator |= (const BitSet& set) {or(set); return *this;}
+	BitSet& operator &= (const BitSet& set) {and(set); return *this;}
+	BitSet& operator -= (const BitSet& set) {difference(set); return *this;}
+
+	// Return the first bit at set to true or -1 if none.
+	Int32 firstOne() const {return nextOne(-1);}
+	// Return the next bit after index set to true or -1 if none.
+	Int32 nextOne(Int32 pos) const;
+	// Return the first bit at set to false or -1 if none.
+	Int32 firstZero() const {return nextZero(-1);}
+	// Return the next bit after index set to false or -1 if none.
+	Int32 nextZero(Int32 pos) const;
+
+	// Iterator to conform with the set API.
+	typedef Int32 iterator;
+	// Return true if the walk is ordered.
+	static bool isOrdered() {return true;}
+	// Return the iterator for the first element of this set.
+	iterator begin() const {return firstOne();}
+	// Return the next iterator.
+	iterator advance(iterator pos) const {return nextOne(pos);}
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos == -1;}
+	// Return the element corresponding to the given iterator.
+	Uint32 get(iterator pos) const {return pos;}
+
+#ifdef DEBUG_LOG
+	// Print the set.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+// Union with the given bitset.
+//
+inline void  BitSet::or(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ |= *src++;
+}
+
+// Intersection with the given bitset.
+//
+inline void  BitSet::and(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ &= *src++;
+}
+
+// Difference with the given bitset.
+//
+inline void BitSet::difference(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ &= ~*src++;
+}
+
+// Copy the given set into this set.
+//
+inline BitSet& BitSet::operator = (const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	if (this != &set)
+		memcpy(word, set.word, getSizeInWords(universeSize) << nBytesInWordLog2);
+	return *this;
+}
+
+// Return true if the given set is identical to this set.
+inline bool operator == (const BitSet& set1, const BitSet& set2)
+{
+	set1.checkUniverseCompatibility(set2);
+
+	if (&set1 == &set2)
+		return true;
+
+	return memcmp(set1.word, set2.word, BitSet::getSizeInWords(set1.universeSize) << BitSet::nBytesInWordLog2) == 0;
+}
+
+inline bool operator != (const BitSet& set1, const BitSet& set2) {return !(set1 == set2);}
+
+#endif // _BITSET_H

mozilla/ef/Compiler/RegisterAllocator/Coalescing.h

@@ -0,0 +1,159 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _COALESCING_H_
+#define _COALESCING_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "RegisterPressure.h"
+#include "InterferenceGraph.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "SparseSet.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+#if 1
+// Performing an ultra conservative coalescing meens that when we look at
+// candidates (source,destination) for coalescing we need to make sure
+// that the combined interference of the source and destination register
+// will not exceed the total number of register available for the register
+// class. 
+#define ULTRA_CONSERVATIVE_COALESCING
+#else
+// If we are not doing an ultra conservative coalescing we have to make sure 
+// that the total number of neighbor whose degree is greater than the total 
+// number of register is not greater than the total number of register.
+#undef ULTRA_CONSERVATIVE_COALESCING
+#endif
+
+template <class RegisterPressure>
+struct Coalescing
+{
+	static bool coalesce(RegisterAllocator& registerAllocator);
+};
+
+template <class RegisterPressure>
+bool Coalescing<RegisterPressure>::coalesce(RegisterAllocator& registerAllocator)
+{
+	Pool& pool = registerAllocator.pool;
+
+   	// Initialize the lookup table
+	//
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* newRange = new RegisterName[2 * rangeCount];
+	RegisterName* coalescedRange = &newRange[rangeCount];
+	RegisterName* name2range = registerAllocator.name2range;
+
+	init(coalescedRange, rangeCount);
+
+	SparseSet interferences(pool, rangeCount);
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+	bool removedInstructions = false;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.lndList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+
+	// Walk the nodes in the loop nesting depth list.
+	for (Int32 n = nNodes - 1; n >= 0; n--) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		InstructionList::iterator it = instructions.begin();
+		while (!instructions.done(it)) {
+			Instruction& instruction = instructions.get(it);
+			it = instructions.advance(it);
+
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(instruction.getInstructionUseBegin() != instruction.getInstructionUseEnd() && instruction.getInstructionUseBegin()[0].isRegister());
+				assert(instruction.getInstructionDefineBegin() != instruction.getInstructionDefineEnd() && instruction.getInstructionDefineBegin()[0].isRegister());
+
+				RegisterName source = findRoot(name2range[instruction.getInstructionUseBegin()[0].getRegisterName()], coalescedRange);
+				RegisterName destination = findRoot(name2range[instruction.getInstructionDefineBegin()[0].getRegisterName()], coalescedRange);
+
+				if (source == destination) {
+					instruction.remove();
+				} else if (!iGraph.interfere(source, destination)) {
+					InterferenceVector* sourceVector = iGraph.getInterferenceVector(source);
+					InterferenceVector* destinationVector = iGraph.getInterferenceVector(destination);
+
+#ifdef ULTRA_CONSERVATIVE_COALESCING
+					interferences.clear();
+
+					InterferenceVector* vector;
+					for (vector = sourceVector; vector != NULL; vector = vector->next) {
+						RegisterName* neighbors = vector->neighbors;
+						for (Uint32 i = 0; i < vector->count; i++)
+							interferences.set(findRoot(neighbors[i], coalescedRange));
+					}
+					for (vector = destinationVector; vector != NULL; vector = vector->next) {
+						RegisterName* neighbors = vector->neighbors;
+						for (Uint32 i = 0; i < vector->count; i++)
+							interferences.set(findRoot(neighbors[i], coalescedRange));
+					}
+
+					Uint32 count = interferences.getSize();
+#else // ULTRA_CONSERVATIVE_COALESCING
+					trespass("not implemented");
+					Uint32 count = 0;
+#endif // ULTRA_CONSERVATIVE_COALESCING
+
+					if (count < 6 /* FIX: should get the number from the class */) {
+						// Update the interferences vector.
+						if (sourceVector == NULL) {
+							iGraph.setInterferenceVector(source, destinationVector);
+							sourceVector = destinationVector;
+						} else if (destinationVector == NULL)
+							iGraph.setInterferenceVector(destination, sourceVector);
+						else {
+							InterferenceVector* last = NULL;
+							for (InterferenceVector* v = sourceVector; v != NULL; v = v->next)
+								last = v;
+							assert(last);
+							last->next = destinationVector;
+							iGraph.setInterferenceVector(destination, sourceVector);
+						}
+						// Update the interference matrix.
+						for (InterferenceVector* v = sourceVector; v != NULL; v = v->next) {
+							RegisterName* neighbors = v->neighbors;
+							for (Uint32 i = 0; i < v->count; i++) {
+								RegisterName neighbor = findRoot(neighbors[i], coalescedRange);
+								iGraph.setInterference(neighbor, source);
+								iGraph.setInterference(neighbor, destination);
+							}
+						}
+
+						instruction.remove();
+						coalescedRange[source] = destination;
+						removedInstructions = true;
+					}
+				}
+			}
+		}
+	}
+
+	registerAllocator.rangeCount = compress(registerAllocator.name2range, coalescedRange, registerAllocator.nameCount, rangeCount);
+	delete newRange;
+
+	return removedInstructions;
+}
+
+#endif // _COALESCING_H_

mozilla/ef/Compiler/RegisterAllocator/Coloring.cpp

@@ -0,0 +1,283 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef NEW_LAURENTM_CODE
+
+#include "Coloring.h"
+#include "VirtualRegister.h"
+#include "FastBitSet.h"
+#include "FastBitMatrix.h"
+#include "CpuInfo.h"
+
+bool Coloring::
+assignRegisters(FastBitMatrix& interferenceMatrix)
+{
+  PRUint32 *stackPtr = new(pool) PRUint32[vRegManager.count()];
+
+  return select(interferenceMatrix, stackPtr, simplify(interferenceMatrix, stackPtr));
+}
+
+PRInt32 Coloring::
+getLowestSpillCostRegister(FastBitSet& bitset)
+{
+  PRInt32 lowest = bitset.firstOne();
+  if (lowest != -1)
+	{
+	  Flt32 cost = vRegManager.getVirtualRegister(lowest).spillInfo.spillCost;
+	  for (PRInt32 r = bitset.nextOne(lowest); r != -1; r = bitset.nextOne(r))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+		  if (!vReg.spillInfo.infiniteSpillCost && (vReg.spillInfo.spillCost < cost))
+			{
+			  cost = vReg.spillInfo.spillCost;
+			  lowest = r;
+			}
+		}
+	}
+  return lowest;
+}
+
+PRUint32* Coloring::
+simplify(FastBitMatrix interferenceMatrix, PRUint32* stackPtr)
+{
+  // first we construct the sets low and high. low contains all nodes of degree
+  // inferior to the number of register available on the processor. All the
+  // nodes with an high degree and a finite spill cost are placed in high.
+  // Nodes of high degree and infinite spill cost are not included in either sets.
+
+  PRUint32 nRegisters = vRegManager.count();
+  FastBitSet low(pool, nRegisters);
+  FastBitSet high(pool, nRegisters);
+  FastBitSet stack(pool, nRegisters);
+
+  for (VirtualRegisterManager::iterator i = vRegManager.begin(); !vRegManager.done(i); i = vRegManager.advance(i))
+	{
+	  VirtualRegister& vReg = vRegManager.getVirtualRegister(i);
+	  
+	  if (vReg.getClass() == vrcStackSlot)
+		{
+		  stack.set(i);
+		  vReg.colorRegister(nRegisters);
+		}
+	  else
+		{
+		  if (vReg.colorInfo.interferenceDegree < NUMBER_OF_REGISTERS)
+			low.set(i);
+		  else // if (!vReg.spillInfo.infiniteSpillCost)
+			high.set(i);
+
+		  // Set coloring info.
+		  vReg.spillInfo.willSpill = false;
+
+		  switch(vReg.getClass())
+			{
+			case vrcInteger:
+			  vReg.colorRegister(LAST_GREGISTER + 1);
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+			  vReg.colorRegister(LAST_FPREGISTER + 1);
+			  break;
+			default:
+			  PR_ASSERT(false); // Cannot happen.
+			}
+		}
+	}
+
+  // push the stack registers
+  PRInt32 j;
+  for (j = stack.firstOne(); j != -1; j = stack.nextOne(j))
+	*stackPtr++ = j;
+
+  // simplify
+  while (true)
+	{
+	  PRInt32 r;
+	  while ((r = getLowestSpillCostRegister(low)) != -1)
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+
+		  /* update low and high */
+		  FastBitSet inter(interferenceMatrix.getRow(r), nRegisters);
+		  for (j = inter.firstOne(); j != -1; j = inter.nextOne(j))
+			{
+			  VirtualRegister& neighbor = vRegManager.getVirtualRegister(j);
+			  // if the new interference degree of one of his neighbor becomes
+			  // NUMBER_OF_REGISTERS - 1 then it is added to the set 'low'.
+			  
+			  PRUint32 maxInterference = 0;
+			  switch (neighbor.getClass())
+				{
+				case vrcInteger:
+				  maxInterference = NUMBER_OF_GREGISTERS;
+				  break;
+				case vrcFloatingPoint:
+				case vrcFixedPoint:
+				  maxInterference = NUMBER_OF_FPREGISTERS;
+				  break;
+				default:
+				  PR_ASSERT(false);
+				}
+			  if ((vRegManager.getVirtualRegister(j).colorInfo.interferenceDegree-- == maxInterference))
+				{
+				  high.clear(j);
+				  low.set(j);
+				}
+			  vReg.colorInfo.interferenceDegree--;
+			  interferenceMatrix.clear(r, j);
+			  interferenceMatrix.clear(j, r);
+			}
+		  low.clear(r);
+
+		  // Push this register.
+		  *stackPtr++ = r;
+		}
+	  if ((r = getLowestSpillCostRegister(high)) != -1)
+		{
+		  high.clear(r);
+		  low.set(r);
+		}
+	  else
+		break;
+	}
+
+  return stackPtr;
+}
+
+bool Coloring::
+select(FastBitMatrix& interferenceMatrix, PRUint32* stackBase, PRUint32* stackPtr)
+{
+  PRUint32 nRegisters = vRegManager.count();
+  FastBitSet usedRegisters(NUMBER_OF_REGISTERS + 1); // usedRegisters if used for both GR & FPR.
+  FastBitSet preColoredRegisters(NUMBER_OF_REGISTERS + 1);
+  FastBitSet usedStack(nRegisters + 1);
+  bool success = true;
+  Int32 lastUsedSSR = -1;
+
+  // select
+  while (stackPtr != stackBase)
+	{
+	  // Pop one register.
+	  PRUint32 r = *--stackPtr;
+	  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+
+	  FastBitSet neighbors(interferenceMatrix.getRow(r), nRegisters);
+		  
+	  if (vReg.getClass() == vrcStackSlot)
+		// Stack slots coloring.
+		{
+		  usedStack.clear();
+
+		  for (PRInt32 i = neighbors.firstOne(); i != -1; i = neighbors.nextOne(i))
+			usedStack.set(vRegManager.getVirtualRegister(i).getColor());
+
+		  Int32 color = usedStack.firstZero();
+		  vReg.colorRegister(color);
+		  if (color > lastUsedSSR)
+			  lastUsedSSR = color;
+		}
+	  else
+		// Integer & Floating point register coloring.
+		{
+		  usedRegisters.clear();
+		  preColoredRegisters.clear();
+		  
+		  for (PRInt32 i = neighbors.firstOne(); i != -1; i = neighbors.nextOne(i))
+			{
+			  VirtualRegister& nvReg = vRegManager.getVirtualRegister(i);
+			  usedRegisters.set(nvReg.getColor());
+			  if (nvReg.isPreColored())
+				preColoredRegisters.set(nvReg.getPreColor());
+			}
+		  if (vReg.hasSpecialInterference)
+			usedRegisters |= vReg.specialInterference;
+
+		  PRInt8 c = -1;
+		  PRInt8 maxColor = 0;
+		  PRInt8 firstColor = 0;
+		  switch (vReg.getClass())
+			{
+			case vrcInteger:
+			  firstColor = FIRST_GREGISTER;
+			  maxColor = LAST_GREGISTER;
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+			  firstColor = FIRST_FPREGISTER;
+			  maxColor = LAST_FPREGISTER;
+			  break;
+			default:
+			  PR_ASSERT(false);
+			}
+
+		  if (vReg.isPreColored())
+			{
+			  c = vReg.getPreColor();
+			  if (usedRegisters.test(c))
+				c = -1;
+			}
+		  else
+			{
+			  for (c = usedRegisters.nextZero(firstColor - 1); (c >= 0) && (c <= maxColor) && (preColoredRegisters.test(c)); 
+				   c = usedRegisters.nextZero(c)) {}
+			}
+
+		  if ((c >= 0) && (c <= maxColor))
+			{
+			  vReg.colorRegister(c);
+			}
+		  else
+			{
+			  VirtualRegister& stackRegister = vRegManager.newVirtualRegister(vrcStackSlot);
+			  vReg.equivalentRegister[vrcStackSlot] = &stackRegister;	  
+			  vReg.spillInfo.willSpill = true;
+			  success = false;
+			}
+		}
+	}
+  
+#ifdef DEBUG
+  if (success)
+	{
+	  for (VirtualRegisterManager::iterator i = vRegManager.begin(); !vRegManager.done(i); i = vRegManager.advance(i))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(i);
+		  switch (vReg.getClass())
+			{
+			case vrcInteger:
+			  if (vReg.getColor() > LAST_GREGISTER)
+				PR_ASSERT(false);
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+#if NUMBER_OF_FPREGISTERS != 0
+			  if (vReg.getColor() > LAST_FPREGISTER)
+				PR_ASSERT(false);
+#endif
+			  break;
+			default:
+			  break;
+			}
+		}
+	}
+#endif
+
+  vRegManager.nUsedStackSlots = lastUsedSSR + 1;
+  return success;
+}
+#endif // NEW_LAURENTM_CODE

mozilla/ef/Compiler/RegisterAllocator/Coloring.h

@@ -0,0 +1,284 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "VirtualRegister.h"
+#include "InterferenceGraph.h"
+#include "SparseSet.h"
+#include "Spilling.h"
+#include "Splits.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+template <class RegisterPressure>
+class Coloring
+{
+private:
+	static RegisterName* simplify(RegisterAllocator& registerAllocator, RegisterName* coloringStack);
+	static bool select(RegisterAllocator& registerAllocator, RegisterName* coloringStack, RegisterName* coloringStackPtr);
+
+public:
+	static bool color(RegisterAllocator& registerAllocator);
+	static void finalColoring(RegisterAllocator& registerAllocator);
+};
+
+
+template <class RegisterPressure>
+void Coloring<RegisterPressure>::finalColoring(RegisterAllocator& registerAllocator)
+{
+	RegisterName* color = registerAllocator.color;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					usePtr->setRegisterName(color[name2range[usePtr->getRegisterName()]]);
+#ifdef DEBUG
+					RegisterID rid = usePtr->getRegisterID();
+					setColoredRegister(rid);
+					usePtr->setRegisterID(rid);
+#endif // DEBUG
+				}
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					definePtr->setRegisterName(color[name2range[definePtr->getRegisterName()]]);
+#ifdef DEBUG
+					RegisterID rid = definePtr->getRegisterID();
+					setColoredRegister(rid);
+					definePtr->setRegisterID(rid);
+#endif // DEBUG
+				}
+		}
+	}
+}
+
+template <class RegisterPressure>
+bool Coloring<RegisterPressure>::select(RegisterAllocator& registerAllocator, RegisterName* coloringStack, RegisterName* coloringStackPtr)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* color = new RegisterName[rangeCount];
+	registerAllocator.color = color;
+
+	for (Uint32 r = 1; r < rangeCount; r++)
+		color[r] = RegisterName(6); // FIX;
+
+	// Color the preColored registers.
+	//
+	VirtualRegisterManager& vrManager = registerAllocator.vrManager;
+	RegisterName* name2range = registerAllocator.name2range;
+	PreColoredRegister* machineEnd = vrManager.getMachineRegistersEnd();
+	for (PreColoredRegister* machinePtr = vrManager.getMachineRegistersBegin(); machinePtr < machineEnd; machinePtr++)
+		if (machinePtr->id != invalidID) {
+			color[name2range[getName(machinePtr->id)]] = machinePtr->color;
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\twill preColor range %d as %d\n", name2range[getName(machinePtr->id)], machinePtr->color));
+		}
+
+	SpillCost* cost = registerAllocator.spillCost;
+	Pool& pool = registerAllocator.pool;
+	SparseSet& spill = *new(pool) SparseSet(pool, rangeCount);
+	registerAllocator.willSpill = &spill;
+	SparseSet neighborColors(pool, 6); // FIX
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+
+	bool coloringFailed = false;
+	while (coloringStackPtr > coloringStack) {
+		RegisterName range = *--coloringStackPtr;
+
+		if (!cost[range].infinite && cost[range].cost < 0) {
+			coloringFailed = true;
+			spill.set(range);
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tfailed to color %d, will spill.\n", range));
+		} else {
+			neighborColors.clear();
+
+			for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+				for (Int32 i = vector->count - 1; i >= 0; --i) {
+					RegisterName neighborColor = color[vector->neighbors[i]];
+					if (neighborColor < 6) // FIX
+						neighborColors.set(neighborColor);
+				}
+
+			if (neighborColors.getSize() == 6) { // FIX
+				coloringFailed = true;
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tfailed to color %d, ", range));
+
+				if (!Splits<RegisterPressure>::findSplit(registerAllocator, color, range)) {
+					UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("will spill.\n"));
+					spill.set(range);
+				} else
+					UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("will split.\n"));
+			} else {
+				for (Uint32 i = 0; i < 6; i++) // FIX
+					if (!neighborColors.test(i)) {
+						fprintf(stdout, "\twill color %d as %d\n", range, i);
+						color[range] = RegisterName(i);
+						break;
+					}
+			}
+		}
+	}
+
+#ifdef DEBUG_LOG
+	if (coloringFailed) {
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring failed:\n"));
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\twill spill: "));
+		spill.printPretty(UT_LOG_MODULE(RegAlloc));
+	} else {
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring succeeded:\n"));
+		for (Uint32 i = 1; i < rangeCount; i++)
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\trange %d colored as %d\n", i, color[i]));
+	}
+#endif
+
+	return !coloringFailed;
+}
+
+template <class RegisterPressure>
+RegisterName* Coloring<RegisterPressure>::simplify(RegisterAllocator& registerAllocator, RegisterName* coloringStack)
+{
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+	SpillCost* spillCost = registerAllocator.spillCost;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+
+	Uint32* degree = new Uint32[rangeCount];
+	for (RegisterName i = RegisterName(1); i < rangeCount; i = RegisterName(i + 1)) {
+		InterferenceVector* vector = iGraph.getInterferenceVector(i);
+		degree[i] = (vector != NULL) ? vector->count : 0;
+	}
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet low(pool, rangeCount);
+	SparseSet high(pool, rangeCount);
+	SparseSet highInfinite(pool, rangeCount);
+	SparseSet preColored(pool, rangeCount);
+
+	// Get the precolored registers.
+	//
+	VirtualRegisterManager& vrManager = registerAllocator.vrManager;
+	RegisterName* name2range = registerAllocator.name2range;
+	PreColoredRegister* machineEnd = vrManager.getMachineRegistersEnd();
+	for (PreColoredRegister* machinePtr = vrManager.getMachineRegistersBegin(); machinePtr < machineEnd; machinePtr++)
+		if (machinePtr->id != invalidID)
+			preColored.set(name2range[getName(machinePtr->id)]);
+
+	// Insert the live ranges in the sets.
+	//
+	for (Uint32 range = 1; range < rangeCount; range++)
+		if (!preColored.test(range))
+			if (degree[range] < 6) // FIX
+				low.set(range);
+			else if (!spillCost[range].infinite)
+				high.set(range);
+			else
+				highInfinite.set(range);
+
+#ifdef DEBUG_LOG
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring sets:\n\tlow = "));
+	low.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\thigh = "));
+	high.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\thighInfinite = "));
+	highInfinite.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tpreColored = "));
+	preColored.printPretty(UT_LOG_MODULE(RegAlloc));
+#endif // DEBUG_LOG
+
+	RegisterName* coloringStackPtr = coloringStack;
+
+	while (low.getSize() != 0 || high.getSize() != 0) {
+		while (low.getSize() != 0) {
+			RegisterName range = RegisterName(low.getOne());
+			low.clear(range);
+			*coloringStackPtr++ = range;
+
+			for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+				for (Int32 i = (vector->count - 1); i >= 0; --i) {
+					RegisterName neighbor = vector->neighbors[i];
+					degree[neighbor]--;
+
+					if (degree[neighbor] < 6) // FIX
+						if (high.test(neighbor)) {
+							high.clear(neighbor);
+							low.set(neighbor);
+						} else if (highInfinite.test(neighbor)) {
+							highInfinite.clear(neighbor);
+							low.set(neighbor);
+						}
+				}
+		}
+
+		if (high.getSize() != 0) {
+			RegisterName best = RegisterName(high.getOne());
+			double bestCost = spillCost[best].cost;
+			double bestDegree = degree[best];
+
+			// Choose the next best candidate.
+			//
+			for (SparseSet::iterator i = high.begin(); !high.done(i); i = high.advance(i)) {
+				RegisterName range = RegisterName(high.get(i));
+				double thisCost = spillCost[range].cost;
+				double thisDegree = degree[range];
+
+				if (thisCost * bestDegree < bestCost * thisDegree) {
+					best = range;
+					bestCost = thisCost;
+					bestDegree = thisDegree;
+				}
+			}
+			
+			high.clear(best);
+			low.set(best);
+		}
+ 	}
+	assert(highInfinite.getSize() == 0);
+
+	delete degree;
+
+#ifdef DEBUG_LOG
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring stack:\n\t"));
+	for (RegisterName* sp = coloringStack; sp < coloringStackPtr; ++sp)
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("%d ", *sp));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\n"));
+#endif // DEBUG_LOG
+
+	return coloringStackPtr;
+}
+
+
+template <class RegisterPressure>
+bool Coloring<RegisterPressure>::color(RegisterAllocator& registerAllocator)
+{
+	RegisterName* coloringStack = new RegisterName[registerAllocator.rangeCount];
+	return select(registerAllocator, coloringStack, simplify(registerAllocator, coloringStack));
+}

mozilla/ef/Compiler/RegisterAllocator/DominatorGraph.cpp

@@ -0,0 +1,212 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+
+#include "DominatorGraph.h"
+
+DominatorGraph::DominatorGraph(ControlGraph& controlGraph) : controlGraph(controlGraph)
+{
+	Uint32 nNodes = controlGraph.nNodes;
+
+	GtoV = new Uint32[nNodes + 1];
+	VtoG = new Uint32[nNodes + 1];
+
+	Uint32 v = 1;
+	for (Uint32 n = 0; n < nNodes; n++) {
+		VtoG[v] = n;
+		GtoV[n] = v++;
+	}
+
+	// Initialize all the 1-based arrays.
+	//
+	parent =	new Uint32[v];
+	semi =		new Uint32[v];
+	vertex =	new Uint32[v];
+	label =		new Uint32[v];
+	size =		new Uint32[v];
+	ancestor =	new Uint32[v];
+	child =		new Uint32[v];
+	dom =		new Uint32[v];
+	bucket =	new DGLinkedList*[v];
+
+	memset(semi, '\0', v * sizeof(Uint32));
+	memset(bucket, '\0', v * sizeof(DGLinkedList*));
+
+	vCount = v;
+
+	build();
+
+	delete parent;
+	delete semi;
+	delete vertex;
+	delete label;
+	delete size;
+	delete ancestor;
+	delete child;
+	delete dom;
+	delete bucket;
+}
+
+Uint32 DominatorGraph::DFS(Uint32 vx, Uint32 n)
+{
+	semi[vx] = ++n;
+	vertex[n] = label[vx] = vx;
+	ancestor[vx] = child[vx] = 0;
+	size[vx] = 1;
+
+
+	ControlNode& node = *controlGraph.dfsList[VtoG[vx]];
+	ControlEdge* successorEnd = node.getSuccessorsEnd();
+	for (ControlEdge* successorPtr = node.getSuccessorsBegin(); successorPtr < successorEnd; successorPtr++) {
+		Uint32 w = GtoV[successorPtr->getTarget().dfsNum];
+		if (semi[w] == 0) {
+			parent[w] = vx;
+			n = DFS(w, n);
+		}
+	}
+	return n;
+}
+
+void DominatorGraph::LINK(Uint32 vx, Uint32 w)
+{
+    Uint32 s = w;
+
+	while (semi[label[w]] < semi[label[child[s]]]) {
+		if (size[s] + size[child[child[s]]] >= (size[child[s]] << 1)) {
+			ancestor[child[s]] = s;
+			child[s] = child[child[s]];
+		} else {
+			size[child[s]] = size[s];
+			s = ancestor[s] = child[s];
+		}
+	}
+	label[s] = label[w];
+	size[vx] += size[w];
+	if(size[vx] < (size[w] << 1)) {
+		Uint32 t = s;
+		s = child[vx]; 
+		child[vx] = t;
+	}
+	while( s != 0 ) {
+		ancestor[s] = vx;
+		s = child[s];
+	}
+}
+
+
+void DominatorGraph::COMPRESS(Uint32 vx)
+{
+	if(ancestor[ancestor[vx]] != 0) {
+		COMPRESS(ancestor[vx]);
+		if(semi[label[ancestor[vx]]] < semi[label[vx]])
+			label[vx] = label[ancestor[vx]];
+		ancestor[vx] = ancestor[ancestor[vx]];
+	}
+}
+
+Uint32 DominatorGraph::EVAL(Uint32 vx)
+{
+	if(ancestor[vx] == 0) 
+		return label[vx];
+	COMPRESS(vx);
+	return (semi[label[ancestor[vx]]] >= semi[label[vx]]) ? label[vx] : label[ancestor[vx]];
+}
+
+void DominatorGraph::build()
+{
+	Uint32 n = DFS(GtoV[0], 0);
+	size[0] = label[0] = semi[0];
+
+	for (Uint32 i = n; i >= 2; i--) {
+		Uint32 w = vertex[i];
+
+		ControlNode& node = *controlGraph.dfsList[VtoG[w]];
+		const DoublyLinkedList<ControlEdge>& predecessors = node.getPredecessors();
+		for (DoublyLinkedList<ControlEdge>::iterator p = predecessors.begin(); !predecessors.done(p); p = predecessors.advance(p)) {
+			Uint32 vx = GtoV[predecessors.get(p).getSource().dfsNum];
+			Uint32 u = EVAL(vx);
+
+			if(semi[u] < semi[w])
+				semi[w] = semi[u];
+		}
+
+		DGLinkedList* elem = new DGLinkedList();
+		elem->next = bucket[vertex[semi[w]]];
+		elem->index = w;
+		bucket[vertex[semi[w]]] = elem;
+
+		LINK(parent[w], w);
+
+		elem = bucket[parent[w]];
+		while(elem != NULL) {
+			Uint32 vx = elem->index;
+			Uint32 u = EVAL(vx);
+			dom[vx] = (semi[u] < semi[vx]) ? u : parent[w];
+			elem = elem->next;
+		}
+	}
+
+	memset(size, '\0', n * sizeof(Uint32));
+	Pool& pool = controlGraph.pool;
+	nodes = new(pool) DGNode[n];
+
+	for(Uint32 j = 2; j <= n; j++) {
+		Uint32 w = vertex[j];
+		Uint32 d = dom[w];
+		if(d != vertex[semi[w]]) {
+			d = dom[d];
+			dom[w] = d;
+		}
+		size[d]++;
+	}
+	dom[GtoV[0]] = 0;
+
+	for (Uint32 k = 1; k <= n; k++) {
+		DGNode& node = nodes[VtoG[k]];
+		Uint32 count = size[k];
+		node.successorsEnd = node.successorsBegin = (count) ? new(pool) Uint32[count] : (Uint32*) 0;
+	}
+
+	for (Uint32 l = 2; l <= n; l++)
+		*(nodes[VtoG[dom[l]]].successorsEnd)++ = VtoG[l];
+}
+
+#ifdef DEBUG_LOG
+void DominatorGraph::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Dominator Graph:\n"));
+	Uint32 nNodes = controlGraph.nNodes;
+	for (Uint32 i = 0; i < nNodes; i++) {
+		DGNode& node = nodes[i];
+		if (node.successorsBegin !=  node.successorsEnd) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tN%d dominates ", i));
+			for (Uint32* successorsPtr = node.successorsBegin; successorsPtr < node.successorsEnd; successorsPtr++)
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("N%d ", *successorsPtr));
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+		}
+	}
+}
+
+#endif // DEBUG_LOG
+
+
+

mozilla/ef/Compiler/RegisterAllocator/DominatorGraph.h

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _DOMINATOR_GRAPH_H_
+#define _DOMINATOR_GRAPH_H_
+
+#include "LogModule.h"
+
+class ControlGraph;
+
+struct DGNode
+{
+	Uint32* successorsBegin;
+	Uint32* successorsEnd;
+};
+
+struct DGLinkedList
+{
+	DGLinkedList* next;
+	Uint32 index;
+};
+
+class DominatorGraph
+{
+private:
+
+	ControlGraph&	controlGraph;
+
+	Uint32			vCount;
+
+	Uint32*			VtoG;
+	Uint32*			GtoV;
+	Uint32*			parent;
+	Uint32*			semi;
+	Uint32*			vertex;
+	Uint32*			label;
+	Uint32*			size;
+	Uint32*			ancestor;
+	Uint32*			child;
+	Uint32*			dom;
+	DGLinkedList**	bucket;
+	DGNode*			nodes;
+	
+private:
+
+	void build();
+
+	Uint32 DFS(Uint32 vx, Uint32 n);
+	void LINK(Uint32 vx, Uint32 w);
+	void COMPRESS(Uint32 vx);
+	Uint32 EVAL(Uint32 vx);
+
+public:
+
+	DominatorGraph(ControlGraph& controlGraph);
+
+	Uint32* getSuccessorsBegin(Uint32 n) const {return nodes[n].successorsBegin;}
+	Uint32* getSuccessorsEnd(Uint32 n) const {return nodes[n].successorsEnd;}
+
+#ifdef DEBUG_LOG
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+#endif // _DOMINATOR_GRAPH_H_

mozilla/ef/Compiler/RegisterAllocator/HashSet.cpp

@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "HashSet.h"

mozilla/ef/Compiler/RegisterAllocator/HashSet.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _HASH_SET_H_
+#define _HASH_SET_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include <string.h>
+
+struct HashSetElement
+{
+	Uint32 index;
+	HashSetElement* next;
+};
+
+class HashSet
+{
+private:
+
+	static const hashSize = 64;
+
+	// Return the hash code for the given element index.
+	static Uint32 getHashCode(Uint32 index) {return index & (hashSize - 1);} // Could be better !
+
+private:
+
+	Pool&					allocationPool;
+	HashSetElement**		bucket;
+	HashSetElement*			free;
+
+private:
+
+	// No copy constructor.
+	HashSet(const HashSet&);
+	// No copy operator.
+	void operator = (const HashSet&);
+
+public:
+
+	// Create a new HashSet.
+	inline HashSet(Pool& pool, Uint32 universeSize);
+
+	// Clear the hashset.
+	void clear();
+	// Clear the element for the given index.
+	void clear(Uint32 index);
+	// Set the element for the given index.
+	void set(Uint32 index);
+	// Return true if the element at index is a member.
+	bool test(Uint32 index) const;
+	// Union with the given hashset.
+	inline void or(const HashSet& set);
+	// Intersection with the given hashset.
+	inline void and(const HashSet& set);
+	// Difference with the given hashset.
+	inline void difference(const HashSet& set);
+
+	// Logical operators.
+	HashSet& operator |= (const HashSet& set) {or(set); return *this;}
+	HashSet& operator &= (const HashSet& set) {and(set); return *this;}
+	HashSet& operator -= (const HashSet& set) {difference(set); return *this;}
+
+	// Iterator to conform with the set API.
+	typedef HashSetElement* iterator;
+	// Return the iterator for the first element of this set.
+	iterator begin() const;
+	// Return the next iterator.
+	iterator advance(iterator pos) const;
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos == NULL;}
+};
+
+
+inline HashSet::HashSet(Pool& pool, Uint32 /*universeSize*/)
+	: allocationPool(pool), free(NULL)
+{
+	bucket = new(pool) HashSetElement*[hashSize];
+	memset(bucket, '\0', sizeof(HashSetElement*));
+}
+
+#endif // _HASH_SET_H_

mozilla/ef/Compiler/RegisterAllocator/IndexedPool.h

@@ -0,0 +1,213 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _INDEXED_POOL_H_
+#define _INDEXED_POOL_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include <stdlib.h>
+
+//------------------------------------------------------------------------------
+// IndexedPool<IndexedObjectSubclass> is an indexed pool of objects. The
+// template parameter 'IndexedObjectSubclass' must be a subclass of the struct
+// IndexedObject.
+// 
+// When the indexed pool is ask to allocate and initialize a new object (using
+// the operator new(anIndexedPool) it will zero the memory used to store the
+// object and initialize the field 'index' of this object to its position in
+// the pool.
+//
+// An object allocated by the indexed pool can be freed by calling the method
+// IndexedPool::release(IndexedElement& objectIndex).
+//
+// example:
+//
+//   IndexedPool<IndexedElement> elementPool;
+//
+//   IndexedElement& element1 = *new(elementPool) IndexedElement();
+//   IndexedElement& element2 = *new(elementPool) IndexedElement();
+//
+//   indexedPool.release(element1);
+//   IndexedElement& element3 = *new(elementPool) IndexedElement();
+//
+//  At this point element1 is no longer a valid object, element2 is at
+//  index 2 and element3 is at index 1.
+//
+
+//------------------------------------------------------------------------------
+// IndexedObject -
+//
+
+template<class Object>
+struct IndexedObject
+{
+	Uint32			index;				// Index in the pool.
+	Object*			next;				// Used to link IndexedObject together.
+
+	Uint32 getIndex() {return index;}
+};
+
+//------------------------------------------------------------------------------
+// IndexedPool<IndexedObject> -
+//
+
+template <class IndexedObject>
+class IndexedPool
+{
+private:
+
+	static const	blockSize = 4;		// Size of one block.
+
+	Uint32			nBlocks;			// Number of blocks in the pool.
+	IndexedObject**	block;				// Array of block pointers.
+	IndexedObject*  freeObjects;		// Chained list of free IndexedObjects.
+	Uint32			nextIndex;			// Index of the next free object in the last block. 
+
+private:
+
+	void allocateAnotherBlock();
+	IndexedObject& newObject();
+
+public:
+
+	IndexedPool() : nBlocks(0), block(NULL), freeObjects(NULL), nextIndex(1) {}
+	~IndexedPool();
+
+	IndexedObject& get(Uint32 index) const;
+	void release(IndexedObject& object);
+
+	void setSize(Uint32 size) {assert(size < nextIndex); nextIndex = size;}
+
+	// Return the universe size.
+	Uint32 getSize() {return nextIndex;}
+
+	friend void* operator new(size_t, IndexedPool<IndexedObject>& pool); // Needs to call newObject().
+};
+
+// Free all the memory allocated for this object.
+//
+template <class IndexedObject>
+IndexedPool<IndexedObject>::~IndexedPool()
+{
+	for (Uint32 n = 0; n < nBlocks; n++)
+		free(&((IndexedObject **) &block[n][n*blockSize])[-(n + 1)]);
+}
+
+// Release the given. This object will be iserted in the chained
+// list of free IndexedObjects. To minimize the fragmentation the chained list 
+// is ordered by ascending indexes.
+//
+template <class IndexedObject>
+void IndexedPool<IndexedObject>::release(IndexedObject& object)
+{
+	Uint32 index = object.index;
+	IndexedObject* list = freeObjects;
+
+	assert(&object == &get(index)); // Make sure that object is owned by this pool.
+
+	if (list == NULL) { // The list is empty.
+		freeObjects = &object;
+		object.next = NULL;
+	} else { // The list contains at least 1 element.
+		if (index < list->index) { // insert as first element.
+			freeObjects = &object;
+			object.next = list;
+		} else { // Find this object's place.
+			while ((list->next) != NULL && (list->next->index < index))
+				list = list->next;
+
+			object.next = list->next;
+			list->next = &object;
+		}
+	}
+
+#ifdef DEBUG
+	// Sanity check to be sure that the list is correctly ordered.
+	for (IndexedObject* obj = freeObjects; obj != NULL; obj = obj->next)
+		if (obj->next != NULL)
+			assert(obj->index < obj->next->index);
+#endif
+}
+
+// Create a new block of IndexedObjects. We will allocate the memory to
+// store IndexedPool::blockSize IndexedObject and the new Array of block
+// pointers.
+// The newly created IndexedObjects will not be initialized.
+//
+template <class IndexedObject>
+void IndexedPool<IndexedObject>::allocateAnotherBlock()
+{
+	void* memory = (void *) malloc((nBlocks + 1) * sizeof(Uint32) + blockSize * sizeof(IndexedObject));
+
+	memcpy(memory, block, nBlocks * sizeof(Uint32));
+
+	block = (IndexedObject **) memory;
+	IndexedObject* objects = (IndexedObject *) &block[nBlocks + 1];
+
+	block[nBlocks] = &objects[-(nBlocks * blockSize)];
+	nBlocks++;
+}
+
+// Return the IndexedObject at the position 'index' in the pool.
+//
+template <class IndexedObject>
+IndexedObject& IndexedPool<IndexedObject>::get(Uint32 index) const
+{
+	Uint32 blockIndex = index / blockSize;
+	assert(blockIndex < nBlocks);
+
+	return block[blockIndex][index];
+}
+
+// Return the reference of an unused object in the pool.
+//
+template <class IndexedObject>
+IndexedObject& IndexedPool<IndexedObject>::newObject()
+{
+	if (freeObjects != NULL) {
+		IndexedObject& newObject = *freeObjects;
+		freeObjects = newObject.next;
+		return newObject;
+	}
+	
+	Uint32 nextIndex = this->nextIndex++;
+	Uint32 blockIndex = nextIndex / blockSize;
+
+	while (blockIndex >= nBlocks)
+		allocateAnotherBlock();
+	
+	IndexedObject& newObject = block[blockIndex][nextIndex];
+	newObject.index = nextIndex;
+
+	return newObject;
+}
+
+// Return the address of the next unsused object in the given
+// indexed pool. The field index of the newly allocated object
+// will be initialized to the corresponding index of this object
+// in the pool.
+//
+template <class IndexedObject>
+void* operator new(size_t size, IndexedPool<IndexedObject>& pool)
+{
+	assert(size == sizeof(IndexedObject));
+	return (void *) &pool.newObject();
+}
+
+#endif // _INDEXED_POOL_H_

mozilla/ef/Compiler/RegisterAllocator/InterferenceGraph.h

@@ -0,0 +1,258 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _INTERFERENCE_GRAPH_H_
+#define _INTERFERENCE_GRAPH_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "Primitives.h"
+#include "Instruction.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h"
+#include "SparseSet.h"
+#include <string.h>
+
+struct InterferenceVector
+{
+	Uint32				count;
+	InterferenceVector*	next;
+	RegisterName*		neighbors;
+
+	InterferenceVector() : count(0), next(NULL) {}
+};
+
+class RegisterAllocator;
+
+template <class RegisterPressure>
+class InterferenceGraph
+{
+private:
+
+	RegisterAllocator&			registerAllocator;
+
+	RegisterPressure::Set*		interferences;
+	InterferenceVector**		vector;
+	Uint32*						offset;
+	Uint32 						rangeCount;
+
+private:
+
+	// No copy constructor.
+	InterferenceGraph(const InterferenceGraph&);
+	// No copy operator.
+	void operator = (const InterferenceGraph&);
+
+	// Check if reg is a member of the universe.
+	void checkMember(RegisterName name) {assert(name < rangeCount);}
+	// Return the edge index for the interference between name1 and name2.
+	Uint32 getEdgeIndex(RegisterName name1, RegisterName name2);
+
+public:
+	InterferenceGraph(RegisterAllocator& registerAllocator) : registerAllocator(registerAllocator) {}
+
+	// Calculate the interferences.
+	void build();
+	// Return true if reg1 and reg2 interfere.
+	bool interfere(RegisterName name1, RegisterName name2);
+	// Return the interference vector for the given register or NULL if there is none.
+	InterferenceVector* getInterferenceVector(RegisterName name) {return vector[name];}
+	// Set the interference between name1 and name2.
+	void setInterference(RegisterName name1, RegisterName name2);
+	// Set the interference vector for the given register.
+	void setInterferenceVector(RegisterName name, InterferenceVector* v) {vector[name] = v;}
+
+
+#ifdef DEBUG_LOG
+	// Print the interferences.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::build()
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	this->rangeCount = rangeCount;
+
+	// Initialize the structures.
+	//
+	offset = new(pool) Uint32[rangeCount + 1];
+	vector = new(pool) InterferenceVector*[rangeCount];
+	memset(vector, '\0', sizeof(InterferenceVector*) * rangeCount);
+
+	Uint32 o = 0;
+	offset[0] = 0;
+	for (Uint32 i = 1; i <= rangeCount; ++i) {
+		offset[i] = o;
+		o += i;
+	}
+	
+	interferences = new(pool) RegisterPressure::Set(pool, (rangeCount * rangeCount) / 2);
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	RegisterName* name2range = registerAllocator.name2range;
+	LivenessInfo<RegisterPressure> liveness = Liveness<RegisterPressure>::analysis(controlGraph, rangeCount, name2range);
+	registerAllocator.liveness = liveness;
+	SparseSet currentLive(pool, rangeCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		currentLive = liveness.liveOut[n];
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			// Handle the copy instruction to avoid unnecessary interference between the 2 registers.
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				currentLive.clear(name2range[useBegin[0].getRegisterName()]);
+			}
+
+			// Create the interferences.
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					RegisterName define = name2range[definePtr->getRegisterName()];
+
+					for (SparseSet::iterator e = currentLive.begin(); !currentLive.done(e); e = currentLive.advance(e)) {
+						RegisterName live = RegisterName(currentLive.get(e));
+
+						if ((live != define) && !interfere(live, define) && registerAllocator.canInterfere(live, define)) {
+
+							if (vector[define] == NULL)
+								vector[define] = new(pool) InterferenceVector();
+							vector[define]->count++;
+
+							if (vector[live] == NULL)
+								vector[live] = new(pool) InterferenceVector();
+							vector[live]->count++;
+
+							setInterference(live, define);
+						}
+					}
+				}
+
+			// Now update the liveness.
+			//
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					currentLive.set(name2range[usePtr->getRegisterName()]);
+		}
+	}
+
+	// Allocate the memory to store the interferences.
+	//
+	for (Uint32 e = 0; e < rangeCount; e++)
+		if (vector[e] != NULL) {
+			InterferenceVector& v = *vector[e];
+			v.neighbors = new(pool) RegisterName[v.count];
+			v.count = 0;
+		}
+
+	// Initialize the edges.
+	//
+	if (RegisterPressure::Set::isOrdered()) {
+		RegisterName name1 = RegisterName(0);
+
+		for (RegisterPressure::Set::iterator i = interferences->begin(); !interferences->done(i); i = interferences->advance(i)) {
+			Uint32 interferenceIndex = interferences->get(i);
+
+			while(interferenceIndex >= offset[name1 + 1])
+				name1 = RegisterName(name1 + 1);
+
+			assert((interferenceIndex >= offset[name1]) && (interferenceIndex < offset[name1 + 1]));
+
+			RegisterName name2 = RegisterName(interferenceIndex - offset[name1]);
+
+			assert(interfere(name1, name2));
+
+			InterferenceVector& vector1 = *vector[name1];
+			vector1.neighbors[vector1.count++] = name2;
+		
+			InterferenceVector& vector2 = *vector[name2];
+			vector2.neighbors[vector2.count++] = name1;
+		}
+	} else {
+		trespass("not Implemented"); // FIX: need one more pass to initialize the vectors.
+	}
+}
+
+template <class RegisterPressure>
+Uint32 InterferenceGraph<RegisterPressure>::getEdgeIndex(RegisterName name1, RegisterName name2)
+{
+	checkMember(name1); checkMember(name2);
+	assert(name1 != name2); // This is not possible.
+	return (name1 < name2) ? offset[name2] + name1 : offset[name1] + name2;
+}
+
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::setInterference(RegisterName name1, RegisterName name2)
+{
+	interferences->set(getEdgeIndex(name1, name2));
+}
+
+template <class RegisterPressure>
+bool InterferenceGraph<RegisterPressure>::interfere(RegisterName name1, RegisterName name2)
+{
+	return interferences->test(getEdgeIndex(name1, name2));
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Interference Vectors:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		if (vector[i] != NULL) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tvr%d: (", i));
+			for (InterferenceVector* v = vector[i]; v != NULL; v = v->next)
+				for (Uint32 j = 0; j < v->count; j++) {
+					UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%d", v->neighbors[j]));
+					if (v->next != NULL || j != (v->count - 1))
+						UT_OBJECTLOG(log, PR_LOG_ALWAYS, (","));
+				}
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (")\n"));
+		}
+	}
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Interference Matrix:\n"));
+	for (RegisterName name1 = RegisterName(1); name1 < rangeCount; name1 = RegisterName(name1 + 1)) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\t%d:\t", name1));
+		for (RegisterName name2 = RegisterName(1); name2 < rangeCount; name2 = RegisterName(name2 + 1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%c", ((name1 != name2) && interfere(name1, name2)) ? '1' : '0'));
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _INTERFERENCE_GRAPH_H_

mozilla/ef/Compiler/RegisterAllocator/LiveRange.h

@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _LIVE_RANGE_H_
+#define _LIVE_RANGE_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Primitives.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+template <class RegisterPressure>
+struct LiveRange
+{
+	static void build(RegisterAllocator& registerAllocator);
+};
+
+template <class RegisterPressure>
+void LiveRange<RegisterPressure>::build(RegisterAllocator& registerAllocator)
+{
+	// Intialize the lookup table.
+	//
+	Uint32 nameCount = registerAllocator.nameCount;
+	RegisterName* nameTable = new(registerAllocator.pool) RegisterName[2*nameCount];
+	RegisterName* rangeName = &nameTable[nameCount];
+
+	init(rangeName, nameCount);
+
+	// Walk the graph.
+	//
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	SparseSet destination(registerAllocator.pool, nameCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+
+		destination.clear();
+		for (InstructionList::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+			Instruction& phiNode = phiNodes.get(i);
+			assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+			destination.set(findRoot(phiNode.getInstructionDefineBegin()[0].getRegisterName(), rangeName));
+		}
+
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& phiNode = phiNodes.get(p);
+
+			assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+			RegisterName destinationName = phiNode.getInstructionDefineBegin()[0].getRegisterName();
+			RegisterName destinationRoot = findRoot(destinationName, rangeName);
+
+			InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+			for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++) {
+				assert(usePtr->isRegister());
+				RegisterName sourceName = usePtr->getRegisterName();
+				RegisterName sourceRoot = findRoot(sourceName, rangeName);
+
+				if (sourceRoot != destinationRoot && !destination.test(sourceRoot))
+					rangeName[sourceRoot] = destinationRoot;
+			}
+		}
+	}
+
+	registerAllocator.rangeCount = compress(registerAllocator.name2range, rangeName, nameCount, nameCount);
+}
+
+#endif // _LIVE_RANGE_H_

mozilla/ef/Compiler/RegisterAllocator/LiveRangeGraph.h

@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _LIVE_RANGE_GRAPH_
+#define _LIVE_RANGE_GRAPH_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterTypes.h"
+
+class RegisterAllocator;
+
+template <class RegisterPressure>
+class LiveRangeGraph
+{
+private:
+
+	RegisterAllocator&		registerAllocator;
+
+	RegisterPressure::Set*	edges;
+	Uint32					rangeCount;
+
+public:
+	//
+	//
+	LiveRangeGraph(RegisterAllocator& registerAllocator) : registerAllocator(registerAllocator) {}
+
+	//
+	//
+	void build();
+
+	//
+	//
+	void addEdge(RegisterName name1, RegisterName name2);
+
+	//
+	//
+	bool haveEdge(RegisterName name1, RegisterName name2);
+
+#ifdef DEBUG_LOG
+	//
+	//
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::build()
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	this->rangeCount = rangeCount;
+
+	edges = new(pool) RegisterPressure::Set(pool, rangeCount * rangeCount);
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	RegisterName* name2range = registerAllocator.name2range;
+	LivenessInfo<RegisterPressure>& liveness = registerAllocator.liveness;
+	SparseSet currentLive(pool, rangeCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		currentLive = liveness.liveOut[n];
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				currentLive.clear(name2range[useBegin[0].getRegisterName()]);
+			}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					RegisterName define = name2range[definePtr->getRegisterName()];
+
+					for (SparseSet::iterator l = currentLive.begin(); !currentLive.done(l); l = currentLive.advance(l)) {
+						RegisterName live = RegisterName(currentLive.get(l));
+						if (define != live && registerAllocator.canInterfere(define, live))
+							addEdge(define, live);
+					}
+				}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					currentLive.set(name2range[usePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName use = name2range[usePtr->getRegisterName()];
+
+					for (SparseSet::iterator l = currentLive.begin(); !currentLive.done(l); l = currentLive.advance(l)) {
+						RegisterName live = RegisterName(currentLive.get(l));
+						if (use != live && registerAllocator.canInterfere(use, live))
+							addEdge(use, live);
+					}
+				}
+		}
+	}
+}
+
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::addEdge(RegisterName name1, RegisterName name2)
+{
+	assert(name1 != name2);
+	edges->set(name1 * rangeCount + name2);
+}
+
+template <class RegisterPressure>
+bool LiveRangeGraph<RegisterPressure>::haveEdge(RegisterName name1, RegisterName name2)
+{
+	assert(name1 != name2);
+	return edges->test(name1 * rangeCount + name2);
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Live ranges graph:\n"));
+	for (RegisterName name1 = RegisterName(1); name1 < rangeCount; name1 = RegisterName(name1 + 1)) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\t%d:\t", name1));
+		for (RegisterName name2 = RegisterName(1); name2 < rangeCount; name2 = RegisterName(name2 + 1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%c", ((name1 != name2) && haveEdge(name1, name2)) ? '1' : '0'));
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _LIVE_RANGE_GRAPH_

mozilla/ef/Compiler/RegisterAllocator/Liveness.cpp

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "Liveness.h"
+

mozilla/ef/Compiler/RegisterAllocator/Liveness.h

@@ -0,0 +1,301 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _LIVENESS_H_
+#define _LIVENESS_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterTypes.h"
+
+// ----------------------------------------------------------------------------
+// LivenessInfo -
+
+template <class RegisterPressure>
+struct LivenessInfo
+{
+	RegisterPressure::Set*	liveIn;
+	RegisterPressure::Set*	liveOut;
+	DEBUG_LOG_ONLY(Uint32	size);
+
+#ifdef DEBUG_LOG
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+// ----------------------------------------------------------------------------
+// Liveness
+//
+// The liveness is defined by the following data-flow equations:
+//
+//		LiveIn(n) = LocalLive(n) U (LiveOut(n) - Killed(n)).
+//		LiveOut(n) = U LiveIn(s) (s a successor of n).
+//
+//	where LocalLive(n) is the set of used registers in the block n, Killed(n)
+//  is the set of defined registers in the block n, LiveIn(n) is the set of
+//  live registers at the begining of the block n and LiveOut(n) is the set
+//  of live registers at the end of the block n.
+//
+//
+// We will compute the liveness analysis in two stages:
+//
+//	1- Build LocalLive(n) (wich is an approximation of LiveIn(n)) and Killed(n) 
+//     for each block n.
+//  2- Perform a backward data-flow analysis to propagate the liveness information
+//     through the entire control-flow graph.
+//
+
+template <class RegisterPressure>
+struct Liveness
+{
+	static LivenessInfo<RegisterPressure> analysis(ControlGraph& controlGraph, Uint32 rangeCount, const RegisterName* name2range);
+	static LivenessInfo<RegisterPressure> analysis(ControlGraph& controlGraph, Uint32 nameCount);
+};
+
+template <class RegisterPressure>
+LivenessInfo<RegisterPressure> Liveness<RegisterPressure>::analysis(ControlGraph& controlGraph, Uint32 rangeCount, const RegisterName* name2range)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Allocate the temporary sets.
+	RegisterPressure::Set* killed = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+	
+	// Allocate the globals sets.
+	RegisterPressure::Set* liveIn = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+	RegisterPressure::Set* liveOut = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+
+	// First stage of the liveness analysis: Compute the sets LocalLive(stored in LiveIn) and Killed.
+	//
+	for (Uint32 n = 0; n < (nNodes - 1); n++) {
+		ControlNode& node = *nodes[n];
+
+		RegisterPressure::Set& currentLocalLive = liveIn[n];
+		RegisterPressure::Set& currentKilled = killed[n];
+		
+		// Find the instructions contributions to the sets LocalLive and Killed.
+		//
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			// If a VirtualRegister is 'used' before being 'defined' then we add it to set LocalLive.
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					Uint32 index = name2range[usePtr->getRegisterName()];
+
+					if (!currentKilled.test(index))
+						currentLocalLive.set(index);
+				}
+
+			// If a Virtualregister is 'defined' then we add it to the set Killed.
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentKilled.set(name2range[definePtr->getRegisterName()]);
+		}
+	}
+
+	// Second stage of the liveness analysis: We propagate the LiveIn & LiveOut through the entire 
+	// control-flow graph.
+	//
+	RegisterPressure::Set temp(pool, rangeCount);
+
+	bool changed;
+	do {
+		changed = false;
+
+		// For all nodes is this graph except the endNode.
+		for (Int32 n = (nNodes - 2); n >= 0; n--) {
+			ControlNode& node = *nodes[n];
+
+			RegisterPressure::Set& currentLiveIn = liveIn[n];
+			RegisterPressure::Set& currentLiveOut = liveOut[n];
+
+			// Compute temp = Union of LiveIn(s) (s a successor of this node) | usedByPhiNodes(n).
+			// temp will be the new LiveOut(n).
+			Uint32 nSuccessors = node.nSuccessors();
+			if (nSuccessors != 0) {
+				temp = liveIn[node.nthSuccessor(0).getTarget().dfsNum];
+				for (Uint32 s = 1; s < nSuccessors; s++)
+					temp |= liveIn[node.nthSuccessor(s).getTarget().dfsNum];
+			} else 
+				temp.clear();
+
+			// If temp and LiveOut(n) differ then set LiveOut(n) = temp and recalculate the
+			// new LiveIn(n).
+			if (currentLiveOut != temp) {
+				currentLiveOut = temp;
+				temp -= killed[n]; // FIX: could be optimized with one call to unionDiff !
+				temp |= currentLiveIn;
+			
+				if (currentLiveIn != temp) {
+					currentLiveIn = temp;
+					changed = true;
+				}
+			}
+		}
+	} while(changed);
+
+	LivenessInfo<RegisterPressure> liveness;
+	liveness.liveIn = liveIn;
+	liveness.liveOut = liveOut;
+	DEBUG_LOG_ONLY(liveness.size = nNodes);
+	return liveness;
+}
+
+template <class RegisterPressure>
+LivenessInfo<RegisterPressure> Liveness<RegisterPressure>::analysis(ControlGraph& controlGraph, Uint32 nameCount)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Allocate the temporary sets.
+	RegisterPressure::Set* killed = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+	RegisterPressure::Set* usedByPhiNodes = NULL;
+	
+	// Allocate the globals sets.
+	RegisterPressure::Set* liveIn = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+	RegisterPressure::Set* liveOut = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+
+	// First stage of the liveness analysis: Compute the sets LocalLive(stored in LiveIn) and Killed.
+	//
+	for (Uint32 n = 0; n < (nNodes - 1); n++) {
+		ControlNode& node = *nodes[n];
+
+		RegisterPressure::Set& currentLocalLive = liveIn[n];
+		RegisterPressure::Set& currentKilled = killed[n];
+		
+		InstructionList& phiNodes = node.getPhiNodeInstructions();
+
+		if ((usedByPhiNodes == NULL) && !phiNodes.empty())
+			usedByPhiNodes = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& phiNode = phiNodes.get(p);
+
+			InstructionDefine& define = phiNode.getInstructionDefineBegin()[0];
+			currentKilled.set(define.getRegisterName());
+
+			typedef DoublyLinkedList<ControlEdge> ControlEdgeList;
+			const ControlEdgeList& predecessors = node.getPredecessors();
+			ControlEdgeList::iterator p = predecessors.begin();
+			InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+			for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++, p = predecessors.advance(p))
+				if (usePtr->isRegister())
+					usedByPhiNodes[predecessors.get(p).getSource().dfsNum].set(usePtr->getRegisterName());
+		}
+
+		// Find the instructions contributions to the sets LocalLive and Killed.
+		//
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			// If a VirtualRegister is 'used' before being 'defined' then we add it to set LocalLive.
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					Uint32 index = usePtr->getRegisterName();
+
+					if (!currentKilled.test(index))
+						currentLocalLive.set(index);
+				}
+
+			// If a Virtualregister is 'defined' then we add it to the set Killed.
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentKilled.set(definePtr->getRegisterName());
+		}
+	}
+
+	// Second stage of the liveness analysis: We propagate the LiveIn & LiveOut through the entire 
+	// control-flow graph.
+	//
+	RegisterPressure::Set temp(pool, nameCount);
+
+	bool changed;
+	do {
+		changed = false;
+
+		// For all nodes is this graph except the endNode.
+		for (Int32 n = (nNodes - 2); n >= 0; n--) {
+			ControlNode& node = *nodes[n];
+
+			RegisterPressure::Set& currentLiveIn = liveIn[n];
+			RegisterPressure::Set& currentLiveOut = liveOut[n];
+
+			// Compute temp = Union of LiveIn(s) (s a successor of this node) | usedByPhiNodes(n).
+			// temp will be the new LiveOut(n).
+			Uint32 nSuccessors = node.nSuccessors();
+			if (nSuccessors != 0) {
+				temp = liveIn[node.nthSuccessor(0).getTarget().dfsNum];
+				for (Uint32 s = 1; s < nSuccessors; s++)
+					temp |= liveIn[node.nthSuccessor(s).getTarget().dfsNum];
+			} else 
+				temp.clear();
+
+			// Insert the phiNodes contribution.
+			if (usedByPhiNodes != NULL)
+				temp |= usedByPhiNodes[n];
+
+			// If temp and LiveOut(n) differ then set LiveOut(n) = temp and recalculate the
+			// new LiveIn(n).
+			if (currentLiveOut != temp) {
+				currentLiveOut = temp;
+				temp -= killed[n]; // FIX: could be optimized with one call to unionDiff !
+				temp |= currentLiveIn;
+			
+				if (currentLiveIn != temp) {
+					currentLiveIn = temp;
+					changed = true;
+				}
+			}
+		}
+	} while(changed);
+
+	LivenessInfo<RegisterPressure> liveness;
+	liveness.liveIn = liveIn;
+	liveness.liveOut = liveOut;
+	DEBUG_LOG_ONLY(liveness.size = nNodes);
+	return liveness;
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void LivenessInfo<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	for (Uint32 n = 0; n < size; n++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Node N%d:\n\tliveIn = ", n));
+		liveIn[n].printPretty(log);
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tliveOut = "));
+		liveOut[n].printPretty(log);
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _LIVENESS_H_

mozilla/ef/Compiler/RegisterAllocator/Makefile

@@ -0,0 +1,40 @@
+#! gmake
+
+DEPTH			= ../..
+
+MODULE_NAME		= RegisterAllocator
+
+include $(DEPTH)/config/config.mk
+
+INCLUDES		+=										\
+	-I$(DEPTH)/Utilities/General						\
+	-I$(DEPTH)/Utilities/zlib							\
+	-I$(DEPTH)/Runtime/ClassReader						\
+	-I$(DEPTH)/Runtime/NativeMethods					\
+	-I$(DEPTH)/Runtime/System							\
+	-I$(DEPTH)/Runtime/ClassInfo						\
+	-I$(DEPTH)/Runtime/FileReader						\
+	-I$(DEPTH)/Compiler/PrimitiveGraph					\
+	-I$(DEPTH)/Compiler/FrontEnd						\
+	-I$(DEPTH)/Compiler/Optimizer						\
+	-I$(DEPTH)/Compiler/CodeGenerator					\
+	-I$(DEPTH)/Compiler/CodeGenerator/md				\
+	-I$(DEPTH)/Compiler/CodeGenerator/md/$(CPU_ARCH)	\
+	-I$(DEPTH)/Compiler/RegisterAllocator				\
+	-I$(DEPTH)/Driver/StandAloneJava					\
+	-I$(DEPTH)/Debugger									\
+	$(NULL)
+
+CXXSRCS 		=										\
+	RegisterAllocator.cpp								\
+	RegisterAllocatorTools.cpp							\
+	DominatorGraph.cpp									\
+	VirtualRegister.cpp									\
+	BitSet.cpp											\
+	SparseSet.cpp										\
+	$(NULL)
+
+
+include $(DEPTH)/config/rules.mk
+
+libs:: $(MODULE)

mozilla/ef/Compiler/RegisterAllocator/PhiNodeRemover.h

@@ -0,0 +1,392 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _PHI_NODE_REMOVER_H_
+#define _PHI_NODE_REMOVER_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "DominatorGraph.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h"
+#include "Liveness.h"
+#include "Instruction.h"
+#include "InstructionEmitter.h"
+#include "SparseSet.h"
+#include <string.h>
+
+//------------------------------------------------------------------------------
+// RegisterNameNode -
+
+struct RegisterNameNode 
+{
+	RegisterNameNode*	next;
+	RegisterName		newName;
+	Uint32				nextPushed;
+};
+
+//------------------------------------------------------------------------------
+// CopyData -
+
+struct CopyData
+{
+	RegisterName		source;
+	RegisterClassKind	classKind;
+	Uint32				useCount;
+	bool				isLiveOut;
+	RegisterName		sourceNameToUse;
+	RegisterName		temporaryName;
+	RegisterNameNode*	newName;
+};
+
+//------------------------------------------------------------------------------
+// PhiNodeRemover<RegisterPressure> -
+
+template <class RegisterPressure>
+struct PhiNodeRemover
+{
+	// Replace the phi nodes by copy instructions.
+	static void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+};
+
+// Split some of the critical edges and return true if there are still some
+// in the graph after that.
+//
+static bool splitCriticalEdges(ControlGraph& /*cg*/)
+{
+	// FIX: not implemented.
+	return true;
+}
+
+inline void pushName(Pool& pool, RegisterNameNode** stack, SparseSet& pushed, Uint32* nodeListPointer, RegisterName oldName, RegisterName newName)
+{
+	RegisterNameNode& newNode = *new(pool) RegisterNameNode();
+
+	if (pushed.test(oldName))
+		(*stack)->newName = newName;
+	else {
+		newNode.newName = newName;
+		newNode.nextPushed = *nodeListPointer;
+		*nodeListPointer = oldName;
+		newNode.next = *stack;
+		*stack = &newNode;
+		pushed.set(oldName);
+	}
+}
+
+template <class RegisterPressure>
+void PhiNodeRemover<RegisterPressure>::replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Initialize the local variables.
+	//
+
+	// When we insert the copies we will also need to create new VirtualRegisters for
+	// the insertion of temporaries. The maximum number of temporary register will not
+	// exceed the number of phiNodes in the primitive graph.
+	Uint32 nameCount = vrManager.getSize();
+	Uint32 maxNameCount = nameCount;
+	for (Uint32 n = 0; n < nNodes; n++)
+		maxNameCount += nodes[n]->getPhiNodes().length();
+
+	// If the CFG contains some critical edges (backward edge which source has more than one
+	// outgoing edge and destination has more than one incomimg edge) then we need the liveness
+	// information to be able to insert temporary copies.
+	RegisterPressure::Set* liveOut = NULL;
+	if (splitCriticalEdges(controlGraph))
+		liveOut = Liveness<LowRegisterPressure>::analysis(controlGraph, nameCount).liveOut;
+
+	DominatorGraph dGraph(controlGraph);
+
+	SparseSet pushed(pool, maxNameCount);
+	SparseSet destinationList(pool, maxNameCount);
+	SparseSet workList(pool, maxNameCount);
+
+	CopyData* copyStats = new(pool) CopyData[maxNameCount];
+	memset(copyStats, '\0', maxNameCount*sizeof(CopyData));
+
+	struct NodeStack {
+		Uint32* next;
+		Uint32* limit;
+		Uint32 pushedList;
+	};
+
+	// Allocate the node stack and initialize the node stack pointer.
+	NodeStack* nodeStack = new(pool) NodeStack[nNodes + 1];
+	NodeStack* nodeStackPtr = nodeStack;
+
+	// We start by the begin node. 
+	Uint32 startNode = 0;
+	Uint32* next = &startNode;
+	Uint32* limit = &startNode + 1;
+
+	while (true) {
+
+		if (next == limit) {
+			// If there are no more node in the sibling, we have to pop the current
+			// frame from the stack and update the copyStats of the pushed nodes.
+			//
+			if (nodeStackPtr == nodeStack)
+				// We are at the bottom of the stack and there are no more nodes
+				// to look at. We are done !
+				break;
+
+			--nodeStackPtr;
+			// We are done with all the children of this node in the dominator tree.
+			// We need to update the copy information of all the new names pushed
+			// during the walk over this node.
+			Uint32 pushedList = nodeStackPtr->pushedList;
+			while (pushedList != 0) {
+				Uint32 nextName = copyStats[pushedList].newName->nextPushed;
+				copyStats[pushedList].newName = copyStats[pushedList].newName->next;
+				pushedList = nextName;
+			}
+
+			// restore the previous frame.
+			next = nodeStackPtr->next;
+			limit = nodeStackPtr->limit;
+		} else {
+			Uint32 currentNode = *next++;
+			Uint32 pushedList = 0;
+
+
+			// Initialize the sets.
+			pushed.clear();
+			destinationList.clear();
+
+			// STEP1:
+			//  Walk the instruction list and to replace all the instruction uses with their new name. 
+			//  If the instruction is a phi node and its defined register is alive at the end of this 
+			//  block then we push the defined register into the stack.
+			//
+			ControlNode& node = *nodes[currentNode];
+			RegisterPressure::Set* currentLiveOut = (liveOut != NULL) ? &liveOut[currentNode] : (RegisterPressure::Set*) 0;
+
+			InstructionList& phiNodes = node.getPhiNodeInstructions();
+			for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+				Instruction& phiNode = phiNodes.get(p);
+
+				InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+				for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++) {
+					assert(usePtr->isRegister());
+					RegisterName name = usePtr->getRegisterName();
+
+					if (copyStats[name].newName != NULL && copyStats[name].newName->newName != name)
+						usePtr->setRegisterName(copyStats[name].newName->newName);
+				}
+
+				if (currentLiveOut != NULL) {
+					// This is a phi node and we have to push its defined name if it is live
+					// at the end of the node. We only need to do this if the CFG has critical edges.
+					assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+					RegisterName name = phiNode.getInstructionDefineBegin()[0].getRegisterName();
+
+					if (currentLiveOut->test(name))
+						pushName(pool, &(copyStats[name].newName), pushed, &pushedList, name, name);
+				}
+				
+			}
+
+			InstructionList& instructions = node.getInstructions();
+			for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+				Instruction& instruction = instructions.get(i);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+
+						if (copyStats[name].newName != NULL && copyStats[name].newName->newName != name)
+							usePtr->setRegisterName(copyStats[name].newName->newName);
+					}
+			}
+
+			// STEP2:
+			//  Look at this node's successors' phiNodes. We keep track of the number of time
+			//  a VR will be used by another copy instruction and insert each definition into the 
+			//  destinationList. This is the only pass over this node's successors as we will
+			//  get all the information we need in the CopyData structures.
+			//
+			ControlEdge* successorEdgeEnd = node.getSuccessorsEnd();
+			for (ControlEdge* successorEdgePtr = node.getSuccessorsBegin(); successorEdgePtr < successorEdgeEnd; successorEdgePtr++) {
+				Uint32 useIndex = successorEdgePtr->getIndex();
+				ControlNode& successor = successorEdgePtr->getTarget();
+
+				// Look at its phi nodes. The phi nodes are at the top of the instruction list. We exit
+				// as soon as we find an instruction which is not a phi node
+				InstructionList& phiNodes = successor.getPhiNodeInstructions();
+				for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+					Instruction& phiNode = phiNodes.get(p);
+					
+					assert((phiNode.getInstructionUseBegin() + useIndex) < phiNode.getInstructionUseEnd());
+					assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd());
+
+					InstructionUse& source = phiNode.getInstructionUseBegin()[useIndex];
+					InstructionDefine& destination = phiNode.getInstructionDefineBegin()[0];
+
+					assert(source.isRegister() && destination.isRegister());
+
+					RegisterName sourceName = source.getRegisterName();
+					RegisterName destinationName = destination.getRegisterName();
+
+					// Get the correct name for the source.
+					if (copyStats[sourceName].newName != NULL)
+						sourceName = copyStats[sourceName].newName->newName;
+
+					// Update the CopyData structures.
+					if ((sourceName != rnInvalid) && (sourceName != destinationName)) {
+						copyStats[destinationName].source = sourceName;
+						copyStats[destinationName].classKind = destination.getRegisterClass();
+						copyStats[destinationName].isLiveOut = (currentLiveOut != NULL) ? currentLiveOut->test(destinationName) : false;
+						copyStats[destinationName].sourceNameToUse = destinationName;
+						copyStats[sourceName].sourceNameToUse = sourceName;
+						copyStats[sourceName].useCount++;
+						destinationList.set(destinationName);
+					}
+				}
+			}
+
+			// STEP3:
+			//  Insert into the worklist only the destination registers that will be not used in 
+			//  another copy instruction in this block.
+			//
+			assert(workList.getSize() == 0);
+			for (SparseSet::iterator d = destinationList.begin(); !destinationList.done(d); d = destinationList.advance(d)) {
+				Uint32 dest = destinationList.get(d);
+				if (copyStats[dest].useCount == 0)
+					workList.set(dest);
+			}
+
+			// STEP4:
+			//  Insert the copy instructions.
+			//
+			Uint32 destinationListSize = destinationList.getSize();
+			InstructionList::iterator endOfTheNode = instructions.end();
+
+			// Find the right place to insert the copy instructions.
+			if (destinationListSize != 0)
+				while (instructions.get(endOfTheNode).getFlags() & ifControl)
+					endOfTheNode = instructions.retreat(endOfTheNode);
+
+			while (destinationListSize != 0) {
+				while(workList.getSize()) {
+					RegisterName destinationName = RegisterName(workList.getOne());
+					RegisterName sourceName = copyStats[destinationName].source;
+
+					workList.clear(destinationName);
+					if (copyStats[destinationName].isLiveOut && !copyStats[destinationName].temporaryName) {
+						// Lost copy problem.
+						copyStats[destinationName].isLiveOut = false;
+
+						RegisterName sourceName = destinationName;
+						RegisterClassKind classKind = copyStats[sourceName].classKind;
+						RegisterName destinationName = getName(vrManager.newVirtualRegister(classKind));
+						assert(destinationName < maxNameCount);
+
+						copyStats[destinationName].classKind = classKind;
+						copyStats[sourceName].useCount = 0;
+				
+						// We need to insert a copy to a temporary register to keep the
+						// source register valid at the end of the node defining it.
+						// This copy will be inserted right after the phi node defining it.
+						RegisterName from = copyStats[sourceName].sourceNameToUse;
+						Instruction* definingPhiNode = vrManager.getVirtualRegister(from).getDefiningInstruction();
+						assert(definingPhiNode && (definingPhiNode->getFlags() & ifPhiNode) != 0);
+
+						RegisterID fromID = buildRegisterID(from, classKind);
+						RegisterID toID = buildRegisterID(destinationName, classKind);
+						Instruction& copy = emitter.newCopy(*definingPhiNode->getPrimitive(), fromID, toID);
+						vrManager.getVirtualRegister(destinationName).setDefiningInstruction(copy);
+						definingPhiNode->getPrimitive()->getContainer()->getInstructions().addFirst(copy);
+
+						copyStats[sourceName].temporaryName = destinationName;
+						copyStats[sourceName].sourceNameToUse = destinationName;
+						pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+					}
+
+					// Insert the copy instruction at the end of the current node.
+					RegisterName from = copyStats[sourceName].sourceNameToUse;
+
+					RegisterClassKind classKind = copyStats[destinationName].classKind;
+					RegisterID fromID = buildRegisterID(from, classKind);
+					RegisterID toID = buildRegisterID(destinationName, classKind);
+					Instruction& copy = emitter.newCopy(*vrManager.getVirtualRegister(from).getDefiningInstruction()->getPrimitive(), fromID, toID);
+					instructions.insertAfter(copy, endOfTheNode);
+					endOfTheNode = instructions.advance(endOfTheNode);
+
+					copyStats[sourceName].useCount = 0;
+					if (destinationList.test(sourceName) && copyStats[sourceName].isLiveOut)
+						pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+					copyStats[sourceName].isLiveOut = false;
+					copyStats[sourceName].sourceNameToUse = destinationName;
+
+					if (destinationList.test(sourceName))
+						workList.set(sourceName);
+					destinationList.clear(destinationName);
+				}
+
+				destinationListSize = destinationList.getSize();
+				if (destinationListSize != 0) {
+					RegisterName sourceName = RegisterName(destinationList.getOne());
+					RegisterName destinationName;
+
+					if (!copyStats[sourceName].temporaryName) {
+						// Cycle problem.
+						RegisterClassKind classKind = copyStats[sourceName].classKind;
+						destinationName = getName(vrManager.newVirtualRegister(classKind));
+						assert(destinationName < maxNameCount);
+				
+						copyStats[destinationName].classKind = classKind;
+						copyStats[sourceName].temporaryName = destinationName;
+
+						// Insert the copy instruction at the end of the current node.
+						RegisterName from = copyStats[sourceName].sourceNameToUse;
+
+						RegisterID fromID = buildRegisterID(from, classKind);
+						RegisterID toID = buildRegisterID(destinationName, classKind);
+						Instruction& copy = emitter.newCopy(*vrManager.getVirtualRegister(from).getDefiningInstruction()->getPrimitive(), fromID, toID);
+						vrManager.getVirtualRegister(destinationName).setDefiningInstruction(copy);
+						instructions.insertAfter(copy, endOfTheNode);
+						endOfTheNode = instructions.advance(endOfTheNode);
+					} else 
+						destinationName = copyStats[sourceName].temporaryName;
+
+					copyStats[sourceName].useCount = 0;
+					copyStats[sourceName].isLiveOut = false;
+					copyStats[sourceName].sourceNameToUse = destinationName;
+					pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+
+					workList.set(sourceName);
+				}
+			}
+
+			nodeStackPtr->pushedList = pushedList;
+			nodeStackPtr->next = next;
+			nodeStackPtr->limit = limit;
+			++nodeStackPtr;
+			next = dGraph.getSuccessorsBegin(currentNode);
+			limit = dGraph.getSuccessorsEnd(currentNode);
+		}
+	}
+}
+
+#endif // _PHI_NODE_REMOVER_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp

@@ -0,0 +1,155 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "LogModule.h"
+#include "RegisterAllocator.h"
+#include "RegisterPressure.h"
+#include "RegisterAllocatorTools.h"
+#include "PhiNodeRemover.h"
+#include "LiveRange.h"
+#include "Liveness.h"
+#include "InterferenceGraph.h"
+#include "LiveRangeGraph.h"
+#include "Coalescing.h"
+#include "Spilling.h"
+#include "Coloring.h"
+#include "Splits.h"
+
+class Pool;
+class ControlGraph;
+class VirtualRegisterManager;
+class InstructionEmitter;
+
+UT_DEFINE_LOG_MODULE(RegAlloc);
+
+void RegisterAllocator::allocateRegisters(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+{
+	// Insert the phi node instructions. We want to do this to have a single defined register per instruction.
+	// If we keep the PhiNode (as a DataNode) and a PhiNode is of DoubleWordKind then we have to execute
+	// some special code for the high word annotation.
+	//
+	RegisterAllocatorTools::insertPhiNodeInstructions(controlGraph, emitter);
+
+	// Perform some tests on the instruction graph.
+	//
+	DEBUG_ONLY(RegisterAllocatorTools::testTheInstructionGraph(controlGraph, vrManager));
+
+	// Replace the phi node instructions by their equivalent copy instructions.
+	//
+	PhiNodeRemover<LowRegisterPressure>::replacePhiNodes(controlGraph, vrManager, emitter);
+
+	// Do the register allocation.
+	//
+	RegisterAllocator registerAllocator(pool, controlGraph, vrManager, emitter);
+	registerAllocator.doGraphColoring();
+}
+
+void RegisterAllocator::doGraphColoring()
+{
+	// Initialize the liverange map.
+	//
+	initLiveRanges();
+
+	// Build the live ranges. We do this to compress the number of RegisterNames 
+	// used in the insterference graph.
+	//
+	LiveRange<LowRegisterPressure>::build(*this);
+
+	// Remove unnecessary copies.
+	//
+	RegisterAllocatorTools::removeUnnecessaryCopies(*this);
+
+	for (Uint8 loop = 0; loop < 10; loop++) {
+
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("********* RegisterAllocator loop %d *********\n", loop));
+
+		while(true) {
+			// Build the interference graph.
+			//
+			iGraph.build();
+
+			// Coalesce the copy instructions.
+			//
+			if (!Coalescing<LowRegisterPressure>::coalesce(*this))
+				break;
+		}
+
+		// Print the interference graph.
+		//
+		DEBUG_LOG_ONLY(iGraph.printPretty(UT_LOG_MODULE(RegAlloc)));
+
+		// Calculate the spill costs.
+		//
+		Spilling<LowRegisterPressure>::calculateSpillCosts(*this);
+		DEBUG_LOG_ONLY(RegisterAllocatorTools::printSpillCosts(*this));
+
+		// Calculate the split costs.
+		//
+		Splits<LowRegisterPressure>::calculateSplitCosts(*this);
+		DEBUG_LOG_ONLY(RegisterAllocatorTools::printSplitCosts(*this));
+
+		// Build the live range graph.
+		//
+		lGraph.build();
+		DEBUG_LOG_ONLY(lGraph.printPretty(UT_LOG_MODULE(RegAlloc)));
+
+		// Color the graph. If it succeeds then we're done with the
+		// register allocation.
+		//
+		if (Coloring<LowRegisterPressure>::color(*this)) {
+			// Write the final colors in the instruction graph.
+			//
+			Coloring<LowRegisterPressure>::finalColoring(*this);
+
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("********** RegisterAllocator  done **********\n"));
+			DEBUG_LOG_ONLY(RegisterAllocatorTools::printInstructions(*this));
+
+			return;
+		}
+
+		// We need to spill some registers.
+		//
+		Spilling<LowRegisterPressure>::insertSpillCode(*this);
+
+		// Insert the split instructions.
+		//
+		Splits<LowRegisterPressure>::insertSplitCode(*this);
+
+		// Update the live ranges.
+		// 
+		// FIX
+	}
+
+#ifdef DEBUG_LOG
+	RegisterAllocatorTools::updateInstructionGraph(*this);
+	RegisterAllocatorTools::printInstructions(*this);
+#endif
+	fprintf(stderr, "!!! Coloring failed after 10 loops !!!\n");
+	abort();
+}
+
+void RegisterAllocator::initLiveRanges()
+{
+	Uint32 count = this->nameCount;
+	RegisterName* name2range = new(pool) RegisterName[nameCount];
+	for (RegisterName r = RegisterName(1); r < count; r = RegisterName(r + 1))
+		name2range[r] = r;
+	this->name2range = name2range;
+	rangeCount = count;
+}

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.h

@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_ALLOCATOR_H_
+#define _REGISTER_ALLOCATOR_H_
+
+class Pool;
+class ControlGraph;
+class InstructionEmitter;
+struct SpillCost;
+struct SplitCost;
+
+#include "Liveness.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h" // This should included by Backend.cpp
+#include "InterferenceGraph.h"
+#include "LiveRangeGraph.h"
+
+//template <class RegisterPressure>
+class RegisterAllocator
+{
+public:
+
+	Pool&									pool;			//
+	ControlGraph&							controlGraph;	//
+	VirtualRegisterManager&					vrManager;		//
+	InstructionEmitter&						emitter;		//
+
+	RegisterName*							name2range;		//
+	RegisterName*							color;			//
+	SpillCost*								spillCost;		//
+	SparseSet*								willSpill;		//
+	SplitCost*								splitCost;		//
+	NameLinkedList**						splitAround;	//
+	InterferenceGraph<LowRegisterPressure>	iGraph;			//
+	LiveRangeGraph<LowRegisterPressure>		lGraph;			//
+	LivenessInfo<LowRegisterPressure>		liveness;		//
+	Uint32									nameCount;		//
+	Uint32									rangeCount;		//
+	bool									splitFound;		//
+
+private:
+
+	//
+	//
+	void doGraphColoring();
+
+public:
+
+	//
+	//
+	inline RegisterAllocator(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+
+	//
+	//
+	bool canInterfere(RegisterName /*name1*/, RegisterName /*name2*/) const {return true;}
+
+	//
+	//
+	void initLiveRanges();
+
+	//
+	//
+	static void allocateRegisters(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+};
+
+//
+//
+inline RegisterAllocator::RegisterAllocator(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+	: pool(pool), controlGraph(controlGraph), vrManager(vrManager), emitter(emitter), iGraph(*this), lGraph(*this), nameCount(vrManager.getSize()) {}
+
+#endif // _REGISTER_ALLOCATOR_H_
+

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocatorTools.cpp

@@ -0,0 +1,355 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "LogModule.h"
+#include "RegisterAllocatorTools.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Primitives.h"
+#include "InstructionEmitter.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "Spilling.h"
+#include "Splits.h"
+#include "BitSet.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+#ifdef DEBUG
+void RegisterAllocatorTools::testTheInstructionGraph(ControlGraph& controlGraph, VirtualRegisterManager& vrManager)
+{
+	// Test the declared VirtualRegisters. The register allocator tries to condense the register universe.
+	// Any gap in the VirtualRegister names will be a loss of efficiency !!!!
+
+	Uint32 nameCount = vrManager.getSize();
+	BitSet registerSeen(controlGraph.pool, nameCount);
+
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					registerSeen.set(usePtr->getRegisterName());
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					registerSeen.set(definePtr->getRegisterName());
+		}
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& instruction = phiNodes.get(p);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					registerSeen.set(usePtr->getRegisterName());
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					registerSeen.set(definePtr->getRegisterName());
+		}
+	}
+
+	bool renameRegisters = false;
+	for (BitSet::iterator i = registerSeen.nextZero(0); !registerSeen.done(i); i = registerSeen.nextZero(i)) {
+		renameRegisters = true;
+		fprintf(stderr, 
+				"WARNING: The VirtualRegister vr%d has been allocated during CodeGeneration but\n"
+				"         is never used nor defined by any instruction in the instruction graph\n"
+				"                                  PLEASE FIX                                  \n",
+				i);
+	}
+	if (renameRegisters) {
+		Instruction** definingInstruction = new Instruction*[nameCount];
+		memset(definingInstruction, '\0', nameCount * sizeof(Instruction*));
+		RegisterName* newName = new RegisterName[nameCount];
+		memset(newName, '\0', nameCount * sizeof(RegisterName));
+		RegisterName nextName = RegisterName(1);
+
+		for (Uint32 n = 0; n < nNodes; n++) {
+
+			InstructionList& instructions = nodes[n]->getInstructions();
+			for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+				Instruction& instruction = instructions.get(i);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						usePtr->setRegisterName(newName[name]);
+					}
+
+				InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+				for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+					if (definePtr->isRegister()) {
+						RegisterName name = definePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						definePtr->setRegisterName(newName[name]);
+					}
+			}
+
+			InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+			for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+				Instruction& instruction = phiNodes.get(p);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						usePtr->setRegisterName(newName[name]);
+					}
+
+				InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+				for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+					if (definePtr->isRegister()) {
+						RegisterName name = definePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						definePtr->setRegisterName(newName[name]);
+					}
+			}
+		}
+		
+		vrManager.setSize(nextName);
+
+		for (RegisterName r = RegisterName(1); r < nextName; r = RegisterName(r + 1))
+			vrManager.getVirtualRegister(r).definingInstruction = definingInstruction[r];
+
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("RegisterMap:\n"));
+		for (Uint32 i = 1; i < nameCount; i++)
+			if (newName[i] != 0)
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tvr%d becomes vr%d.\n", i, newName[i]));
+			else
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tvr%d is dead.\n", i));
+
+
+		delete newName;
+		delete definingInstruction;
+	}
+
+}
+#endif // DEBUG
+
+void RegisterAllocatorTools::removeUnnecessaryCopies(RegisterAllocator& registerAllocator)
+{
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i);) {
+			Instruction& instruction = instructions.get(i);
+			i = instructions.advance(i);
+
+			if (instruction.getFlags() & ifCopy) {
+				assert(instruction.getInstructionUseBegin() != instruction.getInstructionUseEnd() && instruction.getInstructionUseBegin()[0].isRegister());
+				assert(instruction.getInstructionDefineBegin() != instruction.getInstructionDefineEnd() && instruction.getInstructionDefineBegin()[0].isRegister());
+				
+				RegisterName source = name2range[instruction.getInstructionUseBegin()[0].getRegisterName()];
+				RegisterName destination = name2range[instruction.getInstructionDefineBegin()[0].getRegisterName()];
+
+				if (source == destination)
+					instruction.remove();
+			}
+		}
+	}
+}
+
+
+void RegisterAllocatorTools::updateInstructionGraph(RegisterAllocator& registerAllocator)
+{
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					usePtr->setRegisterName(name2range[usePtr->getRegisterName()]);
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					definePtr->setRegisterName(name2range[definePtr->getRegisterName()]);
+		}
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& instruction = phiNodes.get(p);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					usePtr->setRegisterName(name2range[usePtr->getRegisterName()]);
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					definePtr->setRegisterName(name2range[definePtr->getRegisterName()]);
+		}
+	}
+}
+
+
+void RegisterAllocatorTools::insertPhiNodeInstructions(ControlGraph& controlGraph, InstructionEmitter& emitter)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		DoublyLinkedList<PhiNode>& phiNodes = node.getPhiNodes();
+
+		if (!phiNodes.empty()) {
+
+			// Set the index of the incoming edges.
+			Uint32 index = 0;
+			const DoublyLinkedList<ControlEdge>& predecessors = node.getPredecessors();
+			for (DoublyLinkedList<ControlEdge>::iterator p = predecessors.begin(); !predecessors.done(p); p = predecessors.advance(p))
+				predecessors.get(p).setIndex(index++);
+
+			// Insert the phi node instruction in the instruction list.
+			for (DoublyLinkedList<PhiNode>::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+				PhiNode& phiNode = phiNodes.get(i);
+				ValueKind kind = phiNode.getKind();
+
+				if (!isStorableKind(kind))
+					continue;
+
+				RegisterClassKind classKind = rckGeneral; // FIX: get class kind from phi node kind.
+				Uint32 nInputs = phiNode.nInputs();
+
+				PhiNodeInstruction& phiNodeInstruction = *new(pool) PhiNodeInstruction(&phiNode, pool, nInputs);
+
+				emitter.defineProducer(phiNode, phiNodeInstruction, 0, classKind, drLow);
+				for (Uint32 whichInput = 0; whichInput < nInputs; whichInput++)
+					emitter.useProducer(phiNode.nthInputVariable(whichInput), phiNodeInstruction, whichInput, classKind, drLow);
+
+				node.addPhiNodeInstruction(phiNodeInstruction);
+
+				if (isDoublewordKind(kind)) {
+					PhiNodeInstruction& phiNodeInstruction = *new(pool) PhiNodeInstruction(&phiNode, pool, nInputs);
+
+					emitter.defineProducer(phiNode, phiNodeInstruction, 0, classKind, drHigh);
+					for (Uint32 whichInput = 0; whichInput < nInputs; whichInput++)
+						emitter.useProducer(phiNode.nthInputVariable(whichInput), phiNodeInstruction, whichInput, classKind, drHigh);
+
+					node.addPhiNodeInstruction(phiNodeInstruction);
+				}
+			}
+		}
+	}
+}
+
+#ifdef DEBUG_LOG
+
+void RegisterAllocatorTools::printSpillCosts(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	SpillCost* cost = registerAllocator.spillCost;
+
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Spill costs:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\trange %d : ", i));
+		if (cost[i].infinite)
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("infinite\n"));
+		else
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%f\n", cost[i].cost));
+	}
+}
+
+void RegisterAllocatorTools::printSplitCosts(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	SplitCost* cost = registerAllocator.splitCost;
+
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Split costs:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\trange %d : loads = %f stores = %f\n", i, cost[i].loads, cost[i].stores));
+	}
+}
+
+void RegisterAllocatorTools::printInstructions(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	ControlNode** nodes = registerAllocator.controlGraph.dfsList;
+	Uint32 nNodes = registerAllocator.controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("N%d:\n", n));
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		if (!phiNodes.empty()) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" PhiNodes:\n", n));
+			for(InstructionList::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+				phiNodes.get(i).printPretty(log);
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+			}
+			if (!instructions.empty())
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" Instructions:\n", n));
+		}
+
+		for(InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			instructions.get(i).printPretty(log);
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+		}
+	}
+}
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocatorTools.h

@@ -0,0 +1,117 @@
+//	-*- mode:C++; tab-width:4; truncate-lines:t -*-
+//
+//           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+//              NETSCAPE COMMUNICATIONS CORPORATION
+// Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
+// Reserved.  Use of this Source Code is subject to the terms of the
+// applicable license agreement from Netscape Communications Corporation.
+// The copyright notice(s) in this Source Code does not indicate actual or
+// intended publication of this Source Code.
+//
+// $Id: RegisterAllocatorTools.h,v 1.1.2.1 1999-03-02 16:12:05 fur%netscape.com Exp $
+//
+
+#ifndef _REGISTER_ALLOCATOR_TOOLS_H_
+#define _REGISTER_ALLOCATOR_TOOLS_H_
+
+#include "LogModule.h"
+#include "RegisterTypes.h"
+#include <string.h>
+
+class RegisterAllocator;
+class ControlGraph;
+class InstructionEmitter;
+class VirtualRegisterManager;
+
+struct RegisterAllocatorTools
+{
+	//
+	//
+	static void insertPhiNodeInstructions(ControlGraph& controlGraph, InstructionEmitter& emitter);
+
+	//
+	//
+	static void updateInstructionGraph(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void removeUnnecessaryCopies(RegisterAllocator& registerAllocator);
+
+#ifdef DEBUG
+	//
+	//
+	static void testTheInstructionGraph(ControlGraph& controlGraph, VirtualRegisterManager& vrManager);
+#endif // DEBUG
+
+#ifdef DEBUG_LOG
+	//
+	//
+	static void printInstructions(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void printSpillCosts(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void printSplitCosts(RegisterAllocator& registerAllocator);
+#endif // DEBUG_LOG
+};
+
+//
+// FIX: this should go in a class (LookupTable ?)
+//
+
+inline RegisterName findRoot(RegisterName name, RegisterName* table)
+{
+	RegisterName* stack = table;
+	RegisterName* stackPtr = stack;
+
+	RegisterName newName;
+	while((newName = table[name]) != name) {
+		*--stackPtr = name;
+		name = newName;
+	}
+
+	while (stackPtr != stack)
+		table[*stackPtr++] = name;
+
+	return name;
+}
+
+inline void init(RegisterName* table, Uint32 nameCount)
+{
+	for (RegisterName r = RegisterName(0); r < nameCount; r = RegisterName(r + 1))
+		table[r] = r;
+}
+
+inline Uint32 compress(RegisterName* name2range, RegisterName* table, Uint32 nameCount, Uint32 tableSize)
+{
+	RegisterName* liveRange = new RegisterName[tableSize];
+	memset(liveRange, '\0', tableSize * sizeof(RegisterName));
+
+	// Update the lookup table.
+	for (RegisterName r = RegisterName(1); r < tableSize; r = RegisterName(r + 1))
+		findRoot(r, table);
+
+	// Count the liveranges.
+	Uint32 liveRangeCount = 1;
+	for (RegisterName s = RegisterName(1); s < tableSize; s = RegisterName(s + 1))
+		if (table[s] == s)
+			liveRange[s] = RegisterName(liveRangeCount++);
+
+	for (RegisterName t = RegisterName(1); t < nameCount; t = RegisterName(t + 1))
+		name2range[t] = liveRange[table[name2range[t]]];
+
+	return liveRangeCount;
+}
+
+inline double doLog10(Uint32 power)
+{
+	double log = 1.0;
+	while (power--)
+		log *= 10.0;
+	return log;
+}
+
+#endif // _REGISTER_ALLOCATOR_TOOLS_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterAssigner.h

@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_ASSIGNER_H_
+#define _REGISTER_ASSIGNER_H_
+
+#include "Fundamentals.h"
+#include "VirtualRegister.h"
+
+class FastBitMatrix;
+
+class RegisterAssigner
+{
+protected:
+  VirtualRegisterManager& vRegManager;
+  
+public:
+  RegisterAssigner(VirtualRegisterManager& vrMan) : vRegManager(vrMan) {}
+  
+  virtual bool assignRegisters(FastBitMatrix& interferenceMatrix) = 0;
+};
+
+#endif /* _REGISTER_ASSIGNER_H_ */

mozilla/ef/Compiler/RegisterAllocator/RegisterClass.h

@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_CLASS_H_
+#define _REGISTER_CLASS_H_
+
+#include "Fundamentals.h"
+#include "RegisterTypes.h"
+
+#endif // _REGISTER_CLASS_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterPressure.h

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_PRESSURE_H_
+#define _REGISTER_PRESSURE_H_
+
+#include "BitSet.h"
+#include "HashSet.h"
+
+struct LowRegisterPressure
+{
+	typedef BitSet Set;
+	static const bool setIsOrdered = true;
+};
+
+struct HighRegisterPressure
+{
+	typedef HashSet Set;
+	static const bool setIsOrdered = false;
+};
+
+#endif // _REGISTER_PRESSURE_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterTypes.h

@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_TYPES_H_
+#define _REGISTER_TYPES_H_
+
+#include "Fundamentals.h"
+
+//------------------------------------------------------------------------------
+// RegisterName -
+//
+
+enum RegisterName {
+	rnInvalid = 0,
+};
+
+//------------------------------------------------------------------------------
+// RegisterClassKind -
+//
+
+enum RegisterClassKind {
+	rckInvalid = 0,
+	rckGeneral,
+	rckStackSlot,
+
+	nRegisterClassKind
+};
+
+//------------------------------------------------------------------------------
+// RegisterID -
+//
+
+enum RegisterID {
+	invalidID = 0
+};
+
+//------------------------------------------------------------------------------
+// RegisterKind -
+//
+
+enum RegisterKind {
+	rkCallerSave = 0,
+	rkCalleeSave,
+};
+
+struct NameLinkedList {
+	RegisterName name;
+	NameLinkedList* next;
+};
+
+#ifdef DEBUG
+
+const registerNameMask = 		0x03ffffff;
+const coloredRegisterMask = 	0x04000000;
+const machineRegisterMask = 	0x08000000;
+const registerClassMask = 		0xf0000000;
+
+const registerNameShift = 		0;
+const coloredRegisterShift = 	26;
+const machineRegisterShift = 	27;
+const registerClassShift = 		28;
+
+#else // DEBUG
+
+const registerNameMask = 		0x0fffffff;
+const registerClassMask = 		0xf0000000;
+
+const registerNameShift = 		0;
+const registerClassShift = 		28;
+
+#endif // DEBUG
+
+
+inline RegisterClassKind getClass(RegisterID registerID) {return RegisterClassKind((registerID & registerClassMask) >> registerClassShift);}
+inline RegisterName getName(RegisterID registerID) {return RegisterName((registerID & registerNameMask) >> registerNameShift);}
+inline void setClass(RegisterID& registerID, RegisterClassKind classKind) {registerID = RegisterID((registerID & ~registerClassMask) | ((classKind << registerClassShift) & registerClassMask));}
+inline void setName(RegisterID& registerID, RegisterName name) {assert((name & ~registerNameMask) == 0); registerID = RegisterID((registerID & ~registerNameMask) | ((name << registerNameShift) & registerNameMask));}
+inline RegisterID buildRegisterID(RegisterName name, RegisterClassKind classKind) {return RegisterID(((classKind << registerClassShift) & registerClassMask) | ((name << registerNameShift) & registerNameMask));}
+
+#ifdef DEBUG
+
+inline bool isMachineRegister(RegisterID rid) {return (rid & machineRegisterMask) != 0;}
+inline void setMachineRegister(RegisterID& rid) {rid = RegisterID(rid | machineRegisterMask);}
+inline bool isColoredRegister(RegisterID rid) {return (rid & coloredRegisterMask) != 0;}
+inline void setColoredRegister(RegisterID& rid) {rid = RegisterID(rid | coloredRegisterMask);}
+
+#endif // DEBUG
+
+#endif // _REGISTER_TYPES_H_

mozilla/ef/Compiler/RegisterAllocator/SSATools.cpp

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "SSATools.h"
+#include "ControlGraph.h"
+#include "VirtualRegister.h"
+#include "Liveness.h"
+
+void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager)
+{
+	if (!controlGraph.hasBackEdges)
+		return;
+
+	Liveness liveness(controlGraph.pool);
+	liveness.buildLivenessAnalysis(controlGraph, vrManager);
+}

mozilla/ef/Compiler/RegisterAllocator/SSATools.h

@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _SSA_TOOLS_H_
+#define _SSA_TOOLS_H_
+
+#include "Fundamentals.h"
+
+class ControlGraph;
+class VirtualRegisterManager;
+
+extern void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager);
+
+#endif // _SSA_TOOLS_H_

mozilla/ef/Compiler/RegisterAllocator/SparseSet.cpp

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "SparseSet.h"
+#include "BitSet.h"
+#include "Pool.h"
+
+#ifdef DEBUG_LOG
+// Print the set.
+//
+void SparseSet::printPretty(LogModuleObject log)
+{
+	Pool pool;
+	BitSet set(pool, universeSize);
+
+	for (Uint32 i = 0; i < count; i++)
+	   set.set(node[i].element);
+
+	set.printPretty(log);
+}
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/SparseSet.h

@@ -0,0 +1,168 @@
+//	-*- mode:C++; tab-width:4; truncate-lines:t -*-
+//
+//           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+//              NETSCAPE COMMUNICATIONS CORPORATION
+// Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
+// Reserved.  Use of this Source Code is subject to the terms of the
+// applicable license agreement from Netscape Communications Corporation.
+// The copyright notice(s) in this Source Code does not indicate actual or
+// intended publication of this Source Code.
+//
+// $Id: SparseSet.h,v 1.1.2.1 1999-03-02 16:12:07 fur%netscape.com Exp $
+//
+
+#ifndef _SPARSE_SET_H_
+#define _SPARSE_SET_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "LogModule.h"
+#include "BitSet.h"
+
+class SparseSet
+{
+private:
+
+	struct Node {
+		Uint32		element;
+		Uint32		stackIndex;
+	};
+
+	Node*			node;
+	Uint32			count;
+	Uint32			universeSize;
+
+private:
+
+	// No copy constructor.
+	SparseSet(const SparseSet&);
+
+	// Check if the given set's universe is of the same size than this universe.
+	void checkUniverseCompatibility(const SparseSet& set) const {assert(set.universeSize == universeSize);}
+	// Check if pos is valid for this set's universe.
+	void checkMember(Int32 pos) const {assert(pos >=0 && Uint32(pos) < universeSize);}
+
+public:
+
+	SparseSet(Pool& pool, Uint32 universeSize) : universeSize(universeSize) {node = new(pool) Node[universeSize]; clear();}
+
+	// Clear the sparse set.
+	void clear() {count = 0;}
+	// Clear the element at index.
+	inline void clear(Uint32 index);
+	// Set the element at index.
+	inline void set(Uint32 index);
+	// Return true if the element at index is set.
+	inline bool test(Uint32 index) const;
+	// Union with the given sparse set.
+	inline void or(const SparseSet& set);
+	// Intersection with the given sparse set.
+	inline void and(const SparseSet& set);
+	// Difference with the given sparse set.
+	inline void difference(const SparseSet& set);
+	// Copy set.
+	inline SparseSet& operator = (const SparseSet& set);
+	inline SparseSet& operator = (const BitSet& set);
+	// Return true if the sparse sets are identical.
+	friend bool operator == (const SparseSet& set1, const SparseSet& set2);
+	// Return true if the sparse sets are different.
+	friend bool operator != (const SparseSet& set1, const SparseSet& set2);
+
+	// Logical operators.
+	SparseSet& operator |= (const SparseSet& set) {or(set); return *this;}
+	SparseSet& operator &= (const SparseSet& set) {and(set); return *this;}
+	SparseSet& operator -= (const SparseSet& set) {difference(set); return *this;}
+
+	// Iterator to conform with the set API.
+	typedef Int32 iterator;
+	// Return the iterator for the first element of this set.
+	iterator begin() const {return count - 1;}
+	// Return the next iterator.
+	iterator advance(iterator pos) const {return --pos;}
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos < 0;}
+	// Return the element for the given iterator;
+	Uint32 get(iterator pos) const {return node[pos].element;}
+	// Return one element of this set.
+	Uint32 getOne() const {assert(count > 0); return node[0].element;}
+	// Return the size of this set.
+	Uint32 getSize() const {return count;}
+
+#ifdef DEBUG_LOG
+	// Print the set.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+inline void SparseSet::clear(Uint32 element)
+{
+	checkMember(element);
+	Uint32 count = this->count;
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+
+	if ((stackIndex < count) && (node[stackIndex].element == element)) {
+		Uint32 stackTop = node[count - 1].element;
+
+		node[stackIndex].element = stackTop;
+		node[stackTop].stackIndex = stackIndex;
+		this->count = count - 1;
+	}
+}
+
+inline void SparseSet::set(Uint32 element)
+{
+	checkMember(element);
+  	Uint32 count = this->count;
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+
+	if ((stackIndex >= count) || (node[stackIndex].element != element)) {
+		node[count].element = element;
+		node[element].stackIndex = count;
+		this->count = count + 1;
+	}
+}
+
+inline bool SparseSet::test(Uint32 element) const
+{
+	checkMember(element);
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+	return ((stackIndex < count) && (node[stackIndex].element == element));
+}
+
+inline SparseSet& SparseSet::operator = (const SparseSet& set)
+{
+	checkUniverseCompatibility(set);
+	Uint32 sourceCount = set.getSize();
+	Node* node = this->node;
+
+	memcpy(node, set.node, sourceCount * sizeof(Node));
+
+	for (Uint32 i = 0; i < sourceCount; i++) {
+		Uint32 element = node[i].element;
+		node[element].stackIndex = i;
+	}
+
+	count = sourceCount;
+
+	return *this;
+}
+
+
+inline SparseSet& SparseSet::operator = (const BitSet& set)
+{
+	// FIX: there's room for optimization here.
+	assert(universeSize == set.getSize());
+
+	clear();
+	for (Int32 i = set.firstOne(); i != -1; i = set.nextOne(i))
+		this->set(i);
+	return *this;
+}
+
+#endif // _SPARSE_SET_H_

mozilla/ef/Compiler/RegisterAllocator/Spilling.cpp

@@ -0,0 +1,270 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef NEW_LAURENTM_CODE
+#define INCLUDE_EMITTER
+#include "CpuInfo.h"
+#include "Fundamentals.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "InstructionEmitter.h"
+#include "Spilling.h"
+
+
+void Spilling::
+insertSpillCode(ControlNode** dfsList, Uint32 nNodes)
+{
+  PRUint32 nVirtualRegisters = vRegManager.count();
+  FastBitSet currentLive(vRegManager.pool, nVirtualRegisters);
+  FastBitSet usedInThisInstruction(vRegManager.pool, nVirtualRegisters);
+  RegisterFifo grNeedLoad(nVirtualRegisters);
+  RegisterFifo fpNeedLoad(nVirtualRegisters);
+
+  for (PRInt32 n = nNodes - 1; n >= 0; n--)
+	{
+	  PR_ASSERT(grNeedLoad.empty() & fpNeedLoad.empty());
+	  ControlNode& node = *dfsList[n];
+
+	  currentLive = node.liveAtEnd;
+
+	  PRUint32 nGeneralAlive = 0;
+	  PRUint32 nFloatingPointAlive = 0;
+
+	  // Get the number of registers alive at the end of this node.
+	  for (PRInt32 j = currentLive.firstOne(); j != -1; j = currentLive.nextOne(j))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(j);
+		  if (vReg.spillInfo.willSpill)
+			{
+			  currentLive.clear(j);
+			}
+		  else
+			{
+			  switch (vReg.getClass())
+				{
+				case vrcInteger:
+				  nGeneralAlive++;
+				  break;
+				case vrcFloatingPoint:
+				case vrcFixedPoint:
+				  nFloatingPointAlive++;
+				  break;
+				default:
+				  break;
+				}
+			}
+		}
+	  
+//		  if(node.dfsNum == 8) printf("\n________Begin Node %d________\n", node.dfsNum);
+
+		InstructionList& instructions = node.getInstructions();
+	  for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i))
+		{
+		  Instruction&       instruction = instructions.get(i);
+		  InstructionUse*    useBegin    = instruction.getInstructionUseBegin();
+		  InstructionUse*    useEnd      = instruction.getInstructionUseEnd();
+		  InstructionUse*    usePtr;
+		  InstructionDefine* defBegin    = instruction.getInstructionDefineBegin();
+		  InstructionDefine* defEnd      = instruction.getInstructionDefineEnd();
+		  InstructionDefine* defPtr;
+
+//		if(node.dfsNum == 8)  { printf("\n");
+//		instruction.printPretty(stdout);
+//		printf("\n"); }
+
+		  // Handle definitions
+		  for (defPtr = defBegin; defPtr < defEnd; defPtr++)
+			if (defPtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = defPtr->getVirtualRegister();
+				currentLive.clear(vReg.getRegisterIndex());
+				switch (vReg.getClass())
+				  {
+				  case vrcInteger:
+					nGeneralAlive--;
+					break;
+				  case vrcFloatingPoint:
+				  case vrcFixedPoint:
+					nFloatingPointAlive--;
+					break;
+				  default:
+					break;
+				  }
+			  }
+
+		  // Check for deaths
+		  for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+			if (usePtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = usePtr->getVirtualRegister();
+				if (!currentLive.test(vReg.getRegisterIndex()))
+				  // This is the last use of this register.
+				  {
+					currentLive.set(vReg.getRegisterIndex());
+					switch (vReg.getClass())
+					  {
+					  case vrcInteger:
+						nGeneralAlive++;
+						while (/*(nGeneralAlive > NUMBER_OF_GREGISTERS) &&*/ !grNeedLoad.empty())
+						  {
+							PRUint32 toLoad = grNeedLoad.get();
+							currentLive.clear(toLoad);
+							nGeneralAlive--;
+							
+							VirtualRegister& nReg = vRegManager.getVirtualRegister(toLoad);
+							Instruction& lastUsingInstruction = *nReg.spillInfo.lastUsingInstruction;
+							emitter.emitLoadAfter(*lastUsingInstruction.getPrimitive(), lastUsingInstruction.getLinks().prev,
+												  nReg.getAlias(), *nReg.equivalentRegister[vrcStackSlot]);
+							nReg.releaseSelf();
+						  }
+						break;
+					  case vrcFloatingPoint:
+					  case vrcFixedPoint:
+						nFloatingPointAlive++;
+						while (/*(nFloatingPointAlive > NUMBER_OF_FPREGISTERS) &&*/ !fpNeedLoad.empty())
+						  {
+							PRUint32 toLoad = fpNeedLoad.get();
+							currentLive.clear(toLoad);
+							nFloatingPointAlive--;
+							
+							VirtualRegister& nReg = vRegManager.getVirtualRegister(toLoad);
+							Instruction& lastUsingInstruction = *nReg.spillInfo.lastUsingInstruction;
+							emitter.emitLoadAfter(*lastUsingInstruction.getPrimitive(), lastUsingInstruction.getLinks().prev,
+												  nReg.getAlias(), *nReg.equivalentRegister[vrcStackSlot]);
+							nReg.releaseSelf();
+						  }
+						break;
+					  default:
+						break;
+					  }
+				  }
+			  }
+
+		  // Handle uses
+		  for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+			if (usePtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = usePtr->getVirtualRegister();
+				PRUint32 registerIndex = vReg.getRegisterIndex();
+
+				if (vReg.spillInfo.willSpill) {
+#if defined(GENERATE_FOR_X86)
+				  if (!instruction.switchUseToSpill((usePtr - useBegin), *vReg.equivalentRegister[vrcStackSlot]))
+#endif
+					{
+					  switch (vReg.getClass())
+						{
+						case vrcInteger:
+						  if (!grNeedLoad.test(registerIndex))
+							{
+							  grNeedLoad.put(registerIndex);
+							  VirtualRegister& alias = vRegManager.newVirtualRegister(vrcInteger);
+							  if (vReg.isPreColored())
+								  alias.preColorRegister(vReg.getPreColor());
+							  /* if (vReg.hasSpecialInterference) {
+								  alias.specialInterference.sizeTo(NUMBER_OF_REGISTERS);
+								  alias.specialInterference = vReg.specialInterference;
+								  alias.hasSpecialInterference = true;
+							  } */
+							  vReg.setAlias(alias);
+							  vReg.retainSelf();
+							}
+						  break;
+						case vrcFloatingPoint:
+						case vrcFixedPoint:
+						  if (!fpNeedLoad.test(registerIndex))
+							{
+							  fpNeedLoad.put(registerIndex);
+							  VirtualRegister& alias = vRegManager.newVirtualRegister(vReg.getClass());
+							  if (vReg.isPreColored())
+								  alias.preColorRegister(vReg.getPreColor());
+							  /*if (vReg.hasSpecialInterference) {
+								  alias.specialInterference.sizeTo(NUMBER_OF_REGISTERS);
+								  alias.specialInterference = vReg.specialInterference;
+								  alias.hasSpecialInterference = true;
+							  } */
+							  vReg.setAlias(alias);
+							  vReg.retainSelf();
+							}
+						  break;
+						default:
+						  break;
+						}
+					  usePtr->getVirtualRegisterPtr().initialize(vReg.getAlias());
+					  usedInThisInstruction.set(registerIndex);
+					  vReg.spillInfo.lastUsingInstruction = &instruction;
+					}
+				  currentLive.clear(registerIndex);
+				} else { // will not spill
+				  currentLive.set(registerIndex);
+				}
+			  }
+		  
+		  // Handle definitions
+		  for (defPtr = defBegin; defPtr < defEnd; defPtr++)
+			if (defPtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = defPtr->getVirtualRegister();
+				
+				if (vReg.spillInfo.willSpill)
+#if defined(GENERATE_FOR_X86)
+				  if (!instruction.switchDefineToSpill((defPtr - defBegin), *vReg.equivalentRegister[vrcStackSlot]))
+#endif
+					{
+					  if (usedInThisInstruction.test(vReg.getRegisterIndex()))
+						// this virtualRegister was used in this instruction and is also defined. We need to move 
+						// this virtual register to its alias first and then save it to memory.
+						{
+						  emitter.emitStoreAfter(*instruction.getPrimitive(), &instruction.getLinks(), 
+												 vReg.getAlias(), *vReg.equivalentRegister[vrcStackSlot]);
+						  defPtr->getVirtualRegisterPtr().initialize(vReg.getAlias());
+						}
+					  else
+						{
+						  emitter.emitStoreAfter(*instruction.getPrimitive(), &instruction.getLinks(), 
+												 vReg, *vReg.equivalentRegister[vrcStackSlot]);
+						}
+					}
+			  }
+		}
+	  while (!grNeedLoad.empty())
+		{
+		  PRUint32 nl = grNeedLoad.get();
+		  VirtualRegister& nlReg = vRegManager.getVirtualRegister(nl);
+		  Instruction& lastUse = *nlReg.spillInfo.lastUsingInstruction;
+		  
+		  emitter.emitLoadAfter(*lastUse.getPrimitive(), lastUse.getLinks().prev, 
+								nlReg.getAlias(), *nlReg.equivalentRegister[vrcStackSlot]);
+		  nlReg.releaseSelf();
+		}
+	  while (!fpNeedLoad.empty())
+		{
+		  PRUint32 nl = fpNeedLoad.get();
+		  VirtualRegister& nlReg = vRegManager.getVirtualRegister(nl);
+		  Instruction& lastUse = *nlReg.spillInfo.lastUsingInstruction;
+
+		  emitter.emitLoadAfter(*lastUse.getPrimitive(), lastUse.getLinks().prev, 
+								nlReg.getAlias(), *nlReg.equivalentRegister[vrcStackSlot]);
+		  nlReg.releaseSelf();
+		}
+
+//	  if(node.dfsNum == 8) printf("\n________End Node %d________\n", node.dfsNum);
+
+	}
+}
+#endif

mozilla/ef/Compiler/RegisterAllocator/Spilling.h

@@ -0,0 +1,269 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _SPILLING_H_
+#define _SPILLING_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "SparseSet.h"
+
+template <class RegisterPressure>
+class Spilling
+{
+private:
+	static void insertStoreAfter(Instruction& instruction, RegisterName name);
+	static void insertLoadBefore(Instruction& instruction, RegisterName name);
+
+public:
+	static void calculateSpillCosts(RegisterAllocator& registerAllocator);
+	static void insertSpillCode(RegisterAllocator& registerAllocator);
+};
+
+struct SpillCost
+{
+	double loads;
+	double stores;
+	double copies;
+	double cost;
+	bool infinite;
+};
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertSpillCode(RegisterAllocator& registerAllocator)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet currentLive(pool, rangeCount);
+	SparseSet needLoad(pool, rangeCount);
+	SparseSet mustSpill(pool, rangeCount);
+	SparseSet& willSpill = *registerAllocator.willSpill;
+	
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+
+		needLoad.clear();
+		currentLive = liveOut[n];
+		mustSpill = currentLive;
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i);) {
+			Instruction& instruction = instructions.get(i);
+			i = instructions.retreat(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			bool foundLiveDefine = false;
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					if (currentLive.test(name2range[definePtr->getRegisterName()])) {
+						foundLiveDefine = true;
+						break;
+					}
+				} else {
+					foundLiveDefine = true;
+					break;
+				}
+			if (defineBegin != defineEnd && !foundLiveDefine) {
+				fprintf(stderr, "!!! Removed instruction because it was only defining unused registers !!!\n");
+				instruction.remove();
+			}
+
+ 			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					RegisterName range = name2range[definePtr->getRegisterName()];
+#ifdef DEBUG
+					if (needLoad.test(range))
+						if (!mustSpill.test(range) && registerAllocator.spillCost[range].infinite && willSpill.test(range)) {
+							fprintf(stderr, "Tried to spill a register with infinite spill cost\n");
+							abort();
+						}
+#endif // DEBUG
+					if (willSpill.test(range))
+						insertStoreAfter(instruction, range);
+
+					needLoad.clear(range);
+				}
+
+			if (instruction.getFlags() & ifCopy)
+				for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName range = name2range[usePtr->getRegisterName()];
+						if (!currentLive.test(range))
+							for (SparseSet::iterator r = needLoad.begin(); !needLoad.done(r); r = needLoad.advance(r)) {
+								RegisterName load = RegisterName(needLoad.get(r));
+								if (willSpill.test(load))
+									insertLoadBefore(instruction, load);
+								mustSpill.set(load);
+							}
+						needLoad.clear();
+					}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+					currentLive.set(range);
+					needLoad.set(range);
+				}
+		}
+
+		for (SparseSet::iterator l = needLoad.begin(); !needLoad.done(l); l = needLoad.advance(l)) {
+			RegisterName load = RegisterName(needLoad.get(l));
+			if (willSpill.test(load))
+				insertLoadBefore(instructions.first(), load);
+		}		
+	}
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertLoadBefore(Instruction& /*instruction*/, RegisterName name)
+{
+	fprintf(stdout, "will insert load for range %d\n", name);
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertStoreAfter(Instruction& /*instruction*/, RegisterName name)
+{
+	fprintf(stdout, "will insert store for range %d\n", name);
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::calculateSpillCosts(RegisterAllocator& registerAllocator)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet live(pool, rangeCount);
+	SparseSet needLoad(pool, rangeCount);
+	SparseSet mustSpill(pool, rangeCount);
+
+	SparseSet alreadyStored(pool, rangeCount); // FIX: should get this from previous spilling.
+
+	SpillCost* cost = new SpillCost[rangeCount];
+	memset(cost, '\0', rangeCount * sizeof(SpillCost));
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+
+		double weight = doLog10(node.loopDepth);
+
+		needLoad.clear();
+		live = liveOut[n];
+		mustSpill = live;
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					RegisterName range = name2range[definePtr->getRegisterName()];
+
+					if (needLoad.test(range))
+						if (!mustSpill.test(range))
+							cost[range].infinite = true;
+
+					if ((false /* !rematerializable(range) */ || !needLoad.test(range)) && !alreadyStored.test(range))
+						cost[range].stores += weight;
+
+					needLoad.clear(range);
+				}
+
+			if (instruction.getFlags() & ifCopy)
+				for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister())
+						if (!live.test(name2range[usePtr->getRegisterName()])) {
+							for (SparseSet::iterator l = needLoad.begin(); !needLoad.done(l); l = needLoad.advance(l)) {
+								Uint32 range = needLoad.get(l);
+								cost[range].loads += weight;
+								mustSpill.set(range);
+							}
+							needLoad.clear();
+						}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					live.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+
+					live.set(range);
+					needLoad.set(range);
+				}
+
+			if (instruction.getFlags() & ifCopy) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				assert(defineBegin != defineEnd && defineBegin[0].isRegister());
+
+				RegisterName source = name2range[useBegin[0].getRegisterName()];
+				RegisterName destination = name2range[defineBegin[0].getRegisterName()];
+
+				cost[source].copies += weight;
+				cost[destination].copies += weight;
+			}			
+		}
+
+		for (SparseSet::iterator s = needLoad.begin(); !needLoad.done(s); s = needLoad.advance(s))
+			cost[needLoad.get(s)].loads += weight;
+	}
+	
+	for (Uint32 r = 0; r < rangeCount; r++) {
+		SpillCost& c = cost[r];
+		c.cost = 2 * (c.loads + c.stores) - c.copies;
+	}
+
+	registerAllocator.spillCost = cost;
+}
+
+#endif // _SPILLING_H_

mozilla/ef/Compiler/RegisterAllocator/Splits.h

@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _SPLITS_H_
+#define _SPLITS_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+template <class RegisterPressure>
+struct Splits
+{
+	static void calculateSplitCosts(RegisterAllocator& registerAllocator);
+	static bool findSplit(RegisterAllocator& registerAllocator, RegisterName* color, RegisterName range);
+	static void insertSplitCode(RegisterAllocator& registerAllocator);
+};
+
+struct SplitCost
+{
+	double loads;
+	double stores;
+};
+
+template <class RegisterPressure>
+void Splits<RegisterPressure>::insertSplitCode(RegisterAllocator& /*registerAllocator*/)
+{
+	// FIX
+}
+
+template <class RegisterPressure>
+bool Splits<RegisterPressure>::findSplit(RegisterAllocator& registerAllocator, RegisterName* color, RegisterName range)
+{
+	Pool& pool = registerAllocator.pool;
+	NameLinkedList** neighborsWithColor = new(pool) NameLinkedList*[6]; // FIX
+	memset(neighborsWithColor, '\0', 6 * sizeof(NameLinkedList*));
+
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+
+	for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+		for (Int32 i = vector->count - 1; i >=0; --i) {
+			RegisterName neighbor = vector->neighbors[i];
+			RegisterName c = color[neighbor];
+
+			if (c < 6) { // FIX
+				NameLinkedList* node = new(pool) NameLinkedList();
+				node->name = neighbor;
+				node->next = neighborsWithColor[c];
+				neighborsWithColor[c] = node;
+			}
+		}
+
+	bool splitAroundName = true;
+
+	LiveRangeGraph<RegisterPressure>& lGraph = registerAllocator.lGraph;
+	RegisterName bestColor = RegisterName(6); // FIX
+	double bestCost = registerAllocator.spillCost[range].cost;
+	SplitCost* splitCost = registerAllocator.splitCost;
+
+	for (RegisterName i = RegisterName(0); i < 6; i = RegisterName(i + 1)) { // FIX
+
+		double splitAroundNameCost = 0.0;
+		bool canSplitAroundName = true;
+
+		SplitCost& sCost = splitCost[range];
+		double addedCost = 2.0 * (sCost.stores + sCost.loads);
+
+		for (NameLinkedList* node = neighborsWithColor[i]; node != NULL; node = node->next) {
+			RegisterName neighbor = node->name;
+			if (lGraph.haveEdge(neighbor, range)) {
+				canSplitAroundName = false;
+				break;
+			} else
+				splitAroundNameCost += addedCost;
+		}
+		if (canSplitAroundName && splitAroundNameCost < bestCost) {
+			bestCost = splitAroundNameCost;
+			bestColor = i;
+			splitAroundName = true;
+		}
+
+		double splitAroundColorCost = 0.0;
+		bool canSplitAroundColor = true;
+
+		for (NameLinkedList* node = neighborsWithColor[i]; node != NULL; node = node->next) {
+			RegisterName neighbor = node->name;
+			if (lGraph.haveEdge(range, neighbor)) {
+				canSplitAroundColor = false;
+				break;
+			} else {
+				SplitCost& sCost = splitCost[neighbor];
+				double addedCost = 2.0 * (sCost.stores + sCost.loads);
+				splitAroundColorCost += addedCost;
+			}
+		}
+		if (canSplitAroundColor && splitAroundColorCost < bestCost) {
+			bestCost = splitAroundColorCost;
+			bestColor = i;
+			splitAroundName = false;
+		}
+ 	}
+	if (bestColor < RegisterName(6)) {
+		color[range] = bestColor;
+		registerAllocator.splitFound = true;
+
+		NameLinkedList** splitAround = registerAllocator.splitAround;
+
+		if (splitAroundName)
+			for (NameLinkedList* node = neighborsWithColor[bestColor]; node != NULL; node = node->next) {
+				NameLinkedList* newNode = new(pool) NameLinkedList();
+				newNode->name = node->name;
+				newNode->next = splitAround[range];
+				splitAround[range] = newNode;
+			}
+		else
+			for (NameLinkedList* node = neighborsWithColor[bestColor]; node != NULL; node = node->next) {
+				NameLinkedList* newNode = new(pool) NameLinkedList();
+				RegisterName neighbor = node->name;
+				newNode->name = range;
+				newNode->next = splitAround[neighbor];
+				splitAround[neighbor] = newNode;
+			}
+
+		trespass("Found a split");
+		return true;
+	}
+
+	return false;
+}
+
+template <class RegisterPressure>
+void Splits<RegisterPressure>::calculateSplitCosts(RegisterAllocator& registerAllocator)
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	SplitCost* splitCost = new(pool) SplitCost[rangeCount];
+	memset(splitCost, '\0', rangeCount * sizeof(SplitCost));
+
+	SparseSet live(pool, rangeCount);
+	RegisterPressure::Set* liveIn = registerAllocator.liveness.liveIn;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		double weight = doLog10(node.loopDepth);
+
+		live = liveOut[n];
+
+		ControlEdge* successorsEnd = node.getSuccessorsEnd();
+		for (ControlEdge* successorsPtr = node.getSuccessorsBegin(); successorsPtr < successorsEnd; successorsPtr++) {
+			ControlNode& successor = successorsPtr->getTarget();
+
+			if (successor.getControlKind() != ckEnd) {
+				RegisterPressure::Set& successorLiveIn = liveIn[successor.dfsNum];
+
+				for (SparseSet::iterator i = live.begin(); !live.done(i); i = live.advance(i)) {
+					RegisterName name = RegisterName(live.get(i));
+					if (!successorLiveIn.test(name))
+						splitCost[name].loads += doLog10(successor.loopDepth);
+				}
+			}
+		}
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					splitCost[name2range[definePtr->getRegisterName()]].stores += weight;
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+					if (!live.test(range)) {
+						if (&instruction != &instructions.last())
+							splitCost[range].loads += weight;
+						else {
+							ControlEdge* successorsEnd = node.getSuccessorsEnd();
+							for (ControlEdge* successorsPtr = node.getSuccessorsBegin(); successorsPtr < successorsEnd; successorsPtr++)
+								splitCost[range].loads += doLog10(successorsPtr->getTarget().loopDepth);
+						}
+					}
+				}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					live.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					live.set(name2range[usePtr->getRegisterName()]);
+		}
+	}
+
+	NameLinkedList** splitAround = new(pool) NameLinkedList*[rangeCount];
+	memset(splitAround, '\0', rangeCount * sizeof(NameLinkedList*));
+	registerAllocator.splitAround = splitAround;
+
+	registerAllocator.splitCost = splitCost;
+	registerAllocator.splitFound = false;
+}
+
+#endif // _SPLITS_H_

mozilla/ef/Compiler/RegisterAllocator/Timer.cpp

@@ -0,0 +1,186 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "HashTable.h"
+#include "Timer.h"
+#include "Pool.h"
+
+static Pool pool;											// Pool for the Timer class.
+static HashTable<TimerEntry*> timerEntries(pool);			// Timers hashtable.
+
+const nTimersInABlock = 128;								// Number of timers in a block.
+static PRTime *timers = new(pool) PRTime[nTimersInABlock];	// A block of timers.
+static Uint8 nextTimer = 0;									// nextAvailableTimer.
+
+//
+// Calibrate the call to PR_Now().
+//
+static PRTime calibrate()
+{
+	PRTime t = PR_Now();
+	PRTime& a = *new(pool) PRTime();
+
+	// Call 10 times the PR_Now() function.
+	a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); 
+	a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); 
+	t = (PR_Now() - t + 9) / 10;
+
+	return t;
+}
+
+static PRTime adjust = calibrate();
+
+//
+// Return the named timer..
+//
+TimerEntry& Timer::getTimerEntry(const char* name)
+{
+	if (!timerEntries.exists(name)) {
+		TimerEntry* newEntry = new(pool) TimerEntry();
+		newEntry->accumulator = 0;
+		newEntry->running = false;
+		timerEntries.add(name, newEntry);
+	}
+
+	return *timerEntries[name];
+}
+
+//
+// Return a reference to a new timer.
+//
+PRTime& Timer::getNewTimer()
+{
+	if (nextTimer >= nTimersInABlock) {
+		timers = new(pool) PRTime[nTimersInABlock];
+		nextTimer = 0;
+	}
+	return timers[nextTimer++];
+}
+
+static Uint32 timersAreFrozen = 0;
+
+//
+// Start the named timer.
+//
+void Timer::start(const char* name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+	PR_ASSERT(!timer.running);
+
+	timer.accumulator = 0;
+	timer.running = true;
+	timer.done = false;
+
+	unfreezeTimers();
+}
+
+//
+// Stop the named timer.
+//
+void Timer::stop(const char* name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+	PR_ASSERT(timer.running);
+	timer.running = false;
+	timer.done = true;
+
+	unfreezeTimers();
+}
+
+//
+// Freeze all the running timers.
+//
+void Timer::freezeTimers()
+{
+	PRTime when = PR_Now() - adjust;
+
+	if (timersAreFrozen == 0) {
+		Vector<TimerEntry*> entries = timerEntries;
+		Uint32 count = entries.size();
+
+		for (Uint32 i = 0; i < count; i++) {
+			TimerEntry& entry = *entries[i];
+			if (entry.running) {
+				entry.accumulator += (when - *entry.startTime);
+			}
+		}
+	}
+	timersAreFrozen++;
+}
+ 
+//
+// Unfreeze all the running timers.
+//
+void Timer::unfreezeTimers()
+{
+	PR_ASSERT(timersAreFrozen != 0);
+	timersAreFrozen--;
+
+	if (timersAreFrozen == 0) {
+		Vector<TimerEntry *> entries = timerEntries;
+		Uint32 count = entries.size();
+		
+		PRTime& newStart = getNewTimer();
+		
+		for (Uint32 i = 0; i < count; i++) {
+			TimerEntry& entry = *entries[i];
+			if (entry.running) {
+				entry.startTime = &newStart;
+			}
+		}
+		
+		newStart = PR_Now();
+	}
+}
+
+//
+// Print the named timer in the file f.
+//
+void Timer::print(FILE* f, const char *name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+  
+	PR_ASSERT(timer.done);
+	PRTime elapsed = timer.accumulator;
+
+	if (elapsed >> 32) {
+		fprintf(f, "[timer %s out of range]\n", name);
+	} else {
+		fprintf(f, "[%dus in %s]\n", Uint32(elapsed), name);
+	}
+	fflush(f);
+
+	unfreezeTimers();
+}
+

mozilla/ef/Compiler/RegisterAllocator/Timer.h

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _TIMER_H_
+#define _TIMER_H_
+
+#include "Fundamentals.h"
+#include "HashTable.h"
+#include "prtime.h"
+
+//
+// Naming convention:
+//  As the class Timer contains only static methods, the timer's name should start with the 
+//  module name. Otherwise starting 2 timers with the same name will assert.
+//
+
+#ifndef NO_TIMER
+
+struct TimerEntry
+{
+	PRTime *startTime;					// Current time when we start the timer.
+	PRTime accumulator;					// Time spent in this timer.
+	bool running;						// True if the timer is running.
+	bool done;							// True if the timer was running and was stopped. 
+};
+
+class Timer
+{
+private:
+
+	// Return the named timer.
+	static TimerEntry& getTimerEntry(const char* name);
+	// Return a reference to a new Timer.
+	static PRTime& getNewTimer();
+
+public:
+
+	// Start the timer.
+	static void start(const char* name);
+	// Stop the timer.
+	static void stop(const char* name);
+	// Freeze all the running timers.
+	static void freezeTimers();
+	// Unfreeze all the running timers.
+	static void unfreezeTimers();
+	// Print the timer.
+	static void print(FILE* f, const char *name);
+};
+
+inline void startTimer(const char* name) 		{Timer::start(name);}
+inline void stopTimer(const char* name) 		{Timer::stop(name); Timer::print(stdout, name);}
+#define START_TIMER_SAFE						Timer::freezeTimers();
+#define END_TIMER_SAFE							Timer::unfreezeTimers();
+#define TIMER_SAFE(x)							START_TIMER_SAFE x; END_TIMER_SAFE
+
+#else /* NO_TIMER */
+
+inline void startTimer(const char* /*name*/) 	{} 
+inline void stopTimer(const char* /*name*/) 	{} 
+#define START_TIMER_SAFE
+#define END_TIMER_SAFE
+#define TIMER_SAFE(x)							x;
+
+#endif /* NO_TIMER */
+#endif /* _TIMER_H_ */

mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.cpp

@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "VirtualRegister.h"
+#include "Instruction.h"
+
+//------------------------------------------------------------------------------
+// VirtualRegister -
+
+#ifdef MANUAL_TEMPLATES
+template class IndexedPool<VirtualRegister>;
+#endif
+
+// Set the defining instruction.
+//
+void VirtualRegister::setDefiningInstruction(Instruction& instruction)
+{
+	if (definingInstruction != NULL) {
+		if ((instruction.getFlags() & ifCopy) && (definingInstruction->getFlags() & ifPhiNode))
+			return;
+	}
+	definingInstruction = &instruction;
+}
+

mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.h

@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _VIRTUAL_REGISTER_H_
+#define _VIRTUAL_REGISTER_H_
+
+#include "Fundamentals.h"
+#include "IndexedPool.h"
+#include <string.h>
+
+#include "RegisterTypes.h"
+#include "RegisterClass.h"
+
+
+//------------------------------------------------------------------------------
+// VirtualRegister - 24b
+
+class Instruction;
+
+class VirtualRegister : public IndexedObject<VirtualRegister>
+{
+public:
+
+	Instruction*					definingInstruction;	// Instruction defining this VR.
+
+	// Initialize a VR of the given classKind.
+	VirtualRegister(RegisterClassKind /*classKind*/) : definingInstruction(NULL) {}
+
+	// Return the defining instruction for this VR.
+	Instruction* getDefiningInstruction() const {return definingInstruction;}
+	// Set the defining instruction.
+	void setDefiningInstruction(Instruction& insn);
+};
+
+// Return true if the VirtualRegisters are equals. The only way 2 VRs can be equal is if
+// they have the same index. If they have the same index then they are at the same
+// address in the indexed pool.
+//
+inline bool operator == (const VirtualRegister& regA, const VirtualRegister& regB) {return &regA == &regB;}
+
+//------------------------------------------------------------------------------
+// VirtualRegisterManager -
+
+struct PreColoredRegister
+{
+	RegisterID id;
+	RegisterName color;
+};
+
+class VirtualRegisterManager
+{
+private:
+
+	IndexedPool<VirtualRegister> registerPool;
+	PreColoredRegister machineRegister[6];
+
+public:
+	VirtualRegisterManager()
+		{
+			for (Uint32 i = 0; i < 6; i++)
+				machineRegister[i].id = invalidID;
+		}
+
+	// Return the VirtualRegister at the given index.
+	VirtualRegister& getVirtualRegister(RegisterName name) const {return registerPool.get(name);}
+
+	// Return a new VirtualRegister.
+	RegisterID newVirtualRegister(RegisterClassKind classKind)
+		{
+			VirtualRegister& vReg = *new(registerPool) VirtualRegister(classKind);
+			RegisterID rid;
+
+			setName(rid, RegisterName(vReg.getIndex()));
+			setClass(rid, classKind);
+			return rid;
+		}
+
+	RegisterID newMachineRegister(RegisterName name, RegisterClassKind classKind)
+		{
+			RegisterID rid = machineRegister[name].id;
+
+			if (rid == invalidID) {
+				rid = newVirtualRegister(classKind);
+				DEBUG_ONLY(setMachineRegister(rid));
+				machineRegister[name].id = rid;
+				machineRegister[name].color = name;
+			}
+
+			return rid;
+		}
+
+	PreColoredRegister* getMachineRegistersBegin() const {return (PreColoredRegister*) machineRegister;} // FIX
+	PreColoredRegister* getMachineRegistersEnd() const {return (PreColoredRegister*) &machineRegister[6];} // FIX
+
+	// Return the VirtualRegister universe size.
+	Uint32 getSize() {return registerPool.getSize();}
+
+	void setSize(Uint32 size) {registerPool.setSize(size);}
+};
+
+#endif // _VIRTUAL_REGISTER_H_

mozilla/embedding/browser/powerplant/source/CProfileManager.cpp

@@ -1,423 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc.  Portions created by Netscape are
- * Copyright (C) 1999, Mozilla.  All Rights Reserved.
- * 
- * Contributor(s):
- *   Conrad Carlen <ccarlen@netscape.com>
- */
-
-// PPBrowser
-#include "CProfileManager.h"
-#include "ApplIDs.h"
-#include "UMacUnicode.h"
-
-// PowerPlant
-#include <LEditText.h>
-#include <LTextTableView.h>
-#include <LPushButton.h>
-#include <LTableMonoGeometry.h>
-#include <LTableArrayStorage.h>
-#include <LTableSingleSelector.h>
-#include <LCheckBox.h>
-
-
-// Mozilla
-#include "nsIProfile.h"
-#include "nsIDirectoryService.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIObserverService.h"
-#include "nsXPIDLString.h"
-#include "nsIRegistry.h"
-
-// Constants
-
-const MessageT    msg_OnNewProfile 	        = 2000;
-const MessageT    msg_OnDeleteProfile 	    = 2001;
-const MessageT    msg_OnRenameProfile 	    = 2002;
-
-#define kRegistryGlobalPrefsSubtreeString (NS_LITERAL_STRING("global-prefs"))
-#define kRegistryShowProfilesAtStartup "start-show-dialog"
-
-//*****************************************************************************
-//***    CProfileManager
-//*****************************************************************************
-
-CProfileManager::CProfileManager() :
-    LAttachment(msg_AnyMessage,true)
-{
-}
-
-CProfileManager::~CProfileManager()
-{
-}
-
-void CProfileManager::StartUp()
-{
-    nsresult rv;
-         
-    NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-    ThrowIfNil_(profileService);
-        
-    PRInt32 profileCount;
-    rv = profileService->GetProfileCount(&profileCount);
-    ThrowIfError_(rv);
-    if (profileCount == 0)
-    {
-        // Make a new default profile
-        NS_NAMED_LITERAL_STRING(newProfileName, "default");
-
-        rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
-        ThrowIfError_(rv);
-        rv = profileService->SetCurrentProfile(newProfileName.get());
-        ThrowIfError_(rv);
-    }
-    else
-    {
-        // Use our flag here to check for whether to show profile mgr UI. If the flag
-        // says don't show it, just start with the last used profile.
-        
-        PRBool showIt;
-        rv = GetShowDialogOnStart(&showIt);
-                        
-        if (NS_FAILED(rv) || (profileCount > 1 && showIt))
-        {
-            DoManageProfilesDialog();
-        }
-        else
-        {
-            // GetCurrentProfile returns the profile which was last used but is not nescesarily
-            // active. Call SetCurrentProfile to make it installed and active.
-            
-            nsXPIDLString   currProfileName;
-            rv = profileService->GetCurrentProfile(getter_Copies(currProfileName));
-            ThrowIfError_(rv);
-            rv = profileService->SetCurrentProfile(currProfileName);
-            ThrowIfError_(rv);
-        }    
-    }
-}
-
-Boolean CProfileManager::DoNewProfileDialog(char *outName, UInt32 bufSize)
-{
-    Boolean confirmed;
-    StDialogHandler	theHandler(dlog_NewProfile, LCommander::GetTopCommander());
-    LWindow			 *theDialog = theHandler.GetDialog();
-    
-    ThrowIfNil_(theDialog);
-    LEditText *responseText = dynamic_cast<LEditText*>(theDialog->FindPaneByID('Name'));
-    ThrowIfNil_(responseText);
-    theDialog->SetLatentSub(responseText);
-
-    theDialog->Show();
-    theDialog->Select();
-	
-  	while (true)  // This is our modal dialog event loop
-  	{				
-  		MessageT	hitMessage = theHandler.DoDialog();
-  		
-  		if (hitMessage == msg_OK)
-  		{
-  		    Str255 pStr;
-  		    UInt32 outLen;
-  		    
- 		    responseText->GetDescriptor(pStr);
- 		    outLen = pStr[0] >= bufSize ? bufSize - 1 : pStr[0];
- 		    memcpy(outName, &pStr[1], outLen);
- 		    outName[outLen] = '\0'; 
-            confirmed = PR_TRUE;
-     		break;
-   		}
-   		else if (hitMessage == msg_Cancel)
-   		{
-   		    confirmed = PR_FALSE;
-   		    break;
-   		}
-  	}
-  	return confirmed;
-}
-
-
-void CProfileManager::DoManageProfilesDialog()
-{
-    nsresult rv;
-    StDialogHandler	theHandler(dlog_ManageProfiles, LCommander::GetTopCommander());
-    LWindow			 *theDialog = theHandler.GetDialog();
-
-    NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-    ThrowIfNil_(profileService);
-        
-    // Set up the dialog by filling the list of current profiles
-    LTextTableView *table = (LTextTableView*) theDialog->FindPaneByID('List');    
-    ThrowIfNil_(table);
-    LPushButton *deleteButton = (LPushButton *) theDialog->FindPaneByID('Dele');
-    ThrowIfNil_(deleteButton);
-    
-    //Str255 pascalStr;
-    nsAutoString unicodeStr;
-    nsCAutoString cStr;
-    char dataBuf[256];
-    UInt32 dataSize;
-    
-    // PowerPlant stuff to set up the list view
-    STableCell selectedCell(1, 1);
-    SDimension16 tableSize;
-    TableIndexT rows, cols;
-
-    table->GetFrameSize(tableSize);
-	table->SetTableGeometry(new LTableMonoGeometry(table, tableSize.width, 16));
-	table->SetTableStorage(new LTableArrayStorage(table, 0UL));
-	table->SetTableSelector(new LTableSingleSelector(table));
-	table->InsertCols(1, 0);
-
-    // Get the name of the current profile so we can select it
-    nsXPIDLString   currProfileName;
-    profileService->GetCurrentProfile(getter_Copies(currProfileName));
-    
-    // Get the list of profile names and add them to the list
-    PRUint32 listLen;
-    PRUnichar **profileList;
-    rv = profileService->GetProfileList(&listLen, &profileList);
-    ThrowIfError_(rv);
-    
-    for (PRUint32 index = 0; index < listLen; index++)
-    {
-          CPlatformUCSConversion::GetInstance()->UCSToPlatform(nsLiteralString(profileList[index]), cStr);
-          table->InsertRows(1, LONG_MAX, cStr.get(), cStr.Length(), true);
-          
-          if (nsCRT::strcmp(profileList[index], currProfileName.get()) == 0)
-            selectedCell.row = index + 1;
-    }
-    
-    PRInt32 numProfiles;
-    rv = profileService->GetProfileCount(&numProfiles);
-    ThrowIfError_(rv);    
-    (numProfiles > 1) ? deleteButton->Enable() : deleteButton->Disable();
-    table->SelectCell(selectedCell);
-
-
-    // Handle the "Ask At StartUp" checkbox    
-    LCheckBox *showAtStartCheck = (LCheckBox*) theDialog->FindPaneByID('Show');
-    ThrowIfNil_(showAtStartCheck);
-    PRBool showIt;
-    rv = GetShowDialogOnStart(&showIt);
-    if (NS_FAILED(rv))
-        showIt = PR_TRUE;
-    showAtStartCheck->SetValue(showIt);
-
-    
-    theDialog->Show();
-    theDialog->Select();
-	
-  	while (true)  // This is our modal dialog event loop
-  	{				
-  		MessageT	hitMessage = theHandler.DoDialog();
-  		
-  		if (hitMessage == msg_OK)
-  		{
-  		    theDialog->Hide();
-            SetShowDialogOnStart(showAtStartCheck->GetValue());
-   		    selectedCell = table->GetFirstSelectedCell();
-   		    if (selectedCell.row > 0)
-   		    {
-   		        dataSize = sizeof(dataBuf) - 1;
-   		        table->GetCellData(selectedCell, dataBuf, dataSize);
-   		        dataBuf[dataSize] = '\0';
-                CPlatformUCSConversion::GetInstance()->PlatformToUCS(nsLiteralCString(dataBuf), unicodeStr);
-   		        rv = profileService->SetCurrentProfile(unicodeStr.GetUnicode());
-            }
-  		    break;
-  		}
-        else if (hitMessage == msg_Cancel)
-        {
-           	break;
-        }
-        else if (hitMessage == msg_OnNewProfile)
-   		{
-   		    if (DoNewProfileDialog(dataBuf, sizeof(dataBuf)))
-   		    {
-   		        CPlatformUCSConversion::GetInstance()->PlatformToUCS(nsLiteralCString(dataBuf), unicodeStr);
-   		        rv = profileService->CreateNewProfile(unicodeStr.GetUnicode(), nsnull, nsnull, PR_FALSE);
-   		        if (NS_FAILED(rv))
-   		            break;
-   		        
-                table->InsertRows(1, LONG_MAX, dataBuf, strlen(dataBuf), true);
-                table->GetTableSize(rows, cols);
-                table->SelectCell(STableCell(rows, cols));
-                
-                rv = profileService->GetProfileCount(&numProfiles);
-                (NS_SUCCEEDED(rv) && numProfiles > 1) ? deleteButton->Enable() : deleteButton->Disable();
-   		    }    
-   		}
-   		else if (hitMessage == msg_OnDeleteProfile)
-   		{
-   		    selectedCell = table->GetFirstSelectedCell();
-   		    if (selectedCell.row > 0)
-   		    {
-   		        dataSize = sizeof(dataBuf) - 1;
-   		        table->GetCellData(selectedCell, dataBuf, dataSize);
-   		        dataBuf[dataSize] = '\0';
-   		        CPlatformUCSConversion::GetInstance()->PlatformToUCS(nsLiteralCString(dataBuf), unicodeStr);
-   		        
-   		        rv = profileService->DeleteProfile(unicodeStr.GetUnicode(), PR_TRUE);
-   		        if (NS_FAILED(rv))
-   		            break;
-   		        
-   		        table->RemoveRows(1, selectedCell.row, true);
-   		        table->GetTableSize(rows, cols);    
-   		        if (selectedCell.row >= rows)
-   		            selectedCell.row = rows - 1;
-   		        table->SelectCell(selectedCell);
-   		        
-                rv = profileService->GetProfileCount(&numProfiles);
-                (NS_SUCCEEDED(rv) && numProfiles > 1) ? deleteButton->Enable() : deleteButton->Disable();
-   		    }
-   		}
-   		else if (hitMessage == msg_OnRenameProfile)
-   		{
-	        nsAutoString oldName;
-
-   		    selectedCell = table->GetFirstSelectedCell();
-	        dataSize = sizeof(dataBuf) - 1;
-	        table->GetCellData(selectedCell, dataBuf, dataSize);
-	        dataBuf[dataSize] = '\0';
-	        CPlatformUCSConversion::GetInstance()->PlatformToUCS(nsLiteralCString(dataBuf), oldName);
-
-   		    if (DoNewProfileDialog(dataBuf, sizeof(dataBuf)))
-   		    {
-   		        CPlatformUCSConversion::GetInstance()->PlatformToUCS(nsLiteralCString(dataBuf), unicodeStr);
-                profileService->RenameProfile(oldName.GetUnicode(), unicodeStr.GetUnicode());
-                table->SetCellData(selectedCell, dataBuf, strlen(dataBuf)); 		        
-   		    }
-   		}
-  	}  
-}
-
-/*
-    The following three methods have nothing to do with profile management per se.
-    They use the registry to store a flag which allows the user to choose whether
-    to show the profile manager dialog at startup. After all, since we can switch
-    it at any time - why must we deal with the dialog every time we start the app?
-*/
-
-nsresult CProfileManager::GetShowDialogOnStart(PRBool* showIt)
-{
-    nsresult rv = NS_OK;
-        
-    *showIt = PR_TRUE;
-                
-    nsCOMPtr<nsIRegistry> registry;    
-    rv = OpenAppRegistry(getter_AddRefs(registry));
-    if (NS_FAILED(rv)) return rv;
-
-    nsRegistryKey profilesTreeKey;
-    
-    rv = registry->GetKey(nsIRegistry::Common, 
-                          kRegistryGlobalPrefsSubtreeString.get(), 
-                          &profilesTreeKey);
-
-    if (NS_SUCCEEDED(rv)) 
-    {
-        PRInt32 flagValue;
-        rv = registry->GetInt(profilesTreeKey, 
-                              kRegistryShowProfilesAtStartup, 
-                              &flagValue);
-         
-        if (NS_SUCCEEDED(rv))
-            *showIt = (flagValue != 0);
-    }
-    return rv;        
-}
-
-nsresult CProfileManager::SetShowDialogOnStart(PRBool showIt)
-{
-
-    nsresult rv = NS_OK;
-                        
-    nsCOMPtr<nsIRegistry> registry;    
-    rv = OpenAppRegistry(getter_AddRefs(registry));
-    if (NS_FAILED(rv)) return rv;
-
-    nsRegistryKey profilesTreeKey;
-    
-    rv = registry->GetKey(nsIRegistry::Common, 
-                          kRegistryGlobalPrefsSubtreeString.get(), 
-                          &profilesTreeKey);
-
-    if (NS_FAILED(rv)) 
-    {
-        rv = registry->AddKey(nsIRegistry::Common, 
-                              kRegistryGlobalPrefsSubtreeString.get(), 
-                              &profilesTreeKey);
-    }
-    if (NS_SUCCEEDED(rv))
-    {
-    
-        rv = registry->SetInt(profilesTreeKey, 
-                              kRegistryShowProfilesAtStartup, 
-                              showIt);
-    }
-    
-    return rv;        
-}
-
-
-nsresult CProfileManager::OpenAppRegistry(nsIRegistry **aRegistry)
-{
-    NS_ENSURE_ARG_POINTER(aRegistry);
-    
-    nsresult rv;
-    nsCOMPtr<nsIFile> regFile;
-    nsXPIDLCString regFilePath;
-            
-    rv = NS_GetSpecialDirectory(NS_APP_APPLICATION_REGISTRY_FILE, getter_AddRefs(regFile));
-    if (NS_FAILED(rv)) return rv;
-    rv = regFile->GetPath(getter_Copies(regFilePath));   
-    if (NS_FAILED(rv)) return rv;
-    
-    nsCOMPtr<nsIRegistry> registry(do_CreateInstance(NS_REGISTRY_CONTRACTID, &rv));
-    if (NS_FAILED(rv)) return rv;
-    rv = registry->Open(regFilePath);
-    if (NS_FAILED(rv)) return rv;
-    
-    *aRegistry = registry;
-    NS_IF_ADDREF(*aRegistry);
-    return NS_OK;
-}
-
-
-//*****************************************************************************
-//***    CProfileManager::LAttachment
-//*****************************************************************************
-
-void CProfileManager::ExecuteSelf(MessageT inMessage, void *ioParam)
-{
-	mExecuteHost = true;
-	// update status
-	if (inMessage == msg_CommandStatus) {
-		SCommandStatus	*status = (SCommandStatus *)ioParam;
-		if (status->command == cmd_ManageProfiles) {
-			*status->enabled = true;
-			*status->usesMark = false;
-			mExecuteHost = false; // we handled it
-		}
-	}
-	else if (inMessage == cmd_ManageProfiles) {
-	    DoManageProfilesDialog();
-	    mExecuteHost = false; // we handled it
-	}
-}

mozilla/htmlparser/src/nsLoggingSink.cpp

@@ -1,789 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- *  Notes: 
- *    The logging sink is now both a sink and a proxy. 
- *    If you want to dump the calls from the parser to the sink, 
- *    create a content sink as usual and hand it to the parser.
- *  
- *    If you want to use a normal sink AND simultaneously have a
- *    parse-log generated, you can set an environment variable
- *    and a logging sink will be created. It will act as a proxy
- *    to the REAL sink you are using after it logs the call. This
- *    form of the loggingsink is constructed using the version
- *    that accepts an nsIHTMLContentSink*.
- *
- * Contributor(s): 
- */
-#include "nsLoggingSink.h"
-#include "nsHTMLTags.h"
-#include "nsString.h"
-#include "prprf.h"
-
-static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
-static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
-static NS_DEFINE_IID(kILoggingSinkIID, NS_ILOGGING_SINK_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-// list of tags that have skipped content
-static char gSkippedContentTags[] = {
-  eHTMLTag_style,
-  eHTMLTag_script,
-  eHTMLTag_server,
-  eHTMLTag_textarea,
-  eHTMLTag_title,
-  0
-};
-
-
-nsresult
-NS_NewHTMLLoggingSink(nsIContentSink** aInstancePtrResult)
-{
-  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-  if (nsnull == aInstancePtrResult) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  nsLoggingSink* it = new nsLoggingSink();
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kIContentSinkIID, (void**) aInstancePtrResult);
-}
-
-nsLoggingSink::nsLoggingSink() {
-  NS_INIT_REFCNT();
-  mOutput = 0;
-	mLevel=-1;
-  mSink=0;
-}
-
-nsLoggingSink::~nsLoggingSink() { 
-  mSink=0;
-  if(mOutput && mAutoDeleteOutput) {
-    delete mOutput;
-  }
-  mOutput=0;
-}
-
-NS_IMPL_ADDREF(nsLoggingSink)
-NS_IMPL_RELEASE(nsLoggingSink)
-
-nsresult
-nsLoggingSink::QueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-  NS_PRECONDITION(nsnull != aInstancePtr, "null ptr");
-  if (nsnull == aInstancePtr) {                                            
-    return NS_ERROR_NULL_POINTER;                                        
-  }                                                                      
-  if (aIID.Equals(kISupportsIID)) {
-    nsISupports* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else if (aIID.Equals(kIContentSinkIID)) {
-    nsIContentSink* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else if (aIID.Equals(kIHTMLContentSinkIID)) {
-    nsIHTMLContentSink* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else if (aIID.Equals(kILoggingSinkIID)) {
-    nsILoggingSink* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else {
-    *aInstancePtr = nsnull;
-    return NS_NOINTERFACE;
-  }
-  NS_ADDREF(this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::SetOutputStream(PRFileDesc *aStream,PRBool autoDeleteOutput) {
-  mOutput = aStream;
-  mAutoDeleteOutput=autoDeleteOutput;
-  return NS_OK;
-}
-
-static
-void WriteTabs(PRFileDesc * out,int aTabCount) {
-  int tabs;
-  for(tabs=0;tabs<aTabCount;tabs++)
-    PR_fprintf(out, "  ");
-}
-
-
-NS_IMETHODIMP
-nsLoggingSink::WillBuildModel() {
-  
-  WriteTabs(mOutput,++mLevel);
-  PR_fprintf(mOutput, "<begin>\n");
-  
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    mSink->WillBuildModel();
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::DidBuildModel(PRInt32 aQualityLevel) {
-  
-  WriteTabs(mOutput,--mLevel);
-  PR_fprintf(mOutput, "</begin>\n");
-
-  //proxy the call to the real sink if you have one.
-  nsresult theResult=NS_OK;
-  if(mSink) {
-    theResult=mSink->DidBuildModel(aQualityLevel);
-  }
-
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::WillInterrupt() {
-  nsresult theResult=NS_OK;
-
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->WillInterrupt();
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::WillResume() {
-  nsresult theResult=NS_OK;
-
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->WillResume();
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::SetParser(nsIParser* aParser)  {
-  nsresult theResult=NS_OK;
-
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->SetParser(aParser);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenContainer(const nsIParserNode& aNode) {
-
-  OpenNode("container", aNode); //do the real logging work...
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenContainer(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseContainer(const nsIParserNode& aNode) {
-
-  nsresult theResult=NS_OK;
-
-  nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
-  if ((nodeType >= eHTMLTag_unknown) &&
-      (nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
-    const char* tag = nsHTMLTags::GetStringValue(nodeType);
-		theResult=CloseNode(tag);
-	}
-	else theResult= CloseNode("???");
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseContainer(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::AddLeaf(const nsIParserNode& aNode) {
-  LeafNode(aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddLeaf(aNode);
-  }
-  
-  return theResult;
-
-} 
-
-
-NS_IMETHODIMP 
-nsLoggingSink::NotifyError(const nsParserError* aError) {
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->NotifyError(aError);
-  }
-  
-  return theResult;
-}
-
-
-/**
- *  This gets called by the parser when you want to add
- *  a PI node to the current container in the content
- *  model.
- *  
- *  @updated gess 3/25/98
- *  @param   
- *  @return  
- */
-NS_IMETHODIMP
-nsLoggingSink::AddProcessingInstruction(const nsIParserNode& aNode){
-
-#ifdef VERBOSE_DEBUG
-  DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
-#endif
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddProcessingInstruction(aNode);
-  }
-  
-  return theResult;
-}
-
-/**
- *  This gets called by the parser when it encounters
- *  a DOCTYPE declaration in the HTML document.
- */
-
-NS_IMETHODIMP
-nsLoggingSink::AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode) {
-
-#ifdef VERBOSE_DEBUG
-  DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
-#endif
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddDocTypeDecl(aNode,aMode);
-  }
-  
-  return theResult;
-
-}
-
-/**
- *  This gets called by the parser when you want to add
- *  a comment node to the current container in the content
- *  model.
- *  
- *  @updated gess 3/25/98
- *  @param   
- *  @return  
- */
-NS_IMETHODIMP
-nsLoggingSink::AddComment(const nsIParserNode& aNode){
-
-#ifdef VERBOSE_DEBUG
-  DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
-#endif
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddComment(aNode);
-  }
-  
-  return theResult;
-
-}
-
-
-NS_IMETHODIMP
-nsLoggingSink::SetTitle(const nsString& aValue) {
-   
-  char* tmp;
-  GetNewCString(aValue, &tmp);
-	WriteTabs(mOutput,++mLevel);
-  if(tmp) {
-    PR_fprintf(mOutput, "<title value=\"%s\"/>\n", tmp);
-    nsMemory::Free(tmp);
-  }
-  --mLevel;
-  
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->SetTitle(aValue);
-  }
-  
-  return theResult;
-
-}
-
-
-NS_IMETHODIMP
-nsLoggingSink::OpenHTML(const nsIParserNode& aNode) {
-  OpenNode("html", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenHTML(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseHTML(const nsIParserNode& aNode) {
-  CloseNode("html");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseHTML(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenHead(const nsIParserNode& aNode) {
-  OpenNode("head", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenHead(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseHead(const nsIParserNode& aNode) {
-  CloseNode("head");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseHead(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenBody(const nsIParserNode& aNode) {
-  OpenNode("body", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenBody(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseBody(const nsIParserNode& aNode) {
-  CloseNode("body");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseBody(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenForm(const nsIParserNode& aNode) {
-  OpenNode("form", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenForm(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseForm(const nsIParserNode& aNode) {
-  CloseNode("form");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseForm(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenMap(const nsIParserNode& aNode) {
-  OpenNode("map", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenMap(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseMap(const nsIParserNode& aNode) {
-  CloseNode("map");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseMap(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenFrameset(const nsIParserNode& aNode) {
-  OpenNode("frameset", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenFrameset(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseFrameset(const nsIParserNode& aNode) {
-  CloseNode("frameset");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseFrameset(aNode);
-  }
-  
-  return theResult;
-}
-
-
-nsresult
-nsLoggingSink::OpenNode(const char* aKind, const nsIParserNode& aNode) {
-	WriteTabs(mOutput,++mLevel);
-
-  PR_fprintf(mOutput,"<open container=");
-
-  nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
-  if ((nodeType >= eHTMLTag_unknown) &&
-      (nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
-    const char* tag = nsHTMLTags::GetStringValue(nodeType);
-    PR_fprintf(mOutput, "\"%s\"", tag);
-  }
-  else {
-    char* text;
-    GetNewCString(aNode.GetText(), &text);
-    if(text) {
-      PR_fprintf(mOutput, "\"%s\"", text);
-      nsMemory::Free(text);
-    }
-  }
-
-  if (WillWriteAttributes(aNode)) {
-    PR_fprintf(mOutput, ">\n");
-    WriteAttributes(aNode);
-    PR_fprintf(mOutput, "</open>\n");
-  }
-  else {
-    PR_fprintf(mOutput, ">\n");
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsLoggingSink::CloseNode(const char* aKind) {
-	WriteTabs(mOutput,mLevel--);
-  PR_fprintf(mOutput, "<close container=\"%s\">\n", aKind);
-  return NS_OK;
-}
-
-
-nsresult
-nsLoggingSink::WriteAttributes(const nsIParserNode& aNode) {
-
-  WriteTabs(mOutput,1+mLevel);
-  nsAutoString tmp;
-  PRInt32 ac = aNode.GetAttributeCount();
-  for (PRInt32 i = 0; i < ac; i++) {
-    char* key=nsnull;
-    char* value=nsnull;
-    const nsAReadableString& k = aNode.GetKeyAt(i);
-    const nsString& v = aNode.GetValueAt(i);
-
-    GetNewCString(k, &key);
-    if(key) {
-      PR_fprintf(mOutput, " <attr key=\"%s\" value=\"", key);
-      nsMemory::Free(key);
-    }
- 
-    tmp.Truncate();
-    tmp.Append(v);
-    if(tmp.Length() > 0) {
-      PRUnichar first = tmp.First();
-      if ((first == '"') || (first == '\'')) {
-        if (tmp.Last() == first) {
-          tmp.Cut(0, 1);
-          PRInt32 pos = tmp.Length() - 1;
-          if (pos >= 0) {
-            tmp.Cut(pos, 1);
-          }
-        } else {
-          // Mismatched quotes - leave them in
-        }
-      }
-      GetNewCString(tmp, &value);
-
-      if(value) {
-        PR_fprintf(mOutput, "%s\"/>\n", value);
-        WriteTabs(mOutput,1+mLevel);
-        nsMemory::Free(value);
-      }
-    }
-  }
-
-  if (0 != strchr(gSkippedContentTags, aNode.GetNodeType())) {
-    char* content;
-    GetNewCString(aNode.GetSkippedContent(), &content);
-    if(content) {
-      PR_fprintf(mOutput, " <content value=\"");
-      PR_fprintf(mOutput, "%s\"/>\n", content) ;
-      nsMemory::Free(content);
-    }
-  }
-  WriteTabs(mOutput,1+mLevel);
-  return NS_OK;
-}
-
-PRBool
-nsLoggingSink::WillWriteAttributes(const nsIParserNode& aNode)
-{
-  PRInt32 ac = aNode.GetAttributeCount();
-  if (0 != ac) {
-    return PR_TRUE;
-  }
-  if (0 != strchr(gSkippedContentTags, aNode.GetNodeType())) {
-    const nsString& content = aNode.GetSkippedContent();
-    if (content.Length() > 0) {
-      return PR_TRUE;
-    }
-  }
-  return PR_FALSE;
-}
-
-nsresult
-nsLoggingSink::LeafNode(const nsIParserNode& aNode)
-{
- 	WriteTabs(mOutput,1+mLevel);
-	nsHTMLTag				nodeType  = nsHTMLTag(aNode.GetNodeType());
-
-  if ((nodeType >= eHTMLTag_unknown) &&
-      (nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
-    const char* tag = nsHTMLTags::GetStringValue(nodeType);
-
-		if(tag)
-      PR_fprintf(mOutput, "<leaf tag=\"%s\"", tag);
-    else PR_fprintf(mOutput, "<leaf tag=\"???\"");
-
-    if (WillWriteAttributes(aNode)) {
-			PR_fprintf(mOutput, ">\n");
-      WriteAttributes(aNode);
-			PR_fprintf(mOutput, "</leaf>\n");
-    }
-    else {
-			PR_fprintf(mOutput, "/>\n");
-    }
-  }
-  else {
-    PRInt32 pos;
-    nsAutoString tmp;
-    char* str;
-    switch (nodeType) {
-			case eHTMLTag_whitespace:
-			case eHTMLTag_text:
-        GetNewCString(aNode.GetText(), &str);
-        if(str) {
-          PR_fprintf(mOutput, "<text value=\"%s\"/>\n", str);
-          nsMemory::Free(str);
-        }
-				break;
-
-			case eHTMLTag_newline:
-				PR_fprintf(mOutput, "<newline/>\n");
-				break;
-
-			case eHTMLTag_entity:
-				tmp.Append(aNode.GetText());
-				tmp.Cut(0, 1);
-				pos = tmp.Length() - 1;
-				if (pos >= 0) {
-					tmp.Cut(pos, 1);
-				}
-				PR_fprintf(mOutput, "<entity value=\"%s\"/>\n", tmp.GetBuffer());
-				break;
-
-			default:
-				NS_NOTREACHED("unsupported leaf node type");
-		}//switch
-  }
-  return NS_OK;
-}
-
-nsresult 
-nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) {
-  aResult.Truncate();
-    /*
-      if you're stepping through the string anyway, why not use iterators instead of forcing the string to copy?
-     */
-  nsPromiseFlatString flat(aValue);
-  const PRUnichar* cp = flat.get();
-  const PRUnichar* end = cp + aValue.Length();
-  while (cp < end) {
-    PRUnichar ch = *cp++;
-    if (ch == '"') {
-      aResult.AppendWithConversion("&quot;");
-    }
-    else if (ch == '&') {
-      aResult.AppendWithConversion("&amp;");
-    }
-    else if ((ch < 32) || (ch >= 127)) {
-      aResult.AppendWithConversion("&#");
-      aResult.AppendInt(PRInt32(ch), 10);
-      aResult.AppendWithConversion(';');
-    }
-    else {
-      aResult.Append(ch);
-    }
-  }
-  return NS_OK;
-}
-
-/**
- * Use this method to convert nsString to char*. 
- * REMEMBER: Match this call with nsMemory::Free(aResult);
- * 
- * @update 04/04/99 harishd
- * @param aValue - The string value
- * @param aResult - String coverted to char*.
- */
-nsresult
-nsLoggingSink::GetNewCString(const nsAReadableString& aValue, char** aResult)
-{
-  nsresult result=NS_OK;
-  nsAutoString temp;
-  result=QuoteText(aValue,temp);
-  if(NS_SUCCEEDED(result)) {
-    if(temp.Length()>0) {
-      *aResult=temp.ToNewCString();
-    }
-  }
-  return result;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::DoFragment(PRBool aFlag) 
-{
-  return NS_OK; 
-}
-
-/**
- * This gets called when handling illegal contents, especially
- * in dealing with tables. This method creates a new context.
- * 
- * @update 04/04/99 harishd
- * @param aPosition - The position from where the new context begins.
- */
-NS_IMETHODIMP
-nsLoggingSink::BeginContext(PRInt32 aPosition) 
-{
-  return NS_OK;
-}
-
-/**
- * This method terminates any new context that got created by
- * BeginContext and switches back to the main context.  
- *
- * @update 04/04/99 harishd
- * @param aPosition - Validates the end of a context.
- */
-NS_IMETHODIMP
-nsLoggingSink::EndContext(PRInt32 aPosition)
-{
-  return NS_OK;
-}

mozilla/layout/xul/base/src/nsBoxObject.cpp

@@ -1,411 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsBoxObject.h"
-#include "nsIBoxLayoutManager.h"
-#include "nsIBoxPaintManager.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIDocument.h"
-#include "nsIContent.h"
-#include "nsIStyleContext.h"
-#include "nsIFrame.h"
-#include "nsXPIDLString.h"
-#include "nsILookAndFeel.h"
-#include "nsWidgetsCID.h"
-#include "nsIServiceManager.h"
-
-
-// Static IIDs/CIDs. Try to minimize these.
-static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
-
-// Implementation /////////////////////////////////////////////////////////////////
-
-// Static member variable initialization
-
-// Implement our nsISupports methods
-NS_IMPL_ISUPPORTS3(nsBoxObject, nsIBoxObject, nsPIBoxObject, nsISecurityCheckedComponent)
-
-// Constructors/Destructors
-nsBoxObject::nsBoxObject(void)
-:mContent(nsnull), mPresShell(nsnull)
-{
-  NS_INIT_ISUPPORTS();
-}
-
-nsBoxObject::~nsBoxObject(void)
-{
-}
-
-NS_IMETHODIMP
-nsBoxObject::GetLayoutManager(nsIBoxLayoutManager** aResult)
-{
-  *aResult = mLayoutManager;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::SetLayoutManager(nsIBoxLayoutManager* aLayoutManager)
-{
-  mLayoutManager = aLayoutManager;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::GetPaintManager(nsIBoxPaintManager** aResult)
-{
-  *aResult = mPaintManager;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::SetPaintManager(nsIBoxPaintManager* aPaintManager)
-{
-  mPaintManager = aPaintManager;
-  return NS_OK;
-}
-
-// nsPIBoxObject //////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP
-nsBoxObject::Init(nsIContent* aContent, nsIPresShell* aShell)
-{
-  mContent = aContent;
-  mPresShell = aShell;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::SetDocument(nsIDocument* aDocument)
-{
-  mPresState = nsnull;
-  if (aDocument) {
-    nsCOMPtr<nsIPresShell> shell = getter_AddRefs(aDocument->GetShellAt(0));
-    mPresShell = shell;
-  }
-  else {
-    mPresShell = nsnull;
-  }
-  return NS_OK;
-}
-
-nsIFrame*
-nsBoxObject::GetFrame()
-{
-  nsIFrame* frame = nsnull;
-  if (mPresShell)
-    mPresShell->GetPrimaryFrameFor(mContent, &frame);
-  return frame;
-}
-
-nsresult 
-nsBoxObject::GetOffsetRect(nsRect& aRect)
-{
-  nsresult res = NS_OK;
-
-  aRect.x = aRect.y = 0;
-  aRect.Empty();
- 
-  nsCOMPtr<nsIDocument> doc;
-  mContent->GetDocument(*getter_AddRefs(doc));
-
-  if (doc) {
-    // Get Presentation shell 0
-    nsCOMPtr<nsIPresShell> presShell = getter_AddRefs(doc->GetShellAt(0));
-
-    if(presShell) {
-      // Flush all pending notifications so that our frames are uptodate
-      presShell->FlushPendingNotifications();
-
-      // Get the Frame for our content
-      nsIFrame* frame = nsnull;
-      presShell->GetPrimaryFrameFor(mContent, &frame);
-      if(frame != nsnull) {
-        // Get its origin
-        nsPoint origin;
-        frame->GetOrigin(origin);
-
-        // Get the union of all rectangles in this and continuation frames
-        nsRect rcFrame;
-        nsIFrame* next = frame;
-        do {
-          nsRect rect;
-          next->GetRect(rect);
-          rcFrame.UnionRect(rcFrame, rect);
-          next->GetNextInFlow(&next);
-        } while (nsnull != next);
-        
-
-        // Find the frame parent whose content's tagName either matches 
-        // the tagName passed in or is the document element.
-        nsCOMPtr<nsIContent> docElement = getter_AddRefs(doc->GetRootContent());
-        nsIFrame* parent = frame;
-        nsCOMPtr<nsIContent> parentContent;
-        frame->GetParent(&parent);
-        while (parent) {
-          parent->GetContent(getter_AddRefs(parentContent));
-          if (parentContent) {
-            // If we've hit the document element, break here
-            if (parentContent.get() == docElement.get()) {
-              break;
-            }
-          }
-
-          // Add the parent's origin to our own to get to the
-          // right coordinate system
-          nsPoint parentOrigin;
-          parent->GetOrigin(parentOrigin);
-          origin += parentOrigin;
-
-          parent->GetParent(&parent);
-        }
-  
-        // For the origin, add in the border for the frame
-        const nsStyleBorder* border;
-        nsStyleCoord coord;
-        frame->GetStyleData(eStyleStruct_Border, (const nsStyleStruct*&)border);
-        if (border) {
-          if (eStyleUnit_Coord == border->mBorder.GetLeftUnit()) {
-            origin.x += border->mBorder.GetLeft(coord).GetCoordValue();
-          }
-          if (eStyleUnit_Coord == border->mBorder.GetTopUnit()) {
-            origin.y += border->mBorder.GetTop(coord).GetCoordValue();
-          }
-        }
-
-        // And subtract out the border for the parent
-        if (parent) {
-          const nsStyleBorder* parentBorder;
-          parent->GetStyleData(eStyleStruct_Border, (const nsStyleStruct*&)parentBorder);
-          if (parentBorder) {
-            if (eStyleUnit_Coord == parentBorder->mBorder.GetLeftUnit()) {
-              origin.x -= parentBorder->mBorder.GetLeft(coord).GetCoordValue();
-            }
-            if (eStyleUnit_Coord == parentBorder->mBorder.GetTopUnit()) {
-              origin.y -= parentBorder->mBorder.GetTop(coord).GetCoordValue();
-            }
-          }
-        }
-
-        // Get the Presentation Context from the Shell
-        nsCOMPtr<nsIPresContext> context;
-        presShell->GetPresContext(getter_AddRefs(context));
-       
-        if(context) {
-          // Get the scale from that Presentation Context
-          float scale;
-          context->GetTwipsToPixels(&scale);
-              
-          // Convert to pixels using that scale
-          aRect.x = NSTwipsToIntPixels(origin.x, scale);
-          aRect.y = NSTwipsToIntPixels(origin.y, scale);
-          aRect.width = NSTwipsToIntPixels(rcFrame.width, scale);
-          aRect.height = NSTwipsToIntPixels(rcFrame.height, scale);
-        }
-      }
-    }
-  }
- 
-  return res;
-}  
-
-NS_IMETHODIMP
-nsBoxObject::GetX(PRInt32* aResult)
-{
-  nsRect rect;
-  GetOffsetRect(rect);
-  *aResult = rect.x;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsBoxObject::GetY(PRInt32* aResult)
-{
-  nsRect rect;
-  GetOffsetRect(rect);
-  *aResult = rect.y;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::GetWidth(PRInt32* aResult)
-{
-  nsRect rect;
-  GetOffsetRect(rect);
-  *aResult = rect.width;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsBoxObject::GetHeight(PRInt32* aResult)
-{
-  nsRect rect;
-  GetOffsetRect(rect);
-  *aResult = rect.height;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::GetLookAndFeelMetric(const PRUnichar* aPropertyName, 
-                                  PRUnichar** aResult)
-{
-  nsCOMPtr<nsILookAndFeel> lookAndFeel(do_GetService(kLookAndFeelCID));
-  if (!lookAndFeel)
-    return NS_ERROR_FAILURE;
-    
-  nsAutoString property(aPropertyName);
-  if (property.EqualsIgnoreCase("scrollbarStyle")) {
-    PRInt32 metricResult;
-    lookAndFeel->GetMetric(nsILookAndFeel::eMetric_ScrollArrowStyle, metricResult);
-    switch (metricResult) {
-      case nsILookAndFeel::eMetric_ScrollArrowStyleBothAtBottom:
-        *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("doublebottom").get());
-        break;
-      case nsILookAndFeel::eMetric_ScrollArrowStyleBothAtEachEnd:
-        *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("double").get());
-        break;
-      case nsILookAndFeel::eMetric_ScrollArrowStyleBothAtTop:
-        *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("doubletop").get());
-        break;
-      default:
-        *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("single").get());
-        break;   
-    } 
-  }
-  else if (property.EqualsIgnoreCase("thumbStyle")) {
-    PRInt32 metricResult;
-    lookAndFeel->GetMetric(nsILookAndFeel::eMetric_ScrollSliderStyle, metricResult);
-    if ( metricResult == nsILookAndFeel::eMetric_ScrollThumbStyleNormal )
-      *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("fixed").get());
-    else
-      *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("proportional").get());   
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::GetPropertyAsSupports(const PRUnichar* aPropertyName, nsISupports** aResult)
-{
-  if (!mPresState) {
-    *aResult = nsnull;
-    return NS_OK;
-  }
-
-  nsAutoString propertyName(aPropertyName);
-  return mPresState->GetStatePropertyAsSupports(propertyName, aResult); // Addref here.
-}
-
-NS_IMETHODIMP
-nsBoxObject::SetPropertyAsSupports(const PRUnichar* aPropertyName, nsISupports* aValue)
-{
-  if (!mPresState)
-    NS_NewPresState(getter_AddRefs(mPresState));
-
-  nsAutoString propertyName(aPropertyName);
-  return mPresState->SetStatePropertyAsSupports(propertyName, aValue);
-}
-
-NS_IMETHODIMP
-nsBoxObject::GetProperty(const PRUnichar* aPropertyName, PRUnichar** aResult)
-{
-  if (!mPresState) {
-    *aResult = nsnull;
-    return NS_OK;
-  }
-
-  nsAutoString propertyName(aPropertyName);
-  nsAutoString result;
-  nsresult rv = mPresState->GetStateProperty(propertyName, result);
-  if (NS_FAILED(rv))
-    return rv;
-  *aResult = nsXPIDLString::Copy(result.GetUnicode());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxObject::SetProperty(const PRUnichar* aPropertyName, const PRUnichar* aPropertyValue)
-{
-  if (!mPresState)
-    NS_NewPresState(getter_AddRefs(mPresState));
-
-  nsAutoString propertyName(aPropertyName);
-  nsAutoString propertyValue(aPropertyValue);
-  return mPresState->SetStateProperty(propertyName, propertyValue);
-}
-
-NS_IMETHODIMP
-nsBoxObject::RemoveProperty(const PRUnichar* aPropertyName)
-{
-  if (!mPresState)
-    return NS_OK;
-
-  nsAutoString propertyName(aPropertyName);
-  return mPresState->RemoveStateProperty(propertyName);
-}
-
-/* string canCreateWrapper (in nsIIDPtr iid); */
-NS_IMETHODIMP nsBoxObject::CanCreateWrapper(const nsIID * iid, char **_retval)
-{
-  nsCAutoString str("AllAccess");
-  *_retval = str.ToNewCString();
-  return NS_OK;
-}
-
-/* string canCallMethod (in nsIIDPtr iid, in wstring methodName); */
-NS_IMETHODIMP nsBoxObject::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval)
-{
-  nsCAutoString str("AllAccess");
-  *_retval = str.ToNewCString();
-  return NS_OK;
-}
-
-/* string canGetProperty (in nsIIDPtr iid, in wstring propertyName); */
-NS_IMETHODIMP nsBoxObject::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval)
-{
-  nsCAutoString str("AllAccess");
-  *_retval = str.ToNewCString();
-  return NS_OK;
-}
-
-/* string canSetProperty (in nsIIDPtr iid, in wstring propertyName); */
-NS_IMETHODIMP nsBoxObject::CanSetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval)
-{
-  nsCAutoString str("AllAccess");
-  *_retval = str.ToNewCString();
-  return NS_OK;
-}
-// Creation Routine ///////////////////////////////////////////////////////////////////////
-
-nsresult
-NS_NewBoxObject(nsIBoxObject** aResult)
-{
-  *aResult = new nsBoxObject;
-  if (!*aResult)
-    return NS_ERROR_OUT_OF_MEMORY;
-  NS_ADDREF(*aResult);
-  return NS_OK;
-}

mozilla/mailnews/import/src/nsImportFieldMap.cpp

@@ -1,585 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nscore.h"
-#include "nsIStringBundle.h"
-#include "nsImportFieldMap.h"
-#include "nsImportStringBundle.h"
-
-#include "ImportDebug.h"
-
-
-
-////////////////////////////////////////////////////////////////////////
-
-
-
-NS_METHOD nsImportFieldMap::Create( nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-  if (aOuter)
-    return NS_ERROR_NO_AGGREGATION;
-
-  nsImportFieldMap *it = new nsImportFieldMap();
-  if (it == nsnull)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF( it);
-  nsresult rv = it->QueryInterface( aIID, aResult);
-  NS_RELEASE( it);
-  return rv;
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportFieldMap, nsIImportFieldMap)
-
-nsImportFieldMap::nsImportFieldMap() 
-{ 
-	NS_INIT_ISUPPORTS(); 
-	m_numFields = 0;
-	m_pFields = nsnull;
-	m_pActive = nsnull;
-	m_allocated = 0;
-	// need to init the description array
-	m_mozFieldCount = 0;
-	nsIStringBundle *pBundle = nsImportStringBundle::GetStringBundleProxy();
-
-	nsString *pStr;
-	for (PRInt32 i = IMPORT_FIELD_DESC_START; i <= IMPORT_FIELD_DESC_END; i++, m_mozFieldCount++) {
-		pStr = new nsString();
-		if (pBundle) {
-			nsImportStringBundle::GetStringByID( i, *pStr, pBundle);	
-		}
-		else
-			pStr->AppendInt( i);
-		m_descriptions.AppendElement( (void *)pStr);
-	}
-	
-	NS_IF_RELEASE( pBundle);
-}
-
-nsImportFieldMap::~nsImportFieldMap() 
-{ 
-	if (m_pFields)
-		delete [] m_pFields;
-	if (m_pActive)
-		delete [] m_pActive;
-
-	nsString *	pStr;
-	for (PRInt32 i = 0; i < m_mozFieldCount; i++) {
-		pStr = (nsString *) m_descriptions.ElementAt( i);
-		delete pStr;
-	}
-	m_descriptions.Clear();
-}
-
-
-NS_IMETHODIMP nsImportFieldMap::GetNumMozFields(PRInt32 *aNumFields)
-{
-    NS_PRECONDITION(aNumFields != nsnull, "null ptr");
-	if (!aNumFields)
-		return NS_ERROR_NULL_POINTER;
-
-	*aNumFields = m_mozFieldCount;
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsImportFieldMap::GetMapSize(PRInt32 *aNumFields)
-{
-    NS_PRECONDITION(aNumFields != nsnull, "null ptr");
-	if (!aNumFields)
-		return NS_ERROR_NULL_POINTER;
-
-	*aNumFields = m_numFields;
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsImportFieldMap::GetFieldDescription(PRInt32 index, PRUnichar **_retval)
-{
-    NS_PRECONDITION(_retval != nsnull, "null ptr");
-	if (!_retval)
-		return NS_ERROR_NULL_POINTER;
-	
-	*_retval = nsnull;
-	if ((index < 0) || (index >= m_descriptions.Count()))
-		return( NS_ERROR_FAILURE);
-	
-	*_retval = ((nsString *)m_descriptions.ElementAt( index))->ToNewUnicode();
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsImportFieldMap::SetFieldMapSize(PRInt32 size)
-{
-	nsresult rv = Allocate( size);
-	if (NS_FAILED( rv))
-		return( rv);
-	
-	m_numFields = size;
-
-	return( NS_OK);
-}
-
-
-NS_IMETHODIMP nsImportFieldMap::DefaultFieldMap(PRInt32 size)
-{
-	nsresult rv = SetFieldMapSize( size);
-	if (NS_FAILED( rv))
-		return( rv);
-	for (PRInt32 i = 0; i < size; i++) {
-		m_pFields[i] = i;
-		m_pActive[i] = PR_TRUE;
-	}
-	
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsImportFieldMap::GetFieldMap(PRInt32 index, PRInt32 *_retval)
-{
-    NS_PRECONDITION(_retval != nsnull, "null ptr");
-	if (!_retval)
-		return NS_ERROR_NULL_POINTER;
-	
-	
-	if ((index < 0) || (index >= m_numFields))
-		return( NS_ERROR_FAILURE);
-
-	*_retval = m_pFields[index];
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsImportFieldMap::SetFieldMap(PRInt32 index, PRInt32 fieldNum)
-{
-	if (index == -1) {
-		nsresult rv = Allocate( m_numFields + 1);
-		if (NS_FAILED( rv))
-			return( rv);
-		index = m_numFields;
-		m_numFields++;
-	}
-	else {
-		if ((index < 0) || (index >= m_numFields))
-			return( NS_ERROR_FAILURE);
-	}
-	
-	if ((fieldNum != -1) && ((fieldNum < 0) || (fieldNum >= m_mozFieldCount)))
-		return( NS_ERROR_FAILURE);
-	
-	m_pFields[index] = fieldNum;
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsImportFieldMap::SetFieldMapByDescription(PRInt32 index, const PRUnichar *fieldDesc)
-{
-    NS_PRECONDITION(fieldDesc != nsnull, "null ptr");
-	if (!fieldDesc)
-		return NS_ERROR_NULL_POINTER;
-
-	PRInt32 i = FindFieldNum( fieldDesc);
-	if (i == -1)
-		return( NS_ERROR_FAILURE);
-
-	return( SetFieldMap( index, i));
-}
-
-
-NS_IMETHODIMP nsImportFieldMap::GetFieldActive(PRInt32 index, PRBool *active)
-{
-    NS_PRECONDITION(active != nsnull, "null ptr");
-	if (!active)
-		return NS_ERROR_NULL_POINTER;
-	if ((index < 0) || (index >= m_numFields))
-		return( NS_ERROR_FAILURE);
-		
-	*active = m_pActive[index];
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsImportFieldMap::SetFieldActive(PRInt32 index, PRBool active)
-{
-	if ((index < 0) || (index >= m_numFields))
-		return( NS_ERROR_FAILURE);
-
-	m_pActive[index] = active;
-	return( NS_OK);
-}
-
-
-NS_IMETHODIMP nsImportFieldMap::SetFieldValue(nsIAddrDatabase *database, nsIMdbRow *row, PRInt32 fieldNum, const PRUnichar *value)
-{
-    NS_PRECONDITION(database != nsnull, "null ptr");
-    NS_PRECONDITION(row != nsnull, "null ptr");
-    NS_PRECONDITION(value != nsnull, "null ptr");
-	if (!database || !row || !value)
-		return NS_ERROR_NULL_POINTER;
-	
-	// Allow the special value for a null field
-	if (fieldNum == -1)
-		return( NS_OK);
-
-	if ((fieldNum < 0) || (fieldNum >= m_mozFieldCount))
-		return( NS_ERROR_FAILURE);
-	
-	// UGGG!!!!! lot's of typing here!
-	nsresult rv;
-	
-	nsString str(value);
-	char *pVal = str.ToNewUTF8String();
-
-	switch( fieldNum) {
-	case 0:
-		rv = database->AddFirstName( row, pVal);
-		break;
-	case 1:
-		rv = database->AddLastName( row, pVal);
-		break;
-	case 2:
-		rv = database->AddDisplayName( row, pVal);
-		break;
-	case 3:
-		rv = database->AddNickName( row, pVal);
-		break;
-	case 4:
-		rv = database->AddPrimaryEmail( row, pVal);
-		break;
-	case 5:
-		rv = database->Add2ndEmail( row, pVal);
-		break;
-	case 6:
-		rv = database->AddWorkPhone( row, pVal);
-		break;
-	case 7:
-		rv = database->AddHomePhone( row, pVal);
-		break;
-	case 8:
-		rv = database->AddFaxNumber( row, pVal);
-		break;
-	case 9:
-		rv = database->AddPagerNumber( row, pVal);
-		break;
-	case 10:
-		rv = database->AddCellularNumber( row, pVal);
-		break;
-	case 11:
-		rv = database->AddHomeAddress( row, pVal);
-		break;
-	case 12:
-		rv = database->AddHomeAddress2( row, pVal);
-		break;
-	case 13:
-		rv = database->AddHomeCity( row, pVal);
-		break;
-	case 14:
-		rv = database->AddHomeState( row, pVal);
-		break;
-	case 15:
-		rv = database->AddHomeZipCode( row, pVal);
-		break;
-	case 16:
-		rv = database->AddHomeCountry( row, pVal);
-		break;
-	case 17:
-		rv = database->AddWorkAddress( row, pVal);
-		break;
-	case 18:
-		rv = database->AddWorkAddress2( row, pVal);
-		break;
-	case 19:
-		rv = database->AddWorkCity( row, pVal);
-		break;
-	case 20:
-		rv = database->AddWorkState( row, pVal);
-		break;
-	case 21:
-		rv = database->AddWorkZipCode( row, pVal);
-		break;
-	case 22:
-		rv = database->AddWorkCountry( row, pVal);
-		break;
-	case 23:
-		rv = database->AddJobTitle(row, pVal);
-		break;
-	case 24:
-		rv = database->AddDepartment(row, pVal);
-		break;
-	case 25:
-		rv = database->AddCompany(row, pVal);
-		break;
-	case 26:
-		rv = database->AddWebPage1(row, pVal);
-		break;
-	case 27:
-		rv = database->AddWebPage2(row, pVal);
-		break;
-	case 28:
-		rv = database->AddBirthYear(row, pVal);
-		break;
-	case 29:
-		rv = database->AddBirthMonth(row, pVal);
-		break;
-	case 30:
-		rv = database->AddBirthDay(row, pVal);
-		break;
-	case 31:
-		rv = database->AddCustom1(row, pVal);
-		break;
-	case 32:
-		rv = database->AddCustom2(row, pVal);
-		break;
-	case 33:
-		rv = database->AddCustom3(row, pVal);
-		break;
-	case 34:
-		rv = database->AddCustom4(row, pVal);
-		break;
-	case 35:
-		rv = database->AddNotes(row, pVal);
-		break;
-	default:
-		/* Get the field description, and add it as an anonymous attr? */
-		/* OR WHAT???? */
-		{
-			rv = NS_ERROR_FAILURE;
-		}
-	}
-	
-	nsCRT::free( pVal);
-
-	return( rv);
-}
-
-
-NS_IMETHODIMP nsImportFieldMap::SetFieldValueByDescription(nsIAddrDatabase *database, nsIMdbRow *row, const PRUnichar *fieldDesc, const PRUnichar *value)
-{
-    NS_PRECONDITION(fieldDesc != nsnull, "null ptr");
-	if (!fieldDesc)
-		return NS_ERROR_NULL_POINTER;
-	PRInt32 i = FindFieldNum( fieldDesc);
-	if (i == -1)
-		return( NS_ERROR_FAILURE);
-	return( SetFieldValue( database, row, i, value));
-}
-
-
-NS_IMETHODIMP nsImportFieldMap::GetFieldValue(nsIAbCard *card, PRInt32 fieldNum, PRUnichar **_retval)
-{
-    NS_PRECONDITION(_retval != nsnull, "null ptr");
-    NS_PRECONDITION(card != nsnull, "null ptr");
-	if (!_retval || !card)
-		return NS_ERROR_NULL_POINTER;
-	
-	if (fieldNum == -1) {
-		PRUnichar	c = 0;
-		*_retval = nsCRT::strdup( &c);
-		return( NS_OK);
-	}
-
-	if ((fieldNum < 0) || (fieldNum >= m_mozFieldCount))
-		return( NS_ERROR_FAILURE);
-
-	// ARRGGG!!! Lots of typing again
-	// get the field from the card
-	nsresult	rv;
-	PRUnichar *	pVal = nsnull;
-
-	switch (fieldNum) {
-	case 0:
-		rv = card->GetFirstName( &pVal);
-		break;
-	case 1:
-		rv = card->GetLastName( &pVal);
-		break;
-	case 2:
-		rv = card->GetDisplayName( &pVal);
-		break;
-	case 3:
-		rv = card->GetNickName( &pVal);
-		break;
-	case 4:
-		rv = card->GetPrimaryEmail( &pVal);
-		break;
-	case 5:
-		rv = card->GetSecondEmail( &pVal);
-		break;
-	case 6:
-		rv = card->GetWorkPhone( &pVal);
-		break;
-	case 7:
-		rv = card->GetHomePhone( &pVal);
-		break;
-	case 8:
-		rv = card->GetFaxNumber( &pVal);
-		break;
-	case 9:
-		rv = card->GetPagerNumber( &pVal);
-		break;
-	case 10:
-		rv = card->GetCellularNumber( &pVal);
-		break;
-	case 11:
-		rv = card->GetHomeAddress( &pVal);
-		break;
-	case 12:
-		rv = card->GetHomeAddress2( &pVal);
-		break;
-	case 13:
-		rv = card->GetHomeCity( &pVal);
-		break;
-	case 14:
-		rv = card->GetHomeState( &pVal);
-		break;
-	case 15:
-		rv = card->GetHomeZipCode( &pVal);
-		break;
-	case 16:
-		rv = card->GetHomeCountry( &pVal);
-		break;
-	case 17:
-		rv = card->GetWorkAddress( &pVal);
-		break;
-	case 18:
-		rv = card->GetWorkAddress2( &pVal);
-		break;
-	case 19:
-		rv = card->GetWorkCity( &pVal);
-		break;
-	case 20:
-		rv = card->GetWorkState( &pVal);
-		break;
-	case 21:
-		rv = card->GetWorkZipCode( &pVal);
-		break;
-	case 22:
-		rv = card->GetWorkCountry( &pVal);
-		break;
-	case 23:
-		rv = card->GetJobTitle( &pVal);
-		break;
-	case 24:
-		rv = card->GetDepartment( &pVal);
-		break;
-	case 25:
-		rv = card->GetCompany( &pVal);
-		break;
-	case 26:
-		rv = card->GetWebPage1( &pVal);
-		break;
-	case 27:
-		rv = card->GetWebPage2( &pVal);
-		break;
-	case 28:
-		rv = card->GetBirthYear( &pVal);
-		break;
-	case 29:
-		rv = card->GetBirthMonth( &pVal);
-		break;
-	case 30:
-		rv = card->GetBirthDay( &pVal);
-		break;
-	case 31:
-		rv = card->GetCustom1( &pVal);
-		break;
-	case 32:
-		rv = card->GetCustom2( &pVal);
-		break;
-	case 33:
-		rv = card->GetCustom3( &pVal);
-		break;
-	case 34:
-		rv = card->GetCustom4( &pVal);
-		break;
-	case 35:
-		rv = card->GetNotes( &pVal);
-		break;
-	default:
-		/* Get the field description, and add it as an anonymous attr? */
-		/* OR WHAT???? */
-		{
-			rv = NS_ERROR_FAILURE;
-		}
-	}
-	
-	*_retval = pVal;
-
-	return( rv);
-}
-
-NS_IMETHODIMP nsImportFieldMap::GetFieldValueByDescription(nsIAbCard *card, const PRUnichar *fieldDesc, PRUnichar **_retval)
-{
-    NS_PRECONDITION(fieldDesc != nsnull, "null ptr");
-	if (!fieldDesc)
-		return NS_ERROR_NULL_POINTER;
-	PRInt32 i = FindFieldNum( fieldDesc);
-	if (i == -1)
-		return( NS_ERROR_FAILURE);
-	return( GetFieldValue( card, i, _retval));
-}
-
-
-nsresult nsImportFieldMap::Allocate( PRInt32 newSize)
-{
-	if (newSize <= m_allocated)
-		return( NS_OK);
-
-	PRInt32 sz = m_allocated;
-	while (sz < newSize)
-		sz += 30;
-
-	PRInt32	*pData = new PRInt32[ sz];
-	if (!pData)
-		return( NS_ERROR_FAILURE);
-	PRBool *pActive = new PRBool[sz];
-	if (!pActive)
-		return( NS_ERROR_FAILURE);
-
-
-	PRInt32	i;
-	for (i = 0; i < sz; i++) {
-		pData[i] = -1;
-		pActive[i] = PR_TRUE;
-	}
-	if (m_numFields) {
-		for (i = 0; i < m_numFields; i++) {
-			pData[i] = m_pFields[i];
-			pActive[i] = m_pActive[i];
-		}
-		delete [] m_pFields;
-		delete [] m_pActive;
-	}
-	m_allocated = sz;
-	m_pFields = pData;
-	m_pActive = pActive;
-	return( NS_OK);
-}
-
-PRInt32 nsImportFieldMap::FindFieldNum( const PRUnichar *pDesc)
-{
-	nsString *	pStr;
-	for (PRInt32 i = 0; i < m_mozFieldCount; i++) {
-		pStr = (nsString *)m_descriptions.ElementAt( i);
-		if (!Compare(*pStr, nsAutoString(pDesc)))
-			return( i);
-	}
-
-	return( -1);
-}
-
-

mozilla/mailnews/import/text/src/nsTextImport.cpp

@@ -1,795 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- * 
- * Contributor(s): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-/*
-
-  Text import addressbook interfaces
-
-*/
-#include "nscore.h"
-#include "nsCRT.h"
-#include "nsString.h"
-#include "nsIServiceManager.h"
-#include "nsIImportService.h"
-#include "nsIComponentManager.h"
-#include "nsTextImport.h"
-#include "nsIMemory.h"
-#include "nsIImportGeneric.h"
-#include "nsIImportAddressBooks.h"
-#include "nsIImportABDescriptor.h"
-#include "nsIImportFieldMap.h"
-#include "nsIOutputStream.h"
-#include "nsIAddrDatabase.h"
-#include "nsTextFormatter.h"
-#include "nsTextStringBundle.h"
-#include "nsIStringBundle.h"
-#include "nsTextAddress.h"
-#include "nsIPref.h"
-#include "nsXPIDLString.h"
-#include "nsProxiedService.h"
-#include "TextDebugLog.h"
-
-
-static NS_DEFINE_CID(kImportServiceCID,		NS_IMPORTSERVICE_CID);
-static NS_DEFINE_IID(kISupportsIID,			NS_ISUPPORTS_IID);
-static NS_DEFINE_CID(kPrefServiceCID,		NS_PREF_CID);
-
-
-class ImportAddressImpl : public nsIImportAddressBooks
-{
-public:
-    ImportAddressImpl();
-    virtual ~ImportAddressImpl();
-
-	static nsresult Create(nsIImportAddressBooks** aImport);
-
-    // nsISupports interface
-    NS_DECL_ISUPPORTS
-
-    // nsIImportAddressBooks interface
-    
-	/* PRBool GetSupportsMultiple (); */
-	NS_IMETHOD GetSupportsMultiple(PRBool *_retval) { *_retval = PR_FALSE; return( NS_OK);}
-	
-	/* PRBool GetAutoFind (out wstring description); */
-	NS_IMETHOD GetAutoFind(PRUnichar **description, PRBool *_retval);
-	
-	/* PRBool GetNeedsFieldMap (nsIFileSpec *location); */
-	NS_IMETHOD GetNeedsFieldMap(nsIFileSpec *location, PRBool *_retval);
-	
-	/* void GetDefaultLocation (out nsIFileSpec location, out boolean found, out boolean userVerify); */
-	NS_IMETHOD GetDefaultLocation(nsIFileSpec **location, PRBool *found, PRBool *userVerify);
-	
-	/* nsISupportsArray FindAddressBooks (in nsIFileSpec location); */
-	NS_IMETHOD FindAddressBooks(nsIFileSpec *location, nsISupportsArray **_retval);
-	
-	/* nsISupports InitFieldMap(nsIFileSpec location, nsIImportFieldMap fieldMap); */
-	NS_IMETHOD InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap);
-	
-	/* void ImportAddressBook (in nsIImportABDescriptor source, in nsISupports destination, in nsISupports fieldMap, out boolean fatalError); */
-	NS_IMETHOD ImportAddressBook(	nsIImportABDescriptor *source, 
-									nsIAddrDatabase *	destination, 
-									nsIImportFieldMap *	fieldMap, 
-									PRUnichar **		errorLog,
-									PRUnichar **		successLog,
-									PRBool *			fatalError);
-	
-	/* unsigned long GetImportProgress (); */
-	NS_IMETHOD GetImportProgress(PRUint32 *_retval);
- 
-	NS_IMETHOD GetSampleData( PRInt32 index, PRBool *pFound, PRUnichar **pStr);
-
-	NS_IMETHOD SetSampleLocation( nsIFileSpec *);
-
-private:
-	void	ClearSampleFile( void);
-	void	SaveFieldMap( nsIImportFieldMap *pMap);
-
-	static void	ReportSuccess( nsString& name, nsString *pStream);
-	static void SetLogs( nsString& success, nsString& error, PRUnichar **pError, PRUnichar **pSuccess);
-	static void ReportError( PRInt32 errorNum, nsString& name, nsString *pStream);
-	static void	SanitizeSampleData( nsCString& val);
-
-private:
-	nsTextAddress	m_text;
-	PRBool			m_haveDelim;
-	nsIFileSpec *	m_fileLoc;
-	char			m_delim;
-	PRUint32		m_bytesImported;
-};
-
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-
-nsTextImport::nsTextImport()
-{
-    NS_INIT_REFCNT();
-
-	IMPORT_LOG0( "nsTextImport Module Created\n");
-
-	nsTextStringBundle::GetStringBundle();
-}
-
-
-nsTextImport::~nsTextImport()
-{
-
-	IMPORT_LOG0( "nsTextImport Module Deleted\n");
-
-}
-
-
-
-NS_IMPL_ISUPPORTS1(nsTextImport, nsIImportModule)
-
-
-NS_IMETHODIMP nsTextImport::GetName( PRUnichar **name)
-{
-    NS_PRECONDITION(name != nsnull, "null ptr");
-    if (! name)
-        return NS_ERROR_NULL_POINTER;
-
-	*name = nsTextStringBundle::GetStringByID( TEXTIMPORT_NAME);
-		
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsTextImport::GetDescription( PRUnichar **name)
-{
-    NS_PRECONDITION(name != nsnull, "null ptr");
-    if (! name)
-        return NS_ERROR_NULL_POINTER;
-
-	*name = nsTextStringBundle::GetStringByID( TEXTIMPORT_DESCRIPTION);
-		
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsTextImport::GetSupports( char **supports)
-{
-    NS_PRECONDITION(supports != nsnull, "null ptr");
-    if (! supports)
-        return NS_ERROR_NULL_POINTER;
-       
-	*supports = nsCRT::strdup( kTextSupportsString);
-	return( NS_OK);
-}
-
-NS_IMETHODIMP nsTextImport::GetSupportsUpgrade( PRBool *pUpgrade)
-{
-    NS_PRECONDITION(pUpgrade != nsnull, "null ptr");
-    if (! pUpgrade)
-        return NS_ERROR_NULL_POINTER;
-       
-	*pUpgrade = PR_FALSE;
-	return( NS_OK);
-}
-
-
-NS_IMETHODIMP nsTextImport::GetImportInterface( const char *pImportType, nsISupports **ppInterface)
-{
-    NS_PRECONDITION(pImportType != nsnull, "null ptr");
-    if (! pImportType)
-        return NS_ERROR_NULL_POINTER;
-    NS_PRECONDITION(ppInterface != nsnull, "null ptr");
-    if (! ppInterface)
-        return NS_ERROR_NULL_POINTER;
-
-	*ppInterface = nsnull;
-	nsresult	rv;
-	
-	if (!nsCRT::strcmp( pImportType, "addressbook")) {
-		// create the nsIImportMail interface and return it!
-		nsIImportAddressBooks *	pAddress = nsnull;
-		nsIImportGeneric *		pGeneric = nsnull;
-		rv = ImportAddressImpl::Create( &pAddress);
-		if (NS_SUCCEEDED( rv)) {
-			NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv);
-			if (NS_SUCCEEDED( rv)) {
-				rv = impSvc->CreateNewGenericAddressBooks( &pGeneric);
-				if (NS_SUCCEEDED( rv)) {
-					pGeneric->SetData( "addressInterface", pAddress);
-					rv = pGeneric->QueryInterface( kISupportsIID, (void **)ppInterface);
-				}
-			}
-		}
-		NS_IF_RELEASE( pAddress);
-		NS_IF_RELEASE( pGeneric);
-		return( rv);
-	}
-			
-	return( NS_ERROR_NOT_AVAILABLE);
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-
-
-
-nsresult ImportAddressImpl::Create(nsIImportAddressBooks** aImport)
-{
-    NS_PRECONDITION(aImport != nsnull, "null ptr");
-    if (! aImport)
-        return NS_ERROR_NULL_POINTER;
-
-    *aImport = new ImportAddressImpl();
-    if (! *aImport)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(*aImport);
-
-    return NS_OK;
-}
-
-ImportAddressImpl::ImportAddressImpl()
-{
-    NS_INIT_REFCNT();
-
-	m_fileLoc = nsnull;
-	m_haveDelim = PR_FALSE;
-}
-
-
-ImportAddressImpl::~ImportAddressImpl()
-{
-	if (m_fileLoc) {
-		PRBool open = PR_FALSE;
-		m_fileLoc->IsStreamOpen( &open);
-		if (open)
-			m_fileLoc->CloseStream();
-		NS_RELEASE( m_fileLoc);
-	}
-}
-
-
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
-
-	
-NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **addrDescription, PRBool *_retval)
-{
-    NS_PRECONDITION(addrDescription != nsnull, "null ptr");
-    NS_PRECONDITION(_retval != nsnull, "null ptr");
-    if (! addrDescription || !_retval)
-        return NS_ERROR_NULL_POINTER;
-    
-    nsString	str;
-    *_retval = PR_FALSE;
-    nsTextStringBundle::GetStringByID( TEXTIMPORT_ADDRESS_NAME, str);
-    *addrDescription = str.ToNewUnicode();
-    
-    return( NS_OK);
-}
-
-
-NS_IMETHODIMP ImportAddressImpl::GetDefaultLocation(nsIFileSpec **ppLoc, PRBool *found, PRBool *userVerify)
-{
-    NS_PRECONDITION(found != nsnull, "null ptr");
-    NS_PRECONDITION(ppLoc != nsnull, "null ptr");
-    NS_PRECONDITION(userVerify != nsnull, "null ptr");
-    if (! found || !userVerify || !ppLoc)
-        return NS_ERROR_NULL_POINTER;
-    
-	*ppLoc = nsnull;
-	*found = PR_FALSE;
-	*userVerify = PR_TRUE;
-	
-	return( NS_OK);    
-}
-
-
-	
-NS_IMETHODIMP ImportAddressImpl::FindAddressBooks(nsIFileSpec *pLoc, nsISupportsArray **ppArray)
-{
-    NS_PRECONDITION(pLoc != nsnull, "null ptr");
-    NS_PRECONDITION(ppArray != nsnull, "null ptr");
-    if (!pLoc || !ppArray)
-        return NS_ERROR_NULL_POINTER;
-	
-	ClearSampleFile();
-
-	*ppArray = nsnull;
-	PRBool exists = PR_FALSE;
-	nsresult rv = pLoc->Exists( &exists);
-	if (NS_FAILED( rv) || !exists)
-		return( NS_ERROR_FAILURE);
-	
-	PRBool isFile = PR_FALSE;
-	rv = pLoc->IsFile( &isFile);
-	if (NS_FAILED( rv) || !isFile)
-		return( NS_ERROR_FAILURE);
-
-	rv = m_text.DetermineDelim( pLoc);
-	
-	if (NS_FAILED( rv)) {
-		IMPORT_LOG0( "*** Error determining delimitter\n");
-		return( rv);
-	}
-	m_haveDelim = PR_TRUE;
-	m_delim = m_text.GetDelim();
-	
-	m_fileLoc = pLoc;
-	NS_ADDREF( m_fileLoc);
-
-	/* Build an address book descriptor based on the file passed in! */
-	nsCOMPtr<nsISupportsArray>	array;
-	rv = NS_NewISupportsArray( getter_AddRefs( array));
-	if (NS_FAILED( rv)) {
-		IMPORT_LOG0( "FAILED to allocate the nsISupportsArray\n");
-		return( rv);
-	}
-		
-	NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv);
-	if (NS_FAILED( rv)) {
-		IMPORT_LOG0( "*** Failed to obtain the import service\n");
-		return( rv);
-	}
-	
-	nsXPIDLCString pName;
-	rv = pLoc->GetLeafName(getter_Copies(pName));
-	if (NS_FAILED( rv)) {
-		IMPORT_LOG0( "*** Failed getting leaf name of file\n");
-		return( rv);
-	}
-
-	// for get unicode leafname.  If it uses nsILocalFile interface,
-	// these codes do not need due to nsILocalFile->GetUnicodeLeafName()
-	nsString	name;
-	rv = impSvc->SystemStringToUnicode((const char*) pName, name);
-	if (NS_FAILED(rv))
-		name.AssignWithConversion((const char*) pName);
-
-	PRInt32		idx = name.RFindChar( '.');
-	if ((idx != -1) && (idx > 0) && ((name.Length() - idx - 1) < 5)) {
-		nsString t;
-		name.Left( t, idx);
-		name = t;
-	}
-
-	nsCOMPtr<nsIImportABDescriptor>	desc;
-	nsISupports *					pInterface;
-
-	rv = impSvc->CreateNewABDescriptor( getter_AddRefs( desc));
-	if (NS_SUCCEEDED( rv)) {
-		PRUint32 sz = 0;
-		pLoc->GetFileSize( &sz);	
-		desc->SetPreferredName( name.GetUnicode());
-		desc->SetSize( sz);
-		nsIFileSpec *pSpec = nsnull;
-		desc->GetFileSpec( &pSpec);
-		if (pSpec) {
-			pSpec->FromFileSpec( pLoc);
-			NS_RELEASE( pSpec);
-		}
-		rv = desc->QueryInterface( kISupportsIID, (void **) &pInterface);
-		array->AppendElement( pInterface);
-		pInterface->Release();
-	}
-	if (NS_FAILED( rv)) {
-		IMPORT_LOG0( "*** Error creating address book descriptor for text import\n");
-	}		
-	else {
-		rv = array->QueryInterface( NS_GET_IID(nsISupportsArray), (void **) ppArray);
-	}
-
-	return( rv);
-}
-
-	
-
-void ImportAddressImpl::ReportSuccess( nsString& name, nsString *pStream)
-{
-	if (!pStream)
-		return;
-	// load the success string
-	nsIStringBundle *pBundle = nsTextStringBundle::GetStringBundleProxy();
-	PRUnichar *pFmt = nsTextStringBundle::GetStringByID( TEXTIMPORT_ADDRESS_SUCCESS, pBundle);
-	PRUnichar *pText = nsTextFormatter::smprintf( pFmt, name.GetUnicode());
-	pStream->Append( pText);
-	nsTextFormatter::smprintf_free( pText);
-	nsTextStringBundle::FreeString( pFmt);
-	pStream->AppendWithConversion( LF);
-	NS_IF_RELEASE( pBundle);
-}
-
-void ImportAddressImpl::ReportError( PRInt32 errorNum, nsString& name, nsString *pStream)
-{
-	if (!pStream)
-		return;
-	// load the error string
-	nsIStringBundle *pBundle = nsTextStringBundle::GetStringBundleProxy();
-	PRUnichar *pFmt = nsTextStringBundle::GetStringByID( errorNum, pBundle);
-	PRUnichar *pText = nsTextFormatter::smprintf( pFmt, name.GetUnicode());
-	pStream->Append( pText);
-	nsTextFormatter::smprintf_free( pText);
-	nsTextStringBundle::FreeString( pFmt);
-	pStream->AppendWithConversion( LF);
-	NS_IF_RELEASE( pBundle);
-}
-
-void ImportAddressImpl::SetLogs( nsString& success, nsString& error, PRUnichar **pError, PRUnichar **pSuccess)
-{
-	if (pError)
-		*pError = error.ToNewUnicode();
-	if (pSuccess)
-		*pSuccess = success.ToNewUnicode();
-}
-
-
-NS_IMETHODIMP ImportAddressImpl::ImportAddressBook(	nsIImportABDescriptor *pSource, 
-													nsIAddrDatabase *	pDestination, 
-													nsIImportFieldMap *	fieldMap, 
-													PRUnichar **		pErrorLog,
-													PRUnichar **		pSuccessLog,
-													PRBool *			fatalError)
-{
-    NS_PRECONDITION(pSource != nsnull, "null ptr");
-    NS_PRECONDITION(pDestination != nsnull, "null ptr");
-    NS_PRECONDITION(fatalError != nsnull, "null ptr");
-	
-	nsCOMPtr<nsIStringBundle>	bundle( dont_AddRef( nsTextStringBundle::GetStringBundleProxy()));
-	m_bytesImported = 0;
-
-	nsString	success;
-	nsString	error;
-    if (!pSource || !pDestination || !fatalError) {
-		IMPORT_LOG0( "*** Bad param passed to text address import\n");
-		nsTextStringBundle::GetStringByID( TEXTIMPORT_ADDRESS_BADPARAM, error, bundle);
-		if (fatalError)
-			*fatalError = PR_TRUE;
-		SetLogs( success, error, pErrorLog, pSuccessLog);
-	    return( NS_ERROR_NULL_POINTER);
-	}
-   
-	ClearSampleFile();
-
-    PRBool		addrAbort = PR_FALSE;
-    nsString	name;
-    PRUnichar *	pName;
-    if (NS_SUCCEEDED( pSource->GetPreferredName( &pName))) {
-    	name = pName;
-    	nsCRT::free( pName);
-    }
-    
-	PRUint32 addressSize = 0;
-	pSource->GetSize( &addressSize);
-	if (addressSize == 0) {
-		IMPORT_LOG0( "Address book size is 0, skipping import.\n");
-		ReportSuccess( name, &success);
-		SetLogs( success, error, pErrorLog, pSuccessLog);
-		return( NS_OK);
-	}
-
-    
-	nsIFileSpec	*	inFile;
-    if (NS_FAILED( pSource->GetFileSpec( &inFile))) {
-		ReportError( TEXTIMPORT_ADDRESS_BADSOURCEFILE, name, &error);
-		SetLogs( success, error, pErrorLog, pSuccessLog);		
-    	return( NS_ERROR_FAILURE);
-    }
-
-#ifdef IMPORT_DEBUG
-	char *pPath;
-	inFile->GetNativePath( &pPath);    
-	IMPORT_LOG1( "Import address book: %s\n", pPath);
-	nsCRT::free( pPath);
-#endif
-	
-    nsresult rv = NS_OK;
-	PRBool	isLDIF = PR_FALSE;
-	rv = nsTextAddress::IsLDIFFile( inFile, &isLDIF);
-	if (NS_FAILED( rv)) {
-		inFile->Release();
-		ReportError( TEXTIMPORT_ADDRESS_CONVERTERROR, name, &error);
-		SetLogs( success, error, pErrorLog, pSuccessLog);
-		return( rv);
-	}
-	
-    if (isLDIF) {
-		// This get's tricky, the database really requires the thing
-		// to have an .ldi extension so if it doesn't we may need to
-		// copy the file to a temp file with the correct name, then
-		// import it!
-		rv = m_text.ImportLDIF( &addrAbort, name.GetUnicode(), inFile, pDestination, error);
-	}
-	else {	
-		rv = m_text.ImportAddresses( &addrAbort, name.GetUnicode(), inFile, pDestination, fieldMap, error, &m_bytesImported);
-		SaveFieldMap( fieldMap);
-	}
-
-    inFile->Release();
-	    
-    
-	if (NS_SUCCEEDED( rv) && error.IsEmpty()) {
-		ReportSuccess( name, &success);
-	}
-	else {
-		ReportError( TEXTIMPORT_ADDRESS_CONVERTERROR, name, &error);
-	}
-
-	SetLogs( success, error, pErrorLog, pSuccessLog);
-
-	IMPORT_LOG0( "*** Text address import done\n");
-
-    return( rv);
-}
-
-
-NS_IMETHODIMP ImportAddressImpl::GetImportProgress(PRUint32 *_retval)
-{
-    NS_PRECONDITION(_retval != nsnull, "null ptr");
-	if (!_retval)
-		return( NS_ERROR_NULL_POINTER);
-	
-	*_retval = m_bytesImported;
-
-	return( NS_OK);
-}
-
-
-NS_IMETHODIMP ImportAddressImpl::GetNeedsFieldMap(nsIFileSpec *location, PRBool *_retval)
-{
-    NS_PRECONDITION(_retval != nsnull, "null ptr");
-    NS_PRECONDITION(location != nsnull, "null ptr");
-	if (!location || !_retval)
-		return( NS_ERROR_NULL_POINTER);
-
-	*_retval = PR_TRUE;
-	PRBool	exists = PR_FALSE;
-	PRBool	isFile = PR_FALSE;
-
-	nsresult rv = location->Exists( &exists);
-	rv = location->IsFile( &isFile);
-	
-	if (!exists || !isFile)
-		return( NS_ERROR_FAILURE);
-
-	PRBool	isLDIF = PR_FALSE;
-	rv = nsTextAddress::IsLDIFFile( location, &isLDIF);
-	if (NS_FAILED( rv)) {
-		IMPORT_LOG0( "*** Error determining if file is of type LDIF\n");
-		return( rv);
-	}
-	
-	if (isLDIF)
-		*_retval = PR_FALSE;
-	
-	return( NS_OK);
-}
-
-void ImportAddressImpl::SanitizeSampleData( nsCString& val)
-{
-	// remove any line-feeds...
-	val.ReplaceSubstring( "\x0D\x0A", ", ");
-	val.ReplaceChar( 13, ',');
-	val.ReplaceChar( 10, ',');
-}
-
-NS_IMETHODIMP ImportAddressImpl::GetSampleData( PRInt32 index, PRBool *pFound, PRUnichar **pStr)
-{
-    NS_PRECONDITION(pFound != nsnull, "null ptr");
-    NS_PRECONDITION(pStr != nsnull, "null ptr");
-	if (!pFound || !pStr)
-		return( NS_ERROR_NULL_POINTER);
-	
-	if (!m_fileLoc) {
-		IMPORT_LOG0( "*** Error, called GetSampleData before SetSampleLocation\n");
-		return( NS_ERROR_FAILURE);
-	}
-
-	nsresult	rv;
-	*pStr = nsnull;
-	PRBool		open = PR_FALSE;
-	PRUnichar	term = 0;
-
-	if (!m_haveDelim) {
-		rv = m_fileLoc->IsStreamOpen( &open);
-		if (open) {
-			m_fileLoc->CloseStream();
-			open = PR_FALSE;
-		}
-		rv = m_text.DetermineDelim( m_fileLoc);
-		if (NS_FAILED( rv))
-			return( rv);
-		m_haveDelim = PR_TRUE;
-		m_delim = m_text.GetDelim();
-	}
-	else {
-		rv = m_fileLoc->IsStreamOpen( &open);			
-	}
-	
-	if (!open) {
-		rv = m_fileLoc->OpenStreamForReading();
-		if (NS_FAILED( rv)) {
-			*pFound = PR_FALSE;
-			*pStr = nsCRT::strdup( &term);
-			return( NS_OK);
-		}
-	}
-	
-	PRInt32	lineLen;
-	PRInt32	bufSz = 10240;
-	char	*pLine = new char[bufSz];
-	
-	NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv);
-
-	rv = nsTextAddress::ReadRecordNumber( m_fileLoc, pLine, bufSz, m_delim, &lineLen, index);
-	if (NS_SUCCEEDED( rv)) {
-		nsString	str;
-		nsCString	field;
-		nsString	uField;
-		PRInt32		fNum = 0;
-		while (nsTextAddress::GetField( pLine, lineLen, fNum, field, m_delim)) {
-			if (fNum)
-				str.AppendWithConversion( "\n");
-			SanitizeSampleData( field);
-			if (impSvc)
-				impSvc->SystemStringToUnicode( field, uField);
-			else
-				uField.AssignWithConversion( field);
-
-			str.Append( uField);
-			fNum++;
-			field.Truncate();
-		}
-
-		*pStr = nsCRT::strdup( str.GetUnicode());
-		*pFound = PR_TRUE;
-
-		/* IMPORT_LOG1( "Sample data: %S\n", str.GetUnicode()); */
-	}
-	else {
-		*pFound = PR_FALSE;
-		*pStr = nsCRT::strdup( &term);
-	}
-
-	delete [] pLine;
-
-	return( NS_OK);
-}
-
-NS_IMETHODIMP ImportAddressImpl::SetSampleLocation( nsIFileSpec *pLocation)
-{
-	NS_IF_RELEASE( m_fileLoc);
-	m_haveDelim = PR_FALSE;
-	m_fileLoc = pLocation;
-	NS_IF_ADDREF( m_fileLoc);
-
-	return( NS_OK);
-}
-
-
-void ImportAddressImpl::ClearSampleFile( void)
-{
-	if (m_fileLoc) {
-		PRBool		open = PR_FALSE;
-		m_fileLoc->IsStreamOpen( &open);
-		if (open)
-			m_fileLoc->CloseStream();
-		NS_RELEASE( m_fileLoc);
-		m_fileLoc = nsnull;
-		m_haveDelim = PR_FALSE;
-	}
-}
-
-
-NS_IMETHODIMP ImportAddressImpl::InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap)
-{
-	// Let's remember the last one the user used!
-	// This should be normal for someone importing multiple times, it's usually
-	// from the same file format.
-	
-	nsresult rv;
-	NS_WITH_SERVICE( nsIPref, prefs, kPrefServiceCID, &rv);
-	if (NS_SUCCEEDED( rv)) {
-		nsXPIDLCString	prefStr;
-		rv = prefs->CopyCharPref( "mailnews.import.text.fieldmap", getter_Copies(prefStr));
-		if (NS_SUCCEEDED( rv)) {
-			const char *pStr = (const char *)prefStr;
-			if (pStr) {
-				fieldMap->SetFieldMapSize( 0);
-				long		fNum;
-				PRBool		active;
-				long		fIndex = 0;
-				while (*pStr) {
-					while (*pStr && (*pStr != '+') && (*pStr != '-'))
-						pStr++;
-					if (*pStr == '+')
-						active = PR_TRUE;
-					else if (*pStr == '-')
-						active = PR_FALSE;
-					else
-						break;
-					fNum = 0;
-					while (*pStr && ((*pStr < '0') || (*pStr > '9')))
-						pStr++;
-					if (!(*pStr))
-						break;
-					while (*pStr && (*pStr >= '0') && (*pStr <= '9')) {
-						fNum *= 10;
-						fNum += (*pStr - '0');
-						pStr++;
-					}
-					while (*pStr && (*pStr != ','))
-						pStr++;
-					if (*pStr == ',')
-						pStr++;
-					fieldMap->SetFieldMap( -1, fNum);
-					fieldMap->SetFieldActive( fIndex, active);
-					fIndex++;
-				}
-				if (!fIndex) {
-					int num;
-					fieldMap->GetNumMozFields( &num);
-					fieldMap->DefaultFieldMap( num);
-				}
-			}
-		}
-	}
-
-	return( NS_OK);
-}
-
-
-void ImportAddressImpl::SaveFieldMap( nsIImportFieldMap *pMap)
-{
-	if (!pMap)
-		return;
-
-	int			size;
-	int			index;
-	PRBool		active;
-	nsCString	str;
-
-	pMap->GetMapSize( &size);
-	for (long i = 0; i < size; i++) {
-		index = i;
-		active = PR_FALSE;
-		pMap->GetFieldMap( i, &index);
-		pMap->GetFieldActive( i, &active);
-		if (active)
-			str.Append( '+');
-		else
-			str.Append( '-');
-
-		str.AppendInt( index);
-		str.Append( ',');
-	}
-
-	PRBool	done = PR_FALSE;
-	nsresult rv;
-	// NS_WITH_PROXIED_SERVICE( nsIPref, prefs, kPrefServiceCID, NS_UI_THREAD_EVENTQ, &rv);
-	NS_WITH_SERVICE( nsIPref, prefs, kPrefServiceCID, &rv);
-
-	if (NS_SUCCEEDED( rv)) {
-		nsXPIDLCString	prefStr;
-		rv = prefs->CopyCharPref( "mailnews.import.text.fieldmap", getter_Copies(prefStr));
-		if (NS_SUCCEEDED( rv)) {
-			if (!Compare(str, nsCAutoString((const char *)prefStr)))
-				done = PR_TRUE;
-		}
-		if (!done) {
-			rv = prefs->SetCharPref( "mailnews.import.text.fieldmap", str);
-		}
-	}
-}

mozilla/netwerk/base/src/nsIOService.cpp

@@ -1,501 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIOService.h"
-#include "nsIProtocolHandler.h"
-#include "nscore.h"
-#include "nsIServiceManager.h"
-#include "nsIEventQueueService.h"
-#include "nsIFileTransportService.h"
-#include "nsIURI.h"
-#include "nsIStreamListener.h"
-#include "prprf.h"
-#include "nsLoadGroup.h"
-#include "nsInputStreamChannel.h"
-#include "nsXPIDLString.h" 
-#include "nsIErrorService.h" 
-#include "netCore.h"
-#include "nsIObserverService.h"
-
-static NS_DEFINE_CID(kFileTransportService, NS_FILETRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kDNSServiceCID, NS_DNSSERVICE_CID);
-static NS_DEFINE_CID(kErrorServiceCID, NS_ERRORSERVICE_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsIOService::nsIOService()
-    : mOffline(PR_FALSE)
-{
-    NS_INIT_REFCNT();
-}
-
-nsresult
-nsIOService::Init()
-{
-    nsresult rv = NS_OK;
-    
-    // Hold onto the eventQueue service.  We do not want any eventqueues to go away
-    // when we shutdown until we process all remaining transports
-
-    if (NS_SUCCEEDED(rv))
-        mEventQueueService = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
-  
-    
-    // We need to get references to these services so that we can shut them
-    // down later. If we wait until the nsIOService is being shut down,
-    // GetService will fail at that point.
-    rv = nsServiceManager::GetService(kSocketTransportServiceCID,
-                                      NS_GET_IID(nsISocketTransportService),
-                                      getter_AddRefs(mSocketTransportService));
-
-    if (NS_FAILED(rv)) return rv;
-
-    rv = nsServiceManager::GetService(kFileTransportService,
-                                      NS_GET_IID(nsIFileTransportService),
-                                      getter_AddRefs(mFileTransportService));
-    if (NS_FAILED(rv)) return rv;
-    rv = nsServiceManager::GetService(kDNSServiceCID,
-                                      NS_GET_IID(nsIDNSService),
-                                      getter_AddRefs(mDNSService));
-
-    // XXX hack until xpidl supports error info directly (http://bugzilla.mozilla.org/show_bug.cgi?id=13423)
-    nsCOMPtr<nsIErrorService> errorService = do_GetService(kErrorServiceCID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-        rv = errorService->RegisterErrorStringBundle(NS_ERROR_MODULE_NETWORK, NECKO_MSGS_URL);
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_READ_FROM, "ReadFrom");
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_WROTE_TO, "WroteTo");
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_RESOLVING_HOST, "ResolvingHost");
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_CONNECTED_TO, "ConnectedTo");
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_SENDING_TO, "SendingTo");
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_RECEIVING_FROM, "ReceivingFrom");
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_CONNECTING_TO, "ConnectingTo");
-        if (NS_FAILED(rv)) return rv;
-    }
-    return rv;
-}
-
-
-nsIOService::~nsIOService()
-{
-    (void)SetOffline(PR_TRUE);
-    if (mFileTransportService)
-        (void)mFileTransportService->Shutdown();
-}   
-
-NS_METHOD
-nsIOService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    static  nsISupports *_rValue = nsnull;
-
-    nsresult rv;
-    NS_ENSURE_NO_AGGREGATION(aOuter);
-
-    if (_rValue)
-    {
-        NS_ADDREF (_rValue);
-        *aResult = _rValue;
-        return NS_OK;
-    }
-
-    nsIOService* _ios = new nsIOService();
-    if (_ios == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(_ios);
-    rv = _ios->Init();
-    if (NS_FAILED(rv))
-    {
-        delete _ios;
-        return rv;
-    }
-
-    rv = _ios->QueryInterface(aIID, aResult);
-
-    if (NS_FAILED(rv))
-    {
-        delete _ios;
-        return rv;
-    }
-    
-    _rValue = NS_STATIC_CAST (nsISupports*, *aResult);
-    NS_RELEASE (_rValue);
-    _rValue = nsnull;
-
-    return rv;
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsIOService, nsIIOService);
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define MAX_SCHEME_LENGTH       64      // XXX big enough?
-
-#define MAX_NET_CONTRACTID_LENGTH   (MAX_SCHEME_LENGTH + NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX_LENGTH + 1)
-
-NS_IMETHODIMP
-nsIOService::CacheProtocolHandler(const char *scheme, nsIProtocolHandler *handler)
-{
-    for (unsigned int i=0; i<NS_N(gScheme); i++)
-    {
-        if (!nsCRT::strcasecmp(scheme, gScheme[i]))
-        {
-            nsresult rv;
-            NS_ASSERTION(!mWeakHandler[i], "Protocol handler already cached");
-            // Make sure the handler supports weak references.
-            nsCOMPtr<nsISupportsWeakReference> factoryPtr = do_QueryInterface(handler, &rv);
-            if (!factoryPtr)
-            {
-                // Dont cache handlers that dont support weak reference as
-                // there is real danger of a circular reference.
-#ifdef DEBUG_dp
-                printf("DEBUG: %s protcol handler doesn't support weak ref. Not cached.\n", scheme);
-#endif /* DEBUG_dp */
-                return NS_ERROR_FAILURE;
-            }
-            mWeakHandler[i] = getter_AddRefs(NS_GetWeakReference(handler));
-            return NS_OK;
-        }
-    }
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsIOService::GetCachedProtocolHandler(const char *scheme, nsIProtocolHandler **result)
-{
-    for (unsigned int i=0; i<NS_N(gScheme); i++)
-    {
-        if (!nsCRT::strcasecmp(scheme, gScheme[i]))
-            if (mWeakHandler[i])
-            {
-                nsCOMPtr<nsIProtocolHandler> temp = do_QueryReferent(mWeakHandler[i]);
-                if (temp)
-                {
-                    *result = temp.get();
-                    NS_ADDREF(*result);
-                    return NS_OK;
-                }
-            }
-    }
-    return NS_ERROR_FAILURE;
-}
- 
-
-NS_IMETHODIMP
-nsIOService::GetProtocolHandler(const char* scheme, nsIProtocolHandler* *result)
-{
-    nsresult rv;
-
-    NS_ASSERTION(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX_LENGTH
-                 == nsCRT::strlen(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX),
-                 "need to fix NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX_LENGTH");
-
-    NS_ENSURE_ARG_POINTER(scheme);
-    // XXX we may want to speed this up by introducing our own protocol 
-    // scheme -> protocol handler mapping, avoiding the string manipulation
-    // and service manager stuff
-
-    rv = GetCachedProtocolHandler(scheme, result);
-    if (NS_SUCCEEDED(rv)) return NS_OK;
-
-    char buf[MAX_NET_CONTRACTID_LENGTH];
-    nsCAutoString contractID(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX);
-    contractID += scheme;
-    contractID.ToLowerCase();
-    contractID.ToCString(buf, MAX_NET_CONTRACTID_LENGTH);
-
-    rv = nsServiceManager::GetService(buf, NS_GET_IID(nsIProtocolHandler), (nsISupports **)result);
-    if (NS_FAILED(rv)) 
-    {
-      // okay we don't have a protocol handler to handle this url type, so use the default protocol handler.
-      // this will cause urls to get dispatched out to the OS ('cause we can't do anything with them) when 
-      // we try to read from a channel created by the default protocol handler.
-
-      rv = nsServiceManager::GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"default", NS_GET_IID(nsIProtocolHandler), (nsISupports **)result);
-      if (NS_FAILED(rv)) return NS_ERROR_UNKNOWN_PROTOCOL;
-    }
-
-    CacheProtocolHandler(scheme, *result);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::ExtractScheme(const char* inURI, PRUint32 *startPos, 
-                           PRUint32 *endPos, char* *scheme)
-{
-    return ExtractURLScheme(inURI, startPos, endPos, scheme);
-}
-
-nsresult
-nsIOService::NewURI(const char* aSpec, nsIURI* aBaseURI,
-                    nsIURI* *result, nsIProtocolHandler* *hdlrResult)
-{
-    nsresult rv;
-    nsIURI* base;
-    NS_ENSURE_ARG_POINTER(aSpec);
-    char* scheme;
-    rv = ExtractScheme(aSpec, nsnull, nsnull, &scheme);
-    if (NS_SUCCEEDED(rv)) {
-        // then aSpec is absolute
-        // ignore aBaseURI in this case
-        base = nsnull;
-    }
-    else {
-        // then aSpec is relative
-        if (aBaseURI == nsnull)
-            return NS_ERROR_MALFORMED_URI;
-        rv = aBaseURI->GetScheme(&scheme);
-        if (NS_FAILED(rv)) return rv;
-        base = aBaseURI;
-    }
-    
-    nsCOMPtr<nsIProtocolHandler> handler;
-    rv = GetProtocolHandler(scheme, getter_AddRefs(handler));
-    nsCRT::free(scheme);
-    if (NS_FAILED(rv)) return rv;
-
-    if (hdlrResult) {
-        *hdlrResult = handler;
-        NS_ADDREF(*hdlrResult);
-    }
-    return handler->NewURI(aSpec, base, result);
-}
-
-NS_IMETHODIMP
-nsIOService::NewURI(const char* aSpec, nsIURI* aBaseURI,
-                    nsIURI* *result)
-{
-    return NewURI(aSpec, aBaseURI, result, nsnull);
-}
-
-NS_IMETHODIMP
-nsIOService::NewChannelFromURI(nsIURI *aURI, nsIChannel **result)
-{
-    nsresult rv;
-    NS_ENSURE_ARG_POINTER(aURI);
-
-    nsXPIDLCString scheme;
-    rv = aURI->GetScheme(getter_Copies(scheme));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIProtocolHandler> handler;
-    rv = GetProtocolHandler((const char*)scheme, getter_AddRefs(handler));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = handler->NewChannel(aURI, result);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsIOService::NewChannel(const char *aSpec, nsIURI *aBaseURI, nsIChannel **result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIURI> uri;
-    nsCOMPtr<nsIProtocolHandler> handler;
-    rv = NewURI(aSpec, aBaseURI, getter_AddRefs(uri), getter_AddRefs(handler));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = handler->NewChannel(uri, result);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsIOService::GetOffline(PRBool *offline)
-{
-    *offline = mOffline;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::SetOffline(PRBool offline)
-{
-    nsCOMPtr<nsIObserverService>
-        observerService(do_GetService(NS_OBSERVERSERVICE_CONTRACTID));
-    
-    nsresult rv1 = NS_OK;
-    nsresult rv2 = NS_OK;
-    if (offline) {
-    	mOffline = PR_TRUE;		// indicate we're trying to shutdown
-        // be sure to try and shutdown both (even if the first fails)
-        if (mDNSService)
-            rv1 = mDNSService->Shutdown();  // shutdown dns service first, because it has callbacks for socket transport
-        if (mSocketTransportService)
-            rv2 = mSocketTransportService->Shutdown();
-        if (NS_FAILED(rv1)) return rv1;
-        if (NS_FAILED(rv2)) return rv2;
-
-        // don't care if notification fails
-        if (observerService)
-            (void)observerService->Notify(this,
-                                          NS_LITERAL_STRING("network:offline-status-changed").get(),
-                                          NS_LITERAL_STRING("offline").get());
-    }
-    else if (!offline && mOffline) {
-        // go online
-        if (mDNSService)
-            rv1 = mDNSService->Init();
-        if (NS_FAILED(rv2)) return rv1;
-
-        if (mSocketTransportService)
-            rv2 = mSocketTransportService->Init();		//XXX should we shutdown the dns service?
-        if (NS_FAILED(rv2)) return rv1;        
-        mOffline = PR_FALSE;    // indicate success only AFTER we've
-                                // brought up the services
-        // don't care if notification fails
-        if (observerService)
-            (void)observerService->Notify(this,
-                                          NS_LITERAL_STRING("network:offline-status-changed").get(),
-                                          NS_LITERAL_STRING("online").get());
-    }
-    return NS_OK;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// URL parsing utilities
-
-/* encode characters into % escaped hexcodes */
-
-/* use the following masks to specify which 
-   part of an URL you want to escape: 
-
-   url_Scheme        =     1
-   url_Username      =     2
-   url_Password      =     4
-   url_Host          =     8
-   url_Directory     =    16
-   url_FileBaseName  =    32
-   url_FileExtension =    64
-   url_Param         =   128
-   url_Query         =   256
-   url_Ref           =   512
-*/
-
-/* by default this function will not escape parts of a string
-   that already look escaped, which means it already includes 
-   a valid hexcode. This is done to avoid multiple escapes of
-   a string. Use the following mask to force escaping of a 
-   string:
- 
-   url_Forced        =  1024
-*/
-NS_IMETHODIMP
-nsIOService::Escape(const char *str, PRInt16 mask, char** result)
-{
-    nsCAutoString esc_str;
-    nsresult rv = nsURLEscape((char*)str,mask,esc_str);
-    CRTFREEIF(*result);
-    if (NS_FAILED(rv))
-        return rv;
-    *result = esc_str.ToNewCString();
-    if (!*result)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::Unescape(const char *str, char **result)
-{
-    return nsURLUnescape((char*)str,result);
-}
-
-NS_IMETHODIMP
-nsIOService::ExtractPort(const char *str, PRInt32 *result)
-{
-    PRInt32 returnValue = -1;
-    *result = (0 < PR_sscanf(str, "%d", &returnValue)) ? returnValue : -1;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::ResolveRelativePath(const char *relativePath, const char* basePath,
-                                 char **result)
-{
-    nsCAutoString name;
-    nsCAutoString path(basePath);
-	PRBool needsDelim = PR_FALSE;
-
-	if ( !path.IsEmpty() ) {
-		PRUnichar last = path.Last();
-		needsDelim = !(last == '/' || last == '\\' );
-	}
-
-    PRBool end = PR_FALSE;
-    char c;
-    while (!end) {
-        c = *relativePath++;
-        switch (c) {
-          case '\0':
-          case '#':
-          case ';':
-          case '?':
-            end = PR_TRUE;
-            // fall through...
-          case '/':
-          case '\\':
-            // delimiter found
-            if (name.Equals("..")) {
-                // pop path
-                PRInt32 pos = path.RFind("/");
-                if (pos > 0) {
-                    path.Truncate(pos + 1);
-                    path += name;
-                }
-                else {
-                    return NS_ERROR_MALFORMED_URI;
-                }
-            }
-            else if (name.Equals(".") || name.Equals("")) {
-                // do nothing
-            }
-            else {
-                // append name to path
-                if (needsDelim)
-                    path += "/";
-                path += name;
-                needsDelim = PR_TRUE;
-            }
-            name = "";
-            break;
-
-          default:
-            // append char to name
-            name += c;
-        }
-    }
-    // append anything left on relativePath (e.g. #..., ;..., ?...)
-    if (c != '\0')
-        path += --relativePath;
-
-    *result = path.ToNewCString();
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/parser/htmlparser/src/nsLoggingSink.cpp

@@ -1,789 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- *  Notes: 
- *    The logging sink is now both a sink and a proxy. 
- *    If you want to dump the calls from the parser to the sink, 
- *    create a content sink as usual and hand it to the parser.
- *  
- *    If you want to use a normal sink AND simultaneously have a
- *    parse-log generated, you can set an environment variable
- *    and a logging sink will be created. It will act as a proxy
- *    to the REAL sink you are using after it logs the call. This
- *    form of the loggingsink is constructed using the version
- *    that accepts an nsIHTMLContentSink*.
- *
- * Contributor(s): 
- */
-#include "nsLoggingSink.h"
-#include "nsHTMLTags.h"
-#include "nsString.h"
-#include "prprf.h"
-
-static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
-static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
-static NS_DEFINE_IID(kILoggingSinkIID, NS_ILOGGING_SINK_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-// list of tags that have skipped content
-static char gSkippedContentTags[] = {
-  eHTMLTag_style,
-  eHTMLTag_script,
-  eHTMLTag_server,
-  eHTMLTag_textarea,
-  eHTMLTag_title,
-  0
-};
-
-
-nsresult
-NS_NewHTMLLoggingSink(nsIContentSink** aInstancePtrResult)
-{
-  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-  if (nsnull == aInstancePtrResult) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  nsLoggingSink* it = new nsLoggingSink();
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kIContentSinkIID, (void**) aInstancePtrResult);
-}
-
-nsLoggingSink::nsLoggingSink() {
-  NS_INIT_REFCNT();
-  mOutput = 0;
-	mLevel=-1;
-  mSink=0;
-}
-
-nsLoggingSink::~nsLoggingSink() { 
-  mSink=0;
-  if(mOutput && mAutoDeleteOutput) {
-    delete mOutput;
-  }
-  mOutput=0;
-}
-
-NS_IMPL_ADDREF(nsLoggingSink)
-NS_IMPL_RELEASE(nsLoggingSink)
-
-nsresult
-nsLoggingSink::QueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-  NS_PRECONDITION(nsnull != aInstancePtr, "null ptr");
-  if (nsnull == aInstancePtr) {                                            
-    return NS_ERROR_NULL_POINTER;                                        
-  }                                                                      
-  if (aIID.Equals(kISupportsIID)) {
-    nsISupports* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else if (aIID.Equals(kIContentSinkIID)) {
-    nsIContentSink* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else if (aIID.Equals(kIHTMLContentSinkIID)) {
-    nsIHTMLContentSink* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else if (aIID.Equals(kILoggingSinkIID)) {
-    nsILoggingSink* tmp = this;
-    *aInstancePtr = (void*) tmp;
-  }
-  else {
-    *aInstancePtr = nsnull;
-    return NS_NOINTERFACE;
-  }
-  NS_ADDREF(this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::SetOutputStream(PRFileDesc *aStream,PRBool autoDeleteOutput) {
-  mOutput = aStream;
-  mAutoDeleteOutput=autoDeleteOutput;
-  return NS_OK;
-}
-
-static
-void WriteTabs(PRFileDesc * out,int aTabCount) {
-  int tabs;
-  for(tabs=0;tabs<aTabCount;tabs++)
-    PR_fprintf(out, "  ");
-}
-
-
-NS_IMETHODIMP
-nsLoggingSink::WillBuildModel() {
-  
-  WriteTabs(mOutput,++mLevel);
-  PR_fprintf(mOutput, "<begin>\n");
-  
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    mSink->WillBuildModel();
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::DidBuildModel(PRInt32 aQualityLevel) {
-  
-  WriteTabs(mOutput,--mLevel);
-  PR_fprintf(mOutput, "</begin>\n");
-
-  //proxy the call to the real sink if you have one.
-  nsresult theResult=NS_OK;
-  if(mSink) {
-    theResult=mSink->DidBuildModel(aQualityLevel);
-  }
-
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::WillInterrupt() {
-  nsresult theResult=NS_OK;
-
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->WillInterrupt();
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::WillResume() {
-  nsresult theResult=NS_OK;
-
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->WillResume();
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::SetParser(nsIParser* aParser)  {
-  nsresult theResult=NS_OK;
-
-  //proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->SetParser(aParser);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenContainer(const nsIParserNode& aNode) {
-
-  OpenNode("container", aNode); //do the real logging work...
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenContainer(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseContainer(const nsIParserNode& aNode) {
-
-  nsresult theResult=NS_OK;
-
-  nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
-  if ((nodeType >= eHTMLTag_unknown) &&
-      (nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
-    const char* tag = nsHTMLTags::GetStringValue(nodeType);
-		theResult=CloseNode(tag);
-	}
-	else theResult= CloseNode("???");
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseContainer(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::AddLeaf(const nsIParserNode& aNode) {
-  LeafNode(aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddLeaf(aNode);
-  }
-  
-  return theResult;
-
-} 
-
-
-NS_IMETHODIMP 
-nsLoggingSink::NotifyError(const nsParserError* aError) {
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->NotifyError(aError);
-  }
-  
-  return theResult;
-}
-
-
-/**
- *  This gets called by the parser when you want to add
- *  a PI node to the current container in the content
- *  model.
- *  
- *  @updated gess 3/25/98
- *  @param   
- *  @return  
- */
-NS_IMETHODIMP
-nsLoggingSink::AddProcessingInstruction(const nsIParserNode& aNode){
-
-#ifdef VERBOSE_DEBUG
-  DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
-#endif
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddProcessingInstruction(aNode);
-  }
-  
-  return theResult;
-}
-
-/**
- *  This gets called by the parser when it encounters
- *  a DOCTYPE declaration in the HTML document.
- */
-
-NS_IMETHODIMP
-nsLoggingSink::AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode) {
-
-#ifdef VERBOSE_DEBUG
-  DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
-#endif
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddDocTypeDecl(aNode,aMode);
-  }
-  
-  return theResult;
-
-}
-
-/**
- *  This gets called by the parser when you want to add
- *  a comment node to the current container in the content
- *  model.
- *  
- *  @updated gess 3/25/98
- *  @param   
- *  @return  
- */
-NS_IMETHODIMP
-nsLoggingSink::AddComment(const nsIParserNode& aNode){
-
-#ifdef VERBOSE_DEBUG
-  DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
-#endif
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->AddComment(aNode);
-  }
-  
-  return theResult;
-
-}
-
-
-NS_IMETHODIMP
-nsLoggingSink::SetTitle(const nsString& aValue) {
-   
-  char* tmp;
-  GetNewCString(aValue, &tmp);
-	WriteTabs(mOutput,++mLevel);
-  if(tmp) {
-    PR_fprintf(mOutput, "<title value=\"%s\"/>\n", tmp);
-    nsMemory::Free(tmp);
-  }
-  --mLevel;
-  
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->SetTitle(aValue);
-  }
-  
-  return theResult;
-
-}
-
-
-NS_IMETHODIMP
-nsLoggingSink::OpenHTML(const nsIParserNode& aNode) {
-  OpenNode("html", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenHTML(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseHTML(const nsIParserNode& aNode) {
-  CloseNode("html");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseHTML(aNode);
-  }
-  
-  return theResult;
-
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenHead(const nsIParserNode& aNode) {
-  OpenNode("head", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenHead(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseHead(const nsIParserNode& aNode) {
-  CloseNode("head");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseHead(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenBody(const nsIParserNode& aNode) {
-  OpenNode("body", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenBody(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseBody(const nsIParserNode& aNode) {
-  CloseNode("body");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseBody(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenForm(const nsIParserNode& aNode) {
-  OpenNode("form", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenForm(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseForm(const nsIParserNode& aNode) {
-  CloseNode("form");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseForm(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenMap(const nsIParserNode& aNode) {
-  OpenNode("map", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenMap(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseMap(const nsIParserNode& aNode) {
-  CloseNode("map");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseMap(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::OpenFrameset(const nsIParserNode& aNode) {
-  OpenNode("frameset", aNode);
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->OpenFrameset(aNode);
-  }
-  
-  return theResult;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::CloseFrameset(const nsIParserNode& aNode) {
-  CloseNode("frameset");
-
-  nsresult theResult=NS_OK;
-
-  //then proxy the call to the real sink if you have one.
-  if(mSink) {
-    theResult=mSink->CloseFrameset(aNode);
-  }
-  
-  return theResult;
-}
-
-
-nsresult
-nsLoggingSink::OpenNode(const char* aKind, const nsIParserNode& aNode) {
-	WriteTabs(mOutput,++mLevel);
-
-  PR_fprintf(mOutput,"<open container=");
-
-  nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
-  if ((nodeType >= eHTMLTag_unknown) &&
-      (nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
-    const char* tag = nsHTMLTags::GetStringValue(nodeType);
-    PR_fprintf(mOutput, "\"%s\"", tag);
-  }
-  else {
-    char* text;
-    GetNewCString(aNode.GetText(), &text);
-    if(text) {
-      PR_fprintf(mOutput, "\"%s\"", text);
-      nsMemory::Free(text);
-    }
-  }
-
-  if (WillWriteAttributes(aNode)) {
-    PR_fprintf(mOutput, ">\n");
-    WriteAttributes(aNode);
-    PR_fprintf(mOutput, "</open>\n");
-  }
-  else {
-    PR_fprintf(mOutput, ">\n");
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsLoggingSink::CloseNode(const char* aKind) {
-	WriteTabs(mOutput,mLevel--);
-  PR_fprintf(mOutput, "<close container=\"%s\">\n", aKind);
-  return NS_OK;
-}
-
-
-nsresult
-nsLoggingSink::WriteAttributes(const nsIParserNode& aNode) {
-
-  WriteTabs(mOutput,1+mLevel);
-  nsAutoString tmp;
-  PRInt32 ac = aNode.GetAttributeCount();
-  for (PRInt32 i = 0; i < ac; i++) {
-    char* key=nsnull;
-    char* value=nsnull;
-    const nsAReadableString& k = aNode.GetKeyAt(i);
-    const nsString& v = aNode.GetValueAt(i);
-
-    GetNewCString(k, &key);
-    if(key) {
-      PR_fprintf(mOutput, " <attr key=\"%s\" value=\"", key);
-      nsMemory::Free(key);
-    }
- 
-    tmp.Truncate();
-    tmp.Append(v);
-    if(tmp.Length() > 0) {
-      PRUnichar first = tmp.First();
-      if ((first == '"') || (first == '\'')) {
-        if (tmp.Last() == first) {
-          tmp.Cut(0, 1);
-          PRInt32 pos = tmp.Length() - 1;
-          if (pos >= 0) {
-            tmp.Cut(pos, 1);
-          }
-        } else {
-          // Mismatched quotes - leave them in
-        }
-      }
-      GetNewCString(tmp, &value);
-
-      if(value) {
-        PR_fprintf(mOutput, "%s\"/>\n", value);
-        WriteTabs(mOutput,1+mLevel);
-        nsMemory::Free(value);
-      }
-    }
-  }
-
-  if (0 != strchr(gSkippedContentTags, aNode.GetNodeType())) {
-    char* content;
-    GetNewCString(aNode.GetSkippedContent(), &content);
-    if(content) {
-      PR_fprintf(mOutput, " <content value=\"");
-      PR_fprintf(mOutput, "%s\"/>\n", content) ;
-      nsMemory::Free(content);
-    }
-  }
-  WriteTabs(mOutput,1+mLevel);
-  return NS_OK;
-}
-
-PRBool
-nsLoggingSink::WillWriteAttributes(const nsIParserNode& aNode)
-{
-  PRInt32 ac = aNode.GetAttributeCount();
-  if (0 != ac) {
-    return PR_TRUE;
-  }
-  if (0 != strchr(gSkippedContentTags, aNode.GetNodeType())) {
-    const nsString& content = aNode.GetSkippedContent();
-    if (content.Length() > 0) {
-      return PR_TRUE;
-    }
-  }
-  return PR_FALSE;
-}
-
-nsresult
-nsLoggingSink::LeafNode(const nsIParserNode& aNode)
-{
- 	WriteTabs(mOutput,1+mLevel);
-	nsHTMLTag				nodeType  = nsHTMLTag(aNode.GetNodeType());
-
-  if ((nodeType >= eHTMLTag_unknown) &&
-      (nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
-    const char* tag = nsHTMLTags::GetStringValue(nodeType);
-
-		if(tag)
-      PR_fprintf(mOutput, "<leaf tag=\"%s\"", tag);
-    else PR_fprintf(mOutput, "<leaf tag=\"???\"");
-
-    if (WillWriteAttributes(aNode)) {
-			PR_fprintf(mOutput, ">\n");
-      WriteAttributes(aNode);
-			PR_fprintf(mOutput, "</leaf>\n");
-    }
-    else {
-			PR_fprintf(mOutput, "/>\n");
-    }
-  }
-  else {
-    PRInt32 pos;
-    nsAutoString tmp;
-    char* str;
-    switch (nodeType) {
-			case eHTMLTag_whitespace:
-			case eHTMLTag_text:
-        GetNewCString(aNode.GetText(), &str);
-        if(str) {
-          PR_fprintf(mOutput, "<text value=\"%s\"/>\n", str);
-          nsMemory::Free(str);
-        }
-				break;
-
-			case eHTMLTag_newline:
-				PR_fprintf(mOutput, "<newline/>\n");
-				break;
-
-			case eHTMLTag_entity:
-				tmp.Append(aNode.GetText());
-				tmp.Cut(0, 1);
-				pos = tmp.Length() - 1;
-				if (pos >= 0) {
-					tmp.Cut(pos, 1);
-				}
-				PR_fprintf(mOutput, "<entity value=\"%s\"/>\n", tmp.GetBuffer());
-				break;
-
-			default:
-				NS_NOTREACHED("unsupported leaf node type");
-		}//switch
-  }
-  return NS_OK;
-}
-
-nsresult 
-nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) {
-  aResult.Truncate();
-    /*
-      if you're stepping through the string anyway, why not use iterators instead of forcing the string to copy?
-     */
-  nsPromiseFlatString flat(aValue);
-  const PRUnichar* cp = flat.get();
-  const PRUnichar* end = cp + aValue.Length();
-  while (cp < end) {
-    PRUnichar ch = *cp++;
-    if (ch == '"') {
-      aResult.AppendWithConversion("&quot;");
-    }
-    else if (ch == '&') {
-      aResult.AppendWithConversion("&amp;");
-    }
-    else if ((ch < 32) || (ch >= 127)) {
-      aResult.AppendWithConversion("&#");
-      aResult.AppendInt(PRInt32(ch), 10);
-      aResult.AppendWithConversion(';');
-    }
-    else {
-      aResult.Append(ch);
-    }
-  }
-  return NS_OK;
-}
-
-/**
- * Use this method to convert nsString to char*. 
- * REMEMBER: Match this call with nsMemory::Free(aResult);
- * 
- * @update 04/04/99 harishd
- * @param aValue - The string value
- * @param aResult - String coverted to char*.
- */
-nsresult
-nsLoggingSink::GetNewCString(const nsAReadableString& aValue, char** aResult)
-{
-  nsresult result=NS_OK;
-  nsAutoString temp;
-  result=QuoteText(aValue,temp);
-  if(NS_SUCCEEDED(result)) {
-    if(temp.Length()>0) {
-      *aResult=temp.ToNewCString();
-    }
-  }
-  return result;
-}
-
-NS_IMETHODIMP
-nsLoggingSink::DoFragment(PRBool aFlag) 
-{
-  return NS_OK; 
-}
-
-/**
- * This gets called when handling illegal contents, especially
- * in dealing with tables. This method creates a new context.
- * 
- * @update 04/04/99 harishd
- * @param aPosition - The position from where the new context begins.
- */
-NS_IMETHODIMP
-nsLoggingSink::BeginContext(PRInt32 aPosition) 
-{
-  return NS_OK;
-}
-
-/**
- * This method terminates any new context that got created by
- * BeginContext and switches back to the main context.  
- *
- * @update 04/04/99 harishd
- * @param aPosition - Validates the end of a context.
- */
-NS_IMETHODIMP
-nsLoggingSink::EndContext(PRInt32 aPosition)
-{
-  return NS_OK;
-}

mozilla/string/Makefile.in

@@ -1,37 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Johnny Stenback <jst@netscape.com> (original author)
-#
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src obsolete
-
-#ifdef ENABLE_TESTS
-#DIRS		+= \
-#	tests
-#endif
-
-include $(topsrcdir)/config/rules.mk

mozilla/string/README.html

@@ -1,29 +0,0 @@
-<html>
-<!-- 
-   - The contents of this file are subject to the Mozilla Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/MPL/
-   - 
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   - 
-   - The Original Code is Mozilla.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications.  Portions created by Netscape Communications are
-   - Copyright (C) 2001 by Netscape Communications.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Scott Collins <scc@mozilla.org> (original author)
-  --> 
-<body>
-  <h1><span class="LXRSHORTDESC">managing sequences of characters</span></h1>
-<p>
-  <span class="LXRLONGDESC"></span>
-</p>
-</body>
-</html>

mozilla/string/doc/README.html

@@ -1,29 +0,0 @@
-<html>
-<!-- 
-   - The contents of this file are subject to the Mozilla Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/MPL/
-   - 
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   - 
-   - The Original Code is Mozilla.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications.  Portions created by Netscape Communications are
-   - Copyright (C) 2001 by Netscape Communications.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Scott Collins <scc@mozilla.org> (original author)
-  --> 
-<body>
-  <h1><span class="LXRSHORTDESC">documentation aimed at programmers who are clients of the string library</span></h1>
-<p>
-  <span class="LXRLONGDESC"></span>
-</p>
-</body>
-</html>

mozilla/string/macbuild/String.Prefix

@@ -1,30 +0,0 @@
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications.  Portions created by Netscape Communications are
- * Copyright (C) 2001 by Netscape Communications.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Collins <scc@mozilla.org> (original author)
- */
-
-/*
- * Mac build settings for the release string library
- */
-
-#include "MacPrefix.h"
-
-  // while we're still a part of xpcom, make stuff get exported
-#define _IMPL_NS_COM 1

mozilla/string/macbuild/StringDebug.Prefix

@@ -1,30 +0,0 @@
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications.  Portions created by Netscape Communications are
- * Copyright (C) 2001 by Netscape Communications.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Collins <scc@mozilla.org> (original author)
- */
-
-/*
- * Mac build settings for the debug string library
- */
-
-#include "MacPrefix_debug.h"
-
-  // while we're still a part of xpcom, make stuff get exported
-#define _IMPL_NS_COM 1

mozilla/string/makefile.win

@@ -1,34 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-#   Johnny Stenback <jst@netscape.com> (original author)
-#
-
-DEPTH=.. 
-
-DIRS=   public                  \
-        src                     \
-        obsolete                \
-#!if !defined(DISABLE_TESTS)
-#       tests                   \
-#!endif
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/string/obsolete/MANIFEST

@@ -1,27 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Scott Collins <scc@mozilla.org> (original author)
-# 
-
-
-nsStr.h
-nsString.h
-nsString2.h
-nsXPIDLString.h

mozilla/string/obsolete/Makefile.in

@@ -1,58 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Johnny Stenback <jst@netscape.com> (original author)
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= string
-LIBRARY_NAME	= string_obsolete_s
-
-REQUIRES	= unicharutil xpcom
-
-CPPSRCS		=			\
-		nsStr.cpp		\
-		nsString.cpp		\
-		nsString2.cpp		\
-		nsXPIDLString.cpp	\
-		$(NULL)
-
-EXPORTS		=			\
-		nsStr.h			\
-		nsString.h		\
-		nsString2.h		\
-		nsXPIDLString.h		\
-		$(NULL)			
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE

mozilla/string/obsolete/README.html

@@ -1,35 +0,0 @@
-<html>
-<!-- 
-   - The contents of this file are subject to the Mozilla Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/MPL/
-   - 
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   - 
-   - The Original Code is Mozilla.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications.  Portions created by Netscape Communications are
-   - Copyright (C) 2001 by Netscape Communications.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Scott Collins <scc@mozilla.org> (original author)
-  --> 
-<body>
-  <h1><span class="LXRSHORTDESC">original string implementations soon to be replaced (the names you are using will still be good)</span></h1>
-<p>
-  <span class="LXRLONGDESC">These are the original string implementations by rickg and others.
-  Most of the code here will be made obsolete by the new shared-buffer string (see bug <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=53065">#53065</a>).
-  For the most part, this change is intended to be transparent to clients.
-  The type names you are using for strings now, e.g., nsString, nsAutoString, nsXPIDLString, will still be good,
-    they will just refer to better, but compatible, implementations.
-  If you're interested in learning how strings work, you probably want to start with
-    <a href="http://lxr.mozilla.org/seamonkey/source/string/public/nsAReadableString.h">nsAReadableString</a>.</span>
-</p>
-</body>
-</html>

mozilla/string/obsolete/bufferRoutines.h

@@ -1,971 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-/* bufferRoutines.h --- rickg's original string manipulation underpinnings;
-    this code will be made obsolete by the new shared-buffer string (see bug #53065)
- */
-
-#ifndef _BUFFERROUTINES_H
-#define _BUFFERROUTINES_H
-
-/******************************************************************************************
-  MODULE NOTES:
-
-  This file contains the workhorse copy and shift functions used in nsStrStruct.
-  Ultimately, I plan to make the function pointers in this system available for 
-  use by external modules. They'll be able to install their own "handlers".
-  Not so, today though.
-
-*******************************************************************************************/
-
-#include "nsCRT.h"
-
-#ifndef XPCOM_STANDALONE
-#if !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
-#include "nsUnicharUtilCIID.h"
-#include "nsIServiceManager.h"
-#include "nsICaseConversion.h"
-#endif
-#endif /* XPCOM_STANDALONE */
-
-#define KSHIFTLEFT  (0)
-#define KSHIFTRIGHT (1)
-
-// uncomment the following line to caught nsString char* casting problem
-//#define DEBUG_ILLEGAL_CAST_UP
-//#define DEBUG_ILLEGAL_CAST_DOWN
-
-#if  defined(DEBUG_ILLEGAL_CAST_UP) || defined(DEBUG_ILLEGAL_CAST_DOWN) 
-
-static PRBool track_illegal = PR_TRUE;
-static PRBool track_latin1  = PR_TRUE;
-
-#ifdef XP_UNIX
-#include "nsTraceRefcnt.h"
-class CTraceFile {
-public:
-   CTraceFile() {
-      mFile = fopen("nsStringTrace.txt" , "a+");
-   }
-   ~CTraceFile() {
-      fflush(mFile);
-      fclose(mFile);
-   }
-   void ReportCastUp(const char* data, const char* msg)
-   {
-      if(mFile) {
-        fprintf(mFile, "ERRORTEXT= %s\n", msg);
-        fprintf(mFile, "BEGINDATA\n");
-        const char* s=data;
-        while(*s) {
-           if(*s & 0x80) {
-             fprintf(mFile, "[%2X]", (char)*s);
-	   } else {
-             fprintf(mFile, "%c", *s);
-           }
-           s++;
-        }
-        fprintf(mFile, "\n");
-        fprintf(mFile, "ENDDATA\n");
-        fprintf(mFile, "BEGINSTACK\n");
-        nsTraceRefcnt::WalkTheStack(mFile);
-        fprintf(mFile, "\n");
-        fprintf(mFile, "ENDSTACK\n");
-        fflush(mFile);
-      }
-   }
-   void ReportCastDown(const PRUnichar* data, const char* msg)
-   {
-      if(mFile) {
-        fprintf(mFile, "ERRORTEXT=%s\n", msg);
-        fprintf(mFile, "BEGINDATA\n");
-        const PRUnichar* s=data;
-        while(*s) {
-           if(*s & 0xFF80) {
-             fprintf(mFile, "\\u%X", *s);
-	   } else {
-             fprintf(mFile, "%c", *s);
-           }
-           s++;
-        }
-        fprintf(mFile, "\n");
-        fprintf(mFile, "ENDDATA\n");
-        fprintf(mFile, "BEGINSTACK\n");
-        nsTraceRefcnt::WalkTheStack(mFile);
-        fprintf(mFile, "\n");
-        fprintf(mFile, "ENDSTACK\n");
-        fflush(mFile);
-      }
-   }
-private:
-   FILE* mFile;
-};
-static CTraceFile gTrace;
-#define  TRACE_ILLEGAL_CAST_UP(c, s, m)     if(!(c)) gTrace.ReportCastUp(s,m);
-#define  TRACE_ILLEGAL_CAST_DOWN(c, s, m)   if(!(c)) gTrace.ReportCastDown(s,m);
-
-#else // XP_UNIX
-
-#define  TRACE_ILLEGAL_CAST_UP(c, s, m)   NS_ASSERTION((c), (m))
-#define  TRACE_ILLEGAL_CAST_DOWN(c, s, m) NS_ASSERTION((c), (m))
-
-#endif //XP_UNIX
-
-#endif
-
-inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
-  return ((PRUnichar*)aString)[anIndex];
-}
-
-inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
-  return (PRUnichar)aString[anIndex];
-}
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to shift the contents of a char buffer.
-//  The functions are differentiated by shift direction and the underlying charsize.
-//
-
-/**
- * This method shifts single byte characters left by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where left-shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "cut"
- */
-void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  char*   dst = aDest+anOffset;
-  char*   src = aDest+anOffset+aCount;
-
-  memmove(dst,src,aLength-(aCount+anOffset));
-}
-
-/**
- * This method shifts single byte characters right by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where the shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "inserted"
- */
-void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  char* src = aDest+anOffset;
-  char* dst = aDest+anOffset+aCount;
-
-  memmove(dst,src,aLength-anOffset);
-}
-
-/**
- * This method shifts unicode characters by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where the shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "cut"
- */
-void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  PRUnichar* root=(PRUnichar*)aDest;
-  PRUnichar* dst = root+anOffset;
-  PRUnichar* src = root+anOffset+aCount;
-
-  memmove(dst,src,(aLength-(aCount+anOffset))*sizeof(PRUnichar));
-}
-
-
-/**
- * This method shifts unicode characters by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where the shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "inserted"
- */
-void ShiftDoubleCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  PRUnichar* root=(PRUnichar*)aDest;
-  PRUnichar* src = root+anOffset;
-  PRUnichar* dst = root+anOffset+aCount;
-
-  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
-}
-
-
-typedef void (*ShiftChars)(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount);
-ShiftChars gShiftChars[2][2]= {
-  {&ShiftCharsLeft,&ShiftCharsRight},
-  {&ShiftDoubleCharsLeft,&ShiftDoubleCharsRight}
-};
-
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to copy one buffer onto another.
-//  The functions are differentiated by the size of source and dest character sizes.
-//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
-//           We don't validate these ranges here (this should be done in higher level routines).
-//
-
-
-/**
- * Going 1 to 1 is easy, since we assume ascii. No conversions are necessary.
- * @update	gess 01/04/99
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars1To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-
-  char* dst = aDest+anDestOffset;
-  char* src = (char*)aSource+anOffset;
-
-  memcpy(dst,src,aCount);
-} 
-
-/**
- * Going 1 to 2 requires a conversion from ascii to unicode. This can be expensive.
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars1To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-
-  PRUnichar* theDest=(PRUnichar*)aDest;
-  PRUnichar* to   = theDest+anDestOffset;
-  const unsigned char* first= (const unsigned char*)aSource+anOffset;
-  const unsigned char* last = first+aCount;
-
-#ifdef DEBUG_ILLEGAL_CAST_UP
-  PRBool illegal= PR_FALSE;
-#endif
-  //now loop over characters, shifting them left...
-  while(first<last) {
-    *to=(PRUnichar)(*first);  
-#ifdef DEBUG_ILLEGAL_CAST_UP
-    if(track_illegal && track_latin1 && ((*to)& 0x80))
-      illegal= PR_TRUE;
-#endif
-    to++;
-    first++;
-  }
-#ifdef DEBUG_ILLEGAL_CAST_UP
-  TRACE_ILLEGAL_CAST_UP((!illegal), aSource, "illegal cast up in CopyChars1To2");
-#endif
-
-}
- 
-
-/**
- * Going 2 to 1 requires a conversion from unicode down to ascii. This can be lossy.
- * @update	gess 01/04/99
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars2To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-  char*             to   = aDest+anDestOffset;
-  PRUnichar*        theSource=(PRUnichar*)aSource;
-  const PRUnichar*  first= theSource+anOffset;
-  const PRUnichar*  last = first+aCount;
-
-#ifdef DEBUG_ILLEGAL_CAST_DOWN
-  PRBool illegal= PR_FALSE;
-#endif
-  //now loop over characters, shifting them left...
-  while(first<last) {
-    if(*first<256)
-      *to=(char)*first;  
-    else { 
-      *to='.';
-      NS_ASSERTION( (*first < 256), "data in U+0100-U+FFFF will be lost");
-    }
-#ifdef DEBUG_ILLEGAL_CAST_DOWN
-    if(track_illegal) {
-      if(track_latin1) {
-        if(*first & 0xFF80)
-          illegal = PR_TRUE;
-      } else {
-        if(*first & 0xFF00)
-          illegal = PR_TRUE;
-      } // track_latin1
-    } // track_illegal
-#endif
-    to++;
-    first++;
-  }
-#ifdef DEBUG_ILLEGAL_CAST_DOWN
-  TRACE_ILLEGAL_CAST_DOWN((!illegal), theSource, "illegal cast down in CopyChars2To1");
-#endif
-}
-
-/**
- * Going 2 to 2 is fast and efficient.
- * @update	gess 01/04/99
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars2To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-  PRUnichar* theDest=(PRUnichar*)aDest;
-  PRUnichar* to   = theDest+anDestOffset;
-  PRUnichar* theSource=(PRUnichar*)aSource;
-  PRUnichar* from= theSource+anOffset;
-
-  memcpy((void*)to,(void*)from,aCount*sizeof(PRUnichar));
-}
-
-
-//--------------------------------------------------------------------------------------
-
-
-typedef void (*CopyChars)(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount);
-
-CopyChars gCopyChars[2][2]={
-  {&CopyChars1To1,&CopyChars1To2},
-  {&CopyChars2To1,&CopyChars2To2}
-};
-
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to search a buffer looking for a char.
-//
-
-
-/**
- *  This methods cans the given buffer for the given char
- *  
- *  @update  gess 02/17/00
- *  @param   aDest is the buffer to be searched
- *  @param   aDestLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @param   aCount tells us how many characters to iterate through (which may be different than aLength); -1 means use full length.
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-inline PRInt32 FindChar1(const char* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase,PRInt32 aCount) {
-
-  if(anOffset<0)
-    anOffset=0;
-
-  if(aCount<0)
-    aCount = (PRInt32)aDestLength;
-
-  if((aChar<256) && (0<aDestLength) && ((PRUint32)anOffset<aDestLength)) {
-
-    //We'll only search if the given aChar is within the normal ascii a range,
-    //(Since this string is definitely within the ascii range).
-    
-    if(0<aCount) {
-
-      const char* left= aDest+anOffset;
-      const char* last= left+aCount;
-      const char* max = aDest+aDestLength;
-      const char* end = (last<max) ? last : max;
-
-      if(aIgnoreCase) {
-    
-        char theChar=(char)nsCRT::ToUpper(aChar);
-        while(left<end){
-          if(nsCRT::ToUpper(*left)==theChar)
-            return left-aDest;
-          ++left;
-        }
-      }
-      else {
-
-        PRInt32 theMax = end-left;
-        if(0<theMax) {
-          unsigned char theChar = (unsigned char) aChar;
-          const char* result=(const char*)memchr(left, (int)theChar, theMax);
-          if(result) {
-            return result-aDest;
-          }
-        }
-      }
-    }
-  }
-
-  return kNotFound;
-}
-
-
-/**
- *  This methods cans the given buffer for the given char
- *  
- *  @update  gess 3/25/98
- *  @param   aDest is the buffer to be searched
- *  @param   aDestLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @param   aCount tells us how many characters to iterate through (which may be different than aLength); -1 means use full length.
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-inline PRInt32 FindChar2(const char* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase,PRInt32 aCount) {
-
-  if(anOffset<0)
-    anOffset=0;
-
-  if(aCount<0)
-    aCount = (PRInt32)aDestLength;
-
-  if((0<aDestLength) && ((PRUint32)anOffset<aDestLength)) {
- 
-    if(0<aCount) {
-
-      const PRUnichar* root = (PRUnichar*)aDest;
-      const PRUnichar* left = root+anOffset;
-      const PRUnichar* last = left+aCount;
-      const PRUnichar* max  = root+aDestLength;
-      const PRUnichar* end  = (last<max) ? last : max;
-
-      if(aIgnoreCase) {
-        PRUnichar theChar=nsCRT::ToUpper(aChar);
-        while(left<end){
-          if(nsCRT::ToUpper(*left)==theChar)
-            return left-root;
-          ++left;
-        }
-      }
-      else {
-        while(left<end){
-          if(*left==aChar)
-            return (left-root);
-          ++left;
-        }
-      }
-    }
-  }
-
-  return kNotFound;
-}
-
-
-/**
- *  This methods cans the given buffer (in reverse) for the given char
- *  
- *  @update  gess 02/17/00
- *  @param   aDest is the buffer to be searched
- *  @param   aDestLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @param   aCount tells us how many characters to iterate through (which may be different than aLength); -1 means use full length.
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-
-inline PRInt32 RFindChar1(const char* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase,PRInt32 aCount) {
-
-  if(anOffset<0)
-    anOffset=(PRInt32)aDestLength-1;
-
-  if(aCount<0)
-    aCount = aDestLength;
-
-  if((aChar<256) && (0<aDestLength) && ((PRUint32)anOffset<aDestLength)) {
-
-    //We'll only search if the given aChar is within the normal ascii a range,
-    //(Since this string is definitely within the ascii range).
- 
-    if(0<aCount) {
-
-      const char* rightmost = aDest+anOffset;  
-      const char* min       = rightmost-aCount+1;
-      const char* leftmost  = (min<aDest) ? aDest: min;
-
-      if(aIgnoreCase) {
-    
-        char theChar=(char)nsCRT::ToUpper(aChar);
-        while(leftmost<rightmost){
-          if(nsCRT::ToUpper(*rightmost)==theChar)
-            return rightmost-aDest;
-          --rightmost;
-        }
-      }
-      else {
-
-        char theChar=(char)aChar;
-        while(leftmost<=rightmost){
-          if((*rightmost)==theChar)
-            return rightmost-aDest;
-          --rightmost;
-        }
-      }
-    }
-  }
-
-  return kNotFound;
-}
-
-
-/**
- *  This methods cans the given buffer for the given char
- *  
- *  @update  gess 3/25/98
- *  @param   aDest is the buffer to be searched
- *  @param   aDestLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @param   aCount tells us how many characters to iterate through (which may be different than aLength); -1 means use full length.
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase,PRInt32 aCount) {
-
-  if(anOffset<0)
-    anOffset=(PRInt32)aDestLength-1;
-
-  if(aCount<0)
-    aCount = aDestLength;
-
-  if((0<aDestLength) && ((PRUint32)anOffset<aDestLength)) {
- 
-    if(0<aCount) {
-
-      const PRUnichar* root      = (PRUnichar*)aDest;
-      const PRUnichar* rightmost = root+anOffset;  
-      const PRUnichar* min       = rightmost-aCount+1;
-      const PRUnichar* leftmost  = (min<root) ? root: min;
-
-      if(aIgnoreCase) {
-    
-        PRUnichar theChar=nsCRT::ToUpper(aChar);
-        while(leftmost<rightmost){
-          if(nsCRT::ToUpper(*rightmost)==theChar)
-            return rightmost-root;
-          --rightmost;
-        }
-      }
-      else {
-
-        while(leftmost<=rightmost){
-          if((*rightmost)==aChar)
-            return rightmost-root;
-          --rightmost;
-        }
-      }
-    }
-  }
-
-  return kNotFound;
-}
-
-typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase,PRInt32 aCount);
-FindChars gFindChars[]={&FindChar1,&FindChar2};
-FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to compare one buffer onto another.
-//  The functions are differentiated by the size of source and dest character sizes.
-//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
-//           We don't validate these ranges here (this should be done in higher level routines).
-//
-
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare1To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result=0;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp(aStr1,aStr2,aCount);
-  else result=memcmp(aStr1,aStr2,aCount);
-  return result;
-}
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare2To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result=0;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
-  else result=nsCRT::strncmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
-  return result;
-}
-
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare2To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp((PRUnichar*)aStr1,aStr2,aCount);
-  else result=nsCRT::strncmp((PRUnichar*)aStr1,aStr2,aCount);
-  return result;
-}
-
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare1To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
-  else result=nsCRT::strncmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
-  return result;
-}
-
-
-typedef PRInt32 (*CompareChars)(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase);
-CompareChars gCompare[2][2]={
-  {&Compare1To1,&Compare1To2},
-  {&Compare2To1,&Compare2To2},
-};
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to convert the case of strings...
-//
-
-
-/**
- * This method performs a case conversion the data in the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be case shifted
- * @param   aCount is the number of chars to compare
- * @param   aToUpper tells us whether to convert to upper or lower
- * @return  0
- */
-PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){ 
-  PRInt32 result=0;
-
-  typedef char  chartype;
-  chartype* cp = (chartype*)aString;
-  chartype* end = cp + aCount-1;
-  while (cp <= end) {
-    chartype ch = *cp;
-    if(aToUpper) {
-      if ((ch >= 'a') && (ch <= 'z')) {
-        *cp = 'A' + (ch - 'a');
-      }
-    }
-    else {
-      if ((ch >= 'A') && (ch <= 'Z')) {
-        *cp = 'a' + (ch - 'A');
-      }
-    }
-    cp++;
-  }
-  return result;
-}
-
-//----------------------------------------------------------------------------------------
-
-#ifndef XPCOM_STANDALONE
-#if !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
-class HandleCaseConversionShutdown3 : public nsIShutdownListener {
-public :
-   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
-   HandleCaseConversionShutdown3(void) { NS_INIT_REFCNT(); }
-   virtual ~HandleCaseConversionShutdown3(void) {}
-   NS_DECL_ISUPPORTS
-};
-
-static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
-static nsICaseConversion * gCaseConv = 0; 
-
-NS_IMPL_ISUPPORTS1(HandleCaseConversionShutdown3, nsIShutdownListener);
-
-nsresult HandleCaseConversionShutdown3::OnShutdown(const nsCID& cid, nsISupports* service) {
-    if (cid.Equals(kUnicharUtilCID)) {
-        NS_ASSERTION(service == gCaseConv, "wrong service!");
-        if(gCaseConv){
-          gCaseConv->Release();
-          gCaseConv = 0;
-        }
-    }
-    return NS_OK;
-}
-
-
-class CCaseConversionServiceInitializer {
-public:
-  CCaseConversionServiceInitializer(){
-    HandleCaseConversionShutdown3* listener = 
-      new HandleCaseConversionShutdown3();
-    if(listener){
-      nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion),(nsISupports**) &gCaseConv, listener);
-    }
-  }
-};
-
-#endif
-#endif /* XPCOM_STANDALONE */
-
-//----------------------------------------------------------------------------------------
-
-/**
- * This method performs a case conversion the data in the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be case shifted
- * @param   aCount is the number of chars to compare
- * @param   aToUpper tells us whether to convert to upper or lower
- * @return  0
- */
-PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){ 
-  PRUnichar* cp = (PRUnichar*)aString;
-  PRUnichar* end = cp + aCount-1;
-  PRInt32 result=0;
-
-#ifndef XPCOM_STANDALONE
-#if !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
-  static CCaseConversionServiceInitializer  gCaseConversionServiceInitializer;
-
-  // I18N code begin
-  if(gCaseConv) {
-    nsresult err=(aToUpper) ? gCaseConv->ToUpper(cp, cp, aCount) : gCaseConv->ToLower(cp, cp, aCount);
-    if(NS_SUCCEEDED(err))
-      return 0;
-  }
-  // I18N code end
-#endif
-#endif /* XPCOM_STANDALONE */
-
-
-  while (cp <= end) {
-    PRUnichar ch = *cp;
-    if(aToUpper) {
-      if ((ch >= 'a') && (ch <= 'z')) {
-        *cp = 'A' + (ch - 'a');
-      }
-    }
-    else {
-      if ((ch >= 'A') && (ch <= 'Z')) {
-        *cp = 'a' + (ch - 'A');
-      }
-    }
-    cp++;
-  }
-
-  return result;
-}
-
-typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
-CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
-
-
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used compress char sequences in a buffer...
-//
-
-
-/**
- * This method compresses duplicate runs of a given char from the given buffer 
- *
- * @update	rickg 03.23.2000
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  char*  from = aString;
-  char*  end =  aString + aLength;
-  char*  to = from;
-
-    //this code converts /n, /t, /r into normal space ' ';
-    //it also compresses runs of whitespace down to a single char...
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-
-    while (from < end) {
-      char theChar = *from++;
-      
-      *to++=theChar; //always copy this char...
-
-      if((kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE,aSetLen))){
-        while (from < end) {
-          theChar = *from++;
-          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE,aSetLen)){
-            *to++ = theChar;
-            break;
-          }
-        } //while
-      } //if
-    } //if
-    *to = 0;
-  }
-  return to - aString;
-}
-
-
-
-/**
- * This method compresses duplicate runs of a given char from the given buffer 
- *
- * @update	rickg 03.23.2000
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  PRUnichar*  from = (PRUnichar*)aString;
-  PRUnichar*  end =  from + aLength;
-  PRUnichar*  to = from;
-
-    //this code converts /n, /t, /r into normal space ' ';
-    //it also compresses runs of whitespace down to a single char...
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-
-    while (from < end) {
-      PRUnichar theChar = *from++;
-      
-      *to++=theChar; //always copy this char...
-
-      if((theChar<256) && (kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE,aSetLen))){
-        while (from < end) {
-          theChar = *from++;
-          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE,aSetLen)){
-            *to++ = theChar;
-            break;
-          }
-        } //while
-      } //if
-    } //if
-    *to = 0;
-  }
-  return to - (PRUnichar*)aString;
-}
-
-typedef PRInt32 (*CompressChars)(char* aString,PRUint32 aCount,const char* aSet);
-CompressChars gCompressChars[]={&CompressChars1,&CompressChars2};
-
-/**
- * This method strips chars in a given set from the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 StripChars1(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  char*  to   = aString;
-  char*  from = aString-1;
-  char*  end  = aString + aLength;
-
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-    while (++from < end) {
-      char theChar = *from;
-      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE,aSetLen)){
-        *to++ = theChar;
-      }
-    }
-    *to = 0;
-  }
-  return to - (char*)aString;
-}
-
-
-/**
- * This method strips chars in a given set from the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 StripChars2(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  PRUnichar*  to   = (PRUnichar*)aString;
-  PRUnichar*  from = (PRUnichar*)aString-1;
-  PRUnichar*  end  = to + aLength;
-
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-    while (++from < end) {
-      PRUnichar theChar = *from;
-      //Note the test for ascii range below. If you have a real unicode char, 
-      //and you're searching for chars in the (given) ascii string, there's no
-      //point in doing the real search since it's out of the ascii range.
-      if((255<theChar) || (kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE,aSetLen))){
-        *to++ = theChar;
-      }
-    }
-    *to = 0;
-  }
-  return to - (PRUnichar*)aString;
-}
-
-
-typedef PRInt32 (*StripChars)(char* aString,PRUint32 aCount,const char* aSet);
-StripChars gStripChars[]={&StripChars1,&StripChars2};
-
-#endif

mozilla/string/obsolete/makefile.win

@@ -1,50 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-#   Johnny Stenback <jst@netscape.com> (original author)
-#
-
-DEPTH=..\..
-
-EXPORTS =                               \
-        nsStr.h                         \
-        nsString.h                      \
-        nsString2.h                     \
-        nsXPIDLString.h                 \
-        $(NULL)                        
-
-LIBRARY_NAME=string_obsolete_s
-
-LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
-
-CPP_OBJS =                              \
-        .\$(OBJDIR)\nsStr.obj           \
-        .\$(OBJDIR)\nsString.obj        \
-        .\$(OBJDIR)\nsString2.obj       \
-        .\$(OBJDIR)\nsXPIDLString.obj   \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/string/obsolete/nsStr.cpp

@@ -1,921 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Rick Gessner <rickg@netscape.com> (original author)
- *   Scott Collins <scc@mozilla.org>
- */
-  
-#include "nsStr.h"
-#include "bufferRoutines.h"
-#include <stdio.h>  //only used for printf
-#include "nsCRT.h"
-#include "nsDeque.h"
- 
-/******************************************************************************************
-  MODULE NOTES:
-
-  This file contains the nsStr data structure.
-  This general purpose buffer management class is used as the basis for our strings.
-  It's benefits include:
-    1. An efficient set of library style functions for manipulating nsStrs
-    2. Support for 1 and 2 byte character strings (which can easily be increased to n)
-    3. Unicode awareness and interoperability.
-
-*******************************************************************************************/
-
-//static const char* kCallFindChar =  "For better performance, call FindChar() for targets whose length==1.";
-//static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1.";
-
-static const  PRUnichar gCommonEmptyBuffer[1] = {0};
-static PRBool gStringAcquiredMemory = PR_TRUE;
-
-/**
- * This method initializes all the members of the nsStr structure 
- *
- * @update	gess10/30/98
- * @param 
- * @return
- */
-void nsStr::Initialize(nsStr& aDest,eCharSize aCharSize) {
-  aDest.mStr=(char*)gCommonEmptyBuffer;
-  aDest.mLength=0;
-  aDest.mCapacity=0;
-  aDest.mCharSize=aCharSize;
-  aDest.mOwnsBuffer=0;
-}
-
-/**
- * This method initializes all the members of the nsStr structure
- * @update	gess10/30/98
- * @param 
- * @return
- */
-void nsStr::Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer){
-  aDest.mStr=(aCString) ? aCString : (char*)gCommonEmptyBuffer;
-  aDest.mLength=aLength;
-  aDest.mCapacity=aCapacity;
-  aDest.mCharSize=aCharSize;
-  aDest.mOwnsBuffer=aOwnsBuffer;
-}
-
-
-/**
- * This member destroys the memory buffer owned by an nsStr object (if it actually owns it)
- * @update	gess10/30/98
- * @param 
- * @return
- */
-void nsStr::Destroy(nsStr& aDest) {
-  if((aDest.mStr) && (aDest.mStr!=(char*)gCommonEmptyBuffer)) {
-    Free(aDest);
-  }
-}
-
-
-/**
- * This method gets called when the internal buffer needs
- * to grow to a given size. The original contents are not preserved.
- * @update  gess 3/30/98
- * @param   aNewLength -- new capacity of string in charSize units
- * @return  void
- */
-PRBool nsStr::EnsureCapacity(nsStr& aString,PRUint32 aNewLength) {
-  PRBool result=PR_TRUE;
-  if(aNewLength>aString.mCapacity) {
-    result=Realloc(aString,aNewLength);
-    if(aString.mStr)
-      AddNullTerminator(aString);
-  }
-  return result;
-}
-
-/**
- * This method gets called when the internal buffer needs
- * to grow to a given size. The original contents ARE preserved.
- * @update  gess 3/30/98
- * @param   aNewLength -- new capacity of string in charSize units
- * @return  void
- */
-PRBool nsStr::GrowCapacity(nsStr& aDest,PRUint32 aNewLength) {
-  PRBool result=PR_TRUE;
-  if(aNewLength>aDest.mCapacity) {
-    nsStr theTempStr;
-    nsStr::Initialize(theTempStr,aDest.mCharSize);
-
-#ifndef NS_USE_OLD_STRING_ALLOCATION_STRATEGY
-      // the new strategy is, allocate exact size, double on grows
-    if ( aDest.mCapacity ) {
-      PRUint32 newCapacity = aDest.mCapacity;
-      while ( newCapacity < aNewLength )
-        newCapacity <<= 1;
-      aNewLength = newCapacity;
-    }
-#endif
-
-    result=EnsureCapacity(theTempStr,aNewLength);
-    if(result) {
-      if(aDest.mLength) {
-        StrAppend(theTempStr,aDest,0,aDest.mLength);        
-      } 
-      Free(aDest);
-      aDest.mStr = theTempStr.mStr;
-      theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
-      aDest.mLength=theTempStr.mLength;
-      aDest.mCapacity=theTempStr.mCapacity;
-      aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
-    }
-  }
-  return result;
-}
-
-/**
- * Replaces the contents of aDest with aSource, up to aCount of chars.
- * @update	gess10/30/98
- * @param   aDest is the nsStr that gets changed.
- * @param   aSource is where chars are copied from
- * @param   aCount is the number of chars copied from aSource
- */
-void nsStr::StrAssign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
-  if(&aDest!=&aSource){
-    StrTruncate(aDest,0);
-    StrAppend(aDest,aSource,anOffset,aCount);
-  }
-}
-
-/**
- * This method appends the given nsStr to this one. Note that we have to 
- * pay attention to the underlying char-size of both structs.
- * @update	gess10/30/98
- * @param   aDest is the nsStr to be manipulated
- * @param   aSource is where char are copied from
- * @aCount  is the number of bytes to be copied 
- */
-void nsStr::StrAppend(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
-  if(anOffset<aSource.mLength){
-    PRUint32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
-    PRUint32 theLength=(anOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-anOffset);
-    if(0<theLength){
-      
-      PRBool isBigEnough=PR_TRUE;
-      if(aDest.mLength+theLength > aDest.mCapacity) {
-        isBigEnough=GrowCapacity(aDest,aDest.mLength+theLength);
-      }
-
-      if(isBigEnough) {
-        //now append new chars, starting at offset
-        (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDest.mLength,aSource.mStr,anOffset,theLength);
-
-        aDest.mLength+=theLength;
-        AddNullTerminator(aDest);
-        NSSTR_SEEN(aDest);
-      }
-    }
-  }
-}
-
-
-/**
- * This method inserts up to "aCount" chars from a source nsStr into a dest nsStr.
- * @update	gess10/30/98
- * @param   aDest is the nsStr that gets changed
- * @param   aDestOffset is where in aDest the insertion is to occur
- * @param   aSource is where chars are copied from
- * @param   aSrcOffset is where in aSource chars are copied from
- * @param   aCount is the number of chars from aSource to be inserted into aDest
- */
-void nsStr::StrInsert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount){
-  //there are a few cases for insert:
-  //  1. You're inserting chars into an empty string (assign)
-  //  2. You're inserting onto the end of a string (append)
-  //  3. You're inserting onto the 1..n-1 pos of a string (the hard case).
-  if(0<aSource.mLength){
-    if(aDest.mLength){
-      if(aDestOffset<aDest.mLength){
-        PRInt32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
-        PRInt32 theLength=(aSrcOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-aSrcOffset);
-
-        if(aSrcOffset<aSource.mLength) {
-            //here's the only new case we have to handle. 
-            //chars are really being inserted into our buffer...
-
-          if(aDest.mLength+theLength > aDest.mCapacity) {
-            nsStr theTempStr;
-            nsStr::Initialize(theTempStr,aDest.mCharSize);
-
-            PRBool isBigEnough=EnsureCapacity(theTempStr,aDest.mLength+theLength);  //grow the temp buffer to the right size
-
-            if(isBigEnough) {
-              if(aDestOffset) {
-                StrAppend(theTempStr,aDest,0,aDestOffset); //first copy leftmost data...
-              } 
-              
-              StrAppend(theTempStr,aSource,0,aSource.mLength); //next copy inserted (new) data
-            
-              PRUint32 theRemains=aDest.mLength-aDestOffset;
-              if(theRemains) {
-                StrAppend(theTempStr,aDest,aDestOffset,theRemains); //next copy rightmost data
-              }
-
-              Free(aDest);
-              aDest.mStr = theTempStr.mStr;
-              theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
-              aDest.mCapacity=theTempStr.mCapacity;
-              aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
-            }
-
-          }
-
-          else {
-              //shift the chars right by theDelta...
-            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
-      
-            //now insert new chars, starting at offset
-            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
-          }
-
-            //finally, make sure to update the string length...
-          aDest.mLength+=theLength;
-          AddNullTerminator(aDest);
-          NSSTR_SEEN(aDest);
-        }//if
-        //else nothing to do!
-      }
-      else StrAppend(aDest,aSource,0,aCount);
-    }
-    else StrAppend(aDest,aSource,0,aCount);
-  }
-}
-
-
-/**
- * This method deletes up to aCount chars from aDest
- * @update	gess10/30/98
- * @param   aDest is the nsStr to be manipulated
- * @param   aDestOffset is where in aDest deletion is to occur
- * @param   aCount is the number of chars to be deleted in aDest
- */
-void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
-  if(aDestOffset<aDest.mLength){
-
-    PRUint32 theDelta=aDest.mLength-aDestOffset;
-    PRUint32 theLength=(theDelta<aCount) ? theDelta : aCount;
-
-    if(aDestOffset+theLength<aDest.mLength) {
-
-      //if you're here, it means we're cutting chars out of the middle of the string...
-      //so shift the chars left by theLength...
-      (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
-      aDest.mLength-=theLength;
-      AddNullTerminator(aDest);
-      NSSTR_SEEN(aDest);
-    }
-    else StrTruncate(aDest,aDestOffset);
-  }//if
-}
-
-/**
- * This method truncates the given nsStr at given offset
- * @update	gess10/30/98
- * @param   aDest is the nsStr to be truncated
- * @param   aDestOffset is where in aDest truncation is to occur
- */
-void nsStr::StrTruncate(nsStr& aDest,PRUint32 aDestOffset){
-  if(aDest.mCapacity && aDestOffset<=aDest.mCapacity){
-    aDest.mLength=aDestOffset;
-    AddNullTerminator(aDest);
-    NSSTR_SEEN(aDest);
-  }
-}
-
-
-/**
- * This method forces the given string to upper or lowercase
- * @update	gess1/7/99
- * @param   aDest is the string you're going to change
- * @param   aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
- * @return
- */
-void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
-  // somehow UnicharUtil return failed, fallback to the old ascii only code
-  gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
-}
-
-/**
- * This method removes characters from the given set from this string.
- * NOTE: aSet is a char*, and it's length is computed using strlen, which assumes null termination.
- *
- * @update	gess 11/7/99
- * @param aDest
- * @param aSet
- * @param aEliminateLeading
- * @param aEliminateTrailing
- * @return nothing
- */
-void nsStr::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
-
-  if((aDest.mLength>0) && aSet){
-    PRInt32 theIndex=-1;
-    PRInt32 theMax=aDest.mLength;
-    PRInt32 theSetLen=nsCRT::strlen(aSet);
-
-    if(aEliminateLeading) {
-      while(++theIndex<=theMax) {
-        PRUnichar theChar=GetCharAt(aDest,theIndex);
-        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE,theSetLen);
-        if(kNotFound==thePos)
-          break;
-      }
-      if(0<theIndex) {
-        if(theIndex<theMax) {
-          Delete(aDest,0,theIndex);
-        }
-        else StrTruncate(aDest,0);
-      }
-    }
-
-    if(aEliminateTrailing) {
-      theIndex=aDest.mLength;
-      PRInt32 theNewLen=theIndex;
-      while(--theIndex>=0) {
-        PRUnichar theChar=GetCharAt(aDest,theIndex);  //read at end now...
-        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE,theSetLen);
-        if(kNotFound<thePos) 
-          theNewLen=theIndex;
-        else break;
-      }
-      if(theNewLen<theMax) {
-        StrTruncate(aDest,theNewLen);
-      }
-    }
-
-  }
-}
-
-/**
- * 
- * @update	gess1/7/99
- * @param 
- * @return
- */
-void nsStr::CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
-  Trim(aDest,aSet,aEliminateLeading,aEliminateTrailing);
-  PRUint32 aNewLen=gCompressChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
-  aDest.mLength=aNewLen;
-  NSSTR_SEEN(aDest);
-}
-
-
-/**
- * 
- * @update	gess1/7/99
- * @param 
- * @return
- */
-void nsStr::StripChars(nsStr& aDest,const char* aSet){
-  if((0<aDest.mLength) && (aSet)) {
-    PRUint32 aNewLen=gStripChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
-    aDest.mLength=aNewLen;
-    NSSTR_SEEN(aDest);
-  }
-}
-
-
-  /**************************************************************
-    Searching methods...
-   **************************************************************/
-
-
-/**
- *  This searches aDest for a given substring
- *  
- *  @update  gess 2/04/00: added aCount argument to restrict search
- *  @param   aDest string to search
- *  @param   aTarget is the substring you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @param   aCount tells us how many iterations to make from offset; -1 means the full length of the string
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::FindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
-  PRInt32 theMaxPos = aDest.mLength-aTarget.mLength;  //this is the last pos that is feasible for starting the search, with given lengths...
-
-  if(0<=theMaxPos) {
-
-    if(anOffset<0)
-      anOffset=0;
-
-    if((0<aDest.mLength) && (anOffset<=theMaxPos) && (aTarget.mLength)) {
-
-      if(aCount<0)
-        aCount = MaxInt(theMaxPos,1);
-      
-      if(0<aCount) {
-
-        PRInt32     aDelta= (aDest.mCharSize == eOneByte) ? 1 : 2;
-        const char* root  = aDest.mStr; 
-        const char* left  = root+(anOffset*aDelta);
-        const char* last  = left+((aCount)*aDelta);
-        const char* max   = root+(theMaxPos*aDelta);
-        const char* right = (last<max) ? last : max;
-
-        while(left<=right){
-          PRInt32 cmp=(*gCompare[aDest.mCharSize][aTarget.mCharSize])(left,aTarget.mStr,aTarget.mLength,aIgnoreCase);
-          if(0==cmp) {
-            return (left-root)/aDelta;
-          }
-          left+=aDelta;
-        } //while
-
-      } //if 
-    }
-  } //if
-
-  return kNotFound;
-}
-
-
-/**
- *  This searches aDest for a given character 
- *  
- *  @update  gess 2/04/00: added aCount argument to restrict search
- *  @param   aDest string to search
- *  @param   char is the character you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @param   aCount tell us how many chars to search from offset
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
-  return gFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
-}
-
-
-/**
- *  This searches aDest for a character found in aSet. 
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   aSet contains a list of chars to be searched for
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
-  //NS_PRECONDITION(aSet.mLength!=1,kCallFindChar);
-
-  PRInt32 index=(0<=anOffset) ? anOffset-1 : -1;
-  PRInt32 thePos;
-
-    //Note that the search is inverted here. We're scanning aDest, one char at a time
-    //but doing the search against the given set. That's why we use 0 as the offset below.
-  if((0<aDest.mLength) && (0<aSet.mLength)){
-    while(++index<(PRInt32)aDest.mLength) {
-      PRUnichar theChar=GetCharAt(aDest,index);
-      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase,aSet.mLength);
-      if(kNotFound!=thePos)
-        return index;
-    } //while
-  }
-  return kNotFound;
-}
-
-  /**************************************************************
-    Reverse Searching methods...
-   **************************************************************/
-
-
-/**
- *  This searches aDest (in reverse) for a given substring
- *
- *  @update  gess 2/18/00
- *  @param   aDest string to search
- *  @param   aTarget is the substring you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search (counting from left)
- *  @param   aCount tell us how many iterations to perform from offset
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget,PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
-  if(anOffset<0)
-    anOffset=(PRInt32)aDest.mLength-1;
-
-  if(aCount<0)
-    aCount = aDest.mLength;
-
-  if((0<aDest.mLength) && ((PRUint32)anOffset<aDest.mLength) && (aTarget.mLength)) {
-
-    if(0<aCount) {
-
-      PRInt32     aDelta    = (aDest.mCharSize == eOneByte) ? 1 : 2;
-      const char* root      = aDest.mStr;
-      const char* destLast  = root+(aDest.mLength*aDelta); //pts to last char in aDest (likely null)
-
-      const char* rightmost = root+(anOffset*aDelta);
-      const char* min       = rightmost-((aCount-1)*aDelta);
-
-      const char* leftmost  = (min<root) ? root: min;
-
-      while(leftmost<=rightmost) {
-          //don't forget to divide by delta in next text (bug found by rhp)...
-        if(aTarget.mLength<=PRUint32((destLast-rightmost)/aDelta)) {
-          PRInt32 result=(*gCompare[aDest.mCharSize][aTarget.mCharSize])(rightmost,aTarget.mStr,aTarget.mLength,aIgnoreCase);
-
-          if(0==result) {
-            return (rightmost-root)/aDelta;
-          }
-        } //if
-        rightmost-=aDelta;
-      } //while
-    }
-  }
-
-  return kNotFound;
-}
-
-
-
-/**
- *  This searches aDest (in reverse) for a given character 
- *  
- *  @update  gess 2/04/00
- *  @param   aDest string to search
- *  @param   char is the character you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search; -1 means start at very end (mLength)
- *  @param   aCount tell us how many iterations to perform from offset; -1 means use full length.
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
-  return gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
-}
-
-
-/**
- *  This searches aDest (in reverese) for a character found in aSet. 
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   aSet contains a list of chars to be searched for
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
-  //NS_PRECONDITION(aSet.mLength!=1,kCallRFindChar);
-
-  PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength;
-  PRInt32 thePos;
-
-    //note that the search is inverted here. We're scanning aDest, one char at a time
-    //but doing the search against the given set. That's why we use 0 as the offset below.
-  if(0<aDest.mLength) {
-    while(--index>=0) {
-      PRUnichar theChar=GetCharAt(aDest,index);
-      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase,aSet.mLength);
-      if(kNotFound!=thePos)
-        return index;
-    } //while
-  }
-  return kNotFound;
-}
-
-/**
- * Compare source and dest strings, up to an (optional max) number of chars
- * @param   aDest is the first str to compare
- * @param   aSource is the second str to compare
- * @param   aCount -- if (-1), then we use length of longer string; if (0<aCount) then it gives the max # of chars to compare
- * @param   aIgnorecase tells us whether to search with case sensitivity
- * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
- */
-PRInt32 nsStr::StrCompare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
-  PRInt32 result=0;
-
-  if(aCount) {
-    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
-
-    if(0==minlen) {
-      if ((aDest.mLength == 0) && (aSource.mLength == 0))
-        return 0;
-      if (aDest.mLength == 0)
-        return -1;
-      return 1;
-    }
-
-    PRInt32 theCount = (aCount<0) ? minlen: MinInt(aCount,minlen);
-    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,theCount,aIgnoreCase);
-
-    if (0==result) {
-      if(-1==aCount) {
-
-          //Since the caller didn't give us a length to test, and minlen characters matched,
-          //we have to assume that the longer string is greater.
-
-        if (aDest.mLength != aSource.mLength) {
-          //we think they match, but we've only compared minlen characters. 
-          //if the string lengths are different, then they don't really match.
-          result = (aDest.mLength<aSource.mLength) ? -1 : 1;
-        }
-      } //if
-    }
-
-  }
-  return result;
-}
-
-/**
- * Overwrites the contents of dest at offset with contents of aSource
- * 
- * @param   aDest is the first str to compare
- * @param   aSource is the second str to compare
- * @param   aDestOffset is the offset within aDest where source should be copied
- * @return  error code
- */
-void nsStr::Overwrite(nsStr& aDest,const nsStr& aSource,PRInt32 aDestOffset) {
-  if(aDest.mLength && aSource.mLength) {
-    if((aDest.mLength-aDestOffset)>=aSource.mLength) {
-      //if you're here, then both dest and source have valid lengths
-      //and there's enough room in dest (at offset) to contain source.
-      (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,0,aSource.mLength);      
-    }
-  }
-}
-
-//----------------------------------------------------------------------------------------
-
-PRBool nsStr::Alloc(nsStr& aDest,PRUint32 aCount) {
-
-  static int mAllocCount=0;
-  mAllocCount++;
-
-#ifdef NS_USE_OLD_STRING_ALLOCATION_STRATEGY
-  //we're given the acount value in charunits; now scale up to next multiple.
-  PRUint32	theNewCapacity=kDefaultStringSize;
-  while(theNewCapacity<aCount){ 
-		theNewCapacity<<=1;
-  }
-
-  aDest.mCapacity=theNewCapacity++;
-  PRUint32 theSize=(theNewCapacity<<aDest.mCharSize);
-  aDest.mStr = (char*)nsMemory::Alloc(theSize);
-#else
-    // the new strategy is, allocate exact size, double on grows
-  aDest.mCapacity = aCount;
-  aDest.mStr = (char*)nsMemory::Alloc((aCount+1)<<aDest.mCharSize);
-#endif
-
-  if(aDest.mStr) {
-    aDest.mOwnsBuffer=1;
-    gStringAcquiredMemory=PR_TRUE;
-  }
-  else gStringAcquiredMemory=PR_FALSE;
-  return gStringAcquiredMemory;
-}
-
-PRBool nsStr::Free(nsStr& aDest){
-  if(aDest.mStr){
-    if(aDest.mOwnsBuffer){
-      nsMemory::Free(aDest.mStr);
-    }
-    aDest.mStr=0;
-    aDest.mOwnsBuffer=0;
-    return PR_TRUE;
-  }
-  return PR_FALSE;
-}
-
-PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){
-
-  nsStr temp;
-  memcpy(&temp,&aDest,sizeof(aDest));
-
-  PRBool result=Alloc(temp,aCount);
-  if(result) {
-    Free(aDest);
-    aDest.mStr=temp.mStr;
-    aDest.mCapacity=temp.mCapacity;
-    aDest.mOwnsBuffer=temp.mOwnsBuffer;
-  }
-  return result;
-}
-
-/**
- * Retrieve last memory error
- *
- * @update  gess 10/11/99
- * @return  memory error (usually returns PR_TRUE)
- */
-PRBool nsStr::DidAcquireMemory(void) {
-  return gStringAcquiredMemory;
-}
-
-//----------------------------------------------------------------------------------------
-
-CBufDescriptor::CBufDescriptor(char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=aString;
-  mCharSize=eOneByte;
-  mStackBased=aStackBased;
-  mIsConst=PR_FALSE;
-  mLength=mCapacity=0;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-CBufDescriptor::CBufDescriptor(const char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=(char*)aString;
-  mCharSize=eOneByte;
-  mStackBased=aStackBased;
-  mIsConst=PR_TRUE;
-  mLength=mCapacity=0;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-
-CBufDescriptor::CBufDescriptor(PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=(char*)aString;
-  mCharSize=eTwoByte;
-  mStackBased=aStackBased;
-  mLength=mCapacity=0;
-  mIsConst=PR_FALSE;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-CBufDescriptor::CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=(char*)aString;
-  mCharSize=eTwoByte;
-  mStackBased=aStackBased;
-  mLength=mCapacity=0;
-  mIsConst=PR_TRUE;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-//----------------------------------------------------------------------------------------
-
-PRUint32
-nsStr::HashCode(const nsStr& aDest)
-{
-	if (aDest.mCharSize == eTwoByte)
-    return nsCRT::HashCode(aDest.mUStr);
-  else 
-    return nsCRT::HashCode(aDest.mStr);
-}
-
-#ifdef NS_STR_STATS
-
-#include <ctype.h>
-
-#ifdef XP_MAC
-#define isascii(c)      ((unsigned)(c) < 0x80)
-#endif
-
-void
-nsStr::Print(const nsStr& aDest, FILE* out, PRBool truncate)
-{
-  PRInt32 printLen = (PRInt32)aDest.mLength;
-
-  if (aDest.mCharSize == eOneByte) {
-    const char* chars = aDest.mStr;
-    while (printLen-- && (!truncate || *chars != '\n')) {
-      fputc(*chars++, out);
-    }
-  }
-  else {
-    const PRUnichar* chars = aDest.mUStr;
-    while (printLen-- && (!truncate || *chars != '\n')) {
-      if (isascii(*chars))
-        fputc((char)(*chars++), out);
-      else
-        fputc('-', out);
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// String Usage Statistics Routines
-
-static PLHashTable* gStringInfo = nsnull;
-PRLock* gStringInfoLock = nsnull;
-PRBool gNoStringInfo = PR_FALSE;
-
-nsStringInfo::nsStringInfo(nsStr& str)
-  : mCount(0)
-{
-  nsStr::Initialize(mStr, str.mCharSize);
-  nsStr::StrAssign(mStr, str, 0, -1);
-//  nsStr::Print(mStr, stdout);
-//  fputc('\n', stdout);
-}
-
-PR_EXTERN(PRHashNumber)
-nsStr_Hash(const void* key)
-{
-  nsStr* str = (nsStr*)key;
-  return nsStr::HashCode(*str);
-}
-
-PR_EXTERN(PRIntn)
-nsStr_Compare(const void *v1, const void *v2)
-{
-  nsStr* str1 = (nsStr*)v1;
-  nsStr* str2 = (nsStr*)v2;
-  return nsStr::StrCompare(*str1, *str2, -1, PR_FALSE) == 0;
-}
-
-nsStringInfo*
-nsStringInfo::GetInfo(nsStr& str)
-{
-  if (gStringInfo == nsnull) {
-    gStringInfo = PL_NewHashTable(1024,
-                                  nsStr_Hash,
-                                  nsStr_Compare,
-                                  PL_CompareValues,
-                                  NULL, NULL);
-    gStringInfoLock = PR_NewLock();
-  }
-  PR_Lock(gStringInfoLock);
-  nsStringInfo* info =
-    (nsStringInfo*)PL_HashTableLookup(gStringInfo, &str);
-  if (info == NULL) {
-    gNoStringInfo = PR_TRUE;
-    info = new nsStringInfo(str);
-    if (info) {
-      PLHashEntry* e = PL_HashTableAdd(gStringInfo, &info->mStr, info);
-      if (e == NULL) {
-        delete info;
-        info = NULL;
-      }
-    }
-    gNoStringInfo = PR_FALSE;
-  }
-  PR_Unlock(gStringInfoLock);
-  return info;
-}
-
-void
-nsStringInfo::Seen(nsStr& str)
-{
-  if (!gNoStringInfo) {
-    nsStringInfo* info = GetInfo(str);
-    info->mCount++;
-  }
-}
-
-void
-nsStringInfo::Report(FILE* out)
-{
-  if (gStringInfo) {
-    fprintf(out, "\n== String Stats\n");
-    PL_HashTableEnumerateEntries(gStringInfo, nsStringInfo::ReportEntry, out);
-  }
-}
-
-PRIntn
-nsStringInfo::ReportEntry(PLHashEntry *he, PRIntn i, void *arg)
-{
-  nsStringInfo* entry = (nsStringInfo*)he->value;
-  FILE* out = (FILE*)arg;
-  
-  fprintf(out, "%d ==> (%d) ", entry->mCount, entry->mStr.mLength);
-  nsStr::Print(entry->mStr, out, PR_TRUE);
-  fputc('\n', out);
-  return HT_ENUMERATE_NEXT;
-}
-
-#endif // NS_STR_STATS
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/string/obsolete/nsStr.h

@@ -1,527 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Rick Gessner <rickg@netscape.com> (original author)
- *   Scott Collins <scc@mozilla.org>
- */
-
-/* nsStr.h --- the underlying buffer for rickg's original string implementations;
-    these classes will be replaced by the new shared-buffer string (see bug #53065)
- */
-
-#ifndef _nsStr
-#define _nsStr
-
-/***********************************************************************
-  MODULE NOTES:
-
-    1. There are two philosophies to building string classes:
-        A. Hide the underlying buffer & offer API's allow indirect iteration
-        B. Reveal underlying buffer, risk corruption, but gain performance
-        
-       We chose the option B for performance reasons. 
-
-    2  Our internal buffer always holds capacity+1 bytes.
-
-    The nsStr struct is a simple structure (no methods) that contains
-    the necessary info to be described as a string. This simple struct
-    is manipulated by the static methods provided in this class. 
-    (Which effectively makes this a library that works on structs).
-
-    There are also object-based versions called nsString and nsAutoString
-    which use nsStr but makes it look at feel like an object. 
-
- ***********************************************************************/
-
-/***********************************************************************
-  ASSUMPTIONS:
-
-    1. nsStrings and nsAutoString are always null terminated. However,
-       since it maintains a length byte, you can store NULL's inside
-       the string. Just be careful passing such buffers to 3rd party
-       API's that assume that NULL always terminate the buffer.
-
-    2. nsCStrings can be upsampled into nsString without data loss
-
-    3. Char searching is faster than string searching. Use char interfaces
-       if your needs will allow it.
-
-    4. It's easy to use the stack for nsAutostring buffer storage (fast too!).
-       See the CBufDescriptor class in this file.
-
-    5. If you don't provide the optional count argument to Append() and Insert(),
-       the method will assume that the given buffer is terminated by the first
-       NULL it encounters.
-
-    6. Downsampling from nsString to nsCString can be lossy -- avoid it if possible!
-
-    7. Calls to ToNewCString() and ToNewUnicode() should be matched with calls to nsMemory::Free().
-
- ***********************************************************************/
-
-
-/**********************************************************************************
-  
- AND NOW FOR SOME GENERAL DOCUMENTATION ON STRING USAGE...
-
-    The fundamental datatype in the string library is nsStr. It's a structure that
-    provides the buffer storage and meta-info. It also provides a C-style library
-    of functions for direct manipulation (for those of you who prefer K&R to Bjarne). 
-
-    Here's a diagram of the class hierarchy: 
-
-      nsStr
-        |___nsString
-        |      |
-        |      ------nsAutoString
-        |
-        |___nsCString
-               |
-               ------nsCAutoString
-
-    Why so many string classes? The 4 variants give you the control you need to 
-    determine the best class for your purpose. There are 2 dimensions to this 
-    flexibility: 1) stack vs. heap; and 2) 1-byte chars vs. 2-byte chars.
-
-    Note: While nsAutoString and nsCAutoString begin life using stack-based storage,
-          they may not stay that way. Like all nsString classes, autostrings will
-          automatically grow to contain the data you provide. When autostrings
-          grow beyond their intrinsic buffer, they switch to heap based allocations.
-          (We avoid alloca to avoid considerable platform difficulties; see the 
-           GNU documentation for more details).
-
-    I should also briefly mention that all the string classes use a "memory agent" 
-    object to perform memory operations. This class proxies the standard nsMemory
-    for actual memory calls, but knows the structure of nsStr making heap operations
-    more localized.
-    
-
-  CHOOSING A STRING CLASS:
-
-    In order to choose a string class for you purpose, use this handy table:
-
-                        heap-based    stack-based
-                    -----------------------------------
-        ascii data  |   nsCString     nsCAutoString   |
-                    |----------------------------------
-      unicode data  |    nsString      nsAutoString   |
-                    ----------------------------------- 
-    
-  
-    Note: The i18n folks will stenuously object if we get too carried away with the
-          use of nsCString's that pass interface boundaries. Try to limit your
-          use of these to external interfaces that demand them, or for your own
-          private purposes in cases where they'll never be seen by humans. 
-
-    
-  --- FAQ ---
-
-    Q. When should I use nsCString instead of nsString?
-
-    A. You should really try to stick with nsString, so that we stay as unicode
-       compliant as possible. But there are cases where an interface you use requires
-       a char*. In such cases, it's fair to use nsCString. 
-
-    Q. I know that my string is going to be a certain size. Can I pre-size my nsString?
-
-    A. Yup, here's how:
-
-         {
-           nsString mBuffer;
-           mBuffer.SetCapacity(aReasonableSize);
-         }
-
-    Q. Should nsAutoString or nsCAutoString ever live on the heap?  
-
-    A. That would be counterproductive. The point of nsAutoStrings is to preallocate your
-       buffers, and to auto-destroy the string when it goes out of scope. 
-
-    Q. I already have a char*. Can I use the nsString functionality on that buffer?
-
-    A. Yes you can -- by using an intermediate class called CBufDescriptor.
-       The CBufDescriptor class is used to tell nsString about an external buffer (heap or stack) to use
-       instead of it's own internal buffers. Here's an example:
-         
-         {
-           char theBuffer[256];
-           CBufDescritor theBufDecriptor( theBuffer, PR_TRUE, sizeof(theBuffer), 0);
-           nsCAutoString s3( theBufDescriptor );
-           s3="HELLO, my name is inigo montoya, you killed my father, prepare to die!.";
-         }
-
-         The assignment statment to s3 will cause the given string to be written to your
-         stack-based buffer via the normal nsString/nsCString interfaces. Cool, huh?  
-         Note however that just like any other nsStringXXX use, if you write more data 
-         than will fit in the buffer, a visit to the heap manager will be in order. 
-     
-
-    Q. What is the simplest way to get from a char* to PRUnichar*?
-    
-    A. The simplest way is by construction (or assignment): 
-
-        {
-          char* theBuf = "hello there";
-          nsAutoString foo(theBuf);
-        }
-
-       If you don't want the char* to be copied into the nsAutoString, the use a 
-       CBufDescriptor instead.
-
-
- **********************************************************************************/
-
-
-#include "nscore.h"
-#include "nsMemory.h"
-#include <string.h>
-#include <stdio.h>
-#include "plhash.h"
-
-//----------------------------------------------------------------------------------------
-
-enum  eCharSize {eOneByte=0,eTwoByte=1};
-#define kDefaultCharSize eTwoByte
-#define kRadix10        (10)
-#define kRadix16        (16)
-#define kAutoDetect     (100)
-#define kRadixUnknown   (kAutoDetect+1)
-#define IGNORE_CASE     (PR_TRUE)
-
-const   PRInt32 kDefaultStringSize = 64;
-const   PRInt32 kNotFound = -1;
-
-
-//----------------------------------------------------------------------------------------
-
-class NS_COM CBufDescriptor {
-public:
-  CBufDescriptor(char* aString,           PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-  CBufDescriptor(const char* aString,     PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-  CBufDescriptor(PRUnichar* aString,      PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-  CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-
-  char*     mBuffer;
-  eCharSize mCharSize;
-  PRUint32  mCapacity;
-  PRInt32   mLength;
-  PRBool    mStackBased;
-  PRBool    mIsConst;
-};
-
-//----------------------------------------------------------------------------------------
-
-
-struct NS_COM nsStr {  
-
-  nsStr() {
-    MOZ_COUNT_CTOR(nsStr);
-  }
-
-  ~nsStr() {
-    MOZ_COUNT_DTOR(nsStr);
-  }
-
- /**
-  * This method initializes an nsStr for use
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be initialized
-  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
-  */
-  static void Initialize(nsStr& aDest,eCharSize aCharSize);
-
- /**
-  * This method initializes an nsStr for use
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be initialized
-  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
-  */
-  static void Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer);
-
- /**
-  * This method destroys the given nsStr, and *MAY* 
-  * deallocate it's memory depending on the setting
-  * of the internal mOwnsBUffer flag.
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be manipulated
-  * @param  anAgent is the allocator to be used to the nsStr
-  */
-  static void Destroy(nsStr& aDest); 
-
- /**
-  * These methods are where memory allocation/reallocation occur. 
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be manipulated
-  * @param  anAgent is the allocator to be used on the nsStr
-  * @return  
-  */
-  static PRBool EnsureCapacity(nsStr& aString,PRUint32 aNewLength);
-  static PRBool GrowCapacity(nsStr& aString,PRUint32 aNewLength);
-
- /**
-  * These methods are used to append content to the given nsStr
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aSource is the buffer to be copied from
-  * @param  anOffset tells us where in source to start copying
-  * @param  aCount tells us the (max) # of chars to copy
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void StrAppend(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
-
- /**
-  * These methods are used to assign contents of a source string to dest string
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aSource is the buffer to be copied from
-  * @param  anOffset tells us where in source to start copying
-  * @param  aCount tells us the (max) # of chars to copy
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void StrAssign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
-
- /**
-  * These methods are used to insert content from source string to the dest nsStr
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aDestOffset tells us where in dest to start insertion
-  * @param  aSource is the buffer to be copied from
-  * @param  aSrcOffset tells us where in source to start copying
-  * @param  aCount tells us the (max) # of chars to insert
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void StrInsert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount);
-
- /**
-  * This method deletes chars from the given str. 
-  * The given allocator may choose to resize the str as well.
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be deleted from
-  * @param  aDestOffset tells us where in dest to start deleting
-  * @param  aCount tells us the (max) # of chars to delete
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount);
-
- /**
-  * This method is used to truncate the given string.
-  * The given allocator may choose to resize the str as well (but it's not likely).
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aDestOffset tells us where in dest to start insertion
-  * @param  aSource is the buffer to be copied from
-  * @param  aSrcOffset tells us where in source to start copying
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void StrTruncate(nsStr& aDest,PRUint32 aDestOffset);
-
- /**
-  * This method is used to perform a case conversion on the given string
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be case shifted
-  * @param  toUpper tells us to go upper vs. lower
-  */
-  static void ChangeCase(nsStr& aDest,PRBool aToUpper);
-
-
-  /**
-   * This method trims chars (given in aSet) from the edges of given buffer 
-   *
-   * @update	gess 01/04/99
-   * @param   aDest is the buffer to be manipulated
-   * @param   aSet tells us which chars to remove from given buffer
-   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
-   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
-   */
-  static void Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
-  
-  /**
-   * This method compresses duplicate runs of a given char from the given buffer 
-   *
-   * @update	gess 01/04/99
-   * @param   aDest is the buffer to be manipulated
-   * @param   aSet tells us which chars to compress from given buffer
-   * @param   aChar is the replacement char
-   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
-   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
-   */
-  static void CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
-
-  /**
-   * This method removes all occurances of chars in given set from aDest 
-   *
-   * @update	gess 01/04/99
-   * @param   aDest is the buffer to be manipulated
-   * @param   aSet tells us which chars to compress from given buffer
-   * @param   aChar is the replacement char
-   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
-   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
-   */
-  static void StripChars(nsStr& aDest,const char* aSet);
-
-  /**
-   * This method compares the data bewteen two nsStr's 
-   *
-   * @update	gess 01/04/99
-   * @param   aStr1 is the first buffer to be compared
-   * @param   aStr2 is the 2nd buffer to be compared
-   * @param   aCount is the number of chars to compare
-   * @param   aIgnorecase tells us whether to use a case-sensitive comparison
-   * @return  -1,0,1 depending on <,==,>
-   */
-  static PRInt32  StrCompare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
-
- /**
-  * These methods scan the given string for 1 or more chars in a given direction
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be searched to
-  * @param  aSource (or aChar) is the substr we're looking to find
-  * @param  aIgnoreCase tells us whether to search in a case-sensitive manner
-  * @param  anOffset tells us where in the dest string to start searching
-  * @return the index of the source (substr) in dest, or -1 (kNotFound) if not found.
-  */
-  static PRInt32 FindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
-  static PRInt32 FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
-  static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
-
-  static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
-  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
-  static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
-
-  static void    Overwrite(nsStr& aDest,const nsStr& aSource,PRInt32 anOffset);
-
-  static PRBool   DidAcquireMemory(void);
-
-  /**
-   * Returns a hash code for the string for use in a PLHashTable.
-   */
-  static PRUint32 HashCode(const nsStr& aDest);
-
-#ifdef NS_STR_STATS
-  /**
-   * Prints an nsStr. If truncate is true, the string is only printed up to 
-   * the first newline. (Note: The current implementation doesn't handle
-   * non-ascii unicode characters.)
-   */
-  static void Print(const nsStr& aDest, FILE* out, PRBool truncate = PR_FALSE);
-#endif
-
-  PRUint32        mLength;
-  PRUint32        mCapacity;
-  eCharSize       mCharSize;
-  PRBool          mOwnsBuffer;
-
-  union { 
-    char*         mStr;
-    PRUnichar*    mUStr;
-  };
-
-private:
-  static PRBool Alloc(nsStr& aString,PRUint32 aCount);
-  static PRBool Realloc(nsStr& aString,PRUint32 aCount);
-  static PRBool Free(nsStr& aString);
-
-};
-
-
-
-
-/**************************************************************
-  A couple of tiny helper methods used in the string classes.
- **************************************************************/
-
-inline PRInt32 MinInt(PRInt32 anInt1,PRInt32 anInt2){
-  return (anInt1<anInt2) ? anInt1 : anInt2;
-}
-
-inline PRInt32 MaxInt(PRInt32 anInt1,PRInt32 anInt2){
-  return (anInt1<anInt2) ? anInt2 : anInt1;
-}
-
-inline void AddNullTerminator(nsStr& aDest) {
-  if(eTwoByte==aDest.mCharSize) 
-    aDest.mUStr[aDest.mLength]=0;
-  else aDest.mStr[aDest.mLength]=0;
-}
-
-/**
- * Deprecated: don't use |Recycle|, just call |nsMemory::Free| directly
- *
- * Return the given buffer to the heap manager. Calls allocator::Free()
- * @return string length
- */
-inline void Recycle( char* aBuffer) { nsMemory::Free(aBuffer); }
-inline void Recycle( PRUnichar* aBuffer) { nsMemory::Free(aBuffer); }
-
-/**
-* This method is used to access a given char in the given string
-*
-* @update	gess 01/04/99
-* @param  aDest is the nsStr to be appended to
-* @param  anIndex tells us where in dest to get the char from
-* @return the given char, or 0 if anIndex is out of range
-*/
-inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex) {
-  if(anIndex<aDest.mLength)  {
-    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : (PRUnichar)aDest.mStr[anIndex];
-  }//if
-  return 0;
-}
-
-
-#ifdef NS_STR_STATS
-
-class nsStringInfo {
-public:
-  nsStringInfo(nsStr& str);
-  ~nsStringInfo() {}
-
-  static nsStringInfo* GetInfo(nsStr& str);
-
-  static void Seen(nsStr& str);
-
-  static void Report(FILE* out = stdout);
-  
-  static PRIntn ReportEntry(PLHashEntry *he, PRIntn i, void *arg);
-
-protected:
-  nsStr         mStr;
-  PRUint32      mCount;
-};
-
-#define NSSTR_SEEN(str) nsStringInfo::Seen(str)
-
-#else // !NS_STR_STATS
-
-#define NSSTR_SEEN(str) /* nothing */
-
-#endif // !NS_STR_STATS
-
-#endif // _nsStr

mozilla/string/obsolete/nsString.h

@@ -1,583 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Rick Gessner <rickg@netscape.com> (original author)
- *   Scott Collins <scc@mozilla.org>
- */
-
-/* nsString.h --- rickg's original strings of 1-byte chars, |nsCString| and |nsCAutoString|;
-    these classes will be replaced by the new shared-buffer string (see bug #53065)
- */
-
-
-#ifndef _nsCString_
-#define _nsCString_
-
-/***********************************************************************
-  MODULE NOTES:
-
-  See nsStr.h for a more general description of string classes.
-
-  This version of the nsString class offers many improvements over the
-  original version:
-    1. Wide and narrow chars
-    2. Allocators
-    3. Much smarter autostrings
-    4. Subsumable strings
- ***********************************************************************/
-
-#include "nsString2.h"
-#include "prtypes.h"
-#include "nscore.h"
-#include <stdio.h>
-#include "nsStr.h"
-#include "nsIAtom.h"
-
-#include "nsAString.h"
-
-/* this file will one day be _only_ a compatibility header for clients using the names
-     |ns[C]String| et al ... which we probably want to support forever.
-   In the mean time, people are used to getting the names |nsAReadable[C]String| and friends
-     from here as well; so we must continue to include the other compatibility headers
-     even though we don't use them ourself.
- */
-
-#include "nsAWritableString.h"
-  // for compatibility
-
-
-class NS_COM nsSubsumeCStr;
-
-class NS_COM nsCString :
-  public nsAFlatCString,
-  public nsStr {
-
-protected:
-  virtual const nsBufferHandle<char>* GetFlatBufferHandle() const;
-  virtual const char* GetReadableFragment( nsReadableFragment<char>&, nsFragmentRequest, PRUint32 ) const;
-  virtual char* GetWritableFragment( nsWritableFragment<char>&, nsFragmentRequest, PRUint32 );
-
-public:
-  virtual const char* get() const { return mStr; }
-
-public: 
-  /**
-   * Default constructor. 
-   */
-  nsCString();
-
-  /**
-   * This is our copy constructor 
-   * @param   reference to another nsCString
-   */
-  nsCString(const nsCString& aString);   
-
-  explicit nsCString( const nsACString& );
-
-  explicit nsCString(const char*);
-  nsCString(const char*, PRInt32);
-
-  /**
-   * This constructor takes a subsumestr
-   * @param   reference to subsumestr
-   */
-  explicit nsCString(nsSubsumeCStr& aSubsumeStr);
-
-  /**
-   * Destructor
-   * 
-   */
-  virtual ~nsCString();    
-
-  /**
-   * Retrieve the length of this string
-   * @return string length
-   */
-  virtual PRUint32 Length() const { return mLength; }
-
-  /**
-   * Retrieve the size of this string
-   * @return string length
-   */
-  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-
-
-  /**
-   * Call this method if you want to force a different string capacity
-   * @update  gess7/30/98
-   * @param   aLength -- contains new length for mStr
-   * @return
-   */
-  void SetLength(PRUint32 aLength);
-
-  /**
-   * Sets the new length of the string.
-   * @param   aLength is new string length.
-   * @return  nada
-   */
-  void SetCapacity(PRUint32 aLength);
-
-  /**********************************************************************
-    Accessor methods...
-   *********************************************************************/
-
-  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
-
-  /**********************************************************************
-    Lexomorphic transforms...
-   *********************************************************************/
-
-  /**
-   * Converts chars in this to lowercase
-   * @update  gess 7/27/98
-   */
-  void ToLowerCase();
-
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in aOut
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToLowerCase(nsCString& aString) const;
-
-  /**
-   * Converts chars in this to uppercase
-   * @update  gess 7/27/98
-   */
-  void ToUpperCase();
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in a given output string
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToUpperCase(nsCString& aString) const;
-
-
-  /**
-   *  This method is used to remove all occurances of the
-   *  characters found in aSet from this string.
-   *  
-   *  @param  aSet -- characters to be cut from this
-   *  @return *this 
-   */
-  void StripChars(const char* aSet);
-  void StripChar(PRUnichar aChar,PRInt32 anOffset=0);
-  void StripChar(char aChar,PRInt32 anOffset=0) { StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
-
-  /**
-   *  This method strips whitespace throughout the string
-   *  
-   *  @return  this
-   */
-  void StripWhitespace();
-
-  /**
-   *  swaps occurence of 1 string for another
-   *  
-   *  @return  this
-   */
-  void ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
-  void ReplaceChar(const char* aSet,PRUnichar aNewChar);
-
-  void ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue);
-  void ReplaceSubstring(const char* aTarget,const char* aNewValue);
-
-  /**
-   *  This method trims characters found in aTrimSet from
-   *  either end of the underlying string.
-   *  
-   *  @param   aTrimSet -- contains chars to be trimmed from
-   *           both ends
-   *  @param   aEliminateLeading
-   *  @param   aEliminateTrailing
-   *  @param   aIgnoreQuotes
-   *  @return  this
-   */
-  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**********************************************************************
-    string conversion methods...
-   *********************************************************************/
-//#ifndef STANDALONE_STRING_TESTS
-  operator const char*() const {return (const char*)mStr;}
-//#endif
-
-  /**
-   * This method constructs a new nsCString that is a clone
-   * of this string.
-   * 
-   */
-  nsCString* ToNewString() const;
-
-  /**
-   * Creates an ISOLatin1 clone of this string
-   * Note that calls to this method should be matched with calls to
-   * |nsMemory::Free|.
-   * @return  ptr to new isolatin1 string
-   */
-  char* ToNewCString() const;
-
-  /**
-   * Creates a unicode clone of this string
-   * Note that calls to this method should be matched with calls to
-   * |nsMemory::Free|.
-   * @return  ptr to new unicode string
-   */
-  PRUnichar* ToNewUnicode() const;
-
-  /**
-   * Copies data from internal buffer onto given char* buffer
-   * NOTE: This only copies as many chars as will fit in given buffer (clips)
-   * @param aBuf is the buffer where data is stored
-   * @param aBuflength is the max # of chars to move to buffer
-   * @return ptr to given buffer
-   */
-  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
-
-  /**
-   * Perform string to float conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @return  float rep of string value
-   */
-  float ToFloat(PRInt32* aErrorCode) const;
-
-
-  /**
-   * Perform string to int conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @param   aRadix tells us which radix to assume; kAutoDetect tells us to determine the radix for you.
-   * @return  int rep of string value, and possible (out) error code
-   */
-  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
-
-
-  /**********************************************************************
-    String manipulation methods...                
-   *********************************************************************/
-
-  /**
-   * assign given string to this string
-   * @param   aStr: buffer to be assigned to this 
-   * @param   aCount is the length of the given str (or -1) if you want me to determine its length
-   *  NOTE:    IFF you pass -1 as aCount, then your buffer must be null terminated.
-   *
-   * @return  this
-   */
-
-  nsCString& operator=( const nsCString& aString )                  { Assign(aString); return *this; }
-  nsCString& operator=( const nsACString& aReadable )               { Assign(aReadable); return *this; }
-//nsCString& operator=( const nsPromiseReadable<char>& aReadable )  { Assign(aReadable); return *this; }
-  nsCString& operator=( const char* aPtr )                          { Assign(aPtr); return *this; }
-  nsCString& operator=( char aChar )                                { Assign(aChar); return *this; }
-
-  void AssignWithConversion(const PRUnichar*,PRInt32=-1);
-  void AssignWithConversion( const nsString& aString );
-  void AssignWithConversion( const nsAString& aString );
-  void AssignWithConversion(PRUnichar);
-
-  /*
-   *  Appends n characters from given string to this,
-   *  
-   *  @param   aString is the source to be appended to this
-   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
-   *  NOTE:    IFF you pass -1 as aCount, then your buffer must be null terminated.
-   *
-   *  @return  number of chars copied
-   */
-
-  void AppendWithConversion(const nsString&, PRInt32=-1);
-  void AppendWithConversion(PRUnichar aChar);
-  void AppendWithConversion( const nsAString& aString );
-  void AppendWithConversion(const PRUnichar*, PRInt32=-1);
-  // Why no |AppendWithConversion(const PRUnichar*, PRInt32)|? --- now I know, because implicit construction hid the need for this routine
-  void AppendInt(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
-  void AppendFloat( double aFloat );
-
-
-  void InsertWithConversion(PRUnichar aChar,PRUint32 anOffset);
-  // Why no |InsertWithConversion(PRUnichar*)|?
-
-#if 0
-  virtual void do_AppendFromReadable( const nsACString& );
-  virtual void do_InsertFromReadable( const nsACString&, PRUint32 );
-#endif
-
-
-  /**********************************************************************
-    Searching methods...                
-   *********************************************************************/
- 
-
-  /**
-   *  Search for given substring within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aCount tells us how many iterations to make starting at the given offset
-   *  @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @param   aCount tells us how many iterations to make starting at the given offset
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-
-  /**
-   * This method searches this string for the first character
-   * found in the given charset
-   * @param aString contains set of chars to be found
-   * @param anOffset tells us where to start searching in this
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=0) const;
-  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=0) const;
-  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=0) const;
-
-
-  /**
-   * This methods scans the string backwards, looking for the given string
-   * @param   aString is substring to be sought in this
-   * @param   aIgnoreCase tells us whether or not to do caseless compare
-   * @param   aCount tells us how many iterations to make starting at the given offset
-   * @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-
-  /**
-   * This method searches this string for the last character
-   * found in the given string
-   * @param aString contains set of chars to be found
-   * @param anOffset tells us where to start searching in this
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
-
-
-
-  /**********************************************************************
-    Comparison methods...                
-   *********************************************************************/
-
-  /**
-   * Compares a given string type to this string. 
-   * @update  gess 7/27/98
-   * @param   S is the string to be compared
-   * @param   aIgnoreCase tells us how to treat case
-   * @param   aCount tells us how many chars to compare
-   * @return  -1,0,1
-   */
-  PRInt32 CompareWithConversion(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRInt32 CompareWithConversion(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-
-  PRBool  EqualsWithConversion(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  EqualsWithConversion(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  EqualsWithConversion(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-
-  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
-  PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
-
-
-  void    DebugDump(void) const;
-
-private:
-    // NOT TO BE IMPLEMENTED
-    //  these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion
-  void operator=( PRUnichar );
-  void AssignWithConversion( char );
-  void AssignWithConversion( const char*, PRInt32=-1 );
-  void AppendWithConversion( char );
-  void InsertWithConversion( char, PRUint32 );
-};
-
-// NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
-// NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCString, char)
-
-extern NS_COM int fputs(const nsCString& aString, FILE* out);
-//ostream& operator<<(ostream& aStream,const nsCString& aString);
-//virtual void  DebugDump(ostream& aStream) const;
-
-
-/**************************************************************
-  Here comes the AutoString class which uses internal memory
-  (typically found on the stack) for its default buffer.
-  If the buffer needs to grow, it gets reallocated on the heap.
- **************************************************************/
-
-class NS_COM nsCAutoString : public nsCString {
-public: 
-
-    virtual ~nsCAutoString();
-
-    nsCAutoString();
-    explicit nsCAutoString(const nsCString& );
-    explicit nsCAutoString(const nsACString& aString);
-    explicit nsCAutoString(const char* aString);
-    nsCAutoString(const char* aString,PRInt32 aLength);
-    explicit nsCAutoString(const CBufDescriptor& aBuffer);
-
-#if defined(AIX) || defined(XP_OS2_VACPP)
-    explicit nsCAutoString(const nsSubsumeCStr& aSubsumeStr);  // AIX and VAC++ require a const
-#else
-    explicit nsCAutoString(nsSubsumeCStr& aSubsumeStr);
-#endif // AIX || XP_OS2_VACPP
-
-
-    nsCAutoString& operator=( const nsCAutoString& aString )              { Assign(aString); return *this; }
-  private:
-    void operator=( PRUnichar ); // NOT TO BE IMPLEMENTED
-  public:
-    nsCAutoString& operator=( const nsACString& aReadable )       { Assign(aReadable); return *this; }
-//  nsCAutoString& operator=( const nsPromiseReadable<char>& aReadable )  { Assign(aReadable); return *this; }
-    nsCAutoString& operator=( const char* aPtr )                          { Assign(aPtr); return *this; }
-    nsCAutoString& operator=( char aChar )                                { Assign(aChar); return *this; }
-
-    /**
-     * Retrieve the size of this string
-     * @return string length
-     */
-    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-    
-    char mBuffer[kDefaultStringSize];
-};
-
-// NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCAutoString, char)
-
-/**
- * A helper class that converts a UCS2 string to UTF8
- */
-class NS_COM NS_ConvertUCS2toUTF8
-      : public nsCAutoString
-    /*
-      ...
-    */
-  {
-    public:
-      explicit
-      NS_ConvertUCS2toUTF8( const PRUnichar* aString )
-        {
-          Append( aString, ~PRUint32(0) /* MAXINT */);
-        }
-
-      NS_ConvertUCS2toUTF8( const PRUnichar* aString, PRUint32 aLength )
-        {
-          Append( aString, aLength );
-        }
-
-      explicit
-      NS_ConvertUCS2toUTF8( PRUnichar aChar )
-        {
-          Append( &aChar, 1 );
-        }
-
-      explicit NS_ConvertUCS2toUTF8( const nsAString& aString );
-
-    protected:
-      void Append( const PRUnichar* aString, PRUint32 aLength );
-
-    private:
-        // NOT TO BE IMPLEMENTED
-      NS_ConvertUCS2toUTF8( char );
-      operator const char*() const;  // use |get()|
-  };
-
-
-/***************************************************************
-  The subsumestr class is very unusual. 
-  It differs from a normal string in that it doesn't use normal
-  copy semantics when another string is assign to this. 
-  Instead, it "steals" the contents of the source string.
-
-  This is very handy for returning nsString classes as part of
-  an operator+(...) for example, in that it cuts down the number
-  of copy operations that must occur. 
-
-  You should probably not use this class unless you really know
-  what you're doing.
- ***************************************************************/
-class NS_COM nsSubsumeCStr : public nsCString {
-public:
-  explicit nsSubsumeCStr(nsStr& aString);
-  nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-  nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-
-  nsSubsumeCStr& operator=( const nsSubsumeCStr& aString )              { Assign(aString); return *this; }
-  nsSubsumeCStr& operator=( const nsACString& aReadable )       { Assign(aReadable); return *this; }
-//nsSubsumeCStr& operator=( const nsPromiseReadable<char>& aReadable )  { Assign(aReadable); return *this; }
-  nsSubsumeCStr& operator=( const char* aPtr )                          { Assign(aPtr); return *this; }
-  nsSubsumeCStr& operator=( char aChar )                                { Assign(aChar); return *this; }
-private:
-  void operator=( PRUnichar ); // NOT TO BE IMPLEMENTED
-};
-
-
-#endif
-
-

mozilla/string/obsolete/nsString2.h

@@ -1,666 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Rick Gessner <rickg@netscape.com> (original author)
- *   Scott Collins <scc@mozilla.org>
- */
-
-/* nsString2.h --- rickg's original strings of 2-byte chars, |nsString| and |nsAutoString|;
-    these classes will be replaced by the new shared-buffer string (see bug #53065)
- */
-
-
-
-#ifndef _nsString_
-#define _nsString_
-
-/***********************************************************************
-  MODULE NOTES:
-
-  See nsStr.h for a more general description of string classes.
-
-  This version of the nsString class offers many improvements over the
-  original version:
-    1. Wide and narrow chars
-    2. Allocators
-    3. Much smarter autostrings
-    4. Subsumable strings
- ***********************************************************************/
-
-#include "prtypes.h"
-#include "nscore.h"
-#include <stdio.h>
-#include "nsString.h"
-#include "nsIAtom.h"
-#include "nsStr.h"
-#include "nsCRT.h"
-
-#ifndef nsAFlatString_h___
-#include "nsAFlatString.h"
-#endif
-
-#ifdef STANDALONE_MI_STRING_TESTS
-  class nsAFlatString { public: virtual ~nsAString() { } };
-#endif
-
-class nsISizeOfHandler;
-
-
-#define nsString2     nsString
-#define nsAutoString2 nsAutoString
-
-class NS_COM nsSubsumeStr;
-
-class NS_COM nsString :
-  public nsAFlatString,
-  public nsStr {
-
-protected:
-  virtual const nsBufferHandle<PRUnichar>* GetFlatBufferHandle() const;
-  virtual const PRUnichar* GetReadableFragment( nsReadableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 ) const;
-  virtual PRUnichar* GetWritableFragment( nsWritableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 );
-
-public:
-  virtual const PRUnichar* get() const { return GetUnicode(); }
-
-public:
-  /**
-   * Default constructor. 
-   */
-  nsString();
-
-  /**
-   * This is our copy constructor 
-   * @param   reference to another nsString
-   */
-  nsString(const nsString& aString);   
-
-  explicit nsString(const nsAString&);
-
-  explicit nsString(const PRUnichar*);
-  nsString(const PRUnichar*, PRInt32);
-
-
-  /**
-   * This constructor takes a subsumestr
-   * @param   reference to subsumestr
-   */
-#if defined(AIX) || defined(XP_OS2_VACPP)
-  explicit nsString(const nsSubsumeStr& aSubsumeStr);   // AIX and VAC++ require a const here
-#else
-  explicit nsString(nsSubsumeStr& aSubsumeStr);   
-#endif
-
-  /**
-   * Destructor
-   * 
-   */
-  virtual ~nsString();    
-
-  /**
-   * Retrieve the length of this string
-   * @return string length
-   */
-  virtual PRUint32 Length() const { return mLength; }
-
-  /**
-   * Retrieve the size of this string
-   * @return string length
-   */
-  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-
-  /**
-   * Call this method if you want to force a different string length
-   * @update  gess7/30/98
-   * @param   aLength -- contains new length for mStr
-   * @return
-   */
-  void SetLength(PRUint32 aLength);
-
-  /**
-   * Sets the new length of the string.
-   * @param   aLength is new string length.
-   * @return  nada
-   */
-  void SetCapacity(PRUint32 aLength);
-
-
-  /**
-   *  Determine whether or not the characters in this
-   *  string are in store as 1 or 2 byte (unicode) strings.
-   *  
-   *  @return  TRUE if ordered.
-   */
-  PRBool IsUnicode(void) const {
-    PRBool result=PRBool(mCharSize==eTwoByte);
-    return result;
-  }
-
-  /**********************************************************************
-    Getters/Setters...
-   *********************************************************************/
-
-   /**
-     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
-     */
-  const char* GetBuffer(void) const;
-  const PRUnichar* GetUnicode(void) const;
-
-   /**
-     * Set nth character.
-     */
-  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
-
-
-
-  /**********************************************************************
-    Lexomorphic transforms...
-   *********************************************************************/
-
-
-  /**
-   * Converts chars in this to lowercase
-   * @update  gess 7/27/98
-   */
-  void ToLowerCase();
-
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in aOut
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToLowerCase(nsString& aString) const;
-
-  /**
-   * Converts chars in this to uppercase
-   * @update  gess 7/27/98
-   */
-  void ToUpperCase();
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in a given output string
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToUpperCase(nsString& aString) const;
-
-
-  /**
-   *  This method is used to remove all occurances of the
-   *  characters found in aSet from this string.
-   *  
-   *  @param  aSet -- characters to be cut from this
-   *  @return *this 
-   */
-  void StripChars( const char* aSet );
-  void StripChar( PRUnichar aChar, PRInt32 anOffset=0 );
-  void StripChar( char aChar, PRInt32 anOffset=0 )       { StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
-  void StripChar( PRInt32 anInt, PRInt32 anOffset=0 )    { StripChar((PRUnichar)anInt,anOffset); }
-
-  /**
-   *  This method strips whitespace throughout the string
-   *  
-   *  @return  this
-   */
-  void StripWhitespace();
-
-  /**
-   *  swaps occurence of 1 string for another
-   *  
-   *  @return  this
-   */
-  void ReplaceChar( PRUnichar anOldChar, PRUnichar aNewChar );
-  void ReplaceChar( const char* aSet, PRUnichar aNewChar );
-
-  void ReplaceSubstring( const nsString& aTarget, const nsString& aNewValue );
-  void ReplaceSubstring( const PRUnichar* aTarget, const PRUnichar* aNewValue );
-
-  /**
-   *  This method trims characters found in aTrimSet from
-   *  either end of the underlying string.
-   *  
-   *  @param   aTrimSet -- contains chars to be trimmed from
-   *           both ends
-   *  @param   aEliminateLeading
-   *  @param   aEliminateTrailing
-   *  @param   aIgnoreQuotes
-   *  @return  this
-   */
-  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**********************************************************************
-    string conversion methods...
-   *********************************************************************/
-
-  /**
-   * This method constructs a new nsString is a clone of this string.
-   * 
-   */
-  nsString* ToNewString() const;
-
-  /**
-   * Creates an ISOLatin1 clone of this string
-   * Note that calls to this method should be matched with calls to
-   * |nsMemory::Free|.
-   * @return  ptr to new isolatin1 string
-   */
-  char* ToNewCString() const;
-
-  /**
-   * Creates an UTF8 clone of this string
-   * Note that calls to this method should be matched with calls to
-   * |nsMemory::Free|.
-   * @return  ptr to new null-terminated UTF8 string
-   */
-  char* ToNewUTF8String() const;
-
-  /**
-   * Creates a unicode clone of this string
-   * Note that calls to this method should be matched with calls to
-   * |nsMemory::Free|.
-   * @return  ptr to new unicode string
-   */
-  PRUnichar* ToNewUnicode() const;
-
-  /**
-   * Copies data from internal buffer onto given char* buffer
-   * NOTE: This only copies as many chars as will fit in given buffer (clips)
-   * @param aBuf is the buffer where data is stored
-   * @param aBuflength is the max # of chars to move to buffer
-   * @return ptr to given buffer
-   */
-  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
-
-  /**
-   * Perform string to float conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @return  float rep of string value
-   */
-  float ToFloat(PRInt32* aErrorCode) const;
-
-  /**
-   * Perform string to int conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @param   aRadix tells us which radix to assume; kAutoDetect tells us to determine the radix for you.
-   * @return  int rep of string value, and possible (out) error code
-   */
-  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
-
-
-  /**********************************************************************
-    String manipulation methods...                
-   *********************************************************************/
-
-  /**
-   * assign given string to this string
-   * @param   aStr: buffer to be assigned to this 
-   * @param   aCount is the length of the given str (or -1) if you want me to determine its length
-   *  NOTE:   IFF you pass -1 as aCount, then your buffer must be null terminated.
-
-   * @return  this
-   */
-
-  nsString& operator=( const nsString& aString )                              { Assign(aString); return *this; }
-  nsString& operator=( const nsAString& aReadable )                           { Assign(aReadable); return *this; }
-//nsString& operator=( const nsPromiseReadable<PRUnichar>& aReadable )        { Assign(aReadable); return *this; }
-  nsString& operator=( const PRUnichar* aPtr )                                { Assign(aPtr); return *this; }
-  nsString& operator=( PRUnichar aChar )                                      { Assign(aChar); return *this; }
-
-  void AssignWithConversion(char);
-  void AssignWithConversion(const char*);
-  void AssignWithConversion(const char*, PRInt32);
-
-
-  /*
-   *  Appends n characters from given string to this,
-   *  This version computes the length of your given string
-   *  
-   *  @param   aString is the source to be appended to this
-   *  @return  number of chars copied
-   */
-
-  void AppendInt(PRInt32, PRInt32=10); //radix=8,10 or 16
-  void AppendFloat(double);
-  void AppendWithConversion(const char*, PRInt32=-1);
-  void AppendWithConversion(char);
-
-  virtual void do_AppendFromElement( PRUnichar );
-
-
-//void InsertWithConversion(char);
-  void InsertWithConversion(const char*, PRUint32, PRInt32=-1);
-
-
-  /**********************************************************************
-    Searching methods...                
-   *********************************************************************/
- 
-  /**
-   *  Search for given substring within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aCount tells us how many iterations to make starting at the given offset
-   *  @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 Find(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @param   aCount tells us how many iterations to make starting at the given offset
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  //PRInt32 Find(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
-  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=0,PRInt32 aCount=-1) const;
-
-  /**
-   * This method searches this string for the first character
-   * found in the given charset
-   * @param aString contains set of chars to be found
-   * @param anOffset tells us where to start searching in this
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=0) const;
-  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=0) const;
-  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=0) const;
-
-
-  /**
-   * This methods scans the string backwards, looking for the given string
-   * @param   aString is substring to be sought in this
-   * @param   aIgnoreCase tells us whether or not to do caseless compare
-   * @param   anOffset tells us where in this strig to start searching (counting from left)
-   * @param   aCount tells us how many iterations to make starting at the given offset
-   * @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-  PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching (counting from left)
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @param   aCount tells us how many iterations to make starting at the given offset
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  //PRInt32 RFind(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
-  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1,PRInt32 aCount=-1) const;
-
-  /**
-   * This method searches this string for the last character
-   * found in the given string
-   * @param aString contains set of chars to be found
-   *  @param   anOffset tells us where in this strig to start searching (counting from left)
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
-
-
-  /**********************************************************************
-    Comparison methods...                
-   *********************************************************************/
-
-  /**
-   * Compares a given string type to this string. 
-   * @update  gess 7/27/98
-   * @param   S is the string to be compared
-   * @param   aIgnoreCase tells us how to treat case
-   * @param   aCount tells us how many chars to compare
-   * @return  -1,0,1
-   */
-
-  PRInt32 CompareWithConversion(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRInt32 CompareWithConversion(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRInt32 CompareWithConversion(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-
-  PRBool  EqualsWithConversion(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  EqualsWithConversion(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  EqualsWithConversion(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  EqualsAtom(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const;   
-
-  PRBool  EqualsIgnoreCase(const nsString& aString) const;
-  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
-  PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
-
-
-  /**
-   *  Determine if given buffer is plain ascii
-   *  
-   *  @param   aBuffer -- if null, then we test *this, otherwise we test given buffer
-   *  @return  TRUE if is all ascii chars or if strlen==0
-   */
-  PRBool IsASCII(const PRUnichar* aBuffer=0);
-
-  void    DebugDump(void) const;
-
-  /**
-   *  Determine if given char is a valid space character
-   *  
-   *  @param   aChar is character to be tested
-   *  @return  TRUE if is valid space char
-   */
-  static  PRBool IsSpace(PRUnichar ch);
-
-  /**
-   *  Determine if given char in valid alpha range
-   *  
-   *  @param   aChar is character to be tested
-   *  @return  TRUE if in alpha range
-   */
-  static  PRBool IsAlpha(PRUnichar ch);
-
-  /**
-   *  Determine if given char is valid digit
-   *  
-   *  @param   aChar is character to be tested
-   *  @return  TRUE if char is a valid digit
-   */
-  static  PRBool IsDigit(PRUnichar ch);
-
-private:
-    // NOT TO BE IMPLEMENTED
-    //  these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion
-  void operator=( char );
-  void AssignWithConversion( PRUnichar );
-  void AssignWithConversion( const PRUnichar*, PRInt32=-1 );
-  void AppendWithConversion( PRUnichar );
-  void AppendWithConversion( const PRUnichar*, PRInt32=-1 );
-  void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 );
-};
-
-// NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
-// NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsString, PRUnichar)
-
-extern NS_COM int fputs(const nsString& aString, FILE* out);
-//ostream& operator<<(ostream& aStream,const nsString& aString);
-//virtual void  DebugDump(ostream& aStream) const;
-
-/**************************************************************
-  Here comes the AutoString class which uses internal memory
-  (typically found on the stack) for its default buffer.
-  If the buffer needs to grow, it gets reallocated on the heap.
- **************************************************************/
-
-class NS_COM nsAutoString : public nsString {
-public: 
-
-    virtual ~nsAutoString();
-    nsAutoString();
-    nsAutoString(const nsAutoString& aString);
-    explicit nsAutoString(const nsAString& aString);
-    explicit nsAutoString(const nsString& aString);
-    explicit nsAutoString(const PRUnichar* aString);
-    nsAutoString(const PRUnichar* aString,PRInt32 aLength);
-    explicit nsAutoString(PRUnichar aChar);
-    explicit nsAutoString(const CBufDescriptor& aBuffer);    
-
-#if defined(AIX) || defined(XP_OS2_VACPP)
-    explicit nsAutoString(const nsSubsumeStr& aSubsumeStr);  // AIX and VAC++ requires a const
-#else
-    explicit nsAutoString(nsSubsumeStr& aSubsumeStr);
-#endif // AIX || XP_OS2_VACPP
-
-
-    nsAutoString& operator=( const nsAutoString& aString )                          { Assign(aString); return *this; }
-  private:
-    void operator=( char ); // NOT TO BE IMPLEMENTED
-  public:
-    nsAutoString& operator=( const nsAString& aReadable )                           { Assign(aReadable); return *this; }
-//  nsAutoString& operator=( const nsPromiseReadable<PRUnichar>& aReadable )        { Assign(aReadable); return *this; }
-    nsAutoString& operator=( const PRUnichar* aPtr )                                { Assign(aPtr); return *this; }
-    nsAutoString& operator=( PRUnichar aChar )                                      { Assign(aChar); return *this; }
-
-    /**
-     * Retrieve the size of this string
-     * @return string length
-     */
-    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-    
-    char mBuffer[kDefaultStringSize<<eTwoByte];
-};
-
-// NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsAutoString, PRUnichar)
-
-class NS_COM NS_ConvertASCIItoUCS2
-      : public nsAutoString
-    /*
-      ...
-    */
-  {
-    public:
-      explicit NS_ConvertASCIItoUCS2( const char* );
-      NS_ConvertASCIItoUCS2( const char*, PRUint32 );
-      explicit NS_ConvertASCIItoUCS2( char );
-
-#if 0
-      operator const nsLocalString() const
-        {
-          return nsLocalString(mUStr, mLength);
-        }
-#endif
-
-    private:
-        // NOT TO BE IMPLEMENTED
-      NS_ConvertASCIItoUCS2( PRUnichar );
-  };
-
-class NS_COM NS_ConvertUTF8toUCS2
-      : public nsAutoString
-  {
-    public:
-      explicit
-      NS_ConvertUTF8toUCS2( const char* aCString )
-        {
-          Init( aCString, ~PRUint32(0) /* MAXINT */ );
-        }
-
-      NS_ConvertUTF8toUCS2( const char* aCString, PRUint32 aLength )
-        {
-          Init( aCString, aLength );
-        }
-
-      explicit
-      NS_ConvertUTF8toUCS2( char aChar )
-        {
-          Init( &aChar, 1 );
-        }
-
-    protected:
-      void Init( const char* aCString, PRUint32 aLength );
-
-    private:
-      NS_ConvertUTF8toUCS2( PRUnichar );
-  };
-
-/***************************************************************
-  The subsumestr class is very unusual. 
-  It differs from a normal string in that it doesn't use normal
-  copy semantics when another string is assign to this. 
-  Instead, it "steals" the contents of the source string.
-
-  This is very handy for returning nsString classes as part of
-  an operator+(...) for example, in that it cuts down the number
-  of copy operations that must occur. 
-
-  You should probably not use this class unless you really know
-  what you're doing.
- ***************************************************************/
-class NS_COM nsSubsumeStr : public nsString {
-public:
-  nsSubsumeStr();
-  explicit nsSubsumeStr(nsStr& aString);
-  nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-  nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-  int Subsume(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-
-  nsSubsumeStr& operator=( const nsSubsumeStr& aReadable )                        { Assign(aReadable); return *this; }
-  nsSubsumeStr& operator=( const nsAString& aReadable )                           { Assign(aReadable); return *this; }
-//nsSubsumeStr& operator=( const nsPromiseReadable<PRUnichar>& aReadable )        { Assign(aReadable); return *this; }
-  nsSubsumeStr& operator=( const PRUnichar* aPtr )                                { Assign(aPtr); return *this; }
-  nsSubsumeStr& operator=( PRUnichar aChar )                                      { Assign(aChar); return *this; }
-private:
-  void operator=( char ); // NOT TO BE IMPLEMENTED
-};
-
-
-#endif
-
-

mozilla/string/obsolete/nsXPIDLString.cpp

@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsDebug.h"
-#include "nsMemory.h"
-#include "nsXPIDLString.h"
-#include "plstr.h"
-
-// If the allocator changes, fix it here.
-#define XPIDL_STRING_ALLOC(__len)  ((PRUnichar*) nsMemory::Alloc((__len) * sizeof(PRUnichar)))
-#define XPIDL_CSTRING_ALLOC(__len) ((char*) nsMemory::Alloc((__len) * sizeof(char)))
-#define XPIDL_FREE(__ptr)          (nsMemory::Free(__ptr))
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLString
-
-nsXPIDLString::~nsXPIDLString()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-}
-
-
-PRUnichar*
-nsXPIDLString::Copy(const PRUnichar* aString)
-{
-    NS_ASSERTION(aString, "null ptr");
-    if (! aString)
-        return 0;
-
-    PRInt32 len = 0;
-
-    {
-        const PRUnichar* p = aString;
-        while (*p++)
-            len++;
-    }
-
-    PRUnichar* result = XPIDL_STRING_ALLOC(len + 1);
-    if (result) {
-        PRUnichar* q = result;
-        while (*aString) {
-            *q = *aString;
-            q++;
-            aString++;
-        }
-        *q = '\0';
-    }
-    return result;
-}
-
-
-PRUnichar**
-nsXPIDLString::StartAssignmentByValue()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_TRUE;
-    return &mBuf;
-}
-
-
-const PRUnichar**
-nsXPIDLString::StartAssignmentByReference()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_FALSE;
-    return (const PRUnichar**) &mBuf;
-}
-
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLCString
-
-nsXPIDLCString::~nsXPIDLCString()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-}
-
-
-nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-	
-    if (aCString) {
-        mBuf = Copy(aCString);
-        mBufOwner = PR_TRUE;
-    }
-    else {
-        mBuf = 0;
-        mBufOwner = PR_FALSE;
-    }
-    
-    return *this;
-}
-
-
-char*
-nsXPIDLCString::Copy(const char* aCString)
-{
-    NS_ASSERTION(aCString, "null ptr");
-    if (! aCString)
-        return 0;
-
-    PRInt32 len = PL_strlen(aCString);
-    char* result = XPIDL_CSTRING_ALLOC(len + 1);
-    if (result)
-        PL_strcpy(result, aCString);
-
-    return result;
-}
-
-
-char**
-nsXPIDLCString::StartAssignmentByValue()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_TRUE;
-    return &mBuf;
-}
-
-
-const char**
-nsXPIDLCString::StartAssignmentByReference()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_FALSE;
-    return (const char**) &mBuf;
-}
-
-

mozilla/string/obsolete/nsXPIDLString.h

@@ -1,389 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* nsXPIDLString.h --- an `|auto_ptr|' for character buffers, this functionality will be replaced
-    by the new shared-buffer string (see bug #53065)
- */
-
-
-
-
-#ifndef nsXPIDLString_h__
-#define nsXPIDLString_h__
-
-/*
-
-  A set of string wrapper classes that ease transition to use of XPIDL
-  interfaces. nsXPIDLString and nsXPIDLCString are to XPIDL `wstring'
-  and `string' out params as nsCOMPtr is to generic XPCOM interface
-  pointers. They help you deal with object ownership.
-
-  Consider the following interface:
-
-    interface nsIFoo {
-      attribute string Bar;
-    };
-
-  This will generate the following C++ header file:
-
-    class nsIFoo {
-      NS_IMETHOD SetBar(const PRUnichar* aValue);
-      NS_IMETHOD GetBar(PRUnichar* *aValue);
-    };
-
-  The GetBar() method will allocate a copy of the nsIFoo object's
-  "bar" attribute, and leave you to deal with freeing it:
-
-    nsIFoo* aFoo; // assume we get this somehow
-    PRUnichar* bar;
-    aFoo->GetFoo(&bar);
-    // Use bar here...
-    printf("bar is %s!\n", bar);
-    nsMemory::Free(bar);
-
-  This makes your life harder, because you need to convolute your code
-  to ensure that you don't leak `bar'.
-
-  Enter nsXPIDLString, which manages the ownership of the allocated
-  string, and automatically destroys it when the nsXPIDLString goes
-  out of scope:
-
-    nsIFoo* aFoo;
-    nsXPIDLString bar;
-    aFoo->GetFoo( getter_Copies(bar) );
-    // Use bar here...
-    printf("bar is %s!\n", (const char*) bar);
-    // no need to remember to nsMemory::Free().
-
-  Like nsCOMPtr, nsXPIDLString uses some syntactic sugar to make it
-  painfully clear exactly what the code expects. You need to wrap an
-  nsXPIDLString object with either `getter_Copies()' or
-  `getter_Shares()' before passing it to a getter: these tell the
-  nsXPIDLString how ownership is being handled.
-
-  In the case of `getter_Copies()', the callee is allocating a copy
-  (which is usually the case). In the case of `getter_Shares()', the
-  callee is returning a const reference to `the real deal' (this can
-  be done using the [shared] attribute in XPIDL).
-
- */
-
-#include "nscore.h"
-#include "nsCom.h"
-#include "prtypes.h"
-
-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-typedef PRUint16 PRUnichar;
-#endif /* __PRUNICHAR__ */
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLString
-//
-//   A wrapper for Unicode strings. With the |getter_Copies()| and
-//   |getter_Shares()| helper functions, this can be used instead of
-//   the "naked" |PRUnichar*| interface for |wstring| parameters in
-//   XPIDL interfaces.
-//
-
-class NS_COM nsXPIDLString {
-private:
-    PRUnichar* mBuf;
-    PRBool     mBufOwner;
-
-    PRUnichar** StartAssignmentByValue();
-    const PRUnichar** StartAssignmentByReference();
-
-public:
-    /**
-     * Construct a new, uninitialized wrapper for a Unicode string.
-     */
-    nsXPIDLString() : mBuf(0), mBufOwner(PR_FALSE) {}
-
-    virtual ~nsXPIDLString();
-
-    /**
-     * Return a reference to the immutable Unicode string.
-     */
-    operator const PRUnichar*() const { return get(); }
-
-    /**
-     * Return a reference to the immutable Unicode string.
-     */
-    const PRUnichar* get() const { return mBuf; }
-
-    /**
-     * Make a copy of the Unicode string. Use this function in the
-     * callee to ensure that the correct memory allocator is used.
-     */
-    static PRUnichar* Copy(const PRUnichar* aString);
-
-    // A helper class for assignment-by-value. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterCopies {
-    private:
-        nsXPIDLString& mXPIDLString;
-
-    public:
-        GetterCopies(nsXPIDLString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator PRUnichar**() {
-            return mXPIDLString.StartAssignmentByValue();
-        }
-
-        friend GetterCopies getter_Copies(nsXPIDLString& aXPIDLString);
-    };
-
-    friend class GetterCopies;
-
-    // A helper class for assignment-by-reference. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterShares {
-    private:
-        nsXPIDLString& mXPIDLString;
-
-    public:
-        GetterShares(nsXPIDLString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator const PRUnichar**() {
-            return mXPIDLString.StartAssignmentByReference();
-        }
-
-        friend GetterShares getter_Shares(nsXPIDLString& aXPIDLString);
-    };
-
-    friend class GetterShares;
-
-private:
-    // not to be implemented
-    nsXPIDLString(nsXPIDLString& /* aXPIDLString */) {}
-    void operator=(nsXPIDLString& /* aXPIDLString */) {}
-};
-
-
-/**
- * Use this function to "wrap" the nsXPIDLString object that is to
- * receive an |out| value.
- */
-inline nsXPIDLString::GetterCopies
-getter_Copies(nsXPIDLString& aXPIDLString)
-{
-    return nsXPIDLString::GetterCopies(aXPIDLString);
-}
-
-/**
- * Use this function to "wrap" the nsXPIDLString object that is to
- * receive a |[shared] out| value.
- */
-inline nsXPIDLString::GetterShares
-getter_Shares(nsXPIDLString& aXPIDLString)
-{
-    return nsXPIDLString::GetterShares(aXPIDLString);
-}
-
-
-// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
-inline
-PRBool
-operator==(const PRUnichar* lhs, const nsXPIDLString& rhs)
-{
-    return lhs == NS_STATIC_CAST(const PRUnichar*, rhs);
-}
-
-inline
-PRBool
-operator==(const nsXPIDLString& lhs, const PRUnichar* rhs)
-{
-    return NS_STATIC_CAST(const PRUnichar*, lhs) == rhs;
-}
-
-
-#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
-
-inline
-PRBool
-operator==(int lhs, const nsXPIDLString& rhs)
-{
-    return NS_REINTERPRET_CAST(PRUnichar*, lhs) == NS_STATIC_CAST(const PRUnichar*, rhs);
-}
-
-inline
-PRBool
-operator==(const nsXPIDLString& lhs, int rhs)
-{
-    return NS_STATIC_CAST(const PRUnichar*, lhs) == NS_REINTERPRET_CAST(PRUnichar*, rhs);
-}
-
-#endif
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLCString
-//
-//   A wrapper for Unicode strings. With the |getter_Copies()| and
-//   |getter_Shares()| helper functions, this can be used instead of
-//   the "naked" |char*| interface for |string| parameters in XPIDL
-//   interfaces.
-//
-
-class NS_COM nsXPIDLCString {
-private:
-    char*  mBuf;
-    PRBool mBufOwner;
-
-    char** StartAssignmentByValue();
-    const char** StartAssignmentByReference();
-
-public:
-    /**
-     * Construct a new, uninitialized wrapper for a single-byte string.
-     */
-    nsXPIDLCString() : mBuf(0), mBufOwner(PR_FALSE) {}
-
-    virtual ~nsXPIDLCString();
-
-    /**
-     * Assign a single-byte string to this wrapper. Copies
-     * and owns the result.
-     */
-    nsXPIDLCString& operator=(const char* aString);
-
-    /**
-     * Return a reference to the immutable single-byte string.
-     */
-    operator const char*() const { return get(); }
-
-    /**
-     * Return a reference to the immutable single-byte string.
-     */
-    const char* get() const { return mBuf; }
-
-    /**
-     * Make a copy of the single-byte string. Use this function in the
-     * callee to ensure that the correct memory allocator is used.
-     */
-    static char* Copy(const char* aString);
-
-    // A helper class for assignment-by-value. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterCopies {
-    private:
-        nsXPIDLCString& mXPIDLString;
-
-    public:
-        GetterCopies(nsXPIDLCString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator char**() {
-            return mXPIDLString.StartAssignmentByValue();
-        }
-
-        friend GetterCopies getter_Copies(nsXPIDLCString& aXPIDLString);
-    };
-
-    friend class GetterCopies;
-
-    // A helper class for assignment-by-reference. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterShares {
-    private:
-        nsXPIDLCString& mXPIDLString;
-
-    public:
-        GetterShares(nsXPIDLCString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator const char**() {
-            return mXPIDLString.StartAssignmentByReference();
-        }
-
-        friend GetterShares getter_Shares(nsXPIDLCString& aXPIDLString);
-    };
-
-    friend class GetterShares;
-
-private:
-    // not to be implemented
-    nsXPIDLCString(nsXPIDLCString& /* aXPIDLString */) {}
-    void operator=(nsXPIDLCString& /* aXPIDLCString */) {}
-};
-
-/**
- * Use this function to "wrap" the nsXPIDLCString object that is to
- * receive an |out| value.
- */
-inline nsXPIDLCString::GetterCopies
-getter_Copies(nsXPIDLCString& aXPIDLString)
-{
-    return nsXPIDLCString::GetterCopies(aXPIDLString);
-}
-
-
-/**
- * Use this function to "wrap" the nsXPIDLCString object that is to
- * receive a |[shared] out| value.
- */
-inline nsXPIDLCString::GetterShares
-getter_Shares(nsXPIDLCString& aXPIDLString)
-{
-    return nsXPIDLCString::GetterShares(aXPIDLString);
-}
-
-// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
-inline
-PRBool
-operator==(const char* lhs, const nsXPIDLCString& rhs)
-{
-    return lhs == NS_STATIC_CAST(const char*, rhs);
-}
-
-inline
-PRBool
-operator==(const nsXPIDLCString& lhs, const char* rhs)
-{
-    return NS_STATIC_CAST(const char*, lhs) == rhs;
-}
-
-#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
-
-inline
-PRBool
-operator==(int lhs, const nsXPIDLCString& rhs)
-{
-    return NS_REINTERPRET_CAST(char*, lhs) == NS_STATIC_CAST(const char*, rhs);
-}
-
-inline
-PRBool
-operator==(const nsXPIDLCString& lhs, int rhs)
-{
-    return NS_STATIC_CAST(const char*, lhs) == NS_REINTERPRET_CAST(char*, rhs);
-}
-
-#endif
-
-#endif // nsXPIDLString_h__

mozilla/string/public/MANIFEST

@@ -1,49 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Scott Collins <scc@mozilla.org> (original author)
-#
- 
-
-nsAFlatString.h
-nsAlgorithm.h
-nsAPromiseString.h
-nsAReadableString.h
-nsAString.h
-nsAWritableString.h
-nsBufferHandle.h
-nsBufferHandleUtils.h
-nsCharTraits.h
-nsCommonString.h
-nsFragmentedString.h
-nsLiteralString.h
-nsLocalString.h
-nsPrintfCString.h
-nsPrivateSharableString.h
-nsPromiseConcatenation.h
-nsPromiseFlatString.h
-nsPromiseSubstring.h
-nsReadableUtils.h
-nsSharedBufferList.h
-nsSlidingString.h
-nsStringFragment.h
-nsStringFwd.h
-nsStringIterator.h
-nsStringIteratorUtils.h
-nsStringTraits.h

mozilla/string/public/Makefile.in

@@ -1,64 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Johnny Stenback <jst@netscape.com> (original author)
-#   Scott Collins <scc@mozilla.org>
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= string
-
-EXPORTS		=				\
-		nsAFlatString.h			\
-		nsAlgorithm.h			\
-		nsAPromiseString.h			\
-		nsAReadableString.h			\
-		nsAString.h			\
-		nsAWritableString.h			\
-		nsBufferHandle.h			\
-		nsBufferHandleUtils.h			\
-		nsCharTraits.h			\
-		nsCommonString.h			\
-		nsFragmentedString.h			\
-		nsLiteralString.h			\
-		nsLocalString.h			\
-		nsPrintfCString.h			\
-		nsPrivateSharableString.h			\
-		nsPromiseConcatenation.h			\
-		nsPromiseFlatString.h			\
-		nsPromiseSubstring.h			\
-		nsReadableUtils.h			\
-		nsSharedBufferList.h			\
-		nsSlidingString.h			\
-		nsStringFragment.h			\
-		nsStringFwd.h			\
-		nsStringIterator.h			\
-		nsStringIteratorUtils.h			\
-		nsStringTraits.h			\
-		$(NULL)			
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk

mozilla/string/public/makefile.win

@@ -1,56 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-#   Johnny Stenback <jst@netscape.com> (original author)
-#   Scott Collins <scc@mozilla.org>
-#
-
-DEPTH=..\..
-
-EXPORTS =                               \
-        nsAFlatString.h                 \
-        nsAlgorithm.h                   \
-        nsAPromiseString.h              \
-        nsAReadableString.h             \
-        nsAString.h                     \
-        nsAWritableString.h             \
-        nsBufferHandle.h                \
-        nsBufferHandleUtils.h           \
-        nsCharTraits.h                  \
-        nsCommonString.h                \
-        nsFragmentedString.h            \
-        nsLiteralString.h               \
-        nsLocalString.h                 \
-        nsPrintfCString.h               \
-        nsPrivateSharableString.h       \
-        nsPromiseConcatenation.h        \
-        nsPromiseFlatString.h           \
-        nsPromiseSubstring.h            \
-        nsReadableUtils.h               \
-        nsSharedBufferList.h            \
-        nsSlidingString.h               \
-        nsStringFragment.h              \
-        nsStringFwd.h                   \
-        nsStringIterator.h              \
-        nsStringIteratorUtils.h         \
-        nsStringTraits.h                \
-        $(NULL)                 
-
-include <$(DEPTH)\config\rules.mak>

mozilla/string/public/nsAFlatString.h

@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications.  Portions created by Netscape Communications are
- * Copyright (C) 2001 by Netscape Communications.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Collins <scc@mozilla.org> (original author)
- */
-
-/* nsAFlatString.h --- */
-
-#ifndef nsAFlatString_h___
-#define nsAFlatString_h___
-
-#ifndef nsAString_h___
-#include "nsAString.h"
-#endif
-
-class NS_COM nsAFlatString
-    : public nsAString
-  {
-    public:
-        // don't really want this to be virtual, and won't after |obsolete_nsString| is really dead
-      virtual const PRUnichar* get() const      { return GetBufferHandle()->DataStart(); }
-      PRUnichar  operator[]( PRUint32 i ) const { return get()[ i ]; }
-      PRUnichar  CharAt( PRUint32 ) const;
-
-      virtual PRUint32 Length() const           { return PRUint32(GetBufferHandle()->DataLength()); }
-
-    protected:
-      virtual const PRUnichar* GetReadableFragment( nsReadableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 ) const;
-      virtual       PRUnichar* GetWritableFragment( nsWritableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 );
-  };
-
-class NS_COM nsAFlatCString
-    : public nsACString
-  {
-    public:
-        // don't really want this to be virtual, and won't after |obsolete_nsCString| is really dead
-      virtual const char* get() const           { return GetBufferHandle()->DataStart(); }
-      char  operator[]( PRUint32 i ) const      { return get()[ i ]; }
-      char  CharAt( PRUint32 ) const;
-
-      virtual PRUint32 Length() const           { return PRUint32(GetBufferHandle()->DataLength()); }
-
-    protected:
-      virtual const char* GetReadableFragment( nsReadableFragment<char>&, nsFragmentRequest, PRUint32 ) const;
-      virtual       char* GetWritableFragment( nsWritableFragment<char>&, nsFragmentRequest, PRUint32 );
-  };
-
-inline
-PRUnichar
-nsAFlatString::CharAt( PRUint32 i ) const
-  {
-    NS_ASSERTION(i<Length(), "|CharAt| out-of-range");
-    return operator[](i);
-  }
-
-inline
-char
-nsAFlatCString::CharAt( PRUint32 i ) const
-  {
-    NS_ASSERTION(i<Length(), "|CharAt| out-of-range");
-    return operator[](i);
-  }
-
-
-
-#endif /* !defined(nsAFlatString_h___) */

mozilla/string/public/nsAPromiseString.h

@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications.  Portions created by Netscape Communications are
- * Copyright (C) 2001 by Netscape Communications.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Collins <scc@mozilla.org> (original author)
- */
-
-/* nsAPromiseString.h --- abstract base class for strings don't actually own their own characters, but proxy data from other strings  */
-
-#ifndef nsAPromiseString_h___
-#define nsAPromiseString_h___
-
-  /**
-   * Don't |#include| this file yourself.  You will get it automatically if you need it.
-   *
-   * Why is it a separate file?  To make it easier to find the classes in your local tree.
-   */
-
-class NS_COM nsAPromiseString : public nsAString { };
-class NS_COM nsAPromiseCString : public nsACString { };
-
-#endif /* !defined(nsAPromiseString_h___) */