Fixed problem with shadow parameters.

[splint.git] / src / cscannerHelp.c

diff --git a/src/cscannerHelp.c b/src/cscannerHelp.c
index 91a03c4813527ac4f41c308bc7c1d726a2236194..1aee6d64c1e59e1c7481e993f55e1884bc97885f 100644 (file)
--- a/src/cscannerHelp.c
+++ b/src/cscannerHelp.c
@@ -2682,7 +2682,12 @@ void cscannerHelp_advanceLine (void)
 
 int cscannerHelp_returnToken (int t)
 {
-  yylval.tok = lltok_create (t, fileloc_decColumn (g_currentloc, s_tokLength)); 
+  if (s_tokLength > fileloc_column (g_currentloc)) {
+    yylval.tok = lltok_create (t, fileloc_copy (g_currentloc));
+  } else {
+    yylval.tok = lltok_create (t, fileloc_decColumn (g_currentloc, s_tokLength)); 
+  }
+
   s_tokLength = 0; 
   s_lastWasString = FALSE; 
   return (t);