Commit 99433b3d authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Replaced the VHDL parser with the VHDL scanner from 1.7.5 to avoid potential licensing issues

parent 28f40b3a

src/Makefile.in

+1 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ distclean: clean 
	       ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \

	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \

	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \

	       vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \

	       vhdlparser.cpp

	       vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp



FORCE:

src/context.cpp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "membername.h"

#include "parserintf.h"

#include "portable.h"

#include "arguments.h"



// TODO: pass the current file to Dot*::writeGraph, so the user can put dot graphs in other

//       files as well

src/docparser.cpp

+0 −2
Original line number Diff line number Diff line
@@ -2904,8 +2904,6 @@ void DocVhdlFlow::parse() 
  DBG(("DocVhdlFlow::parse() end\n"));

  DocNode *n=g_nodeStack.pop();

  ASSERT(n==this);



  VhdlDocGen::createFlowChart(g_memberDef);

}

src/doxygen.cpp

+1 −8
Original line number Diff line number Diff line
@@ -11192,13 +11192,6 @@ void parseInput() 
  g_s.begin("Adding members to index pages...\n");

  addMembersToIndex();

  g_s.end();



  if (Config_getBool("OPTIMIZE_OUTPUT_VHDL") && 

      Config_getBool("HAVE_DOT") &&

      Config_getEnum("DOT_IMAGE_FORMAT")=="svg")

  {

    VhdlDocGen::writeOverview();

  }

}



void generateOutput()

src/htmldocvisitor.cpp

+2 −23
Original line number Diff line number Diff line
@@ -1773,35 +1773,14 @@ void HtmlDocVisitor::visitPost(DocHtmlBlockQuote *b) 
  forceStartParagraph(b);

}



void HtmlDocVisitor::visitPre(DocVhdlFlow *vf)

void HtmlDocVisitor::visitPre(DocVhdlFlow *)

{

  if (m_hide) return;

  if (VhdlDocGen::getFlowMember()) // use VHDL flow chart creator

  {

    forceEndParagraph(vf);

    QCString fname=FlowChart::convertNameToFileName(); 

    m_t << "<p>";

    m_t << "flowchart: " ; // TODO: translate me

    m_t << "<a href=\"";

    m_t << fname.data(); 

    m_t << ".svg\">";

    m_t << VhdlDocGen::getFlowMember()->name().data(); 

    m_t << "</a>";

    if (vf->hasCaption())

    {

      m_t << "<br />";

    }

  }

}



void HtmlDocVisitor::visitPost(DocVhdlFlow *vf)

void HtmlDocVisitor::visitPost(DocVhdlFlow *)

{

  if (m_hide) return;

  if (VhdlDocGen::getFlowMember()) // use VHDL flow chart creator

  {

    m_t << "</p>";

    forceStartParagraph(vf);

  }

}



void HtmlDocVisitor::visitPre(DocParBlock *)