ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-08-16 18:20:43 +03:00
Code Issues Projects Releases Wiki Activity

Improved parser.

Browse Source
This commit is contained in:
Rik van der Kleij 2016-12-28 17:54:30 +01:00
parent 601afdc5d9
commit efa317deb3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gen/intellij/haskell/parser/HaskellParser.java
View File

@ -1149,7 +1149,7 @@ public class HaskellParser implements PsiParser, LightPsiParser {
}
/* ********************************************************** */
// ttype | q_name COLON_COLON q_name |
// q_name COLON_COLON q_name | ttype |
// q_name+ |
// q_name LEFT_PAREN q_name atype+ RIGHT_PAREN |
// q_name LEFT_PAREN q_name+ RIGHT_PAREN q_name*
@ -1157,8 +1157,8 @@ public class HaskellParser implements PsiParser, LightPsiParser {
if (!recursion_guard_(b, l, "clazz")) return false;
boolean r;
Marker m = enter_section_(b, l, _NONE_, HS_CLAZZ, "<clazz>");
r = ttype(b, l + 1);
if (!r) r = clazz_1(b, l + 1);
r = clazz_0(b, l + 1);
if (!r) r = ttype(b, l + 1);
if (!r) r = clazz_2(b, l + 1);
if (!r) r = clazz_3(b, l + 1);
if (!r) r = clazz_4(b, l + 1);
@ -1167,8 +1167,8 @@ public class HaskellParser implements PsiParser, LightPsiParser {
}
// q_name COLON_COLON q_name
private static boolean clazz_1(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "clazz_1")) return false;
private static boolean clazz_0(PsiBuilder b, int l) {
if (!recursion_guard_(b, l, "clazz_0")) return false;
boolean r;
Marker m = enter_section_(b);
r = q_name(b, l + 1);

2
src/main/scala/intellij/haskell/haskell.bnf
View File

@ -227,7 +227,7 @@ type_family_type ::= (q_name | LEFT_PAREN? q_names COLON_COLON? onls
ccontext ::= LEFT_PAREN onls clazz (onls COMMA onls clazz)* onls RIGHT_PAREN |
clazz
clazz ::= ttype | q_name COLON_COLON q_name |
clazz ::= q_name COLON_COLON q_name | ttype |
q_name+ |
q_name LEFT_PAREN q_name atype+ RIGHT_PAREN |
q_name LEFT_PAREN q_name+ RIGHT_PAREN q_name*