Changeset 89 for trunk

Timestamp:

03/09/07 10:00:09 (18 years ago)

Author:

tim

Message:

Added contract comments to void_stack header. Minor cleanups in void_stack implementation.

Location:

trunk

Files:

• include/void_stack.h (modified) (1 diff)
• lib/void_stack.c (modified) (3 diffs)

trunk/include/void_stack.h

@@ -34 +34 @@
 typedef struct _void_stack_iterator
 {
-  void_stack* stack;
+  const void_stack* stack;
   unsigned short cur;
 } void_stack_iterator;
 
 
-/* XXX: need to document these interfaces */
+/* void_stack_new(): 
+ *  Allocates a new void_stack.
+ *
+ * Arguments:
+ *  max_size -- the maxiumum number of elements 
+ *              which may be pushed onto the stack.
+ *
+ * Returns: 
+ *  a pointer to the newly allocated void_stack, or NULL if an error occurred.
+ */
 void_stack* void_stack_new(unsigned short max_size);
+
+
+/* void_stack_copy(): 
+ *  Makes a shallow copy of void_stack.
+ *
+ * Arguments:
+ *  v -- the stack to make a copy of.
+ *
+ * Returns:
+ *  a pointer to the duplicate void_stack, or NULL If an error occurred.
+ */
 void_stack* void_stack_copy(const void_stack* v);
+
+
+/* void_stack_copy_reverse(): 
+ *  Makes a shallow copy of void_stack in reverse order.
+ *
+ * Arguments:
+ *  v -- the stack to make a copy of.
+ *
+ * Returns:
+ *  a pointer to the duplicate void_stack (which will be in reverse order),
+ *  or NULL If an error occurred.
+ */
 void_stack* void_stack_copy_reverse(const void_stack* v);
+
+
+/* void_stack_free(): 
+ *  Frees the memory associated with a void_stack, but not the elements held
+ *  on the stack.
+ *
+ * Arguments:
+ *  stack -- the stack to be free()d.
+ */
 void void_stack_free(void_stack* stack);
+
+
+/* void_stack_free_deep(): 
+ *  Frees the memory associated with a void_stack and the elements referenced 
+ *  by the stack.  Do not use this function if the elements of the stack 
+ *  are also free()d elsewhere, or contain pointers to other memory which 
+ *  cannot be otherwise free()d.
+ *
+ * Arguments:
+ *  stack -- the stack to be free()d.
+ */
 void void_stack_free_deep(void_stack* stack);
-unsigned short void_stack_size(void_stack* stack);
+
+
+/* void_stack_size(): 
+ *  Query the current number of elements on a void_stack()
+ *
+ * Arguments:
+ *  stack -- the void_stack to query
+ *
+ * Returns:
+ *  the number of elements currently on the stack.
+ */
+unsigned short void_stack_size(const void_stack* stack);
+
+
+/* void_stack_pop():
+ *  Removes the top element on a void_stack and returns a reference to it.
+ *
+ * Arguments:
+ *  stack -- the void_stack to pop
+ *
+ * Returns:
+ *  a pointer to the popped stack element, or NULL if no elements exist on 
+ *  the stack.
+ */
 void* void_stack_pop(void_stack* stack);
+
+
+/* void_stack_push():
+ *  Puts a new element on the top of a void_stack.
+ *
+ * Arguments:
+ *  stack -- the void_stack being modified.
+ *
+ *  e     -- the element to be added
+ *
+ * Returns:
+ *  true if the element was successfully added, false otherwise.
+ */
 bool void_stack_push(void_stack* stack, void* e);
-const void* void_stack_cur(void_stack* stack);
-void_stack_iterator* void_stack_iterator_new(void_stack* stack);
+
+
+/* void_stack_cur():
+ *  Returns a pointer to the current element on the top of the stack.
+ *
+ * Arguments:
+ *  stack -- the void_stack being queried.
+ *
+ * Returns:
+ *  a pointer to the current element on the top of the stack, or NULL if no
+ *  elements exist in the stack.
+ */
+const void* void_stack_cur(const void_stack* stack);
+
+
+/* void_stack_iterator_new():
+ *  Creates a new iterator for the specified void_stack.
+ *
+ * Arguments:
+ *  stack -- the void_stack to be referenced by the new iterator
+ *
+ * Returns:
+ *  a new void_stack_iterator, or NULL if an error occurred.
+ */
+void_stack_iterator* void_stack_iterator_new(const void_stack* stack);
+
+
+/* void_stack_iterator_free():
+ *  Frees a void_stack_iterator.  Does not affect the void_stack referenced
+ *  by the iterator.
+ *
+ * Arguments:
+ *  iter -- the void_stack_iterator to be free()d.
+ */
 void void_stack_iterator_free(void_stack_iterator* iter);
+
+
+/* void_stack_iterator_next():
+ *  Returns a pointer to the the next element in the stack.  Iterates over 
+ *  elements starting in order from the oldest element (bottom of the stack).
+ *
+ * Arguments:
+ *  iter -- the void_stack_iterator used to lookup the next element.
+ *
+ * Returns:
+ *  a pointer to the next element.
+ */
 const void* void_stack_iterator_next(void_stack_iterator* iter);
 
+
+/* XXX: for completeness, might want to add a void_stack_iterator_first()
+ *      function, to return iterator to first element
+ */
 #endif

trunk/lib/void_stack.c

@@ -105 +105 @@
 
 
-unsigned short void_stack_size(void_stack* stack)
+unsigned short void_stack_size(const void_stack* stack)
 {
   return stack->top;
+}
+
+
+void* void_stack_pop(void_stack* stack)
+{
+  void* ret_val = NULL;
+
+  if(stack->top > 0)
+  {
+    ret_val = stack->elements[--(stack->top)];
+    stack->elements[stack->top] = NULL;
+  }
+
+  return ret_val;
 }
 
@@ -123 +137 @@
 
 
-void* void_stack_pop(void_stack* stack)
+const void* void_stack_cur(const void_stack* stack)
 {
   void* ret_val = NULL;
 
   if(stack->top > 0)
-  {
-    ret_val = stack->elements[--(stack->top)];
-    stack->elements[stack->top] = NULL;
-  }
-  else
-    ret_val = NULL;
+    ret_val = stack->elements[stack->top-1];
 
   return ret_val;
@@ -139 +148 @@
 
 
-const void* void_stack_cur(void_stack* stack)
-{
-  void* ret_val = NULL;
-
-  if(stack->top > 0)
-    ret_val = stack->elements[stack->top-1];
-  else
-    ret_val = NULL;
-
-  return ret_val;
-}
-
-
-void_stack_iterator* void_stack_iterator_new(void_stack* stack)
+void_stack_iterator* void_stack_iterator_new(const void_stack* stack)
 {
   void_stack_iterator* ret_val = NULL;
   
-  ret_val = (void_stack_iterator*)malloc(sizeof(void_stack_iterator));
-  if (ret_val != NULL)
+  if(stack != NULL)
   {
-    ret_val->stack = stack;
-    ret_val->cur = 0;
+    ret_val = (void_stack_iterator*)malloc(sizeof(void_stack_iterator));
+    if (ret_val != NULL)
+    {
+      ret_val->stack = stack;
+      ret_val->cur = 0;
+    }
   }