From 4e6bfd6fe0d48ddf49cd61bb8cb31881a1e5e369 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 21 Feb 2016 03:40:43 -0500
Subject: accept(): Use toktext()

---
(limited to 'parsing')

diff --git a/parsing/lexer.sh b/parsing/lexer.sh
index 292d2fa..886e7f8 100644
--- a/parsing/lexer.sh
+++ b/parsing/lexer.sh
@@ -800,7 +800,7 @@ accept()
 				# T_WORD data unit must match reserved word
 				# exactly.
 				if ! [ "x${tok#T_WORD${US}}" = \
-						"x$(tokname "${t}")" ]; then
+						"x$(toktext "${t}")" ]; then
 					return 1
 				fi
 				# If the token matches the reserved word,
@@ -842,7 +842,7 @@ accept()
 					T_CASE T_ESAC T_WHILE T_UNTIL T_FOR \
 					T_LBRACE T_RBRACE T_BANG T_IN; do
 				if [ "x${tok#T_WORD${US}}" = \
-						"x$(tokname "${rw}")" ]; then
+						"x$(toktext "${rw}")" ]; then
 					tok="${rw}"
 					return 1
 				fi
@@ -860,7 +860,7 @@ accept()
 					T_CASE T_ESAC T_WHILE T_UNTIL T_FOR \
 					T_LBRACE T_RBRACE T_BANG T_IN; do
 				if [ "x${tok#T_WORD${US}}" = \
-						"x$(tokname "${rw}")" ]; then
+						"x$(toktext "${rw}")" ]; then
 					tok="${rw}"
 					return 1
 				fi
diff --git a/parsing/parse.sh b/parsing/parse.sh
index 1ea851a..199005a 100644
--- a/parsing/parse.sh
+++ b/parsing/parse.sh
@@ -670,5 +670,7 @@ try()
 #try 'foo\" bar'
 #try 'foo\'
 #try "foo'"
-try 'foo\' 'bar'
-try 'v=foo'
+#try 'foo\' 'bar'
+#try 'v=foo'
+try 'if &&'
+try 'if true; do'
--
cgit v0.9.1