|
@@ -160,9 +160,9 @@ public class LispImpl implements Lisp {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
public Object evaluate(Object ex) throws LispError {
|
|
|
if(ex instanceof ConsList) {
|
|
|
- return evaluate((ConsList<Object>) ex);
|
|
|
+ return eval((ConsList<Object>) ex);
|
|
|
}
|
|
|
- return evaluate(ConsListFactory.singleton(ex));
|
|
|
+ return eval(ConsListFactory.singleton(ex));
|
|
|
}
|
|
|
|
|
|
/* --- Verification --- */
|
|
@@ -298,7 +298,7 @@ public class LispImpl implements Lisp {
|
|
|
* @return Valeur évaluer
|
|
|
* @throws LispError
|
|
|
*/
|
|
|
- private static LispElement<?> evaluate(ConsList<Object> lisp) throws LispError {
|
|
|
+ private static LispElement<?> eval(ConsList<Object> lisp) throws LispError {
|
|
|
LispOperator op = operators.get(LispElement.generate(lisp.car()).toStr());
|
|
|
if(op == null) {
|
|
|
throw new LispError(new UnsupportedOperationException("Unknow expression"));
|
|
@@ -321,7 +321,7 @@ public class LispImpl implements Lisp {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
private static LispElement<?> getElement(Object elt) throws LispError {
|
|
|
if(elt instanceof ConsList) {
|
|
|
- return evaluate((ConsList<Object>) elt);
|
|
|
+ return eval((ConsList<Object>) elt);
|
|
|
}
|
|
|
return LispElement.generate(elt);
|
|
|
}
|