・文字列に対する == と != の演算を equals() を使って判定するようコード生成するように修正した．・子リソースの getter の仮引数が多すぎるという不具合を修正した．

Fork: 1

nitta-lab / AlgebraicDataflowArchitectureModel

Browse code ・文字列に対する == と != の演算を equals() を使って判定するようコード生成するように修正した．・子リソースの getter の仮引数が多すぎるという不具合を修正した． 2024_stable MODELS2025_submit bug-pathParam bug-swingNativeReceiver dynamicResourceCreation feature-addTableUI gameEngine htmlGUi language-server ...update-parser
1 parent 6e46572 commit 0a2e1899eda379997719c04d24a84407d33adc9e Naoya Nitta authored on 30 Nov

Browse code

・文字列に対する == と != の演算を equals() を使って判定するようコード生成するように修正した．

・子リソースの getter の仮引数が多すぎるという不具合を修正した．

2024_stable ...update-parser

1 parent 6e46572 commit 0a2e1899eda379997719c04d24a84407d33adc9e

Naoya Nitta authored on 30 Nov

Patch

Unified Split

Showing 5 changed files

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java
 				JavaCodeGenerator.setMainTypeName(mainTypeName);	// use model's file name as the main type's name.
			} else {
				JavaCodeGenerator.resetMainTypeName();			// use the default main type's name.
			}
			editor.setCodes(JavaMethodBodyGenerator.doGenerate(graph, model, JavaCodeGenerator.doGenerate(graph, model)));
//			editor.setCodes(new CodeGeneratorFromDataFlowGraph().generateCode(model, graph, new JavaSpecific()));
//			editor.setCodes(JavaMethodBodyGenerator.doGenerate(graph, model, JavaCodeGenerator.doGenerate(graph, model)));
			editor.setCodes(new CodeGeneratorFromDataFlowGraph().generateCode(model, graph, new JavaSpecific()));
			ModelExtension.recoverModel(model);
			for (CompilationUnit file : editor.getCodes()) {
				System.out.println(file);
			}
 				JavaCodeGenerator.setMainTypeName(mainTypeName);	// use model's file name as the main type's name.
 			} else {
 				JavaCodeGenerator.resetMainTypeName();			// use the default main type's name.
 			}
+			editor.setCodes(JavaMethodBodyGenerator.doGenerate(graph, model, JavaCodeGenerator.doGenerate(graph, model)));
+//			editor.setCodes(new CodeGeneratorFromDataFlowGraph().generateCode(model, graph, new JavaSpecific()));
+//			editor.setCodes(JavaMethodBodyGenerator.doGenerate(graph, model, JavaCodeGenerator.doGenerate(graph, model)));
+			editor.setCodes(new CodeGeneratorFromDataFlowGraph().generateCode(model, graph, new JavaSpecific()));
 			ModelExtension.recoverModel(model);
 			for (CompilationUnit file : editor.getCodes()) {
 				System.out.println(file);
 			}

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
 				if (!children.contains(child.getResourceHierarchy())) {
					children.add(child.getResourceHierarchy());
					List<VariableDeclaration> params = new ArrayList<>();
					int v = 1;
					for (Selector param: child.getSelectors()) {
						if (param.getExpression() instanceof Variable) {
							Variable var = (Variable) param.getExpression();
					Expression param = child.getPrimaryResourcePath().getLastParam();
					if (param != null) {
						if (param instanceof Variable) {
							Variable var = (Variable) param;
							params.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));
						} else if (param.getExpression() instanceof Term) {
							Term var = (Term) param.getExpression();
						} else if (param instanceof Term) {
							Term var = (Term) param;
							params.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));
						}
						v++;
					}
 				if (!children.contains(child.getResourceHierarchy())) {
 					children.add(child.getResourceHierarchy());
 					List<VariableDeclaration> params = new ArrayList<>();
 					int v = 1;
+					for (Selector param: child.getSelectors()) {
+						if (param.getExpression() instanceof Variable) {
+							Variable var = (Variable) param.getExpression();
+					Expression param = child.getPrimaryResourcePath().getLastParam();
+					if (param != null) {
+						if (param instanceof Variable) {
+							Variable var = (Variable) param;
 							params.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));
+						} else if (param.getExpression() instanceof Term) {
+							Term var = (Term) param.getExpression();
+						} else if (param instanceof Term) {
+							Term var = (Term) param;
 							params.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));
 						}
 						v++;
 					}

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
 							if (!children.contains(child.getResourceHierarchy())) {
								children.add(child.getResourceHierarchy());
								List<VariableDeclaration> params = new ArrayList<>();
								int v = 1;
								for (Selector param: child.getSelectors()) {
									if (param.getExpression() instanceof Variable) {
										Variable var = (Variable) param.getExpression();
								Expression param = child.getPrimaryResourcePath().getLastParam();
								if (param != null) {
									if (param instanceof Variable) {
										Variable var = (Variable) param;
										params.add(new VariableDeclaration(var.getType(), var.getName()));
									} else if (param.getExpression() instanceof Term) {
										Term var = (Term) param.getExpression();
									} else if (param instanceof Term) {
										Term var = (Term) param;
										params.add(new VariableDeclaration(var.getType(), "v" + v));
									}
									v++;
								}
 							if (!children.contains(child.getResourceHierarchy())) {
 								children.add(child.getResourceHierarchy());
 								List<VariableDeclaration> params = new ArrayList<>();
 								int v = 1;
+								for (Selector param: child.getSelectors()) {
+									if (param.getExpression() instanceof Variable) {
+										Variable var = (Variable) param.getExpression();
+								Expression param = child.getPrimaryResourcePath().getLastParam();
+								if (param != null) {
+									if (param instanceof Variable) {
+										Variable var = (Variable) param;
 										params.add(new VariableDeclaration(var.getType(), var.getName()));
+									} else if (param.getExpression() instanceof Term) {
+										Term var = (Term) param.getExpression();
+									} else if (param instanceof Term) {
+										Term var = (Term) param;
 										params.add(new VariableDeclaration(var.getType(), "v" + v));
 									}
 									v++;
 								}

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java

Show line notes below