[certi-cvs] certi/libCERTI tokens.ll

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/12/18 15:26:17

Modified files:
        libCERTI       : tokens.ll 

Log message:
        Tolerate DOS like end of line.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/tokens.ll?cvsroot=certi&r1=3.9&r2=3.10

Patches:
Index: tokens.ll
===================================================================
RCS file: /sources/certi/certi/libCERTI/tokens.ll,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- tokens.ll   9 Nov 2010 12:43:30 -0000       3.9
+++ tokens.ll   18 Dec 2011 15:26:16 -0000      3.10
@@ -20,7 +20,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: tokens.ll,v 3.9 2010/11/09 12:43:30 erk Exp $
+// $Id: tokens.ll,v 3.10 2011/12/18 15:26:16 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include "syntax.h"
@@ -65,9 +65,9 @@
 
 %%
 
-;;.*\n         certi::fedparser::line_number++ ; /* comments */
+;;.*\r?\n   certi::fedparser::line_number++ ; /* comments */
 [ \t]+         /* whitespaces */
-\n             certi::fedparser::line_number++ ;
+\r?\n       certi::fedparser::line_number++ ;
 "("            return L_PAR ;
 ")"            return R_PAR ;
 "("[Aa][Tt][Tt][Rr][Ii][Bb][Uu][Tt][Ee]        return ATTRIBUTE ;
@@ -102,8 +102,7 @@
 }
 {ident}                { certi::fedparser::arg = yytext ; return STRING ; }
 \"[^"\n]*["]   {                       
-                       certi::fedparser::arg = std::string(&yytext[1], 
-                               &yytext[yyleng - 1]) ;                  
+                certi::fedparser::arg = std::string(&yytext[1],&yytext[yyleng 
- 1]);
                        return STRING ; 
                }
 .              yyerror("invalid character");