model-checker : remove the display of promela property

diff --git a/src/xbt/automaton/automaton_lexer.yy.c b/src/xbt/automaton/automaton_lexer.yy.c
index 5a5d379..8477155 100644 (file)
--- a/src/xbt/automaton/automaton_lexer.yy.c
+++ b/src/xbt/automaton/automaton_lexer.yy.c
@@ -805,143 +805,138 @@ do_action:      /* This label is used only to access EOF actions. */
 case 1:
 YY_RULE_SETUP
 #line 30 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (NEVER); }
+{ return (NEVER); }
        YY_BREAK
 case 2:
 YY_RULE_SETUP
 #line 31 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (IF); }
+{ return (IF); }
        YY_BREAK
 case 3:
 YY_RULE_SETUP
 #line 32 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); 
-               return (FI); }
+{ return (FI); }
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 34 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (IMPLIES); }
+#line 33 "parserPromela.lex"
+{ return (IMPLIES); }
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 35 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (GOTO); }
+#line 34 "parserPromela.lex"
+{ return (GOTO); }
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 36 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (AND); }
+#line 35 "parserPromela.lex"
+{ return (AND); }
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 37 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (OR); }
+#line 36 "parserPromela.lex"
+{ return (OR); }
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 38 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (NOT); }
+#line 37 "parserPromela.lex"
+{ return (NOT); }
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 39 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (LEFT_PAR); }
+#line 38 "parserPromela.lex"
+{ return (LEFT_PAR); }
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 40 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (RIGHT_PAR); }
+#line 39 "parserPromela.lex"
+{ return (RIGHT_PAR); }
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 41 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (CASE); }
+#line 40 "parserPromela.lex"
+{ return (CASE); }
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 42 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (COLON); }
+#line 41 "parserPromela.lex"
+{ return (COLON); }
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 43 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (SEMI_COLON); }
+#line 42 "parserPromela.lex"
+{ return (SEMI_COLON); }
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 44 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (CASE_TRUE); }
+#line 43 "parserPromela.lex"
+{ return (CASE_TRUE); }
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 45 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (LEFT_BRACE); }
+#line 44 "parserPromela.lex"
+{ return (LEFT_BRACE); }
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 46 "parserPromela.lex"
-{ printf("%s", xbt_automaton_parser_text); return (RIGHT_BRACE); }
+#line 45 "parserPromela.lex"
+{ return (RIGHT_BRACE); }
        YY_BREAK
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 49 "parserPromela.lex"
-{ printf(" ");}
+#line 48 "parserPromela.lex"
+{ }
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 51 "parserPromela.lex"
-{ printf("%s",xbt_automaton_parser_text); }
+#line 50 "parserPromela.lex"
+{ }
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 54 "parserPromela.lex"
-{ printf("%s",xbt_automaton_parser_text); 
-                            sscanf(xbt_automaton_parser_text,"%lf",&yylval.real); 
+#line 53 "parserPromela.lex"
+{ sscanf(xbt_automaton_parser_text,"%lf",&yylval.real); 
                             return (LITT_REEL); }
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 58 "parserPromela.lex"
-{ printf("%s",xbt_automaton_parser_text); 
-                            sscanf(xbt_automaton_parser_text,"%d",&yylval.integer); 
+#line 56 "parserPromela.lex"
+{ sscanf(xbt_automaton_parser_text,"%d",&yylval.integer); 
                             return (LITT_ENT); }
        YY_BREAK
 case 21:
 /* rule 21 can match eol */
 YY_RULE_SETUP
-#line 62 "parserPromela.lex"
-{ printf("%s",xbt_automaton_parser_text);  
-                            yylval.string=(char *)malloc(strlen(xbt_automaton_parser_text)+1);
+#line 59 "parserPromela.lex"
+{ yylval.string=(char *)malloc(strlen(xbt_automaton_parser_text)+1);
                             sscanf(xbt_automaton_parser_text,"%s",yylval.string); 
                             return (LITT_CHAINE); }
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 67 "parserPromela.lex"
-{ printf("%s",xbt_automaton_parser_text); 
-                           yylval.string=(char *)malloc(strlen(xbt_automaton_parser_text)+1);
-                           sscanf(xbt_automaton_parser_text,"%s",yylval.string);
-                           return (ID); }
+#line 63 "parserPromela.lex"
+{ yylval.string=(char *)malloc(strlen(xbt_automaton_parser_text)+1);
+                            sscanf(xbt_automaton_parser_text,"%s",yylval.string);
+                                             return (ID); }
        YY_BREAK
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 72 "parserPromela.lex"
-{ printf("\n"); }
+#line 67 "parserPromela.lex"
+{ }
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 74 "parserPromela.lex"
-{ printf("caractère inconnu\n"); }
+#line 69 "parserPromela.lex"
+{ }
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 76 "parserPromela.lex"
+#line 71 "parserPromela.lex"
 ECHO;
        YY_BREAK
-#line 945 "automaton_lexer.yy.c"
+#line 940 "automaton_lexer.yy.c"
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
@@ -1939,7 +1934,7 @@ void xbt_automaton_parser_free (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 76 "parserPromela.lex"
+#line 71 "parserPromela.lex"
 
 
 

diff --git a/src/xbt/automaton/parserPromela.lex b/src/xbt/automaton/parserPromela.lex
index 921940f..7b64a62 100644 (file)
--- a/src/xbt/automaton/parserPromela.lex
+++ b/src/xbt/automaton/parserPromela.lex
@@ -27,51 +27,46 @@ commentaire  "/*"([^\*\/]*{nouv_ligne}*[^\*\/]*)*"*/"
 
 %%
 
-"never"      { printf("%s", yytext); return (NEVER); }
-"if"         { printf("%s", yytext); return (IF); }
-"fi"         { printf("%s", yytext); 
-               return (FI); }
-"->"         { printf("%s", yytext); return (IMPLIES); }
-"goto"       { printf("%s", yytext); return (GOTO); }
-"&&"         { printf("%s", yytext); return (AND); }
-"||"         { printf("%s", yytext); return (OR); }
-"!"          { printf("%s", yytext); return (NOT); }
-"("          { printf("%s", yytext); return (LEFT_PAR); }
-")"          { printf("%s", yytext); return (RIGHT_PAR); }
-"::"         { printf("%s", yytext); return (CASE); }
-":"          { printf("%s", yytext); return (COLON); }
-";"          { printf("%s", yytext); return (SEMI_COLON); }
-"1"          { printf("%s", yytext); return (CASE_TRUE); }
-"{"          { printf("%s", yytext); return (LEFT_BRACE); }
-"}"          { printf("%s", yytext); return (RIGHT_BRACE); }
-
-
-{commentaire}             { printf(" ");}
-
-{blancs}                  { printf("%s",yytext); }
-
-
-{reel}                    { printf("%s",yytext); 
-                            sscanf(yytext,"%lf",&yylval.real); 
+"never"      { return (NEVER); }
+"if"         { return (IF); }
+"fi"         { return (FI); }
+"->"         { return (IMPLIES); }
+"goto"       { return (GOTO); }
+"&&"         { return (AND); }
+"||"         { return (OR); }
+"!"          { return (NOT); }
+"("          { return (LEFT_PAR); }
+")"          { return (RIGHT_PAR); }
+"::"         { return (CASE); }
+":"          { return (COLON); }
+";"          { return (SEMI_COLON); }
+"1"          { return (CASE_TRUE); }
+"{"          { return (LEFT_BRACE); }
+"}"          { return (RIGHT_BRACE); }
+
+
+{commentaire}             { }
+
+{blancs}                  { }
+
+
+{reel}                    { sscanf(yytext,"%lf",&yylval.real); 
                             return (LITT_REEL); }
 
-{entier}                  { printf("%s",yytext); 
-                            sscanf(yytext,"%d",&yylval.integer); 
+{entier}                  { sscanf(yytext,"%d",&yylval.integer); 
                             return (LITT_ENT); }
 
-{chaine}                  { printf("%s",yytext);  
-                            yylval.string=(char *)malloc(strlen(yytext)+1);
+{chaine}                  { yylval.string=(char *)malloc(strlen(yytext)+1);
                             sscanf(yytext,"%s",yylval.string); 
                             return (LITT_CHAINE); }
 
-[a-zA-Z]{caractere}*      { printf("%s",yytext); 
-                           yylval.string=(char *)malloc(strlen(yytext)+1);
-                           sscanf(yytext,"%s",yylval.string);
-                           return (ID); }
+[a-zA-Z]{caractere}*      { yylval.string=(char *)malloc(strlen(yytext)+1);
+                            sscanf(yytext,"%s",yylval.string);
+                                             return (ID); }
                   
-{numl}                    { printf("\n"); }
+{numl}                    { }
 
-.                         { printf("caractère inconnu\n"); }
+.                         { }
 
 %%