Index: tools/prettyprinter/parser.yy
===================================================================
--- tools/prettyprinter/parser.yy	(revision fc1ef6262344eb2eb531046aed824827d0a0909f)
+++ tools/prettyprinter/parser.yy	(revision a42a6542b4369835501abbde87c5fd815d0f0d21)
@@ -10,6 +10,6 @@
 // Created On       : Sat Dec 15 13:44:21 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 29 16:34:10 2017
-// Update Count     : 1047
+// Last Modified On : Sun Apr 15 21:40:30 2018
+// Update Count     : 1052
 // 
 
@@ -61,57 +61,59 @@
 %token<tokenp>	CODE									// C code
 
-%token<tokenp>	START									// %start
-%token<tokenp>	UNION									// %union
-%token<tokenp>	TOKEN									// %token
+%token<tokenp>	DEFINE									// %define
+%token<tokenp>	EXPECT									// %expect
 %token<tokenp>	LEFT									// %left
-%token<tokenp>	RIGHT									// %right
+%token<tokenp>	LOCATIONS								// %locations
 %token<tokenp>	NONASSOC								// %nonassoc
 %token<tokenp>	PRECEDENCE								// %precedence
+%token<tokenp>	PURE_PARSER								// %pure_parser
+%token<tokenp>	RIGHT									// %right
+%token<tokenp>	SEMANTIC_PARSER							// %semantic_parser
+%token<tokenp>	START									// %start
+%token<tokenp>	THONG									// %thong
+%token<tokenp>	TOKEN									// %token
 %token<tokenp>	TYPE									// %type
-%token<tokenp>	PURE_PARSER								// %pure_parser
-%token<tokenp>	SEMANTIC_PARSER							// %semantic_parser
-%token<tokenp>	EXPECT									// %expect
-%token<tokenp>	THONG									// %thong
+%token<tokenp>	UNION									// %union
 
 %token<tokenp>	PREC									// %prec
 
-%token		END_TERMINALS								// ALL TERMINAL TOKEN NAMES MUST APPEAR BEFORE THIS
+%token			END_TERMINALS							// ALL TERMINAL TOKEN NAMES MUST APPEAR BEFORE THIS
 
 %type<tokenp>	sections
-%token		_SECTIONS
+%token			_SECTIONS
 %type<tokenp>	mark
 %type<tokenp>	defsection_opt
-%token		_DEFSECTION_OPT
+%token			_DEFSECTION_OPT
 %type<tokenp>	declarations
 %type<tokenp>	literalblock
-%token		_LITERALBLOCK
+%token			_LITERALBLOCK
 %type<tokenp>	declaration
-%token		_DECLARATION
+%token			_DECLARATION
 %type<tokenp>	union
 %type<tokenp>	rword
 %type<tokenp>	tag_opt
-%token		_TAG_OPT
+%token			_TAG_OPT
 %type<tokenp>	namenolist
-%token		_NAMENOLIST
+%token			_NAMENOLIST
 %type<tokenp>	nameno
-%token		_NAMENO
+%token			_NAMENO
 %type<tokenp>	namelist
-%token		_NAMELIST
+%token			_NAMELIST
 %type<tokenp>	name
 %type<tokenp>	rulesection
-%token		_RULESECTION
+%token			_RULESECTION
 %type<tokenp>	rules
-%token		_RULE
+%token			_RULE
 %type<tokenp>	lhs
-%token		_LHS
+%token			_LHS
 %type<tokenp>	rhs
-%token		_RHS
+%token			_RHS
 %type<tokenp>	prod
 %type<tokenp>	prec
-%token		_PREC
+%token			_PREC
 %type<tokenp>	action
-%token		_ACTION
+%token			_ACTION
 %type<tokenp>	usersection_opt
-%token		_USERSECTION_OPT
+%token			_USERSECTION_OPT
 %type<tokenp>	ccode_opt
 %type<tokenp>	blocks
@@ -234,4 +236,6 @@
 		    $$ = $1;
 		}
+	| DEFINE											// bison
+	| LOCATIONS
 	| THONG												// bison
 	;