Changeset 937e51d for src/Tests/Expect-s/ScopeErrors.txt

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:

• src/Tests/Expect-s/ScopeErrors.txt (moved) (moved from src/Tests/SynTree/Expected-SymTab/ScopeErrors.tst ) (4 diffs)

src/Tests/Expect-s/ScopeErrors.txt

@@ -8 +8 @@
 Adding object thisIsNotAnError
 --- Leaving scope containing
-thisIsNotAnError (__thisIsNotAnError__i) (2)
 --- Leaving scope containing
 Adding function thisIsAlsoNotAnError
@@ -16 +15 @@
 --- Leaving scope containing
 --- Leaving scope containing
-x (__x__d) (1)
 Adding function thisIsStillNotAnError
 --- Entering scope
@@ -29 +27 @@
 --- Leaving scope containing
 Adding function butThisIsAnError
-Error: duplicate definition for thisIsAnError: a signed int 
-Error: duplicate function definition for butThisIsAnError: a function
+Error: duplicate function definition for butThisIsAnError: function
   with parameters
     double 
@@ -36 +33 @@
     double 
   with body 
+    CompoundStmt