Changeset 8686f31


Ignore:
Timestamp:
Jul 7, 2015, 10:48:14 AM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
0a0a65b, 413f7f8
Parents:
28a8cf9
Message:

fix generated enum assignment for nested declarations

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Validate.cc

    r28a8cf9 r8686f31  
    1010// Created On       : Sun May 17 21:50:04 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Fri Jul 03 13:17:07 2015
    13 // Update Count     : 131
     12// Last Modified On : Tue Jul 07 10:41:23 2015
     13// Update Count     : 136
    1414//
    1515
     
    560560                // E ?=?(E volatile *, E)
    561561                Type *etype = refType->clone();
    562                 etype->get_qualifiers() += Type::Qualifiers(false, true, false, false, false, false);
     562                // etype->get_qualifiers() += Type::Qualifiers(false, true, false, false, false, false);
    563563
    564564                ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), etype ), 0 );
     
    589589
    590590                LibCfa::makeLibCfa( assigns );
     591
     592                // need to remove the prototypes, since these can appear nested in a routine
     593                for (int start = 0, end = assigns.size()/2; start < end; start++) {
     594                        delete assigns.front();
     595                        assigns.pop_front();
     596                }
    591597
    592598                declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
  • src/main.cc

    r28a8cf9 r8686f31  
    99// Author           : Richard C. Bilson
    1010// Created On       : Fri May 15 23:12:02 2015
    11 <<<<<<< Updated upstream
    12 // Last Modified By : Peter A. Buhr
    13 // Last Modified On : Mon Jun 29 17:09:21 2015
    14 // Update Count     : 77
    15 =======
    1611// Last Modified By : Rob Schluntz
    17 // Last Modified On : Fri Jul 03 13:08:52 2015
    18 // Update Count     : 75
    19 >>>>>>> Stashed changes
     12// Last Modified On : Mon Jul 06 15:01:26 2015
     13// Update Count     : 79
    2014//
    2115
Note: See TracChangeset for help on using the changeset viewer.