Fixing an error that crept in during earlier check-in for haxe.bnf,

when fixing constructor elements.
HaxeFoundation · Oct 8, 2014 · 15b1574 · 15b1574
1 parent c264d55
commit 15b1574
Show file tree

Hide file tree

Showing 104 changed files with 321 additions and 291 deletions.
diff --git a/gen/com/intellij/plugins/haxe/lang/parser/HaxeParser.java b/gen/com/intellij/plugins/haxe/lang/parser/HaxeParser.java
diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeAnonymousFunctionDeclaration.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeAnonymousFunctionDeclaration.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeAnonymousFunctionDeclaration extends HaxeMethod {
+public interface HaxeAnonymousFunctionDeclaration extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeParameterList getParameterList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeAnonymousTypeBody.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeAnonymousTypeBody.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeAnonymousTypeBody extends HaxeMethod {
+public interface HaxeAnonymousTypeBody extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeAnonymousTypeFieldList getAnonymousTypeFieldList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeAnonymousTypeFieldList.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeAnonymousTypeFieldList.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeAnonymousTypeFieldList extends HaxeMethod {
+public interface HaxeAnonymousTypeFieldList extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeAnonymousTypeField> getAnonymousTypeFieldList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeBlockStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeBlockStatement.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeBlockStatement extends HaxeMethod {
+public interface HaxeBlockStatement extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeBlockStatement> getBlockStatementList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeBreakStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeBreakStatement.java
@@ -23,6 +23,6 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeBreakStatement extends HaxeMethod {
+public interface HaxeBreakStatement extends HaxePsiCompositeElement {
 
 }
diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeCastExpression.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeCastExpression.java
@@ -25,7 +25,7 @@
 
 public interface HaxeCastExpression extends HaxeExpression, HaxeReference {
 
-  @NotNull
+  @Nullable
   HaxeExpression getExpression();
 
   @Nullable

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeCatchStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeCatchStatement.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeCatchStatement extends HaxeMethod {
+public interface HaxeCatchStatement extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeBlockStatement getBlockStatement();
@@ -52,7 +52,7 @@ public interface HaxeCatchStatement extends HaxeMethod {
   @Nullable
   HaxeLocalVarDeclaration getLocalVarDeclaration();
 
-  @NotNull
+  @Nullable
   HaxeParameter getParameter();
 
   @Nullable

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeContinueStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeContinueStatement.java
@@ -23,6 +23,6 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeContinueStatement extends HaxeMethod {
+public interface HaxeContinueStatement extends HaxePsiCompositeElement {
 
 }
diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeDefaultCase.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeDefaultCase.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeDefaultCase extends HaxeMethod {
+public interface HaxeDefaultCase extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeSwitchCaseBlock getSwitchCaseBlock();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeDoWhileStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeDoWhileStatement.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeDoWhileStatement extends HaxeMethod {
+public interface HaxeDoWhileStatement extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeBlockStatement getBlockStatement();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeExpression.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeExpression.java
@@ -23,6 +23,6 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeExpression extends HaxeMethod {
+public interface HaxeExpression extends HaxePsiCompositeElement {
 
 }
diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeExpressionList.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeExpressionList.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeExpressionList extends HaxeMethod {
+public interface HaxeExpressionList extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeExpression> getExpressionList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeForStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeForStatement.java
@@ -31,7 +31,7 @@ public interface HaxeForStatement extends HaxeComponent {
   @Nullable
   HaxeBreakStatement getBreakStatement();
 
-  @NotNull
+  @Nullable
   HaxeComponentName getComponentName();
 
   @Nullable

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeFunctionType.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeFunctionType.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeFunctionType extends HaxeMethod {
+public interface HaxeFunctionType extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeFunctionType getFunctionType();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeGenericParam.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeGenericParam.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeGenericParam extends HaxeMethod {
+public interface HaxeGenericParam extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeGenericListPart> getGenericListPartList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeIfStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeIfStatement.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeIfStatement extends HaxeMethod {
+public interface HaxeIfStatement extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeBlockStatement> getBlockStatementList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeInherit.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeInherit.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeInherit extends HaxeMethod {
+public interface HaxeInherit extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeType getType();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeInheritList.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeInheritList.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeInheritList extends HaxeMethod {
+public interface HaxeInheritList extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeInherit> getInheritList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeIterable.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeIterable.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeIterable extends HaxeMethod {
+public interface HaxeIterable extends HaxePsiCompositeElement {
 
   @NotNull
   HaxeExpression getExpression();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeLongTemplateEntry.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeLongTemplateEntry.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeLongTemplateEntry extends HaxeMethod {
+public interface HaxeLongTemplateEntry extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeExpression getExpression();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeObjectLiteralElement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeObjectLiteralElement.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeObjectLiteralElement extends HaxeMethod {
+public interface HaxeObjectLiteralElement extends HaxePsiCompositeElement {
 
   @NotNull
   HaxeExpression getExpression();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeReturnStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeReturnStatement.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeReturnStatement extends HaxeMethod {
+public interface HaxeReturnStatement extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeExpression getExpression();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeReturnStatementWithoutSemicolon.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeReturnStatementWithoutSemicolon.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeReturnStatementWithoutSemicolon extends HaxeMethod {
+public interface HaxeReturnStatementWithoutSemicolon extends HaxePsiCompositeElement {
 
   @NotNull
   HaxeExpression getExpression();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeShortTemplateEntry.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeShortTemplateEntry.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeShortTemplateEntry extends HaxeMethod {
+public interface HaxeShortTemplateEntry extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeExpression getExpression();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchBlock.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchBlock.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeSwitchBlock extends HaxeMethod {
+public interface HaxeSwitchBlock extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeDefaultCase getDefaultCase();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchCase.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchCase.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeSwitchCase extends HaxeMethod {
+public interface HaxeSwitchCase extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeExpression> getExpressionList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchCaseBlock.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchCaseBlock.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeSwitchCaseBlock extends HaxeMethod {
+public interface HaxeSwitchCaseBlock extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeBlockStatement> getBlockStatementList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeSwitchStatement.java
@@ -23,12 +23,12 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeSwitchStatement extends HaxeMethod {
+public interface HaxeSwitchStatement extends HaxePsiCompositeElement {
 
-  @NotNull
+  @Nullable
   HaxeExpression getExpression();
 
-  @NotNull
+  @Nullable
   HaxeSwitchBlock getSwitchBlock();
 
 }
diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeThrowStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeThrowStatement.java
@@ -23,9 +23,9 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeThrowStatement extends HaxeMethod {
+public interface HaxeThrowStatement extends HaxePsiCompositeElement {
 
-  @NotNull
+  @Nullable
   HaxeExpression getExpression();
 
 }
diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeTryStatement.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeTryStatement.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeTryStatement extends HaxeMethod {
+public interface HaxeTryStatement extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeBlockStatement getBlockStatement();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeType.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeType.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeType extends HaxeMethod {
+public interface HaxeType extends HaxePsiCompositeElement {
 
   @NotNull
   HaxeReferenceExpression getReferenceExpression();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeExtends.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeExtends.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeTypeExtends extends HaxeMethod {
+public interface HaxeTypeExtends extends HaxePsiCompositeElement {
 
   @NotNull
   HaxeType getType();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeList.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeList.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeTypeList extends HaxeMethod {
+public interface HaxeTypeList extends HaxePsiCompositeElement {
 
   @NotNull
   List<HaxeTypeListPart> getTypeListPartList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeListPart.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeListPart.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeTypeListPart extends HaxeMethod {
+public interface HaxeTypeListPart extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeFunctionType getFunctionType();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeOrAnonymous.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeOrAnonymous.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeTypeOrAnonymous extends HaxeMethod {
+public interface HaxeTypeOrAnonymous extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeAnonymousType getAnonymousType();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeParam.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeParam.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeTypeParam extends HaxeMethod {
+public interface HaxeTypeParam extends HaxePsiCompositeElement {
 
   @NotNull
   HaxeTypeList getTypeList();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeTag.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeTypeTag.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeTypeTag extends HaxeMethod {
+public interface HaxeTypeTag extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeFunctionType getFunctionType();

diff --git a/gen/com/intellij/plugins/haxe/lang/psi/HaxeVarInit.java b/gen/com/intellij/plugins/haxe/lang/psi/HaxeVarInit.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
 
-public interface HaxeVarInit extends HaxeMethod {
+public interface HaxeVarInit extends HaxePsiCompositeElement {
 
   @Nullable
   HaxeExpression getExpression();