case, caseproto: Implement save and load.

[pspp] / src / data / case.h

diff --git a/src/data/case.h b/src/data/case.h
index 0bfc62cdce96054fe461043ac2cb44bf39436c03..97fa2a69212a5b0be4da558264d8041eb570cb72 100644 (file)
--- a/src/data/case.h
+++ b/src/data/case.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,15 +21,13 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <libpspp/compiler.h>
-#include <data/caseproto.h>
 
-struct variable;
+#include "data/caseproto.h"
+#include "libpspp/compiler.h"
+#include "libpspp/pxd.h"
+#include "data/casenumber.h"
 
-/* A count of cases or the index of a case within a collection of
-   them. */
-#define CASENUMBER_MAX LONG_MAX
-typedef long int casenumber;
+struct variable;
 
 /* Reference-counted case implementation.
 
@@ -61,7 +59,7 @@ struct ccase *case_try_create (const struct caseproto *) MALLOC_LIKE;
 struct ccase *case_clone (const struct ccase *) MALLOC_LIKE;
 
 static inline struct ccase *case_unshare (struct ccase *) WARN_UNUSED_RESULT;
-static inline struct ccase *case_ref (const struct ccase *);
+struct ccase *case_ref (const struct ccase *) WARN_UNUSED_RESULT;
 static inline void case_unref (struct ccase *);
 static inline bool case_is_shared (const struct ccase *);
 
@@ -108,6 +106,9 @@ int case_compare_2dict (const struct ccase *, const struct ccase *,
 
 const union value *case_data_all (const struct ccase *);
 union value *case_data_all_rw (struct ccase *);
+
+struct pxd_object *case_save (const struct ccase *, struct pxd *);
+struct ccase *case_load (struct pxd_object *, const struct pxd *);
 \f
 struct ccase *case_unshare__ (struct ccase *);
 void case_unref__ (struct ccase *);
@@ -130,16 +131,6 @@ case_unshare (struct ccase *c)
   return c;
 }
 
-/* Increments case C's reference count and returns C.  Afterward,
-   case C is shared among its reference count holders. */
-static inline struct ccase *
-case_ref (const struct ccase *c_)
-{
-  struct ccase *c = (struct ccase *) c_;
-  c->ref_cnt++;
-  return c;
-}
-
 /* Decrements case C's reference count.  Frees C if its
    reference count drops to 0.