summaryrefslogtreecommitdiff
path: root/scan.l
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@golden-gryphon.com>2006-02-25 11:25:45 -0800
committerManoj Srivastava <srivasta@golden-gryphon.com>2006-02-25 11:25:45 -0800
commit174cabe1a0b3cc6b2a061106f74e9b1c04252eec (patch)
tree3fe25aa13e39b2553ee696816df57a3384dc682b /scan.l
parentc2b22e08bd48278f2cf125f054c9f6286e345ff0 (diff)
Imported Upstream version 2.5.33
Diffstat (limited to 'scan.l')
-rw-r--r--scan.l3
1 files changed, 2 insertions, 1 deletions
diff --git a/scan.l b/scan.l
index fced0b8..fe9a0fc 100644
--- a/scan.l
+++ b/scan.l
@@ -35,6 +35,7 @@
#include "flexdef.h"
#include "parse.h"
extern bool tablesverify, tablesext;
+extern int trlcontxt; /* Set in parse.y for each rule. */
#define ACTION_ECHO add_action( yytext )
#define ACTION_IFDEF(def, should_define) \
@@ -613,7 +614,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */
if ( lex_compat || nmdefptr[0] == '^' ||
(len > 0 && nmdefptr[len - 1] == '$')
- || end_is_ws)
+ || (end_is_ws && trlcontxt))
{ /* don't use ()'s after all */
PUT_BACK_STRING((char *) nmdefptr, 0);