Merge pull request #1522 from WalterBright/b21

json refactoring
dlang · Jan 20, 2013 · 2102028 · 2102028
2 parents dc43e3b + 6d632c1
commit 2102028
Show file tree

Hide file tree

Showing 8 changed files with 151 additions and 144 deletions.
diff --git a/src/aggregate.h b/src/aggregate.h
@@ -100,7 +100,7 @@ struct AggregateDeclaration : ScopeDsymbol
     int isExport();
 
     void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
     void toDocBuffer(OutBuffer *buf, Scope *sc);
 
     // For access checking

diff --git a/src/attrib.h b/src/attrib.h
@@ -55,7 +55,7 @@ struct AttribDeclaration : Dsymbol
     void checkCtorConstInit();
     void addLocalClass(ClassDeclarations *);
     void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
     AttribDeclaration *isAttribDeclaration() { return this; }
 
     void toObjFile(int multiobj);                       // compile to .obj file
@@ -163,7 +163,7 @@ struct ConditionalDeclaration : AttribDeclaration
     Dsymbols *include(Scope *sc, ScopeDsymbol *s);
     void addComment(unsigned char *comment);
     void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
     void importAll(Scope *sc);
     void setScope(Scope *sc);
 };

diff --git a/src/declaration.h b/src/declaration.h
@@ -140,7 +140,7 @@ struct Declaration : Dsymbol
     Dsymbol *search(Loc loc, Identifier *ident, int flags);
 
     void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
     void toDocBuffer(OutBuffer *buf, Scope *sc);
 
     char *mangle();
@@ -343,7 +343,7 @@ struct ClassInfoDeclaration : VarDeclaration
     void semantic(Scope *sc);
 
     void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
 
     Symbol *toSymbol();
 };
@@ -357,7 +357,7 @@ struct ModuleInfoDeclaration : VarDeclaration
     void semantic(Scope *sc);
 
     void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
 
     Symbol *toSymbol();
 };
@@ -371,7 +371,7 @@ struct TypeInfoDeclaration : VarDeclaration
     void semantic(Scope *sc);
 
     void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
 
     Symbol *toSymbol();
     void toObjFile(int multiobj);                       // compile to .obj file

diff --git a/src/dsymbol.h b/src/dsymbol.h
@@ -72,6 +72,7 @@ struct DeleteDeclaration;
 struct HdrGenState;
 struct OverloadSet;
 struct AA;
+struct JsonOut;
 #ifdef IN_GCC
 union tree_node;
 typedef union tree_node TYPE;
@@ -169,7 +170,7 @@ struct Dsymbol : Object
     virtual void toHBuffer(OutBuffer *buf, HdrGenState *hgs);
     virtual void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
     virtual void toDocBuffer(OutBuffer *buf, Scope *sc);
-    virtual void toJsonBuffer(OutBuffer *buf);
+    virtual void toJson(JsonOut *json);
     virtual unsigned size(Loc loc);
     virtual int isforwardRef();
     virtual void defineRef(Dsymbol *s);

diff --git a/src/enum.h b/src/enum.h
@@ -61,7 +61,7 @@ struct EnumDeclaration : ScopeDsymbol
     int isDeprecated();                 // is Dsymbol deprecated?
 
     void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
     void toDocBuffer(OutBuffer *buf, Scope *sc);
 
     EnumDeclaration *isEnumDeclaration() { return this; }
@@ -86,7 +86,7 @@ struct EnumMember : Dsymbol
     const char *kind();
 
     void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
     void toDocBuffer(OutBuffer *buf, Scope *sc);
 
     EnumMember *isEnumMember() { return this; }