Add LinguisticDescriptor concept and apply in LinguisticPattern&Context

Author: dzikoysk

light-core/src/main/java/org/panda_lang/light/framework/design/architecture/linguistic/Context.java

@@ -22,7 +22,7 @@
 
 public interface Context {
 
- @Nullable LinguisticAct find(String sentence, @Nullable LinguisticCandidate<LinguisticAct> previousCandidate);
+ @Nullable LinguisticAct find(String sentence, @Nullable LinguisticCandidate<LinguisticDescriptor> previousCandidate);
 
  void importComponent(ContextComponent<?> component);
 

light-core/src/main/java/org/panda_lang/light/framework/design/architecture/linguistic/ContextComponent.java

@@ -23,7 +23,7 @@
 
 public interface ContextComponent<T> {
 
- LinguisticCandidate<LinguisticAct> recognize(Context context, String sentence, @Nullable LinguisticCandidate<LinguisticAct> previousCandidate);
+ LinguisticCandidate<LinguisticDescriptor> recognize(Context context, String sentence, @Nullable LinguisticCandidate<LinguisticDescriptor> previousCandidate);
 
  void registerElement(T element);
 

light-core/src/main/java/org/panda_lang/light/framework/design/architecture/linguistic/LinguisticDescriptor.java

@@ -0,0 +1,9 @@
+package org.panda_lang.light.framework.design.architecture.linguistic;
+
+public interface LinguisticDescriptor {
+
+ LinguisticAct[] getActs();
+
+ String getIdentifier();
+
+}

light-core/src/main/java/org/panda_lang/light/framework/design/architecture/linguistic/phraseme/Phraseme.java

@@ -16,15 +16,13 @@
 
 package org.panda_lang.light.framework.design.architecture.linguistic.phraseme;
 
-import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
+import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticDescriptor;
 import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticPattern;
 
-public interface Phraseme {
+public interface Phraseme extends LinguisticDescriptor {
 
  void increaseUsages();
 
  LinguisticPattern getPattern();
 
- LinguisticAct getAct();
-
 }

light-core/src/main/java/org/panda_lang/light/framework/design/architecture/linguistic/type/TypeResolver.java

@@ -18,10 +18,10 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.panda_lang.light.framework.design.architecture.linguistic.ContextComponent;
-import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
+import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticDescriptor;
 
 public interface TypeResolver {
 
- @Nullable LinguisticAct resolve(ContextComponent<Type<?>> component, String sentence);
+ @Nullable LinguisticDescriptor resolve(ContextComponent<Type<?>> component, String sentence);
 
 }

light-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/LinguisticCandidate.java

@@ -16,46 +16,19 @@
 
 package org.panda_lang.light.framework.design.interpreter.pattern.linguistic;
 
-import org.jetbrains.annotations.Nullable;
-
 public class LinguisticCandidate<T> {
 
- private final boolean matched;
+ private static final LinguisticCandidate<?> NOT_MATCHED = new LinguisticCandidate<>(null, null);
+
  private final T matchedElement;
  private final LinguisticPatternResult<T> linguisticResult;
- private final LinguisticCandidate<T> previousCandidate;
- private boolean definite;
 
- public LinguisticCandidate(boolean matched, boolean definite, T matchedElement, LinguisticPatternResult<T> linguisticResult, LinguisticCandidate<T> previousCandidate) {
- this.matched = matched;
- this.definite = definite;
+ public LinguisticCandidate(T matchedElement, LinguisticPatternResult<T> linguisticResult) {
  this.matchedElement = matchedElement;
  this.linguisticResult = linguisticResult;
- this.previousCandidate = previousCandidate;
- }
-
- public LinguisticCandidate(T matchedElement, LinguisticPatternResult<T> linguisticResult, @Nullable LinguisticCandidate<T> previousCandidate) {
- this(true, true, matchedElement, linguisticResult, previousCandidate);
  }
-
- public LinguisticCandidate(T matchedElement, LinguisticPatternResult<T> linguisticResult) {
- this(matchedElement, linguisticResult, null);
- }
-
- public LinguisticCandidate(boolean matched) {
- this(matched, true, null, null, null);
- }
-
- public boolean isDefinite() {
- return definite;
- }
-
  public boolean isMatched() {
- return matched;
- }
-
- public LinguisticCandidate<T> getPreviousCandidate() {
- return previousCandidate;
+ return matchedElement != null;
  }
 
  public LinguisticPatternResult<T> getLinguisticResult() {
@@ -66,4 +39,9 @@ public T getMatchedElement() {
  return matchedElement;
  }
 
+ @SuppressWarnings("unchecked")
+ public static <T> LinguisticCandidate<T> notMatched() {
+ return (LinguisticCandidate<T>) NOT_MATCHED;
+ }
+
 }

light-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/LinguisticExtractor.java

@@ -19,27 +19,27 @@
 import org.jetbrains.annotations.Nullable;
 import org.panda_lang.light.LightException;
 import org.panda_lang.light.framework.design.architecture.linguistic.Context;
-import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
+import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticDescriptor;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.extractor.LexicalExtractor;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.extractor.LexicalExtractorResult;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.extractor.LexicalExtractorWorker;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.extractor.processed.WildcardProcessor;
 
-public class LinguisticExtractor implements LexicalExtractor<LinguisticAct> {
+class LinguisticExtractor implements LexicalExtractor<LinguisticDescriptor> {
 
  private final Context context;
  private final LinguisticPattern pattern;
- private final @Nullable LinguisticCandidate<LinguisticAct> previousCandidate;
+ private final @Nullable LinguisticCandidate<LinguisticDescriptor> previousCandidate;
 
- public LinguisticExtractor(Context context, LinguisticPattern pattern, @Nullable LinguisticCandidate<LinguisticAct> previousResult) {
+ LinguisticExtractor(Context context, LinguisticPattern pattern, @Nullable LinguisticCandidate<LinguisticDescriptor> previousResult) {
  this.pattern = pattern;
  this.context = context;
  this.previousCandidate = previousResult;
  }
 
  @Override
- public LexicalExtractorResult<LinguisticAct> extract(String phrase) {
- WildcardProcessor<LinguisticAct> wildcardProcessor = null;
+ public LexicalExtractorResult<LinguisticDescriptor> extract(String phrase) {
+ WildcardProcessor<LinguisticDescriptor> wildcardProcessor = null;
 
  if (pattern.getWildcardProcessor() != null) {
  wildcardProcessor = (details, wildcard) -> {
@@ -55,7 +55,7 @@ public LexicalExtractorResult<LinguisticAct> extract(String phrase) {
  wildcardProcessor = pattern.getLexicalPattern().getWildcardProcessor();
  }
 
- LexicalExtractorWorker<LinguisticAct> extractorWorker = new LexicalExtractorWorker<>(wildcardProcessor);
+ LexicalExtractorWorker<LinguisticDescriptor> extractorWorker = new LexicalExtractorWorker<>(wildcardProcessor);
  return extractorWorker.extract(pattern.getLexicalPattern().getModel(), phrase);
  }
 

light-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/LinguisticPattern.java

@@ -18,28 +18,28 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.panda_lang.light.framework.design.architecture.linguistic.Context;
-import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
+import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticDescriptor;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.LexicalPattern;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.extractor.LexicalExtractorResult;
 
 public class LinguisticPattern {
 
- private final LexicalPattern<LinguisticAct> lexicalPattern;
+ private final LexicalPattern<LinguisticDescriptor> lexicalPattern;
  private @Nullable LinguisticWildcardProcessor wildcardProcessor;
 
- public LinguisticPattern(LexicalPattern<LinguisticAct> lexicalPattern, @Nullable LinguisticWildcardProcessor wildcardProcessor) {
+ public LinguisticPattern(LexicalPattern<LinguisticDescriptor> lexicalPattern, @Nullable LinguisticWildcardProcessor wildcardProcessor) {
  this.lexicalPattern = lexicalPattern;
  this.wildcardProcessor = wildcardProcessor;
  }
 
- public LinguisticPatternResult<LinguisticAct> match(String sentence, Context context, @Nullable LinguisticCandidate<LinguisticAct> previousResult) {
+ public LinguisticPatternResult<LinguisticDescriptor> match(String sentence, Context context, @Nullable LinguisticCandidate<LinguisticDescriptor> previousResult) {
  LinguisticExtractor extractor = new LinguisticExtractor(context, this, previousResult);
- LexicalExtractorResult<LinguisticAct> result = lexicalPattern.extract(extractor, sentence);
+ LexicalExtractorResult<LinguisticDescriptor> result = lexicalPattern.extract(extractor, sentence);
 
  return new LinguisticPatternResult<>(result);
  }
 
- public void setWildcardProcessor(LinguisticWildcardProcessor wildcardProcessor) {
+ public void setWildcardProcessor(@Nullable LinguisticWildcardProcessor wildcardProcessor) {
  this.wildcardProcessor = wildcardProcessor;
  }
 
@@ -51,7 +51,7 @@ public boolean hasWildcardProcessor() {
  return wildcardProcessor;
  }
 
- public LexicalPattern<LinguisticAct> getLexicalPattern() {
+ public LexicalPattern<LinguisticDescriptor> getLexicalPattern() {
  return lexicalPattern;
  }
 

light-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/LinguisticPatternBuilder.java

@@ -16,13 +16,13 @@
 
 package org.panda_lang.light.framework.design.interpreter.pattern.linguistic;
 
-import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
+import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticDescriptor;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.LexicalPattern;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.extractor.processed.WildcardProcessor;
 
 public class LinguisticPatternBuilder {
 
- private LexicalPattern<LinguisticAct> pattern;
+ private LexicalPattern<LinguisticDescriptor> pattern;
  private LinguisticWildcardProcessor wildcardProcessor;
 
  public LinguisticPatternBuilder compile(String pattern) {
@@ -33,18 +33,18 @@ public LinguisticPatternBuilder compile(String pattern) {
  return this;
  }
 
- public LinguisticPattern build() {
- return new LinguisticPattern(pattern, wildcardProcessor);
- }
-
- public LinguisticPatternBuilder setWildcardProcessor(WildcardProcessor<LinguisticAct> wildcardProcessor) {
+ public LinguisticPatternBuilder wildcardProcessor(WildcardProcessor<LinguisticDescriptor> wildcardProcessor) {
  pattern.setWildcardProcessor(wildcardProcessor);
  return this;
  }
 
- public LinguisticPatternBuilder setWildcardProcessor(LinguisticWildcardProcessor wildcardProcessor) {
+ public LinguisticPatternBuilder wildcardProcessor(LinguisticWildcardProcessor wildcardProcessor) {
  this.wildcardProcessor = wildcardProcessor;
  return this;
  }
 
+ public LinguisticPattern build() {
+ return new LinguisticPattern(pattern, wildcardProcessor);
+ }
+
 }

light-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/LinguisticPatternCompiler.java

@@ -16,25 +16,25 @@
 
 package org.panda_lang.light.framework.design.interpreter.pattern.linguistic;
 
-import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
+import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticDescriptor;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.LexicalPattern;
 
-public class LinguisticPatternCompiler {
+class LinguisticPatternCompiler {
 
  private final String pattern;
- private LexicalPattern<LinguisticAct> lexicalPattern;
+ private LexicalPattern<LinguisticDescriptor> lexicalPattern;
 
- public LinguisticPatternCompiler(String pattern) {
+ LinguisticPatternCompiler(String pattern) {
  this.pattern = pattern;
  }
 
- public void compile() {
- this.lexicalPattern = LexicalPattern.<LinguisticAct> builder()
+ protected void compile() {
+ this.lexicalPattern = LexicalPattern.<LinguisticDescriptor> builder()
  .compile(pattern)
  .build();
  }
 
- public LexicalPattern<LinguisticAct> getLexicalPattern() {
+ protected LexicalPattern<LinguisticDescriptor> getLexicalPattern() {
  return lexicalPattern;
  }