Changeset f80e0218 for src/SymTab/Indexer.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/SymTab/Indexer.h (modified) (7 diffs)

src/SymTab/Indexer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indexer.h -- 
+// Indexer.h --
 //
 // Author           : Richard C. Bilson
@@ -33 +33 @@
                 Indexer& operator= ( Indexer &&that );
 
-                //using Visitor::visit;
+                using Visitor::visit;
                 virtual void visit( ObjectDecl *objectDecl );
                 virtual void visit( FunctionDecl *functionDecl );
@@ -54 +54 @@
                 virtual void visit( MemberExpr *memberExpr );
                 virtual void visit( VariableExpr *variableExpr );
-                virtual void visit( ConstantExpr *constantExpr ); 
+                virtual void visit( ConstantExpr *constantExpr );
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
@@ -93 +93 @@
                 /// Gets the top-most trait declaration with the given ID
                 TraitDecl *lookupTrait( const std::string &id ) const;
-  
+
                 void print( std::ostream &os, int indent = 0 ) const;
           private:
@@ -99 +99 @@
                 DeclarationWithType *lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
                 /// returns true if there exists a declaration with C linkage and the given name with a different mangled name
-                bool hasIncompatibleCDecl( const std::string &id, const std::string &mangleName ) const;
+                bool hasIncompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
                 // equivalents to lookup functions that only look at tables at scope `scope` (which should be >= tables->scope)
                 NamedTypeDecl *lookupTypeAtScope( const std::string &id, unsigned long scope ) const;
@@ -106 +106 @@
                 UnionDecl *lookupUnionAtScope( const std::string &id, unsigned long scope ) const;
                 TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
-                
+
                 void addId( DeclarationWithType *decl );
                 void addType( NamedTypeDecl *decl );
@@ -115 +115 @@
                 void addUnion( UnionDecl *decl );
                 void addTrait( TraitDecl *decl );
-                
+
                 struct Impl;
                 Impl *tables;         ///< Copy-on-write instance of table data structure