cbore: typo and comments

killme2008 · Jun 9, 2024 · 0ec087c · 0ec087c
1 parent ad9a3f1
commit 0ec087c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/src/main/java/com/googlecode/aviator/AviatorEvaluator.java b/src/main/java/com/googlecode/aviator/AviatorEvaluator.java
@@ -430,7 +430,7 @@ public static AviatorFunction removeOpFunction(final OperatorType opType) {
 
 
   /**
-   * Check if the function is existed in aviator
+   * Check if the function exists in the global evaluator instance.
    *
    * @param name
    * @return

diff --git a/src/main/java/com/googlecode/aviator/AviatorEvaluatorInstance.java b/src/main/java/com/googlecode/aviator/AviatorEvaluatorInstance.java
@@ -1327,7 +1327,7 @@ public AviatorFunction removeOpFunction(final OperatorType opType) {
   }
 
   /**
-   * Check if the function is existed in evaluator. Note: it doesn't check the runtime defined
+   * Check if the function exists in the evaluator. Note: it doesn't check the runtime defined
    * functions.
    *
    * @param name
@@ -1337,13 +1337,10 @@ public boolean containsFunction(final String name) {
     boolean exists = this.funcMap.containsKey(name);
     if (!exists && this.functionLoaders != null) {
       for (FunctionLoader loader : this.functionLoaders) {
-        if (loader != null) {
-          if (loader.onFunctionNotFound(name) != null) {
-            exists = true;
-            break;
-          }
+        if (loader != null && loader.onFunctionNotFound(name) != null) {
+          exists = true;
+          break;
         }
-
       }
     }
 

diff --git a/src/main/java/com/googlecode/aviator/Expression.java b/src/main/java/com/googlecode/aviator/Expression.java
@@ -29,18 +29,18 @@
 public interface Expression extends Serializable {
 
   /**
-   * Execute expression with environment
+   * Execute an expression with an environment, returns the result.
    *
    * @param env Binding variable environment
-   * @return
+   * @return the result of execution
    */
   Object execute(Map<String, Object> env);
 
 
   /**
-   * Execute expression with empty environment
+   * Execute an expression with an empty environment, returns the result.
    *
-   * @return
+   * @return the result of execution
    */
   Object execute();
 
@@ -55,7 +55,7 @@ public interface Expression extends Serializable {
 
   /**
    * Returns this expression's all uninitialized global variable names in order when using
-   * AviatorEvaluator.EVAL mode,else returns an empty list.
+   * AviatorEvaluator.EVAL mode, otherwise returns an empty list.
    *
    * @see com.googlecode.aviator.AviatorEvaluator#EVAL
    * @return
@@ -65,7 +65,7 @@ public interface Expression extends Serializable {
 
   /**
    * Returns this expression's all uninitialized global variable full names(contains dot) in order
-   * when using AviatorEvaluator.EVAL mode,else returns an empty list.
+   * when using AviatorEvaluator.EVAL mode, otherwise returns an empty list.
    *
    * @return
    */
@@ -90,8 +90,8 @@ public interface Expression extends Serializable {
   String addSymbol(String name);
 
   /**
-   * Returns the function names in the expression when using AviatorEvaluator.EVAL mode,else returns
-   * an empty list.
+   * Returns the function names in the expression when using AviatorEvaluator.EVAL mode, otherwise
+   * returns an empty list.
    * 
    * @since 5.4.2
    * @return the function name list