/*
** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 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
** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
** MA 02111-1307, USA.
**
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
** For more information: http://www.splint.org
*/
/*
You are forbidden to forbid anyone else to use, share and improve
what you give them. Help stamp out software-hoarding! */
-# include "lclintMacros.nf"
-# include "llbasic.h"
+# include "splintMacros.nf"
+# include "basic.h"
# include "cpplib.h"
# include "cpphash.h"
# include "cpperror.h"
# include "llmain.h"
+# include "osd.h"
# include <stdio.h>
{
struct cppOptions *opts = (struct cppOptions *) dmalloc (sizeof (*opts));
- cppReader_init (&g_cppState);
+ cpplib_init (&g_cppState);
llassert (g_cppState.opts == NULL);
g_cppState.opts = opts;
/*@-compdef@*/ /* g_cppState is not yet innitialized */
} /*@=compdef@*/
+void cppReader_destroyMod ()
+ /*@globals killed g_cppState@*/
+{
+ cppCleanup (&g_cppState);
+}
+
void cppReader_initialize ()
{
- cppReader_initializeReader (&g_cppState);
+ cpplib_initializeReader (&g_cppState);
}
int cppProcess (/*@dependent@*/ cstring infile,
opts->in_fname = infile;
opts->out_fname = outfile;
- if (cppFatalErrors (&g_cppState))
+ if (cpplib_fatalErrors (&g_cppState))
{
llexit (LLFAILURE);
}
llexit (LLFAILURE);
}
- ofile = fileTable_openFile (context_fileTable (), outfile, "w");
+ ofile = fileTable_createFile (context_fileTable (), outfile);
if (ofile == NULL)
{
fileTable_noDelete (context_fileTable (), outfile);
+ osd_setTempError ();
llfatalerror (message ("Cannot create temporary file for "
"pre-processor output. Trying to "
"open: %s. Use -tmpdir to change "
if (!opts->no_output)
{
+ DPRINTF (("Writing: %s", cstring_copyLength (g_cppState.token_buffer, cpplib_getWritten (&g_cppState))));
+
(void) fwrite (g_cppState.token_buffer, (size_t) 1,
- cppReader_getWritten (&g_cppState), ofile);
+ cpplib_getWritten (&g_cppState), ofile);
}
cppReader_setWritten (&g_cppState, 0);
- kind = cppGetToken (&g_cppState);
+ kind = cpplib_getToken (&g_cppState);
if (kind == CPP_EOF)
break;
** Add the -I- code. This code provided by Robin Watts <Robin.Watts@wss.co.uk>
*/
+ DPRINTF (("Adding include: %s", dir));
+
if (cstring_equalLit (dir, "-I-"))
{
struct cppOptions *opts = CPPOPTIONS (&g_cppState);
}
else
{
- /* -I option (Add directory to include path) */
struct file_name_list *dirtmp = (struct file_name_list *) dmalloc (sizeof (*dirtmp));
DPRINTF (("Add include: %s", dir));
-
+
dirtmp->next = 0; /* New one goes on the end */
dirtmp->control_macro = 0;
dirtmp->c_system_include_path = FALSE;
void cppDoUndefine (cstring str)
{
- int sym_length;
+ size_t sym_length;
hashNode hp;
char *buf = cstring_toCharsSafe (str);
sym_length = cppReader_checkMacroName (&g_cppState, buf,
- cstring_makeLiteralTemp ("macro"));
+ cstring_makeLiteralTemp ("macro"));
- while ((hp = cppReader_lookup (buf, sym_length, -1)) != NULL)
+ while ((hp = cpphash_lookup (buf, size_toInt (sym_length), -1)) != NULL)
{
/*@-exposetrans@*/ /*@-dependenttrans@*/
cppReader_deleteMacro (hp);