Merge from origin/emacs-25

[gnu-emacs] / admin / grammars / js.wy

diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index a13abf56e6ee469b72a0f5710167595a4a569a98..a49952f52de98badca7c6c4c54439c51cfdf36f6 100644 (file)
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -1,6 +1,6 @@
 ;;; javascript-jv.wy -- LALR grammar for Javascript
 
-;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2016 Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona
@@ -58,7 +58,14 @@
 ;; DAMAGE.
 
 %package wisent-javascript-jv-wy
-;; JAVE I prefere ecmascript-mode
+%provide semantic/wisent/js-wy
+
+%{
+(declare-function semantic-parse-region "semantic"
+                 (start end &optional nonterminal depth returnonerror))
+}
+
+;; JAVE I preferred ecmascript-mode.
 %languagemode ecmascript-mode javascript-mode
 
 ;; The default goal
@@ -66,7 +73,7 @@
 ;; Other Goals
 %start FormalParameterList
 
-;; with the terminals stuff, I used the javacript.y names,
+;; with the terminals stuff, I used the javascript.y names,
 ;; but the semantic/wisent/java-tags.wy types
 ;; when possible
 ;; ------------------
@@ -269,8 +276,8 @@ Statement : Block
           | BreakStatement
           | ReturnStatement
           | WithStatement
-          ;   
-      
+          ;
+
 FunctionDeclaration : FUNCTION VARIABLE FormalParameterListBlock Block
                      (FUNCTION-TAG $2 nil $3)
                     ;
@@ -346,7 +353,7 @@ IterationExpression : WHILE OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statem
 ContinueStatement : CONTINUE SEMICOLON
                   ;
 
-;;JAVE break needs labels 
+;;JAVE break needs labels
 BreakStatement : BREAK SEMICOLON
               ;;               | BREAK identifier SEMICOLON
                ;