pensm/osm_qos_parser: QOS parser doesn't work after syntax error

Commit Message

Yevgeny Kliteynik March 7, 2011, 3:25 p.m. UTC

None

Patch

diff --git a/opensm/opensm/osm_qos_parser_l.l b/opensm/opensm/osm_qos_parser_l.l
index 4633e0e..559974b 100644
--- a/opensm/opensm/osm_qos_parser_l.l
+++ b/opensm/opensm/osm_qos_parser_l.l
@@ -355,6 +355,10 @@  QUOTED_TEXT             \"[^\"]*\"

 .                   { SAVE_POS; yylval = strdup(yytext); return TK_TEXT;}

+<<EOF>>             {
+                        YY_NEW_FILE;
+                        yyterminate();
+                    }
 %%


diff --git a/opensm/opensm/osm_qos_parser_y.y b/opensm/opensm/osm_qos_parser_y.y
index 7118b79..51f72e3 100644
--- a/opensm/opensm/osm_qos_parser_y.y
+++ b/opensm/opensm/osm_qos_parser_y.y
@@ -149,6 +149,7 @@  extern char * yytext;
 extern int yylex (void);
 extern FILE * yyin;
 extern int errno;
+extern void yyrestart(FILE *input_file);
 int yyparse();

 #define RESET_BUFFER  __parser_tmp_struct_reset()
@@ -2354,7 +2355,10 @@  int osm_qos_parse_policy_file(IN osm_subn_t * p_subn)

   Exit:
     if (yyin)
+    {
+        yyrestart(yyin);
         fclose(yyin);
+    }
     OSM_LOG_EXIT(p_qos_parser_osm_log);
     return res;
 }