From: Rowan Decker <Smasher816@gmail.com>
Date: Wed, 31 Dec 2014 07:48:08 +0000 (-0600)
Subject: Die gracefully
X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-kll.git;a=commitdiff_plain;h=3f0149b7213fdcf28f94291ab5bcab2bed82ff91

Die gracefully

Don't explode into a 20 line stack trace if the kll file is formatted
incorrectly. Instead simply show the error message and exit with an
error code (which will stop the rest of a make command).

A misformatted file is most likely a user error so showing the full
backtrace for debugging is not necessary. The file and line number
should (hopefully) be enough to fix the parsing error.
---

diff --git a/kll.py b/kll.py
index 57fd37a..401d22e 100755
--- a/kll.py
+++ b/kll.py
@@ -552,9 +552,11 @@ def processKLLFile( filename ):
 		data = file.read()
 		tokenSequence = tokenize( data )
 		#print ( pformat( tokenSequence ) ) # Display tokenization
-		tree = parse( tokenSequence )
-
-
+		try:
+			tree = parse( tokenSequence )
+		except NoParseError as e:
+			print("Error parsing %s. %s" % (filename, e.msg), file=sys.stderr)
+			sys.exit(1)
 
 ### Main Entry Point ###