Changeset 74Tweet

Timestamp:

Mar 4, 2008, 6:08:07 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Cleaned up stack.hpp and moved it to src/lisp/.

Location:

abuse/trunk

Files:

• osx/abuse_sdl.pbproj/project.pbxproj (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/lisp/Makefile.am (modified) (1 diff)
• src/lisp/stack.hpp (moved) (moved from abuse/trunk/src/stack.hpp) (1 diff)

abuse/trunk/osx/abuse_sdl.pbproj/project.pbxproj

@@ -2737 +2737 @@
                 F5C58193028E0D6D012A168D = {
                         isa = PBXFileReference;
-                        path = stack.hpp;
+                        path = lisp/stack.hpp;
                         refType = 4;
                 };

abuse/trunk/src/Makefile.am

@@ -59 +59 @@
     gamma.cpp gamma.hpp \
     language.cpp language.hpp \
-    bus_type.hpp stack.hpp id.hpp netface.hpp isllist.hpp sbar.hpp \
+    bus_type.hpp id.hpp netface.hpp isllist.hpp sbar.hpp \
     nfserver.hpp exitproc.hpp \
     $(NULL)

abuse/trunk/src/lisp/Makefile.am

@@ -6 +6 @@
     lisp_opt.cpp lisp_opt.hpp \
     lisp_gc.cpp lisp_gc.hpp \
+    stack.hpp \
     $(NULL)
 

abuse/trunk/src/lisp/stack.hpp

@@ -1 +1 @@
 /*
- *  Abuse - dark 2D side-scrolling platform game
- *  Copyright (c) 1995 Crack dot Com
+ *    Abuse - dark 2D side-scrolling platform game
+ *    Copyright (c) 1995 Crack dot Com
  *
- *  This software was released into the Public Domain. As with most public
- *  domain software, no warranty is made or implied by Crack dot Com or
- *  Jonathan Clark.
+ *    This software was released into the Public Domain. As with most public
+ *    domain software, no warranty is made or implied by Crack dot Com or
+ *    Jonathan Clark.
  */
 
 #ifndef __STACK_HPP_
 #define __STACK_HPP_
+
+#include <stdio.h>
+
 #ifndef NO_LIBS
-#include "jmalloc.hpp"
+#   include "jmalloc.hpp"
 #else
-#include "fakelib.hpp"
+#   include "fakelib.hpp"
 #endif
 
-#include <stdio.h>
-struct cons_cell;
+// A fixed-size stack class
+template<class T> class grow_stack
+{ 
+public:
+    T **sdata;
+    long son;
 
-template<class T> class grow_stack        // stack does not shrink
-{ 
-  public :
-  T **sdata;
-  long son;
-  long smax;
+private:
+    long smax;
 
-  grow_stack(int max_size) {
-    smax=max_size;
-    son=0;
-    sdata=(T **)jmalloc(sizeof(T *)*smax,"pointer stack");
-  }
-  void push(T *data) 
-  {
-    if (son>=smax) { lbreak("stack overflow (%ld)\n",smax); exit(1); }
-    sdata[son]=data;
-    son++;
-  }
-   
-  T *pop(long total) 
-  { if (total>son) { lbreak("stack underflow\n"); exit(1); }
-    son-=total;
-    return sdata[son];
-  }
-  void clean_up() 
-  { 
-    if (son!=0) fprintf(stderr,"Warning cleaning up stack and not empty\n");
-    jfree(sdata); 
-    sdata=NULL;  son=0; 
-  }
-} ;
+public:
+    grow_stack(int max_size)
+    {
+        smax = max_size;
+        son = 0;
+        sdata = (T **)jmalloc(sizeof(T *) * smax, "pointer stack");
+    }
+
+    void push(T *data) 
+    {
+        if(son >= smax)
+        {
+            lbreak("error: stack overflow (%ld >= %ld)\n", son, smax);
+            exit(1);
+        }
+        sdata[son] = data;
+        son++;
+    }
+     
+    T *pop(long total) 
+    {
+        if (total > son)
+        {
+            lbreak("error: stack underflow\n");
+            exit(1);
+        }
+        son -= total;
+        return sdata[son];
+    }
+
+    void clean_up() 
+    { 
+        if(son != 0)
+            fprintf(stderr, "warning: cleaning up stack and not empty\n");
+        jfree(sdata); 
+        sdata = NULL;
+        son = 0; 
+    }
+};
 
 #endif