X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/2934b455c4074408a0f819009c071456f021ba21..35b9a1d988c06908076e3a6eeae55b1147879607:/src/exprData.c

diff --git a/src/exprData.c b/src/exprData.c
index bbeea0f..b16be35 100644
--- a/src/exprData.c
+++ b/src/exprData.c
@@ -3,13 +3,12 @@
 */
 
 # include <ctype.h> /* for isdigit */
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 # include "cgrammar.h"
 # include "cgrammar_tokens.h"
 
 # include "exprChecks.h"
-# include "aliasChecks.h"
 # include "exprNodeSList.h"
 
 void exprData_freeShallow (/*@only@*/ exprData data, exprKind kind)
@@ -296,7 +295,7 @@ void exprData_free (/*@only@*/ exprData data, exprKind kind)
 
 /*@exposed@*/ exprNode exprData_getOpB (exprData data) /*@*/
 {
-  llassert (data != exprData_undefined);
+  llassertretval (data != exprData_undefined, exprNode_undefined);
   return (data->op->b);
 }
 
@@ -308,20 +307,19 @@ void exprData_free (/*@only@*/ exprData data, exprKind kind)
 
 /*@exposed@*/ exprNode exprData_getPairA (exprData data) /*@*/
 {
-  llassert (data != exprData_undefined);
+  llassertretval (data != exprData_undefined, exprNode_undefined);
   return (data->pair->a);
 }
 
 /*@exposed@*/ exprNode exprData_getPairB (exprData data) /*@*/
 {
-  llassert (data != exprData_undefined);
+  llassertretval (data != exprData_undefined, exprNode_undefined);
   return (data->pair->b);
 }
 
-
 /*@exposed@*/ uentry exprData_getIterSname (exprData data) /*@*/
 {
-  llassert (data != exprData_undefined);
+  llassertretval (data != exprData_undefined, uentry_undefined);
   return (data->iter->sname);
 }
 
@@ -333,19 +331,19 @@ void exprData_free (/*@only@*/ exprData data, exprKind kind)
 
 /*@exposed@*/ exprNode exprData_getIterBody (exprData data) /*@*/
 {
-  llassert (data != exprData_undefined);
+  llassertretval (data != exprData_undefined, exprNode_undefined);
   return (data->iter->body);
 }
 
 /*@exposed@*/ uentry exprData_getIterEname (exprData data) /*@*/
 {
-  llassert (data != exprData_undefined);
+  llassertretval (data != exprData_undefined, uentry_undefined);
   return (data->iter->ename);
 }
 
 /*@exposed@*/ exprNode exprData_getFcn (exprData data) /*@*/
 {
-  llassert (data != exprData_undefined);
+  llassertretval (data != exprData_undefined, exprNode_undefined);
   return (data->call->fcn);
 }
 
@@ -461,7 +459,7 @@ void exprData_free (/*@only@*/ exprData data, exprKind kind)
 /*@observer@*/ lltok exprData_getTok (exprData data) /*@*/
 {
   llassert (data != exprData_undefined);
-  return (*data->tok);
+  return data->tok;
 }
 
 /*@exposed@*/ qtype exprData_getType (exprData data) /*@*/ 
@@ -482,7 +480,7 @@ void exprData_free (/*@only@*/ exprData data, exprKind kind)
   return (data->offset->field);
 }
 
-/*@exposed@*/ exprNode exprData_getSingle (exprData data)
+/*@exposed@*/ exprNode exprData_getSingle (exprData data) /*@*/
 {
   exprNode ret;
   llassert (data != exprData_undefined);
@@ -527,9 +525,8 @@ void exprData_free (/*@only@*/ exprData data, exprKind kind)
 /*@only@*/ exprData exprData_makeTok (/*@only@*/ lltok op)
 {
   exprData ed = (exprData) dmalloc (sizeof (*ed));
-  
-  ed->tok = (lltok *) dmalloc (sizeof (*(ed->tok)));
-  *(ed->tok) = op;  
+  ed->tok = op;  
+
   return ed;
 }