Moving stringmap code to head

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

mozilla/gfx/src/gtk/nsFontMetricsGTK.h

@@ -0,0 +1,219 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ex: set tabstop=8 softtabstop=2 shiftwidth=2 expandtab:
+ *
+ * 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): 
+ */
+
+#ifndef nsFontMetricsGTK_h__
+#define nsFontMetricsGTK_h__
+
+#include "nsDeviceContextGTK.h"
+#include "nsIFontMetrics.h"
+#include "nsIFontEnumerator.h"
+#include "nsFont.h"
+#include "nsString.h"
+#include "nsUnitConversion.h"
+#include "nsIDeviceContext.h"
+#include "nsCRT.h"
+#include "nsCOMPtr.h"
+#include "nsRenderingContextGTK.h"
+#include "nsICharRepresentable.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#undef FONT_HAS_GLYPH
+#define FONT_HAS_GLYPH(map, char) IS_REPRESENTABLE(map, char)
+
+typedef struct nsFontCharSetInfo nsFontCharSetInfo;
+
+typedef gint (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
+  XFontStruct* aFont, const PRUnichar* aSrcBuf, PRInt32 aSrcLen,
+  char* aDestBuf, PRInt32 aDestLen);
+
+struct nsFontCharSet;
+struct nsFontFamily;
+struct nsFontNode;
+struct nsFontStretch;
+
+class nsFontGTKUserDefined;
+class nsFontMetricsGTK;
+
+class nsFontGTK
+{
+public:
+  nsFontGTK();
+  virtual ~nsFontGTK();
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  void LoadFont(void);
+  PRBool IsEmptyFont(GdkFont*);
+
+  inline int SupportsChar(PRUnichar aChar)
+    { return mFont && FONT_HAS_GLYPH(mMap, aChar); };
+
+  virtual GdkFont* GetGDKFont(void);
+  virtual PRBool   GetGDKFontIs10646(void);
+  virtual gint GetWidth(const PRUnichar* aString, PRUint32 aLength) = 0;
+  virtual gint DrawString(nsRenderingContextGTK* aContext,
+                          nsDrawingSurfaceGTK* aSurface, nscoord aX,
+                          nscoord aY, const PRUnichar* aString,
+                          PRUint32 aLength) = 0;
+#ifdef MOZ_MATHML
+  // bounding metrics for a string 
+  // remember returned values are not in app units 
+  // - to emulate GetWidth () above
+  virtual nsresult
+  GetBoundingMetrics(const PRUnichar*   aString,
+                     PRUint32           aLength,
+                     nsBoundingMetrics& aBoundingMetrics) = 0;
+#endif
+
+  PRUint32*              mMap;
+  nsFontCharSetInfo*     mCharSetInfo;
+  char*                  mName;
+  nsFontGTKUserDefined*  mUserDefinedFont;
+  PRUint16               mSize;
+  PRInt16                mBaselineAdjust;
+
+protected:
+  GdkFont*               mFont;
+  PRBool                 mAlreadyCalledLoadFont;
+};
+
+class nsFontMetricsGTK : public nsIFontMetrics
+{
+public:
+  nsFontMetricsGTK();
+  virtual ~nsFontMetricsGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(const nsFont& aFont, nsIAtom* aLangGroup,
+                   nsIDeviceContext* aContext);
+  NS_IMETHOD  Destroy();
+
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize);
+  NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize);
+
+  NS_IMETHOD  GetHeight(nscoord &aHeight);
+  NS_IMETHOD  GetNormalLineHeight(nscoord &aHeight);
+  NS_IMETHOD  GetLeading(nscoord &aLeading);
+  NS_IMETHOD  GetEmHeight(nscoord &aHeight);
+  NS_IMETHOD  GetEmAscent(nscoord &aAscent);
+  NS_IMETHOD  GetEmDescent(nscoord &aDescent);
+  NS_IMETHOD  GetMaxHeight(nscoord &aHeight);
+  NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
+  NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
+  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
+  NS_IMETHOD  GetFont(const nsFont *&aFont);
+  NS_IMETHOD  GetLangGroup(nsIAtom** aLangGroup);
+  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
+  
+  virtual nsresult GetSpaceWidth(nscoord &aSpaceWidth);
+
+  nsFontGTK*  FindFont(PRUnichar aChar);
+  nsFontGTK*  FindUserDefinedFont(PRUnichar aChar);
+  nsFontGTK*  FindStyleSheetSpecificFont(PRUnichar aChar);
+  nsFontGTK*  FindStyleSheetGenericFont(PRUnichar aChar);
+  nsFontGTK*  FindLangGroupPrefFont(nsIAtom* aLangGroup, PRUnichar aChar);
+  nsFontGTK*  FindLangGroupFont(nsIAtom* aLangGroup, PRUnichar aChar, nsCString* aName);
+  nsFontGTK*  FindAnyFont(PRUnichar aChar);
+  nsFontGTK*  FindSubstituteFont(PRUnichar aChar);
+
+  nsFontGTK*  SearchNode(nsFontNode* aNode, PRUnichar aChar);
+  nsFontGTK*  TryAliases(nsCString* aName, PRUnichar aChar);
+  nsFontGTK*  TryFamily(nsCString* aName, PRUnichar aChar);
+  nsFontGTK*  TryNode(nsCString* aName, PRUnichar aChar);
+  nsFontGTK*  TryNodes(nsAWritableCString &aFFREName, PRUnichar aChar);
+  nsFontGTK*  TryLangGroup(nsIAtom* aLangGroup, nsCString* aName, PRUnichar aChar);
+
+  nsFontGTK*  AddToLoadedFontsList(nsFontGTK* aFont);
+  nsFontGTK*  PickASizeAndLoad(nsFontStretch* aStretch,
+                               nsFontCharSetInfo* aCharSet, 
+                               PRUnichar aChar,
+                               const char *aName);
+
+  static nsresult FamilyExists(const nsString& aFontName);
+
+  //friend struct nsFontGTK;
+
+  nsFontGTK   **mLoadedFonts;
+  PRUint16    mLoadedFontsAlloc;
+  PRUint16    mLoadedFontsCount;
+
+  nsFontGTK   *mSubstituteFont;
+
+  nsCStringArray mFonts;
+  PRUint16       mFontsIndex;
+  nsVoidArray    mFontIsGeneric;
+
+  nsCAutoString     mDefaultFont;
+  nsCString         *mGeneric;
+  nsCOMPtr<nsIAtom> mLangGroup;
+  nsCAutoString     mUserDefined;
+
+  PRUint8 mTriedAllGenerics;
+  PRUint8 mIsUserDefined;
+
+protected:
+  void RealizeFont();
+
+  nsIDeviceContext    *mDeviceContext;
+  nsFont              *mFont;
+  nsFontGTK           *mWesternFont;
+
+  nscoord             mLeading;
+  nscoord             mEmHeight;
+  nscoord             mEmAscent;
+  nscoord             mEmDescent;
+  nscoord             mMaxHeight;
+  nscoord             mMaxAscent;
+  nscoord             mMaxDescent;
+  nscoord             mMaxAdvance;
+  nscoord             mXHeight;
+  nscoord             mSuperscriptOffset;
+  nscoord             mSubscriptOffset;
+  nscoord             mStrikeoutSize;
+  nscoord             mStrikeoutOffset;
+  nscoord             mUnderlineSize;
+  nscoord             mUnderlineOffset;
+  nscoord             mSpaceWidth;
+
+  PRUint16            mPixelSize;
+  PRUint8             mStretchIndex;
+  PRUint8             mStyleIndex;
+  nsFontCharSetConverter mDocConverterType;
+};
+
+class nsFontEnumeratorGTK : public nsIFontEnumerator
+{
+public:
+  nsFontEnumeratorGTK();
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIFONTENUMERATOR
+};
+
+#endif

mozilla/security/tinderlight/config.sh

@@ -1,29 +0,0 @@
-#! /bin/bash
-
-#### LOCAL MACHINE SETTINGS ####
-PORT_64_DBG=8543
-PORT_64_OPT=8544
-PORT_32_DBG=8545
-PORT_32_OPT=8546
-if [ "${NSS_TESTS}" = "memtest" ]; then
-    PORT_64_DBG=8547
-    PORT_64_OPT=8548
-    PORT_32_DBG=8549
-    PORT_32_OPT=8550
-fi
-JAVA_HOME_64=/usr/lib/jvm/java-1.6.0-openjdk.x86_64
-JAVA_HOME_32=/usr/lib/jvm/java-1.6.0-openjdk
-
-# example configuration
-case ${HOST} in
-host1) 
-    JAVA_HOME_64=/opt/jdk/1.6.0_01/SunOS64
-    JAVA_HOME_32=/opt/jdk/1.6.0_01/SunOS
-    ;;
-host2)
-    run_bits="32"
-    export NSS_TESTS=memleak
-    NO_JSS=1
-    ;;
-esac
-

mozilla/security/tinderlight/env.sh

@@ -1,72 +0,0 @@
-#! /bin/bash
-
-HOST=$(hostname | cut -d. -f1)
-ARCH=$(uname -s)
-
-ulimit -c unlimited 2> /dev/null
-
-CVSROOT=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot"
-
-CVS_TRUNK="mozilla/nsprpub
-mozilla/dbm
-mozilla/security/dbm
-mozilla/security/coreconf
-mozilla/security/nss
-mozilla/security/jss
--r:NSS_3_11_1_RTM:mozilla/security/nss/lib/freebl/ecl/ecl-curve.h"
-
-CVS_STABLE="-r:NSPR_4_6_BRANCH:mozilla/nsprpub
--r:NSS_3_11_BRANCH:mozilla/dbm
--r:NSS_3_11_BRANCH:mozilla/security/dbm
--r:NSS_3_11_BRANCH:mozilla/security/coreconf
--r:NSS_3_11_BRANCH:mozilla/security/nss
--r:JSS_4_2_BRANCH:mozilla/security/jss
--r:NSS_3_11_1_RTM:mozilla/security/nss/lib/freebl/ecl/ecl-curve.h"
-
-export NSS_ENABLE_ECC=1
-export NSS_ECC_MORE_THAN_SUITE_B=1
-export NSPR_LOG_MODULES="pkix:1"
-
-NSS_BUILD_TARGET="clean nss_build_all"
-JSS_BUILD_TARGET="clean all"
-
-CVS=cvs
-MAKE=gmake
-AWK=awk
-PATCH=patch
-
-if [ "${ARCH}" = "SunOS" ]; then
-    AWK=nawk
-    PATCH=gpatch
-    ARCH=SunOS/$(uname -p)
-fi
-
-if [ "${ARCH}" = "Linux" -a -f /etc/system-release ]; then
-   VERSION=`sed -e 's; release ;;' -e 's; (.*)$;;' -e 's;Red Hat Enterprise Linux Server;RHEL;' /etc/system-release`
-   ARCH=Linux/${VERSION}
-   echo ${ARCH}
-fi
-
-MAIL=mail
-TB_SERVER=tinderbox-daemon@tinderbox.mozilla.org
-
-CYCLE_MAX=5
-CYCLE_TIME=60
-
-PORT_32_DBG=8111
-PORT_32_OPT=8222
-PORT_64_DBG=8333
-PORT_64_OPT=8444
-
-#### SOME DEFAULTS, CAN CHANGE LATER ####
-
-run_bits="32 64"
-run_opt="DBG OPT"
-BRANCH="trunk"
-
-### CONFIG.SH CONTAINS CONFIGURATIONS OF ALL MACHINES ###
-
-. config.sh
-
-RUN_BITS="${RUN_BITS:-$run_bits}"
-RUN_OPT="${RUN_OPT:-$run_opt}"

mozilla/security/tinderlight/tinder.sh

@@ -1,514 +0,0 @@
-#! /bin/bash
-
-proc_args()
-{
-    while [ -n "$1" ]; do
-        OPT=$(echo $1 | cut -d= -f1)
-        VAL=$(echo $1 | cut -d= -f2)
-
-        case $OPT in
-            "--bits")
-                RUN_BITS="${VAL}"
-                ;;
-            "--opt")
-                RUN_OPT="${VAL}"
-                ;;
-            "--once")
-                RUN_ONCE=1
-                ;;
-            "--cycles")
-                RUN_CYCLES=1
-                ;;
-            "--nomail")
-                NO_MAIL=1
-                ;;
-            "--nocvs")
-                NO_CVS=1
-                ;;
-            "--nobuild")
-                NO_BUILD=1
-                ;;
-            "--notest")
-                NO_TEST=1
-                ;;
-            "--nomove")
-                NO_MOVE=1
-                ;;
-            "--nojss")
-                NO_JSS=1
-                ;;
-	    "--pidfile")
-		echo " $$" >>  ${VAL}
-		;;
-            "--memtest")
-                NSS_TESTS="memtest"
-                ;;
-            "--nojsssign")
-                NO_JSS_SIGN=1
-                ;;
-            *)
-                echo "Usage: $0 [--bits=BITS] [--opt=OPT] [--once] ..."
-                echo "    --bits      - bits mode (32 or 64)"
-                echo "    --opt       - debug/opt mode (DBG or OPT)"
-                echo "    --once      - run only once"
-                echo "    --cycles    - run cycles (pkix, shared db,..) in separate runs"
-                echo "    --memtest   - run the memory leak tests"
-                echo "    --nomail    - don't send e-mail"
-                echo "    --nocvs     - skip CVS checkout (work with old data)"
-                echo "    --nobuild   - skip build"
-                echo "    --notest    - skip testing"
-                echo "    --nomove    - don't move old data directory after testing"
-                echo "    --nojss     - don't build/test JSS (NSS only)"
-                echo "    --nojsssign - try to sign jss"
-                exit 0
-                ;;
-        esac 
-
-        shift
-    done
-}
-
-set_env()
-{
-    TESTDIR=$(pwd)
-    TESTSET=standard
-    MEM_LEAK=
-    if [ "${NSS_TESTS}" = "memleak" ]; then
-	TESTSET=memleak
-	MEM_LEAK="_MEMLEAK"
-    fi
-    DATADIR=$(pwd)$(echo "/data/${HOST}_${RUN_BITS}_${RUN_OPT}${MEM_LEAK}" | sed "s/ /_/g")
-    LOG_ALL="${DATADIR}/all.log"
-    LOG_TMP="${DATADIR}/tmp.log"
-
-    if [ "${BRANCH}" = "stable" ]; then 
-        CVS_LIST="${CVS_STABLE}"
-        TB_TREE="NSS-Stable-Branch"
-    else
-        CVS_LIST="${CVS_TRUNK}"
-        TB_TREE="NSS"
-    fi
-}
-
-print_log()
-{
-    DATE=$(date "+TB [%Y-%m-%d %H:%M:%S]")
-    echo "${DATE} $*"
-    echo "${DATE} $*" >> ${LOG_ALL}
-}
-
-print_result()
-{
-    TESTNAME=$1
-    RET=$2
-    EXP=$3
-
-    if [ ${RET} -eq ${EXP} ]; then
-        print_log "${TESTNAME} PASSED"
-    else
-        print_log "${TESTNAME} FAILED"
-    fi
-}
-
-print_env()
-{
-    print_log "######## Environment variables ########"
-
-    uname -a | tee -a ${LOG_ALL}
-    if [ -e "/etc/redhat-release" ]; then
-        cat "/etc/redhat-release" | tee -a ${LOG_ALL}
-    fi
-    env | tee -a ${LOG_ALL}
-}
-
-print_mail_header()
-{
-    TREE=$1
-    BUILD_DATE=$2
-    STATUS=$3
-    BUILD=$4
-
-    echo
-    echo "tinderbox: tree: ${TREE}"
-    echo "tinderbox: builddate: ${BUILD_DATE}"
-    echo "tinderbox: status: ${STATUS}"
-    echo "tinderbox: build: ${BUILD}"
-    echo "tinderbox: errorparser: unix"
-    echo "tinderbox: buildfamily: unix"
-    echo "tinderbox: END"
-    echo
-}
-
-mail_start()
-{
-    print_mail_header "${TB_TREE}" "${BUILD_DATE}" building "${BRANCH} ${TESTSET} ${HOST} ${ARCH} ${RUN_BITS}bit ${RUN_OPT}" > ${LOG_TMP}
-    ${MAIL} ${TB_SERVER} < ${LOG_TMP}
-}
-
-mail_finish()
-{
-    STATUS=$1
-
-    print_mail_header "${TB_TREE}" "${BUILD_DATE}" "${STATUS}" "${BRANCH} ${TESTSET} ${HOST} ${ARCH} ${RUN_BITS}bit ${RUN_OPT}" > ${LOG_TMP}
-    cat ${LOG_ALL} >> ${LOG_TMP}
-    ${MAIL} ${TB_SERVER} < ${LOG_TMP}
-}
-
-cvs_checkout()
-{
-    print_log "######## CVS checkout ########"
-
-    print_log "$ cd ${DATADIR}"
-    cd ${DATADIR}
-
-    for CVS_FILE in ${CVS_LIST}; do
-        CVS_FILE=$(echo ${CVS_FILE} | sed "s/:/ /g")
-
-        print_log "$ ${CVS} -d ${CVSROOT} co -A ${CVS_FILE}"
-        ${CVS} -d ${CVSROOT} co -A ${CVS_FILE} >> ${LOG_ALL} 2>&1
-        RET=$?
-        print_result "CVS checkout ${CVS_FILE}" ${RET} 0
-        [ ${RET} -eq 0 ] || return ${RET}
-    done
-
-    print_log "$ ${CVS} -d ${CVSROOT} stat mozilla" 
-    ${CVS} -d ${CVSROOT} stat mozilla > ${LOG_TMP} 2>&1
-    RET=$?
-    print_result "CVS stat mozilla" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    if [ -f ${DATADIR}.cvs ]; then
-        diff -U4 ${DATADIR}.cvs ${LOG_TMP} | grep -i "Repository revision:" >> ${LOG_ALL}
-        if [ $? -eq 0 ]; then 
-            print_log "CVS change detected" 
-            echo "TinderboxPrint:CVS change" >> ${LOG_ALL}
-        fi
-    fi
-
-    mv ${LOG_TMP} ${DATADIR}.cvs
-
-    return 0
-}
-
-apply_patches()
-{
-    [ -z "${NSS_PATCH}" ] && return 0
-
-    print_log "######## Applying patches ########"
-    echo "TinderboxPrint:Using patches" >> ${LOG_ALL}
-
-    for PDATA in ${NSS_PATCH}; do
-        PDIR=$(echo ${PDATA} | cut -d: -f1)
-        PFILE=$(echo ${PDATA} | cut -d: -f2)
-       
-        cd ${DATADIR}/${PDIR} 
-        ${PATCH} -p0 < ${PFILE} >> ${LOG_ALL} 2>&1
-        RET=$?
-        print_result "Applying patch ${PFILE}" ${RET} 0
-        [ ${RET} -eq 0 ] || return ${RET}
-    done
-
-    return 0
-}
-
-set_cycle()
-{
-    BITS=$1
-    OPT=$2
-    CYCLE_CNT=$3
-
-    if [ "${BITS}" = "64" ]; then
-        USE_64=1
-        JAVA_HOME=${JAVA_HOME_64} 
-        PORT_DBG=${PORT_64_DBG}
-        PORT_OPT=${PORT_64_OPT}
-    else
-        USE_64=
-        JAVA_HOME=${JAVA_HOME_32} 
-        PORT_DBG=${PORT_32_DBG}
-        PORT_OPT=${PORT_32_OPT}
-    fi
-    export USE_64
-    export JAVA_HOME
-
-    BUILD_OPT=
-    if [ "${OPT}" = "OPT" ]; then
-        BUILD_OPT=1
-        XPCLASS=xpclass.jar
-        PORT=${PORT_OPT}
-    else
-        BUILD_OPT=
-        XPCLASS=xpclass_dbg.jar
-        PORT=${PORT_DBG}
-    fi
-    export BUILD_OPT
-
-    PORT_JSS_SERVER=$(expr ${PORT} + 20)
-    PORT_JSSE_SERVER=$(expr ${PORT} + 40)
-
-    export PORT
-    export PORT_JSS_SERVER
-    export PORT_JSSE_SERVER
-
-    [ -z ${RUN_CYCLES} ] && return 0
-
-    CYCLE_ID=$(expr ${CYCLE_CNT} % 4)
-    case ${CYCLE_ID} in
-        0)
-            export NSS_CYCLES=standard
-            CYCLE_TEXT="Standard"
-            ;;
-        1)
-            export NSS_CYCLES=pkix
-            CYCLE_TEXT="PKIX"
-            ;;
-        2)
-            export NSS_CYCLES=upgradedb
-            CYCLE_TEXT="Upgrade DB"
-            ;;
-        3)
-            export NSS_CYCLES=sharedb
-            CYCLE_TEXT="Shared DB"
-            ;;
-    esac
-}
-
-build_nss()
-{
-    print_log "######## NSS - build - ${BITS} bits - ${OPT} ########"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/nss"
-    cd ${DATADIR}/mozilla/security/nss
-
-    print_log "$ ${MAKE} ${NSS_BUILD_TARGET}"
-    ${MAKE} ${NSS_BUILD_TARGET} >> ${LOG_ALL} 2>&1
-    RET=$?
-    print_result "NSS - build - ${BITS} bits - ${OPT}" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    return 0
-}
-
-build_jss()
-{
-    print_log "######## JSS - build - ${BITS} bits - ${OPT} ########"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/jss"
-    cd ${DATADIR}/mozilla/security/jss
-
-    print_log "$ ${MAKE} ${JSS_BUILD_TARGET}"
-    ${MAKE} ${JSS_BUILD_TARGET} >> ${LOG_ALL} 2>&1
-    RET=$?
-    print_result "JSS build - ${BITS} bits - ${OPT}" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    print_log "$ cd ${DATADIR}/mozilla/dist"
-    cd ${DATADIR}/mozilla/dist
-
-    if [ -z "${NO_JSS_SIGN}" ]; then
-	print_log "cat ${TESTDIR}/keystore.pw | ${JAVA_HOME}/bin/jarsigner -keystore ${TESTDIR}/keystore -internalsf ${XPCLASS} jssdsa"
-	cat ${TESTDIR}/keystore.pw | ${JAVA_HOME}/bin/jarsigner -keystore ${TESTDIR}/keystore -internalsf ${XPCLASS} jssdsa >> ${LOG_ALL} 2>&1
-	RET=$?
-	print_result "JSS - sign JAR files - ${BITS} bits - ${OPT}" ${RET} 0
-	[ ${RET} -eq 0 ] || return ${RET}
-    fi
-    print_log "${JAVA_HOME}/bin/jarsigner -verify -certs ${XPCLASS}"
-    ${JAVA_HOME}/bin/jarsigner -verify -certs ${XPCLASS} >> ${LOG_ALL} 2>&1
-    RET=$?
-    print_result "JSS - verify JAR files - ${BITS} bits - ${OPT}" ${RET} 0
-    [ ${RET} -eq 0 ] || return ${RET}
-
-    return 0
-}
-
-test_nss()
-{
-    print_log "######## NSS - tests - ${BITS} bits - ${OPT} ########"
-
-    [ -n ${RUN_CYCLES} ] && echo "TinderboxPrint:${CYCLE_TEXT}" >> ${LOG_ALL}
-
-    print_log "$ cd ${DATADIR}/mozilla/security/nss/tests"
-    cd ${DATADIR}/mozilla/security/nss/tests
-
-    print_log "$ ./all.sh"
-    ./all.sh > ${LOG_TMP} 2>&1 
-    cat ${LOG_TMP} >> ${LOG_ALL}
-
-    tail -2 ${DATADIR}/mozilla/tests_results/security/${HOST}.1/results.html | grep END_OF_TEST >> ${LOG_ALL}
-    RET=$?
-
-    grep FAIL ${LOG_TMP}
-    [ $? -eq 1 ] || RET=1
-
-    print_result "NSS - tests - ${BITS} bits - ${OPT}" ${RET} 0
-    return ${RET}
-}
-
-test_jss()
-{
-    print_log "######## JSS - tests - ${BITS} bits - ${OPT} ########"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/jss"
-    cd ${DATADIR}/mozilla/security/jss
-
-    print_log "$ ${MAKE} platform"
-    PLATFORM=$(${MAKE} platform)
-    print_log "PLATFORM=${PLATFORM}"
-
-    print_log "$ cd ${DATADIR}/mozilla/security/jss/org/mozilla/jss/tests"
-    cd ${DATADIR}/mozilla/security/jss/org/mozilla/jss/tests
-
-    print_log "$ perl all.pl dist ${DATADIR}/mozilla/dist/${PLATFORM}"
-    perl all.pl dist ${DATADIR}/mozilla/dist/${PLATFORM} > ${LOG_TMP} 2>&1
-    cat ${LOG_TMP} >> ${LOG_ALL}
-
-    tail -2 ${LOG_TMP} | grep JSSTEST_RATE > /dev/null
-    RET=$?
-
-    grep FAIL ${LOG_TMP} 
-    [ $? -eq 1 ] || RET=1
-
-    print_result "JSS - tests - ${BITS} bits - ${OPT}" ${RET} 0
-    return ${RET}
-}
-
-build_and_test()
-{
-    if [ -z "${NO_BUILD}" ]; then
-        build_nss
-        [ $? -eq 0 ] || return 1
-    fi
-
-    if [ -z "${NO_TEST}" ]; then
-        test_nss
-        [ $? -eq 0 ] || return 2
-    fi
-
-    if [ -z "${NO_JSS}" -a -z "${NO_BUILD}" ]; then
-        build_jss
-        [ $? -eq 0 ] || return 1
-    fi
-
-    if [ -z "${NO_JSS}" -a -z "${NO_TEST}" ]; then
-        test_jss
-        [ $? -eq 0 ] || return 2
-    fi
-
-    return 0
-}
-
-run_cycle()
-{
-    if [ -z "${NO_MAIL}" ]; then
-        BUILD_DATE=$(${AWK} 'BEGIN{ srand(); print srand(); }')
-        mail_start
-    fi
-
-    print_env
-    STATUS=success
-
-    if [ -z "${NO_CVS}" ]; then
-        cvs_checkout
-        [ $? -ne 0 ] && STATUS=busted
-    fi
-        
-    if [ ${STATUS} = "success" -a -z "${NO_CVS}" ]; then
-        apply_patches
-        [ $? -ne 0 ] && STATUS=busted
-    fi
-
-    if [ ${STATUS} = "success" ]; then
-        build_and_test
-        RET=$?
-        [ ${RET} -eq 1 ] && STATUS=busted
-        [ ${RET} -eq 2 ] && STATUS=testfailed
-    fi
-
-    grep ^TinderboxPrint ${LOG_ALL}
-
-    if [ -z "${NO_MAIL}" ]; then
-        mail_finish ${STATUS}
-    fi
-}
-
-run_all()
-{
-    if [ ${SLEEP_TIME} -gt 0 ]; then
-        echo "Waiting ${SLEEP_TIME} minutes"
-        SLEEP_TIME=$(expr ${SLEEP_TIME} \* 60)
-        sleep ${SLEEP_TIME}
-        [ $? -eq 0 ] || return 1
-    fi
-
-    START_TIME=$(${AWK} 'BEGIN{ srand(); print srand(); }')
-
-    [ -z "${NO_CVS}" ] && rm -rf ${DATADIR}
-    [ -f "${LOG_ALL}" ] && rm ${LOG_ALL}
- 
-    mkdir -p ${DATADIR}
-
-    set_cycle ${BITS} ${OPT} ${CYCLE_CNT}
-    run_cycle
-
-    CYCLE_ID=$(expr ${CYCLE_CNT} % ${CYCLE_MAX} + 1)
-
-    cd ${TESTDIR}
-    rm -rf ${DATADIR}.last.${CYCLE_ID}
-
-    if [ -z "${NO_MOVE}" ]; then
-        mv ${DATADIR} ${DATADIR}.last.${CYCLE_ID}
-    else
-        cp -r ${DATADIR} ${DATADIR}.last.${CYCLE_ID}
-    fi 
-
-    CYCLE_CNT=$(expr ${CYCLE_CNT} + 1)
-
-    FINISH_TIME=$(${AWK} 'BEGIN{ srand(); print srand(); }')
-    TESTING_TIME=$(expr ${FINISH_TIME} - ${START_TIME})
-    TESTING_TIME=$(expr ${TESTING_TIME} / 60)
-    if [ ${TESTING_TIME} -ge ${CYCLE_TIME} ]; then
-        SLEEP_TIME=0
-    else
-        SLEEP_TIME=$(expr ${CYCLE_TIME} - ${TESTING_TIME})
-    fi
-
-    [ -n "${RUN_ONCE}" ] && RUN=0
-}
-
-main()
-{
-    CYCLE_CNT=0
-    SLEEP_TIME=0
-    RUN=1
-    VALID=0
- 
-    while [ ${RUN} -eq 1 ]; do 
-        for BITS in 32 64; do
-            echo ${RUN_BITS} | grep ${BITS} > /dev/null
-            [ $? -eq 0 ] || continue
-            for OPT in DBG OPT; do
-                echo ${RUN_OPT} | grep ${OPT} > /dev/null
-                [ $? -eq 0 ] || continue
-
-                if [ ${RUN} -eq 1 ]; then
-                    VALID=1 
-                    run_all 
-                fi
-            done
-        done
-
-        if [ ${VALID} -ne 1 ]; then
-            echo "Need to set valid bits/opt values."
-            RUN=0
-        fi
-    done
-
-    return 0
-}
-
-echo "tinderbox args: $0 $@"
-. env.sh
-proc_args "$@"
-set_env
-main
-

mozilla/xpcom/ds/Makefile.in

@@ -0,0 +1,134 @@
+#
+# 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): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_ds
+LIBRARY_NAME	= xpcomds_s
+REQUIRES	= unicharutil string
+
+CSRCS = \
+		pldhash.c \
+		plvector.c \
+		$(NULL)
+
+CPPSRCS		= \
+		nsArena.cpp \
+		nsAtomTable.cpp \
+		nsAtomService.cpp \
+		nsAVLTree.cpp \
+		nsByteBuffer.cpp \
+		nsCRT.cpp \
+		nsConjoiningEnumerator.cpp \
+		nsDeque.cpp \
+		nsEmptyEnumerator.cpp \
+		nsEnumeratorUtils.cpp \
+		nsFixedSizeAllocator.cpp \
+		nsHashtable.cpp \
+		nsHashtableEnumerator.cpp \
+		nsObserver.cpp \
+		nsObserverList.cpp \
+		nsObserverService.cpp \
+		nsProperties.cpp \
+		nsPersistentProperties.cpp \
+		nsQuickSort.cpp \
+		nsSizeOfHandler.cpp \
+		nsStaticNameTable.cpp \
+		nsStatistics.cpp \
+		nsStringMap.cpp \
+		nsSupportsArray.cpp \
+		nsSupportsArrayEnumerator.cpp \
+		nsSupportsPrimitives.cpp \
+		nsUnicharBuffer.cpp \
+		nsVoidArray.cpp \
+		nsVoidBTree.cpp \
+		nsTextFormatter.cpp \
+		nsTimelineService.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsAVLTree.h \
+		nsAtomService.h \
+		nsCppSharedAllocator.h \
+		nsCRT.h \
+		nsDeque.h \
+		nsEnumeratorUtils.h \
+		nsFixedSizeAllocator.h \
+		nsHashtable.h \
+		nsHashtableEnumerator.h \
+		nsIArena.h \
+		nsIByteBuffer.h \
+		nsIObserverList.h \
+		nsISimpleEnumerator.h \
+		nsISizeOfHandler.h \
+		nsIUnicharBuffer.h \
+		nsInt64.h \
+		nsQuickSort.h \
+		nsStaticNameTable.h \
+		nsStatistics.h \
+		nsStringMap.h \
+		nsSupportsArray.h \
+		nsSupportsPrimitives.h \
+		nsTime.h \
+		nsUnitConversion.h \
+		nsVector.h \
+		nsVoidArray.h \
+		nsVoidBTree.h \
+		pldhash.h \
+		plvector.h \
+		nsTextFormatter.h \
+		$(NULL)			
+
+XPIDLSRCS	= \
+		nsIAtom.idl \
+		nsIAtomService.idl \
+		nsICollection.idl \
+		nsIEnumerator.idl \
+		nsIObserver.idl \
+		nsIObserverService.idl \
+		nsIPersistentProperties2.idl \
+		nsIProperties.idl \
+		nsISerializable.idl \
+		nsIStopwatch.idl \
+		nsISupportsArray.idl \
+		nsISupportsIterators.idl \
+		nsISupportsPrimitives.idl \
+		nsITimelineService.idl \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = 1
+
+# Force use of PIC
+FORCE_USE_PIC	= 1
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+

mozilla/xpcom/ds/nsStringMap.cpp

@@ -0,0 +1,300 @@
+/* 
+ * 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 Communicator client code.
+ * 
+ * The Initial Developer of the Original Code is James L. Nance
+ * Portions created by James L. Nance are Copyright (C) 2001
+ * James L. Nance.  All  Rights Reserved.
+ * 
+ * Contributor(s): Patricia Jewell Nance, Jesse Jacob Nance
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+// #define TEST_PATRICIA
+
+#if defined(TEST_PATRICIA)
+#   include "stdlib.h"
+#   include "stdio.h"
+#   include "string.h"
+#   define PRBool bool
+#   define PRUint32 unsigned int
+#   define PRInt32  int
+#   define PR_CALLBACK
+#   define PLArenaPool int
+#   define PL_FinishArenaPool(a)
+#   define PL_InitArenaPool(a, b, c, d)
+#   define PL_ArenaAllocate(a, size) malloc(size)
+#   define PR_TRUE true
+#   define PR_FALSE false
+
+    struct nsCRT {
+        static int strlen(const char *a) {return ::strlen(a);}
+        static int memcmp(const void *a, const void *b, PRUint32 c) {
+            return ::memcmp(a,b,c);
+        }
+    };
+#else
+#   include "nsCRT.h"
+#endif
+
+#include "nsStringMap.h"
+
+const char nsStringMap::zero_str[] = "\0";
+
+nsStringMap::~nsStringMap()
+{
+    // Get rid of the arena memory
+    PL_FinishArenaPool(&mPool);
+}
+
+nsStringMap::nsStringMap() : numEntries(0)
+{
+    // Initialize the head
+    head.l   = head.r = &head;
+    head.bit = ~0;
+    head.key = zero_str;
+    head.len = 1;
+    head.obj = 0;
+
+    // Initialize the arena.  Guess that a 512 byte block size is good
+    PL_InitArenaPool(&mPool, "nsStringMap", 512, sizeof(void*));
+}
+
+void
+nsStringMap::Reset()
+{
+    // Initialize the head
+    head.l   = head.r = &head;
+    head.bit = ~0;
+    head.key = zero_str;
+    head.len = 1;
+    head.obj = 0;
+
+    // Reinitialize the Arena
+    PL_FinishArenaPool(&mPool);
+    PL_InitArenaPool(&mPool, "nsStringMap", 512, sizeof(void*));
+}
+
+void
+nsStringMap::Reset(nsStringMapEnumFunc destroyFunc, void *aClosure)
+{
+    Enumerate(destroyFunc, aClosure);
+    Reset();
+}
+
+nsStringMap::Patricia *
+nsStringMap::newNode()
+{
+    return (Patricia*) PL_ArenaAllocate(&mPool, sizeof(Patricia));
+}
+
+nsStringMap::Patricia *
+nsStringMap::searchDown(BitTester &key)
+{
+    // The head node only branches to the left, so we can optimize here.
+    Patricia *x = head.l;
+
+    PRUint32 lastBits;
+
+    do {
+        lastBits = x->bit;
+
+        if(key.isset(lastBits))
+            x = x->r;
+        else
+            x = x->l;
+
+    } while(lastBits > x->bit);
+
+    return x;
+}
+
+void*
+nsStringMap::Get(const char *str, PRUint32 slen)
+{
+    BitTester key(str, slen);
+
+    Patricia *t = searchDown(key);
+
+    if(!key.memcmp(t->key, t->len)) {
+        return t->obj;
+    }
+
+    return 0;
+}
+
+void*
+nsStringMap::Get(const char *str)
+{
+    BitTester key(str);
+
+    Patricia *t = searchDown(key);
+
+    if(!key.memcmp(t->key, t->len)) {
+        return t->obj;
+    }
+
+    return 0;
+}
+
+PRBool
+nsStringMap::Put(const char *str, void *obj, PRBool copy)
+{
+    PRUint32 slen = nsCRT::strlen(str);
+    return Put(str, slen, obj, copy);
+}
+
+PRBool
+nsStringMap::Put(const char *str, PRUint32 slen, void *obj, PRBool copy)
+{
+    if(copy) {
+        PRUint32 mask  = sizeof(double) - 1;
+        PRUint32 asize = (slen+mask) & ~mask;
+        char *tstr = (char*) PL_ArenaAllocate(&mPool, asize);
+        memcpy(tstr, str, slen);
+        str = tstr;
+    }
+
+    BitTester key(str, slen);
+
+    Patricia *t = searchDown(key);
+
+    if(!key.memcmp(t->key, t->len)) {
+        t->obj = obj;
+        return PR_TRUE;
+    }
+
+    // This is somewhat ugly.  We need to find the maximum bit position that
+    // differs, but this is complicated by the fact that we have random length
+    // data.  Assume that data past the end of the string is 0.
+    const PRUint32 klen = key.datalen();
+    const PRUint32 tlen = t->len;
+    PRUint32   bpos;
+    if(klen>tlen) {
+        bpos = 8 * klen - 1;
+        while(!BitTester::isset_checked(str, bpos)) --bpos;
+    } else if(tlen>klen) {
+        bpos = 8 * tlen - 1;
+        while(!BitTester::isset_checked(t->key, bpos)) --bpos;
+    } else /* equal */ {
+        bpos = 8 * tlen - 1;
+        while(BitTester::bitsequal(t->key, str, bpos)) --bpos;
+    }
+
+    Patricia *p, *x = &head;
+
+    do {
+        p = x;
+        x = key.isset(x->bit) ? x->r : x->l;
+    } while(x->bit > bpos && p->bit > x->bit);
+
+    t = newNode();
+
+    if(!t) {
+        return PR_FALSE;
+    }
+
+    t->key = str;
+    t->len = key.datalen();
+    t->obj = obj;
+    t->bit = bpos;
+
+    if(key.isset(t->bit)) {
+        t->r = t;
+        t->l = x;
+    } else {
+        t->r = x;
+        t->l = t;
+    }
+
+    if(key.isset(p->bit)) {
+        p->r = t;
+    } else {
+        p->l = t;
+    }
+
+    return PR_TRUE;
+}
+
+void
+nsStringMap::enumerate_recurse(
+nsStringMapEnumFunc aEnumFunc, void* aClosure, Patricia *node)
+{
+    aEnumFunc(node->key, node->obj, aClosure);
+    if(node->l && node->l->bit<node->bit)
+        enumerate_recurse(aEnumFunc, aClosure, node->l);
+    if(node->r && node->r->bit<node->bit)
+        enumerate_recurse(aEnumFunc, aClosure, node->r);
+}
+
+void
+nsStringMap::Enumerate(nsStringMapEnumFunc aEnumFunc, void *aClosure)
+{
+    // We dont want to process head, its a sentinal
+    if(head.l && head.l->bit<head.bit)
+        enumerate_recurse(aEnumFunc, aClosure, head.l);
+    if(head.r && head.r->bit<head.bit)
+        enumerate_recurse(aEnumFunc, aClosure, head.r);
+}
+
+#if defined(TEST_PATRICIA)
+
+PRBool etest(const char *key, void *data, void *closure)
+{
+    printf("%s\n", key);
+    return PR_TRUE;
+}
+
+int main()
+{
+    nsStringMap map;
+    const char *strings[] = {
+      "I am number 1 string",
+      "I am number 2 string",
+      "I am number 3 string",
+      "a different string",
+      "a similar string",
+      "I am a very long string and I want to make sure we can handle this",
+      "I am a very long string and I want to make sure we can handle this too",
+      0
+    };
+
+    int idx;
+    for(idx=0; strings[idx]; ++idx) {
+        map.Put(strings[idx], (void*)(1+idx));
+    }
+
+    printf("Lookup Test\n");
+    while(--idx>=0) {
+        void *ptr = map.Get(strings[idx]);
+        printf("%d: %s\n", (long)ptr, strings[idx]);
+    }
+
+    printf("\nEnumeration Test\n");
+
+    map.Enumerate(etest, 0);
+
+    return 0;
+}
+
+#endif

mozilla/xpcom/ds/nsStringMap.h

@@ -0,0 +1,112 @@
+#ifndef nsStringMap_h__
+#define nsStringMap_h__
+
+/* 
+ * 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 Communicator client code.
+ * 
+ * The Initial Developer of the Original Code is James L. Nance
+ * Portions created by James L. Nance are Copyright (C) 2001
+ * James L. Nance.  All  Rights Reserved.
+ * 
+ * Contributor(s): Patricia Jewell Nance, Jesse Jacob Nance
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#if !defined(TEST_PATRICIA)
+#   include "nscore.h"
+#   include "prtypes.h"
+#   include "plarena.h"
+#endif
+
+typedef PRBool (*PR_CALLBACK nsStringMapEnumFunc) (
+    const char *aKey, void *aData, void *aClosure);
+
+class nsStringMap
+{
+public:
+    nsStringMap();
+    ~nsStringMap();
+    PRBool Put(const char *str, PRUint32 slen, void *obj, PRBool copy=PR_FALSE);
+    PRBool Put(const char *str, void *obj, PRBool copy=PR_FALSE);
+    void*  Get(const char *str);
+    void*  Get(const char *str, PRUint32 slen);
+    void   Reset();
+    void   Reset(nsStringMapEnumFunc destroyFunc, void *aClosure = 0);
+    void   Enumerate(nsStringMapEnumFunc aEnumFunc, void *aClosure = 0);
+
+    struct Patricia {
+        Patricia   *l, *r;
+        PRUint32    bit;    // Bit position for l/r comp
+        const char *key;
+        PRUint32    len;
+        void       *obj;
+    };
+
+    // The BitTester class is used to test a particular bit position in an
+    // array of characters.  It does not assign any special meaning to 0
+    // characters.  Bits past the end of the array are treated as 0
+    class BitTester {
+        const PRUint32 slen;
+        const char    *cstr;
+    public:
+        BitTester(const char *s) : slen(nsCRT::strlen(s)), cstr(s) {}
+        BitTester(const char *s, PRUint32 l) : slen(l), cstr(s) {}
+
+        PRInt32 memcmp(const char *ostr, PRUint32 olen) {
+            if(olen==slen) {
+                return ::memcmp((void*)cstr, ostr, slen);
+            } else {
+                return olen - slen;
+            }
+        }
+
+        PRUint32 datalen() const {return slen;}
+
+        static PRBool isset_checked(const char *str, PRUint32 idx) {
+            return (str[idx/8] & (1<<(idx & 7))) != 0;
+        }
+
+        static PRBool
+        bitsequal(const char *str1, const char*str2, PRUint32 idx) {
+            return (str1[idx/8] & (1<<(idx&7)))==(str2[idx/8] & (1<<(idx&7)));
+        }
+
+        PRBool isset(PRUint32 idx) {
+            const PRUint32 base = idx/8;
+            if(base>=slen) return 0;
+            return (cstr[base] & (1<<(idx & 7))) != 0;
+        }
+    };
+
+private:
+    PLArenaPool mPool;
+    Patricia *newNode();
+    Patricia *searchDown(BitTester&);
+    void enumerate_recurse(nsStringMapEnumFunc, void*, Patricia*);
+    Patricia head; // Sentinal node
+    PRInt32  numEntries;
+    static const char zero_str[];
+};
+
+#endif