From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 09/10] Improve error recovery in setup.ini parsing
Date: Tue, 23 May 2017 16:59:00 -0000 [thread overview]
Message-ID: <20170523165911.49652-2-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20170523165911.49652-1-jon.turney@dronecode.org.uk>
Following the error token with a NL allows the parser to discard tokens
until a NL is found to resynchronize, rather than aborting.
This doesn't help hugely, as *any* parse errors are considered fatal by
do_remote_ini()/do_local_ini() and won't let us proceed.
---
iniparse.yy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iniparse.yy b/iniparse.yy
index 8ee7dc3..c540146 100644
--- a/iniparse.yy
+++ b/iniparse.yy
@@ -104,7 +104,7 @@ singleitem /* non-empty */
| REQUIRES { iniBuilder->buildBeginDepends(); } versionedpackagelistsp NL
| BUILDDEPENDS { iniBuilder->buildBeginBuildDepends(); } versionedpackagelist NL
| MESSAGE STRING STRING NL { iniBuilder->buildMessage ($2, $3); }
- | error { yyerror (std::string("unrecognized line ")
+ | error NL { yyerror (std::string("unrecognized line ")
+ stringify(yylineno)
+ " (do you have the latest setup?)");
}
--
2.12.3
next prev parent reply other threads:[~2017-05-23 16:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 16:46 [PATCH setup 00/10] Various setup patches Jon Turney
2017-05-23 16:47 ` [PATCH setup 04/10] Make PrereqChecker::setTrust() a static method Jon Turney
2017-05-23 16:47 ` [PATCH setup 05/10] Move and rename dumpAndList() Jon Turney
2017-05-23 16:47 ` [PATCH setup 02/10] Correctly calculate total data to checksum when using IncludeSource Jon Turney
2017-05-23 16:47 ` [PATCH setup 06/10] Fold IniDBBuilderPackage::buildInstallSize() into buildPackageInstall() Jon Turney
2017-05-23 16:47 ` [PATCH setup 01/10] isBinary() should return true for orphaned packages Jon Turney
2017-05-23 16:47 ` [PATCH setup 03/10] Rename category "Misc" to "Orphaned" Jon Turney
2017-05-23 16:47 ` [PATCH setup 07/10] Fold build(Install|Source)(MD5|SHA512) into buildPackage(Install|Source) Jon Turney
2017-05-23 16:59 ` [PATCH setup 08/10] Fix infinite recursion in grammar for depends Jon Turney
2017-05-23 16:59 ` Jon Turney [this message]
2017-05-23 16:59 ` [PATCH setup 10/10] Remove OR from grammar Jon Turney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170523165911.49652-2-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).