1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

introduce helper function quantify_property_node()

Browse Source 
The new function quantify_property_node() combines the functions
create_property_node() and quantify_node(), which frequently appear together.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2018-11-27 10:15:45 +00:00
parent 69443998cd
commit 8f9c00d207
1 changed files with 28 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
regparse.c
View File

@ -5750,6 +5750,15 @@ quantify_node(Node **np, int lower, int upper)
return 0; return 0;
} }
static int
quantify_property_node(Node **np, ScanEnv* env, const char* propname, int lower, int upper)
{
int r;
r = create_property_node(np, env, propname);
if (r != 0) return r;
return quantify_node(np, lower, upper);
}
static int static int
node_extended_grapheme_cluster(Node** np, ScanEnv* env) node_extended_grapheme_cluster(Node** np, ScanEnv* env)
{ {
@ -5849,9 +5858,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
/* these are equivalent, so we leave things as is for the moment */ /* these are equivalent, so we leave things as is for the moment */
/* T+ */ /* T+ */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=T"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=T", 1, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 1, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = onig_node_new_alt(np1, alt); tmp = onig_node_new_alt(np1, alt);
@ -5860,9 +5867,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
np1 = NULL; np1 = NULL;
/* L+ */ /* L+ */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=L"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=L", 1, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 1, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = onig_node_new_alt(np1, alt); tmp = onig_node_new_alt(np1, alt);
@ -5871,9 +5876,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
np1 = NULL; np1 = NULL;
/* L* LVT T* */ /* L* LVT T* */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=T"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=T", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, NULL_NODE); tmp = node_new_list(np1, NULL_NODE);
@ -5889,10 +5892,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = tmp; list2 = tmp;
np1 = NULL; np1 = NULL;
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=L"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=L", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -5906,9 +5906,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = NULL; list2 = NULL;
/* L* LV V* T* */ /* L* LV V* T* */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=T"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=T", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, NULL_NODE); tmp = node_new_list(np1, NULL_NODE);
@ -5916,9 +5914,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = tmp; list2 = tmp;
np1 = NULL; np1 = NULL;
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=V"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=V", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -5934,9 +5930,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = tmp; list2 = tmp;
np1 = NULL; np1 = NULL;
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=L"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=L", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -5950,9 +5944,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = NULL; list2 = NULL;
/* L* V+ T* */ /* L* V+ T* */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=T"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=T", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, NULL_NODE); tmp = node_new_list(np1, NULL_NODE);
@ -5960,9 +5952,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = tmp; list2 = tmp;
np1 = NULL; np1 = NULL;
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=V"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=V", 1, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 1, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -5970,9 +5960,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = tmp; list2 = tmp;
np1 = NULL; np1 = NULL;
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=L"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=L", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -5991,9 +5979,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
* (ZWJ (Glue_After_Zwj | EBG Extend* E_Modifier?) )* */ * (ZWJ (Glue_After_Zwj | EBG Extend* E_Modifier?) )* */
/* ZWJ (Glue_After_Zwj | E_Base_GAZ Extend* E_Modifier?) */ /* ZWJ (Glue_After_Zwj | E_Base_GAZ Extend* E_Modifier?) */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=E_Modifier"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=E_Modifier", 0, 1);
if (r != 0) goto err;
r = quantify_node(&np1, 0, 1);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, NULL_NODE); tmp = node_new_list(np1, NULL_NODE);
@ -6001,9 +5987,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = tmp; list2 = tmp;
np1 = NULL; np1 = NULL;
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=Extend"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=Extend", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -6026,9 +6010,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
/* Unicode 10.0.0 */ /* Unicode 10.0.0 */
/* Glue_After_Zwj */ /* Glue_After_Zwj */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=Extend"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=Extend", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, NULL_NODE); tmp = node_new_list(np1, NULL_NODE);
@ -6120,9 +6102,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
np1 = NULL; np1 = NULL;
/* E_Modifier? */ /* E_Modifier? */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=E_Modifier"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=E_Modifier", 0, 1);
if (r != 0) goto err;
r = quantify_node(&np1, 0, 1);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -6131,9 +6111,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
np1 = NULL; np1 = NULL;
/* Extend* */ /* Extend* */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=Extend"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=Extend", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -6171,9 +6149,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
* has such examples. * has such examples.
* http://www.unicode.org/Public/9.0.0/ucd/auxiliary/GraphemeBreakTest.html * http://www.unicode.org/Public/9.0.0/ucd/auxiliary/GraphemeBreakTest.html
*/ */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=E_Modifier"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=E_Modifier", 0, 1);
if (r != 0) goto err;
r = quantify_node(&np1, 0, 1);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, NULL_NODE); tmp = node_new_list(np1, NULL_NODE);
@ -6213,9 +6189,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
/* this is actually Regional_Indicator+ in Unicode 10.0.0, /* this is actually Regional_Indicator+ in Unicode 10.0.0,
* but it is Regional_Indicator{2} in Unicode 11.0.0, so no need to fix */ * but it is Regional_Indicator{2} in Unicode 11.0.0, so no need to fix */
/* RI-Sequence := Regional_Indicator{2} */ /* RI-Sequence := Regional_Indicator{2} */
r = create_property_node(&np1, env, "Regional_Indicator"); r = quantify_property_node(&np1, env, "Regional_Indicator", 2, 2);
if (r != 0) goto err;
r = quantify_node(&np1, 2, 2);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);
@ -6234,9 +6208,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
alt = NULL; alt = NULL;
/* Prepend* */ /* Prepend* */
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=Prepend"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=Prepend", 0, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 0, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list); tmp = node_new_list(np1, list);
@ -6274,9 +6246,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
list2 = tmp; list2 = tmp;
np1 = NULL; np1 = NULL;
r = create_property_node(&np1, env, "Grapheme_Cluster_Break=Prepend"); r = quantify_property_node(&np1, env, "Grapheme_Cluster_Break=Prepend", 1, REPEAT_INFINITE);
if (r != 0) goto err;
r = quantify_node(&np1, 1, REPEAT_INFINITE);
if (r != 0) goto err; if (r != 0) goto err;
tmp = node_new_list(np1, list2); tmp = node_new_list(np1, list2);