From 14648534b37f9ace7a6997537f9f22b29f5d3e3a Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sat, 15 Dec 2012 15:30:13 +0000
Subject: [PATCH] changed a single-quoted string to support no escaping. added
 a not-defined/is-nil operator

---
 qse/lib/awk/parse.c | 44 +++++++++++++++++++++++++++++++++++++++-----
 qse/lib/awk/run.c   |  8 +++++++-
 qse/lib/awk/run.h   |  3 ++-
 qse/lib/awk/tree.c  |  3 ++-
 4 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/qse/lib/awk/parse.c b/qse/lib/awk/parse.c
index e76b0c78..f8dcccc0 100644
--- a/qse/lib/awk/parse.c
+++ b/qse/lib/awk/parse.c
@@ -69,6 +69,7 @@ enum tok_t
 	TOK_GT,
 	TOK_MA,   /* match */
 	TOK_NM,   /* not match */
+	TOK_ND,   /* not defined, is-nil */
 	TOK_LNOT, /* logical negation ! */
 	TOK_PLUS,
 	TOK_PLUSPLUS,
@@ -3725,10 +3726,11 @@ static qse_awk_nde_t* parse_concat (qse_awk_t* awk, const qse_awk_loc_t* xloc)
 		}
 		else if (awk->opt.trait & QSE_AWK_BLANKCONCAT)
 		{
-		    if (MATCH(awk,TOK_LPAREN) || MATCH(awk,TOK_DOLLAR) ||
+			if (MATCH(awk,TOK_LPAREN) || MATCH(awk,TOK_DOLLAR) ||
 			   /* unary operators */
 			   MATCH(awk,TOK_PLUS) || MATCH(awk,TOK_MINUS) ||
-			   MATCH(awk,TOK_LNOT) || MATCH(awk,TOK_BNOT) ||
+			   MATCH(awk,TOK_LNOT) || MATCH(awk,TOK_BNOT) || 
+			   MATCH(awk,TOK_ND) ||
 			   /* increment operators */
 			   MATCH(awk,TOK_PLUSPLUS) || MATCH(awk,TOK_MINUSMINUS) ||
 			   ((awk->opt.trait & QSE_AWK_TOLERANT) && 
@@ -3798,7 +3800,8 @@ static qse_awk_nde_t* parse_unary (qse_awk_t* awk, const qse_awk_loc_t* xloc)
 	opcode = (MATCH(awk,TOK_PLUS))?  QSE_AWK_UNROP_PLUS:
 	         (MATCH(awk,TOK_MINUS))? QSE_AWK_UNROP_MINUS:
 	         (MATCH(awk,TOK_LNOT))?  QSE_AWK_UNROP_LNOT:
-	         (MATCH(awk,TOK_BNOT))?  QSE_AWK_UNROP_BNOT: -1;
+	         (MATCH(awk,TOK_BNOT))?  QSE_AWK_UNROP_BNOT:
+	         (MATCH(awk,TOK_ND))?    QSE_AWK_UNROP_ND: -1;
 
 	/*if (opcode <= -1) return parse_increment (awk);*/
 	if (opcode <= -1) return parse_exponent (awk, xloc);
@@ -3945,7 +3948,8 @@ static qse_awk_nde_t* parse_unary_exp (qse_awk_t* awk, const qse_awk_loc_t* xloc
 	opcode = (MATCH(awk,TOK_PLUS))?  QSE_AWK_UNROP_PLUS:
 	         (MATCH(awk,TOK_MINUS))? QSE_AWK_UNROP_MINUS:
 	         (MATCH(awk,TOK_LNOT))?  QSE_AWK_UNROP_LNOT:
-	         (MATCH(awk,TOK_BNOT))?  QSE_AWK_UNROP_BNOT: -1;
+	         (MATCH(awk,TOK_BNOT))?  QSE_AWK_UNROP_BNOT: 
+	         (MATCH(awk,TOK_ND))?    QSE_AWK_UNROP_ND: -1;
 
 	if (opcode <= -1) return parse_increment (awk, xloc);
 
@@ -5756,6 +5760,7 @@ static int get_symbols (qse_awk_t* awk, qse_cint_t c, qse_awk_tok_t* tok)
 		{ QSE_T("!=="), 3, TOK_TNE,          0 },
 		{ QSE_T("!="),  2, TOK_NE,           0 },
 		{ QSE_T("!~"),  2, TOK_NM,           0 },
+		{ QSE_T("!:"),  2, TOK_ND,           0 },
 		{ QSE_T("!"),   1, TOK_LNOT,         0 },
 		{ QSE_T(">>="), 3, TOK_RS_ASSN,      0 },
 		{ QSE_T(">>"),  2, TOK_RS,           0 },
@@ -5960,12 +5965,41 @@ retry:
 		type = classify_ident (awk, QSE_STR_CSTR(tok->name));
 		SET_TOKEN_TYPE (awk, tok, type);
 	}
-	else if (c == QSE_T('\"') || c == QSE_T('\''))
+	else if (c == QSE_T('\"'))
 	{
+		/* double-quoted string */
 		SET_TOKEN_TYPE (awk, tok, TOK_STR);
 		/*if (get_charstr(awk, tok, c) <= -1) return -1;*/
 		if (get_string (awk, c, QSE_T('\\'), 0, 0, tok) <= -1) return -1;
 	}
+	else if (c == QSE_T('\''))
+	{
+		/* single-quoted string - no escaping */
+		qse_cint_t c;
+
+		SET_TOKEN_TYPE (awk, tok, TOK_STR);
+
+		while (1)
+		{
+			GET_CHAR_TO (awk, c);
+
+			if (c == QSE_CHAR_EOF)
+			{
+				SETERR_TOK (awk, QSE_AWK_ESTRNC);
+				return -1;
+			}
+
+			if (c == QSE_T('\''))
+			{
+				/* terminating quote */
+				GET_CHAR (awk);
+				break;
+			}
+
+			ADD_TOKEN_CHAR (awk, tok, c);
+		}
+		return 0;
+	}
 	else
 	{
 	try_get_symbols:
diff --git a/qse/lib/awk/run.c b/qse/lib/awk/run.c
index 26db1405..66c13c13 100644
--- a/qse/lib/awk/run.c
+++ b/qse/lib/awk/run.c
@@ -5037,7 +5037,8 @@ static qse_awk_val_t* eval_unary (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
 		exp->opcode == QSE_AWK_UNROP_PLUS ||
 		exp->opcode == QSE_AWK_UNROP_MINUS ||
 		exp->opcode == QSE_AWK_UNROP_LNOT ||
-		exp->opcode == QSE_AWK_UNROP_BNOT);
+		exp->opcode == QSE_AWK_UNROP_BNOT ||
+		exp->opcode == QSE_AWK_UNROP_ND);
 
 	QSE_ASSERT (exp->left->next == QSE_NULL);
 	left = eval_expression (run, exp->left);
@@ -5085,6 +5086,11 @@ static qse_awk_val_t* eval_unary (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
 			res = (n == 0)? qse_awk_rtx_makeintval (run, l):
 			                qse_awk_rtx_makefltval (run, r);
 			break;
+
+		case QSE_AWK_UNROP_ND:
+			res = qse_awk_rtx_makeintval (
+				run, ((left->type == QSE_AWK_VAL_NIL)? 1: 0));
+			break;
 	}
 
 exit_func:
diff --git a/qse/lib/awk/run.h b/qse/lib/awk/run.h
index 21be298d..eb09f76a 100644
--- a/qse/lib/awk/run.h
+++ b/qse/lib/awk/run.h
@@ -90,7 +90,8 @@ enum qse_awk_unrop_type_t
 	QSE_AWK_UNROP_PLUS,
 	QSE_AWK_UNROP_MINUS,
 	QSE_AWK_UNROP_LNOT,
-	QSE_AWK_UNROP_BNOT
+	QSE_AWK_UNROP_BNOT,
+	QSE_AWK_UNROP_ND
 };
 
 enum qse_awk_incop_type_t
diff --git a/qse/lib/awk/tree.c b/qse/lib/awk/tree.c
index 2769aea2..140e3a1d 100644
--- a/qse/lib/awk/tree.c
+++ b/qse/lib/awk/tree.c
@@ -80,7 +80,8 @@ static const qse_char_t* unrop_str[] =
 	QSE_T("+"),
 	QSE_T("-"),
 	QSE_T("!"),
-	QSE_T("~~")
+	QSE_T("~~"),
+	QSE_T("!:")
 };
 
 static const qse_char_t* incop_str[] =