Changeset 68b52b0

Timestamp:

Jun 23, 2021, 4:52:43 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6448f7d

Parents:

b680198

Message:

Implementing syntax forall( T * ) abbreviating forall( T & | sized(T) )

Files:

• src/Parser/DeclarationNode.cc (modified) (1 diff)
• tests/.expect/forall.txt (modified) (1 diff)
• tests/forall.cfa (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -1076 +1076 @@
         if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
                 // otype is internally converted to dtype + otype parameters
-                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::DStype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype, TypeDecl::Dimension };
+                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::Dtype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype, TypeDecl::Dimension };
                 static_assert( sizeof(kindMap) / sizeof(kindMap[0]) == TypeDecl::NUMBER_OF_KINDS, "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
+                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype || variable.tyClass == TypeDecl::DStype, variable.initializer ? variable.initializer->buildType() : nullptr );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;

tests/.expect/forall.txt

@@ -1 @@
-forall.cfa:216:25: warning: Compiled
+forall.cfa:242:25: warning: Compiled

tests/forall.cfa

@@ -199 +199 @@
 }
 
+forall( T ) void check_otype() {
+        T & tr = *0p;
+        T * tp = 0p;
+
+        &tr += 1;
+        tp += 1;
+        T & tx = tp[1];
+
+        T t;
+        T t2 = t;
+}
+
+forall( T * ) void check_dstype() {
+        T & tr = *0p;
+        T * tp = 0p;
+
+        &tr += 1;
+        tp += 1;
+        T & tx = tp[1];
+}
+
+forall( T & ) void check_dtype() {
+        T & tr = *0p;
+        T * tp = 0p;
+}
+
 //otype T1 | { void xxx( T1 ); };