引数を持たない input メソッドを生成できなかった不具合を修正。

Browse code 引数を持たない input メソッドを生成できなかった不具合を修正。 2024_stable ASE2022submit FACS2023 MODELS2025_submit Models2024 SimulatorVisualization bug-pathParam bug-swingNativeReceiver controlFlowModeling dynamicResourceCreation experiment20231128 experiment_2023_1_25 extendForWebServices feature-addTableUI feature-keyboard-shortcuts feature_addLoggerToCFD fix-window-position fixSerializeException fix_connectionAnEdgeAtDependsOnMediator forMultipleOutputResources forWebServices gameEngine gameEngine-DTRAM gameEngine2 hieararchicalLayout htmlGUi importVisualModelingUpdates language-server master outputChannelAsAClass refactor simulationLayout simulator swingInterface test two-stage-modeling update-dtram-parser update-parser ...updateHierarchicalResources
1 parent 94cb106 commit e8b362cdfd33af44543a965cbdb16de74200f48f Naoya Nitta authored on 30 Dec 2021

 					Map.Entry<DataflowChannelGenerator, Set<ChannelMember>> ioChannelAndMembers = getIOChannelAndMembers(resource, model);
 					if (ioChannelAndMembers != null) {
 						Set<ChannelMember> outs = ioChannelAndMembers.getValue();
 						for (ChannelMember out: outs) {
+							Term message = (Term) out.getStateTransition().getMessageExpression();
+							MethodDeclaration input = getMethod(type, message.getSymbol().getName());
+							MethodDeclaration input = getInputMethod(type, out);
 							if (input != null) {
 								String[] sideEffects = new String[] {""};
 								Expression updateExp = ioChannelAndMembers.getKey().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);
 								String newState = updateExp.toImplementation(sideEffects);
 									MethodDeclaration mainInput = getMethod(mainType, input.getName());
 									if (mainInput != null) {
 										String args = "";
 										String delimitar = "";
+										for (Variable var: message.getVariables().values()) {
+											args += delimitar + var.getName();
+											delimitar = ", ";
+										if (out.getStateTransition().getMessageExpression() instanceof Term) {
+											Term message = (Term) out.getStateTransition().getMessageExpression();
+											for (Variable var: message.getVariables().values()) {
+												args += delimitar + var.getName();
+												delimitar = ", ";
+											}
 										}
 										mainInput.addStatement("this." + resourceName + "." + input.getName() + "(" + args + ");");
 									}
 								}
 			DataflowChannelGenerator ch = (DataflowChannelGenerator) c;
 			// I/O channel
 			for (ChannelMember out: ch.getOutputChannelMembers()) {
 				if (out.getIdentifierTemplate().equals(resource.getIdentifierTemplate())) {
+					if (out.getStateTransition().getMessageExpression() instanceof Term) {
+						// not an identity element
+					if (out.getStateTransition().getMessageExpression() instanceof Term || out.getStateTransition().getMessageExpression() instanceof Variable) {
 						channel = ch;
 						channelMembers.add(out);
 					}
 				}
 			DataflowChannelGenerator channel = (DataflowChannelGenerator) c;
 			// I/O channel
 			for (ChannelMember out: channel.getOutputChannelMembers()) {
 				if (out.getIdentifierTemplate().equals(resource.getIdentifierTemplate())) {
+					if (out.getStateTransition().getMessageExpression() instanceof Term) {
+						// not an identity element
+						Term message = (Term) out.getStateTransition().getMessageExpression();
+						MethodDeclaration input = getMethod(type, message.getSymbol().getName());
+						return input;
+					}
+				}
+			}
+		}
+		return null;
+					MethodDeclaration input = getInputMethod(type, out);
+					if (input != null) return input;
+				}
+			}
+		}
+		return null;
+	}
+	private static MethodDeclaration getInputMethod(TypeDeclaration type, ChannelMember out) {
+		MethodDeclaration input = null;
+		if (out.getStateTransition().getMessageExpression() instanceof Term) {
+			Term message = (Term) out.getStateTransition().getMessageExpression();
+			input = getMethod(type, message.getSymbol().getImplName());
+		} else if (out.getStateTransition().getMessageExpression() instanceof Variable) {
+			Variable message = (Variable) out.getStateTransition().getMessageExpression();
+			input = getMethod(type, message.getName());
+		}
+		return input;
 	}
 	private static MethodDeclaration getMethod(TypeDeclaration type, String methodName) {
 		for (MethodDeclaration m: type.getMethods()) {