Commit 36122e49 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

New VHDL parser implementation

parent 6a60477b

.gitignore

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ 
/libmd5/Makefile.libmd5

/libmd5/Makefile.libmd5

/qtools/Makefile

/qtools/Makefile

/qtools/Makefile.qtools

/qtools/Makefile.qtools

/vhdlparser/Makefile

/vhdlparser/Makefile.vhdlparser

/src/Makefile.doxygen

/src/Makefile.doxygen

/src/Makefile.libdoxycfg

/src/Makefile.libdoxycfg

/src/Makefile.libdoxygen

/src/Makefile.libdoxygen

Makefile.in

+5 −2
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ clean: FORCE 
	- cd qtools ; $(MAKE) clean

	- cd qtools ; $(MAKE) clean

	- cd src ; $(MAKE) clean

	- cd src ; $(MAKE) clean

	- cd libmd5 ; $(MAKE) clean

	- cd libmd5 ; $(MAKE) clean

	- cd vhdlparser ; $(MAKE) clean

	-cd addon/doxywizard ; $(MAKE) clean

	-cd addon/doxywizard ; $(MAKE) clean

	-cd addon/doxysearch ; $(MAKE) clean

	-cd addon/doxysearch ; $(MAKE) clean

	-cd addon/doxyapp ; $(MAKE) clean

	-cd addon/doxyapp ; $(MAKE) clean
@@ -33,6 +34,7 @@ clean: FORCE 
distclean: clean

distclean: clean

	-cd src ; $(MAKE) distclean

	-cd src ; $(MAKE) distclean

	-cd libmd5 ; $(MAKE) distclean

	-cd libmd5 ; $(MAKE) distclean

	-cd vhdlparser ; $(MAKE) distclean

	-cd addon/doxywizard ; $(MAKE) distclean

	-cd addon/doxywizard ; $(MAKE) distclean

	-cd addon/doxysearch ; $(MAKE) distclean

	-cd addon/doxysearch ; $(MAKE) distclean

	-cd addon/doxyapp ; $(MAKE) distclean

	-cd addon/doxyapp ; $(MAKE) distclean
@@ -52,8 +54,9 @@ distclean: clean 
	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 

	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 

	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t

	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t

	-rm -f libmd5/Makefile.libmd5

	-rm -f libmd5/Makefile.libmd5

	-rm -f vhdlparser/Makefile.vhdlparser

	-rm -f .makeconfig .tmakeconfig

	-rm -f .makeconfig .tmakeconfig

	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro

	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro

	-rm -rf generated_src

	-rm -rf generated_src

	-rm -f addon/doxywizard/doxywizard.pro

	-rm -f addon/doxywizard/doxywizard.pro

	-rm -f VERSION

	-rm -f VERSION
@@ -95,7 +98,7 @@ docs: FORCE 
pdf: docs

pdf: docs

	cd latex ; $(MAKE)

	cd latex ; $(MAKE)





DISTFILES =  Doxyfile libmd5 addon tmake doc examples bin lib objects testing \

DISTFILES =  Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \

             qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \

             qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \

             Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \

             Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \

             VERSION README.md packages winbuild jquery

             VERSION README.md packages winbuild jquery

configure

+4 −2
Original line number Original line Diff line number Diff line
@@ -868,7 +868,7 @@ INCLUDEPATH += $XAPIAN/include 
EOF

EOF

fi

fi





f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in"

f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"





for i in $f_inmakefiles ; do

for i in $f_inmakefiles ; do

     SRC=$i

     SRC=$i
@@ -893,7 +893,9 @@ EOF 
       echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST

       echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST

       echo "	\$(MAKE) -C qtools" >> $DST

       echo "	\$(MAKE) -C qtools" >> $DST

       echo "	\$(MAKE) -C libmd5" >> $DST

       echo "	\$(MAKE) -C libmd5" >> $DST

       echo "	\$(MAKE) -C vhdlparser" >> $DST

       echo "	\$(MAKE) -C src" >> $DST

       echo "	\$(MAKE) -C src" >> $DST



       if test $f_wizard = YES; then

       if test $f_wizard = YES; then

         echo "	\$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST

         echo "	\$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST

       fi

       fi
@@ -930,7 +932,7 @@ done 
cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t

cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t

cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t

cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t





f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" 

f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"





for i in $f_inprofiles ; do

for i in $f_inprofiles ; do

     SRC=$i

     SRC=$i

src/docparser.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -2908,6 +2908,7 @@ void DocVhdlFlow::parse() 
  DBG(("DocVhdlFlow::parse() end\n"));

  DBG(("DocVhdlFlow::parse() end\n"));

  DocNode *n=g_nodeStack.pop();

  DocNode *n=g_nodeStack.pop();

  ASSERT(n==this);

  ASSERT(n==this);

  VhdlDocGen::createFlowChart(g_memberDef);

}

}

src/doxygen.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ 
#include "store.h"

#include "store.h"

#include "marshal.h"

#include "marshal.h"

#include "portable.h"

#include "portable.h"

#include "vhdlscanner.h"

#include "vhdljjparser.h"

#include "vhdldocgen.h"

#include "vhdldocgen.h"

#include "eclipsehelp.h"

#include "eclipsehelp.h"

#include "cite.h"

#include "cite.h"