Changeset 422 for trunk/yao

Timestamp:

09/02/10 15:13:04 (14 years ago)

Author:

yerima

Message:

makefile and main.cpp restaured to the version 309.

Location:

trunk/yao/src

Files:

• main.cpp (modified) (5 diffs)
• makefile (modified) (4 diffs)

trunk/yao/src/main.cpp

@@ -16 +16 @@
 // PURPOSE.
 
-
 #include <cstring>
 #include <iostream>
@@ -22 +21 @@
 #include "Translator.hpp"
 #include "help/Display.hpp"
+
 #include <antlr/TokenStreamRecognitionException.hpp>
 
@@ -37 +37 @@
     // Check argument count.
     if(argc <= 1)
-      throw runtime_error("No file specified");
+      throw runtime_error("no file specified");
 
     // Check if help menu is required.
@@ -44 +44 @@
       exit(EXIT_SUCCESS);
     }
-        
+
     filename = argv[1];
     if(filename.getExtension().empty())
@@ -54 +54 @@
     Translator translator(tokenizer);
     // Code generation of the files Y1ProjectName.h and Y2ProjectName.h
-    //translator.generateCode();
-        translator.descriptionVisualYAO();
+    translator.generateCode();
     exitStatus = EXIT_SUCCESS;
     //cout << "End application" << endl;
-
-        //QMessageBox msgBox;
-        //msgBox.setWindowTitle("Aide sur la création d'un nouveau projet.");
-        
-        
-        translator.theConstantTable;
-        //MainController MainController(translator.theConstantTable);
-        //m_ConstantCopy = new ConstantWindow(&theConstantTable, &theHeaderList); 
-        
-        for (Table<Constant>::iterator it = translator.theConstantTable.begin(); it != translator.theConstantTable.end(); it++)
-        {       
-                //Constant test(it->getName(), it->getText());
-                //MainController MainController(test); 
-                cout    << it->getName() << ".def1" << endl << it->getText() << ".def2" << endl;
-                //cout << "#" << endl;     
-        //msgBox.setText("Le dernier parametre est:" + it->getName() + it->getText());
-        }
-        translator.theHeaderList;
-        for (vector<string>::iterator it = translator.theHeaderList.begin(); it != translator.theHeaderList.end(); it++)
-                        cout << it->c_str() << endl;
-        
-        translator.theTrajectoryTable;
-        for (Table<Trajectory>::iterator it = translator.theTrajectoryTable.begin(); it != translator.theTrajectoryTable.end(); it++)
-                        cout << it->getName() << ".traj1" << endl << it->getType() << ".traj2" << endl << it->getBoot() << ".traj3" << endl << it->getOffset() << ".traj4" << endl << it->getStep() << ".traj5" << endl << it->getSize() << ".traj6"<< endl;
-
-        translator.theSpaceTable;
-        for (Table<Space>::iterator it = translator.theSpaceTable.begin(); it != translator.theSpaceTable.end(); it++)
-                        cout << it->getProperty(0) << ".sp1" << endl << it->getProperty(1) << ".sp2" << endl << it->getProperty(2) << ".sp3" << endl;
-
-        //translator.theOperatorTable;
-        //for (Table<Operator>::iterator it = translator.theOperatorTable.begin(); it != translator.theOperatorTable.end(); it++)
-          //           cout << it->getProperty(0) << ".sp1" /*<< endl << it->getProperty(1) << ".sp2" << endl << it->getProperty(2) << ".sp3"*/ << endl;
-
   }
   catch (RecognitionException& e){

trunk/yao/src/makefile

@@ -9 +9 @@
 BOOSTDIR        = ../share/boost_1_39_0
 BOOSTFLAG       = -I $(BOOSTDIR)
+
 
 #LFLAGS         = -L../lib -lantlr
@@ -32 +33 @@
         
         $(CP) $(EXEC) ../bin/
-        $(CP) $(EXEC) interface/
+
         #@echo  
         #@echo "Nardi's application---------------" 
@@ -57 +58 @@
 # target for compiling Visual YAO##########################################################
 visual: 
-        #make
-        #make -C interface/
-        
-        
-        @echo "-----Done----- "
+        cd interface/; qmake -project; qmake; make;
         
 # visual clean target ############
@@ -131 +128 @@
         $(CP) $(MQNDIR)/src/$(MQNLIB) $(MQNDIR)/bin/
         -@echo " $(EXEC) installed."
-        cd interface/; make; ./interface; cd -
+
 # DO NOT DELETE