Changeset fd54fef for libcfa/src/memory.cfa

Timestamp:

Jan 19, 2021, 8:44:29 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

dafbde8

Parents:

2f47ea4

Message:

Converting the project to use the new syntax for otype, dtype and ttytpe.

Changed prelude (gen), libcfa and test suite to use it. Added a simple deprecation rule of the old syntax to the parser; we might wish to support both syntaxes "officially," like with an extra CLI switch, but this measure should serve as a simple reminder for our team to try the new syntax.

File:

• libcfa/src/memory.cfa (modified) (11 diffs)

libcfa/src/memory.cfa

@@ -18 +18 @@
 
 // Internal data object.
-forall(dtype T | sized(T), ttype Args | { void ?{}(T &, Args); })
+forall(T & | sized(T), Args... | { void ?{}(T &, Args); })
 void ?{}(counter_data(T) & this, Args args) {
         (this.counter){1};
@@ -24 +24 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ^?{}(counter_data(T) & this) {
         assert(0 == this.counter);
@@ -31 +31 @@
 
 // This is one of many pointers keeping this alive.
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 void ?{}(counter_ptr(T) & this) {
         this.data = 0p;
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 void ?{}(counter_ptr(T) & this, zero_t) {
         this.data = 0p;
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 static void internal_decrement(counter_ptr(T) & this) {
         if (this.data && 0 == --this.data->counter) {
@@ -48 +48 @@
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 static void internal_copy(counter_ptr(T) & this, counter_ptr(T) & that) {
         this.data = that.data;
@@ -56 +56 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ?{}(counter_ptr(T) & this, counter_ptr(T) that) {
         // `that` is a copy but it should have neither a constructor
@@ -64 +64 @@
 }
 
-forall(dtype T | sized(T), ttype Args | { void ?{}(T&, Args); })
+forall(T & | sized(T), Args... | { void ?{}(T&, Args); })
 void ?{}(counter_ptr(T) & this, Args args) {
         this.data = (counter_data(T)*)new(args);
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ^?{}(counter_ptr(T) & this) {
         internal_decrement(this);
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 T & *?(counter_ptr(T) & this) {
         return *((this.data) ? &this.data->object : 0p);
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ?=?(counter_ptr(T) & this, counter_ptr(T) that) {
         if (this.data != that.data) {
@@ -87 +87 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ?=?(counter_ptr(T) & this, zero_t) {
         internal_decrement(this);
@@ -93 +93 @@
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?==?(counter_ptr(T) const & this, counter_ptr(T) const & that) {
         return this.data == that.data;
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?!=?(counter_ptr(T) const & this, counter_ptr(T) const & that) {
         return !?==?(this, that);
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?==?(counter_ptr(T) const & this, zero_t) {
         return this.data == 0;
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?!=?(counter_ptr(T) const & this, zero_t) {
         return !?==?(this, (zero_t)0);
@@ -114 +114 @@
 
 // This is the only pointer that keeps this alive.
-forall(dtype T)
+forall(T &)
 void ?{}(unique_ptr(T) & this) {
         this.data = 0p;
 }
 
-forall(dtype T)
+forall(T &)
 void ?{}(unique_ptr(T) & this, zero_t) {
         this.data = 0p;
 }
 
-forall(dtype T | sized(T), ttype Args | { void ?{}(T &, Args); })
+forall(T & | sized(T), Args... | { void ?{}(T &, Args); })
 void ?{}(unique_ptr(T) & this, Args args) {
         this.data = (T *)new(args);
 }
 
-forall(dtype T | { void ^?{}(T &); })
+forall(T & | { void ^?{}(T &); })
 void ^?{}(unique_ptr(T) & this) {
         delete(this.data);
 }
 
-forall(dtype T)
+forall(T &)
 T & *?(unique_ptr(T) & this) {
         return *this.data;
 }
 
-forall(dtype T | { void ^?{}(T &); })
+forall(T & | { void ^?{}(T &); })
 void ?=?(unique_ptr(T) & this, zero_t) {
         delete(this.data);
@@ -145 +145 @@
 }
 
-forall(dtype T | { void ^?{}(T &); })
+forall(T & | { void ^?{}(T &); })
 void move(unique_ptr(T) & this, unique_ptr(T) & that) {
         delete(this.data);
@@ -152 +152 @@
 }
 
-forall(dtype T)
+forall(T &)
 int ?==?(unique_ptr(T) const & this, unique_ptr(T) const & that) {
         return this.data == that.data;
 }
 
-forall(dtype T)
+forall(T &)
 int ?!=?(unique_ptr(T) const & this, unique_ptr(T) const & that) {
         return !?==?(this, that);
 }
 
-forall(dtype T)
+forall(T &)
 int ?==?(unique_ptr(T) const & this, zero_t) {
         return this.data == 0;
 }
 
-forall(dtype T)
+forall(T &)
 int ?!=?(unique_ptr(T) const & this, zero_t) {
         return !?==?(this, (zero_t)0);