Changeset b5b0907 for src/Tests/Expect-f

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-f

Files:

• Attributes.txt (modified) (1 diff)
• TypeGenerator.txt (modified) (2 diffs)
• report (deleted)

src/Tests/Expect-f/Attributes.txt

@@ -1 @@
-Error at line 8 reading token "*"
+Error at line 58 reading token "*"

src/Tests/Expect-f/TypeGenerator.txt

@@ -47 +47 @@
             Name: *?
         ...to: 
-            Variable Expression: _dst: pointer to instance of struct S1 
+            Variable Expression: _dst: pointer to instance of struct S2 
     Member Expression, with field: 
       i: instance of type T (not function type) 
     from aggregate: 
-      Variable Expression: _src: instance of struct S1 
+      Variable Expression: _src: instance of struct S2 
 
 Error: No reasonable alternatives for expression Applying untyped: 
@@ -63 +63 @@
             Name: *?
         ...to: 
-            Variable Expression: _dst: pointer to instance of struct S2 
+            Variable Expression: _dst: pointer to instance of struct S24 
     Member Expression, with field: 
       i: instance of type T (not function type) 
     from aggregate: 
-      Variable Expression: _src: instance of struct S2 
+      Variable Expression: _src: instance of struct S24 
 
 Error: No reasonable alternatives for expression Applying untyped: