Browse Source

Renommage methode

Arthur Brandao 6 years ago
parent
commit
3c092e24d9
3 changed files with 5 additions and 5 deletions
  1. 1 1
      src/migl/lisp/Lisp.java
  2. 3 3
      src/migl/lisp/LispImpl.java
  3. 1 1
      src/migl/lisp/REPL.java

+ 1 - 1
src/migl/lisp/Lisp.java

@@ -39,7 +39,7 @@ public interface Lisp {
      * @throws LispError
      *             if the expression is malformed or cannot be evaluated.
      */
-    default Object evaluateExpr(String expr) throws LispError {
+    default Object eval(String expr) throws LispError {
         return evaluate(parse(expr));
     }
 }

+ 3 - 3
src/migl/lisp/LispImpl.java

@@ -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);
 	}

+ 1 - 1
src/migl/lisp/REPL.java

@@ -33,7 +33,7 @@ public class REPL {
                     break;
                 }
                 try {
-                    System.out.println(lisp.evaluateExpr(line));
+                    System.out.println(lisp.eval(line));
                 } catch (LispError le) {
                     System.out.println("Error: " + le.getMessage());
                 }