Changeset 03606ce for src/Parser/DeclarationNode.cc

Timestamp:

Mar 8, 2024, 12:25:49 AM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

266732e

Parents:

06601401 (diff), 169496e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/DeclarationNode.cc (modified) (4 diffs)

src/Parser/DeclarationNode.cc

@@ -177 +177 @@
 }
 
+DeclarationNode * DeclarationNode::newFromTypeData( TypeData * type ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = type;
+        return newnode;
+} // DeclarationNode::newFromTypeData
+
 DeclarationNode * DeclarationNode::newStorageClass( ast::Storage::Classes sc ) {
         DeclarationNode * newnode = new DeclarationNode;
@@ -188 +194 @@
         return newnode;
 } // DeclarationNode::newFuncSpecifier
-
-DeclarationNode * DeclarationNode::newTypeQualifier( ast::CV::Qualifiers tq ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData();
-        newnode->type->qualifiers = tq;
-        return newnode;
-} // DeclarationNode::newQualifier
-
-DeclarationNode * DeclarationNode::newBasicType( BasicType bt ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Basic );
-        newnode->type->basictype = bt;
-        return newnode;
-} // DeclarationNode::newBasicType
-
-DeclarationNode * DeclarationNode::newComplexType( ComplexType ct ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Basic );
-        newnode->type->complextype = ct;
-        return newnode;
-} // DeclarationNode::newComplexType
-
-DeclarationNode * DeclarationNode::newSignedNess( Signedness sn ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Basic );
-        newnode->type->signedness = sn;
-        return newnode;
-} // DeclarationNode::newSignedNess
-
-DeclarationNode * DeclarationNode::newLength( Length lnth ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Basic );
-        newnode->type->length = lnth;
-        return newnode;
-} // DeclarationNode::newLength
-
-DeclarationNode * DeclarationNode::newForall( DeclarationNode * forall ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Unknown );
-        newnode->type->forall = forall;
-        return newnode;
-} // DeclarationNode::newForall
-
-DeclarationNode * DeclarationNode::newFromGlobalScope() {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::GlobalScope );
-        return newnode;
-}
-
-DeclarationNode * DeclarationNode::newQualifiedType( DeclarationNode * parent, DeclarationNode * child) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Qualified );
-        newnode->type->qualified.parent = parent->type;
-        newnode->type->qualified.child = child->type;
-        parent->type = nullptr;
-        child->type = nullptr;
-        delete parent;
-        delete child;
-        return newnode;
-}
 
 DeclarationNode * DeclarationNode::newAggregate( ast::AggregateDecl::Aggregate kind, const string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
@@ -312 +258 @@
 }
 
-DeclarationNode * DeclarationNode::newFromTypedef( const string * name ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::SymbolicInst );
-        newnode->type->symbolic.name = name;
-        newnode->type->symbolic.isTypedef = true;
-        newnode->type->symbolic.params = nullptr;
-        return newnode;
-} // DeclarationNode::newFromTypedef
-
-DeclarationNode * DeclarationNode::newFromTypeGen( const string * name, ExpressionNode * params ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::SymbolicInst );
-        newnode->type->symbolic.name = name;
-        newnode->type->symbolic.isTypedef = false;
-        newnode->type->symbolic.actuals = params;
-        return newnode;
-} // DeclarationNode::newFromTypeGen
-
 DeclarationNode * DeclarationNode::newTypeParam( ast::TypeDecl::Kind tc, const string * name ) {
         DeclarationNode * newnode = newName( name );
@@ -423 +351 @@
         return newnode;
 }
-
-DeclarationNode * DeclarationNode::newVtableType( DeclarationNode * decl ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Vtable );
-        newnode->setBase( decl->type );
-        return newnode;
-}
-
-DeclarationNode * DeclarationNode::newBuiltinType( BuiltinType bt ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Builtin );
-        newnode->type->builtintype = bt;
-        return newnode;
-} // DeclarationNode::newBuiltinType
 
 DeclarationNode * DeclarationNode::newFunction( const string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body ) {