Changeset b5b0907 for src/Tests/Expect-s


Ignore:
Timestamp:
Jun 15, 2015, 12:45:26 PM (10 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
94b4364
Parents:
ea9b9d3 (diff), a1d5d2a (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

Location:
src/Tests/Expect-s
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • src/Tests/Expect-s/Attributes.txt

    rea9b9d3 rb5b0907  
    1 Error at line 8 reading token "*"
     1Error at line 58 reading token "*"

  • src/Tests/Expect-s/TypeGenerator.txt

    rea9b9d3 rb5b0907  
    44Adding type T
    55Adding function ?+?
     6--- Entering scope
     7--- Leaving scope containing
     8Adding function ?=?
    69--- Entering scope
    710--- Leaving scope containing
    … …  
    3336Adding object p
    3437--- Leaving scope containing
    35 Adding fwd decl for struct S1
    36 --- Entering scope
    37 --- Entering scope
    38 --- Leaving scope containing
    39 Adding type T
    40 --- Leaving scope containing
    41 T
    42 Adding struct S1
    43 Adding fwd decl for struct S1
    44 --- Entering scope
    45 --- Entering scope
    46 --- Leaving scope containing
    47 Adding type T
    48 Adding object i
    49 --- Leaving scope containing
    50 T
    51 Adding struct S1
    52 --- Entering scope
    53 --- Leaving scope containing
    54 Adding object v1
    55 --- Entering scope
    56 --- Leaving scope containing
    57 Adding object p
    5838Adding fwd decl for struct S2
    5939--- Entering scope
    … …  
    6545T
    6646Adding struct S2
     47Adding struct S3 from implicit forward declaration
     48--- Entering scope
     49--- Leaving scope containing
     50Adding object v1
     51--- Entering scope
     52--- Leaving scope containing
     53Adding object p
     54Adding fwd decl for struct S24
     55--- Entering scope
     56--- Entering scope
     57--- Leaving scope containing
     58Adding type T
     59Adding object i
     60--- Leaving scope containing
     61T
     62Adding struct S24
    6763--- Entering scope
    6864--- Leaving scope containing
Note: See TracChangeset for help on using the changeset viewer.