diff options
author | Chong Yidong <cyd@gnu.org> | 2012-01-09 13:42:57 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-01-09 13:42:57 +0800 |
commit | 866b58d61afd2eccfed53d1707bea233bde3c030 (patch) | |
tree | 860d0ce299d0482248ecec6e618dd967a2904178 /lisp | |
parent | 9ca4c014c87716b8712f710cbc8bbdf1421a08fc (diff) |
Add CEDET grammar files to emacs-23 branch.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/cedet/semantic/bovine/c-by.el | 3 | ||||
-rw-r--r-- | lisp/cedet/semantic/bovine/make-by.el | 3 | ||||
-rw-r--r-- | lisp/cedet/semantic/bovine/scm-by.el | 3 | ||||
-rw-r--r-- | lisp/cedet/semantic/grammar-wy.el | 3 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/javat-wy.el | 3 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/js-wy.el | 38 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/python-wy.el | 54 | ||||
-rw-r--r-- | lisp/cedet/srecode/srt-wy.el | 4 |
8 files changed, 95 insertions, 16 deletions
diff --git a/lisp/cedet/semantic/bovine/c-by.el b/lisp/cedet/semantic/bovine/c-by.el index 0308ace619b..36aa480e514 100644 --- a/lisp/cedet/semantic/bovine/c-by.el +++ b/lisp/cedet/semantic/bovine/c-by.el @@ -20,8 +20,7 @@ ;;; Commentary: ;; -;; This file was generated from the grammar file semantic/bovine/c.by -;; in the CEDET repository. +;; This file was generated from etc/grammars/c.by. ;;; Code: diff --git a/lisp/cedet/semantic/bovine/make-by.el b/lisp/cedet/semantic/bovine/make-by.el index 1db454f6ea8..17dd5613a50 100644 --- a/lisp/cedet/semantic/bovine/make-by.el +++ b/lisp/cedet/semantic/bovine/make-by.el @@ -20,8 +20,7 @@ ;;; Commentary: ;; -;; This file was generated from the grammar file -;; semantic/bovine/make.by in the CEDET repository. +;; This file was generated from etc/grammars/make.by. ;;; Code: diff --git a/lisp/cedet/semantic/bovine/scm-by.el b/lisp/cedet/semantic/bovine/scm-by.el index ac8211bfc8c..0b27abaf211 100644 --- a/lisp/cedet/semantic/bovine/scm-by.el +++ b/lisp/cedet/semantic/bovine/scm-by.el @@ -19,8 +19,7 @@ ;;; Commentary: ;; -;; This file was generated from the grammar file -;; semantic/bovine/scm.by in the CEDET repository. +;; This file was generated from etc/grammars/scm.by. ;;; Code: diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el index 58f7f9900e2..59729863316 100644 --- a/lisp/cedet/semantic/grammar-wy.el +++ b/lisp/cedet/semantic/grammar-wy.el @@ -22,8 +22,7 @@ ;;; Commentary: ;; -;; This file is generated from the grammar file semantic-grammar.wy in -;; the upstream CEDET repository. +;; This file was generated from etc/grammars/grammar.wy. ;;; Code: diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el index 258b1ac4af7..9057ee9fd45 100644 --- a/lisp/cedet/semantic/wisent/javat-wy.el +++ b/lisp/cedet/semantic/wisent/javat-wy.el @@ -19,8 +19,7 @@ ;;; Commentary: ;; -;; This file was generated from the grammar file -;; semantic/wisent/wisent-java-tags.wy in the CEDET repository. +;; This file was generated from etc/grammars/java-tags.wy. ;;; Code: diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el index 021002059f8..a974a28bcd9 100644 --- a/lisp/cedet/semantic/wisent/js-wy.el +++ b/lisp/cedet/semantic/wisent/js-wy.el @@ -19,8 +19,42 @@ ;;; Commentary: ;; -;; This file was generated from the grammar file -;; semantic/wisent/wisent-javascript-jv.wy in the CEDET repository. +;; This file was generated from etc/grammars/js.wy. +;; +;; It is derived from the grammar in the ECMAScript Language +;; Specification published at +;; +;; http://www.ecma-international.org/publications/standards/Ecma-262.htm +;; +;; and redistributed under the following license: +;; +;; Redistribution and use in source and binary forms, with or without +;; modification, are permitted provided that the following conditions +;; are met: +;; +;; 1. Redistributions of source code must retain the above copyright +;; notice, this list of conditions and the following disclaimer. +;; +;; 2. Redistributions in binary form must reproduce the above +;; copyright notice, this list of conditions and the following +;; disclaimer in the documentation and/or other materials provided +;; with the distribution. +;; +;; 3. Neither the name of the authors nor Ecma International may be +;; used to endorse or promote products derived from this software +;; without specific prior written permission. THIS SOFTWARE IS +;; PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR +;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +;; ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR +;; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +;; DAMAGE. ;;; Code: (require 'semantic/lex) diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el index 32466a31cec..f4cae7545fc 100644 --- a/lisp/cedet/semantic/wisent/python-wy.el +++ b/lisp/cedet/semantic/wisent/python-wy.el @@ -19,9 +19,59 @@ ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: + +;; This file was generated from etc/grammars/python.wy. +;; It is derived in part from the Python grammar, used under the +;; following license: +;; +;; PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +;; -------------------------------------------- +;; 1. This LICENSE AGREEMENT is between the Python Software Foundation +;; ("PSF"), and the Individual or Organization ("Licensee") accessing +;; and otherwise using this software ("Python") in source or binary +;; form and its associated documentation. +;; +;; 2. Subject to the terms and conditions of this License Agreement, +;; PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide +;; license to reproduce, analyze, test, perform and/or display +;; publicly, prepare derivative works, distribute, and otherwise use +;; Python alone or in any derivative version, provided, however, that +;; PSF's License Agreement and PSF's notice of copyright, i.e., +;; "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Python Software Foundation; All Rights Reserved" are +;; retained in Python alone or in any derivative version prepared by +;; Licensee. +;; +;; 3. In the event Licensee prepares a derivative work that is based +;; on or incorporates Python or any part thereof, and wants to make +;; the derivative work available to others as provided herein, then +;; Licensee hereby agrees to include in any such work a brief summary +;; of the changes made to Python. +;; +;; 4. PSF is making Python available to Licensee on an "AS IS" +;; basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +;; IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +;; DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +;; FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +;; INFRINGE ANY THIRD PARTY RIGHTS. +;; +;; 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +;; FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A +;; RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR +;; ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. +;; +;; 6. This License Agreement will automatically terminate upon a +;; material breach of its terms and conditions. +;; +;; 7. Nothing in this License Agreement shall be deemed to create any +;; relationship of agency, partnership, or joint venture between PSF +;; and Licensee. This License Agreement does not grant permission to +;; use PSF trademarks or trade name in a trademark sense to endorse or +;; promote products or services of Licensee, or any third party. ;; -;; This file was generated from the grammar file -;; semantic/wisent/wisent-python.wy in the CEDET repository. +;; 8. By copying, installing or otherwise using Python, Licensee +;; agrees to be bound by the terms and conditions of this License +;; Agreement. ;;; Code: diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el index 3dde065c2a6..2910483bba3 100644 --- a/lisp/cedet/srecode/srt-wy.el +++ b/lisp/cedet/srecode/srt-wy.el @@ -18,8 +18,8 @@ ;; 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 etc/grammars/srecode-template.wy. ;;; Code: |