Fixed problem with russian characters.

[splint.git] / src / lltok.c

diff --git a/src/lltok.c b/src/lltok.c
index 4906dc5bab323b707bc6341df1e22493eb16920b..3f2c77e569a9a260855fec3e37031a70ff891337 100644 (file)
--- a/src/lltok.c
+++ b/src/lltok.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -43,35 +43,40 @@ lltok_isMult (lltok tok)
   return (tok->tok == TMULT);
 }
 
-bool lltok_isInc_Op (lltok tok)
+bool lltok_isIncOp (lltok tok)
 {
   return (tok->tok == INC_OP);
 }
 
-bool lltok_isDec_Op  (lltok tok)
+bool lltok_isDecOp  (lltok tok)
 {
   return (tok->tok == DEC_OP);
 }
 
 
 /* DRL added this function 10/23/2000 for boolean stuff */
-bool lltok_isEq_Op (lltok tok)
+bool lltok_isEqOp (lltok tok)
 {
   return (tok->tok == EQ_OP);
 }
 
+bool lltok_isNotEqOp (lltok tok)
+{
+  return (tok->tok == NE_OP);
+}
+
 /* DRL added this function 10/25/2000 for boolean stuff */
-bool lltok_isAnd_Op (lltok tok)
+bool lltok_isAndOp (lltok tok)
 {
   return (tok->tok == AND_OP);
 }
 
-bool lltok_isOr_Op (lltok tok)
+bool lltok_isOrOp (lltok tok)
 {
   return (tok->tok == OR_OP);
 }
 
-bool lltok_isNot_Op (lltok tok)
+bool lltok_isNotOp (lltok tok)
 {
   return (tok->tok ==  TEXCL);
 }
@@ -199,12 +204,12 @@ lltok_unparse (lltok tok)
     case TRBRACE:    lit = "}"; break;
     case TCOMMA:     lit = ","; break;
     case TCOLON:     lit = ":"; break;
-    case TASSIGN:        lit = "="; break;
+    case TASSIGN:    lit = "="; break;
     case TLPAREN:    lit = "("; break;
     case TRPAREN:    lit = ")"; break;
     case TLSQBR:     lit = "["; break;
     case TRSQBR:     lit = "]"; break;
-    case TDOT:       lit = "->"; break;
+    case TDOT:       lit = "."; break; /* evans 2003-05-31: Fix reported by psanzani. */
     case TAMPERSAND: lit = "&"; break;
     case TEXCL:      lit = "!"; break;
     case TTILDE:     lit = "~"; break;
@@ -271,3 +276,16 @@ void lltok_free (lltok t)
   sfree (t);
 }
 
+void lltok_free2 (lltok t1, lltok t2) 
+{
+  lltok_free (t1);
+  lltok_free (t2);
+}
+
+void lltok_free3 (lltok t1, lltok t2, lltok t3) 
+{
+  lltok_free (t1);
+  lltok_free (t2);
+  lltok_free (t3);
+}
+