|
@@ -170,7 +170,7 @@ public class LispImpl implements Lisp {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
public Object evaluate(Object lisp) throws LispError {
|
|
|
if(lisp instanceof ConsList) {
|
|
|
- return eval((ConsList<Object>) lisp);
|
|
|
+ return evaluateList((ConsList<Object>) lisp);
|
|
|
}
|
|
|
//Si element seul on évalue directement sa valeur
|
|
|
try {
|
|
@@ -314,7 +314,7 @@ public class LispImpl implements Lisp {
|
|
|
* @return Valeur évaluer
|
|
|
* @throws LispError
|
|
|
*/
|
|
|
- private static LispElement<?> eval(ConsList<Object> lisp) throws LispError {
|
|
|
+ private static LispElement<?> evaluateList(ConsList<Object> lisp) throws LispError {
|
|
|
LispOperator op = operators.get(LispElement.generate(lisp.car()).toStr());
|
|
|
if(op == null) {
|
|
|
throw new LispError(new UnsupportedOperationException("Unknow expression"));
|
|
@@ -339,7 +339,7 @@ public class LispImpl implements Lisp {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
private static LispElement<?> getElement(Object elt) throws LispError {
|
|
|
if(elt instanceof ConsList) {
|
|
|
- return eval((ConsList<Object>) elt);
|
|
|
+ return evaluateList((ConsList<Object>) elt);
|
|
|
}
|
|
|
return LispElement.generate(elt);
|
|
|
}
|