diff --git a/gen/intellij/haskell/parser/HaskellParser.java b/gen/intellij/haskell/parser/HaskellParser.java index 8d4bc2cd..81771f90 100644 --- a/gen/intellij/haskell/parser/HaskellParser.java +++ b/gen/intellij/haskell/parser/HaskellParser.java @@ -2365,7 +2365,7 @@ public class HaskellParser implements PsiParser, LightPsiParser { } /* ********************************************************** */ - // TYPE onl conid + // TYPE onl q_name static boolean export3(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "export3")) return false; if (!nextTokenIs(b, HS_TYPE)) return false; @@ -2373,7 +2373,7 @@ public class HaskellParser implements PsiParser, LightPsiParser { Marker m = enter_section_(b); r = consumeToken(b, HS_TYPE); r = r && onl(b, l + 1); - r = r && conid(b, l + 1); + r = r && q_name(b, l + 1); exit_section_(b, m, null, r); return r; } diff --git a/gen/intellij/haskell/psi/HaskellExport.java b/gen/intellij/haskell/psi/HaskellExport.java index bd98cf34..12b78d26 100644 --- a/gen/intellij/haskell/psi/HaskellExport.java +++ b/gen/intellij/haskell/psi/HaskellExport.java @@ -8,9 +8,6 @@ import java.util.List; public interface HaskellExport extends HaskellCompositeElement { - @Nullable - HaskellConid getConid(); - @Nullable HaskellDotDot getDotDot(); diff --git a/gen/intellij/haskell/psi/impl/HaskellCdeclImpl.java b/gen/intellij/haskell/psi/impl/HaskellCdeclImpl.java index 1291689a..2ef3cc00 100644 --- a/gen/intellij/haskell/psi/impl/HaskellCdeclImpl.java +++ b/gen/intellij/haskell/psi/impl/HaskellCdeclImpl.java @@ -19,7 +19,7 @@ public class HaskellCdeclImpl extends HaskellCompositeElementImpl implements Has } public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof HaskellVisitor) accept((HaskellVisitor)visitor); + if (visitor instanceof HaskellVisitor) accept((HaskellVisitor) visitor); else super.accept(visitor); } diff --git a/gen/intellij/haskell/psi/impl/HaskellExportImpl.java b/gen/intellij/haskell/psi/impl/HaskellExportImpl.java index b4240cee..63e57475 100644 --- a/gen/intellij/haskell/psi/impl/HaskellExportImpl.java +++ b/gen/intellij/haskell/psi/impl/HaskellExportImpl.java @@ -25,12 +25,6 @@ public class HaskellExportImpl extends HaskellCompositeElementImpl implements Ha else super.accept(visitor); } - @Override - @Nullable - public HaskellConid getConid() { - return PsiTreeUtil.getChildOfType(this, HaskellConid.class); - } - @Override @Nullable public HaskellDotDot getDotDot() { diff --git a/src/main/scala/intellij/haskell/haskell.bnf b/src/main/scala/intellij/haskell/haskell.bnf index d70b387b..6c9c525f 100644 --- a/src/main/scala/intellij/haskell/haskell.bnf +++ b/src/main/scala/intellij/haskell/haskell.bnf @@ -219,7 +219,7 @@ exports ::= LEFT_PAREN onl export ((onl COMMA)? onl export)* export ::= export1 | export2 | export3 private export1 ::= MODULE modid private export2 ::= q_name (onl LEFT_PAREN (onl q_name (onl COMMA onl q_name)*)? onl RIGHT_PAREN | onl LEFT_PAREN onl dot_dot onl RIGHT_PAREN)? -private export3 ::= TYPE onl conid +private export3 ::= TYPE onl q_name newconstr ::= newconstr_fielddecl | q_name atype newconstr_fielddecl ::= q_name onls LEFT_BRACE? onls type_signature onls RIGHT_BRACE?