Changeset f80e0218 for src/examples/Attributes.c

Timestamp:

Jun 30, 2016, 4:32:56 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/examples/Attributes.c (moved) (moved from src/Tests/Attributes.c ) (4 diffs)

src/examples/Attributes.c

@@ -6 +6 @@
 //    @max
 // 
-// 2. a direct application to a manifest type
+// 2. a direct application to a manifest otype
 // 
 //    @max( int )
 // 
-// 3. constraining a type variable; the application is implicitly performed at the call site as in (2)
+// 3. constraining a otype variable; the application is implicitly performed at the call site as in (2)
 // 
-//    forall( type T | { T @max( T ); } ) T x( T t );
+//    forall( otype T | { T @max( T ); } ) T x( T t );
 // 
 // 
@@ -23 +23 @@
 //    x = (*attr_var);
 // 
-// 2. an indirect application to a manifest type
+// 2. an indirect application to a manifest otype
 // 
 //    (*attr_var)( int )
 // 
-// 3. a direct application to a type variable
+// 3. a direct application to a otype variable
 // 
 //    @max( T )
@@ -47 +47 @@
 // 3. polymorphic
 // 
-//    forall( type T | constraint( T ) ) int @attr( T );
+//    forall( otype T | constraint( T ) ) int @attr( T );
 
 int @max = 3;
@@ -53 +53 @@
 int main() {
     int x;
-    type @type(type t);                                                                 // compiler intrinsic
-    type @widest(type t);
-    @type(x) *y;                                                                                // gcc: typeof(x) *y;
-    const @widest(double) *w;                                                   // gcc: const typeof(x) *w;
-    * @type(3 + 4) z;                                                                   // cfa declaration syntax
+    otype @otype(otype t);                                                                      // compiler intrinsic
+    otype @widest(otype t);
+    @otype(x) *y;                                                                               // gcc: otypeof(x) *y;
+//    const @widest(double) *w;                                                 // gcc: const otypeof(x) *w;
+//    * @otype(3 + 4) z;                                                                        // cfa declaration syntax
     y = @max;           
     z = @max(x) + @size(int);