# HG changeset patch
# User Robert Clipsham <robert@octarineparrot.com>
# Date 1257603716 0
# Node ID 9f7151d890ff52ab7b188200ec1c9a261e44dbd3
# Parent  b0dfdd5f600645c1390f5164eb4fe46bf1bb9664
Added in forgotten json.c and json.h files so ldc compiles again.

diff -r b0dfdd5f6006 -r 9f7151d890ff dmd/json.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dmd/json.c	Sat Nov 07 14:21:56 2009 +0000
@@ -0,0 +1,424 @@
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2009 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+// This implements the JSON capability.
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+#include <assert.h>
+
+#include "rmem.h"
+#include "root.h"
+
+#include "mars.h"
+#include "dsymbol.h"
+#include "macro.h"
+#include "template.h"
+#include "lexer.h"
+#include "aggregate.h"
+#include "declaration.h"
+#include "enum.h"
+#include "id.h"
+#include "module.h"
+#include "scope.h"
+#include "hdrgen.h"
+#include "json.h"
+#include "mtype.h"
+#include "attrib.h"
+#include "cond.h"
+
+const char Pname[] = "name";
+const char Pkind[] = "kind";
+const char Pfile[] = "file";
+const char Pline[] = "line";
+const char Ptype[] = "type";
+const char Pcomment[] = "comment";
+const char Pmembers[] = "members";
+
+void JsonRemoveComma(OutBuffer *buf);
+
+void json_generate(Array *modules)
+{   OutBuffer buf;
+
+    buf.writestring("[\n");
+    for (int i = 0; i < modules->dim; i++)
+    {	Module *m = (Module *)modules->data[i];
+	if (global.params.verbose)
+	    printf("json gen %s\n", m->toChars());
+	m->toJsonBuffer(&buf);
+	buf.writestring(",\n");
+    }
+    JsonRemoveComma(&buf);
+    buf.writestring("]\n");
+
+    // Write buf to file
+    char *arg = global.params.xfilename;
+    if (!arg || !*arg)
+    {   // Generate lib file name from first obj name
+        char *n = (char *)global.params.objfiles->data[0];
+
+        n = FileName::name(n);
+        FileName *fn = FileName::forceExt(n, global.json_ext);
+        arg = fn->toChars();
+    }
+    else if (arg[0] == '-' && arg[1] == 0)
+    {	// Write to stdout
+	fwrite(buf.data, 1, buf.offset, stdout);
+	return;
+    }
+//    if (!FileName::absolute(arg))
+//        arg = FileName::combine(dir, arg);
+    FileName *jsonfilename = FileName::defaultExt(arg, global.json_ext);
+    File *jsonfile = new File(jsonfilename);
+    assert(jsonfile);
+    jsonfile->setbuffer(buf.data, buf.offset);
+    jsonfile->ref = 1;
+    char *pt = FileName::path(jsonfile->toChars());
+    if (*pt)
+	FileName::ensurePathExists(pt);
+    mem.free(pt);
+    jsonfile->writev();
+}
+
+
+/*********************************
+ * Encode string into buf, and wrap it in double quotes.
+ */
+void JsonString(OutBuffer *buf, const char *s)
+{
+    buf->writeByte('\"');
+    for (; *s; s++)
+    {
+	unsigned char c = (unsigned char) *s;
+	switch (c)
+	{
+	    case '\n':
+		buf->writestring("\\n");
+		break;
+
+	    case '\r':
+		buf->writestring("\\r");
+		break;
+
+	    case '\t':
+		buf->writestring("\\t");
+		break;
+
+	    case '\"':
+		buf->writestring("\\\"");
+		break;
+
+	    case '\\':
+		buf->writestring("\\\\");
+		break;
+
+	    case '/':
+		buf->writestring("\\/");
+		break;
+
+	    case '\b':
+		buf->writestring("\\b");
+		break;
+
+	    case '\f':
+		buf->writestring("\\f");
+		break;
+
+	    default:
+		if (c < 0x20)
+		    buf->printf("\\u%04x", c);
+		else
+		    // Note that UTF-8 chars pass through here just fine
+		    buf->writeByte(c);
+		break;
+	}
+    }
+    buf->writeByte('\"');
+}
+
+void JsonProperty(OutBuffer *buf, const char *name, const char *value)
+{
+    JsonString(buf, name);
+    buf->writestring(" : ");
+    JsonString(buf, value);
+    buf->writestring(",\n");
+}
+
+void JsonProperty(OutBuffer *buf, const char *name, int value)
+{
+    JsonString(buf, name);
+    buf->writestring(" : ");
+    buf->printf("%d", value);
+    buf->writestring(",\n");
+}
+
+void JsonRemoveComma(OutBuffer *buf)
+{
+    if (buf->offset >= 2 &&
+	buf->data[buf->offset - 2] == ',' &&
+	buf->data[buf->offset - 1] == '\n')
+	buf->offset -= 2;
+}
+
+void Dsymbol::toJsonBuffer(OutBuffer *buf)
+{
+}
+
+void Module::toJsonBuffer(OutBuffer *buf)
+{
+    buf->writestring("{\n");
+
+    if (md)
+	JsonProperty(buf, Pname, md->toChars());
+
+    JsonProperty(buf, Pkind, kind());
+
+    JsonProperty(buf, Pfile, srcfile->toChars());
+
+    if (comment)
+	JsonProperty(buf, Pcomment, (const char *)comment);
+
+    JsonString(buf, Pmembers);
+    buf->writestring(" : [\n");
+
+    size_t offset = buf->offset;
+    for (int i = 0; i < members->dim; i++)
+    {	Dsymbol *s = (Dsymbol *)members->data[i];
+	if (offset != buf->offset)
+	{   buf->writestring(",\n");
+	    offset = buf->offset;
+	}
+	s->toJsonBuffer(buf);
+    }
+
+    JsonRemoveComma(buf);
+    buf->writestring("]\n");
+
+    buf->writestring("}\n");
+}
+
+void AttribDeclaration::toJsonBuffer(OutBuffer *buf)
+{
+    //printf("AttribDeclaration::toJsonBuffer()\n");
+
+    Array *d = include(NULL, NULL);
+
+    if (d)
+    {
+	for (unsigned i = 0; i < d->dim; i++)
+	{   Dsymbol *s = (Dsymbol *)d->data[i];
+	    //printf("AttribDeclaration::toJsonBuffer %s\n", s->toChars());
+	    s->toJsonBuffer(buf);
+	}
+    }
+}
+
+
+void ConditionalDeclaration::toJsonBuffer(OutBuffer *buf)
+{
+    //printf("ConditionalDeclaration::toJsonBuffer()\n");
+    if (condition->inc)
+    {
+	AttribDeclaration::toJsonBuffer(buf);
+    }
+}
+
+
+void InvariantDeclaration::toJsonBuffer(OutBuffer *buf)  { }
+void DtorDeclaration::toJsonBuffer(OutBuffer *buf)       { }
+void StaticCtorDeclaration::toJsonBuffer(OutBuffer *buf) { }
+void StaticDtorDeclaration::toJsonBuffer(OutBuffer *buf) { }
+void ClassInfoDeclaration::toJsonBuffer(OutBuffer *buf)  { }
+void ModuleInfoDeclaration::toJsonBuffer(OutBuffer *buf) { }
+void TypeInfoDeclaration::toJsonBuffer(OutBuffer *buf)   { }
+#if DMDV2
+void PostBlitDeclaration::toJsonBuffer(OutBuffer *buf)   { }
+#endif
+
+void Declaration::toJsonBuffer(OutBuffer *buf)
+{
+    //printf("Declaration::toJsonBuffer()\n");
+    buf->writestring("{\n");
+
+    JsonProperty(buf, Pname, toChars());
+    JsonProperty(buf, Pkind, kind());
+    if (type)
+	JsonProperty(buf, Ptype, type->toChars());
+
+    if (comment)
+	JsonProperty(buf, Pcomment, (const char *)comment);
+
+    if (loc.linnum)
+	JsonProperty(buf, Pline, loc.linnum);
+
+    TypedefDeclaration *td = isTypedefDeclaration();
+    if (td)
+    {
+	JsonProperty(buf, "base", td->basetype->toChars());
+    }
+
+    JsonRemoveComma(buf);
+    buf->writestring("}\n");
+}
+
+void AggregateDeclaration::toJsonBuffer(OutBuffer *buf)
+{
+    //printf("AggregateDeclaration::toJsonBuffer()\n");
+    buf->writestring("{\n");
+
+    JsonProperty(buf, Pname, toChars());
+    JsonProperty(buf, Pkind, kind());
+    if (comment)
+	JsonProperty(buf, Pcomment, (const char *)comment);
+    if (loc.linnum)
+	JsonProperty(buf, Pline, loc.linnum);
+
+    ClassDeclaration *cd = isClassDeclaration();
+    if (cd)
+    {
+	if (cd->baseClass)
+	{
+	    JsonProperty(buf, "base", cd->baseClass->toChars());
+	}
+	if (cd->interfaces_dim)
+	{
+	    JsonString(buf, "interfaces");
+	    buf->writestring(" : [\n");
+	    size_t offset = buf->offset;
+	    for (int i = 0; i < cd->interfaces_dim; i++)
+	    {	BaseClass *b = cd->interfaces[i];
+		if (offset != buf->offset)
+		{   buf->writestring(",\n");
+		    offset = buf->offset;
+		}
+		JsonString(buf, b->base->toChars());
+	    }
+	    JsonRemoveComma(buf);
+	    buf->writestring("],\n");
+	}
+    }
+
+    JsonString(buf, Pmembers);
+    buf->writestring(" : [\n");
+    size_t offset = buf->offset;
+    for (int i = 0; i < members->dim; i++)
+    {	Dsymbol *s = (Dsymbol *)members->data[i];
+	if (offset != buf->offset)
+	{   buf->writestring(",\n");
+	    offset = buf->offset;
+	}
+	s->toJsonBuffer(buf);
+    }
+    JsonRemoveComma(buf);
+    buf->writestring("]\n");
+
+    buf->writestring("}\n");
+}
+
+void TemplateDeclaration::toJsonBuffer(OutBuffer *buf)
+{
+    //printf("TemplateDeclaration::toJsonBuffer()\n");
+
+    buf->writestring("{\n");
+
+    JsonProperty(buf, Pname, toChars());
+    JsonProperty(buf, Pkind, kind());
+    if (comment)
+	JsonProperty(buf, Pcomment, (const char *)comment);
+
+    if (loc.linnum)
+	JsonProperty(buf, Pline, loc.linnum);
+
+    JsonString(buf, Pmembers);
+    buf->writestring(" : [\n");
+    size_t offset = buf->offset;
+    for (int i = 0; i < members->dim; i++)
+    {	Dsymbol *s = (Dsymbol *)members->data[i];
+	if (offset != buf->offset)
+	{   buf->writestring(",\n");
+	    offset = buf->offset;
+	}
+	s->toJsonBuffer(buf);
+    }
+    JsonRemoveComma(buf);
+    buf->writestring("]\n");
+
+    buf->writestring("}\n");
+}
+
+void EnumDeclaration::toJsonBuffer(OutBuffer *buf)
+{
+    //printf("EnumDeclaration::toJsonBuffer()\n");
+    if (isAnonymous())
+    {
+	if (members)
+	{
+	    for (int i = 0; i < members->dim; i++)
+	    {
+		Dsymbol *s = (Dsymbol *)members->data[i];
+		s->toJsonBuffer(buf);
+		buf->writestring(",\n");
+	    }
+	    JsonRemoveComma(buf);
+	}
+	return;
+    }
+
+    buf->writestring("{\n");
+
+    JsonProperty(buf, Pname, toChars());
+    JsonProperty(buf, Pkind, kind());
+    if (comment)
+	JsonProperty(buf, Pcomment, (const char *)comment);
+
+    if (loc.linnum)
+	JsonProperty(buf, Pline, loc.linnum);
+
+    if (memtype)
+	JsonProperty(buf, "base", memtype->toChars());
+
+    JsonString(buf, Pmembers);
+    buf->writestring(" : [\n");
+    size_t offset = buf->offset;
+    for (int i = 0; i < members->dim; i++)
+    {	Dsymbol *s = (Dsymbol *)members->data[i];
+	if (offset != buf->offset)
+	{   buf->writestring(",\n");
+	    offset = buf->offset;
+	}
+	s->toJsonBuffer(buf);
+    }
+    JsonRemoveComma(buf);
+    buf->writestring("]\n");
+
+    buf->writestring("}\n");
+}
+
+void EnumMember::toJsonBuffer(OutBuffer *buf)
+{
+    //printf("EnumMember::toJsonBuffer()\n");
+    buf->writestring("{\n");
+
+    JsonProperty(buf, Pname, toChars());
+    JsonProperty(buf, Pkind, kind());
+
+    if (comment)
+	JsonProperty(buf, Pcomment, (const char *)comment);
+
+    if (loc.linnum)
+	JsonProperty(buf, Pline, loc.linnum);
+
+    JsonRemoveComma(buf);
+    buf->writestring("}\n");
+}
+
+
diff -r b0dfdd5f6006 -r 9f7151d890ff dmd/json.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dmd/json.h	Sat Nov 07 14:21:56 2009 +0000
@@ -0,0 +1,24 @@
+
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2008 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+#ifndef DMD_JSON_H
+#define DMD_JSON_H
+
+#ifdef __DMC__
+#pragma once
+#endif /* __DMC__ */
+
+struct Array;
+
+void json_generate(Array *);
+
+#endif /* DMD_JSON_H */
+