carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 18:51:09 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename struct to class per #651 (#765)

Browse Source
This commit is contained in:
Jon Meow
2021-08-19 12:15:20 -07:00
committed by GitHub
parent 47325be112
commit 367f9e4e94
24 changed files with 82 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/syntax/lexer.lpp
+2 -2
View File
@@ -51,7 +51,7 @@ NOT "not"
OR "or"
RETURN "return"
STRING "String"
STRUCT "struct"
CLASS "class"
TRUE "true"
TYPE "Type"
VAR "var"
@@ -100,6 +100,7 @@ operand_start [(A-Za-z0-9_"]
{BREAK} { return Carbon::Parser::make_BREAK(context.current_token_position); }
{CASE} { return Carbon::Parser::make_CASE(context.current_token_position); }
{CHOICE} { return Carbon::Parser::make_CHOICE(context.current_token_position); }
{CLASS} { return Carbon::Parser::make_CLASS(context.current_token_position); }
{CONTINUE} { return Carbon::Parser::make_CONTINUE(context.current_token_position); }
{DBLARROW} { return Carbon::Parser::make_DBLARROW(context.current_token_position); }
{DEFAULT} { return Carbon::Parser::make_DEFAULT(context.current_token_position); }
@@ -113,7 +114,6 @@ operand_start [(A-Za-z0-9_"]
{NOT} { return Carbon::Parser::make_NOT(context.current_token_position); }
{OR} { return Carbon::Parser::make_OR(context.current_token_position); }
{RETURN} { return Carbon::Parser::make_RETURN(context.current_token_position); }
{STRUCT} { return Carbon::Parser::make_STRUCT(context.current_token_position); }
{TRUE} { return Carbon::Parser::make_TRUE(context.current_token_position); }
{TYPE} { return Carbon::Parser::make_TYPE(context.current_token_position); }
{VAR} { return Carbon::Parser::make_VAR(context.current_token_position); }
executable_semantics/syntax/parser.ypp
+3 -3
View File
@@ -154,7 +154,7 @@ void Carbon::Parser::error(const location_type&, const std::string& message) {
%token RETURN
%token TRUE
%token FALSE
%token STRUCT
%token CLASS
%token CHOICE
%token MATCH
%token CASE
@@ -570,9 +570,9 @@ declaration:
{ $$ = global_arena->RawNew<FunctionDeclaration>($1); }
| function_declaration
{ $$ = global_arena->RawNew<FunctionDeclaration>($1); }
| STRUCT identifier "{" member_list "}"
| CLASS identifier "{" member_list "}"
{
$$ = global_arena->RawNew<StructDeclaration>(yylineno, $2, $4);
$$ = global_arena->RawNew<ClassDeclaration>(yylineno, $2, $4);
}
| CHOICE identifier "{" alternative_list "}"
{