From 5cfe48265ebad0ffa0a980dbc2d131fceeecdf3b Mon Sep 17 00:00:00 2001 From: Renaud G Date: Wed, 8 Apr 2015 21:34:02 +0200 Subject: -remove memory leaks -delete created objects --- main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 926e3d4..7b70e23 100644 --- a/main.cpp +++ b/main.cpp @@ -39,7 +39,8 @@ int main(int argc, char *argv[]) QStringList commands; - commands << "1L[cheminée,chocolat,épée,arc,chute de pierre]" + commands<< "10d10c[>6]+@c[=10]" + << "1L[cheminée,chocolat,épée,arc,chute de pierre]" << "10d10c[>=6]-@c[=1]" << "10d10c[>=6]-@c[=1]-@c[=1]" << "10d10c[>6]+@c[=10]" @@ -61,6 +62,7 @@ int main(int argc, char *argv[]) << "15D10e10c[8-10]" << "10d10e11" << "1D8+2D6+7" + << "100190D6666666s" << "D25" << "D25+D10" << "D25;D10" @@ -73,7 +75,7 @@ int main(int argc, char *argv[]) << "help" << "la" << "400000D20/400000" - << "100*3*8"; + << "100*3*8";// if(argc>1) { @@ -100,4 +102,6 @@ int main(int argc, char *argv[]) main.show(); return a.exec(); #endif + delete myParser; + return 0; } -- cgit v1.2.3-70-g09d2 From 888c6cbf5a204712b591ce96148ea016eea0ba5d Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 23 Apr 2015 10:50:33 +0200 Subject: add file for cli main application --- cli/cli.pri | 2 ++ cli/main.cpp | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.cpp | 107 ----------------------------------------------------------- 3 files changed, 109 insertions(+), 107 deletions(-) create mode 100644 cli/cli.pri create mode 100644 cli/main.cpp delete mode 100644 main.cpp (limited to 'main.cpp') diff --git a/cli/cli.pri b/cli/cli.pri new file mode 100644 index 0000000..69aa44f --- /dev/null +++ b/cli/cli.pri @@ -0,0 +1,2 @@ +SOURCES += \ + $$PWD/main.cpp diff --git a/cli/main.cpp b/cli/main.cpp new file mode 100644 index 0000000..7b70e23 --- /dev/null +++ b/cli/main.cpp @@ -0,0 +1,107 @@ +/*************************************************************************** +* Copyright (C) 2014 by Renaud Guezennec * +* http://renaudguezennec.homelinux.org/accueil,3.html * +* * +* This file is part of DiceParser * +* * +* DiceParser is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +#ifdef HAVE_IRC +#include +#include "irc/mainwindow.h" +#endif + +#include +#include "diceparser.h" + +int main(int argc, char *argv[]) +{ + #ifdef HAVE_IRC + QApplication a(argc, argv); + + + MainWindow main; +#endif + DiceParser* myParser = new DiceParser(); + + QStringList commands; + + commands<< "10d10c[>6]+@c[=10]" + << "1L[cheminée,chocolat,épée,arc,chute de pierre]" + << "10d10c[>=6]-@c[=1]" + << "10d10c[>=6]-@c[=1]-@c[=1]" + << "10d10c[>6]+@c[=10]" + << "1+1D10" + << "3d10c[>=5]" + << "3nwod" + << "1+(4*3)D10" + << "2+4/4" + << "2D10*2D20*8" + <<"1+(4*3)D10" + <<"(4D6)D10" + << "1D100a[>=95]a[>=96]a[>=97]a[>=98]a[>=99]e[>=100]" + << "3D100" + << "4k3" + << "10D10e[>=6]sc[>=6]" + << "100190D6666666s" + << "10D10e10s" + << "10D10s" + << "15D10e10c[8-10]" + << "10d10e11" + << "1D8+2D6+7" + << "100190D6666666s" + << "D25" + << "D25+D10" + << "D25;D10" + << "8+8+8" + << "1D20-88" + << "100*1D20*2D6" + << "100/28*3" + << "100/8" + << "100*3*8" + << "help" + << "la" + << "400000D20/400000" + << "100*3*8";// + + if(argc>1) + { + for(int i=1;iparseLine(cmd)) + { + myParser->Start(); + // myParser->displayDotTree(); + myParser->displayResult(); + } + else + { + qDebug() << "echec"; + } + } + #ifdef HAVE_IRC + main.show(); + return a.exec(); +#endif + delete myParser; + return 0; +} diff --git a/main.cpp b/main.cpp deleted file mode 100644 index 7b70e23..0000000 --- a/main.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2014 by Renaud Guezennec * -* http://renaudguezennec.homelinux.org/accueil,3.html * -* * -* This file is part of DiceParser * -* * -* DiceParser is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ -#ifdef HAVE_IRC -#include -#include "irc/mainwindow.h" -#endif - -#include -#include "diceparser.h" - -int main(int argc, char *argv[]) -{ - #ifdef HAVE_IRC - QApplication a(argc, argv); - - - MainWindow main; -#endif - DiceParser* myParser = new DiceParser(); - - QStringList commands; - - commands<< "10d10c[>6]+@c[=10]" - << "1L[cheminée,chocolat,épée,arc,chute de pierre]" - << "10d10c[>=6]-@c[=1]" - << "10d10c[>=6]-@c[=1]-@c[=1]" - << "10d10c[>6]+@c[=10]" - << "1+1D10" - << "3d10c[>=5]" - << "3nwod" - << "1+(4*3)D10" - << "2+4/4" - << "2D10*2D20*8" - <<"1+(4*3)D10" - <<"(4D6)D10" - << "1D100a[>=95]a[>=96]a[>=97]a[>=98]a[>=99]e[>=100]" - << "3D100" - << "4k3" - << "10D10e[>=6]sc[>=6]" - << "100190D6666666s" - << "10D10e10s" - << "10D10s" - << "15D10e10c[8-10]" - << "10d10e11" - << "1D8+2D6+7" - << "100190D6666666s" - << "D25" - << "D25+D10" - << "D25;D10" - << "8+8+8" - << "1D20-88" - << "100*1D20*2D6" - << "100/28*3" - << "100/8" - << "100*3*8" - << "help" - << "la" - << "400000D20/400000" - << "100*3*8";// - - if(argc>1) - { - for(int i=1;iparseLine(cmd)) - { - myParser->Start(); - // myParser->displayDotTree(); - myParser->displayResult(); - } - else - { - qDebug() << "echec"; - } - } - #ifdef HAVE_IRC - main.show(); - return a.exec(); -#endif - delete myParser; - return 0; -} -- cgit v1.2.3-70-g09d2