From 9feebb1dc6732a5ca3451e9967e2dbfeff55c444 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 16 Oct 2014 06:14:53 +0400
Subject: [PATCH] "typedef" replaced with "typeAlias" in the grammar

---
 .../jetbrains/jet/lang/parsing/JetExpressionParsing.java    | 2 +-
 .../src/org/jetbrains/jet/lang/parsing/JetParsing.java      | 6 +++---
 grammar/src/class_members.grm                               | 2 +-
 grammar/src/expressions.grm                                 | 2 +-
 grammar/src/toplevel.grm                                    | 5 ++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
index b3d3f673623..caeb877a32a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
@@ -1279,7 +1279,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
      *   : property
      *   : extension
      *   : class
-     *   : typedef
+     *   : typeAlias
      *   : object
      *   ;
      */
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
index 1dc22d5a4e9..dd10733803f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
@@ -342,7 +342,7 @@ public class JetParsing extends AbstractJetParsing {
      *   : extension
      *   : function
      *   : property
-     *   : typedef
+     *   : typeAlias
      *   : object
      *   ;
      */
@@ -752,7 +752,7 @@ public class JetParsing extends AbstractJetParsing {
      *   : property
      *   : class
      *   : extension
-     *   : typedef
+     *   : typeAlias
      *   : anonymousInitializer
      *   : object
      *   ;
@@ -874,7 +874,7 @@ public class JetParsing extends AbstractJetParsing {
     }
 
     /*
-     * typedef
+     * typeAlias
      *   : modifiers "typealias" SimpleName (typeParameters typeConstraints)? "=" type
      *   ;
      */
diff --git a/grammar/src/class_members.grm b/grammar/src/class_members.grm
index 17bbdcd1026..b3428fb4fe1 100644
--- a/grammar/src/class_members.grm
+++ b/grammar/src/class_members.grm
@@ -32,7 +32,7 @@ memberDeclaration
   : function
   : property
   : class
-  : typedef
+  : typeAlias
   : anonymousInitializer
   ;
 
diff --git a/grammar/src/expressions.grm b/grammar/src/expressions.grm
index 54e082b33a1..abc17fb2812 100644
--- a/grammar/src/expressions.grm
+++ b/grammar/src/expressions.grm
@@ -165,7 +165,7 @@ declaration
   : function
   : property
   : class
-  : typedef
+  : typeAlias
   : object
   ;
 
diff --git a/grammar/src/toplevel.grm b/grammar/src/toplevel.grm
index 0aec595175b..922262d4823 100644
--- a/grammar/src/toplevel.grm
+++ b/grammar/src/toplevel.grm
@@ -45,7 +45,7 @@ toplevelObject
   : object
   : function
   : property
-  : typedef
+  : typeAlias
   ;
 
 package
@@ -59,7 +59,6 @@ package
 See [Packages](packages.html)
 */
 
-[undocumented]
-typedef
+typeAlias
   : modifiers "typealias" SimpleName (typeParameters typeConstraints)? "=" type
   ;