Changeset b5b0907 for src/Tests/Expect-a/Functions.txt

Timestamp:

Jun 15, 2015, 12:45:26 PM (11 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

File:

• src/Tests/Expect-a/Functions.txt (modified) (3 diffs)

src/Tests/Expect-a/Functions.txt

@@ -173 +173 @@
       CompoundStmt
 
-fII3: auto function
-    with parameters
-      i: signed int 
-    returning 
-      signed int 
-    with body 
-      CompoundStmt
-
-fII4: auto function
+fII3: extern function
+    with parameters
+      i: signed int 
+    returning 
+      signed int 
+    with body 
+      CompoundStmt
+
+fII4: extern function
     with parameters
       i: signed int 
@@ -257 +257 @@
       CompoundStmt
 
-fO4: auto function
+fO4: extern function
       accepting unspecified arguments
     returning 
@@ -268 +268 @@
       CompoundStmt
 
-fO5: auto function
+fO5: extern function
       accepting unspecified arguments
     returning