Changeset be8bd88 for src/Parser/TypeData.h

Timestamp:

Mar 8, 2017, 3:22:50 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

031a2c95, 0e7ea335

Parents:

87c3bef (diff), 6363ad1 (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/TypeData.h (modified) (4 diffs)

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 17:14:46 2017
-// Update Count     : 158
+// Last Modified On : Tue Mar  7 08:03:53 2017
+// Update Count     : 173
 //
 
@@ -76 +76 @@
         DeclarationNode::Length length = DeclarationNode::NoLength;
         DeclarationNode::BuiltinType builtintype = DeclarationNode::NoBuiltinType;
-        typedef std::bitset< DeclarationNode::NoQualifier > Qualifiers;
-        Qualifiers qualifiers;
+        typedef std::bitset< DeclarationNode::NoTypeQualifier > TypeQualifiers;
+        TypeQualifiers typeQualifiers;
         DeclarationNode * forall;
 
@@ -107 +107 @@
 ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes );
 ReferenceToType * buildAggInst( const TypeData * );
-NamedTypeDecl * buildSymbolic( const TypeData *, const std::string &name, DeclarationNode::StorageClass sc );
 TypeDecl * buildVariable( const TypeData * );
 EnumDecl * buildEnum( const TypeData *, std::list< Attribute * > );
@@ -113 +112 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-Declaration * buildDecl( const TypeData *, const std::string &, DeclarationNode::StorageClass, Expression *, bool isInline, bool isNoreturn, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+Declaration * buildDecl( const TypeData *, const std::string &, DeclarationNode::StorageClasses, Expression *, DeclarationNode::FuncSpecifiers funcSpec, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );