Update CEDET from upstream.

[bpt/emacs.git] / lisp / cedet / srecode / srt-wy.el

diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el
index 2fb8e76..6f5d73a 100644 (file)
--- a/lisp/cedet/srecode/srt-wy.el
+++ b/lisp/cedet/srecode/srt-wy.el
@@ -1,6 +1,6 @@
 ;;; srecode/srt-wy.el --- Generated parser support file
 
-;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -18,13 +18,13 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-
-;; Generated from srecode-template.wy in the CEDET repository.
+;;
+;; This file was generated from admin/grammars/srecode-template.wy.
 
 ;;; Code:
 
 (require 'semantic/lex)
-
+(eval-when-compile (require 'semantic/bovine))
 \f
 ;;; Prologue
 ;;
@@ -39,6 +39,8 @@
      ("context" . CONTEXT)
      ("template" . TEMPLATE)
      ("sectiondictionary" . SECTIONDICTIONARY)
+     ("section" . SECTION)
+     ("end" . END)
      ("prompt" . PROMPT)
      ("default" . DEFAULT)
      ("defaultmacro" . DEFAULTMACRO)
@@ -49,6 +51,8 @@
      ("defaultmacro" summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]")
      ("default" summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]")
      ("prompt" summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]")
+     ("end" summary "section ... end")
+     ("section" summary "section <name>\\n <dictionary entries>\\n end")
      ("sectiondictionary" summary "sectiondictionary <name>\\n <dictionary entries>")
      ("template" summary "template <name>\\n <template definition>")
      ("context" summary "context <name>")
@@ -74,6 +78,7 @@
    '(("number" :declared t)
      ("string" :declared t)
      ("symbol" :declared t)
+     ("property" syntax ":\\(\\w\\|\\s_\\)*")
      ("property" :declared t)
      ("newline" :declared t)
      ("punctuation" syntax "\\s.+")
@@ -86,7 +91,7 @@
     (eval-when-compile
       (require 'semantic/wisent/comp))
     (wisent-compile-grammar
-     '((SET SHOW MACRO CONTEXT TEMPLATE SECTIONDICTIONARY PROMPT DEFAULT DEFAULTMACRO READ BIND newline TEMPLATE_BLOCK property symbol string number)
+     '((SET SHOW MACRO CONTEXT TEMPLATE SECTIONDICTIONARY SECTION END PROMPT DEFAULT DEFAULTMACRO READ BIND newline TEMPLATE_BLOCK property symbol string number)
        nil
        (template_file
        ((newline)
@@ -142,7 +147,7 @@
         (cons 'macro
               (read $2))))
        (template
-       ((TEMPLATE templatename opt-dynamic-arguments newline opt-string opt-section-dictionaries TEMPLATE_BLOCK newline opt-bind)
+       ((TEMPLATE templatename opt-dynamic-arguments newline opt-string section-dictionary-list TEMPLATE_BLOCK newline opt-bind)
         (wisent-raw-tag
          (semantic-tag-new-function $2 nil $3 :documentation $5 :code $7 :dictionaries $6 :binding $9))))
        (templatename
@@ -163,26 +168,40 @@
        ((string newline)
         (read $1))
        (nil nil))
-       (opt-section-dictionaries
-       (nil nil)
-       ((section-dictionary-list)))
        (section-dictionary-list
-       ((one-section-dictionary)
-        (list $1))
-       ((section-dictionary-list one-section-dictionary)
+       (nil nil)
+       ((section-dictionary-list flat-section-dictionary)
+        (append $1
+                (list $2)))
+       ((section-dictionary-list section-dictionary)
         (append $1
                 (list $2))))
-       (one-section-dictionary
-       ((SECTIONDICTIONARY string newline variable-list)
+       (flat-section-dictionary
+       ((SECTIONDICTIONARY string newline flat-dictionary-entry-list)
+        (cons
+         (read $2)
+         $4)))
+       (flat-dictionary-entry-list
+       (nil nil)
+       ((flat-dictionary-entry-list flat-dictionary-entry)
+        (append $1 $2)))
+       (flat-dictionary-entry
+       ((variable)
+        (wisent-cook-tag $1)))
+       (section-dictionary
+       ((SECTION string newline dictionary-entry-list END newline)
         (cons
          (read $2)
          $4)))
-       (variable-list
+       (dictionary-entry-list
+       (nil nil)
+       ((dictionary-entry-list dictionary-entry)
+        (append $1 $2)))
+       (dictionary-entry
        ((variable)
         (wisent-cook-tag $1))
-       ((variable-list variable)
-        (append $1
-                (wisent-cook-tag $2))))
+       ((section-dictionary)
+        (list $1)))
        (opt-bind
        ((BIND string newline)
         (read $2))
@@ -207,9 +226,11 @@
 \f
 ;;; Analyzers
 ;;
-(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
+(define-lex-regex-type-analyzer srecode-template-wy--<property>-regexp-analyzer
+  "regexp analyzer for <property> tokens."
+  ":\\(\\w\\|\\s_\\)*"
+  nil
+  'property)
 
 (define-lex-regex-type-analyzer srecode-template-wy--<symbol>-regexp-analyzer
   "regexp analyzer for <symbol> tokens."
@@ -217,11 +238,6 @@
   nil
   'symbol)
 
-(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
-  "sexp analyzer for <string> tokens."
-  "\\s\""
-  'string)
-
 (define-lex-regex-type-analyzer srecode-template-wy--<number>-regexp-analyzer
   "regexp analyzer for <number> tokens."
   semantic-lex-number-expression
@@ -234,6 +250,15 @@
   nil
   'punctuation)
 
+(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'string)
+
+(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
 \f
 ;;; Epilogue
 ;;