feat: Add support for Token Based validators (WIP #2)

Author: Steve Ramage

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/grammar/GrammarOptionValue.kt

@@ -46,7 +46,14 @@ interface Combinator {
 
 interface TerminalCombinator : Combinator
 
-data class MatchResult(val tokens: List<String>, val matchResult: Int, val terminals: List<TerminalCombinator> )
+data class MatchResult(val tokens: List<String>, val matchResult: Int, val terminals: List<TerminalCombinator> ) {
+  init {
+    if (tokens.size != terminals.size) {
+      throw IllegalArgumentException("Tokens and terminals must be the same size, ${tokens.size} != ${terminals.size}")
+    }
+  }
+}
+
 
 val NoMatch = MatchResult(emptyList(), -1, emptyList())
 
@@ -65,7 +72,7 @@ class RegexTerminal(val syntaticMatchStr : String, val semanticMatchStr: String
   override fun SemanticMatch(value: String, offset: Int): MatchResult {
     val matchResult = semanticMatch.matchAt(value, offset)  ?: return NoMatch
 
-    return MatchResult(listOf(matchResult.value), offset + matchResult.value.length, listOf())
+    return MatchResult(listOf(matchResult.value), offset + matchResult.value.length, listOf(this))
   }
 }
 
@@ -200,9 +207,9 @@ class OneOrMore(val combinator : Combinator) : Combinator {
     while (match.matchResult != -1) {
       index = match.matchResult
       tokens.addAll(match.tokens)
+      terminals.addAll(match.terminals)
 
       match = f(value, index)
-      terminals.addAll(match.terminals)
     }
 
     return MatchResult(tokens, index, terminals)
@@ -237,9 +244,9 @@ class ZeroOrMore(val combinator : Combinator) : Combinator {
     while (match.matchResult != -1) {
       index = match.matchResult
       tokens.addAll(match.tokens)
+      terminals.addAll(match.terminals)
 
       match = f(value, index)
-      terminals.addAll(match.terminals)
     }
 
     return MatchResult(tokens, index, terminals)

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/grammar/Grammar.kt

@@ -5,6 +5,15 @@ import junit.framework.TestCase
 class GrammarTest : TestCase() {
 
 
+  fun TerminalType(o : TerminalCombinator): String {
+    return o.javaClass.simpleName
+  }
+
+  fun TerminalTypes(os : List<TerminalCombinator>): List<String> {
+    return os.map { o -> TerminalType(o) }
+  }
+
+
   fun testRegexTerminalMatches() {
     /**
      * Fixture Setup
@@ -28,11 +37,14 @@ class GrammarTest : TestCase() {
     /**
      * Execute SUT & Verification
      */
-    assertEquals(semValid.length, regexTerminal.SemanticMatch(semValid, 0).matchResult)
-    assertEquals(listOf("1K"), regexTerminal.SemanticMatch(semValid, 0).tokens)
-
-    assertEquals(semValid.length, regexTerminal.SyntacticMatch(semValid, 0).matchResult)
-    assertEquals(listOf("1K"), regexTerminal.SyntacticMatch(semValid, 0).tokens)
+    var match = regexTerminal.SemanticMatch(semValid, 0)
+    assertEquals(semValid.length, match.matchResult)
+    assertEquals(listOf("1K"), match.tokens)
+    assertEquals(listOf("RegexTerminal"), TerminalTypes(match.terminals))
+
+    match = regexTerminal.SyntacticMatch(semValid, 0)
+    assertEquals(semValid.length, match.matchResult)
+    assertEquals(listOf("1K"), match.tokens)
 
     assertEquals(NoMatch, regexTerminal.SemanticMatch(synValid, 0))