Forráskód Böngészése

core: preprocessor subst rules are applied to pv names

- all name is matched and substituted before pv is looked up
- reported in FS#139

(cherry picked from commit 39ffe589035fce17145023204b1005702e02a66f)
Daniel-Constantin Mierla 10 éve
szülő
commit
4fb321cb44
1 módosított fájl, 2 hozzáadás és 0 törlés
  1. 2 0
      cfg.lex

+ 2 - 0
cfg.lex

@@ -1043,6 +1043,7 @@ IMPORTFILE      "import_file"
 								if (p_nest==0){
 									count();
 									addstr(&s_buf, yytext, yyleng);
+									r = pp_subst_run(&s_buf.s);
 									yylval.strval=s_buf.s;
 									memset(&s_buf, 0, sizeof(s_buf));
 									state=INITIAL_S;
@@ -1060,6 +1061,7 @@ IMPORTFILE      "import_file"
 <PVARID>{CR}|{EAT_ABLE}|.	{	yyless(yyleng-1);
 								count();
 								addstr(&s_buf, yytext, yyleng);
+								r = pp_subst_run(&s_buf.s);
 								yylval.strval=s_buf.s;
 								memset(&s_buf, 0, sizeof(s_buf));
 								state=INITIAL_S;