diff --git a/AlgebraicDataflowArchitectureModel/src/tests/ASTTest.java b/AlgebraicDataflowArchitectureModel/src/tests/ASTTest.java index dfb709d..d436321 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/ASTTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/ASTTest.java @@ -2,7 +2,6 @@ import code.ast.*; import models.algebra.Symbol; -import models.dataConstraintModel.DataConstraintModel; import java.util.Arrays; import java.util.List; @@ -15,11 +14,11 @@ VariableDeclarationStatement varStmt = new VariableDeclarationStatement(); varStmt.setModifiers(List.of(new PlainStatement("private"))); - varStmt.setType(new SimpleType("int")); + + //VariableDeclarationのTypeとSimpleTypeの関係を確認(models.algebra)になってる? varStmt.setFragments(List.of( - //Typeを使用したい - new VariableDeclaration(DataConstraintModel.typeInt, "x"), - new VariableDeclaration(DataConstraintModel.typeInt, "sum") + new VariableDeclaration(new SimpleType("int"), "x"), + new VariableDeclaration(new SimpleType("int"), "sum") )); methodBody.addStatement(varStmt); @@ -52,7 +51,7 @@ methodBody.addStatement(forStmt); EnhancedForStatement enhancedFor = new EnhancedForStatement(); - enhancedFor.setParameter(new VariableDeclaration(DataConstraintModel.typeString, "s")); + enhancedFor.setParameter(new SimpleType("String"), "s"); enhancedFor.setExpression(new Variable("list")); Block eForBody = new Block();