Changeset ccb447e for src/tests/.expect

Timestamp:

Jul 22, 2016, 2:06:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

72e9222

Parents:

6cf27a07 (diff), 31e46b8 (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 ctor

Location:

src/tests/.expect

Files:

• 32/extension.txt (added)
• 32/gccExtensions.txt (added)
• 32/math.txt (added)
• 64/extension.txt (moved) (moved from src/tests/.expect/extension.txt)
• 64/gccExtensions.txt (moved) (moved from src/tests/.expect/gccExtensions.txt)
• 64/math.txt (moved) (moved from src/tests/.expect/math.txt)
• declarationErrors.txt (modified) (2 diffs)
• declarationSpecifier.txt (modified) (2 diffs)

src/tests/.expect/declarationErrors.txt

@@ -5 +5 @@
   with members 
     i: int 
+   with body 
 
 
@@ -10 +11 @@
   with members 
     i: int 
+   with body 
 
 

src/tests/.expect/declarationSpecifier.txt

@@ -5 +5 @@
   with members 
     i: int 
+   with body 
 
 
@@ -10 +11 @@
   with members 
     i: int 
+   with body