Replace LinguisticResultUtils with LightContextUtils, move the phrasemes wildcard processor to the phraseme package

Author: dzikoysk

light-core/src/main/java/org/panda_lang/light/framework/language/architecture/linguistic/LightContext.java

@@ -22,7 +22,6 @@
 import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
 import org.panda_lang.light.framework.design.architecture.linguistic.type.Type;
 import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticCandidate;
-import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticResultUtils;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -69,7 +68,7 @@ public void importComponent(ContextComponent<?> component) {
  return null;
  }
 
- return LinguisticResultUtils.assignParameters(candidate);
+ return LightContextUtils.assignParameters(candidate);
  }
 
  private LinguisticCandidate<LinguisticAct> findNext(String sentence, @Nullable LinguisticCandidate<LinguisticAct> previousCandidate) {

…rn/linguistic/LinguisticResultUtils.java …ecture/linguistic/LightContextUtils.javalight-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/LinguisticResultUtils.java renamed to light-core/src/main/java/org/panda_lang/light/framework/language/architecture/linguistic/LightContextUtils.java light-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/LinguisticResultUtils.java renamed to light-core/src/main/java/org/panda_lang/light/framework/language/architecture/linguistic/LightContextUtils.java

@@ -1,31 +1,18 @@
-/*
- * Copyright (c) 2016-2018 Dzikoysk
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.panda_lang.light.framework.design.interpreter.pattern.linguistic;
+package org.panda_lang.light.framework.language.architecture.linguistic;
 
 import org.jetbrains.annotations.Nullable;
 import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticAct;
 import org.panda_lang.light.framework.design.architecture.linguistic.LinguisticUtils;
 import org.panda_lang.light.framework.design.architecture.linguistic.type.Type;
+import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticCandidate;
 import org.panda_lang.panda.framework.design.runtime.ExecutableBranch;
 import org.panda_lang.panda.framework.language.interpreter.pattern.lexical.extractor.LexicalExtractorResult;
 
-public class LinguisticResultUtils {
+class LightContextUtils {
+
+ private LightContextUtils() { }
 
- public static @Nullable LinguisticAct assignParameters(LinguisticCandidate<LinguisticAct> candidate) {
+ protected static @Nullable LinguisticAct assignParameters(LinguisticCandidate<LinguisticAct> candidate) {
  LinguisticAct act = candidate.getMatchedElement();
 
  if (!candidate.isMatched() || act == null) {

light-core/src/main/java/org/panda_lang/light/framework/language/architecture/linguistic/phraseme/Phrasemes.java

@@ -23,7 +23,6 @@
 import org.panda_lang.light.framework.design.architecture.linguistic.phraseme.Phraseme;
 import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticCandidate;
 import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticPatternResult;
-import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.PhrasemesWildcardProcessor;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -52,7 +51,7 @@ public LinguisticCandidate<LinguisticAct> recognize(Context context, String sent
 
  @Override
  public void registerElement(Phraseme phraseme) {
- phraseme.getPattern().setWildcardProcessor(PhrasemesWildcardProcessor.getInstance());
+ phraseme.getPattern().setWildcardProcessor(PhrasemesProcessor.getInstance());
  phrasemes.add(phraseme);
  }
 

…nguistic/PhrasemesWildcardProcessor.java …guistic/phraseme/PhrasemesProcessor.javalight-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/PhrasemesWildcardProcessor.java renamed to light-core/src/main/java/org/panda_lang/light/framework/language/architecture/linguistic/phraseme/PhrasemesProcessor.java light-core/src/main/java/org/panda_lang/light/framework/design/interpreter/pattern/linguistic/PhrasemesWildcardProcessor.java renamed to light-core/src/main/java/org/panda_lang/light/framework/language/architecture/linguistic/phraseme/PhrasemesProcessor.java

@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-package org.panda_lang.light.framework.design.interpreter.pattern.linguistic;
+package org.panda_lang.light.framework.language.architecture.linguistic.phraseme;
 
 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.type.Type;
+import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticCandidate;
+import org.panda_lang.light.framework.design.interpreter.pattern.linguistic.LinguisticWildcardProcessor;
 
-public class PhrasemesWildcardProcessor implements LinguisticWildcardProcessor {
+public class PhrasemesProcessor implements LinguisticWildcardProcessor {
 
- private static final PhrasemesWildcardProcessor INSTANCE = new PhrasemesWildcardProcessor();
+ private static final PhrasemesProcessor INSTANCE = new PhrasemesProcessor();
 
  @Override
  public @Nullable LinguisticAct handle(Context context, String details, String wildcard, @Nullable LinguisticCandidate<LinguisticAct> previousCandidate) {
@@ -47,7 +49,7 @@ public class PhrasemesWildcardProcessor implements LinguisticWildcardProcessor {
  return matchedAct;
  }
 
- public static PhrasemesWildcardProcessor getInstance() {
+ public static PhrasemesProcessor getInstance() {
  return INSTANCE;
  }
 

light-core/src/main/java/org/panda_lang/light/framework/language/architecture/linguistic/phraseme/loader/PhrasemeGroupLoader.java

@@ -27,7 +27,6 @@ protected Collection<Phraseme> load(Context context, AnnotationsScannerProcess p
  return phrasemes;
  }
 
- // TODO: \o/
  private Phraseme loadPhrasemeGroup(Context context, Class<?> clazz) throws Exception {
  String phrasemeGroup = clazz.getAnnotation(PhrasemeGroup.class).value();
 

light-core/src/main/java/org/panda_lang/light/framework/language/resource/phrasemes/ConsolePhraseme.java

@@ -29,7 +29,7 @@ public void sendMessageToConsole(@Id("message") String message) {
  }
 
  @PhrasemeVariant
- public void sendMessageToConsole(@Id("message") boolean message) {
+ public void sendMessageToConsole(boolean message) {
  System.out.println("boolean::" + message);
  }