Changeset a32b204 for translator/InitTweak/Association.h

Timestamp:

May 17, 2015, 1:19:35 PM (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:

0dd3a2f

Parents:

b87a5ed

Message:

licencing: second groups of files

File:

• translator/InitTweak/Association.h (modified) (9 diffs)

translator/InitTweak/Association.h

@@ -70 +70 @@
 
   virtual long int add_single( long int idx, Expression *newExpr) {
-    if( expr == 0 ) //|| *expr == *newExpr )
+    if ( expr == 0 ) //|| *expr == *newExpr )
       expr = newExpr;
     return 0;
@@ -76 +76 @@
 
   virtual long int add_single( std::string str, Expression *newExpr) {
-    if( expr == 0 ) //|| *expr == *newExpr )
+    if ( expr == 0 ) //|| *expr == *newExpr )
       expr = newExpr;
     return 0;
@@ -114 +114 @@
     long int ret;
 
-    if( idx >= (long int)ordering.size() ) throw AssocException("extra (spurious) members");
+    if ( idx >= (long int)ordering.size() ) throw AssocException("extra (spurious) members");
 
     if ( ordering[ idx ] == "")
@@ -127 +127 @@
 
   virtual long int add_single( std::string idx, Expression *expr) {
-    if( idx == "" )
+    if ( idx == "" )
       std::cerr << "Checkpoint 1" << std::endl;
     else {
@@ -143 +143 @@
     if ( table.find( str ) != table.end() ) return;
     ordering.push_back( str );
-    if( str != "" ) {
+    if ( str != "" ) {
       std::pair<long int, Association *> p( ordering.size() - 1, 0 );
       table.insert( std::pair< std::string, std::pair<long int, Association *> >(str, p) );
@@ -151 +151 @@
 
   virtual void set_member( std::string str, Association *assoc ) {
-    if( str == "" )
+    if ( str == "" )
       anonym.push_back( assoc );
     else  if ( table.find( str ) == table.end() )
@@ -162 +162 @@
 
   virtual Association *operator[]( int idx ) {
-    if( ordering[idx] == "" ) {
+    if ( ordering[idx] == "" ) {
       std::cerr << "Error, anonymous members not implemented yet" << std::endl;
       throw 0;
@@ -187 +187 @@
   virtual void display( std::ostream &os ) {
     os << "Point association: " << std::endl;
-    for( map_type::iterator i = table.begin(); i != table.end(); i++ ) {
+    for ( map_type::iterator i = table.begin(); i != table.end(); i++ ) {
       os << "Member [" << i->first << ", index = " << i->second.first << "]";
       if ( i->second.second != 0 )
@@ -244 +244 @@
   diet::diet_tree<int> tree;
   /*
-  for( diet_tree<int>::iterator i = tree.begin(); i != tree.end(); i++ )
+  for ( diet_tree<int>::iterator i = tree.begin(); i != tree.end(); i++ )
     std::cout << "--(" << (*i).first << ", " << (*i).second << ")--" << std::endl;
   diet_tree<int> tree;