{"thread":{"id":"30440","subject":"[PATCH] compat/regex: fix typos in comments.","startedAt":"2012-05-06T12:45:00Z","lastAt":"2012-05-06T15:18:15Z","messageCount":5,"participants":["Yi, EungJun","Ævar Arnfjörð Bjarmason","Zbigniew Jędrzejewski-Szmek"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"190906","messageId":"1336308300-4858-1-git-send-email-semtlenori@gmail.com","threadId":"30440","inReplyTo":null,"subject":"[PATCH] compat/regex: fix typos in comments.","fromName":"Yi, EungJun","fromEmail":"semtlenori@gmail.com","sentAt":"2012-05-06T12:45:00Z","receivedAt":"2012-05-06T12:45:00Z","isPatch":true,"sender":{"key":"semtlenori@gmail.com","avatar":"https://gravatar.com/avatar/8363435d2badb3450df0dd7c4ec2113f6e1d62c44dd3cf7dfe83c5a389b8a9bf?d=mp&s=160"},"body":"From: \"Yi, EungJun\" \n\noccured => occurred\n\nSigned-off-by: Yi, EungJun \n---\n compat/regex/regcomp.c | 4 ++--\n compat/regex/regex_internal.c | 6 +++---\n 2 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex 8c96ed9..aab8153 100644\n--- a/compat/regex/regcomp.c\n+++ b/compat/regex/regcomp.c\n@@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)\n \n /* Entry point of the parser.\n Parse the regular expression REGEXP and return the structure tree.\n- If an error is occured, ERR is set by error code, and return NULL.\n+ If an error is occurred, ERR is set by error code, and return NULL.\n This function build the following tree, from regular expression :\n \t CAT\n \t / \\\n@@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,\n /* This is intended for the expressions like \"a{1,3}\".\n Fetch a number from `input', and return the number.\n Return -1, if the number field is empty like \"{,1}\".\n- Return -2, If an error is occured. */\n+ Return -2, If an error is occurred. */\n \n static int\n fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)\ndiff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\nindex 193854c..237642c 100644\n--- a/compat/regex/regex_internal.c\n+++ b/compat/regex/regex_internal.c\n@@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)\n \n /* Insert the new element ELEM to the re_node_set* SET.\n SET should not already have ELEM.\n- return -1 if an error is occured, return 1 otherwise. */\n+ return -1 if an error is occurred, return 1 otherwise. */\n \n static int\n internal_function\n@@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)\n \n /* Insert the new element ELEM to the re_node_set* SET.\n SET should not already have any element greater than or equal to ELEM.\n- Return -1 if an error is occured, return 1 otherwise. */\n+ Return -1 if an error is occurred, return 1 otherwise. */\n \n static int\n internal_function\n@@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)\n \f\n \n /* Add the token TOKEN to dfa->nodes, and return the index of the token.\n- Or return -1, if an error will be occured. */\n+ Or return -1, if an error will be occurred. */\n \n static int\n internal_function\n-- \n1.7.5.4\n"},{"id":"190907","messageId":"CACBZZX4K5vh7CjJ6SqX-reuuNqse7koONC=1HcXCuY0vbXRpbQ@mail.gmail.com","threadId":"30440","inReplyTo":"1336308300-4858-1-git-send-email-semtlenori@gmail.com","subject":"Re: [PATCH] compat/regex: fix typos in comments.","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2012-05-06T12:55:48Z","receivedAt":"2012-05-06T12:55:48Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Sun, May 6, 2012 at 2:45 PM, Yi, EungJun wrote:\n> From: \"Yi, EungJun\" \n>\n> occured => occurred\n\nIn d18f76d I changed compat/regex to use the engine from gawk, there\nhave been a few fixes of ours to it since then, some of which may be\napplicable for upstream inclusion:\n\n $ git --no-pager log --oneline --reverse d18f76d.. -- compat/regex\n a997bf4 compat/regex: get the gawk regex engine to compile within git\n de83172 Change regerror() declaration from K&R style to ANSI C (C89)\n b50f370 compat/regex: define out variables only used under RE_ENABLE_I18N\n 178b331 compat/regex: get rid of old-style definition\n ce518bb Fix compat/regex ANSIfication on MinGW\n\nBut I don't think we should be taking patches like these. I think they\nshould instead be sent to the upstream gawk developers who I'm sure\nwould be happy to take them.\n\nBut this is not code that we're maintaining, and patches like these\njust make it harder to merge the code from upstream.\n"},{"id":"190913","messageId":"CAFT+Tg8fvVawnCFwmXfBep1b+uonEB7J3eA3wJDMVSRcaXHMAQ@mail.gmail.com","threadId":"30440","inReplyTo":"CACBZZX4K5vh7CjJ6SqX-reuuNqse7koONC=1HcXCuY0vbXRpbQ@mail.gmail.com","subject":"Re: [PATCH] compat/regex: fix typos in comments.","fromName":"Yi, EungJun","fromEmail":"semtlenori@gmail.com","sentAt":"2012-05-06T13:40:20Z","receivedAt":"2012-05-06T13:40:20Z","isPatch":true,"sender":{"key":"semtlenori@gmail.com","avatar":"https://gravatar.com/avatar/8363435d2badb3450df0dd7c4ec2113f6e1d62c44dd3cf7dfe83c5a389b8a9bf?d=mp&s=160"},"body":"You're right. I will send this patch to gawk developers.\n\nThanks to your advice!\n\n2012/5/6 Ævar Arnfjörð Bjarmason :\n> On Sun, May 6, 2012 at 2:45 PM, Yi, EungJun wrote:\n>> From: \"Yi, EungJun\" \n>>\n>> occured => occurred\n>\n> In d18f76d I changed compat/regex to use the engine from gawk, there\n> have been a few fixes of ours to it since then, some of which may be\n> applicable for upstream inclusion:\n>\n>    $ git --no-pager log --oneline --reverse d18f76d.. -- compat/regex\n>    a997bf4 compat/regex: get the gawk regex engine to compile within git\n>    de83172 Change regerror() declaration from K&R style to ANSI C (C89)\n>    b50f370 compat/regex: define out variables only used under RE_ENABLE_I18N\n>    178b331 compat/regex: get rid of old-style definition\n>    ce518bb Fix compat/regex ANSIfication on MinGW\n>\n> But I don't think we should be taking patches like these. I think they\n> should instead be sent to the upstream gawk developers who I'm sure\n> would be happy to take them.\n>\n> But this is not code that we're maintaining, and patches like these\n> just make it harder to merge the code from upstream.\n"},{"id":"190921","messageId":"4FA693A9.20101@in.waw.pl","threadId":"30440","inReplyTo":"1336308300-4858-1-git-send-email-semtlenori@gmail.com","subject":"Re: [PATCH] compat/regex: fix typos in comments.","fromName":"Zbigniew Jędrzejewski-Szmek","fromEmail":"zbyszek@in.waw.pl","sentAt":"2012-05-06T15:07:21Z","receivedAt":"2012-05-06T15:07:21Z","isPatch":true,"sender":{"key":"zbyszek@in.waw.pl","avatar":"https://avatars.githubusercontent.com/u/349618?v=4"},"body":"On 05/06/2012 02:45 PM, Yi, EungJun wrote:\n> From: \"Yi, EungJun\" \n> \n> occured => occurred\n> \n> Signed-off-by: Yi, EungJun \n> ---\n> compat/regex/regcomp.c | 4 ++--\n> compat/regex/regex_internal.c | 6 +++---\n> 2 files changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\n> index 8c96ed9..aab8153 100644\n> --- a/compat/regex/regcomp.c\n> +++ b/compat/regex/regcomp.c\n> @@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)\n> \n> /* Entry point of the parser.\n> Parse the regular expression REGEXP and return the structure tree.\n> - If an error is occured, ERR is set by error code, and return NULL.\n> + If an error is occurred, ERR is set by error code, and return NULL.\n\nHi,\nyou might want to fix the grammatical errors instead:\n\"If an error occurs, ERR is set to the error code, and NULL is\nreturned.\", or something like that, I haven't actually read the code.\n\nBest,\nZbyszek\n\n> This function build the following tree, from regular expression :\n> \t CAT\n> \t / \\\n> @@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,\n> /* This is intended for the expressions like \"a{1,3}\".\n> Fetch a number from `input', and return the number.\n> Return -1, if the number field is empty like \"{,1}\".\n> - Return -2, If an error is occured. */\n> + Return -2, If an error is occurred. */\n> \n> static int\n> fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)\n> diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\n> index 193854c..237642c 100644\n> --- a/compat/regex/regex_internal.c\n> +++ b/compat/regex/regex_internal.c\n> @@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)\n> \n> /* Insert the new element ELEM to the re_node_set* SET.\n> SET should not already have ELEM.\n> - return -1 if an error is occured, return 1 otherwise. */\n> + return -1 if an error is occurred, return 1 otherwise. */\n> \n> static int\n> internal_function\n> @@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)\n> \n> /* Insert the new element ELEM to the re_node_set* SET.\n> SET should not already have any element greater than or equal to ELEM.\n> - Return -1 if an error is occured, return 1 otherwise. */\n> + Return -1 if an error is occurred, return 1 otherwise. */\n> \n> static int\n> internal_function\n> @@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)\n> \f\n> \n> /* Add the token TOKEN to dfa->nodes, and return the index of the token.\n> - Or return -1, if an error will be occured. */\n> + Or return -1, if an error will be occurred. */\n> \n> static int\n> internal_function\n"},{"id":"190922","messageId":"CACBZZX7hUmEK5-7rpmZiDx4u5_aV_uiwijtzP5-jFNd4si-iQQ@mail.gmail.com","threadId":"30440","inReplyTo":"CAFT+Tg8fvVawnCFwmXfBep1b+uonEB7J3eA3wJDMVSRcaXHMAQ@mail.gmail.com","subject":"Re: [PATCH] compat/regex: fix typos in comments.","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2012-05-06T15:18:15Z","receivedAt":"2012-05-06T15:18:15Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Sun, May 6, 2012 at 3:40 PM, Yi, EungJun wrote:\n> You're right. I will send this patch to gawk developers.\n\nIf you're doing that anyway it would also be very useful to see if\nthey'd be willing to take the the rest of the patches we've\naccumulated since we initially brought it into our tree. I.e. the ones\nI showed in the shortlog I posted.\n"}]}