Merged code tree with Dave Evans's version. Many changes to numberous to list....

[splint.git] / src / Headers / mapping.h

diff --git a/src/Headers/mapping.h b/src/Headers/mapping.h
index 1e78dc151f07b1c73e5f7a02cec01f6d518f300e..531501915b64b28b5aab2548297bf4eeb8882b30 100644 (file)
--- a/src/Headers/mapping.h
+++ b/src/Headers/mapping.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2000.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
 ** See ../LICENSE for license information.
 **
 */
@@ -10,23 +10,23 @@
 # ifndef MAPPING_H
 # define MAPPING_H
 
-typedef struct _mappair {
+typedef struct s_mappair {
   lsymbol domain, range;
-  /*@null@*/ struct _mappair *next;
+  /*@null@*/ struct s_mappair *next;
 } mappair;
 
 typedef /*@relnull@*/ /*@only@*/ mappair *o_mappair;
 
-typedef struct {
+typedef /*@abstract@*/ struct {
   unsigned int count;
   /*@relnull@*/ /*@only@*/ o_mappair *buckets;  
-} mapping;
+} *mapping;
 
 
-extern /*@only@*/ mapping *mapping_create (void);
-extern lsymbol mapping_find (mapping *p_t, lsymbol p_domain);
-extern void mapping_bind (mapping *p_t, lsymbol p_domain, lsymbol p_range);
-extern void mapping_free (/*@only@*/ mapping *p_m);
+extern /*@only@*/ mapping mapping_create (void);
+extern lsymbol mapping_find (mapping p_t, lsymbol p_domain);
+extern void mapping_bind (mapping p_t, lsymbol p_domain, lsymbol p_range);
+extern void mapping_free (/*@only@*/ mapping p_m);
 
 # else
 # error "Multiple include"