Changeset f1ee72e for src/tests/Scope.c

Timestamp:

Jun 23, 2016, 12:23:00 PM (9 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, with_gc

Children:

4d3ca1d8

Parents:

c2931ea (diff), d56c05d0 (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

File:

• src/tests/Scope.c (modified) (2 diffs)

src/tests/Scope.c

@@ -3 +3 @@
 typedef float t;
 y z;
-otype u = struct { int a; double b; };
+//otype u = struct { int a; double b; };
+typedef struct { int a; double b; } u;
 int f( int y );
 y q;
+struct x { int x; };
 
 y w( y y, u v ) {
-        otype x | { x t(u); };
+//      otype x | { x t(u); };
+        void ?{}(struct x *);
+        void ^?{}(struct x *);
+        extern struct x t( u );
         u u = y;
-        x z = t(u);
+        struct x z = t(u);
 }
 
 y p;
 
-context has_u( otype z ) {
+trait has_u( otype z ) {
         z u(z);
 };
@@ -40 +45 @@
 }
 
+void some_func() {}
+
 t g( void ) {
         typedef char x;
-        try {
+//      try {
                 some_func();
-        } catch ( x x ) {
-                t y = x;
-        }
+//      } catch ( x x ) {
+//              t y = x;
+//      }
         x z;
 }