|
@@ -1192,9 +1192,9 @@ IMPORTFILE "import_file"
|
|
|
|
|
|
<INITIAL>{COM_LINE}!{SER_CFG}{CR} { count();
|
|
<INITIAL>{COM_LINE}!{SER_CFG}{CR} { count();
|
|
sr_cfg_compat=SR_COMPAT_SER;}
|
|
sr_cfg_compat=SR_COMPAT_SER;}
|
|
-<INITIAL>{COM_LINE}!{KAMAILIO_CFG}{CR} { count();
|
|
|
|
|
|
+<INITIAL>{COM_LINE}!{KAMAILIO_CFG}{CR} { count();
|
|
sr_cfg_compat=SR_COMPAT_KAMAILIO;}
|
|
sr_cfg_compat=SR_COMPAT_KAMAILIO;}
|
|
-<INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count();
|
|
|
|
|
|
+<INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count();
|
|
sr_cfg_compat=SR_COMPAT_MAX;}
|
|
sr_cfg_compat=SR_COMPAT_MAX;}
|
|
|
|
|
|
<INITIAL>{PREP_START}{DEFINE}{EAT_ABLE}+ { count(); pp_define_set_type(0);
|
|
<INITIAL>{PREP_START}{DEFINE}{EAT_ABLE}+ { count(); pp_define_set_type(0);
|
|
@@ -1203,6 +1203,12 @@ IMPORTFILE "import_file"
|
|
state = DEFINE_S; BEGIN(DEFINE_ID); }
|
|
state = DEFINE_S; BEGIN(DEFINE_ID); }
|
|
<INITIAL>{PREP_START}{REDEF}{EAT_ABLE}+ { count(); pp_define_set_type(2);
|
|
<INITIAL>{PREP_START}{REDEF}{EAT_ABLE}+ { count(); pp_define_set_type(2);
|
|
state = DEFINE_S; BEGIN(DEFINE_ID); }
|
|
state = DEFINE_S; BEGIN(DEFINE_ID); }
|
|
|
|
+<DEFINE_ID>{ID}{MINUS} { count();
|
|
|
|
+ LOG(L_CRIT,
|
|
|
|
+ "error at %s line %d: '-' not allowed\n",
|
|
|
|
+ (finame)?finame:"cfg", line);
|
|
|
|
+ exit(-1);
|
|
|
|
+ }
|
|
<DEFINE_ID>{ID} { count();
|
|
<DEFINE_ID>{ID} { count();
|
|
if (pp_define(yyleng, yytext)) return 1;
|
|
if (pp_define(yyleng, yytext)) return 1;
|
|
state = DEFINE_EOL_S; BEGIN(DEFINE_EOL); }
|
|
state = DEFINE_EOL_S; BEGIN(DEFINE_EOL); }
|
|
@@ -1230,6 +1236,12 @@ IMPORTFILE "import_file"
|
|
<INITIAL,IFDEF_SKIP>{PREP_START}{IFNDEF}{EAT_ABLE}+ { count();
|
|
<INITIAL,IFDEF_SKIP>{PREP_START}{IFNDEF}{EAT_ABLE}+ { count();
|
|
if (pp_ifdef_type(0)) return 1;
|
|
if (pp_ifdef_type(0)) return 1;
|
|
state = IFDEF_S; BEGIN(IFDEF_ID); }
|
|
state = IFDEF_S; BEGIN(IFDEF_ID); }
|
|
|
|
+<IFDEF_ID>{ID}{MINUS} { count();
|
|
|
|
+ LOG(L_CRIT,
|
|
|
|
+ "error at %s line %d: '-' not allowed\n",
|
|
|
|
+ (finame)?finame:"cfg", line);
|
|
|
|
+ exit(-1);
|
|
|
|
+ }
|
|
<IFDEF_ID>{ID} { count();
|
|
<IFDEF_ID>{ID} { count();
|
|
pp_ifdef_var(yyleng, yytext);
|
|
pp_ifdef_var(yyleng, yytext);
|
|
state = IFDEF_EOL_S; BEGIN(IFDEF_EOL); }
|
|
state = IFDEF_EOL_S; BEGIN(IFDEF_EOL); }
|