diff options
Diffstat (limited to 'admin/grammars/grammar.wy')
| -rw-r--r-- | admin/grammars/grammar.wy | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index f7664de655a..81fd1b0b79c 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy @@ -3,7 +3,6 @@ ;; Copyright (C) 2002-2019 Free Software Foundation, Inc. ;; ;; Author: David Ponce <david@dponce.com> -;; Maintainer: David Ponce <david@dponce.com> ;; Created: 26 Aug 2002 ;; Keywords: syntax ;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $ @@ -53,6 +52,7 @@ %keyword LEFT "%left" %keyword NONASSOC "%nonassoc" %keyword PACKAGE "%package" +%keyword EXPECTEDCONFLICTS "%expectedconflicts" %keyword PROVIDE "%provide" %keyword PREC "%prec" %keyword PUT "%put" @@ -136,6 +136,7 @@ decl: | no_default_prec_decl | languagemode_decl | package_decl + | expectedconflicts_decl | provide_decl | precedence_decl | put_decl @@ -168,6 +169,11 @@ package_decl: `(PACKAGE-TAG ',$2 nil) ; +expectedconflicts_decl: + EXPECTEDCONFLICTS symbols + `(TAG ',(car $2) 'expectedconflicts :rest ',(cdr $2)) + ; + provide_decl: PROVIDE SYMBOL `(TAG ',$2 'provide) |