Changeset 465 for trunk/zoo-project/zoo-kernel/service_conf.l

Timestamp:

Apr 23, 2014, 3:05:01 AM (10 years ago)

Author:

djay

Message:

Add the optional YAML ZCFG support #4 and the zcfg2yaml converter. Return error messages that enable the service provider to quickly identify the root cause of errors due to configuration file syntax #90. Fix logic in addMapToMap #91. Enable multiple range definition using default and supported blocks. Add the lastest revision number in version.h (available from Python ZOO-API as zoo.VERSION).

File:

• trunk/zoo-project/zoo-kernel/service_conf.l (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/service_conf.l

@@ -22 +22 @@
 #endif
 
-
+char *lmsg;
 int attentionImpossibleDeTrouverXMLDeclapres = 0 ;
 
@@ -41 +41 @@
 
 attname [a-zA-Z0-9_\-]+
-attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|\$\&>]+
+attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|\$\&>\[\]]+
 
 attvalue                \"[^"]*\"|\'[^']*\'\(\)
@@ -118 +118 @@
 
 
-<INITIAL,DANSBALISE,HORSBALISE>.|\n     {fprintf(stderr,"error : ligne %d : caractere non reconnu '%s'\n",srlineno,yytext);}
+<INITIAL,DANSBALISE,HORSBALISE>.|\n     {lmsg=(char*)malloc(1024*sizeof(char));sprintf(lmsg,"error: line %d: character not allowed '%s'",srlineno,yytext);fprintf(stderr,"%s \n",lmsg);srlval.chaine=lmsg;return -1;}
 
 %%