Merge from origin/emacs-24

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

diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index c6b3a58aac3e5954e2295624a7be4275d39ff1bc..1579b0787d764003070d9a84f78001daf4c0ad90 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-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2015 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
@@ -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
                ;