Permalink
Browse files

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

  • Loading branch information...
1 parent dda8205 commit 00efebdf6d6a19125e636a7f51343a44ec0722da @jleben jleben committed Feb 21, 2011
View
@@ -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:
@@ -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;
View
@@ -24,6 +24,7 @@
#include "PyrSymbol.h"
#include "SC_Export.h"
+#include "SCBase.h"
extern int charno, lineno, linepos;
extern int *linestarts;
View
@@ -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
View
@@ -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,
View
@@ -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;
@@ -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:
@@ -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"
@@ -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>
@@ -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>
@@ -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);
@@ -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();
@@ -41,6 +41,7 @@
#include "PyrKernel.h"
#include "PyrPrimitive.h"
#include "SC_LanguageClient.h"
+#include "SCBase.h"
#include "SC_FIFO.h"
@@ -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"
@@ -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);
@@ -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"
View
@@ -22,6 +22,7 @@
#include "GC.h"
#include "PyrKernel.h"
#include "PyrObjectProto.h"
+#include "PyrSymbol.h"
#include "InitAlloc.h"
#include <string.h>
#include <stdexcept>
@@ -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"
@@ -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
@@ -45,6 +45,7 @@
#include "GC.h"
#include "VMGlobals.h"
#include "SC_DirUtils.h"
+#include "SCBase.h"
void closeAllGUIScreens();
void initGUI();
@@ -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)

0 comments on commit 00efebd

Please sign in to comment.