Merged this branch with the one in the splint.sf.net repository.

[splint.git] / src / lclinit.c

diff --git a/src/lclinit.c b/src/lclinit.c
index f6f697a4fc9073d6eff0cca534a69e593ebb8296..58a1260e28220c11e2a50cad13fbd6cc570836bb 100644 (file)
--- a/src/lclinit.c
+++ b/src/lclinit.c
@@ -153,7 +153,7 @@ hasFirstChar (ltoken tok) /*@*/
 }
 
 void
-lclinit_process (void)
+LCLProcessInitFile (void)
 {
   InitLines ();
 
@@ -171,6 +171,8 @@ InitLines (void)
   setCodePoint ();
   InitReduce (INITLINES1);
 
+  
+
   if (ltoken_getCode (nextToken) != LEOFTOKEN)
     {
       InitLine ();
@@ -187,14 +189,15 @@ InitLines (void)
 static void
 InitLine (void)
 {
+  
   if (ltoken_getCode (nextToken) == LLT_EOL)
     {
       /* Nothing on line. */
-      InitReduce (INITLINE1);
+            InitReduce (INITLINE1);
     }
   else
     {
-      Classification ();
+            Classification ();
       InitReduce (INITLINE2);
     }
 
@@ -202,14 +205,15 @@ InitLine (void)
     {
       LocalUserError (nextToken, "Unexpected tokens on line");
     }
-  
+
   nextToken = LCLScanNextToken (); /* Discard EOL      */
-}
+  }
 
 static void
 Classification (void)
 {
   lsymbol ntext = ltoken_getRawText (nextToken);  
+
     
   if (ntext == ltoken_getText (endCommentCharToken)
       || ntext == ltoken_getText (idCharToken)
@@ -247,7 +251,7 @@ Classification (void)
     {
       llbug (message ("Expected character, token, or synonym classification: %s",
                      ltoken_getRawString (nextToken)));
-      /* pop off all tokens on this line */
+     /* pop off all tokens on this line */
     }
 }
 
@@ -255,7 +259,9 @@ static void
 CharClass (void)
 {
   ltoken charClassToken;
+
   charClassToken = nextToken;
+
   nextToken = LCLScanNextToken ();             /* Discard char class keyword. */
 
   if (ltoken_getRawText (charClassToken) == ltoken_getText (endCommentCharToken))
@@ -445,7 +451,7 @@ static void WhiteChar (void) /*@modifies nextToken@*/
 }
 
 static void
-TokenClass (void) /*@modifies nextToken@*/
+  TokenClass (void) /*@modifies nextToken@*/
 {
   ltoken tokenClassToken;
   lsymbol ttext = ltoken_getRawText (nextToken);
@@ -1465,7 +1471,7 @@ static void
  */
 
 void
-lclinit_initMod (void)
+LCLProcessInitFileInit (void)
 {
   int i;
 
@@ -1530,15 +1536,14 @@ lclinit_initMod (void)
 }
 
 void
-lclinit_reset (void)
+LCLProcessInitFileReset (void)
 {
   nextToken = LCLScanNextToken ();       
 }
 
 void
-lclinit_cleanup (void)
+LCLProcessInitFileCleanup (void)
 {
-  ;
 }