*** empty log message ***

diff --git a/lib/file.mts b/lib/file.mts
index 0e5003278966f1883679eacce10d1b4995bbe777..c9396664d1786a0966355358de25e0947f62e306 100644 (file)
--- 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 fd1d093fa690f5abfb49fbddb5a7241fe9da88bd..12b1e1b93ab3062a10ab0e5c8586416070b1208e 100644 (file)
--- 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 8dfc830940fb6d2b40a7df5891f5825a922c13dd..09893e8314a35f5bc4518239f267ffb98e7a8ed6 100644 (file)
--- 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 73e13fc02ff2ff0ec28919e4f5adc9cc5c4dac80..c4c3a887ac645344e32355e5979556d4d408aa9a 100644 (file)
--- 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 beb4d3b98451749850883bfac4b0ffb9e4f66106..350de8109b547eb0d8b3675316388c371094df4f 100644 (file)
--- 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 38f94265a9a177df14cc5d622c2f479c96d8530f..8dc83f29556e20180d38af011eac0dc3f37ea67f 100644 (file)
--- 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 9f1ead7628d1944203a43ef4be0d41a77a74849d..5501087b809d474c31b166d5944b87917083dd9d 100644 (file)
--- 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 69e6a992e9c9ffde8069c2f598489aef8510fc9e..850874f236afa32b7ac4d1a3c2ea9c251ef8b2d1 100644 (file)
--- a/src/mttok.c
+++ b/src/mttok.c
@@ -38,7 +38,7 @@ mttok_unparse (mttok tok)
   switch (tok->tok)
     {
     case EOF:               lit = "<EOF>"; 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 def4b4d6b8c73a9848c71021584e2e4aa2d3bad3..b863dc404aa7b83ac63426eccd3d10c52eda06c7 100644 (file)
--- 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 57b1f0032b05e21746c57031ff7227704d3ce64c..ef18d5d7f3648cc33eac83e2fcc49555e87db2ad 100644 (file)
--- 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 0e5003278966f1883679eacce10d1b4995bbe777..c9396664d1786a0966355358de25e0947f62e306 100644 (file)
--- 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 fd1d093fa690f5abfb49fbddb5a7241fe9da88bd..12b1e1b93ab3062a10ab0e5c8586416070b1208e 100644 (file)
--- 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 ac231207a556fad9ef31f6e8247e6a2c9b3e1282..2108c544c95815249322844d57230da470061fb6 100644 (file)
--- 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 7e4c2cec267f80ee0c2635a0f0a38d59a7eee0d0..820021d21515c5d1a7d4ae5a1b2e27cc8bd9d8c3 100644 (file)
--- 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 4303aa7e8b8da246d71acb10b69325ec27e309c3..f414952d087b649ec8803d12d9f9fe5afd5b970b 100644 (file)
--- 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"