diff --git a/Hazard/Hazard/CParser.cpp b/Hazard/Hazard/CParser.cpp index 3b42295..e2cb026 100644 --- a/Hazard/Hazard/CParser.cpp +++ b/Hazard/Hazard/CParser.cpp @@ -80,10 +80,11 @@ int CParser::yyparse(PrimImplikantCollection* &pic, vector* &variables) switch(tok) { case IDENTIFIER: - printf("Variable %s\n", yylval.s.c_str()); + fprintf(IP_List, "Variable %s\n", yylval.s.c_str()); variables->push_back(yylval.s.c_str()); break; case TERMS: + fprintf(IP_List, "\n", yylval.s.c_str()); pState = P_TERMS_KEY; break; } @@ -92,11 +93,11 @@ int CParser::yyparse(PrimImplikantCollection* &pic, vector* &variables) switch(tok) { case STRING1: - printf("Term Key %s\n", yylval.s.c_str()); + fprintf(IP_List, "Term Key %s\n", yylval.s.c_str()); pic->add(yylval.s.c_str()); break; case INTEGER1: - printf("Term Key %d\n", (unsigned int)yylval.i); + fprintf(IP_List, "Term Key %d\n", (unsigned int)yylval.i); pic->add(yylval.i); break; case (int)'>': @@ -124,7 +125,7 @@ int CParser::yyparse(PrimImplikantCollection* &pic, vector* &variables) return 1; } - printf("Term Value %d\n\n",yylval.i); + fprintf(IP_List, "Term Value %d\n\n",yylval.i); pState = P_TERMS_KEY; } break; diff --git a/Hazard/Hazard/Hazard.cpp b/Hazard/Hazard/Hazard.cpp index cd6f278..a4edc44 100644 --- a/Hazard/Hazard/Hazard.cpp +++ b/Hazard/Hazard/Hazard.cpp @@ -49,7 +49,6 @@ int _tmain(int argc, _TCHAR* argv[]) CParser parser; parser.IP_init_token_table(); - parser.pr_tokentable(); parser.InitParse(input, error, list); if (parser.yyparse(globalPIC, variables) != 0) { diff --git a/Hazard/res/listParser.txt b/Hazard/res/listParser.txt index e69de29..3726901 100644 --- a/Hazard/res/listParser.txt +++ b/Hazard/res/listParser.txt @@ -0,0 +1,20 @@ +Variable a +Variable bar +Variable char +Variable d + +Term Key 0010 +Term Value 1 + +Term Key 7 +Term Value 1 + +Term Key 14 +Term Value 1 + +Term Key 01xx +Term Value 1 + +Term Key x000 +Term Value 1 +