support multi head and #if grammar

Author: waderwu

build.gradle.kts

@@ -27,7 +27,7 @@ apply {
 
 repositories {
     mavenCentral()
-    maven("https://dl.bintray.com/jetbrains/markdown")
+    //maven("https://dl.bintray.com/jetbrains/markdown")
     maven("https://plugins.gradle.org/m2/")
 }
 

src/main/grammars/datalog.bnf

@@ -19,6 +19,7 @@
     LINE_BREAK = 'regexp:\r|\n|\r\n'
 
     INCLUDE_DIRECTIVE = "#include"
+    IF_DIRECTIVE = "#if"
     IFDEF_DIRECTIVE = "#ifdef"
     IFNDEF_DIRECTIVE = "#ifndef"
     ELIF_DIRECTIVE = "#elif"
@@ -156,7 +157,7 @@ private ProgramElement_first ::= (
     ".input" | ".output" | ".printsize" |
     ".pragma" |
     ".symbol_type" | ".number_type" |
-    DEFINE_DIRECTIVE | IFDEF_DIRECTIVE | IFNDEF_DIRECTIVE | ENDIF_DIRECTIVE | INCLUDE_DIRECTIVE |
+    DEFINE_DIRECTIVE | IF_DIRECTIVE | ELSE_DIRECTIVE | IFDEF_DIRECTIVE | IFNDEF_DIRECTIVE | ENDIF_DIRECTIVE | INCLUDE_DIRECTIVE |
     IDENTIFIER)
 
 
@@ -180,8 +181,10 @@ ComponentTyped ::= AnyRef ("<"TypeReference ("," TypeReference)*">")?
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Preprocessor
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-Preprocessor ::= (IFDEF_DIRECTIVE AnyRef)
-               | (IFNDEF_DIRECTIVE AnyRef)
+Preprocessor ::= (IF_DIRECTIVE IDENTIFIER ("<" | "==" | ">") Constant)
+               | ELSE_DIRECTIVE
+               | (IFDEF_DIRECTIVE IDENTIFIER)
+               | (IFNDEF_DIRECTIVE IDENTIFIER)
                | ENDIF_DIRECTIVE
                | Include
                | (MacroDecl (LINE_BREAK | <<eof>>))
@@ -284,7 +287,7 @@ Clause ::= ClauseHead ":-" ClauseBody "." {
 
 private Clause_recover ::= !("}" | ProgramElement_first)
 
-ClauseHead ::= Atom
+ClauseHead ::= Atom ("," Atom)*
 ClauseBody ::= Predicate {pin=1 recoverWhile=ClauseBody_recover}
 
 private ClauseBody_recover ::= !(ProgramElement_first | ".")

src/main/grammars/datalog.flex

@@ -56,6 +56,7 @@ MACRO_CONTINUATION = \\[ \t\f]*{LINE_BREAK}
   {WHITE_SPACE}         { return WHITE_SPACE; }
 
   "#include"            { return INCLUDE_DIRECTIVE; }
+  "#if"                 {return IF_DIRECTIVE; }
   "#ifdef"              { return IFDEF_DIRECTIVE; }
   "#ifndef"             { return IFNDEF_DIRECTIVE; }
   "#elif"               { return ELIF_DIRECTIVE; }

src/main/kotlin/com/lfrobeen/datalog/ide/folding/DatalogFoldingBuilder.kt

@@ -44,7 +44,7 @@ class DatalogFoldingBuilder : FoldingBuilderEx() {
 
             is DatalogStatement ->
                 return node.fact?.atom?.anyReference?.text?.let { "$it(...)." }
-                    ?: node.clause?.clauseHead?.atom?.anyReference?.text?.let { "$it(...) :- (...)." }
+//                    ?: node.clause?.clauseHead?.atomList?.anyReference?.text?.let { "$it(...) :- (...)." }
                     ?: "..."
         }
 

src/main/kotlin/com/lfrobeen/datalog/ide/highlight/DatalogSyntaxHighlighter.kt

@@ -37,7 +37,7 @@ class DatalogSyntaxHighlighter : SyntaxHighlighterBase() {
             // IDENTIFIER -> DatalogColors.IDENTIFIER
 
             DEFINE_DIRECTIVE, INCLUDE_DIRECTIVE,
-            IFDEF_DIRECTIVE, IFNDEF_DIRECTIVE, ENDIF_DIRECTIVE ->
+            IF_DIRECTIVE, ELSE_DIRECTIVE, IFDEF_DIRECTIVE, IFNDEF_DIRECTIVE, ENDIF_DIRECTIVE ->
                 DatalogColors.PREPROCESSOR
 
 

src/main/kotlin/com/lfrobeen/datalog/ide/lineMarkers/DatalogRuleToRelationLineMarkerProvider.kt

@@ -16,14 +16,18 @@ class DatalogRuleToRelationLineMarkerProvider : RelatedItemLineMarkerProvider()
         if (element !is DatalogClause)
             return
 
-        val relationRef = element.clauseHead.atom.anyReference.reference
-        val relation = relationRef?.resolve() as? DatalogRelDeclImpl ?: return
+        val atoms = element.clauseHead.atomList
+        atoms.forEach {
+            val relationRef = it.anyReference.reference
+            val relation = relationRef?.resolve() as? DatalogRelDeclImpl ?: return
 
-        val builder = NavigationGutterIconBuilder
-            .create(AllIcons.Gutter.ImplementingMethod)
-            .setTargets(listOf(relation))
-            .setTooltipText("Rule for relation ${relation.name}")
+            val builder = NavigationGutterIconBuilder
+                .create(AllIcons.Gutter.ImplementingMethod)
+                .setTargets(listOf(relation))
+                .setTooltipText("Rule for relation ${relation.name}")
+
+            result.add(builder.createLineMarkerInfo(element))
+        }
 
-        result.add(builder.createLineMarkerInfo(element))
     }
 }