Improved searches within GraphNode with GraphNodeContentVisitor (4a9a5b6e) · Commits · Program Slicing / SDG

sdg-cli/pom.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		<dependency>
		<groupId>tfm</groupId>
		<artifactId>sdg-core</artifactId>
		<version>1.1.1</version>
		<version>1.1.2</version>
		<scope>compile</scope>
		</dependency>
		</dependencies>

sdg-core/pom.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@

		<groupId>tfm</groupId>
		<artifactId>sdg-core</artifactId>
		<version>1.1.1</version>
		<version>1.1.2</version>

		<properties>
		<maven.compiler.source>11</maven.compiler.source>

sdg-core/src/main/java/tfm/graphs/GraphNodeContentVisitor.java

0 → 100644

+147 −0

Original line number	Diff line number	Diff line
		package tfm.graphs;

		import com.github.javaparser.ast.body.*;
		import com.github.javaparser.ast.stmt.*;
		import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
		import tfm.nodes.GraphNode;

		/** A generic visitor that can be use as a basis to traverse the nodes inside
		* a given {@link GraphNode}. */
		public class GraphNodeContentVisitor<A> extends VoidVisitorAdapter<A> {
		protected GraphNode<?> graphNode = null;

		public final void startVisit(GraphNode<?> graphNode, A arg) {
		this.graphNode = graphNode;
		graphNode.getAstNode().accept(this, arg);
		this.graphNode = null;
		}

		public void startVisit(GraphNode<?> graphNode) {
		startVisit(graphNode, null);
		}

		@Override
		public void visit(AssertStmt n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(BlockStmt n, A arg) {}

		@Override
		public void visit(BreakStmt n, A arg) {
		n.getLabel().ifPresent(l -> l.accept(this, arg));
		}

		@Override
		public void visit(CatchClause n, A arg) {
		n.getParameter().accept(this, arg);
		}

		@Override
		public void visit(ConstructorDeclaration n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(ContinueStmt n, A arg) {
		n.getLabel().ifPresent(l -> l.accept(this, arg));
		}

		@Override
		public void visit(DoStmt n, A arg) {
		n.getCondition().accept(this, arg);
		}

		// TODO: this should not be part of any node, but in practice there are still
		// synthetic nodes that rely on it instead of extending SyntheticNode.
		@Override
		public void visit(EmptyStmt n, A arg) {}

		@Override
		public void visit(EnumConstantDeclaration n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(EnumDeclaration n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(ExplicitConstructorInvocationStmt n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(ExpressionStmt n, A arg) {
		super.visit(n, arg);
		}

		@Override
		public void visit(FieldDeclaration n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(ForEachStmt n, A arg) {
		n.getIterable().accept(this, arg);
		n.getVariable().accept(this, arg);
		}

		@Override
		public void visit(ForStmt n, A arg) {
		n.getCompare().ifPresent(c -> c.accept(this, arg));
		}

		@Override
		public void visit(IfStmt n, A arg) {
		n.getCondition().accept(this, arg);
		}

		@Override
		public void visit(LabeledStmt n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(MethodDeclaration n, A arg) {}

		@Override
		public void visit(ReturnStmt n, A arg) {
		n.getExpression().ifPresent(e -> e.accept(this, arg));
		}

		@Override
		public void visit(SwitchEntryStmt n, A arg) {
		n.getLabel().ifPresent(l -> l.accept(this, arg));
		}

		@Override
		public void visit(SwitchStmt n, A arg) {
		n.getSelector().accept(this, arg);
		}

		@Override
		public void visit(SynchronizedStmt n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(ThrowStmt n, A arg) {
		n.getExpression().accept(this, arg);
		}

		@Override
		public void visit(TryStmt n, A arg) {}

		@Override
		public void visit(LocalClassDeclarationStmt n, A arg) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void visit(WhileStmt n, A arg) {
		n.getCondition().accept(this, arg);
		}
		}

sdg-core/src/main/java/tfm/graphs/augmented/ACFGBuilder.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,8 @@ public class ACFGBuilder extends CFGBuilder {
		if (!methodDeclaration.getBody().isPresent())
		throw new IllegalStateException("The method must have a body!");

		graph.buildRootNode("ENTER " + methodDeclaration.getNameAsString(), methodDeclaration, TypeNodeFactory.fromType(NodeType.METHOD_ENTER));
		graph.buildRootNode("ENTER " + methodDeclaration.getDeclarationAsString(false, false, false),
		methodDeclaration, TypeNodeFactory.fromType(NodeType.METHOD_ENTER));

		hangingNodes.add(graph.getRootNode().get());
		for (Parameter param : methodDeclaration.getParameters())

sdg-core/src/main/java/tfm/graphs/cfg/CFGBuilder.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ public class CFGBuilder extends VoidVisitorAdapter<Void> {

		// Create the root node
		graph.buildRootNode(
		"ENTER " + methodDeclaration.getNameAsString(),
		"ENTER " + methodDeclaration.getDeclarationAsString(false, false, false),
		methodDeclaration,
		TypeNodeFactory.fromType(NodeType.METHOD_ENTER));
		hangingNodes.add(graph.getRootNode().get());