From e26e911c1e825f5a84750350cc061559ffcfc2ee Mon Sep 17 00:00:00 2001 From: evans Date: Wed, 18 Jul 2001 01:08:14 +0000 Subject: [PATCH] *** empty log message *** --- lib/file.mts | 2 +- lib/filerw.mts | 2 +- src/Headers/herald.h | 2 +- src/Headers/local_constants.h | 4 ++-- src/cgrammar.y | 2 ++ src/llmain.c | 2 +- src/mtscanner.c | 2 +- src/mttok.c | 2 +- test/abst_t.lcs | 2 +- test/abstptr.lcs | 2 +- test/fileio/file.mts | 2 +- test/fileio/filerw.mts | 2 +- test/metastate/file.mts | 2 +- test/metastate/sockets.mts | 5 ++--- test/mut.lh | 2 +- 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/file.mts b/lib/file.mts index 0e50032..c939666 100644 --- a/lib/file.mts +++ b/lib/file.mts @@ -1,4 +1,4 @@ -state file +attribute file context reference FILE * oneof unopen, open annotations diff --git a/lib/filerw.mts b/lib/filerw.mts index fd1d093..12b1e1b 100644 --- a/lib/filerw.mts +++ b/lib/filerw.mts @@ -1,4 +1,4 @@ -state filerw +attribute filerw context reference FILE * oneof rw_none, rw_read, rw_write, rw_either annotations diff --git a/src/Headers/herald.h b/src/Headers/herald.h index 8dfc830..09893e8 100644 --- a/src/Headers/herald.h +++ b/src/Headers/herald.h @@ -4,4 +4,4 @@ /*@constant observer char *LCL_PARSE_VERSION;@*/ # define LCL_PARSE_VERSION "LCLint 3.0.0.7" /*@constant observer char *LCL_COMPILE;@*/ -# define LCL_COMPILE "Compiled using gcc -DSTDC_HEADERS=1 -g -Wall on Linux fowler 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by drl7x" +# define LCL_COMPILE "Compiled using gcc -Wall -g on Linux paisley 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by evans" diff --git a/src/Headers/local_constants.h b/src/Headers/local_constants.h index 73e13fc..c4c3a88 100644 --- a/src/Headers/local_constants.h +++ b/src/Headers/local_constants.h @@ -2,6 +2,6 @@ /*@constant observer char *SYSTEM_LIBDIR;@*/ # define SYSTEM_LIBDIR "/usr/include" /*@constant observer char *DEFAULT_LARCHPATH;@*/ -# define DEFAULT_LARCHPATH ".:/af9/drl7x/re3/LCLintDev/lib" +# define DEFAULT_LARCHPATH "/usr/local/lclint-2.5m/lib" /*@constant observer char *DEFAULT_LCLIMPORTDIR;@*/ -# define DEFAULT_LCLIMPORTDIR "/af9/drl7x/re3/LCLintDev/imports" +# define DEFAULT_LCLIMPORTDIR "/usr/local/lclint-2.5m/imports" diff --git a/src/cgrammar.y b/src/cgrammar.y index beb4d3b..350de81 100644 --- a/src/cgrammar.y +++ b/src/cgrammar.y @@ -1113,8 +1113,10 @@ stateQualifier | QNOTNULL { $$ = qual_createNotNull (); } | QEXPOSED { $$ = qual_createExposed (); } | QOBSERVER { $$ = qual_createObserver (); } + | QNULLTERMINATED { $$ = qual_createNullTerminated (); } | CANNOTATION { $$ = qual_createMetaState ($1); } + paramQualifier : QRETURNED { $$ = qual_createReturned (); } | QSEF { $$ = qual_createSef (); } diff --git a/src/llmain.c b/src/llmain.c index 38f9426..8dc83f2 100644 --- a/src/llmain.c +++ b/src/llmain.c @@ -2023,7 +2023,7 @@ describeVars (void) { cstring dirs = context_getString (FLG_SYSTEMDIRS); llmsg (message - ("systemdirs = %s (set by include envirnoment variable or -systemdirs)", + ("systemdirs = %s (set by -systemdirs)", dirs)); } diff --git a/src/mtscanner.c b/src/mtscanner.c index 9f1ead7..5501087 100644 --- a/src/mtscanner.c +++ b/src/mtscanner.c @@ -47,7 +47,7 @@ static void mtscanner_initMod (void) llassert (cstringTable_isUndefined (tokenTable)); tokenTable = cstringTable_create (MT_TOKENTABLESIZE); - cstringTable_insert (tokenTable, cstring_makeLiteral ("state"), MT_STATE); + cstringTable_insert (tokenTable, cstring_makeLiteral ("attribute"), MT_STATE); cstringTable_insert (tokenTable, cstring_makeLiteral ("global"), MT_GLOBAL); cstringTable_insert (tokenTable, cstring_makeLiteral ("context"), MT_CONTEXT); cstringTable_insert (tokenTable, cstring_makeLiteral ("oneof"), MT_ONEOF); diff --git a/src/mttok.c b/src/mttok.c index 69e6a99..850874f 100644 --- a/src/mttok.c +++ b/src/mttok.c @@ -38,7 +38,7 @@ mttok_unparse (mttok tok) switch (tok->tok) { case EOF: lit = ""; break; - case MT_STATE: lit = "state"; break; + case MT_STATE: lit = "attribute"; break; case MT_GLOBAL: lit = "global"; break; case MT_CONTEXT: lit = "context"; break; case MT_ONEOF: lit = "oneof"; break; diff --git a/test/abst_t.lcs b/test/abst_t.lcs index def4b4d..b863dc4 100644 --- a/test/abst_t.lcs +++ b/test/abst_t.lcs @@ -1,4 +1,4 @@ -%PASSED Output from LCLint 3.0.0.7 +%PASSED Output from LCLint 3.0b-alpha %LCLimports %LCLSortTable %LCLsort bool immutable nil nil diff --git a/test/abstptr.lcs b/test/abstptr.lcs index 57b1f00..ef18d5d 100644 --- a/test/abstptr.lcs +++ b/test/abstptr.lcs @@ -1,4 +1,4 @@ -%PASSED Output from LCLint 3.0.0.7 +%PASSED Output from LCLint 3.0b-alpha %LCLimports %LCLSortTable %LCLsort bool immutable nil nil diff --git a/test/fileio/file.mts b/test/fileio/file.mts index 0e50032..c939666 100644 --- a/test/fileio/file.mts +++ b/test/fileio/file.mts @@ -1,4 +1,4 @@ -state file +attribute file context reference FILE * oneof unopen, open annotations diff --git a/test/fileio/filerw.mts b/test/fileio/filerw.mts index fd1d093..12b1e1b 100644 --- a/test/fileio/filerw.mts +++ b/test/fileio/filerw.mts @@ -1,4 +1,4 @@ -state filerw +attribute filerw context reference FILE * oneof rw_none, rw_read, rw_write, rw_either annotations diff --git a/test/metastate/file.mts b/test/metastate/file.mts index ac23120..2108c54 100644 --- a/test/metastate/file.mts +++ b/test/metastate/file.mts @@ -1,4 +1,4 @@ -state file +attribute file context reference FILE * oneof unopen, open annotations diff --git a/test/metastate/sockets.mts b/test/metastate/sockets.mts index 7e4c2ce..820021d 100644 --- a/test/metastate/sockets.mts +++ b/test/metastate/sockets.mts @@ -1,5 +1,5 @@ /* -** A global state is not assosicated with a reference, but rather the +** A global attribute is not assosicated with a reference, but rather the ** global state of an execution. ** ** Annotations are used in pre and post conditions (requires/ensures @@ -7,8 +7,7 @@ ** */ - -global state sockets +global attribute sockets oneof uninitialized, initialized annotations sockets_initialized clause ==> initialized diff --git a/test/mut.lh b/test/mut.lh index 4303aa7..f414952 100644 --- a/test/mut.lh +++ b/test/mut.lh @@ -1,4 +1,4 @@ -/* Output from LCLint 3.0.0.7 */ +/* Output from LCLint 3.0b-alpha */ # include "bool.h" -- 2.45.2