Push old pc

src/dev/peerat/mapping/TreasureProcessor.java

@@ -1,5 +1,8 @@
 package dev.peerat.mapping;
 
+import static dev.peerat.parser.visitor.Operator.*;
+import static dev.peerat.parser.java.visitor.JavaVisitor.*;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -24,7 +27,6 @@ import javax.tools.StandardLocation;
 
 import dev.peerat.mapping.providers.Provider;
 import dev.peerat.mapping.providers.ProviderManager;
-import dev.peerat.parser.ElementBuilder.Builder;
 import dev.peerat.parser.Parser;
 import dev.peerat.parser.TokenValidator;
 import dev.peerat.parser.java.Annotation;
@@ -33,6 +35,7 @@ import dev.peerat.parser.java.Function;
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.JavaFile;
 import dev.peerat.parser.java.JavaParser;
+import dev.peerat.parser.java.JavaProject;
 import dev.peerat.parser.java.operation.ReturnOperation;
 import dev.peerat.parser.java.value.InstanceValue;
 import dev.peerat.parser.java.value.StaticValue;
@@ -67,64 +70,72 @@ public class TreasureProcessor extends AbstractProcessor{
 			return false;
 		}
 		
-		Map<File, JavaFile> map = new HashMap<>();
+		JavaProject project = new JavaProject();
 		for(File workingDirectory : workingDir){
 			try {
-				parseClazz(workingDirectory, output, workingDirectory, map);
+				parseProject(workingDirectory, project);
 			}catch(Exception ex){
 				annotations.forEach((a) -> roundEnv.getElementsAnnotatedWith(a).forEach((e) -> processingEnv.getMessager().printMessage(Kind.ERROR, ex.getMessage(), e)));
 			}
 		}
-		Provider provider = null;
+		
-		for(Entry<File, JavaFile> classes : map.entrySet()){
+		List<InstanceValue> ships = or(
-			List<InstanceValue> values = new ArrayList<>();
+				collect(allInstanceValue().named((name) -> name.equals("dev.peerat.mapping.Ship")))
-			classes.getValue().findAll((e) -> {
+				,
-				if(e instanceof InstanceValue){
+				and(
-					InstanceValue iv = (InstanceValue)e;
+					allImport().named((name) -> name.equals("dev.peerat.mapping.Ship"))
-					return iv.getToken().getValue().equals("Ship()"); //can also be dev.peerat.mapping.Ship
+					,
-				}
+					collect(allInstanceValue().named((name) -> name.equals("Ship")))
-				return false;
+				)
-			}, values);
+			).visit(project).toList();
-			if(values.size() < 1) continue;
+		if(ships.isEmpty()) return false;
-			InstanceValue ship = (InstanceValue)values.get(0);
+
-			String providerType = ((StaticValue)ship.getParameters().get(0)).getToken().getValue().replace("\"", "");
+		//TODO accept multiple instance of Ship
-			provider = ProviderManager.getInstance().getProvider(providerType);
+		
-		}
+		InstanceValue ship = (InstanceValue)ships.get(0);
+		String providerType = ((StaticValue)ship.getParameters().get(0)).getToken().getValue().replace("\"", "");
+		Provider provider = ProviderManager.getInstance().getProvider(providerType);
 		
 		if(provider == null) return false;
 		
 		try {
 			provider.init(output);
-			throw new Exception(output.getAbsolutePath());
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
 		
-//		for(Entry<File, JavaFile> classes : map.entrySet()){
+		List<Class> treasures = or(
-//			Class treasure = classes.getValue().find((element) -> {
+				and(
-//				if(element instanceof Class){
+						allImport().named((name) -> name.equals("dev.peerat.mapping.Treasure"))
-//					Class c = (Class)element;
+						,
-//					return c.hasAnnotation((annotation) -> annotation.getName().getValue().equals("Treasure")); //can also be dev.peerat.mapping.Treasure
+						allClass().
-//				}
+						annotation(
-//				return false;
+								annotation().nameFilter((name) -> name.equals("Treasure") || name.equals("dev.peerat.mapping.Treasure"))
-//			});
+								)
-//			if(treasure != null){
+				)
-//				provider.mapTreasure(treasure);
+				,
-////				annotations.forEach((a) -> roundEnv.getElementsAnnotatedWith(a).forEach((e) -> processingEnv.getMessager().printMessage(Kind.ERROR, classes.getKey().getName(), e)));
+				allClass().
-//				List<Function> seaBottles = new ArrayList<>();
+					annotation(
-//				treasure.findAll((element) -> {
+							annotation().nameFilter((name) -> name.equals("dev.peerat.mapping.Treasure"))
-//					if(element instanceof Function){
+							)
-//						Function function = (Function)element;
+				).visit(project).toList();
-//						return function.hasAnnotation((annotation) -> annotation.getName().getValue().equals("SeaBottle")); //can also be dev.peerat.mapping.SeaBottle
+				
-//					}
+		for(Class treasure : treasures){
-//					return false;
+			provider.mapTreasure(treasure);
-//				}, seaBottles);
+//			annotations.forEach((a) -> roundEnv.getElementsAnnotatedWith(a).forEach((e) -> processingEnv.getMessager().printMessage(Kind.ERROR, classes.getKey().getName(), e)));
-//				for(Function function : seaBottles){
+			List<Function> seaBottles = new ArrayList<>();
-//					provider.mapBottle(treasure, function);
+			treasure.findAll((element) -> {
-//				}
+				if(element instanceof Function){
-//			}
+					Function function = (Function)element;
-//		}
+					return function.hasAnnotation((annotation) -> annotation.getName().getValue().equals("SeaBottle")); //can also be dev.peerat.mapping.SeaBottle
-//		
+				}
+				return false;
+			}, seaBottles);
+			for(Function function : seaBottles){
+				provider.mapBottle(treasure, function);
+			}
+		}
+		
 //		for(Entry<File, JavaFile> classes : map.entrySet()){
 //			List<Class> noTreasures = new ArrayList<>();
 //			classes.getValue().findAll((element) -> {
@@ -148,12 +159,30 @@ public class TreasureProcessor extends AbstractProcessor{
 //				}
 //			}
 //		}
-//		provider.complete();
+		provider.complete();
-//		return true;
+		return true;
 	  }
 	
 	private static final Parser<JavaElement> PARSER = new JavaParser();
 	
+	private void parseProject(File file, JavaProject project) throws Exception{
+		if(file.isDirectory()){
+			for(File child : file.listFiles()) parseProject(child, project);
+			return;
+		}
+		if(!file.getName().endsWith(".java")) return;
+		try {
+			BufferedReader reader = new BufferedReader(new FileReader(file));
+			JavaFile javaFile = new JavaFile();
+			TokenValidator.TOKENS = 0;
+			TokenValidator.MAX_VALIDATE = 0;
+			PARSER.parse(reader, javaFile);
+			project.addFile(javaFile);
+		}catch(Exception ex){
+			error(null, null, file,  new Exception(file.getName()+" | "+ex.getMessage()));
+		}
+	}
+	
 	private void parseClazz(File source, File output, File file, Map<File, JavaFile> map) throws Exception{
 		if(file.isDirectory()){
 			for(File child : file.listFiles()) parseClazz(source, output, child, map);
@@ -201,9 +230,9 @@ public class TreasureProcessor extends AbstractProcessor{
 		}else{
 			processOthers(file);
 		}
-		Builder builder = new Builder();
+//		Builder builder = new Builder();
-		file.build(builder);
+//		file.build(builder);
-		builder.build(writer);
+//		builder.build(writer);
 		
 	}
 	

src/dev/peerat/mapping/providers/Provider.java

@@ -5,6 +5,9 @@ import java.io.File;
 import dev.peerat.mapping.Ship;
 import dev.peerat.parser.java.Class;
 import dev.peerat.parser.java.Function;
+import dev.peerat.parser.java.JavaElement;
+import dev.peerat.parser.java.value.InstanceValue;
+import dev.peerat.parser.java.value.MethodCallValue;
 
 public interface Provider{
 	
@@ -14,7 +17,8 @@ public interface Provider{
 	
 	void mapBottle(Class clazz, Function function);
 
-	void mapUses(Class clazz, Function function);
+	void mapCreation(Class clazz, JavaElement container,  InstanceValue value);
+	void mapEdit(Class clazz, JavaElement container, MethodCallValue value);
 	
 	void complete();
 	

src/dev/peerat/mapping/providers/mysql/MySQlProvider.java

@@ -19,10 +19,10 @@ import java.util.List;
 import dev.peerat.mapping.Ship;
 import dev.peerat.mapping.providers.Provider;
 import dev.peerat.mapping.providers.ProviderManager;
-import dev.peerat.parser.ElementBuilder.Builder;
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.Class;
 import dev.peerat.parser.java.Function;
+import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.JavaFile;
 import dev.peerat.parser.java.Variable;
 import dev.peerat.parser.java.builder.JavaBuilder;
@@ -31,6 +31,7 @@ import dev.peerat.parser.java.builder.JavaFunctionBuilder;
 import dev.peerat.parser.java.operation.CatchOperation;
 import dev.peerat.parser.java.operation.ReturnOperation;
 import dev.peerat.parser.java.operation.TryOperation;
+import dev.peerat.parser.java.value.InstanceValue;
 import dev.peerat.parser.java.value.MethodCallValue;
 import dev.peerat.parser.java.value.Value;
 
@@ -80,10 +81,14 @@ public class MySQLProvider implements Provider{
 	}
 
 	@Override
-	public void mapUses(Class clazz, Function function){
+	public void mapCreation(Class clazz, JavaElement container, InstanceValue value){
 		
 	}
 	
+	@Override
+	public void mapEdit(Class clazz, JavaElement container, MethodCallValue value){
+		
+	}
 
 	@Override
 	public void complete(){
@@ -91,10 +96,7 @@ public class MySQLProvider implements Provider{
 		
 		for(MySQLRequestBuilder request : this.requests){
 			Function base = request.getFunction();
-			JavaFunctionBuilder func = ofFunction(base.getReturnType().getValue(), "getter_"+base.getName().getValue()).setPublic();
+			JavaFunctionBuilder func = ofFunction().normalizeSignature(base).setName("getter_"+base.getName().getValue()).setPublic();
-			for(Variable params : base.getParameters()){
-				func.parameter(ofVariable(params.getType().getValue(), params.getName().getValue(), params.getValue()));
-			}
 			clazz.element(
 					func.element(
 						ofOperation("try{"
@@ -111,10 +113,10 @@ public class MySQLProvider implements Provider{
 				.clazz(clazz)
 				.build();
 		try{
-			Builder builder = new Builder();
+//			Builder builder = new Builder();
-			file.build(builder);
+//			file.build(builder);
 			BufferedWriter writer = new BufferedWriter(new FileWriter(this.repo));
-			builder.build(writer);
+//			builder.build(writer);
 			writer.flush();
 			writer.close();
 		}catch(Exception ex){