Only include necessary headers in PyrSlot.h and PyrSymbol.h

supercollider · Feb 23, 2011 · 00efebd · 00efebd
1 parent dda8205
commit 00efebd
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 4 deletions.
diff --git a/include/lang/FIFOT.h b/include/lang/FIFOT.h
@@ -26,6 +26,8 @@ A Fifo for sending/receiving some type of object.
 #ifndef _FIFOT_
 #define _FIFOT_
 
+#include "SCBase.h"
+
 template <class T, int N> class FIFOT
 {
 public:

diff --git a/include/lang/PyrArchiverT.h b/include/lang/PyrArchiverT.h
@@ -32,9 +32,11 @@ An object archiving system for SuperCollider.
 
 #include "PyrKernel.h"
 #include "PyrPrimitive.h"
+#include "PyrSymbol.h"
 #include "VMGlobals.h"
 #include "GC.h"
 #include "ReadWriteMacros.h"
+#include "SCBase.h"
 
 const int32 kArchHdrSize = 12;
 const int32 kObjectArrayInitialCapacity = 32;

diff --git a/include/lang/PyrLexer.h b/include/lang/PyrLexer.h
@@ -24,6 +24,7 @@
 
 #include "PyrSymbol.h"
 #include "SC_Export.h"
+#include "SCBase.h"
 
 extern int charno, lineno, linepos;
 extern int *linestarts;

diff --git a/include/lang/PyrSlot32.h b/include/lang/PyrSlot32.h
@@ -29,10 +29,12 @@ A PyrSlot is an 8-byte value which is either a double precision float or a
 #define _PYRSLOT32_H_
 
 #include "SC_Endian.h"
-#include "PyrSymbol.h"
+#include "PyrErrors.h"
 
 #include <cassert>
 
+struct PyrSymbol;
+
 /*
 	Pyrite slots are the size of an 8 byte double. If the upper bits
 	indicate that the double is a 'Not-A-Number' then the upper 32

diff --git a/include/lang/PyrSlot64.h b/include/lang/PyrSlot64.h
@@ -23,10 +23,14 @@
 #define _PYRSLOTGENERIC_H_
 
 #include "SC_Endian.h"
-#include "PyrSymbol.h"
+#include "SC_Types.h"
+#include "PyrErrors.h"
 
+#include <cstddef>
 #include <cassert>
 
+struct PyrSymbol;
+
 enum {
 	tagNotInitialized, // uninitialized slots have a tag of 0
 	tagObj,

diff --git a/include/lang/PyrSymbol.h b/include/lang/PyrSymbol.h
@@ -26,7 +26,7 @@ A PyrSymbol is a unique string that resides in a global hash table.
 #ifndef _PYRSYMBOL_H_
 #define _PYRSYMBOL_H_
 
-#include "SCBase.h"
+#include "SC_Types.h"
 
 struct PyrSymbol {
 	char *name;

diff --git a/include/lang/PyrSymbolTable.h b/include/lang/PyrSymbolTable.h
@@ -23,10 +23,14 @@
 
 #include "PyrSymbol.h"
 #include "AdvancingAllocPool.h"
+#include "SC_Export.h"
 
 #define STRINGCHUNK 32000
 #define SYMBOLCHUNK 32000
 
+SC_DLLEXPORT_C PyrSymbol* getsym(const char *name);
+SC_DLLEXPORT_C PyrSymbol* findsym(const char *name);
+
 class SymbolSpace
 {
 public:

diff --git a/lang/LangPrimSource/OSCData.cpp b/lang/LangPrimSource/OSCData.cpp
@@ -23,6 +23,7 @@
 #include "PyrKernel.h"
 #include "PyrInterpreter.h"
 #include "PyrSched.h"
+#include "PyrSymbol.h"
 #include "GC.h"
 //#include "PyrOMS.h"
 //#include "MidiQ.h"

diff --git a/lang/LangPrimSource/PyrFilePrim.cpp b/lang/LangPrimSource/PyrFilePrim.cpp
@@ -27,9 +27,11 @@ Primitives for File i/o.
 #include "GC.h"
 #include "PyrKernel.h"
 #include "PyrPrimitive.h"
+#include "PyrSymbol.h"
 #include "PyrFilePrim.h"
 #include "PyrFileUtils.h"
 #include "ReadWriteMacros.h"
+#include "SCBase.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>

diff --git a/lang/LangPrimSource/PyrListPrim.cpp b/lang/LangPrimSource/PyrListPrim.cpp
@@ -22,13 +22,15 @@
 #include "PyrKernelProto.h"
 #include "PyrPrimitive.h"
 #include "PyrPrimitiveProto.h"
+#include "PyrSymbol.h"
 #include "PyrListPrim.h"
 #include "SC_InlineUnaryOp.h"
 #include "SC_InlineBinaryOp.h"
 #include "PyrSignal.h"
 #include "PyrMessage.h"
 #include "PyrSched.h"
 #include "SC_RGen.h"
+#include "SCBase.h"
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/lang/LangPrimSource/PyrMathPrim.cpp b/lang/LangPrimSource/PyrMathPrim.cpp
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <math.h>
 #include "SC_Endian.h"
+#include "SCBase.h"
 
 const int INT_MAX_BY_PyrSlot = INT_MAX / sizeof(PyrSlot);
 

diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
@@ -23,6 +23,7 @@
 #include "PyrSched.h"
 #include "GC.h"
 #include "PyrPrimitive.h"
+#include "PyrSymbol.h"
 #ifdef SC_DARWIN
 # include <CoreAudio/HostTime.h>
 #endif
@@ -36,7 +37,7 @@
 #endif
 
 #include "SC_Win32Utils.h"
-
+#include "SCBase.h"
 
 static const double dInfinity = std::numeric_limits<double>::infinity();
 

diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
@@ -41,6 +41,7 @@
 #include "PyrKernel.h"
 #include "PyrPrimitive.h"
 #include "SC_LanguageClient.h"
+#include "SCBase.h"
 
 #include "SC_FIFO.h"
 

diff --git a/lang/LangPrimSource/PyrSignalPrim.cpp b/lang/LangPrimSource/PyrSignalPrim.cpp
@@ -18,13 +18,15 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include "PyrSymbol.h"
 #include "PyrKernel.h"
 #include "PyrObject.h"
 #include "PyrPrimitive.h"
 #include "PyrSignal.h"
 #include "PyrSignalPrim.h"
 #include "PyrMessage.h"
 #include "SC_Constants.h"
+#include "SCBase.h"
 #include "clz.h"
 extern "C" {
 #include "fftlib.h"

diff --git a/lang/LangPrimSource/PyrSymbolPrim.cpp b/lang/LangPrimSource/PyrSymbolPrim.cpp
@@ -26,8 +26,10 @@ Primitives for Symbol.
 #include <string.h>
 #include <stdlib.h>
 #include "PyrPrimitive.h"
+#include "PyrSymbol.h"
 #include "VMGlobals.h"
 #include "PyrKernel.h"
+#include "SCBase.h"
 
 /*
 int prSymbolString(struct VMGlobals *g, int numArgsPushed);

diff --git a/lang/LangPrimSource/PyrUnixPrim.cpp b/lang/LangPrimSource/PyrUnixPrim.cpp
@@ -37,6 +37,7 @@ Primitives for Unix.
 #include "SC_RGen.h"
 #include "SC_DirUtils.h"
 #include "sc_popen.h"
+#include "SCBase.h"
 
 #ifdef SC_WIN32
 #include "SC_Win32Utils.h"

diff --git a/lang/LangSource/GC.cpp b/lang/LangSource/GC.cpp
@@ -22,6 +22,7 @@
 #include "GC.h"
 #include "PyrKernel.h"
 #include "PyrObjectProto.h"
+#include "PyrSymbol.h"
 #include "InitAlloc.h"
 #include <string.h>
 #include <stdexcept>

diff --git a/lang/LangSource/PyrMathOps.cpp b/lang/LangSource/PyrMathOps.cpp
@@ -36,6 +36,7 @@ double log2(double x);
 #include "PyrParseNode.h"
 #include "PyrSignal.h"
 #include "PyrSched.h"
+#include "PyrSymbol.h"
 #include "SC_InlineUnaryOp.h"
 #include "SC_InlineBinaryOp.h"
 #include "MiscInlineMath.h"

diff --git a/lang/LangSource/PyrMessage.cpp b/lang/LangSource/PyrMessage.cpp
@@ -23,12 +23,14 @@
 #include "PyrInterpreter.h"
 #include "PyrPrimitive.h"
 #include "PyrListPrim.h"
+#include "PyrSymbol.h"
 #include "GC.h"
 #include "bullet.h"
 #include <stdlib.h>
 #include <assert.h>
 #include "PredefinedSymbols.h"
 #include "PyrObjectProto.h"
+#include "SCBase.h"
 
 #define DEBUGMETHODS 0
 #define METHODMETER 0

diff --git a/lang/LangSource/SC_LanguageClient.cpp b/lang/LangSource/SC_LanguageClient.cpp
@@ -45,6 +45,7 @@
 #include "GC.h"
 #include "VMGlobals.h"
 #include "SC_DirUtils.h"
+#include "SCBase.h"
 
 void closeAllGUIScreens();
 void initGUI();

diff --git a/lang/LangSource/dumpByteCodes.cpp b/lang/LangSource/dumpByteCodes.cpp
@@ -20,6 +20,8 @@
 
 #include "PyrKernel.h"
 #include "PyrParseNode.h"
+#include "PyrSymbol.h"
+#include "SCBase.h"
 
 void numBlockTemps(PyrBlock *block, long level, long *numArgNames, long *numVarNames);
 void numBlockTemps(PyrBlock *block, long level, long *numArgNames, long *numVarNames)