diff -r 000000000000 -r 6474c204b198 js/jsd/jsd_text.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/jsd/jsd_text.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,525 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * JavaScript Debugging support - Source Text functions
+ */
+
+#include <ctype.h>
+#include "jsd.h"
+#include "jsprf.h"
+
+#ifdef DEBUG
+void JSD_ASSERT_VALID_SOURCE_TEXT(JSDSourceText* jsdsrc)
+{
+    MOZ_ASSERT(jsdsrc);
+    MOZ_ASSERT(jsdsrc->url);
+}
+#endif
+
+/***************************************************************************/
+/* XXX add notification */
+
+static void
+_clearText(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    if( jsdsrc->text )
+        free(jsdsrc->text);
+    jsdsrc->text        = nullptr;
+    jsdsrc->textLength  = 0;
+    jsdsrc->textSpace   = 0;
+    jsdsrc->status      = JSD_SOURCE_CLEARED;
+    jsdsrc->dirty       = true;
+    jsdsrc->alterCount  = jsdc->sourceAlterCount++ ;
+    jsdsrc->doingEval   = false;
+}    
+
+static bool
+_appendText(JSDContext* jsdc, JSDSourceText* jsdsrc, 
+            const char* text, size_t length)
+{
+#define MEMBUF_GROW 1000
+
+    unsigned neededSize = jsdsrc->textLength + length;
+
+    if( neededSize > jsdsrc->textSpace )
+    {
+        char* newBuf;
+        unsigned iNewSize;
+
+        /* if this is the first alloc, the req might be all that's needed*/
+        if( ! jsdsrc->textSpace )
+            iNewSize = length;
+        else
+            iNewSize = (neededSize * 5 / 4) + MEMBUF_GROW;
+
+        newBuf = (char*) realloc(jsdsrc->text, iNewSize);
+        if( ! newBuf )
+        {
+            /* try again with the minimal size really asked for */
+            iNewSize = neededSize;
+            newBuf = (char*) realloc(jsdsrc->text, iNewSize);
+            if( ! newBuf )
+            {
+                /* out of memory */
+                _clearText( jsdc, jsdsrc );
+                jsdsrc->status = JSD_SOURCE_FAILED;
+                return false;
+            }
+        }
+
+        jsdsrc->text = newBuf;
+        jsdsrc->textSpace = iNewSize;
+    }
+
+    memcpy(jsdsrc->text + jsdsrc->textLength, text, length);
+    jsdsrc->textLength += length;
+    return true;
+}
+
+static JSDSourceText*
+_newSource(JSDContext* jsdc, char* url)
+{
+    JSDSourceText* jsdsrc = (JSDSourceText*)calloc(1,sizeof(JSDSourceText));
+    if( ! jsdsrc )
+        return nullptr;
+    
+    jsdsrc->url        = url;
+    jsdsrc->status     = JSD_SOURCE_INITED;
+    jsdsrc->dirty      = true;
+    jsdsrc->alterCount = jsdc->sourceAlterCount++ ;
+            
+    return jsdsrc;
+}
+
+static void
+_destroySource(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    MOZ_ASSERT(nullptr == jsdsrc->text);  /* must _clearText() first */
+    free(jsdsrc->url);
+    free(jsdsrc);
+}
+
+static void
+_removeSource(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    JS_REMOVE_LINK(&jsdsrc->links);
+    _clearText(jsdc, jsdsrc);
+    _destroySource(jsdc, jsdsrc);
+}
+
+static JSDSourceText*
+_addSource(JSDContext* jsdc, char* url)
+{
+    JSDSourceText* jsdsrc = _newSource(jsdc, url);
+    if( ! jsdsrc )
+        return nullptr;
+    JS_INSERT_LINK(&jsdsrc->links, &jsdc->sources);
+    return jsdsrc;
+}
+
+static void
+_moveSourceToRemovedList(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    _clearText(jsdc, jsdsrc);
+    JS_REMOVE_LINK(&jsdsrc->links);
+    JS_INSERT_LINK(&jsdsrc->links, &jsdc->removedSources);
+}
+
+static void
+_removeSourceFromRemovedList( JSDContext* jsdc, JSDSourceText* jsdsrc )
+{
+    JS_REMOVE_LINK(&jsdsrc->links);
+    _destroySource( jsdc, jsdsrc );
+}
+
+static bool
+_isSourceInSourceList(JSDContext* jsdc, JSDSourceText* jsdsrcToFind)
+{
+    JSDSourceText *jsdsrc;
+
+    for( jsdsrc = (JSDSourceText*)jsdc->sources.next;
+         jsdsrc != (JSDSourceText*)&jsdc->sources;
+         jsdsrc = (JSDSourceText*)jsdsrc->links.next ) 
+    {
+        if( jsdsrc == jsdsrcToFind )
+            return true;
+    }
+    return false;
+}
+
+/*  compare strings in a case insensitive manner with a length limit
+*/
+
+static int 
+strncasecomp (const char* one, const char * two, int n)
+{
+    const char *pA;
+    const char *pB;
+    
+    for(pA=one, pB=two;; pA++, pB++) 
+    {
+        int tmp;
+        if (pA == one+n) 
+            return 0;   
+        if (!(*pA && *pB)) 
+            return *pA - *pB;
+        tmp = tolower(*pA) - tolower(*pB);
+        if (tmp) 
+            return tmp;
+    }
+}
+
+static const char file_url_prefix[] = "file:";
+#define FILE_URL_PREFIX_LEN     (sizeof file_url_prefix - 1)
+
+char*
+jsd_BuildNormalizedURL( const char* url_string )
+{
+    char *new_url_string;
+
+    if( ! url_string )
+        return nullptr;
+
+    if (!strncasecomp(url_string, file_url_prefix, FILE_URL_PREFIX_LEN) &&
+        url_string[FILE_URL_PREFIX_LEN + 0] == '/' &&
+        url_string[FILE_URL_PREFIX_LEN + 1] == '/') {
+        new_url_string = JS_smprintf("%s%s",
+                                     file_url_prefix,
+                                     url_string + FILE_URL_PREFIX_LEN + 2);
+    } else {
+        new_url_string = strdup(url_string);
+    }
+    return new_url_string;
+}
+
+/***************************************************************************/
+
+void
+jsd_DestroyAllSources( JSDContext* jsdc )
+{
+    JSDSourceText *jsdsrc;
+    JSDSourceText *next;
+
+    for( jsdsrc = (JSDSourceText*)jsdc->sources.next;
+         jsdsrc != (JSDSourceText*)&jsdc->sources;
+         jsdsrc = next ) 
+    {
+        next = (JSDSourceText*)jsdsrc->links.next;
+        _removeSource( jsdc, jsdsrc );
+    }
+
+    for( jsdsrc = (JSDSourceText*)jsdc->removedSources.next;
+         jsdsrc != (JSDSourceText*)&jsdc->removedSources;
+         jsdsrc = next ) 
+    {
+        next = (JSDSourceText*)jsdsrc->links.next;
+        _removeSourceFromRemovedList( jsdc, jsdsrc );
+    }
+
+}
+
+JSDSourceText*
+jsd_IterateSources(JSDContext* jsdc, JSDSourceText **iterp)
+{
+    JSDSourceText *jsdsrc = *iterp;
+    
+    if( !jsdsrc )
+        jsdsrc = (JSDSourceText *)jsdc->sources.next;
+    if( jsdsrc == (JSDSourceText *)&jsdc->sources )
+        return nullptr;
+    *iterp = (JSDSourceText *)jsdsrc->links.next;
+    return jsdsrc;
+}
+
+JSDSourceText*
+jsd_FindSourceForURL(JSDContext* jsdc, const char* url)
+{
+    JSDSourceText *jsdsrc;
+
+    for( jsdsrc = (JSDSourceText *)jsdc->sources.next;
+         jsdsrc != (JSDSourceText *)&jsdc->sources;
+         jsdsrc = (JSDSourceText *)jsdsrc->links.next )
+    {
+        if( 0 == strcmp(jsdsrc->url, url) )
+            return jsdsrc;
+    }
+    return nullptr;
+}
+
+const char*
+jsd_GetSourceURL(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    return jsdsrc->url;
+}
+
+bool
+jsd_GetSourceText(JSDContext* jsdc, JSDSourceText* jsdsrc,
+                  const char** ppBuf, int* pLen )
+{
+    *ppBuf = jsdsrc->text;
+    *pLen  = jsdsrc->textLength;
+    return true;
+}
+
+void
+jsd_ClearSourceText(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    if( JSD_SOURCE_INITED  != jsdsrc->status &&
+        JSD_SOURCE_PARTIAL != jsdsrc->status )
+    {
+        _clearText(jsdc, jsdsrc);
+    }
+}
+
+JSDSourceStatus
+jsd_GetSourceStatus(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    return jsdsrc->status;
+}
+
+bool
+jsd_IsSourceDirty(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    return jsdsrc->dirty;
+}
+
+void
+jsd_SetSourceDirty(JSDContext* jsdc, JSDSourceText* jsdsrc, bool dirty)
+{
+    jsdsrc->dirty = dirty;
+}
+
+unsigned
+jsd_GetSourceAlterCount(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    return jsdsrc->alterCount;
+}
+
+unsigned
+jsd_IncrementSourceAlterCount(JSDContext* jsdc, JSDSourceText* jsdsrc)
+{
+    return jsdsrc->alterCount = jsdc->sourceAlterCount++;
+}
+
+/***************************************************************************/
+
+#if defined(DEBUG) && 0
+void DEBUG_ITERATE_SOURCES( JSDContext* jsdc )
+{
+    JSDSourceText* iterp = nullptr;
+    JSDSourceText* jsdsrc = nullptr;
+    int dummy;
+    
+    while( nullptr != (jsdsrc = jsd_IterateSources(jsdc, &iterp)) )
+    {
+        const char*     url;
+        const char*     text;
+        int             len;
+        bool            dirty;
+        JSDStreamStatus status;
+        bool            gotSrc;
+
+        url     = JSD_GetSourceURL(jsdc, jsdsrc);
+        dirty   = JSD_IsSourceDirty(jsdc, jsdsrc);
+        status  = JSD_GetSourceStatus(jsdc, jsdsrc);
+        gotSrc  = JSD_GetSourceText(jsdc, jsdsrc, &text, &len );
+        
+        dummy = 0;  /* gives us a line to set breakpoint... */
+    }
+}
+#else
+#define DEBUG_ITERATE_SOURCES(x) ((void)x)
+#endif
+
+/***************************************************************************/
+
+JSDSourceText*
+jsd_NewSourceText(JSDContext* jsdc, const char* url)
+{
+    JSDSourceText* jsdsrc;
+    char* new_url_string;
+
+    JSD_LOCK_SOURCE_TEXT(jsdc);
+
+    new_url_string = jsd_BuildNormalizedURL(url);
+
+    if( ! new_url_string )
+        return nullptr;
+
+    jsdsrc = jsd_FindSourceForURL(jsdc, new_url_string);
+
+    if( jsdsrc )
+    {
+        if( jsdsrc->doingEval )
+        {
+            free(new_url_string);
+            JSD_UNLOCK_SOURCE_TEXT(jsdc);
+            return nullptr;
+        }
+        else    
+            _moveSourceToRemovedList(jsdc, jsdsrc);
+    }
+
+    jsdsrc = _addSource( jsdc, new_url_string );
+
+    JSD_UNLOCK_SOURCE_TEXT(jsdc);
+
+    return jsdsrc;
+}
+
+JSDSourceText*
+jsd_AppendSourceText(JSDContext* jsdc, 
+                     JSDSourceText* jsdsrc,
+                     const char* text,       /* *not* zero terminated */
+                     size_t length,
+                     JSDSourceStatus status)
+{
+    JSD_LOCK_SOURCE_TEXT(jsdc);
+
+    if( jsdsrc->doingEval )
+    {
+        JSD_UNLOCK_SOURCE_TEXT(jsdc);
+        return nullptr;
+    }
+
+    if( ! _isSourceInSourceList( jsdc, jsdsrc ) )
+    {
+        _removeSourceFromRemovedList( jsdc, jsdsrc );
+        JSD_UNLOCK_SOURCE_TEXT(jsdc);
+        return nullptr;
+    }
+
+    if( text && length && ! _appendText( jsdc, jsdsrc, text, length ) )
+    {
+        jsdsrc->dirty  = true;
+        jsdsrc->alterCount  = jsdc->sourceAlterCount++ ;
+        jsdsrc->status = JSD_SOURCE_FAILED;
+        _moveSourceToRemovedList(jsdc, jsdsrc);
+        JSD_UNLOCK_SOURCE_TEXT(jsdc);
+        return nullptr;    
+    }
+
+    jsdsrc->dirty  = true;
+    jsdsrc->alterCount  = jsdc->sourceAlterCount++ ;
+    jsdsrc->status = status;
+    DEBUG_ITERATE_SOURCES(jsdc);
+    JSD_UNLOCK_SOURCE_TEXT(jsdc);
+    return jsdsrc;
+}
+
+JSDSourceText*
+jsd_AppendUCSourceText(JSDContext* jsdc,
+                       JSDSourceText* jsdsrc,
+                       const jschar* text,       /* *not* zero terminated */
+                       size_t length,
+                       JSDSourceStatus status)
+{
+#define UNICODE_TRUNCATE_BUF_SIZE 1024
+    static char* buf = nullptr;
+    int remaining = length;
+
+    if(!text || !length)
+        return jsd_AppendSourceText(jsdc, jsdsrc, nullptr, 0, status);
+
+    JSD_LOCK_SOURCE_TEXT(jsdc);
+    if(!buf)
+    {
+        buf = js_pod_malloc<char>(UNICODE_TRUNCATE_BUF_SIZE);
+        if(!buf)
+        {
+            JSD_UNLOCK_SOURCE_TEXT(jsdc);
+            return nullptr;
+        }
+    }
+    while(remaining && jsdsrc) {
+        int bytes = (remaining < UNICODE_TRUNCATE_BUF_SIZE) ? remaining : UNICODE_TRUNCATE_BUF_SIZE;
+        int i;
+        for(i = 0; i < bytes; i++)
+            buf[i] = (const char) *(text++);
+        jsdsrc = jsd_AppendSourceText(jsdc,jsdsrc,
+                                      buf, bytes,
+                                      JSD_SOURCE_PARTIAL);
+        remaining -= bytes;
+    }
+    if(jsdsrc && status != JSD_SOURCE_PARTIAL)
+        jsdsrc = jsd_AppendSourceText(jsdc, jsdsrc, nullptr, 0, status);
+
+    JSD_UNLOCK_SOURCE_TEXT(jsdc);
+    return jsdsrc;
+}
+
+/* convienence function for adding complete source of url in one call */
+bool
+jsd_AddFullSourceText(JSDContext* jsdc, 
+                      const char* text,       /* *not* zero terminated */
+                      size_t      length,
+                      const char* url)
+{
+    JSDSourceText* jsdsrc;
+
+    JSD_LOCK_SOURCE_TEXT(jsdc);
+
+    jsdsrc = jsd_NewSourceText(jsdc, url);
+    if( jsdsrc )
+        jsdsrc = jsd_AppendSourceText(jsdc, jsdsrc,
+                                      text, length, JSD_SOURCE_PARTIAL );
+    if( jsdsrc )
+        jsdsrc = jsd_AppendSourceText(jsdc, jsdsrc,
+                                      nullptr, 0, JSD_SOURCE_COMPLETED );
+
+    JSD_UNLOCK_SOURCE_TEXT(jsdc);
+
+    return jsdsrc ? true : false;
+}
+
+/***************************************************************************/
+
+void
+jsd_StartingEvalUsingFilename(JSDContext* jsdc, const char* url)
+{
+    JSDSourceText* jsdsrc;
+
+    /* NOTE: We leave it locked! */
+    JSD_LOCK_SOURCE_TEXT(jsdc); 
+
+    jsdsrc = jsd_FindSourceForURL(jsdc, url);
+    if(jsdsrc)
+    {
+#if 0
+#ifndef JSD_LOWLEVEL_SOURCE
+        MOZ_ASSERT(! jsdsrc->doingEval);
+#endif
+#endif
+        jsdsrc->doingEval = true;
+    }
+}    
+
+void
+jsd_FinishedEvalUsingFilename(JSDContext* jsdc, const char* url)
+{
+    JSDSourceText* jsdsrc;
+
+    /* NOTE: We ASSUME it is locked! */
+
+    jsdsrc = jsd_FindSourceForURL(jsdc, url);
+    if(jsdsrc)
+    {
+#if 0
+#ifndef JSD_LOWLEVEL_SOURCE
+        /*
+        * when using this low level source addition, this jsdsrc might 
+        * not have existed before the eval, but does exist now (without
+        * this flag set!)
+        */
+        MOZ_ASSERT(jsdsrc->doingEval);
+#endif
+#endif
+        jsdsrc->doingEval = false;
+    }
+
+    JSD_UNLOCK_SOURCE_TEXT(jsdc);
+}