From bb5d2256ba052af13a3d50f150b78c5762840449 Mon Sep 17 00:00:00 2001
From: "Benjamin J. Culkin" <bjculkin@mix.wvu.edu>
Date: Tue, 5 Jun 2018 00:16:59 -0300
Subject: Grammar update

Update grammar for new features/syntax
---
 data/sample-grammars/address.gram | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'data/sample-grammars/address.gram')

diff --git a/data/sample-grammars/address.gram b/data/sample-grammars/address.gram
index 44475c4..3e432d5 100755
--- a/data/sample-grammars/address.gram
+++ b/data/sample-grammars/address.gram
@@ -73,30 +73,23 @@ pragma suffix-with [street] [street-suffix]
 	s.
 	e.
 	w.
-	[cardinal]
+	<^2> [cardinal]
 
-[street-suffix] street
-	st.
-	road
-	rd.
+[street-suffix] [%street|%st.]
+	[%road|%rd.]
 	way
-	boulevard
-	blvd.
-	avenue
-	ave.
+	[%boulevard|%blvd.]
+	[%avenue|%ave.]
 	place
 	plaza
 	court
 	drive
-	highway
-	hwy.
-	parkway
-	pkwy.
+	[%highway|%hwy.]
+	[%parkway|%pkwy.]
 	pike
 	bypass
 
-[street-generic] main
-	main
+[street-generic] <^2> main
 	high
 	independence
 	division
@@ -128,6 +121,6 @@ pragma suffix-with [street] [street-suffix]
 	[geographic-thing]
 
 [street-generic-standalone] Broadway
-	avenue of the Americas
+	Avenue of the Americas
 	Kingshighway
 	El Camino real
-- 
cgit v1.2.3