Changeset 1f652a7 for src/Parser

Timestamp:

Apr 1, 2021, 4:17:56 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3bd2464

Parents:

ca33b15

Message:

add keywords typeid and vtable, and parse new syntax for virtual tables

Location:

src/Parser

Files:

• lex.ll (modified) (3 diffs)
• parser.yy (modified) (7 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Wed Feb 17 08:38:13 2021
- * Update Count     : 752
+ * Last Modified On : Thu Apr  1 13:22:31 2021
+ * Update Count     : 754
  */
 
@@ -318 +318 @@
 __typeof                { KEYWORD_RETURN(TYPEOF); }                             // GCC
 __typeof__              { KEYWORD_RETURN(TYPEOF); }                             // GCC
+typeid                  { KEYWORD_RETURN(TYPEID); }                             // GCC
 union                   { KEYWORD_RETURN(UNION); }
 __uint128_t             { KEYWORD_RETURN(UINT128); }                    // GCC
@@ -327 +328 @@
 __volatile              { KEYWORD_RETURN(VOLATILE); }                   // GCC
 __volatile__    { KEYWORD_RETURN(VOLATILE); }                   // GCC
+vtable                  { KEYWORD_RETURN(VTABLE); }                             // CFA
 waitfor                 { KEYWORD_RETURN(WAITFOR); }                    // CFA
 when                    { KEYWORD_RETURN(WHEN); }                               // CFA

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 30 18:39:23 2021
-// Update Count     : 4965
+// Last Modified On : Thu Apr  1 14:43:24 2021
+// Update Count     : 4978
 //
 
@@ -264 +264 @@
 %token RESTRICT                                                                                 // C99
 %token ATOMIC                                                                                   // C11
-%token FORALL MUTEX VIRTUAL COERCE                                              // CFA
+%token FORALL MUTEX VIRTUAL VTABLE COERCE                               // CFA
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
 %token BOOL COMPLEX IMAGINARY                                                   // C99
@@ -270 +270 @@
 %token uFLOAT16 uFLOAT32 uFLOAT32X uFLOAT64 uFLOAT64X uFLOAT128 // GCC
 %token ZERO_T ONE_T                                                                             // CFA
-%token VALIST                                                                                   // GCC
-%token AUTO_TYPE                                                                                // GCC
-%token TYPEOF BASETYPEOF LABEL                                                  // GCC
+%token SIZEOF TYPEOF VALIST AUTO_TYPE                                   // GCC
+%token OFFSETOF BASETYPEOF TYPEID                                               // CFA
 %token ENUM STRUCT UNION
 %token EXCEPTION                                                                                // CFA
 %token GENERATOR COROUTINE MONITOR THREAD                               // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
-%token SIZEOF OFFSETOF
 // %token RESUME                                                                                        // CFA
+%token LABEL                                                                                    // GCC
 %token SUSPEND                                                                                  // CFA
 %token ATTRIBUTE EXTENSION                                                              // GCC
@@ -373 +372 @@
 
 %type<decl> basic_declaration_specifier basic_type_name basic_type_specifier direct_type indirect_type
+%type<decl> vtable vtable_opt default_opt
 
 %type<decl> trait_declaration trait_declaration_list trait_declaring_list trait_specifier
@@ -785 +785 @@
         | OFFSETOF '(' type_no_function ',' identifier ')'
                 { $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) ); }
+        | TYPEID '(' type_no_function ')'
+                {
+                        SemanticError( yylloc, "typeid name is currently unimplemented." ); $$ = nullptr;
+                        // $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) );
+                }
         ;
 
@@ -1895 +1900 @@
         | AUTO_TYPE
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::AutoType ); }
+        | vtable
+        ;
+
+vtable_opt:
+        // empty
+                { $$ = nullptr; }
+        | vtable;
+        ;
+
+vtable:
+        VTABLE '(' type_list ')' default_opt
+                { SemanticError( yylloc, "vtable is currently unimplemented." ); $$ = nullptr; }
+        ;
+
+default_opt:
+        // empty
+                { $$ = nullptr; }
+        | DEFAULT
+                { SemanticError( yylloc, "vtable default is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -2102 +2126 @@
 
 aggregate_data:
-        STRUCT
+        STRUCT vtable_opt
                 { yyy = true; $$ = AggregateDecl::Struct; }
         | UNION
                 { yyy = true; $$ = AggregateDecl::Union; }
         | EXCEPTION                                                                                     // CFA
-                // { yyy = true; $$ = AggregateDecl::Exception; }
-                { SemanticError( yylloc, "exception aggregate is currently unimplemented." ); $$ = AggregateDecl::NoAggregate; }
+                { yyy = true; $$ = AggregateDecl::Exception; }
+          //            { SemanticError( yylloc, "exception aggregate is currently unimplemented." ); $$ = AggregateDecl::NoAggregate; }
         ;