Skip to content

Commit 425d591

Browse files
andrew-johnson-4andrew-johnson-4
committed
parse
1 parent 5b4b939 commit 425d591

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎BOOTSTRAP/cli.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33889,8 +33889,8 @@ uuid__0000000000135162;
3388933889
});}
3389033890

3389133891
#line 1349 "PLUGINS/FRONTEND/LSTS/lsts-parse.lsts"
33892-
LM__LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT_ lsts_SB_parse_SB_lhs_SB_one_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(LM__LT_List_LT_Token_GT__GT_ uuid__000000000013518b){LM__LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT_ uuid__00000000001351a9;
33893-
LM__LT_Token_GT_ uuid__00000000001351c6;
33892+
LM__LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT_ lsts_SB_parse_SB_lhs_SB_one_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(LM__LT_List_LT_Token_GT__GT_ uuid__000000000013518b){LM__LT_Token_GT_ uuid__00000000001351a9;
33893+
LM__LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT_ uuid__00000000001351aa;
3389433894
LM__LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT_ uuid__00000000001351c7;
3389533895
LM__LT_Token_GT_ uuid__00000000001351e4;
3389633896
LM__LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT_ uuid__00000000001351e5;
@@ -33906,38 +33906,38 @@ char uuid__0000000000135242;
3390633906
LM__LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT_ uuid__0000000000135244;
3390733907
LM__LT_AST_GT_ uuid__0000000000135243;
3390833908
LM__LT_AST_GT_ uuid__00000000001351a8;
33909-
return ({({uuid__00000000001351a8=((lsts_SB_is_SB_ident_SB_head_CL__LT_Arrow_LT_U64_GT__LT_String_GT__GT_((lsts_SB_parse_SB_head_CL__LT_Arrow_LT_String_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b))))?({({({uuid__00000000001351a9=(lsts_SB_make_SB_maybe_SB_var_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
33909+
return ({({uuid__00000000001351a8=((_EQ__EQ__CL__LT_Arrow_LT_U64_GT__LT_Cons_LT_String_GT__LT_String_GT__GT__GT_((lsts_SB_parse_SB_head_CL__LT_Arrow_LT_String_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b)),"uuid"))?({({({({({({({({({uuid__00000000001351a9=(head_CL__LT_Arrow_LT_Token_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
3391033910
;
33911-
({uuid__000000000013518b=(uuid__00000000001351a9.field_1);({});});
33911+
({uuid__000000000013518b=(tail_CL__LT_Arrow_LT_List_LT_Token_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});});
33912+
});
33913+
(lsts_SB_parse_SB_expect_CL__LT_Arrow_LT_Nil_GT__LT_Cons_LT_List_LT_Token_GT__GT__LT_String_GT__GT__GT_("(",uuid__000000000013518b));
3391233914
});
33913-
(uuid__00000000001351a9.field_2);
33914-
}):((_EQ__EQ__CL__LT_Arrow_LT_U64_GT__LT_Cons_LT_String_GT__LT_String_GT__GT__GT_((lsts_SB_parse_SB_head_CL__LT_Arrow_LT_String_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b)),"&"))?({({({({({uuid__00000000001351c6=(head_CL__LT_Arrow_LT_Token_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
33915-
;
3391633915
({uuid__000000000013518b=(tail_CL__LT_Arrow_LT_List_LT_Token_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});});
3391733916
});
33918-
({uuid__00000000001351c7=(lsts_SB_parse_SB_lhs_SB_one_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
33917+
({uuid__00000000001351aa=(lsts_SB_parse_SB_lhs_SB_one_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
3391933918
;
3392033919
});
33921-
({uuid__000000000013518b=(uuid__00000000001351c7.field_1);({});});
33920+
({uuid__000000000013518b=(uuid__00000000001351aa.field_1);({});});
33921+
});
33922+
(lsts_SB_parse_SB_expect_CL__LT_Arrow_LT_Nil_GT__LT_Cons_LT_List_LT_Token_GT__GT__LT_String_GT__GT__GT_(")",uuid__000000000013518b));
3392233923
});
33923-
(mk_SB_cons_CL__LT_Arrow_LT_AST_GT__LT_Cons_LT_AST_GT__LT_AST_GT__GT__GT_(({LM__LT_AST_GT_ rvalue={.field_0=7};rvalue.field_7001=uuid__00000000001351c6;rvalue.field_7002=(uuid__00000000001351c6.field_3);rvalue;}),(uuid__00000000001351c7.field_2)));
33924-
}):((_EQ__EQ__CL__LT_Arrow_LT_U64_GT__LT_Cons_LT_String_GT__LT_String_GT__GT__GT_((lsts_SB_parse_SB_head_CL__LT_Arrow_LT_String_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b)),"uuid"))?({({({({({({({({({uuid__00000000001351e4=(head_CL__LT_Arrow_LT_Token_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
33925-
;
3392633924
({uuid__000000000013518b=(tail_CL__LT_Arrow_LT_List_LT_Token_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});});
3392733925
});
33928-
(lsts_SB_parse_SB_expect_CL__LT_Arrow_LT_Nil_GT__LT_Cons_LT_List_LT_Token_GT__GT__LT_String_GT__GT__GT_("(",uuid__000000000013518b));
33926+
(mk_SB_cons_CL__LT_Arrow_LT_AST_GT__LT_Cons_LT_AST_GT__LT_AST_GT__GT__GT_(({LM__LT_AST_GT_ rvalue={.field_0=7};rvalue.field_7001=uuid__00000000001351a9;rvalue.field_7002=(uuid__00000000001351a9.field_3);rvalue;}),(uuid__00000000001351aa.field_2)));
33927+
}):((lsts_SB_is_SB_ident_SB_head_CL__LT_Arrow_LT_U64_GT__LT_String_GT__GT_((lsts_SB_parse_SB_head_CL__LT_Arrow_LT_String_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b))))?({({({uuid__00000000001351c7=(lsts_SB_make_SB_maybe_SB_var_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
33928+
;
33929+
({uuid__000000000013518b=(uuid__00000000001351c7.field_1);({});});
3392933930
});
33931+
(uuid__00000000001351c7.field_2);
33932+
}):((_EQ__EQ__CL__LT_Arrow_LT_U64_GT__LT_Cons_LT_String_GT__LT_String_GT__GT__GT_((lsts_SB_parse_SB_head_CL__LT_Arrow_LT_String_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b)),"&"))?({({({({({uuid__00000000001351e4=(head_CL__LT_Arrow_LT_Token_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
33933+
;
3393033934
({uuid__000000000013518b=(tail_CL__LT_Arrow_LT_List_LT_Token_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});});
3393133935
});
3393233936
({uuid__00000000001351e5=(lsts_SB_parse_SB_lhs_SB_one_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
3393333937
;
3393433938
});
3393533939
({uuid__000000000013518b=(uuid__00000000001351e5.field_1);({});});
3393633940
});
33937-
(lsts_SB_parse_SB_expect_CL__LT_Arrow_LT_Nil_GT__LT_Cons_LT_List_LT_Token_GT__GT__LT_String_GT__GT__GT_(")",uuid__000000000013518b));
33938-
});
33939-
({uuid__000000000013518b=(tail_CL__LT_Arrow_LT_List_LT_Token_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});});
33940-
});
3394133941
(mk_SB_cons_CL__LT_Arrow_LT_AST_GT__LT_Cons_LT_AST_GT__LT_AST_GT__GT__GT_(({LM__LT_AST_GT_ rvalue={.field_0=7};rvalue.field_7001=uuid__00000000001351e4;rvalue.field_7002=(uuid__00000000001351e4.field_3);rvalue;}),(uuid__00000000001351e5.field_2)));
3394233942
}):((lsts_SB_is_SB_lit_CL__LT_Arrow_LT_U64_GT__LT_String_GT__GT_((lsts_SB_parse_SB_head_CL__LT_Arrow_LT_String_GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b))))?({({({uuid__0000000000135202=(lsts_SB_parse_SB_lit_CL__LT_Arrow_LT_Tuple_LT_List_LT_Token_GT__GT__LT_AST_GT__GT__LT_List_LT_Token_GT__GT__GT_(uuid__000000000013518b));({});})
3394333943
;

‎PLUGINS/FRONTEND/LSTS/lsts-parse.lsts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,17 @@ let lsts-make-lit(t: Token): AST = (
13471347
);
13481348

13491349
let lsts-parse-lhs-one(tokens: List<Token>): Tuple<AST,List<Token>> = (
1350-
let base = if lsts-is-ident-head(lsts-parse-head(tokens)) {
1350+
let base = if lsts-parse-head(tokens)==c"uuid" {
1351+
let u = head(tokens); tokens = tail(tokens);
1352+
lsts-parse-expect(c"(", tokens); tokens = tail(tokens);
1353+
let base-rest = lsts-parse-lhs-one(tokens);
1354+
tokens = base-rest.second;
1355+
lsts-parse-expect(c")", tokens); tokens = tail(tokens);
1356+
mk-cons(
1357+
Var{ u.key, u },
1358+
base-rest.first
1359+
);
1360+
} else if lsts-is-ident-head(lsts-parse-head(tokens)) {
13511361
let base-rest = lsts-make-maybe-var(tokens);
13521362
tokens = base-rest.second;
13531363
base-rest.first;
@@ -1359,16 +1369,6 @@ let lsts-parse-lhs-one(tokens: List<Token>): Tuple<AST,List<Token>> = (
13591369
Var{ amp.key, amp },
13601370
base-rest.first
13611371
);
1362-
} else if lsts-parse-head(tokens)==c"uuid" {
1363-
let u = head(tokens); tokens = tail(tokens);
1364-
lsts-parse-expect(c"(", tokens); tokens = tail(tokens);
1365-
let base-rest = lsts-parse-lhs-one(tokens);
1366-
tokens = base-rest.second;
1367-
lsts-parse-expect(c")", tokens); tokens = tail(tokens);
1368-
mk-cons(
1369-
Var{ u.key, u },
1370-
base-rest.first
1371-
);
13721372
} else if lsts-is-lit(lsts-parse-head(tokens)) {
13731373
let base-rest = lsts-parse-lit(tokens);
13741374
tokens = base-rest.second;

0 commit comments

Comments
 (0)