Changeset 0dd3a2f for translator/SymTab/AggregateTable.h

Timestamp:

May 18, 2015, 11:20:23 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

51587aa

Parents:

a32b204

Message:

licencing: third groups of files

File:

• translator/SymTab/AggregateTable.h (modified) (2 diffs)

translator/SymTab/AggregateTable.h

@@ -1 @@
-/*
- * This file is part of the Cforall project
- *
- * $Id: AggregateTable.h,v 1.4 2005/08/29 20:14:17 rcbilson Exp $
- *
- */
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// AggregateTable.h -- 
+//
+// Author           : Richard C. Bilson
+// Created On       : Sun May 17 16:17:26 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun May 17 16:19:29 2015
+// Update Count     : 4
+//
 
-#ifndef SYMTAB_AGGREGATETABLE_H
-#define SYMTAB_AGGREGATETABLE_H
+#ifndef AGGREGATETABLE_H
+#define AGGREGATETABLE_H
 
 #include <map>
@@ -18 +26 @@
 
 namespace SymTab {
+        template< class AggregateDeclClass >
+        class AggregateTableConflictFunction : public std::binary_function< AggregateDeclClass *, AggregateDeclClass *, AggregateDeclClass *> {
+          public:
+                AggregateDeclClass *operator()( AggregateDeclClass *existing, AggregateDeclClass *added ) {
+                        if ( existing->get_members().empty() ) {
+                                return added;
+                        } else if ( ! added->get_members().empty() ) {
+                                throw SemanticError( "redeclaration of ", added );
+                        } // if
+                        return existing;
+                }
+        };
 
-template< class AggregateDeclClass >
-class AggregateTableConflictFunction : public std::binary_function< AggregateDeclClass*, AggregateDeclClass*, AggregateDeclClass* >
-{
-public:
-  AggregateDeclClass *operator()( AggregateDeclClass *existing, AggregateDeclClass *added )
-  {
-    if ( existing->get_members().empty() ) {
-      return added;
-    } else if ( ! added->get_members().empty() ) {
-      throw SemanticError( "redeclaration of ", added );
-    }
-    return existing;
-  }
-  
-};
-
-typedef StackTable< StructDecl, AggregateTableConflictFunction< StructDecl > > StructTable;
-typedef StackTable< EnumDecl, AggregateTableConflictFunction< EnumDecl > > EnumTable;
-typedef StackTable< UnionDecl, AggregateTableConflictFunction< UnionDecl > > UnionTable;
-typedef StackTable< ContextDecl, AggregateTableConflictFunction< ContextDecl > > ContextTable;
-
+        typedef StackTable< StructDecl, AggregateTableConflictFunction< StructDecl > > StructTable;
+        typedef StackTable< EnumDecl, AggregateTableConflictFunction< EnumDecl > > EnumTable;
+        typedef StackTable< UnionDecl, AggregateTableConflictFunction< UnionDecl > > UnionTable;
+        typedef StackTable< ContextDecl, AggregateTableConflictFunction< ContextDecl > > ContextTable;
 } // namespace SymTab
 
-#endif /* #ifndef SYMTAB_AGGREGATETABLE_H */
+#endif // AGGREGATETABLE_H
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //