From 867d4408bd8cd8e3a752ab88c4157e5a0a8f72dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 27 Nov 2013 17:10:14 +0100 Subject: clean up ignore token, use cr token --- eo_tokenizer.rl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eo_tokenizer.rl b/eo_tokenizer.rl index 3a10e8d..b995b13 100644 --- a/eo_tokenizer.rl +++ b/eo_tokenizer.rl @@ -146,15 +146,15 @@ _eo_tokenizer_accessor_get(Eo_Tokenizer *toknz, Eo_Accessor_Type type) cr_neg = [^\n]; ws = [ \t\r]; newline = cr @inc_line; - ignore = (0x00..0x20 - cr)+ newline?; + ignore = (0x00..0x20 - cr) | newline; alnum_u = alnum | '_'; alpha_u = alpha | '_'; ident = alpha+ >save_fpc (alnum | '_' )+; - eo_comment = "/*@" ignore* alnum_u >save_fpc ( any | '\n' @inc_line )* :>> "*/"; - c_comment = "/*" ( any | '\n' @inc_line )* :>> "*/"; - cpp_comment = "//" (any - cr)* newline; + eo_comment = "/*@" ignore* alnum_u >save_fpc ( any | cr @inc_line )* :>> "*/"; + c_comment = "/*" ( any | cr @inc_line )* :>> "*/"; + cpp_comment = "//" (any - cr )* newline; comment = ( c_comment | cpp_comment ) > save_line; end_statement = ';'; -- cgit v1.1-2-g2b99