Commit 61010d6b authored by Javier Costa's avatar Javier Costa
Browse files

Renamed Vertex to Node

parent 7eb19191

src/main/java/tfm/Main.java

+3 −4
Original line number Diff line number Diff line
@@ -6,9 +6,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; 
import tfm.graphs.CFGGraph;

import tfm.graphs.Graph;

import tfm.graphs.PDGGraph;

import tfm.nodes.PDGVertex;

import tfm.nodes.PDGNode;

import tfm.utils.Logger;

import tfm.variables.Variable;

import tfm.visitors.CFGVisitor;

import tfm.visitors.PDGVisitor;
@@ -66,9 +65,9 @@ public class Main { 
            }

        };



        VoidVisitor<PDGVertex> voidVisitor = new PDGVisitor(pdgGraph);

        VoidVisitor<PDGNode> voidVisitor = new PDGVisitor(pdgGraph);



        cu.accept(voidVisitor, pdgGraph.getRootVertex());

        cu.accept(voidVisitor, pdgGraph.getRootNode());



        return pdgGraph;

    }

src/main/java/tfm/arcs/Arc.java

+4 −4
Original line number Diff line number Diff line 
package tfm.arcs;



import tfm.arcs.data.ArcData;

import tfm.nodes.Vertex;

import tfm.nodes.Node;



public abstract class Arc<D extends ArcData> extends edg.graphlib.Arrow<String, D> {



    @SuppressWarnings("unchecked")

    public Arc(Vertex from, Vertex to) {

    public Arc(Node from, Node to) {

        super((edg.graphlib.Vertex<String, D>) from, (edg.graphlib.Vertex<String, D>) to);

    }
@@ -26,8 +26,8 @@ public abstract class Arc<D extends ArcData> extends edg.graphlib.Arrow<String, 
    }



    public String toGraphvizRepresentation() {

        Vertex from = (Vertex) getFrom();

        Vertex to = (Vertex) getTo();

        Node from = (Node) getFrom();

        Node to = (Node) getTo();



        return String.format("\"%s: %s\" -> \"%s: %s\"",

                from.getId(), from.getData(),

src/main/java/tfm/arcs/cfg/ControlFlowArc.java

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ package tfm.arcs.cfg; 


import tfm.arcs.Arc;

import tfm.arcs.data.VoidArcData;

import tfm.nodes.Vertex;

import tfm.nodes.Node;



public class ControlFlowArc extends Arc<VoidArcData> {



    public ControlFlowArc(Vertex from, Vertex to) {

    public ControlFlowArc(Node from, Node to) {

        super(from, to);

    }

src/main/java/tfm/arcs/pdg/ControlDependencyArc.java

+4 −4
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ package tfm.arcs.pdg; 


import tfm.arcs.Arc;

import tfm.arcs.data.ArcData;

import tfm.nodes.Vertex;

import tfm.nodes.Node;



public class ControlDependencyArc extends Arc<ArcData> {



    public ControlDependencyArc(Vertex from, Vertex to) {

    public ControlDependencyArc(Node from, Node to) {

        super(from, to);

    }
@@ -28,8 +28,8 @@ public class ControlDependencyArc extends Arc<ArcData> { 
    @Override

    public String toString() {

        return String.format("ControlDependencyArc{%s -> %s}",

                ((Vertex) getFrom()).getId(),

                ((Vertex) getTo()).getId()

                ((Node) getFrom()).getId(),

                ((Node) getTo()).getId()

        );

    }

}

src/main/java/tfm/arcs/pdg/DataDependencyArc.java

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package tfm.arcs.pdg; 


import tfm.arcs.Arc;

import tfm.arcs.data.VariableArcData;

import tfm.nodes.Vertex;

import tfm.nodes.Node;



import java.util.ArrayList;

import java.util.Arrays;
@@ -10,7 +10,7 @@ import java.util.List; 


public class DataDependencyArc extends Arc<VariableArcData> {



    public DataDependencyArc(Vertex from, Vertex to, String variable, String... variables) {

    public DataDependencyArc(Node from, Node to, String variable, String... variables) {

        super(from, to);



        List<String> variablesList = new ArrayList<>(variables.length + 1);