Skip to content

Commit 82dd566

Browse files
committed
naming consistency
1 parent 9cadfc4 commit 82dd566

36 files changed

Lines changed: 617 additions & 637 deletions

cozo-core/src/cozoscript.pest

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*/
88

99
script = _{sys_script | multi_script | query_script}
10-
query_script = {SOI ~ (option | rule | const_rule | algo_rule)+ ~ EOI}
11-
query_script_inner = {"{" ~ (option | rule | const_rule | algo_rule)+ ~ "}"}
10+
query_script = {SOI ~ (option | rule | const_rule | fixed_rule)+ ~ EOI}
11+
query_script_inner = {"{" ~ (option | rule | const_rule | fixed_rule)+ ~ "}"}
1212
multi_script = {SOI ~ query_script_inner+ ~ EOI}
1313
sys_script = {SOI ~ "::" ~ (compact_op | list_relations_op | list_relation_op | remove_relations_op | trigger_relation_op |
1414
trigger_relation_show_op | rename_relations_op | running_op | kill_op | explain_op | access_level_op) ~ EOI}
@@ -48,19 +48,19 @@ compound_ident = @{ident ~ ("." ~ ident)?}
4848

4949
rule = {rule_head ~ ":=" ~ rule_body ~ ";"?}
5050
const_rule = {rule_head ~ "<-" ~ expr ~ ";"?}
51-
algo_rule = {rule_head ~ "<~" ~ ident ~ algo_args_list ~ ";"?}
52-
algo_args_list = {"(" ~ (algo_arg ~ ",")* ~ algo_arg? ~ ")"}
51+
fixed_rule = {rule_head ~ "<~" ~ ident ~ fixed_args_list ~ ";"?}
52+
fixed_args_list = {"(" ~ (fixed_arg ~ ",")* ~ fixed_arg? ~ ")"}
5353

5454
rule_head = {(prog_entry | ident) ~ "[" ~ (head_arg ~ ",")* ~ head_arg? ~ "]"}
5555
head_arg = {aggr_arg | var}
5656
aggr_arg = {ident ~ "(" ~ var ~ ("," ~ expr)* ~ ")"}
57-
algo_arg = _{algo_rel | algo_opt_pair}
58-
algo_opt_pair = {ident ~ ":" ~ expr}
59-
algo_rel = {algo_rule_rel | algo_relation_rel | algo_named_relation_rel }
60-
algo_rule_rel = {ident ~ "[" ~ (var ~ ",")* ~ var? ~ "]"}
61-
algo_relation_rel = {relation_ident ~ "[" ~ (var ~ ",")* ~ var? ~ "]"}
62-
algo_named_relation_rel = {relation_ident ~ "{" ~ (algo_named_relation_arg_pair ~ ",")* ~ algo_named_relation_arg_pair? ~ "}"}
63-
algo_named_relation_arg_pair = {ident ~ (":" ~ ident)?}
57+
fixed_arg = _{fixed_rel | fixed_opt_pair}
58+
fixed_opt_pair = {ident ~ ":" ~ expr}
59+
fixed_rel = {fixed_rule_rel | fixed_relation_rel | fixed_named_relation_rel }
60+
fixed_rule_rel = {ident ~ "[" ~ (var ~ ",")* ~ var? ~ "]"}
61+
fixed_relation_rel = {relation_ident ~ "[" ~ (var ~ ",")* ~ var? ~ "]"}
62+
fixed_named_relation_rel = {relation_ident ~ "{" ~ (fixed_named_relation_arg_pair ~ ",")* ~ fixed_named_relation_arg_pair? ~ "}"}
63+
fixed_named_relation_arg_pair = {ident ~ (":" ~ ident)?}
6464

6565
rule_body = {(disjunction ~ ",")* ~ disjunction?}
6666
rule_apply = {underscore_ident ~ "[" ~ apply_args ~ "]"}

0 commit comments

Comments
 (0)