Ignore:
Timestamp:
Jun 11, 2015, 1:31:07 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:
ea9b9d3
Parents:
bfbf97f (diff), cda48b6 (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 'code-gen' into resolver

File:
1 moved

Legend:

Unmodified
Added
Removed

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

    rbfbf97f ra8541d9  
    1111            instance of type T (not function type)
    1212
     13      ?=?: function
     14          with parameters
     15            pointer to instance of type T (not function type)
     16            instance of type T (not function type)
     17          returning
     18            instance of type T (not function type)
     19
    1320
    1421struct __anonymous0
    1522    with members
    1623      data: instance of type T (not function type)
    17       next: pointer to instance of type List (not function type)
     24      next: pointer to instance of type List1 (not function type)
    1825        with parameters
    1926          instance of type T (not function type)
    2027
    2128
    22 List: type for pointer to instance of struct __anonymous0
     29List1: type for pointer to instance of struct __anonymous0
    2330  with parameters
    2431    T: type
    … …  
    3037
    3138
    32   with assertions
    33     instance of context addable
    34       with parameters
    35         instance of type T (not function type)
    36 
    37 
    38 ListOfIntegers: typedef for instance of type List (not function type)
     39ListOfIntegers: typedef for instance of type List1 (not function type)
    3940  with parameters
    4041    signed int
    … …  
    4748            signed int
    4849          returning
    49             instance of type List (not function type)
     50            instance of type List1 (not function type)
    5051              with parameters
    5152                signed int
    … …  
    5758h: function
    5859    with parameters
    59       p: pointer to instance of type List (not function type)
     60      p: pointer to instance of type List1 (not function type)
    6061        with parameters
    6162          signed int
    … …  
    6364    returning
    6465      signed int
     66
     67struct S1
     68    with parameters
     69      T: type
     70
     71struct S1
     72    with parameters
     73      T: type
     74
     75    with members
     76      i: instance of type T (not function type)
     77
     78v1: instance of struct S1
     79  with parameters
     80    signed int
     81
     82p: pointer to instance of struct S1
     83  with parameters
     84    signed int
     85
     86struct S2
     87    with parameters
     88      T: type
     89
     90    with members
     91      i: instance of type T (not function type)
     92
     93v2: instance of struct S2
     94  with parameters
     95    signed int
     96
     97struct __anonymous1
     98    with parameters
     99      T: type
     100
     101    with members
     102      i: instance of type T (not function type)
     103
     104v2: instance of struct __anonymous1
     105  with parameters
     106    signed int
    65107
    66108struct node
Note: See TracChangeset for help on using the changeset viewer.