Changeset 3d8f2f8

Timestamp:

Mar 9, 2018, 1:28:54 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e84382b

Parents:

8b001bd (diff), f86c8e5 (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:

more changes

Location:

doc/papers/general

Files:

• Paper.tex (modified) (4 diffs)
• evaluation/cpp-stack.hpp (modified) (2 diffs)
• evaluation/cpp-vstack.hpp (modified) (1 diff)
• evaluation/timing.dat (modified) (1 diff)
• evaluation/timing.gp (modified) (1 diff)
• evaluation/timing.xlsx (modified) (previous)

doc/papers/general/Paper.tex

@@ -2637 +2637 @@
                                                                         & \CT{C}        & \CT{\CFA}     & \CT{\CC}      & \CT{\CCV}             \\ \hline
 maximum memory usage (MB)                       & 10,001        & 2,502         & 2,503         & 11,253                \\
-source code size (lines)                        & 197           & 186           & 133           & 303                   \\
+source code size (lines)                        & 197           & 186           & 125           & 293                   \\
 redundant type annotations (lines)      & 27            & 0                     & 2                     & 16                    \\
 binary size (KB)                                        & 14            & 257           & 14            & 37                    \\
@@ -2906 +2906 @@
 }
 \end{cfa}
+
+\begin{comment}
+forall( otype T ) {
+        struct stack_node {
+                T value;
+                stack_node(T) * next;
+        };
+        struct stack { stack_node(T) * head; };
+        void clear( stack(T) & s ) with( s ) {
+                for ( stack_node(T) * next = head; next; ) {
+                        stack_node(T) * crnt = next;
+                        next = crnt->next;
+                        ^(*crnt){};
+                        free(crnt);
+                }
+                head = 0;
+        }
+        void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+        void ?{}( stack(T) & s, stack(T) t ) {
+                stack_node(T) ** crnt = &s.head;
+                for ( stack_node(T) * next = t.head; next; next = next->next ) {
+                        *crnt = alloc();
+                        ((*crnt)->value){ next->value };
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = 0;
+        }
+        stack(T) ?=?( stack(T) & s, stack(T) t ) {
+                if ( s.head == t.head ) return s;
+                clear( s );
+                s{ t };
+                return s;
+        }
+        void ^?{}( stack(T) & s) { clear( s ); }
+        _Bool empty( const stack(T) & s ) { return s.head == 0; }
+        void push( stack(T) & s, T value ) with( s ) {
+                stack_node(T) * n = alloc();
+                (*n){ value, head };
+                head = n;
+        }
+        T pop( stack(T) & s ) with( s ) {
+                stack_node(T) * n = head;
+                head = n->next;
+                T v = n->value;
+                ^(*n){};
+                free( n );
+                return v;
+        }
+}
+\end{comment}
 
 \medskip\noindent
@@ -2943 +2993 @@
                 return *this;
         }
-        stack & operator= ( stack<T> && o ) {
-                if ( this == &o ) return *this;
-                head = o.head;
-                o.head = nullptr;
-                return *this;
-        }
         bool empty() const { return head == nullptr; }
         void push( const T & value ) { head = new node{ value, head };  /***/ }
@@ -2989 +3033 @@
         stack() : head( nullptr ) {}
         stack( const stack & o ) { copy( o ); }
-        stack( stack && o ) : head( o.head ) { o.head = nullptr; }
         ~stack() { clear(); }
-        stack & operator=( const stack & o ) {
+        stack & operator= ( const stack & o ) {
                 if ( this == &o ) return *this;
                 clear();
                 copy( o );
-                return *this;
-        }
-        stack & operator=( stack && o ) {
-                if ( this == &o ) return *this;
-                head = o.head;
-                o.head = nullptr;
                 return *this;
         }

doc/papers/general/evaluation/cpp-stack.hpp

@@ -11 +11 @@
 
         stack() : head( nullptr ) {}
-        stack( const stack<T> & o) { copy( o ); }
+        stack( const stack<T> & o ) { copy( o ); }
         stack( stack<T> && o ) : head( o.head ) { o.head = nullptr; }
 
@@ -41 +41 @@
         }
 
-        stack & operator= ( stack<T> && o ) {
-                if ( this == &o ) return *this;
-                head = o.head;
-                o.head = nullptr;
-                return *this;
-        }
-
         bool empty() const { return head == nullptr; }
 

doc/papers/general/evaluation/cpp-vstack.hpp

@@ -17 +17 @@
         stack( stack && o );
         ~stack();
-        stack& operator=( const stack& o );
-        stack& operator=( stack && o );
-
+        stack & operator=( const stack& o );
+        stack & operator=( stack && o );
         bool empty() const;
         void push( const object & value );

doc/papers/general/evaluation/timing.dat

@@ -1 +1 @@
 "400 million repetitions"       "C"     "\\CFA{}"       "\\CC{}"        "\\CC{obj}"
-"push\nint"     3002    2459    1520    3305
-"copy\nint"     2985    2057    1521    3152
-"clear\nint"    1374    827     718     1469
-"pop\nint"      1416    1221    717     5467
-"push\npair"    4214    2752    946     6826
-"copy\npair"    6127    2105    993     7330
-"clear\npair"   2881    885     711     3564
-"pop\npair"     3046    5434    783     26538
+"push\nint"     3002    2459    1542    3269
+"copy\nint"     2985    2057    1539    3083
+"clear\nint"    1374    827     756     1469
+"pop\nint"      1416    1221    760     5098
+"push\npair"    4214    2752    950     6873
+"copy\npair"    6127    2105    987     7293
+"clear\npair"   2881    885     751     3460
+"pop\npair"     3046    5434    822     24962

doc/papers/general/evaluation/timing.gp

@@ -24 +24 @@
 set yrange [0:10]
 
-set label "26.5" at 7.125,10.5
+set label "25.0" at 7.125,10.5
 
 # set datafile separator ","