From f0866c5197ee0c01fd1ded16e364cbe612c271be Mon Sep 17 00:00:00 2001
From: john haque <j.eh@mchsi.com>
Date: Sun, 21 Aug 2011 05:54:38 -0500
Subject: Add a test file, cleanup code and update doc.

---
 awkgram.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'awkgram.c')

diff --git a/awkgram.c b/awkgram.c
index ba9a9042..b9e30020 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -2330,7 +2330,7 @@ yyreduce:
 					_("regexp constant `/%s/' looks like a C comment, but is not"), re);
 		  }
 
-		  exp = make_str_node(re, len);
+		  exp = make_str_node(re, len, ALREADY_MALLOCED);
 		  n = make_regnode(Node_regex, exp);
 		  if (n == NULL) {
 			unref(exp);
@@ -5438,7 +5438,6 @@ yylex(void)
 	int mid;
 	static int did_newline = FALSE;
 	char *tokkey;
-	size_t toklen;
 	int inhex = FALSE;
 	int intlstr = FALSE;
 	AWKNUM d;
@@ -5873,16 +5872,14 @@ retry:
 			tokadd(c);
 		}
 		yylval = GET_INSTRUCTION(Op_token);
-		toklen = tok - tokstart;
 		if (want_source) {
-			yylval->lextok = estrdup(tokstart, toklen);
+			yylval->lextok = estrdup(tokstart, tok - tokstart);
 			return lasttok = FILENAME;
 		}
 		
 		yylval->opcode = Op_push_i;
-		if (esc_seen)
-			toklen = scan_escape(tokstart, toklen);
-		yylval->memory = make_string(tokstart, toklen);
+		yylval->memory = make_str_node(tokstart,
+					tok - tokstart, esc_seen ? SCAN : 0);
 		if (intlstr) {
 			yylval->memory->flags |= INTLSTR;
 			intlstr = FALSE;
-- 
cgit v1.2.3