MapやJson周りのバグ修正．

Fork: 1

nitta-lab / AlgebraicDataflowArchitectureModel

Browse code

MapやJson周りのバグ修正．

2024_stable ...updateHierarchicalResources

1 parent e1c1129 commit abae5cf98587a9357434a02690377995cba5d79f

Naoya Nitta authored on 30 Sep 2023

Patch

Unified Split

Showing 9 changed files

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
 							childGetter.addChild(new Field(fieldName, getImplStateType(child, langSpec)));
						}
						composer = new Term(DataConstraintModel.insert);
						composer.addChild(composerSub);
						composer.addChild(new Constant(fieldName, DataConstraintModel.typeString));		// key
						composer.addChild(new Constant(langSpec.getStringDelimiter() + fieldName + langSpec.getStringDelimiter(), DataConstraintModel.typeString));		// key
						composer.addChild(childGetter);													// value
						composer.setType(DataConstraintModel.typeMap);
						composerSub = composer;
					}
					composer.setType(stateGetter.getReturnType());
					String[] sideEffects = new String[] {null};
					String returnValue = composer.toImplementation(sideEffects);
					if (sideEffects[0] != null) stateGetter.addStatement(sideEffects[0]);
					stateGetter.addStatement(langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
					if (sideEffects[0] != null) {
						stateGetter.addStatement(sideEffects[0] + langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
					} else {
						stateGetter.addStatement(langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
					}
				}
			}
		}
	}
 							childGetter.addChild(new Field(fieldName, getImplStateType(child, langSpec)));
 						}
 						composer = new Term(DataConstraintModel.insert);
 						composer.addChild(composerSub);
+						composer.addChild(new Constant(fieldName, DataConstraintModel.typeString));		// key
+						composer.addChild(new Constant(langSpec.getStringDelimiter() + fieldName + langSpec.getStringDelimiter(), DataConstraintModel.typeString));		// key
 						composer.addChild(childGetter);													// value
 						composer.setType(DataConstraintModel.typeMap);
 						composerSub = composer;
 					}
 					composer.setType(stateGetter.getReturnType());
 					String[] sideEffects = new String[] {null};
 					String returnValue = composer.toImplementation(sideEffects);
+					if (sideEffects[0] != null) stateGetter.addStatement(sideEffects[0]);
+					stateGetter.addStatement(langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
+					if (sideEffects[0] != null) {
+						stateGetter.addStatement(sideEffects[0] + langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
+					} else {
+						stateGetter.addStatement(langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
+					}
 				}
 			}
 		}
 	}

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
 										String[] sideEffects2 = new String[] {""};
										String newList = selector.toImplementation(sideEffects2);
										updateStatement = sideEffects[0] + sideEffects2[0];
									} else if (DataConstraintModel.typeMap.isAncestorOf(resourceNode.getParent().getResourceStateType())) {
										Term selector = new Term(DataConstraintModel.set);
										Term selector = new Term(DataConstraintModel.insert);
										selector.addChild(new Constant(langSpec.getFieldAccessor(fieldOfResourceState)));
										selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
										selector.addChild(new Constant(newState));
										String[] sideEffects2 = new String[] {""};
										String newList = selector.toImplementation(sideEffects2);
										String newMap = selector.toImplementation(sideEffects2);
										updateStatement = sideEffects[0] + sideEffects2[0];
									} else {
										String resourceName = JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(resource));
										updateStatement = sideEffects[0] + langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
 										String[] sideEffects2 = new String[] {""};
 										String newList = selector.toImplementation(sideEffects2);
 										updateStatement = sideEffects[0] + sideEffects2[0];
 									} else if (DataConstraintModel.typeMap.isAncestorOf(resourceNode.getParent().getResourceStateType())) {
+										Term selector = new Term(DataConstraintModel.set);
+										Term selector = new Term(DataConstraintModel.insert);
 										selector.addChild(new Constant(langSpec.getFieldAccessor(fieldOfResourceState)));
 										selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
 										selector.addChild(new Constant(newState));
 										String[] sideEffects2 = new String[] {""};
+										String newList = selector.toImplementation(sideEffects2);
+										String newMap = selector.toImplementation(sideEffects2);
 										updateStatement = sideEffects[0] + sideEffects2[0];
 									} else {
 										String resourceName = JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(resource));
 										updateStatement = sideEffects[0] + langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();

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

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

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

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

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java

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

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

Show line notes below