summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-03-05 10:06:05 +0200
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-03-06 15:12:51 +0200
commita9748e6445016d276b0fa344c61646de3d7febf2 (patch)
tree3a7943007f16ae47630ad852ee3dac90cc353603 /src
parent232a3cf5fcc4312f6550d28e5d21607a6a7da637 (diff)
Eolian/Lexer: fix parsing for functions description.
If the first character of the description was not an alphanumeric, it was not finalizing the parsing of the description and was not inserting it in the database. It was occurring when "@since" was the first word in the description of the function.
Diffstat (limited to 'src')
-rw-r--r--src/lib/eolian/eo_lexer.c16
-rw-r--r--src/lib/eolian/eo_lexer.rl2
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index ff5faff..70de68f 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -402,7 +402,7 @@ static const char _eo_tokenizer_trans_keys[] = {
402 114, 102, 97, 99, 101, 9, 13, 32, 402 114, 102, 97, 99, 101, 9, 13, 32,
403 120, 105, 110, 9, 13, 32, 10, 42, 403 120, 105, 110, 9, 13, 32, 10, 42,
404 64, 10, 42, 10, 42, 47, 10, 42, 404 64, 10, 42, 10, 42, 47, 10, 42,
405 95, 0, 32, 48, 57, 65, 90, 97, 405 95, 0, 32, 48, 57, 64, 90, 97,
406 122, 10, 42, 10, 42, 47, 10, 9, 406 122, 10, 42, 10, 42, 47, 10, 9,
407 13, 32, 58, 95, 48, 57, 65, 90, 407 13, 32, 58, 95, 48, 57, 65, 90,
408 97, 122, 9, 13, 32, 58, 9, 13, 408 97, 122, 9, 13, 32, 58, 9, 13,
@@ -432,13 +432,13 @@ static const char _eo_tokenizer_trans_keys[] = {
432 9, 13, 32, 42, 59, 64, 95, 48, 432 9, 13, 32, 42, 59, 64, 95, 48,
433 57, 65, 90, 97, 122, 9, 13, 32, 433 57, 65, 90, 97, 122, 9, 13, 32,
434 47, 42, 64, 10, 95, 0, 32, 48, 434 47, 42, 64, 10, 95, 0, 32, 48,
435 57, 65, 90, 97, 122, 10, 42, 10, 435 57, 64, 90, 97, 122, 10, 42, 10,
436 42, 47, 119, 97, 114, 110, 95, 117, 436 42, 47, 119, 97, 114, 110, 95, 117,
437 110, 117, 115, 101, 100, 59, 10, 42, 437 110, 117, 115, 101, 100, 59, 10, 42,
438 10, 42, 47, 10, 9, 13, 32, 42, 438 10, 42, 47, 10, 9, 13, 32, 42,
439 59, 95, 48, 57, 64, 90, 97, 122, 439 59, 95, 48, 57, 64, 90, 97, 122,
440 9, 13, 32, 47, 42, 64, 10, 95, 440 9, 13, 32, 47, 42, 64, 10, 95,
441 0, 32, 48, 57, 65, 90, 97, 122, 441 0, 32, 48, 57, 64, 90, 97, 122,
442 10, 42, 10, 42, 47, 10, 42, 10, 442 10, 42, 10, 42, 47, 10, 42, 10,
443 42, 47, 10, 116, 10, 123, 0, 32, 443 42, 47, 10, 116, 10, 123, 0, 32,
444 121, 115, 10, 123, 0, 32, 116, 10, 444 121, 115, 10, 123, 0, 32, 116, 10,
@@ -447,7 +447,7 @@ static const char _eo_tokenizer_trans_keys[] = {
447 10, 10, 95, 123, 0, 32, 48, 57, 447 10, 10, 95, 123, 0, 32, 48, 57,
448 65, 90, 97, 122, 10, 123, 0, 32, 448 65, 90, 97, 122, 10, 123, 0, 32,
449 10, 42, 64, 10, 42, 10, 42, 47, 449 10, 42, 64, 10, 42, 10, 42, 47,
450 10, 42, 95, 0, 32, 48, 57, 65, 450 10, 42, 95, 0, 32, 48, 57, 64,
451 90, 97, 122, 10, 42, 10, 42, 47, 451 90, 97, 122, 10, 42, 10, 42, 47,
452 10, 110, 115, 116, 59, 103, 97, 99, 452 10, 110, 115, 116, 59, 103, 97, 99,
453 121, 9, 13, 32, 9, 13, 32, 65, 453 121, 9, 13, 32, 9, 13, 32, 65,
@@ -460,14 +460,14 @@ static const char _eo_tokenizer_trans_keys[] = {
460 90, 97, 122, 9, 13, 32, 42, 59, 460 90, 97, 122, 9, 13, 32, 42, 59,
461 64, 95, 48, 57, 65, 90, 97, 122, 461 64, 95, 48, 57, 65, 90, 97, 122,
462 9, 13, 32, 47, 42, 64, 10, 95, 462 9, 13, 32, 47, 42, 64, 10, 95,
463 0, 32, 48, 57, 65, 90, 97, 122, 463 0, 32, 48, 57, 64, 90, 97, 122,
464 10, 42, 10, 42, 47, 119, 97, 114, 464 10, 42, 10, 42, 47, 119, 97, 114,
465 110, 95, 117, 110, 117, 115, 101, 100, 465 110, 95, 117, 110, 117, 115, 101, 100,
466 59, 10, 42, 10, 42, 47, 10, 10, 466 59, 10, 42, 10, 42, 47, 10, 10,
467 95, 123, 0, 32, 48, 57, 65, 90, 467 95, 123, 0, 32, 48, 57, 65, 90,
468 97, 122, 10, 123, 0, 32, 10, 42, 468 97, 122, 10, 123, 0, 32, 10, 42,
469 64, 10, 42, 10, 42, 47, 10, 42, 469 64, 10, 42, 10, 42, 47, 10, 42,
470 95, 0, 32, 48, 57, 65, 90, 97, 470 95, 0, 32, 48, 57, 64, 90, 97,
471 122, 10, 42, 10, 42, 47, 10, 110, 471 122, 10, 42, 10, 42, 47, 10, 110,
472 115, 116, 114, 117, 99, 116, 111, 114, 472 115, 116, 114, 117, 99, 116, 111, 114,
473 115, 10, 123, 0, 32, 115, 116, 114, 473 115, 10, 123, 0, 32, 115, 116, 114,
@@ -479,7 +479,7 @@ static const char _eo_tokenizer_trans_keys[] = {
479 48, 57, 65, 90, 97, 122, 10, 59, 479 48, 57, 65, 90, 97, 122, 10, 59,
480 0, 32, 9, 10, 13, 32, 47, 125, 480 0, 32, 9, 10, 13, 32, 47, 125,
481 0, 31, 65, 90, 97, 122, 42, 64, 481 0, 31, 65, 90, 97, 122, 42, 64,
482 10, 95, 0, 32, 48, 57, 65, 90, 482 10, 95, 0, 32, 48, 57, 64, 90,
483 97, 122, 10, 42, 10, 42, 47, 10, 483 97, 122, 10, 42, 10, 42, 47, 10,
484 125, 0, 32, 65, 90, 97, 122, 112, 484 125, 0, 32, 65, 90, 97, 122, 112,
485 108, 101, 109, 101, 110, 116, 115, 10, 485 108, 101, 109, 101, 110, 116, 115, 10,
@@ -514,7 +514,7 @@ static const char _eo_tokenizer_trans_keys[] = {
514 65, 90, 97, 122, 59, 95, 48, 57, 514 65, 90, 97, 122, 59, 95, 48, 57,
515 65, 90, 97, 122, 10, 125, 0, 32, 515 65, 90, 97, 122, 10, 125, 0, 32,
516 10, 59, 125, 0, 32, 42, 64, 10, 516 10, 59, 125, 0, 32, 42, 64, 10,
517 95, 0, 32, 48, 57, 65, 90, 97, 517 95, 0, 32, 48, 57, 64, 90, 97,
518 122, 10, 42, 10, 42, 47, 10, 58, 518 122, 10, 42, 10, 42, 47, 10, 58,
519 59, 125, 0, 32, 65, 90, 97, 122, 519 59, 125, 0, 32, 65, 90, 97, 122,
520 9, 10, 13, 32, 59, 123, 0, 31, 520 9, 10, 13, 32, 59, 123, 0, 31,
diff --git a/src/lib/eolian/eo_lexer.rl b/src/lib/eolian/eo_lexer.rl
index 7d29967..ada7686 100644
--- a/src/lib/eolian/eo_lexer.rl
+++ b/src/lib/eolian/eo_lexer.rl
@@ -342,7 +342,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
342 event = alpha+ >save_fpc (alnum | '_' | ',' )+; 342 event = alpha+ >save_fpc (alnum | '_' | ',' )+;
343 class_meth = alpha+ >save_fpc (alnum | '_' | '::' )+; 343 class_meth = alpha+ >save_fpc (alnum | '_' | '::' )+;
344 344
345 eo_comment = "/*@" ignore* alnum_u >save_fpc ( any | cr @inc_line )* :>> "*/"; 345 eo_comment = "/*@" ignore* ('@' | alnum_u) >save_fpc ( any | cr @inc_line )* :>> "*/";
346 c_comment = "/*" ( any | cr @inc_line )* :>> "*/"; 346 c_comment = "/*" ( any | cr @inc_line )* :>> "*/";
347 cpp_comment = "//" (any - cr )* newline; 347 cpp_comment = "//" (any - cr )* newline;
348 comment = ( c_comment | cpp_comment ) > save_line; 348 comment = ( c_comment | cpp_comment ) > save_line;