Ignore:
Timestamp:
Jun 26, 2015, 4:00:26 PM (11 years ago)
Author:
Aaron Moss <a3moss@…>
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, stuck-waitfor-destruct, with_gc
Children:
0df292b, e0ff3e6
Parents:
eb50842 (diff), 1869adf (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 pointer to pointer to qualified fix into master

File:
1 moved

Legend:

Unmodified
Added
Removed
  • src/Tests/Expect-s/Context.txt

    reb50842 r937e51d  
    1 Adding context has_q
    21--- Entering scope
    3 Adding type T
    42--- Entering scope
    53--- Leaving scope containing
     4Adding type T
    65Adding function q
    76--- Entering scope
    87--- Leaving scope containing
    98--- Leaving scope containing
    10 q (__q__F_2tT_2tT_) (1)
    119T
     10Adding context has_q
    1211Adding function f
    1312--- Entering scope
    14 Adding type z
    1513--- Entering scope
    1614--- Leaving scope containing
    17 Adding function q
     15Adding type z
     16Adding function ?=?
    1817--- Entering scope
    1918--- Leaving scope containing
    2019--- Entering scope
    21 Adding context has_r
    2220--- Entering scope
     21--- Entering scope
     22--- Leaving scope containing
    2323Adding type T
    2424--- Entering scope
    2525--- Leaving scope containing
    2626Adding type U
    27 --- Entering scope
    28 --- Leaving scope containing
    2927Adding function r
    3028--- Entering scope
    3129--- Leaving scope containing
    3230--- Leaving scope containing
    33 r (__r__F_2tT_2tTPF_2tT_2tT2tU__) (3)
    3431T
    3532U
     33Adding context has_r
     34--- Entering scope
     35--- Leaving scope containing
    3636Adding type x
    3737--- Entering scope
    3838--- Leaving scope containing
    3939Adding type y
    40 --- Entering scope
    4140--- Leaving scope containing
    42 Adding function r
    43 --- Entering scope
    44 --- Leaving scope containing
    45 --- Leaving scope containing
    46 r (__r__F_2tx_2txPF_2tx_2tx2ty__) (2)
    4741x
    4842y
    4943has_r
    5044--- Leaving scope containing
    51 q (__q__F_2tz_2tz_) (1)
    5245z
Note: See TracChangeset for help on using the changeset viewer.