shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to the grammar.

Browse Source
This commit is contained in:
Christoffer Lerno
2023-11-26 20:06:38 +01:00
parent a46bf4fbe0
commit a50c5f4f7c
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/grammar/c3.l
View File

@@ -41,6 +41,7 @@ int comment_level = 0;
"$alignof" { count(); return(CT_ALIGNOF); } "$alignof" { count(); return(CT_ALIGNOF); }
"$and" { count(); return(CT_AND); } "$and" { count(); return(CT_AND); }
"$assert" { count(); return(CT_ASSERT); } "$assert" { count(); return(CT_ASSERT); }
"$assignable" { count(); return(CT_ASSIGNABLE); }
"$case" { count(); return(CT_CASE); } "$case" { count(); return(CT_CASE); }
"$default" { count(); return(CT_DEFAULT); } "$default" { count(); return(CT_DEFAULT); }
"$defined" { count(); return(CT_DEFINED); } "$defined" { count(); return(CT_DEFINED); }
@@ -173,7 +174,7 @@ b64\'{B64}+\' { count(); return(BYTES); }
b64\"{B64}+\" { count(); return(BYTES); } b64\"{B64}+\" { count(); return(BYTES); }
b64\`{B64}+\` { count(); return(BYTES); } b64\`{B64}+\` { count(); return(BYTES); }
{INT}{E}{REALTYPE}? { count(); return(REAL); } {INT}{E}?{REALTYPE}? { count(); return(REAL); }
0[xX]{HINT}{P}{REALTYPE}? { count(); return(REAL); } 0[xX]{HINT}{P}{REALTYPE}? { count(); return(REAL); }
{INT}"."{INT}{E}?{REALTYPE}? { count(); return(REAL); } {INT}"."{INT}{E}?{REALTYPE}? { count(); return(REAL); }
0[xX]{HINT}"."{HINT}{P}{REALTYPE}? { count(); return(REAL); } 0[xX]{HINT}"."{HINT}{P}{REALTYPE}? { count(); return(REAL); }

22
resources/grammar/grammar.y
View File

@@ -33,7 +33,7 @@ void yyerror(char *s);
%token CT_SIZEOF CT_STRINGIFY CT_QNAMEOF CT_OFFSETOF CT_VAEXPR CT_FEATURE %token CT_SIZEOF CT_STRINGIFY CT_QNAMEOF CT_OFFSETOF CT_VAEXPR CT_FEATURE
%token CT_EXTNAMEOF CT_EVAL CT_DEFINED CT_ALIGNOF ASSERT %token CT_EXTNAMEOF CT_EVAL CT_DEFINED CT_ALIGNOF ASSERT
%token ASM CHAR_LITERAL REAL TRUE FALSE CT_CONST_IDENT %token ASM CHAR_LITERAL REAL TRUE FALSE CT_CONST_IDENT
%token LBRAPIPE RBRAPIPE HASH_CONST_IDENT CT_CASTABLE CT_ASSIGNABLE CT_AND CT_IS_CONST %token LBRAPIPE RBRAPIPE HASH_CONST_IDENT CT_ASSIGNABLE CT_AND CT_IS_CONST
%start translation_unit %start translation_unit
%% %%
@@ -142,7 +142,7 @@ base_expr
| expr_block | expr_block
| ct_call '(' flat_path ')' | ct_call '(' flat_path ')'
| ct_arg '(' expr ')' | ct_arg '(' expr ')'
| ct_analyse '(' expr ')' | ct_analyse '(' expression_list ')'
| CT_VACOUNT | CT_VACOUNT
| CT_FEATURE '(' CONST_IDENT ')' | CT_FEATURE '(' CONST_IDENT ')'
| CT_AND '(' expression_list ')' | CT_AND '(' expression_list ')'
@@ -522,8 +522,8 @@ base_type
| ANYFAULT | ANYFAULT
| ANY | ANY
| TYPEID | TYPEID
| TYPE_IDENT | TYPE_IDENT opt_generic_parameters
| path TYPE_IDENT | path TYPE_IDENT opt_generic_parameters
| CT_TYPE_IDENT | CT_TYPE_IDENT
| CT_TYPEOF '(' expr ')' | CT_TYPEOF '(' expr ')'
| CT_TYPEFROM '(' constant_expr ')' | CT_TYPEFROM '(' constant_expr ')'
@@ -1095,8 +1095,12 @@ parameter
| CT_IDENT ELLIPSIS | CT_IDENT ELLIPSIS
; ;
func_definition func_defintion_decl
: FN func_header fn_parameter_list opt_attributes ';' : FN func_header fn_parameter_list opt_attributes ';'
;
func_definition
: func_defintion_decl
| FN func_header fn_parameter_list opt_attributes macro_func_body | FN func_header fn_parameter_list opt_attributes macro_func_body
; ;
@@ -1123,7 +1127,7 @@ generic_parameters
typedef_type typedef_type
: func_typedef : func_typedef
| type opt_generic_parameters | type
; ;
@@ -1189,8 +1193,8 @@ define_declaration
; ;
interface_body interface_body
: func_typedef : func_defintion_decl
| interface_body func_typedef | interface_body func_defintion_decl
; ;
interface_declaration interface_declaration
@@ -1199,7 +1203,7 @@ interface_declaration
; ;
distinct_declaration distinct_declaration
: DISTINCT TYPE_IDENT opt_interface_impl opt_attributes '=' opt_inline type opt_generic_parameters ';' : DISTINCT TYPE_IDENT opt_interface_impl opt_attributes '=' opt_inline type ';'
; ;
tl_ct_if tl_ct_if