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/Forall.txt

    reb50842 r937e51d  
    1 in default case, (shouldn't be here)
    2 in default case, (shouldn't be here)
    3 Adding typedef f
    4 --- Entering scope
    5 Adding type T
    6 --- Entering scope
    7 --- Leaving scope containing
    8 --- Leaving scope containing
    9 T
     1Adding function ?=?
     2--- Entering scope
     3--- Leaving scope containing
     4Adding function ?=?
     5--- Entering scope
     6--- Leaving scope containing
     7Adding function ?=?
     8--- Entering scope
     9--- Leaving scope containing
     10Adding function ?=?
     11--- Entering scope
     12--- Leaving scope containing
     13Adding function ?=?
     14--- Entering scope
     15--- Leaving scope containing
     16Adding function ?=?
     17--- Entering scope
     18--- Leaving scope containing
     19Adding function g1
     20--- Entering scope
     21--- Entering scope
     22Adding function f
     23--- Entering scope
     24--- Entering scope
     25--- Leaving scope containing
     26Adding type T
     27Adding function ?=?
     28--- Entering scope
     29--- Leaving scope containing
     30--- Leaving scope containing
     31T
     32Adding function f
     33--- Entering scope
     34--- Leaving scope containing
     35Adding function h
     36--- Entering scope
     37Adding object p
     38--- Leaving scope containing
     39Adding object x
     40Adding object y
     41Adding object z
     42Adding object w
     43--- Leaving scope containing
     44--- Leaving scope containing
     45Adding function g2
     46--- Entering scope
     47--- Entering scope
     48Adding function f
     49--- Entering scope
     50--- Entering scope
     51--- Leaving scope containing
     52Adding type T
     53Adding function ?=?
     54--- Entering scope
     55--- Leaving scope containing
     56--- Leaving scope containing
     57T
     58Adding function f
     59--- Entering scope
     60--- Entering scope
     61--- Leaving scope containing
     62Adding type T
     63Adding function ?=?
     64--- Entering scope
     65--- Leaving scope containing
     66--- Entering scope
     67--- Leaving scope containing
     68Adding type U
     69Adding function ?=?
     70--- Entering scope
     71--- Leaving scope containing
     72--- Leaving scope containing
     73T
     74U
     75Adding object x
     76Adding object y
     77Adding object z
     78Adding object w
     79--- Leaving scope containing
     80--- Leaving scope containing
    1081Adding function swap
    1182--- Entering scope
    12 Adding type T
     83--- Entering scope
     84--- Leaving scope containing
     85Adding type T
     86Adding function ?=?
    1387--- Entering scope
    1488--- Leaving scope containing
     
    1892Adding object temp
    1993--- Leaving scope containing
    20 temp (__temp__2tT) (2)
    21 --- Leaving scope containing
    22 left (__left__2tT) (1)
    23 right (__right__2tT) (1)
     94--- Leaving scope containing
     95T
     96--- Entering scope
     97--- Entering scope
     98--- Leaving scope containing
     99Adding type T
     100Adding object 0
     101Adding function ?+?
     102--- Entering scope
     103--- Leaving scope containing
     104Adding function ?++
     105--- Entering scope
     106--- Leaving scope containing
     107Adding function ?+=?
     108--- Entering scope
     109--- Leaving scope containing
     110--- Leaving scope containing
    24111T
    25112Adding context sumable
    26113--- Entering scope
    27 Adding type T
    28 --- Entering scope
    29 --- Leaving scope containing
     114--- Leaving scope containing
     115Adding type T1
    30116Adding object 0
    31117Adding function ?+?
     
    38124--- Entering scope
    39125--- Leaving scope containing
    40 --- Leaving scope containing
    41 0 (__0__C2tT) (1)
    42 ?++ (__?++__F_2tT_2tT_) (1)
    43 ?+=? (__?+=?__F_2tT_2tT2tT_) (1)
    44 ?+? (__?+?__F_2tT_2tT2tT_) (1)
    45 T
    46 Adding type T1
    47 --- Entering scope
    48 --- Leaving scope containing
    49 Adding object 0
    50 Adding function ?+?
    51 --- Entering scope
    52 --- Leaving scope containing
    53 Adding function ?++
    54 --- Entering scope
    55 --- Leaving scope containing
    56 Adding function ?+=?
    57 --- Entering scope
    58 --- Leaving scope containing
    59 Adding type T2
    60 --- Entering scope
     126--- Entering scope
     127--- Entering scope
     128--- Leaving scope containing
    61129Adding type P1
    62130--- Entering scope
    63131--- Leaving scope containing
    64132Adding type P2
    65 --- Entering scope
    66 --- Leaving scope containing
    67133--- Leaving scope containing
    68134P1
    69135P2
     136Adding type T2
     137--- Entering scope
     138--- Leaving scope containing
    70139Adding type T3
    71 --- Entering scope
    72 --- Leaving scope containing
    73 Adding object 0
    74 Adding function ?+?
    75 --- Entering scope
    76 --- Leaving scope containing
    77 Adding function ?++
    78 --- Entering scope
    79 --- Leaving scope containing
    80 Adding function ?+=?
    81 --- Entering scope
    82 --- Leaving scope containing
    83 Adding struct __anonymous0
     140Adding fwd decl for struct __anonymous0
    84141--- Entering scope
    85142Adding object i
    86143Adding object j
    87144--- Leaving scope containing
    88 i (__i__3tP1) (1)
    89 j (__j__3tP2) (1)
    90 Adding type T2
    91 --- Entering scope
     145Adding struct __anonymous0
     146--- Entering scope
     147--- Entering scope
     148--- Leaving scope containing
    92149Adding type P1
    93150--- Entering scope
     
    99156P1
    100157P2
    101 Adding object 0
    102 Adding function ?+?
    103 --- Entering scope
    104 --- Leaving scope containing
    105 Adding function ?++
    106 --- Entering scope
    107 --- Leaving scope containing
    108 Adding function ?+=?
    109 --- Entering scope
    110 --- Leaving scope containing
     158Adding type T2
    111159Adding object w1
    112 Adding typedef w2
    113 --- Entering scope
    114 --- Leaving scope containing
    115160Adding object g2
     161--- Entering scope
     162--- Leaving scope containing
    116163Adding type w3
    117 --- Entering scope
    118 --- Leaving scope containing
    119164Adding object g3
    120165Adding function sum
    121166--- Entering scope
    122 Adding type T
    123 --- Entering scope
    124 --- Leaving scope containing
    125 Adding object 0
    126 Adding function ?+?
    127 --- Entering scope
    128 --- Leaving scope containing
    129 Adding function ?++
    130 --- Entering scope
    131 --- Leaving scope containing
    132 Adding function ?+=?
     167--- Entering scope
     168--- Leaving scope containing
     169Adding type T
     170Adding function ?=?
    133171--- Entering scope
    134172--- Leaving scope containing
     
    138176Adding object total
    139177Adding object i
    140 --- Leaving scope containing
    141 i (__i__i) (2)
    142 total (__total__2tT) (2)
    143 --- Leaving scope containing
    144 0 (__0__2tT) (1)
    145 ?++ (__?++__F_2tT_2tT_) (1)
    146 ?+=? (__?+=?__F_2tT_2tT2tT_) (1)
    147 ?+? (__?+?__F_2tT_2tT2tT_) (1)
    148 a (__a__P2tT) (1)
    149 n (__n__i) (1)
     178--- Entering scope
     179--- Leaving scope containing
     180--- Leaving scope containing
     181--- Leaving scope containing
    150182T
    151183Adding function twice
    152184--- Entering scope
    153 Adding type T
     185--- Entering scope
     186--- Leaving scope containing
     187Adding type T
     188Adding function ?=?
    154189--- Entering scope
    155190--- Leaving scope containing
     
    168203--- Leaving scope containing
    169204--- Leaving scope containing
    170 0 (__0__C2tT) (1)
    171 ?++ (__?++__F_2tT_2tT_) (1)
    172 ?+=? (__?+=?__F_2tT_2tT2tT_) (1)
    173 ?+? (__?+?__F_2tT_2tT2tT_) (1)
    174 t (__t__2tT) (1)
     205T
     206Adding function min
     207--- Entering scope
     208--- Entering scope
     209--- Leaving scope containing
     210Adding type T
     211Adding function ?=?
     212--- Entering scope
     213--- Leaving scope containing
     214Adding object 0
     215Adding function ?!=?
     216--- Entering scope
     217--- Leaving scope containing
     218Adding function ?<?
     219--- Entering scope
     220--- Leaving scope containing
     221Adding object t1
     222Adding object t2
     223--- Entering scope
     224--- Leaving scope containing
     225--- Leaving scope containing
    175226T
    176227Adding function main
     
    182233Adding object f
    183234--- Leaving scope containing
    184 a (__a__A0i) (2)
    185 f (__f__f) (2)
    186 x (__x__i) (2)
    187 y (__y__i) (2)
    188 --- Leaving scope containing
     235--- Leaving scope containing
Note: See TracChangeset for help on using the changeset viewer.