[ narc ] Some parser fixes

owo-lang · Oct 10, 2019 · d68db8a · d68db8a
1 parent 2ad82fb
commit d68db8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/grammar/narc.bnf b/grammar/narc.bnf
@@ -40,12 +40,12 @@ expr ::=
 
 private telescopic ::= telescopicExpr | telescopic2Expr
 
-project ::= DOT nameUsage { pin=1 }
+projectOp ::= DOT nameUsage { pin=1 }
 
-projectExpr ::= expr project
+projectExpr ::= expr projectOp
 piExpr ::= expr ARROW expr
 telescopic2Expr ::= LBRACE nameDecl+ COLON expr RBRACE {
-	pin=1
+	pin=3
 }
 telescopicExpr ::= LPAREN nameDecl+ COLON expr RPAREN {
 	pin=3
@@ -76,7 +76,7 @@ constructor ::= KW_CONSTRUCTOR nameDecl sig? SEMI {
 	pin=1
 }
 
-copattern ::= project | pattern
+copattern ::= projectOp | pattern
 pattern ::= nameDecl | inaccessiblePattern | consPattern
 
 inaccessiblePattern ::= LINACCESS expr RINACCESS { pin=1 }

diff --git a/res/META-INF/plugin.xml b/res/META-INF/plugin.xml
@@ -194,6 +194,7 @@
 		<lang.commenter language="Narc" implementationClass="org.ice1000.tt.editing.CxxLineCommenter"/>
 		<lang.braceMatcher language="Narc" implementationClass="org.ice1000.tt.editing.narc.NarcBraceMatcher"/>
 		<lang.syntaxHighlighterFactory language="Narc" implementationClass="org.ice1000.tt.editing.narc.NarcHighlighterFactory"/>
+		<lang.parserDefinition language="Narc" implementationClass="org.ice1000.tt.psi.narc.NarcGeneratedParserDefinition"/>
 
 		<projectConfigurable
 			groupId="language"

diff --git a/res/fileTemplates/internal/Narc File.narc.ft b/res/fileTemplates/internal/Narc File.narc.ft
@@ -4,4 +4,5 @@
 // Author: ${USER}
 //
 
-// TODO: there's no syntax designed yet
+definition ${NAME_CAMEL} : Type;
+clause ${NAME_CAMEL} : _;