Skip to content

Commit

Permalink
Merge pull request thelilylang#458 from thelilylang/change_generic_sy…
Browse files Browse the repository at this point in the history 
…ntax

Change generic syntax
  • Loading branch information
@ArthurPV
ArthurPV committed Apr 28, 2024
2 parents d028951 + a91d97f commit bb235cb
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 60 deletions.
8 changes: 4 additions & 4 deletions src/core/cc/ci/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@ In my case, the CI advantage is that I can translate Lily's source code in a ver
For the time being, the only real feature is generic support:
```c
struct Vec<@T> {
struct Vec[@T] {
@T *buffer;
unsigned int len;
unsigned int capacity;
};
struct Vec<@T> init__Vec<@T>() {
return (struct Vec<@T>){ .buffer = NULL, .len = 0, .capacity = 4 };
struct Vec.[@T] init__Vec[@T]() {
return (struct Vec.[@T]){ .buffer = NULL, .len = 0, .capacity = 4 };
}
int main() {
struct Vec<int> v = init__Vec<int>();
struct Vec.[int] v = init__Vec.[int]();
}
```

Expand Down
130 changes: 75 additions & 55 deletions src/core/cc/ci/parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,8 @@ static void
expect_with_list__CIParser(CIParser *self, Usize n, ...);

/// @brief Advance to n token(s).
// TODO: Perhaps implement it.
// static void
// jump__CIParser(CIParser *self, Usize n);
static void
jump__CIParser(CIParser *self, Usize n);

/// @brief Check if the current token can be a data type.
static bool
Expand Down Expand Up @@ -535,8 +534,20 @@ parse_function_params__CIParser(CIParser *self);

/// @brief Parse generic params.
/// @return Vec<CIDataType*>*
/// @param is_call Check whether this is a generic params call.
/// @example
///
/// struct Vec[@T] { // => generic params, so `is_call` is false
/// @T *buffer;
/// Usize len;
/// Usize capacity;
/// };
///
/// // ...
///
/// Vec.[@T] // => generic params call, so `is_call` is true
static CIGenericParams *
parse_generic_params__CIParser(CIParser *self);
parse_generic_params__CIParser(CIParser *self, bool is_call);

/// @brief Parser function call.
static CIExpr *
Expand Down Expand Up @@ -3004,6 +3015,14 @@ expect_with_list__CIParser(CIParser *self, Usize n, ...)
FAILED("expected ...");
}

void
jump__CIParser(CIParser *self, Usize n)
{
while (n--) {
next_token__CIParser(self);
}
}

bool
is_data_type__CIParser(CIParser *self)
{
Expand Down Expand Up @@ -3709,16 +3728,8 @@ parse_data_type__CIParser(CIParser *self)
switch (self->tokens_iters.previous_token->kind) {
case CI_TOKEN_KIND_IDENTIFIER: {
String *name = self->tokens_iters.previous_token->identifier;
CIGenericParams *generic_params = NULL;

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LSHIFT:
generic_params = parse_generic_params__CIParser(self);

break;
default:
break;
}
CIGenericParams *generic_params =
parse_generic_params__CIParser(self, true);

res = NEW_VARIANT(CIDataType,
typedef,
Expand Down Expand Up @@ -3841,7 +3852,6 @@ parse_data_type__CIParser(CIParser *self)
enum CITokenKind previous_token_kind =
self->tokens_iters.previous_token->kind;
String *name = NULL; // String* (&)
CIGenericParams *generic_params = NULL;

// struct <name><generic_params, ...> ...;
// struct <name><generic_params, ...> { ... } ...;
Expand All @@ -3857,15 +3867,20 @@ parse_data_type__CIParser(CIParser *self)
break;
}

bool generic_params_is_call = false;

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LSHIFT:
generic_params = parse_generic_params__CIParser(self);
case CI_TOKEN_KIND_DOT:
generic_params_is_call = true;

break;
default:
break;
}

CIGenericParams *generic_params = parse_generic_params__CIParser(
self, generic_params_is_call); // CIGenericParams*?

switch (previous_token_kind) {
case CI_TOKEN_KIND_KEYWORD_STRUCT:
res = NEW_VARIANT(
Expand All @@ -3888,6 +3903,10 @@ parse_data_type__CIParser(CIParser *self)
switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LBRACE:
case CI_TOKEN_KIND_SEMICOLON:
if (generic_params_is_call) {
FAILED("`.` is not expected before generic params");
}

switch (previous_token_kind) {
case CI_TOKEN_KIND_KEYWORD_STRUCT: {
CIDecl *struct_decl = parse_struct__CIParser(
Expand Down Expand Up @@ -4117,21 +4136,48 @@ parse_function_params__CIParser(CIParser *self)
}

CIGenericParams *
parse_generic_params__CIParser(CIParser *self)
parse_generic_params__CIParser(CIParser *self, bool is_call)
{
next_token__CIParser(self); // skip `<`
if (is_call) {
switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_DOT: {
CIToken *peeked = peek_token__CIParser(self, 1);

switch (peeked->kind) {
case CI_TOKEN_KIND_LHOOK:
jump__CIParser(self, 2);
break;
default:
return NULL;
}

break;
}
default:
return NULL;
}
} else {
switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LHOOK:
next_token__CIParser(self);

break;
default:
return NULL;
}
}

Vec *params = NEW(Vec); // Vec<CIDataType*>*

while (self->tokens_iters.current_token->kind != CI_TOKEN_KIND_RSHIFT &&
while (self->tokens_iters.current_token->kind != CI_TOKEN_KIND_RHOOK &&
self->tokens_iters.current_token->kind != CI_TOKEN_KIND_EOF) {
CIDataType *data_type = parse_data_type__CIParser(self);

if (data_type) {
push__Vec(params, data_type);
}

if (self->tokens_iters.current_token->kind != CI_TOKEN_KIND_RSHIFT) {
if (self->tokens_iters.current_token->kind != CI_TOKEN_KIND_RHOOK) {
expect__CIParser(self, CI_TOKEN_KIND_COMMA, true);
}
}
Expand All @@ -4141,14 +4187,14 @@ parse_generic_params__CIParser(CIParser *self)
}

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_RSHIFT:
case CI_TOKEN_KIND_RHOOK:
next_token__CIParser(self);

break;
case CI_TOKEN_KIND_EOF:
FAILED("unexpected EOF");
default:
UNREACHABLE("expected `>` or `EOF`");
UNREACHABLE("expected `]` or `EOF`");
}

return params ? NEW(CIGenericParams, params) : NULL;
Expand Down Expand Up @@ -4393,16 +4439,8 @@ parse_primary_expr__CIParser(CIParser *self)
}
case CI_TOKEN_KIND_IDENTIFIER: {
String *identifier = self->tokens_iters.previous_token->identifier;
CIGenericParams *generic_params = NULL; // CIGenericParams*?

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LSHIFT:
generic_params = parse_generic_params__CIParser(self);

break;
default:
break;
}
CIGenericParams *generic_params =
parse_generic_params__CIParser(self, true); // CIGenericParams*?

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LPAREN:
Expand Down Expand Up @@ -5408,7 +5446,6 @@ parse_typedef__CIParser(CIParser *self, CIDataType *data_type)
}

String *typedef_name = NULL;
CIGenericParams *generic_params = NULL;

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_IDENTIFIER:
Expand All @@ -5422,14 +5459,8 @@ parse_typedef__CIParser(CIParser *self, CIDataType *data_type)

init_typedef_to_visit_waiting_list__CIParser(self, typedef_name);

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LSHIFT:
generic_params = parse_generic_params__CIParser(self);

break;
default:
break;
}
CIGenericParams *generic_params =
parse_generic_params__CIParser(self, false);

expect__CIParser(self, CI_TOKEN_KIND_SEMICOLON, true);

Expand Down Expand Up @@ -5737,22 +5768,11 @@ parse_decl__CIParser(CIParser *self, bool in_function_body)
switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_IDENTIFIER: {
String *name = self->tokens_iters.current_token->identifier;
CIGenericParams *generic_params = NULL; // CIGenericParams*?

next_token__CIParser(self);

switch (self->tokens_iters.current_token->kind) {
case CI_TOKEN_KIND_LSHIFT:
generic_params = parse_generic_params__CIParser(self);

break;
default:
break;
}

if (storage_class_flag & CI_STORAGE_CLASS_TYPEDEF) {
TODO("parse typedef");
}
CIGenericParams *generic_params =
parse_generic_params__CIParser(self, false); // CIGenericParams*?

switch (self->tokens_iters.current_token->kind) {
// Parse first variable
Expand Down
3 changes: 2 additions & 1 deletion src/core/shared/scanner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ skip_space_except_new_line__Scanner(Scanner *self)
void
jump__Scanner(Scanner *self, Usize n)
{
for (Usize i = 0; i < n; ++i)
while (n--) {
next_char__Scanner(self);
}
}

void
Expand Down

0 comments on commit bb235cb

Please sign in to comment.