Changed to used /\ and requires instead of bufferConstraint

[splint.git] / src / cscanner.l

diff --git a/src/cscanner.l b/src/cscanner.l
index ae40852a0c7fb01c4772f226c781f1df63ebc460..def018339c3c5d4e8123d03bfd56eb42545983ab 100644 (file)
--- a/src/cscanner.l
+++ b/src/cscanner.l
@@ -428,6 +428,10 @@ static void setTokLengthT (size_t len)
 "|"            { setTokLength (1); RETURN_TOK (TBAR); }
 "?"            { setTokLength (1); RETURN_TOK (TQUEST); }
 
+
+"/\\"          { setTokLength (1); RETURN_TOK (TCAND); }
+
+
 [ \t\v\f]      { incColumn (); }
 \n              { context_incLineno ();
                  if (continueLine)
@@ -565,8 +569,8 @@ struct skeyword s_parsetable[] = {
   { "pre", QPRECLAUSE } ,
   { "post", QPOSTCLAUSE } ,
   {"setBufferSize", QSETBUFFERSIZE},
-  {"bufferConstraint", QBUFFERCONSTRAINT},
-  {"ensuresConstraint", QENSURESCONSTRAINT},
+  {"requires", QBUFFERCONSTRAINT},
+  {"ensures", QENSURESCONSTRAINT},
   {"setStringLength", QSETSTRINGLENGTH},
   {"testinRange", QTESTINRANGE},
   { NULL, BADTOK }
@@ -613,8 +617,8 @@ struct skeyword s_keytable[] = {
   { "relnull", QRELNULL } ,
   { "nullterminated", QNULLTERMINATED }, 
   { "setBufferSize", QSETBUFFERSIZE },
-  { "bufferConstraint", QBUFFERCONSTRAINT },
-  { "ensuresConstraint", QENSURESCONSTRAINT },
+  { "requires", QBUFFERCONSTRAINT },
+  { "ensures", QENSURESCONSTRAINT },
   { "testInRange", QTESTINRANGE},
   { "MaxSet", QMAXSET},
   { "MaxRead", QMAXREAD},