use common method pattern between ParseContext and EvalConfig

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@1176 f203690c-595d-4dc9-a70b-905162fa7fd2

src/main/java/com/healthmarketscience/jackcess/impl/DBEvalContext.java

@@ -92,8 +92,4 @@ public class DBEvalContext implements Expressionator.ParseContext, EvalConfig
   public float getRandom(Integer seed) {
     return _rndCtx.getRandom(seed);
   }
-
-  public Function getExpressionFunction(String name) {
-    return _funcs.getFunction(name);
-  }
 }

src/main/java/com/healthmarketscience/jackcess/impl/expr/Expressionator.java

@@ -39,6 +39,7 @@ import com.healthmarketscience.jackcess.expr.EvalContext;
 import com.healthmarketscience.jackcess.expr.EvalException;
 import com.healthmarketscience.jackcess.expr.Expression;
 import com.healthmarketscience.jackcess.expr.Function;
+import com.healthmarketscience.jackcess.expr.FunctionLookup;
 import com.healthmarketscience.jackcess.expr.Identifier;
 import com.healthmarketscience.jackcess.expr.ParseException;
 import com.healthmarketscience.jackcess.expr.TemporalConfig;
@@ -67,7 +68,7 @@ public class Expressionator
   public interface ParseContext {
     public TemporalConfig getTemporalConfig();
     public SimpleDateFormat createDateFormat(String formatStr);
-    public Function getExpressionFunction(String name);
+    public FunctionLookup getFunctionLookup();
   }
 
   private enum WordType {
@@ -1109,7 +1110,7 @@ public class Expressionator
     }
 
     public Function getFunction(String funcName) {
-      return _context.getExpressionFunction(funcName);
+      return _context.getFunctionLookup().getFunction(funcName);
     }
 
     @Override

src/test/java/com/healthmarketscience/jackcess/impl/expr/ExpressionatorTest.java

@@ -27,6 +27,7 @@ import com.healthmarketscience.jackcess.TestUtil;
 import com.healthmarketscience.jackcess.expr.EvalContext;
 import com.healthmarketscience.jackcess.expr.Expression;
 import com.healthmarketscience.jackcess.expr.Function;
+import com.healthmarketscience.jackcess.expr.FunctionLookup;
 import com.healthmarketscience.jackcess.expr.Identifier;
 import com.healthmarketscience.jackcess.expr.TemporalConfig;
 import com.healthmarketscience.jackcess.expr.Value;
@@ -410,9 +411,8 @@ public class ExpressionatorTest extends TestCase
       sdf.setTimeZone(TestUtil.TEST_TZ);
       return sdf;
     }
-
-    public Function getExpressionFunction(String name) {
-      return DefaultFunctions.LOOKUP.getFunction(name);
+    public FunctionLookup getFunctionLookup() {
+      return DefaultFunctions.LOOKUP;
     }
   }