Changeset 93bbbc4 for src/Parser

Timestamp:

Jul 14, 2021, 6:35:37 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

e7a63e3

Parents:

b16e15e

Message:

update parser for vtable declarations

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (2 diffs)
• TypeData.cc (modified) (7 diffs)
• TypeData.h (modified) (3 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 23 08:44:08 2021
-// Update Count     : 1149
+// Last Modified On : Wed Jul 14 17:36:57 2021
+// Update Count     : 1154
 //
 
@@ -385 +385 @@
         newnode->type = new TypeData( basetypeof ? TypeData::Basetypeof : TypeData::Typeof );
         newnode->type->typeexpr = expr;
+        return newnode;
+}
+
+DeclarationNode * DeclarationNode::newVtableType( DeclarationNode * decl ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Vtable );
+        newnode->setBase( decl->type );
         return newnode;
 }

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 15:19:04 2021
-// Update Count     : 897
+// Last Modified On : Wed Jul 14 17:28:53 2021
+// Update Count     : 900
 //
 
@@ -249 +249 @@
         static DeclarationNode * newTuple( DeclarationNode * members );
         static DeclarationNode * newTypeof( ExpressionNode * expr, bool basetypeof = false );
+        static DeclarationNode * newVtableType( DeclarationNode * expr );
         static DeclarationNode * newAttribute( const std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newDirectiveStmt( StatementNode * stmt ); // gcc external directive statement

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 07:56:46 2019
-// Update Count     : 662
+// Last Modified On : Wed Jul 14 17:46:47 2021
+// Update Count     : 671
 //
 
@@ -100 +100 @@
                 typeexpr = nullptr;
                 break;
+          case Vtable:
+                break;
           case Builtin:
                 // builtin = new Builtin_t;
@@ -170 +172 @@
                 // delete typeexpr->expr;
                 delete typeexpr;
+                break;
+          case Vtable:
                 break;
           case Builtin:
@@ -249 +253 @@
           case Basetypeof:
                 newtype->typeexpr = maybeClone( typeexpr );
+                break;
+          case Vtable:
                 break;
           case Builtin:
@@ -467 +473 @@
           case Basetypeof:
           case Builtin:
+          case Vtable:
                 assertf(false, "Tried to get leaf name from kind without a name: %d", kind);
                 break;
@@ -546 +553 @@
           case TypeData::Basetypeof:
                 return buildTypeof( td );
+          case TypeData::Vtable:
+                return buildVtable( td );
           case TypeData::Builtin:
                 switch ( td->builtintype ) {
@@ -950 +959 @@
 
 
+VTableType * buildVtable( const TypeData * td ) {
+        assert( td->base );
+        return new VTableType{ buildQualifiers( td ), typebuild( td->base ) };
+} // buildVtable
+
+
 Declaration * buildDecl( const TypeData * td, const string &name, Type::StorageClasses scs, Expression * bitfieldWidth, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, Expression *asmName, Initializer * init, std::list< Attribute * > attributes ) {
         if ( td->kind == TypeData::Function ) {

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar 27 09:05:35 2021
-// Update Count     : 200
+// Last Modified On : Wed Jul 14 17:44:05 2021
+// Update Count     : 202
 //
 
@@ -27 +27 @@
 struct TypeData {
         enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
-                                SymbolicInst, Tuple, Typeof, Basetypeof, Builtin, GlobalScope, Qualified, Unknown };
+                                SymbolicInst, Tuple, Typeof, Basetypeof, Vtable, Builtin, GlobalScope, Qualified, Unknown };
 
         struct Aggregate_t {
@@ -128 +128 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
+VTableType * buildVtable( const TypeData * );
 Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName,
                                                  Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );

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 Jun 29 09:12:47 2021
-// Update Count     : 5027
+// Last Modified On : Wed Jul 14 17:27:54 2021
+// Update Count     : 5030
 //
 
@@ -1923 +1923 @@
 
 vtable:
-        VTABLE '(' type_list ')' default_opt
-                { SemanticError( yylloc, "vtable is currently unimplemented." ); $$ = nullptr; }
+        VTABLE '(' typedef_name ')' default_opt
+                { $$ = DeclarationNode::newVtableType( $3 ); }
+                // { SemanticError( yylloc, "vtable is currently unimplemented." ); $$ = nullptr; }
         ;