Skip to content

fix_new_line_in_definition #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boomyl merged 1 commit into from
Aug 17, 2021
Merged

fix_new_line_in_definition #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions compiler/create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,16 @@ FuncDefinition *chain_func_definition_list(FuncDefinition *list, FuncDefinition
return list;
}

Definition *alloc_definition()
{
return (Definition *) malloc(sizeof(Definition));
}

DefinitionList *alloc_definition_list()
{
return (DefinitionList *) malloc(sizeof(DefinitionList));
}

Declaration *chain_declaration_list(Declaration *list, Declaration *next)
{
if (list == NULL)
Expand Down
33 changes: 23 additions & 10 deletions compiler/grammar.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ int yyerror(const char *s);
struct Block *block;
struct Elseif *elseif;
struct FuncDefinition *func_definition;
struct Definition *definition;
struct DefinitionList *definition_list;
struct TypeSpecifier *type_specifier;
struct ParameterList *parameter_list;
struct ArgumentList *argument_list;
Expand All @@ -38,8 +40,10 @@ int yyerror(const char *s);
%type <block> block
%type <elseif> elseif elseif_list
%type <func_definition> func_definition
%type <definition> definition
%type <definition_list> definition_list
%type <type_specifier> type_specifier
%type <parameter_list> parameter_list paramter
%type <parameter_list> parameter_list parameter
%type <argument_list> argument_list

%nonassoc '=' ADD_ASSIGN SUB_ASSIGN MUL_ASSIGN DIV_ASSIGN DECL_ASSIGN
Expand All @@ -53,11 +57,20 @@ int yyerror(const char *s);

%%

definition_or_stmt:
func_definition { add_func_definition_to_compiler($1); }
| const_stmt { add_stmt_to_compiler($1); }
| variable_declaration_stmt { add_stmt_to_compiler($1); }
;
translation_unit:
new_line_option definition_list new_line_option
;

definition_list:
definition { $$ = alloc_definition_list(); }
| definition_list new_line definition
;

definition:
func_definition { $$ = alloc_definition(); add_func_definition_to_compiler($1); }
| const_stmt { $$ = alloc_definition(); add_stmt_to_compiler($1); }
| variable_declaration_stmt { $$ = alloc_definition(); add_stmt_to_compiler($1); }
;

func_definition:
FUNCTION IDENTIFIER '(' parameter_list ')' type_specifier block { $$ = alloc_func_definition($2, $4, $6, $7); }
Expand All @@ -67,12 +80,12 @@ func_definition:
;

parameter_list:
paramter
| parameter_list ',' paramter { $$ = chain_parameter($1, $3); }
parameter
| parameter_list ',' parameter { $$ = chain_parameter($1, $3); }
;

paramter:
IDENTIFIER type_specifier { $$ = alloc_parameter($2, $1); }
parameter:
IDENTIFIER type_specifier { $$ = alloc_parameter($2, $1); }
;

stmt_list:
Expand Down
6 changes: 6 additions & 0 deletions compiler/summoner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,12 @@ FuncDefinition *alloc_func_definition(char *name, ParameterList *parameters, Typ
FuncDefinition *chain_func_definition_list(FuncDefinition *list, FuncDefinition *next);
Declaration *chain_declaration_list(Declaration *list, Declaration *declaration);

typedef struct Definition {} Definition;
typedef struct DefinitionList {} DefinitionList;

Definition *alloc_definition();
DefinitionList *alloc_definition_list();

typedef wchar_t SVM_Char;
typedef unsigned char SVM_Byte;

Expand Down