Sfoglia il codice sorgente

Ajout # dans le regex de verification

Arthur Brandao 6 anni fa
parent
commit
08de512a2e
1 ha cambiato i file con 2 aggiunte e 3 eliminazioni
  1. 2 3
      src/migl/lisp/LispImpl.java

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

@@ -46,12 +46,11 @@ public class LispImpl implements Lisp {
 		if(expr.charAt(0) == '(') {
 			return this.verifyList(expr);
 		}
-		System.out.println("Ici");
 		return this.verifyElement(expr);
 	}
 	
 	private boolean verifyList(String expr) {
-		Pattern p = Pattern.compile("\\(([ |\t]*[A-Za-z0-9\\.\\+\\-<>=\\/\\*]+[ |\t]*)+\\)");
+		Pattern p = Pattern.compile("\\(([ |\t]*[A-Za-z0-9\\.\\+\\-\\/\\*<>=#]+[ |\t]*)+\\)");
 		Matcher m = p.matcher(expr);
 		//Si pas de correspondance
 		if(!m.find()) {
@@ -74,7 +73,7 @@ public class LispImpl implements Lisp {
 	}
 	
 	private boolean verifyElement(String expr) {
-		Pattern p = Pattern.compile("[ |\t]*[A-Za-z0-9\\.\\+\\-<>=\\/\\*]+[ |\t]*");
+		Pattern p = Pattern.compile("[ |\t]*[A-Za-z0-9\\.\\+\\-\\/\\*<>=#]+[ |\t]*");
 		Matcher m = p.matcher(expr);
 		return m.find();
 	}