From 66b48f8f5dec56b170d09dfb4a760365a63014f6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 1 Dec 2016 17:22:19 +0100 Subject: [PATCH] eolian: remove handling of short refs in tokenizer Already expanded in the main lexer. --- src/lib/eolian/eolian_database.c | 8 ++------ src/tests/eolian/eolian_parsing.c | 12 +----------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c index a8293aae11..86fb6bc296 100644 --- a/src/lib/eolian/eolian_database.c +++ b/src/lib/eolian/eolian_database.c @@ -267,12 +267,6 @@ _get_ref_token(const char *doc, const char **doc_end) if (is_event) ++doc; - if ((doc[0] == '.') && (doc[1] != '_') && !isalpha(doc[1])) - return EOLIAN_DOC_TOKEN_UNKNOWN; - - if (doc[0] == '.') - ++doc; - if (_skip_ref_word(&doc)) { while (doc[0] == '.') @@ -294,6 +288,8 @@ _get_ref_token(const char *doc, const char **doc_end) } } } + else + return EOLIAN_DOC_TOKEN_UNKNOWN; if (is_event) { diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index e4b320e8af..b16494a0da 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -1199,7 +1199,7 @@ START_TEST(eolian_docs) EINA_LIST_FREE(sdoc, dpar) free(dpar); - const char *tdoc = "Note: This is $something, see @Blah, @.bleh, " + const char *tdoc = "Note: This is $something, see @Blah, " "@Foo.Bar.baz, \\@ref foo and @[Things.Stuffs.foo,bar]."; Eolian_Doc_Token tok; @@ -1238,16 +1238,6 @@ START_TEST(eolian_docs) tdoc = eolian_documentation_tokenize(tdoc, &tok); fail_if(eolian_doc_token_type_get(&tok) != EOLIAN_DOC_TOKEN_REF); txt = eolian_doc_token_text_get(&tok); - fail_if(strcmp(txt, ".bleh")); - free(txt); - tdoc = eolian_documentation_tokenize(tdoc, &tok); - fail_if(eolian_doc_token_type_get(&tok) != EOLIAN_DOC_TOKEN_TEXT); - txt = eolian_doc_token_text_get(&tok); - fail_if(strcmp(txt, ", ")); - free(txt); - tdoc = eolian_documentation_tokenize(tdoc, &tok); - fail_if(eolian_doc_token_type_get(&tok) != EOLIAN_DOC_TOKEN_REF); - txt = eolian_doc_token_text_get(&tok); fail_if(strcmp(txt, "Foo.Bar.baz")); free(txt); tdoc = eolian_documentation_tokenize(tdoc, &tok);