Finished save and load conversion CFG to PDA and handle epsilon.

Author: navrkald

src/CFG/contextfreegrammar.cpp

@@ -129,7 +129,12 @@ QString CCFGRule::ToString() const
     foreach(const CSymbol& symbol, m_rightString){
         switch (symbol.GetType()) {
             case CSymbol::TType::terminal:
-                ruleString += QString(" \"%1\" ").arg(symbol.GetString());
+				if (symbol.GetString() == EPSILON) {
+					ruleString += QString(" %1 ").arg(symbol.GetString());
+				}
+				else {
+					ruleString += QString(" \"%1\" ").arg(symbol.GetString());
+				}
                 break;
             case CSymbol::TType::nonTerminal:
                 ruleString += QString(" <%1> ").arg(symbol.GetString());
@@ -205,26 +210,6 @@ QString CContextFreeGrammar::NonTerminalAlphabetToString() const
   return result.left(result.length() - 2);
 }
 
-//QSet<CTerminal> CContextFreeGrammar::GetTerminalAlphabet()
-//{
-//    QSet<QString> outSet;
-//    foreach(CTerminal terminal, m_terminalsAlphabet)
-//    {
-//        outSet.insert(terminal.GetString());
-//    }
-//    return outSet;
-//}
-
-//QSet<CNonTerminal> CContextFreeGrammar::GetNoonTerminalAlphabet()
-//{
-//    QSet<QString> outSet;
-//    foreach(CNonTerminal nonTerminal, m_nonterminalsAlphabet)
-//    {
-//        outSet.insert(nonTerminal.GetString());
-//    }
-//    return outSet;
-//}
-
 QSet<QString> CContextFreeGrammar::GetBothTerminalAndNonterminalAlphabet()
 {
     QSet<QString> terninals = CTerminal::CTerminalQSetToQStringQSet(GetTerminalAlphabet());
@@ -385,7 +370,7 @@ QDataStream& CSymbol::WriteToQDataStream(QDataStream & out) const
 QDataStream& CSymbol::ReadFromQDataStream(QDataStream & in)
 {
 	quint32 tmpType;
-	in >> m_symbol >> tmpType;
+	in >> tmpType >> m_symbol;
 	m_type = (TType)tmpType;
 	return in;
 }
@@ -400,7 +385,7 @@ QDataStream & operator<<(QDataStream & out, const CTerminal & s)
 	return s.WriteToQDataStream(out);
 }
 
-QDataStream & operator >> (QDataStream & in, CNonTerminal & s)
+QDataStream & operator>>(QDataStream & in, CNonTerminal & s)
 {
 	return s.ReadFromQDataStream(in);
 }

src/CFG/contextfreegrammar.h

@@ -24,7 +24,7 @@ class CSymbol
     operator QString() const { return m_symbol; }
     static QSet<QString> CSymbolQSetToQStringQSet(const QSet<CSymbol>& csymbolSet);
     bool operator==(const CSymbol& s) const {return this->m_symbol == s.m_symbol ;}
-    CSymbol& operator=(CSymbol other) { this->m_symbol = other.m_symbol; return *this; }
+    CSymbol& operator=(CSymbol other) { this->m_symbol = other.m_symbol; m_type = other.m_type; return *this; }
     bool IsEmpty() const {return m_symbol.isEmpty();}
     void Trim() {m_symbol = m_symbol.trimmed();}
     void Append(QChar charter) {m_symbol.append(charter);}

src/mainwindow.cpp

@@ -609,18 +609,6 @@ void MainWindow::CfgToPda_example(const CContextFreeGrammar& cfg, QString exampl
         PrepareConversionWidget(Conversions::CFG_TO_PDA);
     ((CCfgToPdaWidget*)m_centralWidget)->SetCfg(cfg);
 
-    /* Abylity to set PDA to pda widget
-    CPushDownAutomata pda;
-    pda.SetStartState("s");
-    pda.SetStates(QSet<QString>{"s","s1","s2","f1","f2"});
-    pda.SetFinalStates(QSet<QString>{"f1","f2"});
-    pda.SetAplhabet(QSet<QString>{"a","b","c"});
-    pda.SetStackAlphabet(QSet<QString>{"D","E","F"});
-    pda.AddPDARule("s","s","a","D",QVector<QString>{"E","F"});
-    pda.AddPDARule("s","s1","b","E",QVector<QString>{"D","F"});
-    pda.AddPDARule("s2","f1","c","F","D");
-    ((CCfgToPdaWidget*)m_centralWidget)->SetPda(pda);
-    */
 	m_exampleName = example_name;
     mySetWindowTitle();
 }
@@ -773,7 +761,19 @@ void MainWindow::on_action_open_file_triggered()
             }
         }
         break;
-        case none:
+		case CFG_TO_PDA:
+		{
+			CContextFreeGrammar g;
+			in >> g;
+			CfgToPda_example(g);
+			if (m_mode != AlgorithmModes::algorithmSteping) {
+				CPushDownAutomata pda;
+				in >> pda;
+				((CCfgToPdaWidget*)m_centralWidget)->SetPda(pda);
+			}
+		}
+			break;
+		case none:
             showStatusMessage(tr("ERROR: Input file in wrong format!"));
             return;
         break;