Fixed line numbering when multi-line macro parameters are used.

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

diff --git a/src/Headers/cpphash.h b/src/Headers/cpphash.h
index 3eba02c31c76b9029f702b4a03cc7551f364b250..f29180e4b4cf86b5546ef7b05276ed9bab688566 100644 (file)
--- a/src/Headers/cpphash.h
+++ b/src/Headers/cpphash.h
@@ -6,16 +6,16 @@
 
 /* different kinds of things that can appear in the value field
    of a hash node.  Actually, this may be useless now. */
-union hashval {
+typedef union u_hashvalue {
   int ival;
-  /*@owned@*/ char *cpval;
+  /*@null@*/ /*@owned@*/ char *cpval;
   /*@owned@*/ DEFINITION *defn;
-} ;
+} hashValue;
 
-struct hashnode {
+struct s_hashNode {
   /* double links for easy deletion */
-  /*@only@*/ /*@null@*/ struct hashnode *next;
-  /*@dependent@*/ /*@null@*/ struct hashnode *prev;
+  /*@only@*/ /*@null@*/ hashNode next;
+  /*@dependent@*/ /*@null@*/ hashNode prev;
 
   /*
   ** Also, a back pointer to this node's hash
@@ -23,13 +23,13 @@ struct hashnode {
   ** of the chain and gets deleted. 
   */
 
-  /*@null@*/ /*@dependent@*/ struct hashnode **bucket_hdr;
+  /*@null@*/ /*@dependent@*/ hashNode *bucket_hdr;
 
   enum node_type type;         /* type of special token */
-  int length;                  /* length of token, for quick comparison */
+  size_t length;               /* length of token, for quick comparison */
   cstring name;                        /* the actual name */
-  union hashval value;         /* pointer to expansion, or whatever */
-};
+  hashValue value;             /* pointer to expansion, or whatever */
+} ;
 
 /* Some definitions for the hash table.  The hash function MUST be
    computed as shown in hashf () below.  That is because the rescan
@@ -38,24 +38,25 @@ struct hashnode {
    the hashf () function.  Hashf () only exists for the sake of
    politeness, for use when speed isn't so important. */
 
-extern void cppReader_deleteMacro (/*@exposed@*/ HASHNODE *p_hp) 
-     /*@modifies internalState, *p_hp@*/;
+extern void cppReader_deleteMacro (/*@exposed@*/ hashNode p_hp) 
+     /*@modifies internalState, p_hp@*/;
 
-extern /*@exposed@*/ HASHNODE *cppReader_install (char *, int, 
+extern /*@exposed@*/ hashNode cpphash_install (char *, int, 
                                                  enum node_type, int, 
                                                  /*@only@*/ /*@null@*/ char *, int);
 
 extern void cppReader_hashCleanup (void);
-extern /*@null@*/ /*@exposed@*/ cppHashNode *cppReader_lookup (char *, int, int); 
-extern /*@null@*/ /*@exposed@*/ cppHashNode *cppReader_lookupExpand (char *, int, int); 
+extern /*@null@*/ /*@exposed@*/ hashNode cpphash_lookup (char *, int, int); 
+extern /*@null@*/ /*@exposed@*/ hashNode cpphash_lookupExpand (char *, int, int,
+                                                              bool p_forceExpand); 
 
+extern int cpphash_hashCode (const char *p_name, size_t p_len, int p_hashsize) /*@*/ ;
 extern void cppReader_saveHashtab (void);
 extern void cppReader_restoreHashtab (void);
-extern int hashf (const char *p_name, int p_len, int p_hashsize);
 
-extern /*@exposed@*/ HASHNODE *
-cppReader_installMacro (char *p_name, int p_len, 
-                       /*@only@*/ struct definition *p_defn, int p_hash);
+extern /*@exposed@*/ hashNode 
+cpphash_installMacro (char *p_name, size_t p_len, 
+                     /*@only@*/ struct definition *p_defn, int p_hash);
 
 # else
 # error "Multiple include"