New CSS selector ":contains(text)" #42

f34nk · 2018-03-24T21:30:03Z

Hey Alex,
I followed your instructions in #36 and added new pseudo class "contains".

added "contains" to $func_map = {...}
run script perl utils/MyCSS/functions.pl
added all "contains" related functions and enums
function mycss_selectors_function_begin_contains() in file function.c:
added selector sub_type MyCSS_SELECTORS_SUB_TYPE_PSEUDO_CLASS_FUNCTION_CONTAINS
added test test/myhtml/pseudo_class_contains.c
implemented finder function in modest_finder_selector_sub_type_pseudo_class_function_contains() in file pseudo_class.c.

As of now, the selector argument cannot contain single or double quotation marks. That's because I basically duplicated the implementation from pseudo class "has", so behavior and serialization is the same.

Example:

const char *selector = ":contains(Hello)"; // works
const char *selector = ":contains('Hello')"; // Bad Selector
const char *selector = ":contains(\"Hello\")"; // Bad Selector

According to the spec (from 2001) however, quotation marks should also be supported.

The :contains("foo") pseudo-class notation represents an element whose textual contents contain the given substring. The argument of this pseudo-class can be a string (surrounded by double quotes) or a keyword.

So my implementation only solves the "argument as keyword" case.
Tell me what you think.

Best,
Frank

… 'contains' type

…tils/MyCSS/functions.pl'

…gress...

…tains(); Test pseudo_class_contains succeeds

lexborisov · 2018-03-25T15:21:09Z

source/modest/finder/finder.c

@@ -189,9 +190,9 @@ myhtml_tree_node_t * modest_finder_node_combinator_begin(modest_finder_t* finder
                if(callback_found)
                    callback_found(finder, node, selector_list, selector, spec, ctx);
            }
-            else {
+            else {                


Extra spaces after else {

lexborisov · 2018-03-25T15:22:31Z

source/modest/finder/finder.c

+    // FRANK
+    // printf("\nmodest_finder_node_combinator_undef()\n");
+    // printf("\tselector->type = %d\n", (int)selector->type);
+


need to remove comments above

lexborisov · 2018-03-25T15:25:54Z

source/modest/finder/pseudo_class.c

@@ -77,6 +77,62 @@ bool modest_finder_selector_sub_type_pseudo_class_function_has(modest_finder_t*
    return false;
 }

+// concat str1 and str2
+char *concat_string(const char *str1, const char *str2)


move to core module, append to mycore/utils.c and rename to mycore_str_cat

lexborisov · 2018-03-25T15:27:07Z

source/modest/finder/pseudo_class.c

+
+bool modest_finder_selector_sub_type_pseudo_class_function_contains(modest_finder_t* finder, myhtml_tree_node_t* base_node, mycss_selectors_entry_t* selector, mycss_selectors_specificity_t* spec)
+{
+    if(base_node){


if(base_node == NULL) { return false; }

lexborisov · 2018-03-25T15:29:52Z

source/modest/finder/pseudo_class.c

+    if(str1) n += strlen(str1);
+    if(str2) n += strlen(str2);
+
+    if((str1 || str2) && (result = malloc(n + 1)) != NULL)


Too many checks of the same str1 and str2
You can make it easier

lexborisov · 2018-03-25T15:30:38Z

source/modest/finder/pseudo_class.c

+    if(str1) n += strlen(str1);
+    if(str2) n += strlen(str2);
+
+    if((str1 || str2) && (result = malloc(n + 1)) != NULL)


malloc => mycore_malloc and:

result = mycore_malloc(n + 1); if(result == NULL) { return NULL; }

lexborisov · 2018-03-25T15:35:03Z

source/modest/finder/pseudo_class.c

+                mycss_selectors_entry_t *next = sel_entry->next;
+                while(next && !i_found){
+                    if(next->key->data){
+                        data = concat_string(data, " ");


memory leak!
if we allocation memory in concat_string and call concat_string with returned data we get leak.

Of course :)

lexborisov · 2018-03-25T15:36:18Z

source/modest/finder/pseudo_class.c

+                    next = next->next;
+                }
+            }
+            if(strstr(text, data) != NULL) {


Where is the release (mycore_free(data)) of resources for data?

lexborisov · 2018-03-25T15:36:52Z

source/mycss/selectors/function.c

@@ -34,7 +34,7 @@ const mycss_selectots_function_begin_entry_t * mycss_function_begin_entry_by_nam
                  % MyCSS_SELECTORS_FUNCTION_NAME_STATIC_SIZE) + 1;

    while (mycss_selectors_function_begin_map_index[idx].name)
-    {
+    {   


unnecessary spaces after {

lexborisov · 2018-03-25T15:40:27Z

source/mycss/selectors/function.c

+
+    (*new_list)->parent = current_list;
+
+    mycss_entry_parser_list_push(entry, mycss_selectors_function_parser_has, entry->parser_switch, entry->parser_ending_token, false);


Why didn't you implement their parsing function?
Do not use mycss_selectors_function_parser_has in this.

…pseudo_class_function_contains' to use mycore_malloc, mycore_realloc and snprintf

lexborisov · 2018-03-26T12:44:03Z

source/modest/finder/pseudo_class.c

+            mycore_free(data);
+            return true;
+        }
+        else {


unnecessary else

if(strstr(text, data) != NULL) { mycore_free(data); return true; } mycore_free(data); return false;

lexborisov · 2018-03-26T12:44:49Z

source/modest/finder/pseudo_class.c

+    mycss_selectors_list_t *list = (mycss_selectors_list_t*)selector->value;
+    for(size_t i = 0; i < list->entries_list_length; i++) {
+        char *data = NULL;
+        data = mycore_malloc(0);


if(data == NULL) { return false; }

lexborisov · 2018-03-26T12:49:22Z

source/modest/finder/pseudo_class.c

+            const char *str = sel_entry->key->data;
+            int length = strlen(str) + 1;
+            data = mycore_realloc(data, length);
+            snprintf(&data[0], length, "%s", str);


leak detected if mycore_realloc return NULL. Need check.

if(sel_entry->key->data){ const char *str = sel_entry->key->data; int length = strlen(str) + 1; char *new_data = mycore_realloc(data, length); if(new_data == NULL) { mycore_free(data); return false; } snprintf(&data[0], length, "%s", str); }

lexborisov · 2018-03-26T12:50:18Z

source/modest/finder/pseudo_class.c

+                const char *str = next->key->data;
+                int length = strlen(whitespace) + strlen(str) + 1;
+                data = mycore_realloc(data, prev + length);
+                snprintf(&data[prev], length, "%s%s", whitespace, str);


and this we have memory leak. see prev comment

lexborisov · 2018-03-26T12:53:21Z

source/modest/finder/pseudo_class.c

+            const char *str = sel_entry->key->data;
+            int length = strlen(str) + 1;
+            data = mycore_realloc(data, length);
+            if(data == NULL) {


leak detected, see comment

lexborisov · 2018-03-26T13:17:25Z

source/modest/finder/pseudo_class.c

+        mycss_selectors_entry_t *sel_entry = list->entries_list[i].entry;
+        if(sel_entry->key->data){
+            const char *str = sel_entry->key->data;
+            int length = strlen(str) + 1;


add new line after this

lexborisov · 2018-03-26T13:17:36Z

source/modest/finder/pseudo_class.c

+                mycore_free(data);
+                return false;
+            }
+            snprintf(&new_data[0], length, "%s", str);


new line before

and change to snprintf(new_data, length, "%s", str);

lexborisov · 2018-03-26T13:18:29Z

source/modest/finder/pseudo_class.c

+                int prev = strlen(data);
+                const char *whitespace = (prev > 0) ? " " : "";
+                const char *str = next->key->data;
+                int length = strlen(whitespace) + strlen(str) + 1;


new line after

lexborisov · 2018-03-26T13:18:40Z

source/modest/finder/pseudo_class.c

+                    mycore_free(data);
+                    return false;
+                }
+                snprintf(&new_data[prev], length, "%s%s", whitespace, str);


new line before

lexborisov · 2018-03-26T13:55:50Z

AWESOME!

f34nk · 2018-03-26T17:21:18Z

Thanks man! That was fun :)

lexborisov · 2018-03-26T17:51:20Z

You're welcome! 😄

f34nk and others added 17 commits February 27, 2018 22:56

Added new pseudo-clas type 'contains'; Added placeholder function for…

ee1578e

… 'contains' type

Marked function as TODO and added default return

97fc234

Added _contains declaration

d6e9727

Incremented xy_LAST_ENTRY

f2bd21d

Added missing functions

bfdc22b

In Progress...

f5e7360

Removed binaries

b97bce9

Added more debugging prints

6322e2c

Generated new 'mycss_selectors_function_begin_map_index' with 'perl u…

6b7c2c4

…tils/MyCSS/functions.pl'

Removed some debug printing

3ef1c28

In progress

bfc5256

Prepared for serialization...

aed3e3d

modest_finder_selector_sub_type_pseudo_class_function_contains in pro…

5883615

…gress...

Implemented modest_finder_selector_sub_type_pseudo_class_function_con…

bec0bc8

…tains(); Test pseudo_class_contains succeeds

Some cleanup...

b4e4e45

Removed all dev printing

a3040f2

Minor change

11bddf6

f34nk changed the title ~~Add CSS selector for ":contains(text)"~~ New CSS selector ":contains(text)" Mar 24, 2018

f34nk added 2 commits March 25, 2018 10:55

Merge branch 'master' into support-for-pseudo-class-contains

5feb533

Cleanup

8b947b6

lexborisov reviewed Mar 25, 2018

View reviewed changes

f34nk added 4 commits March 26, 2018 14:22

Cleanup

8dc0c4c

Added parser for 'contains'

bee75d5

Removed concat function; Refactored 'modest_finder_selector_sub_type_…

2f65f50

…pseudo_class_function_contains' to use mycore_malloc, mycore_realloc and snprintf

Added comma separated arguments test

f8076d9

lexborisov reviewed Mar 26, 2018

View reviewed changes

Added failed allocation check

76b1839

lexborisov reviewed Mar 26, 2018

View reviewed changes

Removed memory leak in case mycore_realloc failes

d650d01

lexborisov reviewed Mar 26, 2018

View reviewed changes

Cleaned formatting

412ba67

lexborisov merged commit 87d75c9 into lexborisov:master Mar 26, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New CSS selector ":contains(text)" #42

New CSS selector ":contains(text)" #42

f34nk commented Mar 24, 2018 •

edited

Loading

lexborisov Mar 25, 2018

f34nk Mar 26, 2018

lexborisov Mar 25, 2018

f34nk Mar 26, 2018

lexborisov Mar 25, 2018

f34nk Mar 26, 2018

lexborisov Mar 25, 2018

f34nk Mar 26, 2018

lexborisov Mar 25, 2018

lexborisov Mar 25, 2018 •

edited

Loading

lexborisov Mar 25, 2018

f34nk Mar 26, 2018

lexborisov Mar 25, 2018

lexborisov Mar 25, 2018

f34nk Mar 26, 2018

lexborisov Mar 25, 2018

f34nk Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov Mar 26, 2018

lexborisov commented Mar 26, 2018

f34nk commented Mar 26, 2018

lexborisov commented Mar 26, 2018


		(*new_list)->parent = current_list;

		mycss_entry_parser_list_push(entry, mycss_selectors_function_parser_has, entry->parser_switch, entry->parser_ending_token, false);

New CSS selector ":contains(text)" #42

New CSS selector ":contains(text)" #42

Conversation

f34nk commented Mar 24, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lexborisov Mar 25, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lexborisov commented Mar 26, 2018

f34nk commented Mar 26, 2018

lexborisov commented Mar 26, 2018

f34nk commented Mar 24, 2018 •

edited

Loading

lexborisov Mar 25, 2018 •

edited

Loading