mingodad
commented
3 years ago Also this prevent segfaults due to syntax errors before attempt to generate anything form the Generate menu:
-------------------------------- MainWindow.cpp --------------------------------
index ee8156f..5976cc1 100644
@@ -396,10 +396,16 @@ void MainWindow::onExpandSelected()
void MainWindow::onGenSynTree()
{
+ const QString title = tr("Generate Syntax Tree");
ENABLED_IF( !d_edit->getPath().isEmpty() );
loadTokMap();
- SynTreeGen::generateTree( d_edit->getPath(), d_edit->getSyntax() );
+ EbnfSyntax* syn = d_edit->getSyntax();
+ if(!syn) {
+ QMessageBox::critical(this,title,tr("Cannot generate syntax tree, fix the issues first !") );
+ return;
+ }
+ SynTreeGen::generateTree( d_edit->getPath(), syn );
// QSet<QByteArray> res = EbnfAnalyzer::collectAllTerminalStrings(d_edit->getSyntax());
// for( QSet<QByteArray>::const_iterator i = res.begin(); i != res.end(); ++i )
// qDebug() << (*i) << SynTreeGen::symToString((*i));
@@ -407,28 +413,45 @@ void MainWindow::onGenSynTree()
void MainWindow::onGenTt()
{
+ const QString title = tr("Generate Token Types");
ENABLED_IF( !d_edit->getPath().isEmpty() );
loadTokMap();
- SynTreeGen::generateTt( d_edit->getPath(), d_edit->getSyntax(), true, true );
+ EbnfSyntax* syn = d_edit->getSyntax();
+ if(!syn) {
+ QMessageBox::critical(this,title,tr("Cannot generate token types, fix the issues first !") );
+ return;
+ }
+ SynTreeGen::generateTt( d_edit->getPath(), syn, true, true );
}
void MainWindow::onGenHtml()
{
+ const QString title = tr("Generate Html");
ENABLED_IF( !d_edit->getPath().isEmpty() );
+ EbnfSyntax* syn = d_edit->getSyntax();
+ if(!syn) {
+ QMessageBox::critical(this,title,tr("Cannot generate html, fix the issues first !") );
+ return;
+ }
HtmlSyntax gen;
- gen.generateHtml( d_edit->getPath(), d_edit->getSyntax() );
+ gen.generateHtml( d_edit->getPath(), syn );
}
void MainWindow::onGenCoco()
{
+ const QString title = tr("Generate Coco/R");
ENABLED_IF( !d_edit->getPath().isEmpty() );
loadTokMap();
CocoGen gen;
- QFileInfo info(d_edit->getPath());
EbnfSyntax* syn = d_edit->getSyntax();
+ if(!syn) {
+ QMessageBox::critical(this,title,tr("Cannot generate Coco/R, fix the issues first !") );
+ return;
+ }
+ QFileInfo info(d_edit->getPath());
gen.generate( info.absoluteDir().absoluteFilePath( info.completeBaseName() + ".atg"), syn, d_tbl, true );
SynTreeGen::generateTt( d_edit->getPath(), syn, true, false );
SynTreeGen::generateTree( d_edit->getPath(), syn, true );
@@ -436,16 +459,28 @@ void MainWindow::onGenCoco()
void MainWindow::onGenAntlr()
{
+ const QString title = tr("Generate Antlr");
ENABLED_IF( !d_edit->getPath().isEmpty() );
+ EbnfSyntax* syn = d_edit->getSyntax();
+ if(!syn) {
+ QMessageBox::critical(this,title,tr("Cannot generate Antlr, fix the issues first !") );
+ return;
+ }
QFileInfo info(d_edit->getPath());
- AntlrGen::generate( info.absoluteDir().absoluteFilePath( info.completeBaseName() + ".g"), d_edit->getSyntax() );
+ AntlrGen::generate( info.absoluteDir().absoluteFilePath( info.completeBaseName() + ".g"), syn );
}
void MainWindow::onGenLlgen()
{
+ const QString title = tr("Generate Llgen");
ENABLED_IF( !d_edit->getPath().isEmpty() );
+ EbnfSyntax* syn = d_edit->getSyntax();
+ if(!syn) {
+ QMessageBox::critical(this,title,tr("Cannot generate Llgen, fix the issues first !") );
+ return;
+ }
QFileInfo info(d_edit->getPath());
- LlgenGen::generate( info.absoluteDir().absoluteFilePath( info.completeBaseName() + ".g"), d_edit->getSyntax(), d_tbl );
+ LlgenGen::generate( info.absoluteDir().absoluteFilePath( info.completeBaseName() + ".g"), syn, d_tbl );
}
void MainWindow::onOutputFirstSet()
-------------------------------- SynTreeGen.cpp --------------------------------
index 65d0ea0..b587c8d 100644
@@ -29,6 +29,8 @@ bool SynTreeGen::generateTree(const QString& ebnfPath, EbnfSyntax* syn, bool inc
{
Q_ASSERT( syn != 0 );
+ if(!syn)
+ return false;
const QByteArray nameSpace = syn->getPragmaFirst("%namespace");
const QByteArray nameSpace2 = nameSpace.isEmpty() ? nameSpace : ( nameSpace + "::" );
QByteArray module = syn->getPragmaFirst("%module");
rochus-keller
When compiling on Ubuntu 18.04 I fix a few compiler warnings see bellow: